diff --git a/.all-contributorsrc b/.all-contributorsrc
index 547fd4539e..133e8849d2 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2837,6 +2837,121 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "AndrewSav",
+      "name": "Andrew Savinykh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/658865?v=4",
+      "profile": "https://github.com/AndrewSav",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kenchan0130",
+      "name": "Tadayuki Onishi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1155067?v=4",
+      "profile": "https://kenchan0130.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "floschoepfer",
+      "name": "Florian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112496896?v=4",
+      "profile": "https://github.com/floschoepfer",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "spencerrlongg",
+      "name": "Spencer Long",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7305753?v=4",
+      "profile": "http://spencerlong.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "marcusmoore",
+      "name": "Marcus Moore",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1141514?v=4",
+      "profile": "https://github.com/marcusmoore",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Mezzle",
+      "name": "Martin Meredith",
+      "avatar_url": "https://avatars.githubusercontent.com/u/570639?v=4",
+      "profile": "https://github.com/Mezzle",
+      "contributions": []
+    },
+    {
+      "login": "dboth",
+      "name": "dboth",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5731963?v=4",
+      "profile": "http://dboth.de",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zacharyfleck",
+      "name": "Zachary Fleck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87536651?v=4",
+      "profile": "https://github.com/zacharyfleck",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vikaas-cyper",
+      "name": "VIKAAS-A",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74609912?v=4",
+      "profile": "https://github.com/vikaas-cyper",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ak-piracha",
+      "name": "Abdul Kareem",
+      "avatar_url": "https://avatars.githubusercontent.com/u/88882041?v=4",
+      "profile": "https://github.com/ak-piracha",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NojoudAlshehri",
+      "name": "NojoudAlshehri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111287779?v=4",
+      "profile": "https://github.com/NojoudAlshehri",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "stefanstidlffg",
+      "name": "Stefan Stidl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/54367449?v=4",
+      "profile": "https://github.com/stefanstidlffg",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "qay21",
+      "name": "Quentin Aymard",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87803479?v=4",
+      "profile": "https://github.com/qay21",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/.chipperci.yml b/.chipperci.yml
new file mode 100644
index 0000000000..0c1ad8ba15
--- /dev/null
+++ b/.chipperci.yml
@@ -0,0 +1,63 @@
+version: 1
+
+environment:
+  php: 8.0
+  node: 12
+
+services:
+  - mysql: 5.7
+  - dusk:
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+  pull_request:
+    branches: .*
+
+pipeline:
+  - name: Setup
+    cmd: |
+      cp -v .env.example .env
+#     This is simply to allow passing the guard in TestCase@setUp()
+#     https://chipperci.com/docs/builds/env
+      touch .env.testing
+      composer install --no-interaction --prefer-dist --optimize-autoloader
+
+  - name: Generate Key
+    cmd: |
+      php artisan key:generate --force
+
+  - name: Passport Keys
+    cmd: |
+      php artisan passport:keys
+
+  - name: Run Migrations
+    cmd: |
+      # php artisan migrate --force
+
+  - name: PHPUnit Unit Tests
+    cmd: |
+      # php artisan test --testsuite Unit
+
+  - name: PHPUnit Feature Tests
+    cmd: |
+      # php artisan test --testsuite Feature
+
+#  - name: Browser Tests
+#    cmd: |
+#      cp -v .env.dusk.example .env.dusk.ci
+#      sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci
+#      sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci
+#      #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci
+#      sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci
+#      sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci
+#      sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci
+#      sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci
+#
+#      php -S [::0]:8000 -t public 2>server.log &
+#      sleep 2
+#      php artisan dusk:chrome-driver $CHROME_DRIVER
+#      php artisan dusk --env=ci
diff --git a/.env.dusk.local b/.env.dusk.example
similarity index 94%
rename from .env.dusk.local
rename to .env.dusk.example
index 33343ffc51..074f6fc3d7 100644
--- a/.env.dusk.local
+++ b/.env.dusk.example
@@ -20,13 +20,13 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # REQUIRED: DATABASE SETTINGS
 # --------------------------------------------
 DB_CONNECTION=mysql
-DB_HOST=localhost
+DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=snipeit-local
-DB_USERNAME=snipeit-local
-DB_PASSWORD=snipeit-local
+DB_DATABASE=null
+DB_USERNAME=null
+DB_PASSWORD=null
 DB_PREFIX=null
-DB_DUMP_PATH='/Applications/MAMP/Library/bin'
+#DB_DUMP_PATH=
 
 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS
diff --git a/.env.example b/.env.example
index c523ef0c04..a9563e6321 100644
--- a/.env.example
+++ b/.env.example
@@ -85,6 +85,7 @@ COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
 API_TOKEN_EXPIRATION_YEARS=15
+BS_TABLE_STORAGE=cookieStorage
 
 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS
@@ -175,6 +176,15 @@ REQUIRE_SAML=false
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
 
+# --------------------------------------------
+# OPTIONAL: HASHING
+# --------------------------------------------
+HASHING_DRIVER='bcrypt'
+BCRYPT_ROUNDS=10
+ARGON_MEMORY=1024
+ARGON_THREADS=2
+ARGON_TIME=2
+
 # --------------------------------------------
 # OPTIONAL: SCIM
 # --------------------------------------------
diff --git a/.env.testing b/.env.testing
deleted file mode 100644
index a60fc4e09d..0000000000
--- a/.env.testing
+++ /dev/null
@@ -1,75 +0,0 @@
-# --------------------------------------------
-# REQUIRED: BASIC APP SETTINGS
-# --------------------------------------------
-APP_ENV=testing
-APP_DEBUG=true
-APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
-APP_URL=http://localhost:8000
-APP_TIMEZONE='US/Pacific'
-APP_LOCALE=en
-FILESYSTEM_DISK=local
-
-# --------------------------------------------
-# REQUIRED: DATABASE SETTINGS
-# --------------------------------------------
-DB_CONNECTION=sqlite_testing
-DB_HOST=localhost
-DB_PORT=3306
-DB_DATABASE=testing.sqlite
-DB_USERNAME=null
-DB_PASSWORD=null
-
-# --------------------------------------------
-# REQUIRED: OUTGOING MAIL SERVER SETTINGS
-# --------------------------------------------
-MAIL_DRIVER=log
-MAIL_HOST=email-smtp.us-west-2.amazonaws.com
-MAIL_PORT=587
-MAIL_USERNAME=YOURUSERNAME
-MAIL_PASSWORD=YOURPASSWORD
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDR=you@example.com
-MAIL_FROM_NAME=Snipe-IT
-
-# --------------------------------------------
-# REQUIRED: IMAGE LIBRARY
-# This should be gd or imagick
-# --------------------------------------------
-IMAGE_LIB=gd
-
-
-# --------------------------------------------
-# OPTIONAL: AWS SETTINGS
-# --------------------------------------------
-AWS_SECRET_ACCESS_KEY=null
-AWS_ACCESS_KEY_ID=null
-AWS_DEFAULT_REGION=null
-AWS_BUCKET=null
-AWS_BUCKET_ROOT=null
-AWS_URL=null
-
-
-# --------------------------------------------
-# OPTIONAL: CACHE SETTINGS
-# --------------------------------------------
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-
-# --------------------------------------------
-# OPTIONAL: SESSION SETTINGS
-# --------------------------------------------
-SESSION_LIFETIME=12000
-EXPIRE_ON_CLOSE=false
-ENCRYPT=false
-COOKIE_NAME=snipeittest_session
-COOKIE_DOMAIN=null
-SECURE_COOKIES=false
-
-
-# --------------------------------------------
-# OPTIONAL: APP LOG FORMAT
-# --------------------------------------------
-LOG_CHANNEL=single
-LOG_LEVEL=debug
diff --git a/.env.testing.example b/.env.testing.example
new file mode 100644
index 0000000000..3391d62726
--- /dev/null
+++ b/.env.testing.example
@@ -0,0 +1,19 @@
+# --------------------------------------------
+# REQUIRED: BASIC APP SETTINGS
+# --------------------------------------------
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
+APP_URL=http://localhost:8000
+APP_TIMEZONE='UTC'
+APP_LOCALE=en
+
+# --------------------------------------------
+# REQUIRED: DATABASE SETTINGS
+# --------------------------------------------
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=null
+DB_USERNAME=null
+DB_PASSWORD=null
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 8f13e1f1b7..dec3a8fe08 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -2,8 +2,6 @@ name: Feature Request
 description: Suggest an idea for this project
 title: "[Feature Request]: "
 labels: ["feature request"]
-assignees:
-  - snipe
 body:
   - type: textarea
     attributes:
diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
index 9320437c78..a27d5fe5fc 100644
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -1,18 +1,22 @@
-frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*", "*livewire*"]
+frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*", "resources/views/livewire/*"]
 skins: ["*.js", "*.css", "*.scss", "*.less"]
 css: ["*.css","*.scss", "*.less"]
-backend: ["/app/*", "*.php"]
+javascript: ["*.js", "package.json", "package.lock"]
+backend: ["/app/*", "composer.json", "composer.lock"]
+translations: ["/resources/lang"]
+livewire: ["/app/Http/Livewire/*", "resources/views/livewire/*"]
 backups: ["*backup*"]
 restore: ["*restore*"]
 saml: ["*saml*"]
 scim: ["*scim*"]
 custom fields: ["*fields*", "*fieldsets*"]
-dependencies: ["composer.json"]
+dependencies: ["composer.json", "composer.lock", "package.json", "package.lock"]
 consumables: ["*consumables*"]
-api: ["/app/Http/Controllers/api/*"]
+api: ["/app/Http/Controllers/Api/*"]
 notifications: ["/app/Notifications/*"]
-importer: ["/app/Importer/*"]
+importer: ["/app/Importer/*","/app/Http/Livewire/Importer.php", "resources/views/livewire/importer.php"]
 cli / artisan: ["/app/Console/*"]
-LDAP: ["*LDAP*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
+LDAP: ["*Ldap*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
 docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
+tests: ["/tests/*", "/stubs"]
 config: .github
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
index 0d77e1ae7c..758838307d 100644
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -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.2.0
+        uses: codacy/codacy-analysis-cli-action@v4.3.0
         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/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
new file mode 100644
index 0000000000..c986accf37
--- /dev/null
+++ b/.github/workflows/crowdin-upload.yml
@@ -0,0 +1,21 @@
+name: Crowdin Action
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  upload-sources-to-crowdin:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Crowdin push
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          upload_translations: false
+          download_translations: false
+          project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
+          token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.github/workflows/docker-alpine.yml b/.github/workflows/docker-alpine.yml
index 3139763cbd..0a5c28ee53 100644
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -72,11 +72,11 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push 'snipe-it' image
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile.alpine
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b261dd828b..5aa2758e79 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -72,11 +72,11 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push 'snipe-it' image
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/.gitignore b/.gitignore
index 37e9d3f68c..f0e9bfcec2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 .couscous
 .DS_Store
 .env
+.env.dusk.*
+!.env.dusk.example
+.env.testing
+phpstan.neon
 .idea
 /bin/
 /bootstrap/compiled.php
diff --git a/Dockerfile b/Dockerfile
index b572ff6896..88de52858b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>"
 
 # No need to add `apt-get clean` here, reference:
@@ -14,16 +14,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
 apt-utils \
 apache2 \
 apache2-bin \
-libapache2-mod-php7.4 \
-php7.4-curl \
-php7.4-ldap \
-php7.4-mysql \
-php7.4-gd \
-php7.4-xml \
-php7.4-mbstring \
-php7.4-zip \
-php7.4-bcmath \
-php7.4-redis \
+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 \
 php-memcached \
 patch \
 curl \
@@ -38,9 +38,10 @@ gcc \
 make \
 autoconf \
 libc-dev \
+libldap-common \
 pkg-config \
 libmcrypt-dev \
-php7.4-dev \
+php8.1-dev \
 ca-certificates \
 unzip \
 dnsutils \
@@ -50,16 +51,16 @@ 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-1.0.3
+RUN pecl install mcrypt
 
-RUN bash -c "echo extension=/usr/lib/php/20190902/mcrypt.so > /etc/php/7.4/mods-available/mcrypt.ini"
+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/7.4/apache2/php.ini
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.4/cli/php.ini
+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 useradd -m --uid 1000 --gid 50 docker
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 93dba995a0..62a928f8ad 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,34 +1,34 @@
-FROM alpine:3.14.2
+FROM alpine:3.17.3
 # Apache + PHP
 RUN  apk add --no-cache \
         apache2 \
-        php7 \
-        php7-common \
-        php7-apache2 \
-        php7-curl \
-        php7-ldap \
-        php7-mysqli \
-        php7-gd \
-        php7-xml \
-        php7-mbstring \
-        php7-zip \
-        php7-ctype \
-        php7-tokenizer \
-        php7-pdo_mysql \
-        php7-openssl \
-        php7-bcmath \
-        php7-phar \
-        php7-json \
-        php7-iconv \
-        php7-fileinfo \
-        php7-simplexml \
-        php7-session \
-        php7-dom \
-        php7-xmlwriter \
-        php7-xmlreader \
-        php7-sodium \
-        php7-redis \
-        php7-pecl-memcached \
+        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 \
         curl \
         wget \
         vim \
@@ -41,7 +41,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/php7/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php81/php.ini
 COPY  docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf
 
 # Enable mod_rewrite
diff --git a/Dockerfile.fpm-alpine b/Dockerfile.fpm-alpine
index 3bb4566ffa..77302524d4 100644
--- a/Dockerfile.fpm-alpine
+++ b/Dockerfile.fpm-alpine
@@ -1,8 +1,8 @@
 ARG ENVIRONMENT=production
-ARG SNIPEIT_RELEASE=5.1.3
-ARG PHP_VERSION=7.4.16
-ARG PHP_ALPINE_VERSION=3.13
-ARG COMPOSER_VERSION=2.0.11
+ARG SNIPEIT_RELEASE=6.1.0
+ARG PHP_VERSION=8.2
+ARG PHP_ALPINE_VERSION=3.17
+ARG COMPOSER_VERSION=2
 
 # Cannot use arguments with 'COPY --from' workaround
 # https://github.com/moby/moby/issues/34482#issuecomment-454716952
@@ -52,7 +52,7 @@ RUN { \
 
 # Install php extensions inside docker containers easily
 # https://github.com/mlocati/docker-php-extension-installer
-COPY --from=mlocati/php-extension-installer:1.2.19 /usr/bin/install-php-extensions /usr/local/bin/
+COPY --from=mlocati/php-extension-installer:2.1.15 /usr/bin/install-php-extensions /usr/local/bin/
 RUN set -eux; \
     install-php-extensions \
         bcmath \
diff --git a/README.md b/README.md
index 1818aa1f82..19310b976b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![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://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-312-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-325-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -66,8 +66,11 @@ Since the release of the JSON REST API, several third-party developers have been
 - [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 [@RodneyLeeBrands](https://github.com/RodneyLeeBrands) - Python script to synchronize information between Mosyle and 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.
+- [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
                                                      
 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. :)
 
@@ -140,7 +143,9 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<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/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") |
 <!-- 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/TESTING.md b/TESTING.md
index 6624289758..3f0e588105 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,65 +1,51 @@
-# Using the Test Suite
+# Running the Test Suite
 
-This document is targeted at developers looking to make modifications to
-this application's code base and want to run the existing test suite.
+This document is targeted at developers looking to make modifications to this application's code base and want to run the existing test suite.
 
+Before starting, follow the [instructions](README.md#installation) for installing the application locally and ensure you can load it in a browser properly.
 
-## Setup
+## Unit and Feature Tests
 
-Follow the instructions for installing the application locally,
-making sure to have also run the [database migrations](link to db migrations).
+Before attempting to run the test suite copy the example environment file for tests and update the values to match your environment:
 
+`cp .env.testing.example .env.testing`
+> Since the data in the database is flushed after each test it is recommended you create a separate mysql database for specifically for tests
 
-## Unit Tests 
+Now you are ready to run the entire test suite from your terminal:
 
-The application will use values in the `.env.testing` file located
-in the root directory to override the
-default settings and/or other values that exist in your `.env` files.
+`php artisan test`
 
-Make sure to modify the section in `.env.testing` that has the
-database settings. In the example below, it is connecting to the
-[MariaDB](link-to-maria-db) server that is used if you install the
-application using [Docker](https://docker.com).
+To run individual test files, you can pass the path to the test that you want to run:
 
-```dotenv
-# --------------------------------------------
-# REQUIRED: DATABASE SETTINGS
-# --------------------------------------------
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_DATABASE=snipeit
-DB_USERNAME=root
-DB_PASSWORD=changeme1234
-```
-
-To run the entire unit test suite, use the following command from your terminal:
-
-`php artisan test --env=testing`
-
-To run individual test files, you can pass the path to the test that
-you want to run.
-
-`php artisan test --env=testing tests/Unit/AccessoryTest.php`
+`php artisan test tests/Unit/AccessoryTest.php`
 
 ## Browser Tests 
 
-The browser tests use [Dusk](https://laravel.com/docs/8.x/dusk) to run them.
-When troubleshooting any problems, make sure that your `.env` file is configured
-correctly to run the existing application.
+Browser tests are run via [Laravel Dusk](https://laravel.com/docs/8.x/dusk) and require Google Chrome to be installed.
 
-### Test Setup
+Before attempting to run Dusk tests copy the example environment file for Dusk and update the values to match your environment:
 
-Your application needs to be configued and up and running in order for the browser
-tests to actually run. When running the tests locally, you can start the application
-using the following command:
+`cp .env.dusk.example .env.dusk.local`
+> `local` refers to the value of `APP_ENV` in your `.env` so if you have it set to `dev` then the file should be named `.env.dusk.dev`.
+
+**Important**: Dusk tests cannot be run using an in-memory SQLite database. Additionally, the Dusk test suite uses the `DatabaseMigrations` trait which will leave the database in a fresh state after running. Therefore, it is recommended that you create a test database and point `DB_DATABASE` in `.env.dusk.local` to it.  
+
+### Running Browser Tests
+
+Your application needs to be configured and up and running in order for the browser tests to actually run. When running the tests locally, you can start the application using the following command:
 
 `php artisan serve`
 
-
-To run the test suite use the following command from another terminal tab or window:
+Now you are ready to run the test suite. Use the following command from another terminal tab or window:
 
 `php artisan dusk`
 
-To run individual test files, you can pass the path to the test that you want to run.
+To run individual test files, you can pass the path to the test that you want to run:
 
 `php artisan dusk tests/Browser/LoginTest.php`
+
+If you get an error when attempting to run Dusk tests that says `Couldn't connect to server` run:
+
+`php artisan dusk:chrome-driver --detect`
+
+This command will install the specific ChromeDriver Dusk needs for your operating system and Chrome version.
diff --git a/app/Console/Commands/CheckoutLicenseToAllUsers.php b/app/Console/Commands/CheckoutLicenseToAllUsers.php
index d655b5aceb..801b3d187a 100644
--- a/app/Console/Commands/CheckoutLicenseToAllUsers.php
+++ b/app/Console/Commands/CheckoutLicenseToAllUsers.php
@@ -56,7 +56,7 @@ class CheckoutLicenseToAllUsers extends Command
             return false;
         }
 
-        $users = User::whereNull('deleted_at')->with('licenses')->get();
+        $users = User::whereNull('deleted_at')->where('autoassign_licenses', '=', 1)->with('licenses')->get();
 
         if ($users->count() > $license->getAvailSeatsCountAttribute()) {
             $this->info('You do not have enough free seats to complete this task, so we will check out as many as we can. ');
diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
index a4b4b9e42c..114f92dae4 100644
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdmin.php
@@ -3,15 +3,31 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use \App\Models\User;
+
 
 class CreateAdmin extends Command
 {
+
+    /** @mixin User **/
     /**
-     * The name and signature of the console command.
-     *
-     * @var string
+     * App\Console\CreateAdmin
+     * @property mixed $first_name
+     * @property string $last_name
+     * @property string $username
+     * @property string $email
+     * @property string $permissions
+     * @property string $password
+     * @property boolean $activated
+     * @property boolean $show_in_list
+     * @property boolean $autoassign_licenses
+     * @property \Illuminate\Support\Carbon|null $created_at
+     * @property mixed $created_by
      */
-    protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=}  {--email=}  {--username=}  {--password=}   {show_in_list?}';
+
+
+
+    protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=}  {--email=}  {--username=}  {--password=} {show_in_list?} {autoassign_licenses?}';
 
     /**
      * The console command description.
@@ -30,11 +46,7 @@ class CreateAdmin extends Command
         parent::__construct();
     }
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
+
     public function handle()
     {
         $first_name = $this->option('first_name');
@@ -43,11 +55,14 @@ class CreateAdmin extends Command
         $email = $this->option('email');
         $password = $this->option('password');
         $show_in_list = $this->argument('show_in_list');
+        $autoassign_licenses = $this->argument('autoassign_licenses');
+
+
 
         if (($first_name == '') || ($last_name == '') || ($username == '') || ($email == '') || ($password == '')) {
             $this->info('ERROR: All fields are required.');
         } else {
-            $user = new \App\Models\User;
+            $user = new User;
             $user->first_name = $first_name;
             $user->last_name = $last_name;
             $user->username = $username;
@@ -59,6 +74,11 @@ class CreateAdmin extends Command
             if ($show_in_list == 'false') {
                 $user->show_in_list = 0;
             }
+
+            if ($autoassign_licenses == 'false') {
+                $user->autoassign_licenses = 0;
+            }
+
             if ($user->save()) {
                 $this->info('New user created');
                 $user->groups()->attach(1);
diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
index c6f8dd379a..f77f5f8c48 100755
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -44,18 +44,25 @@ class LdapSync extends Command
      */
     public function handle()
     {
+
+        // If LDAP enabled isn't set to 1 (ldap_enabled!=1) then we should cut this short immediately without going any further
+        if (Setting::getSettings()->ldap_enabled!='1') {
+            $this->error('LDAP is not enabled. Aborting. See Settings > LDAP to enable it.');
+            exit();
+        }
+
         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_default_group = Setting::getSettings()->ldap_default_group;
@@ -68,7 +75,7 @@ class LdapSync extends Command
                 $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []];
                 $this->info(json_encode($json_summary));
             }
-            LOG::info($e);
+            Log::info($e);
 
             return [];
         }
@@ -78,7 +85,7 @@ class LdapSync extends Command
         try {
             if ($this->option('base_dn') != '') {
                 $search_base = $this->option('base_dn');
-                LOG::debug('Importing users from specified base DN: \"'.$search_base.'\".');
+                Log::debug('Importing users from specified base DN: \"'.$search_base.'\".');
             } else {
                 $search_base = null;
             }
@@ -92,7 +99,7 @@ class LdapSync extends Command
                 $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []];
                 $this->info(json_encode($json_summary));
             }
-            LOG::info($e);
+            Log::info($e);
 
             return [];
         }
@@ -102,16 +109,16 @@ class LdapSync extends Command
 
         if ($this->option('location') != '') {
             $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('Location name '.$this->option('location').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
         } elseif ($this->option('location_id') != '') {
             $location = Location::where('id', '=', $this->option('location_id'))->first();
-            LOG::debug('Location ID '.$this->option('location_id').' passed');
-            LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
+            Log::debug('Location ID '.$this->option('location_id').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
         }
 
         if (! isset($location)) {
-            LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
+            Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
         }
 
         /* Process locations with explicitly defined OUs, if doing a full import. */
@@ -127,7 +134,7 @@ class LdapSync extends Command
             array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
 
             if (count($ldap_ou_locations) > 0) {
-                LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
+                Log::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
             }
 
             // Inject location information fields
@@ -145,7 +152,7 @@ class LdapSync extends Command
                         $json_summary = ['error' => true, 'error_message' => trans('admin/users/message.error.ldap_could_not_search').' Location: '.$ldap_loc['name'].' (ID: '.$ldap_loc['id'].') cannot connect to "'.$ldap_loc['ldap_ou'].'" - '.$e->getMessage(), 'summary' => []];
                         $this->info(json_encode($json_summary));
                     }
-                    LOG::info($e);
+                    Log::info($e);
 
                     return [];
                 }
@@ -191,20 +198,26 @@ class LdapSync extends Command
 
         for ($i = 0; $i < $results['count']; $i++) {
                 $item = [];
-                $item['username'] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : '';
-                $item['employee_number'] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : '';
-                $item['lastname'] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : '';
-                $item['firstname'] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : '';
-                $item['email'] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : '';
-                $item['ldap_location_override'] = isset($results[$i]['ldap_location_override']) ? $results[$i]['ldap_location_override'] : '';
-                $item['location_id'] = isset($results[$i]['location_id']) ? $results[$i]['location_id'] : '';
-                $item['telephone'] = isset($results[$i][$ldap_result_phone][0]) ? $results[$i][$ldap_result_phone][0] : '';
-                $item['jobtitle'] = isset($results[$i][$ldap_result_jobtitle][0]) ? $results[$i][$ldap_result_jobtitle][0] : '';
-                $item['country'] = isset($results[$i][$ldap_result_country][0]) ? $results[$i][$ldap_result_country][0] : '';
-                $item['department'] = isset($results[$i][$ldap_result_dept][0]) ? $results[$i][$ldap_result_dept][0] : '';
-                $item['manager'] = isset($results[$i][$ldap_result_manager][0]) ? $results[$i][$ldap_result_manager][0] : '';
-
+                $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] ?? '';
 
+                // 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'],
                 ]);
@@ -230,6 +243,7 @@ class LdapSync extends Command
                 $user->jobtitle = $item['jobtitle'];
                 $user->country = $item['country'];
                 $user->department_id = $department->id;
+                $user->location_id = $location->id;
 
                 if($item['manager'] != null) {
                     // Check Cache first
@@ -303,17 +317,18 @@ class LdapSync extends Command
                         $user->activated = 0;
                     } */
                     $enabled_accounts = [
-                    '512',    // 0x200    NORMAL_ACCOUNT
-                    '544',    // 0x220    NORMAL_ACCOUNT, PASSWD_NOTREQD
-                    '66048',  // 0x10200  NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
-                    '66080',  // 0x10220  NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD
-                    '262656', // 0x40200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED
-                    '262688', // 0x40220  NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
-                    '328192', // 0x50200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
-                    '328224', // 0x50220  NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
-                    '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
+                    '512',    //     0x200 NORMAL_ACCOUNT
+                    '544',    //     0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD
+                    '66048',  //   0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
+                    '66080',  //   0x10220 NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD
+                    '262656', //   0x40200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED
+                    '262688', //   0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
+                    '328192', //   0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '328224', //   0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '4194816',//  0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
                     '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;
 
diff --git a/app/Console/Commands/NormalizeUserNames.php b/app/Console/Commands/NormalizeUserNames.php
new file mode 100644
index 0000000000..c3ea5e8ace
--- /dev/null
+++ b/app/Console/Commands/NormalizeUserNames.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\User;
+
+class NormalizeUserNames extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:normalize-names';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Normalizes weirdly formatted names as first-letter upercased';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+
+        $users = User::get();
+            $this->info($users->count() . ' users');
+
+            foreach ($users as $user) {
+                $user->first_name = ucwords(strtolower($user->first_name));
+                $user->last_name = ucwords(strtolower($user->last_name));
+                $user->email = strtolower($user->email);
+                $user->save();
+        }
+    }
+}
diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php
index c5e3a4c790..b1f1753564 100644
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -149,7 +149,7 @@ class RestoreFromBackup extends Command
                 $boring_files[] = $raw_path;
                 continue;
             }
-            if (@pathinfo($raw_path)['extension'] == 'sql') {
+            if (@pathinfo($raw_path, PATHINFO_EXTENSION) == 'sql') {
                 \Log::debug("Found a sql file!");
                 $sqlfiles[] = $raw_path;
                 $sqlfile_indices[] = $i;
diff --git a/app/Console/Commands/SystemBackup.php b/app/Console/Commands/SystemBackup.php
index b7ca526052..3b51bcc736 100644
--- a/app/Console/Commands/SystemBackup.php
+++ b/app/Console/Commands/SystemBackup.php
@@ -11,7 +11,7 @@ class SystemBackup extends Command
      *
      * @var string
      */
-    protected $name = 'snipeit:backup';
+    protected $signature = 'snipeit:backup {--filename=}';
 
     /**
      * The console command description.
@@ -37,7 +37,18 @@ class SystemBackup extends Command
      */
     public function handle()
     {
-        //
-        $this->call('backup:run');
+        if ($this->option('filename')) {
+            $filename = $this->option('filename');
+
+            // Make sure the filename ends in .zip
+            if (!ends_with($filename, '.zip')) {
+                $filename = $filename.'.zip';
+            }
+
+            $this->call('backup:run', ['--filename' => $filename]);
+        } else {
+            $this->call('backup:run');
+        }
+
     }
 }
diff --git a/app/Events/UserMerged.php b/app/Events/UserMerged.php
new file mode 100644
index 0000000000..b045fdef03
--- /dev/null
+++ b/app/Events/UserMerged.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use App\Models\User;
+
+class UserMerged
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $from_user, User $to_user, User $admin)
+    {
+        $this->merged_from        = $from_user;
+        $this->merged_to      = $to_user;
+        $this->admin            = $admin;
+    }
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 5594d8e6b3..3d4db93452 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -6,10 +6,11 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use App\Helpers\Helper;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Auth\AuthenticationException;
+use ArieTimmerman\Laravel\SCIMServer\Exceptions\SCIMException;
 use Log;
 use Throwable;
 use JsonException;
-
+use Carbon\Exceptions\InvalidFormatException;
 
 class Handler extends ExceptionHandler
 {
@@ -28,6 +29,8 @@ class Handler extends ExceptionHandler
         \Intervention\Image\Exception\NotSupportedException::class,
         \League\OAuth2\Server\Exception\OAuthServerException::class,
         JsonException::class,
+        SCIMException::class, //these generally don't need to be reported
+        InvalidFormatException::class,
     ];
 
     /**
@@ -41,7 +44,9 @@ class Handler extends ExceptionHandler
     public function report(Throwable $exception)
     {
         if ($this->shouldReport($exception)) {
-            \Log::error($exception);
+            if (class_exists(\Log::class)) {
+                \Log::error($exception);
+            }
             return parent::report($exception);
         }
     }
@@ -51,7 +56,7 @@ class Handler extends ExceptionHandler
      * 
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $e
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
      */
     public function render($request, Throwable $e)
     {
@@ -65,18 +70,39 @@ class Handler extends ExceptionHandler
         // Invalid JSON exception
         // TODO: don't understand why we have to do this when we have the invalidJson() method, below, but, well, whatever
         if ($e instanceof JsonException) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'invalid JSON'), 422);
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Invalid JSON'), 422);
         }
 
+        // Handle SCIM exceptions
+        if ($e instanceof SCIMException) {
+            try {
+                $e->report(); // logs as 'debug', so shouldn't get too noisy
+            } catch(\Exception $reportException) {
+                //do nothing
+            }
+            return $e->render($request); // ALL SCIMExceptions have the 'render()' method
+        }
 
-        // Handle Ajax requests that fail because the model doesn't exist
+        // Handle standard requests that fail because Carbon cannot parse the date on validation (when a submitted date value is definitely not a date)
+        if ($e instanceof InvalidFormatException) {
+            return redirect()->back()->withInput()->with('error', trans('validation.date', ['attribute' => 'date']));
+        }
+
+        // Handle API requests that fail
         if ($request->ajax() || $request->wantsJson()) {
 
+            // Handle API requests that fail because Carbon cannot parse the date on validation (when a submitted date value is definitely not a date)
+            if ($e instanceof InvalidFormatException) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('validation.date', ['attribute' => 'date'])), 200);
+            }
+
+            // Handle API requests that fail because the model doesn't exist
             if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
                 $className = last(explode('\\', $e->getModel()));
                 return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
             }
 
+            // Handle API requests that fail because of an HTTP status code and return a useful error message
             if ($this->isHttpException($e)) {
 
                 $statusCode = $e->getStatusCode();
@@ -96,6 +122,8 @@ class Handler extends ExceptionHandler
         }
 
 
+
+
         if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) {
             return response()->view('layouts/basic', [
                 'content' => view('errors/404')
@@ -111,8 +139,8 @@ class Handler extends ExceptionHandler
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Illuminate\Auth\AuthenticationException  $exception
-     * @return \Illuminate\Http\Response
-     */
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+  */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 83961ffd75..b4c8f5605d 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -33,6 +33,16 @@ class Helper
         }
     }
 
+    public static function parseEscapedMarkedownInline($str = null)
+    {
+        $Parsedown = new \Parsedown();
+        $Parsedown->setSafeMode(true);
+
+        if ($str) {
+            return $Parsedown->line($str);
+        }
+    }
+
     /**
      * The importer has formatted number strings since v3,
      * so the value might be a string, or an integer.
@@ -334,7 +344,11 @@ class Helper
             '#92896B',
         ];
 
+        $total_colors = count($colors);
 
+        if ($index >= $total_colors) {
+            $index = $index - $total_colors;
+        }
 
         return $colors[$index];
     }
@@ -528,20 +542,23 @@ class Helper
      * @since [v2.5]
      * @return array
      */
-    public static function categoryTypeList()
+    public static function categoryTypeList($selection=null)
     {
         $category_types = [
             '' => '',
-            'accessory' => 'Accessory',
-            'asset' => 'Asset',
-            'consumable' => 'Consumable',
-            'component' => 'Component',
-            'license' => 'License',
+            'accessory' => trans('general.accessory'),
+            'asset' => trans('general.asset'),
+            'consumable' => trans('general.consumable'),
+            'component' => trans('general.component'),
+            'license' => trans('general.license'),
         ];
 
+        if ($selection != null){
+            return $category_types[strtolower($selection)];
+        }
+        else
         return $category_types;
     }
-
     /**
      * Get the list of custom fields in an array to make a dropdown menu
      *
@@ -1092,6 +1109,15 @@ class Helper
         return $file_name;
     }
 
+
+    /**
+     * Universal helper to show file size in human-readable formats
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since 5.0
+     *
+     * @return string[]
+     */
     public static function formatFilesizeUnits($bytes)
     {
         if ($bytes >= 1073741824)
@@ -1121,32 +1147,84 @@ class Helper
 
         return $bytes;
     }
+
+    /**
+     * This is weird but used by the side nav to determine which URL to point the user to
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since 5.0
+     *
+     * @return string[]
+     */
     public static function SettingUrls(){
         $settings=['#','fields.index', 'statuslabels.index', 'models.index', 'categories.index', 'manufacturers.index', 'suppliers.index', 'departments.index', 'locations.index', 'companies.index', 'depreciations.index'];
 
         return $settings;
         }
-    public static function AgeFormat($date) {
-        $year = Carbon::parse($date)
-            ->diff(now())->y;
-        $month = Carbon::parse($date)
-            ->diff(now())->m;
-        $days = Carbon::parse($date)
-            ->diff(now())->d;
-        $age='';
-        if ($year) {
-            $age .= $year.'y ';
+
+
+    /**
+     * Generic helper (largely used by livewire right now) that returns the font-awesome icon
+     * for the object type.
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since 6.1.0
+     *
+     * @return string
+     */
+    public static function iconTypeByItem($item) {
+
+        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;
         }
-        if ($month) {
-            $age .= $month.'m ';
-        }
-        if ($days) {
-            $age .= $days.'d';
-        }
-        
-        return $age;
+
     }
 
+
+     /*
+     * This is a shorter way to see if the app is in demo mode.
+     *
+     * This makes it cleanly available in blades and in controllers, e.g.
+     *
+     * Blade:
+     * {{ Helper::isDemoMode() ? ' disabled' : ''}} for form blades where we need to disable a form
+     *
+     * Controller:
+     * if (Helper::isDemoMode()) {
+     *      // don't allow the thing
+     * }
+     * @todo - use this everywhere else in the app where we have very long if/else config('app.lock_passwords') stuff
+     */
+    public static function isDemoMode() {
+        if (config('app.lock_passwords') === true) {
+            return true;
+            \Log::debug('app locked!');
+        }
+        
+        return false;
+    }
+
+  
     /**
      * Conversion between units of measurement
      *
@@ -1164,7 +1242,7 @@ class Helper
         $output = $value * $srcFactor / $dstFactor;
         return ($round !== false) ? round($output, $round) : $output;
     }
-        
+  
     /**
      * Get conversion factor from unit of measurement to mm
      *
@@ -1183,6 +1261,18 @@ class Helper
             case 'yd': return 3 * static::getUnitConversionFactor('ft');
             case 'pt': return (1/72) * static::getUnitConversionFactor('in');
             default: throw new \InvalidArgumentException('Unit: \''.$unit.'\' is not supported');
+
+        return false;
+    }
+
+
+    /*
+     * I know it's gauche  to return a shitty HTML string, but this is just a helper and since it will be the same every single time,
+     * it seemed pretty safe to do here. Don't you judge me.
+     */
+    public static function showDemoModeFieldWarning() {
+        if (Helper::isDemoMode()) {
+            return "<p class=\"text-warning\"><i class=\"fas fa-lock\"></i>" . trans('general.feature_disabled') . "</p>";
         }
     }
 }
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index d1af79adf1..111cbb3c8b 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -63,6 +63,7 @@ class AccessoriesController extends Controller
     public function store(ImageUploadRequest $request)
     {
         $this->authorize(Accessory::class);
+        
         // create a new model instance
         $accessory = new Accessory();
 
@@ -76,13 +77,12 @@ class AccessoriesController extends Controller
         $accessory->manufacturer_id         = request('manufacturer_id');
         $accessory->model_number            = request('model_number');
         $accessory->purchase_date           = request('purchase_date');
-        $accessory->purchase_cost           = Helper::ParseCurrency(request('purchase_cost'));
+        $accessory->purchase_cost           = request('purchase_cost');
         $accessory->qty                     = request('qty');
         $accessory->user_id                 = Auth::user()->id;
         $accessory->supplier_id             = request('supplier_id');
         $accessory->notes                   = request('notes');
 
-
         $accessory = $request->handleImages($accessory);
 
         // Was the accessory created?
@@ -115,6 +115,33 @@ class AccessoriesController extends Controller
 
     }
 
+    /**
+     * Returns a view that presents a form to clone an accessory.
+     *
+     * @author [J. Vinsmoke]
+     * @param int $accessoryId
+     * @since [v6.0]
+     * @return View
+     */
+    public function getClone($accessoryId = null)
+    {
+
+        $this->authorize('create', Accesory::class);
+
+        // Check if the asset exists
+        if (is_null($accessory_to_clone = Accessory::find($accessoryId))) {
+            // Redirect to the asset management page
+            return redirect()->route('accessory.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+        }
+
+        $accessory = clone $accessory_to_clone;
+        $accessory->id = null;
+        $accessory->location_id = null;
+
+        return view('accessories/edit')
+            ->with('item', $accessory);
+        
+    }
 
     /**
      * Save edited Accessory from form post
@@ -127,45 +154,47 @@ class AccessoriesController extends Controller
      */
     public function update(ImageUploadRequest $request, $accessoryId = null)
     {
-        if (is_null($accessory = Accessory::find($accessoryId))) {
+        if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) {
+
+            $this->authorize($accessory);
+
+            $validator = Validator::make($request->all(), [
+                "qty" => "required|numeric|min:$accessory->users_count"
+            ]);
+
+            if ($validator->fails()) {
+                return redirect()->back()
+                    ->withErrors($validator)
+                    ->withInput();
+            }
+
+
+
+            // Update the accessory data
+            $accessory->name = request('name');
+            $accessory->location_id = request('location_id');
+            $accessory->min_amt = request('min_amt');
+            $accessory->category_id = request('category_id');
+            $accessory->company_id = Company::getIdForCurrentUser(request('company_id'));
+            $accessory->manufacturer_id = request('manufacturer_id');
+            $accessory->order_number = request('order_number');
+            $accessory->model_number = request('model_number');
+            $accessory->purchase_date = request('purchase_date');
+            $accessory->purchase_cost = request('purchase_cost');
+            $accessory->qty = request('qty');
+            $accessory->supplier_id = request('supplier_id');
+            $accessory->notes = request('notes');
+
+            $accessory = $request->handleImages($accessory);
+
+            // Was the accessory updated?
+            if ($accessory->save()) {
+                return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
+            }
+        } else {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
         }
 
-        $min = $accessory->numCheckedOut();
-        $validator = Validator::make($request->all(), [
-            "qty" => "required|numeric|min:$min"
-        ]);
-
-        if ($validator->fails()) {
-            return redirect()->back()
-                ->withErrors($validator)
-                ->withInput();
-        }
-
-        $this->authorize($accessory);
-
-        // Update the accessory data
-        $accessory->name                    = request('name');
-        $accessory->location_id             = request('location_id');
-        $accessory->min_amt                 = request('min_amt');
-        $accessory->category_id             = request('category_id');
-        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
-        $accessory->manufacturer_id         = request('manufacturer_id');
-        $accessory->order_number            = request('order_number');
-        $accessory->model_number            = request('model_number');
-        $accessory->purchase_date           = request('purchase_date');
-        $accessory->purchase_cost           = Helper::ParseCurrency(request('purchase_cost'));
-        $accessory->qty                     = request('qty');
-        $accessory->supplier_id             = request('supplier_id');
-        $accessory->notes                   = request('notes');
-
-        $accessory = $request->handleImages($accessory);
-
-        // Was the accessory updated?
-        if ($accessory->save()) {
-            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
-        }
-
         return redirect()->back()->withInput()->withErrors($accessory->getErrors());
     }
 
@@ -217,7 +246,7 @@ class AccessoriesController extends Controller
      */
     public function show($accessoryID = null)
     {
-        $accessory = Accessory::find($accessoryID);
+        $accessory = Accessory::withCount('users as users_count')->find($accessoryID);
         $this->authorize('view', $accessory);
         if (isset($accessory->id)) {
             return view('accessories/view', compact('accessory'));
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
index 6144bb6f92..1ea036e6ed 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -25,11 +25,16 @@ class AccessoryCheckoutController extends Controller
     public function create($accessoryId)
     {
         // Check if the accessory exists
-        if (is_null($accessory = Accessory::find($accessoryId))) {
+        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.not_found'));
         }
 
+        // 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'));
+        }
+        
         if ($accessory->category) {
             $this->authorize('checkout', $accessory);
 
@@ -55,17 +60,23 @@ class AccessoryCheckoutController extends Controller
     public function store(Request $request, $accessoryId)
     {
         // Check if the accessory exists
-        if (is_null($accessory = Accessory::find($accessoryId))) {
+        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'))) {
+        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'));
         }
 
+        // 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'));
+        }
+
+
         // Update the accessory data
         $accessory->assigned_to = e($request->input('assigned_to'));
 
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
index 59c8f88430..645e2624b2 100644
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -121,7 +121,6 @@ class AcceptanceController extends Controller
         $pdf_filename = 'accepted-eula-'.date('Y-m-d-h-i-s').'.pdf';
         $sig_filename='';
 
-
         if ($request->input('asset_acceptance') == 'accepted') {
 
             /**
@@ -153,12 +152,14 @@ class AcceptanceController extends Controller
                 }
             }
 
-
             // this is horrible
             switch($acceptance->checkoutable_type){
                 case 'App\Models\Asset':
                         $pdf_view_route ='account.accept.accept-asset-eula';
                         $asset_model = AssetModel::find($item->model_id);
+                        if (!$asset_model) {
+                            return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
+                        }
                         $display_model = $asset_model->name;
                         $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                 break;
@@ -167,7 +168,7 @@ class AcceptanceController extends Controller
                         $pdf_view_route ='account.accept.accept-accessory-eula';
                         $accessory = Accessory::find($item->id);
                         $display_model = $accessory->name;
-                        $assigned_to = User::find($item->assignedTo);
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                 break;
 
                 case 'App\Models\LicenseSeat':
@@ -222,8 +223,8 @@ class AcceptanceController extends Controller
                 'item_model' => $display_model,
                 'item_serial' => $item->serial,
                 'eula' => $item->getEula(),
-                'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format),
-                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
+                'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
+                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format('Y-m-d'),
                 'assigned_to' => $assigned_to,
                 'company_name' => $branding_settings->site_name,
                 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
@@ -250,11 +251,15 @@ class AcceptanceController extends Controller
             // This is the most horriblest
             switch($acceptance->checkoutable_type){
                 case 'App\Models\Asset':
+                    $asset_model = AssetModel::find($item->model_id);
+                    $display_model = $asset_model->name;
                     $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                     break;
 
                 case 'App\Models\Accessory':
-                    $assigned_to = User::find($item->assignedTo);
+                    $accessory = Accessory::find($item->id);
+                    $display_model = $accessory->name;
+                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                     break;
 
                 case 'App\Models\LicenseSeat':
@@ -266,6 +271,8 @@ class AcceptanceController extends Controller
                     break;
 
                 case 'App\Models\Consumable':
+                    $consumable = Consumable::find($item->id);
+                    $display_model = $consumable->name;
                     $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                     break;
             }
@@ -273,7 +280,7 @@ class AcceptanceController extends Controller
                 'item_tag' => $item->asset_tag,
                 'item_model' => $display_model,
                 'item_serial' => $item->serial,
-                'declined_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
+                'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
                 'assigned_to' => $assigned_to,
                 'company_name' => $branding_settings->site_name,
                 'date_settings' => $branding_settings->date_display_format,
@@ -289,4 +296,4 @@ class AcceptanceController extends Controller
         return redirect()->to('account/accept')->with('success', $return_msg);
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index a894dc3760..263bd2086f 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -26,7 +26,10 @@ class AccessoriesController extends Controller
      */
     public function index(Request $request)
     {
-        $this->authorize('view', Accessory::class);
+        if ($request->user()->cannot('reports.view')) {
+            $this->authorize('view', Accessory::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.
@@ -41,10 +44,13 @@ class AccessoriesController extends Controller
                 'min_amt',
                 'company_id',
                 'notes',
+                'users_count',
+                'qty',
             ];
 
 
-        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier');
+        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier')
+                                ->withCount('users as users_count');
 
         if ($request->filled('search')) {
             $accessories = $accessories->TextSearch($request->input('search'));
@@ -74,12 +80,9 @@ class AccessoriesController extends Controller
             $accessories->where('notes','=',$request->input('notes'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $accessories->count()) ? $accessories->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort_override =  $request->input('sort');
@@ -147,7 +150,7 @@ class AccessoriesController extends Controller
     public function show($id)
     {
         $this->authorize('view', Accessory::class);
-        $accessory = Accessory::findOrFail($id);
+        $accessory = Accessory::withCount('users as users_count')->findOrFail($id);
 
         return (new AccessoriesTransformer)->transformAccessory($accessory);
     }
diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php
index e38d5382fa..6da7ce23a1 100644
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -36,7 +36,7 @@ class AssetMaintenancesController extends Controller
     {
         $this->authorize('view', Asset::class);
 
-        $maintenances = AssetMaintenance::select('asset_maintenances.*')->with('asset', 'asset.model', 'asset.location', 'supplier', 'asset.company', 'admin');
+        $maintenances = AssetMaintenance::select('asset_maintenances.*')->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'admin');
 
         if ($request->filled('search')) {
             $maintenances = $maintenances->TextSearch($request->input('search'));
@@ -55,12 +55,9 @@ class AssetMaintenancesController extends Controller
         }
 
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($maintenances) && ($request->get('offset') > $maintenances->count())) ? $maintenances->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $maintenances->count()) ? $maintenances->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
 
         $allowed_columns = [
                                 'id',
@@ -74,7 +71,8 @@ class AssetMaintenancesController extends Controller
                                 'asset_tag',
                                 'asset_name',
                                 'user_id',
-                                'supplier'
+                                'supplier',
+                                'is_warranty',
                             ];
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
@@ -121,7 +119,7 @@ class AssetMaintenancesController extends Controller
         $assetMaintenance = new AssetMaintenance();
         $assetMaintenance->supplier_id = $request->input('supplier_id');
         $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost =  Helper::ParseCurrency($request->input('cost'));
+        $assetMaintenance->cost =  $request->input('cost');
         $assetMaintenance->notes = e($request->input('notes'));
         $asset = Asset::find(e($request->input('asset_id')));
 
@@ -178,7 +176,7 @@ class AssetMaintenancesController extends Controller
 
         $assetMaintenance->supplier_id = e($request->input('supplier_id'));
         $assetMaintenance->is_warranty = e($request->input('is_warranty'));
-        $assetMaintenance->cost =  Helper::ParseCurrency($request->input('cost'));
+        $assetMaintenance->cost =  $request->input('cost');
         $assetMaintenance->notes = e($request->input('notes'));
 
         $asset = Asset::find(request('asset_id'));
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 5e9b3ad78d..cf13d24fc4 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -63,7 +63,7 @@ class AssetModelsController extends Controller
             'models.deleted_at',
             'models.updated_at',
          ])
-            ->with('category', 'depreciation', 'manufacturer', 'fieldset')
+            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues')
             ->withCount('assets as assets_count');
 
         if ($request->input('status')=='deleted') {
@@ -78,12 +78,9 @@ class AssetModelsController extends Controller
             $assetmodels->TextSearch($request->input('search'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($assetmodels) && ($request->get('offset') > $assetmodels->count())) ? $assetmodels->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $assetmodels->count()) ? $assetmodels->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') : 'models.created_at';
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index a843aa09db..e8f37d8574 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -101,6 +101,7 @@ class AssetsController extends Controller
             'checkin_counter',
             'requests_counter',
             'byod',
+            'asset_eol_date',
         ];
 
         $filter = [];
@@ -114,7 +115,7 @@ class AssetsController extends Controller
             $allowed_columns[] = $field->db_column_name();
         }
 
-        $assets = Company::scopeCompanyables(Asset::select('assets.*'), 'company_id', 'assets')
+        $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.
 
@@ -124,11 +125,12 @@ class AssetsController extends Controller
             $assets->InModelList($non_deprecable_models->toArray());
         }
 
+
+
         // These are used by the API to query against specific ID numbers.
         // They are also used by the individual searches on detail pages like
         // locations, etc.
 
-
         // Search custom fields by column name
         foreach ($all_custom_fields as $field) {
             if ($request->filled($field->db_column_name())) {
@@ -136,76 +138,12 @@ class AssetsController extends Controller
             }
         }
 
-
-        if ($request->filled('status_id')) {
-            $assets->where('assets.status_id', '=', $request->input('status_id'));
+        if ((! is_null($filter)) && (count($filter)) > 0) {
+            $assets->ByFilter($filter);
+        } elseif ($request->filled('search')) {
+            $assets->TextSearch($request->input('search'));
         }
 
-        if ($request->filled('asset_tag')) {
-            $assets->where('assets.asset_tag', '=', $request->input('asset_tag'));
-        }
-
-        if ($request->filled('serial')) {
-            $assets->where('assets.serial', '=', $request->input('serial'));
-        }
-
-        if ($request->input('requestable') == 'true') {
-            $assets->where('assets.requestable', '=', '1');
-        }
-
-        if ($request->filled('model_id')) {
-            $assets->InModelList([$request->input('model_id')]);
-        }
-
-        if ($request->filled('category_id')) {
-            $assets->InCategory($request->input('category_id'));
-        }
-
-        if ($request->filled('location_id')) {
-            $assets->where('assets.location_id', '=', $request->input('location_id'));
-        }
-
-        if ($request->filled('rtd_location_id')) {
-            $assets->where('assets.rtd_location_id', '=', $request->input('rtd_location_id'));
-        }
-
-        if ($request->filled('supplier_id')) {
-            $assets->where('assets.supplier_id', '=', $request->input('supplier_id'));
-        }
-
-        if (($request->filled('assigned_to')) && ($request->filled('assigned_type'))) {
-            $assets->where('assets.assigned_to', '=', $request->input('assigned_to'))
-                ->where('assets.assigned_type', '=', $request->input('assigned_type'));
-        }
-
-        if ($request->filled('company_id')) {
-            $assets->where('assets.company_id', '=', $request->input('company_id'));
-        }
-
-        if ($request->filled('manufacturer_id')) {
-            $assets->ByManufacturer($request->input('manufacturer_id'));
-        }
-
-        if ($request->filled('depreciation_id')) {
-            $assets->ByDepreciationId($request->input('depreciation_id'));
-        }
-
-        if ($request->filled('byod')) {
-            $assets->where('assets.byod', '=', $request->input('byod'));
-        }
-
-        $request->filled('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
-
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($assets) && ($request->get('offset') > $assets->count())) ? $assets->count() : $request->get('offset', 0);
-
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
         // This is used by the audit reporting routes
         if (Gate::allows('audit', Asset::class)) {
             switch ($audit) {
@@ -219,7 +157,6 @@ class AssetsController extends Controller
         }
 
 
-
         // This is used by the sidenav, mostly
 
         // We switched from using query scopes here because of a Laravel bug
@@ -269,7 +206,7 @@ class AssetsController extends Controller
                 break;
             case 'Deployed':
                 // more sad, horrible workarounds for laravel bugs when doing full text searches
-                $assets->where('assets.assigned_to', '>', '0');
+                $assets->whereNotNull('assets.assigned_to');
                 break;
             case 'byod':
                 // This is kind of redundant, since we already check for byod=1 above, but this keeps the
@@ -295,12 +232,71 @@ class AssetsController extends Controller
         }
 
 
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $assets->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $assets->TextSearch($request->input('search'));
+        // Leave these under the TextSearch scope, else the fuzziness will override the specific ID (status ID, etc) requested
+        if ($request->filled('status_id')) {
+            $assets->where('assets.status_id', '=', $request->input('status_id'));
         }
 
+        if ($request->filled('asset_tag')) {
+            $assets->where('assets.asset_tag', '=', $request->input('asset_tag'));
+        }
+
+        if ($request->filled('serial')) {
+            $assets->where('assets.serial', '=', $request->input('serial'));
+        }
+
+        if ($request->input('requestable') == 'true') {
+            $assets->where('assets.requestable', '=', '1');
+        }
+
+        if ($request->filled('model_id')) {
+            $assets->InModelList([$request->input('model_id')]);
+        }
+
+        if ($request->filled('category_id')) {
+            $assets->InCategory($request->input('category_id'));
+        }
+
+        if ($request->filled('location_id')) {
+            $assets->where('assets.location_id', '=', $request->input('location_id'));
+        }
+
+        if ($request->filled('rtd_location_id')) {
+            $assets->where('assets.rtd_location_id', '=', $request->input('rtd_location_id'));
+        }
+
+        if ($request->filled('supplier_id')) {
+            $assets->where('assets.supplier_id', '=', $request->input('supplier_id'));
+        }
+
+        if ($request->filled('asset_eol_date')) {
+            $assets->where('assets.asset_eol_date', '=', $request->input('asset_eol_date'));
+        }
+
+        if (($request->filled('assigned_to')) && ($request->filled('assigned_type'))) {
+            $assets->where('assets.assigned_to', '=', $request->input('assigned_to'))
+                ->where('assets.assigned_type', '=', $request->input('assigned_type'));
+        }
+
+        if ($request->filled('company_id')) {
+            $assets->where('assets.company_id', '=', $request->input('company_id'));
+        }
+
+        if ($request->filled('manufacturer_id')) {
+            $assets->ByManufacturer($request->input('manufacturer_id'));
+        }
+
+        if ($request->filled('depreciation_id')) {
+            $assets->ByDepreciationId($request->input('depreciation_id'));
+        }
+
+        if ($request->filled('byod')) {
+            $assets->where('assets.byod', '=', $request->input('byod'));
+        }
+
+        if ($request->filled('order_number')) {
+            $assets->where('assets.order_number', '=', $request->get('order_number'));
+        }
 
         // This is kinda gross, but we need to do this because the Bootstrap Tables
         // API passes custom field ordering as custom_fields.fieldname, and we have to strip
@@ -311,7 +307,8 @@ class AssetsController extends Controller
         // in the allowed_columns array)
         $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);
@@ -348,6 +345,10 @@ class AssetsController extends Controller
         }
 
 
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
+
         $total = $assets->count();
         $assets = $assets->skip($offset)->take($limit)->get();
         
@@ -460,7 +461,7 @@ class AssetsController extends Controller
     {
         $this->authorize('view', Asset::class);
         $this->authorize('view', License::class);
-        $asset = Asset::where('id', $id)->withTrashed()->first();
+        $asset = Asset::where('id', $id)->withTrashed()->firstorfail();
         $licenses = $asset->licenses()->get();
 
         return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
@@ -478,7 +479,7 @@ class AssetsController extends Controller
     public function selectlist(Request $request)
     {
 
-        $assets = Company::scopeCompanyables(Asset::select([
+        $assets = Asset::select([
             'assets.id',
             'assets.name',
             'assets.asset_tag',
@@ -486,7 +487,7 @@ class AssetsController extends Controller
             'assets.assigned_to',
             'assets.assigned_type',
             'assets.status_id',
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(), 'company_id', 'assets');
+            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived();
 
         if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
             $assets = $assets->RTD();
@@ -544,14 +545,16 @@ class AssetsController extends Controller
         $asset->model_id                = $request->get('model_id');
         $asset->order_number            = $request->get('order_number');
         $asset->notes                   = $request->get('notes');
-        $asset->asset_tag               = $request->get('asset_tag', Asset::autoincrement_asset());
+        $asset->asset_tag               = $request->get('asset_tag', Asset::autoincrement_asset()); //yup, problem :/
+        // NO IT IS NOT!!! This is never firing; we SHOW the asset_tag you're going to get, so it *will* be filled in!
         $asset->user_id                 = Auth::id();
         $asset->archived                = '0';
         $asset->physical                = '1';
         $asset->depreciate              = '0';
         $asset->status_id               = $request->get('status_id', 0);
         $asset->warranty_months         = $request->get('warranty_months', null);
-        $asset->purchase_cost           = Helper::ParseCurrency($request->get('purchase_cost')); // this is the API's store method, so I don't know that I want to do this? Confusing. FIXME (or not?!)
+        $asset->purchase_cost           = $request->get('purchase_cost');
+        $asset->asset_eol_date          = $request->get('asset_eol_date', $asset->present()->eol_date());
         $asset->purchase_date           = $request->get('purchase_date', null);
         $asset->assigned_to             = $request->get('assigned_to', null);
         $asset->supplier_id             = $request->get('supplier_id');
@@ -559,6 +562,7 @@ class AssetsController extends Controller
         $asset->rtd_location_id         = $request->get('rtd_location_id', null);
         $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.
@@ -572,6 +576,7 @@ class AssetsController extends Controller
         // 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 (($model) && ($model->fieldset)) {
             foreach ($model->fieldset->fields as $field) {
 
@@ -829,7 +834,6 @@ class AssetsController extends Controller
 
         } elseif (request('checkout_to_type') == 'asset') {
             $target = Asset::where('id', '!=', $asset_id)->find(request('assigned_asset'));
-            $asset->location_id = $target->rtd_location_id;
             // 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');
@@ -857,7 +861,8 @@ class AssetsController extends Controller
         $checkout_at = request('checkout_at', date('Y-m-d H:i:s'));
         $expected_checkin = request('expected_checkin', null);
         $note = request('note', null);
-        $asset_name = request('name', null);
+        // Using `->has` preserves the asset name if the name parameter was not included in request.
+        $asset_name = request()->has('name') ? request('name') : $asset->name;
 
         // Set the location ID to the RTD location id if there is one
         // Wait, why are we doing this? This overrides the stuff we set further up, which makes no sense.
@@ -937,18 +942,21 @@ class AssetsController extends Controller
      * @since [v6.0]
      * @return JsonResponse
      */
-    public function checkinByTag(Request $request)
+    public function checkinByTag(Request $request, $tag = null)
     {
         $this->authorize('checkin', Asset::class);
-        $asset = Asset::where('asset_tag', $request->input('asset_tag'))->first();
+        if(null == $tag && null !== ($request->input('asset_tag'))) {
+            $tag = $request->input('asset_tag');
+        }
+        $asset = Asset::where('asset_tag', $tag)->first();
 
         if ($asset) {
             return $this->checkin($request, $asset->id);
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', [
-            'asset'=> e($request->input('asset_tag'))
-        ], 'Asset with tag '.e($request->input('asset_tag')).' not found'));
+            'asset'=> e($tag)
+        ], 'Asset with tag '.e($tag).' not found'));
     }
 
 
@@ -1025,9 +1033,10 @@ class AssetsController extends Controller
     {
         $this->authorize('viewRequestable', Asset::class);
 
-        $assets = Company::scopeCompanyables(Asset::select('assets.*'), 'company_id', 'assets')
+        $assets = Asset::select('assets.*')
             ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')->requestableAssets();
+                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')
+            ->requestableAssets();
 
         $offset = request('offset', 0);
         $limit = $request->input('limit', 50);
diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php
index c518813405..2781fa101f 100644
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -24,10 +24,48 @@ class CategoriesController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Category::class);
-        $allowed_columns = ['id', 'name', 'category_type', 'category_type', 'use_default_eula', 'eula_text', 'require_acceptance', 'checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count', 'licenses_count', 'image'];
+        $allowed_columns = [
+            'id',
+            'name',
+            'category_type',
+            'category_type',
+            'use_default_eula',
+            'eula_text',
+            'require_acceptance',
+            'checkin_email',
+            'assets_count',
+            'accessories_count',
+            'consumables_count',
+            'components_count',
+            'licenses_count',
+            'image',
+        ];
 
-        $categories = Category::select(['id', 'created_at', 'updated_at', 'name', 'category_type', 'use_default_eula', 'eula_text', 'require_acceptance', 'checkin_email', 'image'])
-            ->withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
+        $categories = Category::select([
+            'id',
+            'created_at',
+            'updated_at',
+            'name', 'category_type',
+            'use_default_eula',
+            'eula_text',
+            'require_acceptance',
+            'checkin_email',
+            'image'
+            ])->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
+
+
+        /*
+         * This checks to see if we should override the Admin Setting to show archived assets in list.
+         * We don't currently use it within the Snipe-IT GUI, but will be useful for API integrations where they
+         * may actually need to fetch assets that are archived.
+         *
+         * @see \App\Models\Category::showableAssets()
+         */
+        if ($request->input('archived')=='true') {
+            $categories = $categories->withCount('assets as assets_count');
+        } else {
+            $categories = $categories->withCount('showableAssets as assets_count');
+        }
 
         if ($request->filled('search')) {
             $categories = $categories->TextSearch($request->input('search'));
@@ -53,14 +91,9 @@ class CategoriesController extends Controller
             $categories->where('checkin_email', '=', $request->input('checkin_email'));
         }
 
-
-
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($categories) && ($request->get('offset') > $categories->count())) ? $categories->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $categories->count()) ? $categories->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') : 'assets_count';
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index 11f5845674..72297440dd 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -27,6 +27,8 @@ class CompaniesController extends Controller
         $allowed_columns = [
             'id',
             'name',
+            'phone',
+            'fax',
             'created_at',
             'updated_at',
             'users_count',
@@ -48,12 +50,10 @@ class CompaniesController extends Controller
         }
 
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($companies) && ($request->get('offset') > $companies->count())) ? $companies->count() : $request->get('offset', 0);
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $companies->count()) ? $companies->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
 
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index 473fbf1482..8b51344424 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -12,6 +12,7 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Events\CheckoutableCheckedIn;
 use App\Events\ComponentCheckedIn;
 use App\Models\Asset;
+use Illuminate\Support\Facades\Validator;
 
 class ComponentsController extends Controller
 {
@@ -43,9 +44,8 @@ class ComponentsController extends Controller
                 'notes',
             ];
 
-
-        $components = Company::scopeCompanyables(Component::select('components.*')
-            ->with('company', 'location', 'category', 'assets'));
+        $components = Component::select('components.*')
+            ->with('company', 'location', 'category', 'assets', 'supplier');
 
         if ($request->filled('search')) {
             $components = $components->TextSearch($request->input('search'));
@@ -63,6 +63,10 @@ class ComponentsController extends Controller
             $components->where('category_id', '=', $request->input('category_id'));
         }
 
+        if ($request->filled('supplier_id')) {
+            $components->where('supplier_id', '=', $request->input('supplier_id'));
+        }
+
         if ($request->filled('location_id')) {
             $components->where('location_id', '=', $request->input('location_id'));
         }
@@ -71,14 +75,10 @@ class ComponentsController extends Controller
             $components->where('notes','=',$request->input('notes'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $components->count()) ? $components->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
 
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
-        
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort_override =  $request->input('sort');
         $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
@@ -93,6 +93,9 @@ class ComponentsController extends Controller
             case 'company':
                 $components = $components->OrderCompany($order);
                 break;
+            case 'supplier':
+                $components = $components->OrderSupplier($order);
+                break;
             default:
                 $components = $components->orderBy($column_sort, $order);
                 break;
@@ -225,20 +228,30 @@ class ComponentsController extends Controller
     public function checkout(Request $request, $componentId)
     {
         // Check if the component exists
-        if (is_null($component = Component::find($componentId))) {
+        if (!$component = Component::find($componentId)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.does_not_exist')));
         }
 
         $this->authorize('checkout', $component);
 
+        $validator = Validator::make($request->all(), [
+            'asset_id'          => 'required|exists:assets,id',
+            'assigned_qty'      => "required|numeric|min:1|digits_between:1,".$component->numRemaining(),
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json(Helper::formatStandardApiResponse('error', $validator->errors()));
+
+        }
+
+        // Make sure there is at least one available to checkout
+        if ($component->numRemaining() <= $request->get('assigned_qty')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->get('assigned_qty')])));
+        }
 
         if ($component->numRemaining() >= $request->get('assigned_qty')) {
 
-            if (!$asset = Asset::find($request->input('assigned_to'))) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')));
-            }
-
-            // Update the accessory data
+            $asset = Asset::find($request->input('assigned_to'));
             $component->assigned_to = $request->input('assigned_to');
 
             $component->assets()->attach($component->id, [
@@ -255,7 +268,7 @@ class ComponentsController extends Controller
             return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/components/message.checkout.success')));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Not enough components remaining: '.$component->numRemaining().' remaining, '.$request->get('assigned_qty').' requested.'));
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->get('assigned_qty')])));
     }
 
     /**
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index fc6620df48..ba7e6fb302 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -45,11 +45,8 @@ class ConsumablesController extends Controller
                 'notes',
                 ];
 
-
-        $consumables = Company::scopeCompanyables(
-            Consumable::select('consumables.*')
-                ->with('company', 'location', 'category', 'users', 'manufacturer')
-        );
+        $consumables = Consumable::select('consumables.*')
+            ->with('company', 'location', 'category', 'users', 'manufacturer');
 
         if ($request->filled('search')) {
             $consumables = $consumables->TextSearch(e($request->input('search')));
@@ -75,6 +72,10 @@ class ConsumablesController extends Controller
             $consumables->where('manufacturer_id', '=', $request->input('manufacturer_id'));
         }
 
+        if ($request->filled('supplier_id')) {
+            $consumables->where('supplier_id', '=', $request->input('supplier_id'));
+        }
+
         if ($request->filled('location_id')) {
             $consumables->where('location_id','=',$request->input('location_id'));
         }
@@ -84,12 +85,9 @@ class ConsumablesController extends Controller
         }
 
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($consumables) && ($request->get('offset') > $consumables->count())) ? $consumables->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : abs($request->input('offset'));
+        $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';
@@ -111,6 +109,9 @@ class ConsumablesController extends Controller
             case 'company':
                 $consumables = $consumables->OrderCompany($order);
                 break;
+            case 'supplier':
+                $components = $consumables->OrderSupplier($order);
+                break;
             default:
                 $consumables = $consumables->orderBy($column_sort, $order);
                 break;
@@ -154,7 +155,7 @@ class ConsumablesController extends Controller
     public function show($id)
     {
         $this->authorize('view', Consumable::class);
-        $consumable = Consumable::findOrFail($id);
+        $consumable = Consumable::with('users')->findOrFail($id);
 
         return (new ConsumablesTransformer)->transformConsumable($consumable);
     }
@@ -253,33 +254,39 @@ class ConsumablesController extends Controller
     public function checkout(Request $request, $id)
     {
         // Check if the consumable exists
-        if (is_null($consumable = Consumable::find($id))) {
+        if (!$consumable = Consumable::with('users')->find($id)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.does_not_exist')));
         }
 
         $this->authorize('checkout', $consumable);
 
-        if ($consumable->qty > 0) {
+        // 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')));
+            \Log::debug('No enough remaining');
+        }
 
-            // Check if the user exists
-            $assigned_to = $request->input('assigned_to');
-            if (is_null($user = User::find($assigned_to))) {
-                // Return error message
-                return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
-            }
+        // 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 = e($assigned_to);
+        // Update the consumable data
+        $consumable->assigned_to = $request->input('assigned_to');
 
-            $consumable->users()->attach($consumable->id, [
-                'consumable_id' => $consumable->id,
-                'user_id' => $user->id,
-                'assigned_to' => $assigned_to,
-                'note' => $request->input('note'),
-            ]);
+        $consumable->users()->attach($consumable->id,
+                [
+                    'consumable_id' => $consumable->id,
+                    'user_id' => $user->id,
+                    'assigned_to' => $request->input('assigned_to'),
+                    'note' => $request->input('note'),
+                ]
+            );
 
             // Log checkout event
-            $logaction = $consumable->logCheckout(e($request->input('note')), $user);
+            $logaction = $consumable->logCheckout($request->input('note'), $user);
             $data['log_id'] = $logaction->id;
             $data['eula'] = $consumable->getEula();
             $data['first_name'] = $user->first_name;
@@ -289,9 +296,7 @@ class ConsumablesController extends Controller
             $data['require_acceptance'] = $consumable->requireAcceptance();
 
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));
-        }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'No consumables remaining'));
     }
 
     /**
diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php
index 18da1b67c2..df0fc940cf 100644
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\CustomFieldsetsTransformer;
 use App\Http\Transformers\CustomFieldsTransformer;
 use App\Models\CustomFieldset;
+use App\Models\CustomField;
 use Illuminate\Http\Request;
 use Redirect;
 use View;
@@ -33,7 +34,7 @@ class CustomFieldsetsController extends Controller
      */
     public function index()
     {
-        $this->authorize('index', CustomFieldset::class);
+        $this->authorize('index', CustomField::class);
         $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();
 
         return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
@@ -49,7 +50,7 @@ class CustomFieldsetsController extends Controller
      */
     public function show($id)
     {
-        $this->authorize('view', CustomFieldset::class);
+        $this->authorize('view', CustomField::class);
         if ($fieldset = CustomFieldset::find($id)) {
             return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset);
         }
@@ -68,7 +69,7 @@ class CustomFieldsetsController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $this->authorize('update', CustomFieldset::class);
+        $this->authorize('update', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
         $fieldset->fill($request->all());
 
@@ -89,11 +90,23 @@ class CustomFieldsetsController extends Controller
      */
     public function store(Request $request)
     {
-        $this->authorize('create', CustomFieldset::class);
+        $this->authorize('create', CustomField::class);
         $fieldset = new CustomFieldset;
         $fieldset->fill($request->all());
 
         if ($fieldset->save()) {
+            // Sync fieldset with auto_add_to_fieldsets
+            $fields = CustomField::select('id')->where('auto_add_to_fieldsets', '=', '1')->get();
+
+            if ($fields->count() > 0) {
+
+                foreach ($fields as $field) {
+                    $field_ids[] = $field->id;
+                }
+
+                $fieldset->fields()->sync($field_ids);
+            }
+
             return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.create.success')));
         }
 
@@ -109,7 +122,7 @@ class CustomFieldsetsController extends Controller
      */
     public function destroy($id)
     {
-        $this->authorize('delete', CustomFieldset::class);
+        $this->authorize('delete', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
 
         $modelsCount = $fieldset->models->count();
@@ -136,7 +149,7 @@ class CustomFieldsetsController extends Controller
      */
     public function fields($id)
     {
-        $this->authorize('view', CustomFieldset::class);
+        $this->authorize('view', CustomField::class);
         $set = CustomFieldset::findOrFail($id);
         $fields = $set->fields;
 
@@ -153,7 +166,7 @@ class CustomFieldsetsController extends Controller
      */
     public function fieldsWithDefaultValues($fieldsetId, $modelId)
     {
-        $this->authorize('view', CustomFieldset::class);
+        $this->authorize('view', CustomField::class);
 
         $set = CustomFieldset::findOrFail($fieldsetId);
 
diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php
index 09e3677360..ef988af597 100644
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -30,6 +30,8 @@ class DepartmentsController extends Controller
         $departments = Company::scopeCompanyables(Department::select(
             'departments.id',
             'departments.name',
+            'departments.phone',
+            'departments.fax',
             'departments.location_id',
             'departments.company_id',
             'departments.manager_id',
@@ -58,12 +60,9 @@ class DepartmentsController extends Controller
             $departments->where('location_id', '=', $request->input('location_id'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($departments) && ($request->get('offset') > $departments->count())) ? $departments->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $departments->count()) ? $departments->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';
diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php
index 2dd6b9d8e5..3d86c1b096 100644
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -28,12 +28,9 @@ class DepreciationsController extends Controller
             $depreciations = $depreciations->TextSearch($request->input('search'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($depreciations) && ($request->get('offset') > $depreciations->count())) ? $depreciations->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->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';
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index 2c37760629..7cc5d2d756 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -8,6 +8,7 @@ use App\Http\Transformers\GroupsTransformer;
 use App\Models\Group;
 use Illuminate\Http\Request;
 
+
 class GroupsController extends Controller
 {
     /**
@@ -19,6 +20,8 @@ class GroupsController extends Controller
      */
     public function index(Request $request)
     {
+        $this->authorize('superadmin');
+
         $this->authorize('view', Group::class);
         $allowed_columns = ['id', 'name', 'created_at', 'users_count'];
 
@@ -32,12 +35,9 @@ class GroupsController extends Controller
             $groups->where('name', '=', $request->input('name'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($groups) && ($request->get('offset') > $groups->count())) ? $groups->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $groups->count()) ? $groups->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';
@@ -59,9 +59,11 @@ class GroupsController extends Controller
      */
     public function store(Request $request)
     {
-        $this->authorize('create', Group::class);
+        $this->authorize('superadmin');
         $group = new Group;
-        $group->fill($request->all());
+
+        $group->name = $request->input('name');
+        $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
 
         if ($group->save()) {
             return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.create.success')));
@@ -80,7 +82,7 @@ class GroupsController extends Controller
      */
     public function show($id)
     {
-        $this->authorize('view', Group::class);
+        $this->authorize('superadmin');
         $group = Group::findOrFail($id);
 
         return (new GroupsTransformer)->transformGroup($group);
@@ -97,9 +99,11 @@ class GroupsController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $this->authorize('update', Group::class);
+        $this->authorize('superadmin');
         $group = Group::findOrFail($id);
-        $group->fill($request->all());
+
+        $group->name = $request->input('name');
+        $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
 
         if ($group->save()) {
             return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.update.success')));
@@ -118,9 +122,8 @@ class GroupsController extends Controller
      */
     public function destroy($id)
     {
-        $this->authorize('delete', Group::class);
+        $this->authorize('superadmin');
         $group = Group::findOrFail($id);
-        $this->authorize('delete', $group);
         $group->delete();
 
         return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/groups/message.delete.success')));
diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php
index 9742cc1644..2d7e2f7d78 100644
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -10,6 +10,7 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
 use Artisan;
+use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
@@ -35,7 +36,7 @@ class ImportController extends Controller
      * Process and store a CSV upload file.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store()
     {
@@ -56,7 +57,7 @@ class ImportController extends Controller
                     'text/tsv', ])) {
                     $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();
 
-                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500);
+                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);
                 }
 
                 //TODO: is there a lighter way to do this?
@@ -64,7 +65,19 @@ class ImportController extends Controller
                     ini_set('auto_detect_line_endings', '1');
                 }
                 $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
-                $import->header_row = $reader->fetchOne(0);
+
+                try {
+                    $import->header_row = $reader->fetchOne(0);
+                } catch (JsonEncodingException $e) {
+                    return response()->json(
+                        Helper::formatStandardApiResponse(
+                            'error',
+                            null,
+                            trans('admin/hardware/message.import.header_row_has_malformed_characters')
+                        ),
+                        422
+                    );
+                }
 
                 //duplicate headers check
                 $duplicate_headers = [];
@@ -82,11 +95,22 @@ class ImportController extends Controller
                     }
                 }
                 if (count($duplicate_headers) > 0) {
-                    return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 500); //should this be '4xx'?
+                    return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)),422);
                 }
 
-                // Grab the first row to display via ajax as the user picks fields
-                $import->first_row = $reader->fetchOne(1);
+                try {
+                    // Grab the first row to display via ajax as the user picks fields
+                    $import->first_row = $reader->fetchOne(1);
+                } catch (JsonEncodingException $e) {
+                    return response()->json(
+                        Helper::formatStandardApiResponse(
+                            'error',
+                            null,
+                            trans('admin/hardware/message.import.content_row_has_malformed_characters')
+                        ),
+                        422
+                    );
+                }
 
                 $date = date('Y-m-d-his');
                 $fixed_filename = str_slug($file->getClientOriginalName());
@@ -102,18 +126,25 @@ class ImportController extends Controller
                 }
                 $file_name = date('Y-m-d-his').'-'.$fixed_filename;
                 $import->file_path = $file_name;
+                $import->filesize = null;
+
+                if (!file_exists($path.'/'.$file_name)) {
+                    return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 500);
+                }
+
                 $import->filesize = filesize($path.'/'.$file_name);
+                
                 $import->save();
                 $results[] = $import;
             }
             $results = (new ImportsTransformer)->transformImports($results);
 
-            return [
+            return response()->json([
                 'files' => $results,
-            ];
+            ]);
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500);
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 422);
     }
 
     /**
@@ -129,7 +160,7 @@ class ImportController extends Controller
         // Run a backup immediately before processing
         if ($request->get('run-backup')) {
             \Log::debug('Backup manually requested via importer');
-            Artisan::call('backup:run');
+            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H:i:s')]);
         } else {
             \Log::debug('NO BACKUP requested via importer');
         }
@@ -162,6 +193,9 @@ class ImportController extends Controller
             case 'user':
                 $redirectTo = 'users.index';
                 break;
+            case 'location':
+                $redirectTo = 'locations.index';
+                break;
         }
 
         if ($errors) { //Failure
diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php
index 759f11e956..a091741e85 100644
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -39,8 +39,15 @@ class LicenseSeatsController extends Controller
             }
 
             $total = $seats->count();
-            $offset = (($seats) && (request('offset') >= $total)) ? 0 : request('offset', 0);
-            $limit = request('limit', 50);
+
+            // Make sure the offset and limit are actually integers and do not exceed system limits
+            $offset = ($request->input('offset') > $seats->count()) ? $seats->count() : abs($request->input('offset'));
+
+            if ($offset >= $total ){
+                $offset = 0;
+            }
+
+            $limit = app('api_limit_value');
 
             $seats = $seats->skip($offset)->take($limit)->get();
 
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index 6e67f07ee9..e021fc3d3e 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -26,8 +26,8 @@ class LicensesController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', License::class);
-        $licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'supplier','category')->withCount('freeSeats as free_seats_count'));
 
+        $licenses = License::with('company', 'manufacturer', 'supplier','category')->withCount('freeSeats as free_seats_count');
 
         if ($request->filled('company_id')) {
             $licenses->where('company_id', '=', $request->input('company_id'));
@@ -94,12 +94,9 @@ class LicensesController extends Controller
             $licenses->onlyTrashed();
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($licenses) && ($request->get('offset') > $licenses->count())) ? $licenses->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index 3a8df10587..87bc266217 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -37,6 +37,8 @@ class LocationsController extends Controller
             'locations.city',
             'locations.state',
             'locations.zip',
+            'locations.phone',
+            'locations.fax',
             'locations.country',
             'locations.parent_id',
             'locations.manager_id',
@@ -78,14 +80,15 @@ class LocationsController extends Controller
             $locations->where('locations.country', '=', $request->input('country'));
         }
 
-        $offset = (($locations) && (request('offset') > $locations->count())) ? $locations->count() : request('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $locations->count()) ? $locations->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';
 
+
+
         switch ($request->input('sort')) {
             case 'parent':
                 $locations->OrderParent($order);
@@ -250,8 +253,12 @@ class LocationsController extends Controller
      */
     public function selectlist(Request $request)
     {
-
-        $this->authorize('view.selectlists');
+        // 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.
+        // Otherwise, we do our normal check that they can view select lists.
+        $request->headers->get('referer') === route('profile')
+            ? $this->authorize('self.edit_location')
+            : $this->authorize('view.selectlists');
 
         $locations = Location::select([
             'locations.id',
diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php
index e88ef5fedf..9ff0a0c202 100644
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -23,10 +23,10 @@ class ManufacturersController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Manufacturer::class);
-        $allowed_columns = ['id', 'name', 'url', 'support_url', 'support_email', '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'];
 
         $manufacturers = Manufacturer::select(
-            ['id', 'name', 'url', 'support_url', 'support_email', 'support_phone', 'created_at', 'updated_at', 'image', 'deleted_at']
+            ['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');
 
         if ($request->input('deleted') == 'true') {
@@ -49,6 +49,10 @@ class ManufacturersController extends Controller
             $manufacturers->where('support_url', '=', $request->input('support_url'));
         }
 
+        if ($request->filled('warranty_lookup_url')) {
+            $manufacturers->where('warranty_lookup_url', '=', $request->input('warranty_lookup_url'));
+        }
+
         if ($request->filled('support_phone')) {
             $manufacturers->where('support_phone', '=', $request->input('support_phone'));
         }
@@ -57,12 +61,9 @@ class ManufacturersController extends Controller
             $manufacturers->where('support_email', '=', $request->input('support_email'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($manufacturers) && ($request->get('offset') > $manufacturers->count())) ? $manufacturers->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->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';
diff --git a/app/Http/Controllers/Api/PredefinedKitsController.php b/app/Http/Controllers/Api/PredefinedKitsController.php
index a2c0c1a902..85d05c422e 100644
--- a/app/Http/Controllers/Api/PredefinedKitsController.php
+++ b/app/Http/Controllers/Api/PredefinedKitsController.php
@@ -29,8 +29,10 @@ class PredefinedKitsController extends Controller
             $kits = $kits->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
-        $limit = $request->input('limit', 50);
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $kits->count()) ? $kits->count() : abs($request->input('offset'));
+        $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);
diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php
index 691efda981..4f5e3b1bdf 100644
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use DB;
 
 class ProfileController extends Controller
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index 7ac704e2f2..21294c5779 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -54,11 +54,15 @@ class ReportsController extends Controller
             'note',
         ];
 
+
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $actionlogs->count()) ? $actionlogs->count() : abs($request->input('offset'));
+        $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';
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
         $total = $actionlogs->count();
+
         $actionlogs = $actionlogs->orderBy($sort, $order)->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 62380b2212..a0438ef078 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -143,47 +143,6 @@ class SettingsController extends Controller
 
     }
 
-    public function slacktest(SlackSettingsRequest $request)
-    {
-
-        $validator = Validator::make($request->all(), [
-            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
-            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json(['message' => 'Validation failed', 'errors' => $validator->errors()], 422);
-        }
-
-        // If validation passes, continue to the curl request
-            $slack = new Client([
-                'base_url' => e($request->input('slack_endpoint')),
-                'defaults' => [
-                    'exceptions' => false,
-                ],
-            ]);
-
-            $payload = json_encode(
-                [
-                    'channel'    => e($request->input('slack_channel')),
-                    'text'       => trans('general.slack_test_msg'),
-                    'username'    => e($request->input('slack_botname')),
-                    'icon_emoji' => ':heart:',
-                ]);
-
-            try {
-                $slack->post($request->input('slack_endpoint'), ['body' => $payload]);
-                return response()->json(['message' => 'Success'], 200);
-
-            } catch (\Exception $e) {
-                return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.e($request->input('slack_endpoint')).'). Slack responded with: '.$e->getMessage()], 400);
-            }
-
-        //} 
-        return response()->json(['message' => 'Something went wrong :( '], 400);
-    }
-
-
     /**
      * Test the email configuration
      *
@@ -312,7 +271,7 @@ class SettingsController extends Controller
             $headers = ['ContentType' => 'application/zip'];
             return Storage::download($path.'/'.$file, $file, $headers);
         } else {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'File not found'));
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('general.file_not_found')));
         }
 
     }
diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index c4058f79ca..30a0b699e9 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\AssetsTransformer;
+use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\StatuslabelsTransformer;
 use App\Models\Asset;
 use App\Models\Statuslabel;
@@ -50,12 +51,9 @@ class StatuslabelsController extends Controller
             }
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($statuslabels) && ($request->get('offset') > $statuslabels->count())) ? $statuslabels->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $statuslabels->count()) ? $statuslabels->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';
@@ -196,6 +194,7 @@ class StatuslabelsController extends Controller
     {
         $this->authorize('view', Statuslabel::class);
         $statuslabels = Statuslabel::withCount('assets')->get();
+        $total = Array();
 
         foreach ($statuslabels as $statuslabel) {
 
@@ -293,4 +292,45 @@ class StatuslabelsController extends Controller
 
         return '0';
     }
+
+    /**
+     * Gets a paginated collection for the select2 menus
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @see \App\Http\Transformers\SelectlistTransformer
+     */
+    public function selectlist(Request $request)
+    {
+
+        $this->authorize('view.selectlists');
+        $statuslabels = Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('deployable', 'desc');
+
+        if ($request->filled('search')) {
+            $statuslabels = $statuslabels->where('name', 'LIKE', '%'.$request->get('search').'%');
+        }
+
+        if ($request->filled('deployable')) {
+            $statuslabels = $statuslabels->where('deployable', '=', '1');
+        }
+
+        if ($request->filled('pending')) {
+            $statuslabels = $statuslabels->where('pending', '=', '1');
+        }
+
+        if ($request->filled('archived')) {
+            $statuslabels = $statuslabels->where('archived', '=', '1');
+        }
+
+        $statuslabels = $statuslabels->orderBy('name', 'ASC')->paginate(50);
+
+        // Loop through and set some custom properties for the transformer to use.
+        // This lets us have more flexibility in special cases like assets, where
+        // they may not have a ->name value but we want to display something anyway
+        foreach ($statuslabels as $statuslabel) {
+            $statuslabels->use_text = $statuslabel->name;
+        }
+
+        return (new SelectlistTransformer)->transformSelectlist($statuslabels);
+    }
 }
diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php
index f73f150499..a26c33b1f8 100644
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -23,11 +23,30 @@ class SuppliersController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Supplier::class);
-        $allowed_columns = ['id', 'name', 'address', 'phone', 'contact', 'fax', 'email', 'image', 'assets_count', 'licenses_count', 'accessories_count', 'url'];
+        $allowed_columns = ['
+            id',
+            'name',
+            'address',
+            'phone',
+            'contact',
+            'fax',
+            'email',
+            'image',
+            'assets_count',
+            'licenses_count',
+            'accessories_count',
+            'components_count',
+            'consumables_count',
+            'url',
+        ];
         
         $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes']
-            )->withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('accessories as accessories_count');
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes'])
+                    ->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');
 
 
         if ($request->filled('search')) {
@@ -74,12 +93,9 @@ class SuppliersController extends Controller
             $suppliers->where('notes', '=', $request->input('notes'));
         }
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($suppliers) && ($request->get('offset') > $suppliers->count())) ? $suppliers->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $suppliers->count()) ? $suppliers->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';
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index cca829c23f..7b22f3af4b 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -20,6 +20,7 @@ use Auth;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;
 
 class UsersController extends Controller
 {
@@ -69,18 +70,14 @@ class UsersController extends Controller
             'users.ldap_import',
             'users.start_date',
             'users.end_date',
+            'users.vip',
+            'users.autoassign_licenses',
 
         ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',)
             ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count');
         $users = Company::scopeCompanyables($users);
 
 
-        if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
-            $users = $users->onlyTrashed();
-        } elseif (($request->filled('all')) && ($request->input('all') == 'true')) {
-            $users = $users->withTrashed();
-        }
-
         if ($request->filled('activated')) {
             $users = $users->where('users.activated', '=', $request->input('activated'));
         }
@@ -149,6 +146,10 @@ class UsersController extends Controller
             $users = $users->where('remote', '=', $request->input('remote'));
         }
 
+        if ($request->filled('vip')) {
+            $users = $users->where('vip', '=', $request->input('vip'));
+        }
+
         if ($request->filled('two_factor_enrolled')) {
             $users = $users->where('two_factor_enrolled', '=', $request->input('two_factor_enrolled'));
         }
@@ -181,19 +182,19 @@ class UsersController extends Controller
             $users->has('accessories', '=', $request->input('accessories_count'));
         }
 
+        if ($request->filled('autoassign_licenses')) {
+            $users->where('autoassign_licenses', '=', $request->input('autoassign_licenses'));
+        }
+
         if ($request->filled('search')) {
             $users = $users->TextSearch($request->input('search'));
         }
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0);
 
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($users) && ($request->get('offset') > $users->count())) ? $users->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $users->count()) ? $users->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
 
 
         switch ($request->input('sort')) {
@@ -212,6 +213,14 @@ class UsersController extends Controller
             case 'company':
                 $users = $users->OrderCompany($order);
                 break;
+            case 'first_name':
+                $users->orderBy('first_name', $order);
+                $users->orderBy('last_name', $order);
+                break;
+            case 'last_name':
+                $users->orderBy('last_name', $order);
+                $users->orderBy('first_name', $order);
+                break;
             default:
                 $allowed_columns =
                     [
@@ -246,8 +255,10 @@ class UsersController extends Controller
                         'two_factor_optin',
                         'two_factor_enrolled',
                         'remote',
+                        'vip',
                         'start_date',
                         'end_date',
+                        'autoassign_licenses',
                     ];
 
                 $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';
@@ -255,6 +266,12 @@ class UsersController extends Controller
                 break;
         }
 
+        if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
+            $users = $users->onlyTrashed();
+        } elseif (($request->filled('all')) && ($request->input('all') == 'true')) {
+            $users = $users->withTrashed();
+        }
+        
         $total = $users->count();
         $users = $users->skip($offset)->take($limit)->get();
 
@@ -286,9 +303,11 @@ class UsersController extends Controller
         $users = Company::scopeCompanyables($users);
 
         if ($request->filled('search')) {
-            $users = $users->SimpleNameSearch($request->get('search'))
-                ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
-                ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
+            $users = $users->where(function ($query) use ($request) {
+                $query->SimpleNameSearch($request->get('search'))
+                    ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
+                    ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
+            });
         }
 
         $users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
@@ -343,7 +362,7 @@ class UsersController extends Controller
             $user->permissions = $permissions_array;
         }
 
-        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20);
+        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 40);
         $user->password = bcrypt($request->get('password', $tmp_pass));
 
         app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
@@ -449,6 +468,13 @@ class UsersController extends Controller
 
             // Check if the request has groups passed and has a value
             if ($request->filled('groups')) {
+                $validator = Validator::make($request->all(), [
+                    'groups.*' => 'integer|exists:permission_groups,id',
+                ]);
+                
+                if ($validator->fails()){
+                    return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
+                }
                 $user->groups()->sync($request->input('groups'));
             // The groups field has been passed but it is null, so we should blank it out
             } elseif ($request->has('groups')) {
@@ -542,9 +568,10 @@ class UsersController extends Controller
         if (empty($user->email)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.inventorynotification.error')));
         }
+
+        $user->notify((new CurrentInventory($user)));
  
-        return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success'));
- 
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')));
     }
 
     /**
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index 5f3221d051..dc6bc84347 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -101,7 +101,7 @@ class AssetMaintenancesController extends Controller
         $assetMaintenance = new AssetMaintenance();
         $assetMaintenance->supplier_id = $request->input('supplier_id');
         $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost = Helper::ParseCurrency($request->input('cost'));
+        $assetMaintenance->cost = $request->input('cost');
         $assetMaintenance->notes = $request->input('notes');
         $asset = Asset::find($request->input('asset_id'));
 
@@ -211,7 +211,7 @@ class AssetMaintenancesController extends Controller
 
         $assetMaintenance->supplier_id = $request->input('supplier_id');
         $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost =  Helper::ParseCurrency($request->input('cost'));
+        $assetMaintenance->cost =  $request->input('cost');
         $assetMaintenance->notes = $request->input('notes');
 
         $asset = Asset::find(request('asset_id'));
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 54d2310e8c..dbefb2e7b7 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -82,8 +82,8 @@ class AssetModelsController extends Controller
         $model->user_id = Auth::id();
         $model->requestable = Request::has('requestable');
 
-        if ($request->input('custom_fieldset') != '') {
-            $model->fieldset_id = e($request->input('custom_fieldset'));
+        if ($request->input('fieldset_id') != '') {
+            $model->fieldset_id = e($request->input('fieldset_id'));
         }
 
         $model = $request->handleImages($model);
@@ -160,10 +160,10 @@ class AssetModelsController extends Controller
 
         $this->removeCustomFieldsDefaultValues($model);
 
-        if ($request->input('custom_fieldset') == '') {
+        if ($request->input('fieldset_id') == '') {
             $model->fieldset_id = null;
         } else {
-            $model->fieldset_id = $request->input('custom_fieldset');
+            $model->fieldset_id = $request->input('fieldset_id');
 
             if ($this->shouldAddDefaultValues($request->input())) {
                 if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
@@ -444,7 +444,7 @@ class AssetModelsController extends Controller
     {
         return ! empty($input['add_default_values'])
             && ! empty($input['default_values'])
-            && ! empty($input['custom_fieldset']);
+            && ! empty($input['fieldset_id']);
     }
 
     /**
diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php
index 657b02171b..fd5cee30ea 100644
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -94,14 +94,18 @@ class AssetCheckinController extends Controller
             \Log::debug('Manually override the location IDs');
             \Log::debug('Original Location ID: '.$asset->location_id);
             $asset->location_id = '';
-            \Log::debug('New RTD Location ID: '.$asset->location_id);
+            \Log::debug('New Location ID: '.$asset->location_id);
         }
 
         $asset->location_id = $asset->rtd_location_id;
 
         if ($request->filled('location_id')) {
             \Log::debug('NEW Location ID: '.$request->get('location_id'));
-            $asset->location_id = e($request->get('location_id'));
+            $asset->location_id = $request->get('location_id');
+
+            if ($request->get('update_default_location') == 0){
+                $asset->rtd_location_id = $request->get('location_id');
+            }
         }
 
         $checkin_at = date('Y-m-d H:i:s');
diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index 38f7460986..e6326da6b1 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -27,7 +27,7 @@ class AssetCheckoutController extends Controller
     public function create($assetId)
     {
         // Check if the asset exists
-        if (is_null($asset = Asset::find(e($assetId)))) {
+        if (is_null($asset = Asset::with('company')->find(e($assetId)))) {
             return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
         }
 
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index dddaa51ba5..e699779a34 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -12,12 +12,13 @@ use App\Models\CheckoutRequest;
 use App\Models\Company;
 use App\Models\Location;
 use App\Models\Setting;
+use App\Models\Statuslabel;
 use App\Models\User;
 use App\View\Label;
 use Auth;
 use Carbon\Carbon;
 use DB;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
@@ -141,8 +142,9 @@ class AssetsController extends Controller
             $asset->depreciate              = '0';
             $asset->status_id               = request('status_id');
             $asset->warranty_months         = request('warranty_months', null);
-            $asset->purchase_cost           = Helper::ParseCurrency($request->get('purchase_cost'));
+            $asset->purchase_cost           = request('purchase_cost');
             $asset->purchase_date           = request('purchase_date', null);
+            $asset->asset_eol_date          = request('asset_eol_date', $asset->present()->eol_date());
             $asset->assigned_to             = request('assigned_to', null);
             $asset->supplier_id             = request('supplier_id', null);
             $asset->requestable             = request('requestable', 0);
@@ -312,7 +314,9 @@ class AssetsController extends Controller
 
         $asset->status_id = $request->input('status_id', null);
         $asset->warranty_months = $request->input('warranty_months', null);
-        $asset->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost', null));
+        $asset->purchase_cost = $request->input('purchase_cost', null);
+        $asset->asset_eol_date  = request('asset_eol_date', null);
+
         $asset->purchase_date = $request->input('purchase_date', null);
         $asset->supplier_id = $request->input('supplier_id', null);
         $asset->expected_checkin = $request->input('expected_checkin', null);
@@ -322,6 +326,12 @@ class AssetsController extends Controller
         $asset->rtd_location_id = $request->input('rtd_location_id', null);
         $asset->byod = $request->input('byod', 0);
 
+        $status = Statuslabel::find($asset->status_id);
+
+        if($status->archived){
+            $asset->assigned_to = null;
+        }
+
         if ($asset->assigned_to == '') {
             $asset->location_id = $request->input('rtd_location_id', null);
         }
@@ -628,7 +638,11 @@ class AssetsController extends Controller
         $csv->setHeaderOffset(0);
         $header = $csv->getHeader();
         $isCheckinHeaderExplicit = in_array('checkin date', (array_map('strtolower', $header)));
-        $results = $csv->getRecords();
+        try {
+            $results = $csv->getRecords();
+        } catch (\Exception $e) {
+            return back()->with('error', trans('general.error_in_import_file', ['error' => $e->getMessage()]));
+        } 
         $item = [];
         $status = [];
         $status['error'] = [];
@@ -764,7 +778,7 @@ class AssetsController extends Controller
     }
 
     /**
-     * Retore a deleted asset.
+     * Restore a deleted asset.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index b9a3a39cf5..8419098936 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -30,7 +30,7 @@ class BulkAssetsController extends Controller
      */
     public function edit(Request $request)
     {
-        $this->authorize('update', Asset::class);
+        $this->authorize('view', Asset::class);
 
         if (! $request->filled('ids')) {
             return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));
@@ -45,19 +45,33 @@ class BulkAssetsController extends Controller
         if ($request->filled('bulk_actions')) {
             switch ($request->input('bulk_actions')) {
                 case 'labels':
+                    $this->authorize('view', Asset::class);
                     return (new Label)
                         ->with('assets', Asset::find($asset_ids))
                         ->with('settings', Setting::getSettings())
                         ->with('bulkedit', true)
                         ->with('count', 0);
+
                 case 'delete':
+                    $this->authorize('delete', Asset::class);
                     $assets = Asset::with('assignedTo', 'location')->find($asset_ids);
                     $assets->each(function ($asset) {
                         $this->authorize('delete', $asset);
                     });
 
                     return view('hardware/bulk-delete')->with('assets', $assets);
+                   
+                case 'restore':
+                    $this->authorize('update', Asset::class);
+                    $assets = Asset::withTrashed()->find($asset_ids); 
+                    $assets->each(function ($asset) {
+                        $this->authorize('delete', $asset);
+                    });
+
+                    return view('hardware/bulk-restore')->with('assets', $assets);
+
                 case 'edit':
+                    $this->authorize('update', Asset::class);
                     return view('hardware/bulk')
                         ->with('assets', $asset_ids)
                         ->with('statuslabel_list', Helper::statusLabelList());
@@ -103,8 +117,11 @@ class BulkAssetsController extends Controller
             || ($request->filled('company_id'))
             || ($request->filled('status_id'))
             || ($request->filled('model_id'))
+            || ($request->filled('next_audit_date'))
             || ($request->filled('null_purchase_date'))
             || ($request->filled('null_expected_checkin_date'))
+            || ($request->filled('null_next_audit_date'))
+
         ) {
             foreach ($assets as $assetId) {
 
@@ -117,7 +134,8 @@ class BulkAssetsController extends Controller
                     ->conditionallyAddItem('requestable')
                     ->conditionallyAddItem('status_id')
                     ->conditionallyAddItem('supplier_id')
-                    ->conditionallyAddItem('warranty_months');
+                    ->conditionallyAddItem('warranty_months')
+                    ->conditionallyAddItem('next_audit_date');
 
                 if ($request->input('null_purchase_date')=='1') {
                     $this->update_array['purchase_date'] = null;
@@ -127,8 +145,12 @@ class BulkAssetsController extends Controller
                     $this->update_array['expected_checkin'] = null;
                 }
 
+                if ($request->input('null_next_audit_date')=='1') {
+                    $this->update_array['next_audit_date'] = null;
+                }
+
                 if ($request->filled('purchase_cost')) {
-                    $this->update_array['purchase_cost'] =  Helper::ParseCurrency($request->input('purchase_cost'));
+                    $this->update_array['purchase_cost'] =  $request->input('purchase_cost');
                 }
 
                 if ($request->filled('company_id')) {
@@ -289,7 +311,8 @@ class BulkAssetsController extends Controller
                 foreach ($asset_ids as $asset_id) {
                     $asset = Asset::findOrFail($asset_id);
                     $this->authorize('checkout', $asset);
-                    $error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), null);
+
+                    $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;
@@ -312,5 +335,19 @@ class BulkAssetsController extends Controller
         } catch (ModelNotFoundException $e) {
             return redirect()->route('hardware.bulkcheckout.show')->with('error', $e->getErrors());
         }
+        
+    }
+    public function restore(Request $request) {
+        $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'));
+        } else {
+            foreach ($assetIds as $key => $assetId) {
+                    $asset = Asset::withTrashed()->find($assetId);
+                    $asset->restore(); 
+            } 
+        return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
+        }
     }
 }
diff --git a/app/Http/Controllers/BulkAssetModelsController.php b/app/Http/Controllers/BulkAssetModelsController.php
index 43381da783..a312ba1f6e 100644
--- a/app/Http/Controllers/BulkAssetModelsController.php
+++ b/app/Http/Controllers/BulkAssetModelsController.php
@@ -92,7 +92,7 @@ class BulkAssetModelsController extends Controller
             AssetModel::whereIn('id', $models_raw_array)->update($update_array);
 
             return redirect()->route('models.index')
-                ->with('success', trans('admin/models/message.bulkedit.success'));
+                ->with('success', trans_choice('admin/models/message.bulkedit.success', count($models_raw_array), ['model_count' => count($models_raw_array)]));
         }
 
         return redirect()->route('models.index')
diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php
index 396ec5ef68..b02e3194f9 100644
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -60,6 +60,8 @@ final class CompaniesController extends Controller
 
         $company = new Company;
         $company->name = $request->input('name');
+        $company->phone = $request->input('phone');
+        $company->fax = $request->input('fax');
 
         $company = $request->handleImages($company);
 
@@ -111,6 +113,8 @@ final class CompaniesController extends Controller
         $this->authorize('update', $company);
 
         $company->name = $request->input('name');
+        $company->phone = $request->input('phone');
+        $company->fax = $request->input('fax');
 
         $company = $request->handleImages($company);
 
diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.php
index b2be07c661..412d9dde62 100644
--- a/app/Http/Controllers/Components/ComponentCheckoutController.php
+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -33,6 +33,11 @@ class ComponentCheckoutController extends Controller
         }
         $this->authorize('checkout', $component);
 
+        // Make sure there is at least one available to checkout
+        if ($component->numRemaining() <= 0){
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.checkout.unavailable'));
+        }
+
         return view('components/checkout', compact('component'));
     }
 
@@ -50,7 +55,7 @@ class ComponentCheckoutController extends Controller
     public function store(Request $request, $componentId)
     {
         // Check if the component exists
-        if (is_null($component = Component::find($componentId))) {
+        if (!$component = Component::find($componentId)) {
             // Redirect to the component management page with error
             return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
         }
@@ -58,9 +63,15 @@ class ComponentCheckoutController extends Controller
         $this->authorize('checkout', $component);
 
         $max_to_checkout = $component->numRemaining();
+
+        // Make sure there are at least the requested number of components available to checkout
+        if ($max_to_checkout < $request->get('assigned_qty')) {
+            return redirect()->back()->withInput()->with('error', trans('admin/components/message.checkout.unavailable', ['remaining' => $max_to_checkout, 'requested' => $request->get('assigned_qty')]));
+        }
+
         $validator = Validator::make($request->all(), [
-            'asset_id'          => 'required',
-            'assigned_qty'      => "required|numeric|between:1,$max_to_checkout",
+            'asset_id'          => 'required|exists:assets,id',
+            'assigned_qty'      => "required|numeric|min:1|digits_between:1,$max_to_checkout",
         ]);
 
         if ($validator->fails()) {
@@ -69,24 +80,17 @@ class ComponentCheckoutController extends Controller
                 ->withInput();
         }
 
-        $admin_user = Auth::user();
-        $asset_id = e($request->input('asset_id'));
-
         // Check if the user exists
-        if (is_null($asset = Asset::find($asset_id))) {
-            // Redirect to the component management page with error
-            return redirect()->route('components.index')->with('error', trans('admin/components/message.asset_does_not_exist'));
-        }
+        $asset = Asset::find($request->input('asset_id'));
 
         // Update the component data
-        $component->asset_id = $asset_id;
-
+        $component->asset_id = $request->input('asset_id');
         $component->assets()->attach($component->id, [
             'component_id' => $component->id,
-            'user_id' => $admin_user->id,
+            'user_id' => Auth::user(),
             'created_at' => date('Y-m-d H:i:s'),
             'assigned_qty' => $request->input('assigned_qty'),
-            'asset_id' => $asset_id,
+            'asset_id' => $request->input('asset_id'),
             'note' => $request->input('note'),
         ]);
 
diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php
index f943a71a2e..34c9aed16b 100644
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -71,13 +71,14 @@ class ComponentsController extends Controller
         $component = new Component();
         $component->name                   = $request->input('name');
         $component->category_id            = $request->input('category_id');
+        $component->supplier_id            = $request->input('supplier_id');
         $component->location_id            = $request->input('location_id');
         $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $component->order_number           = $request->input('order_number', null);
         $component->min_amt                = $request->input('min_amt', null);
         $component->serial                 = $request->input('serial', null);
         $component->purchase_date          = $request->input('purchase_date', null);
-        $component->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost', null));
+        $component->purchase_cost          = $request->input('purchase_cost', null);
         $component->qty                    = $request->input('qty');
         $component->user_id                = Auth::id();
         $component->notes                  = $request->input('notes');
@@ -145,13 +146,14 @@ class ComponentsController extends Controller
         // Update the component data
         $component->name                   = $request->input('name');
         $component->category_id            = $request->input('category_id');
+        $component->supplier_id            = $request->input('supplier_id');
         $component->location_id            = $request->input('location_id');
         $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $component->order_number           = $request->input('order_number');
         $component->min_amt                = $request->input('min_amt');
         $component->serial                 = $request->input('serial');
         $component->purchase_date          = $request->input('purchase_date');
-        $component->purchase_cost          = Helper::ParseCurrency(request('purchase_cost'));
+        $component->purchase_cost          = request('purchase_cost');
         $component->qty                    = $request->input('qty');
         $component->notes                  = $request->input('notes');
 
diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
index f7f2b6e54d..6585624d82 100644
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -24,9 +24,16 @@ class ConsumableCheckoutController extends Controller
      */
     public function create($consumableId)
     {
-        if (is_null($consumable = Consumable::find($consumableId))) {
+
+        if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
             return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
         }
+
+        // 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'));
+        }
+
         $this->authorize('checkout', $consumable);
 
         return view('consumables/checkout', compact('consumable'));
@@ -44,12 +51,18 @@ class ConsumableCheckoutController extends Controller
      */
     public function store(Request $request, $consumableId)
     {
-        if (is_null($consumable = Consumable::find($consumableId))) {
+        if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
             return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
         }
 
         $this->authorize('checkout', $consumable);
 
+        // 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'));
+        }
+
+
         $admin_user = Auth::user();
         $assigned_to = e($request->input('assigned_to'));
 
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
index f068e9868d..b33e6e07a9 100644
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -68,6 +68,7 @@ class ConsumablesController extends Controller
         $consumable = new Consumable();
         $consumable->name                   = $request->input('name');
         $consumable->category_id            = $request->input('category_id');
+        $consumable->supplier_id            = $request->input('supplier_id');
         $consumable->location_id            = $request->input('location_id');
         $consumable->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $consumable->order_number           = $request->input('order_number');
@@ -76,7 +77,7 @@ class ConsumablesController extends Controller
         $consumable->model_number           = $request->input('model_number');
         $consumable->item_no                = $request->input('item_no');
         $consumable->purchase_date          = $request->input('purchase_date');
-        $consumable->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost'));
+        $consumable->purchase_cost          = $request->input('purchase_cost');
         $consumable->qty                    = $request->input('qty');
         $consumable->user_id                = Auth::id();
         $consumable->notes                  = $request->input('notes');
@@ -144,6 +145,7 @@ class ConsumablesController extends Controller
 
         $consumable->name                   = $request->input('name');
         $consumable->category_id            = $request->input('category_id');
+        $consumable->supplier_id            = $request->input('supplier_id');
         $consumable->location_id            = $request->input('location_id');
         $consumable->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $consumable->order_number           = $request->input('order_number');
@@ -152,7 +154,7 @@ class ConsumablesController extends Controller
         $consumable->model_number           = $request->input('model_number');
         $consumable->item_no                = $request->input('item_no');
         $consumable->purchase_date          = $request->input('purchase_date');
-        $consumable->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost'));
+        $consumable->purchase_cost          = $request->input('purchase_cost');
         $consumable->qty                    = Helper::ParseFloat($request->input('qty'));
         $consumable->notes                  = $request->input('notes');
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 96d761ef5b..c0e9454d62 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -9,11 +9,11 @@
  *
  * **THIS DOCUMENTATION DOES NOT COVER INSTALLATION.** If you're here and you're not a
  * developer, you're probably in the wrong place. Please see the
- * [Installation documentation](http://docs.snipeitapp.com) for
+ * [Installation documentation](https://snipe-it.readme.io) for
  * information on how to install Snipe-IT.
  *
  * To learn how to set up a development environment and get started developing for Snipe-IT,
- * please see the [contributing documentation](http://docs.snipeitapp.com/contributing.html).
+ * please see the [contributing documentation](https://snipe-it.readme.io/docs/contributing-overview).
  *
  * Only the Snipe-IT specific controllers, models, helpers, service providers,
  * etc have been included in this documentation (excluding vendors, Laravel core, etc)
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 4eb31450ee..c9579ae7ef 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\CustomFieldRequest;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
 use Redirect;
 
 /**
@@ -45,7 +46,7 @@ class CustomFieldsController extends Controller
      * @see CustomFieldsController::storeField()
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.1.5]
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function show()
@@ -63,14 +64,17 @@ class CustomFieldsController extends Controller
      * @return \Illuminate\Support\Facades\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create(Request $request)
     {
         $this->authorize('create', CustomField::class);
+        $fieldsets = CustomFieldset::get();
 
         return view('custom_fields.fields.edit', [
             'predefinedFormats' => Helper::predefined_formats(),
-        'customFormat' => '',
-        ])->with('field', new CustomField());
+            'customFormat' => '',
+            'fieldsets' => $fieldsets,
+            'field' => new CustomField(),
+        ]);
     }
 
     /**
@@ -79,7 +83,7 @@ class CustomFieldsController extends Controller
      * @see CustomFieldsController::createField()
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function store(CustomFieldRequest $request)
@@ -104,21 +108,33 @@ class CustomFieldsController extends Controller
             "show_in_email" => $show_in_email,
             "is_unique" => $request->get("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),
             "user_id" => Auth::id()
         ]);
 
 
         if ($request->filled('custom_format')) {
-            $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->save()) {
+
+            // Sync fields with fieldsets
+            $fieldset_array = $request->input('associate_fieldsets');
+            if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {
+                $field->fieldset()->sync(array_keys($fieldset_array));
+            } else {
+                $field->fieldset()->sync([]);
+            }
+
+
             return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.create.success'));
         }
 
-        return redirect()->back()->withInput()
+        return redirect()->back()->with('selected_fieldsets', $request->input('associate_fieldsets'))->withInput()
             ->with('error', trans('admin/custom_fields/message.field.create.error'));
     }
 
@@ -128,7 +144,7 @@ class CustomFieldsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function deleteFieldFromFieldset($field_id, $fieldset_id)
@@ -147,8 +163,7 @@ class CustomFieldsController extends Controller
                 ->with('success', trans('admin/custom_fields/message.field.delete.success'));
             } else {
                 return redirect()->back()->withErrors(['message' => "Field is in use and cannot be deleted."]);
-            }  
-
+            }
         }
 
         return redirect()->back()->withErrors(['message' => "Error deleting field from fieldset"]);
@@ -161,7 +176,7 @@ class CustomFieldsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function destroy($field_id)
@@ -190,12 +205,12 @@ class CustomFieldsController extends Controller
      * @return \Illuminate\Support\Facades\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($id)
+    public function edit(Request $request, $id)
     {
         if ($field = CustomField::find($id)) {
 
         $this->authorize('update', $field);
-
+        $fieldsets = CustomFieldset::get();
         $customFormat = '';
         if ((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
             $customFormat = $field->format;
@@ -204,6 +219,7 @@ class CustomFieldsController extends Controller
         return view('custom_fields.fields.edit', [
             'field'             => $field,
             'customFormat'      => $customFormat,
+            'fieldsets'         => $fieldsets,
             'predefinedFormats' => Helper::predefined_formats(),
         ]);
         } 
@@ -222,7 +238,7 @@ class CustomFieldsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $id
      * @since [v4.0]
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function update(CustomFieldRequest $request, $id)
@@ -249,6 +265,8 @@ class CustomFieldsController extends Controller
         $field->show_in_email = $show_in_email;
         $field->is_unique     = $request->get("is_unique", 0);
         $field->display_in_user_view = $display_in_user_view;
+        $field->auto_add_to_fieldsets = $request->get("auto_add_to_fieldsets", 0);
+        $field->show_in_listview = $request->get("show_in_listview", 0);
 
         if ($request->get('format') == 'CUSTOM REGEX') {
             $field->format = e($request->get('custom_format'));
@@ -256,11 +274,21 @@ class CustomFieldsController extends Controller
             $field->format = e($request->get('format'));
         }
 
-        if($field->element == 'checkbox' || $field->element == 'radio'){
+        if ($field->element == 'checkbox' || $field->element == 'radio'){
             $field->format = 'ANY';
         }
 
         if ($field->save()) {
+
+
+            // Sync fields with fieldsets
+            $fieldset_array = $request->input('associate_fieldsets');
+            if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {
+                $field->fieldset()->sync(array_keys($fieldset_array));
+            } else {
+                $field->fieldset()->sync([]);
+            }
+
             return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.update.success'));
         }
 
diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index c7c00a7bd2..dbee97b776 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -75,9 +75,9 @@ class CustomFieldsetsController extends Controller
      */
     public function create()
     {
-        $this->authorize('create', CustomFieldset::class);
+        $this->authorize('create', CustomField::class);
 
-        return view('custom_fields.fieldsets.edit');
+        return view('custom_fields.fieldsets.edit')->with('item', new CustomFieldset());
     }
 
     /**
@@ -91,18 +91,29 @@ class CustomFieldsetsController extends Controller
      */
     public function store(Request $request)
     {
-        $this->authorize('create', CustomFieldset::class);
+        $this->authorize('create', CustomField::class);
 
-        $cfset = new CustomFieldset([
+        $fieldset = new CustomFieldset([
                 'name' => e($request->get('name')),
                 'user_id' => Auth::user()->id,
         ]);
 
-        $validator = Validator::make($request->all(), $cfset->rules);
-        if ($validator->passes()) {
-            $cfset->save();
+        $validator = Validator::make($request->all(), $fieldset->rules);
 
-            return redirect()->route('fieldsets.show', [$cfset->id])
+        if ($validator->passes()) {
+            $fieldset->save();
+
+            // Sync fieldset with auto_add_to_fieldsets
+            $fields = CustomField::select('id')->where('auto_add_to_fieldsets', '=', '1')->get();
+            if ($fields->count() > 0) {
+                foreach ($fields as $field) {
+                    $field_ids[] = $field->id;
+                }
+
+                $fieldset->fields()->sync($field_ids);
+            }
+
+            return redirect()->route('fieldsets.show', [$fieldset->id])
                 ->with('success', trans('admin/custom_fields/message.fieldset.create.success'));
         }
 
@@ -110,31 +121,52 @@ class CustomFieldsetsController extends Controller
     }
 
     /**
-     * What the actual fuck, Brady?
+     * Presents edit form for fieldset
      *
-     * @todo Uhh, build this?
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @since [v1.8]
-     * @return Fuckall
+     * @since [v6.0.14]
+     * @return Redirect
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function edit($id)
     {
-        //
+        $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]));
+
     }
 
     /**
-     * GET IN THE SEA BRADY.
+     * Saves updated fieldset data
      *
-     * @todo Uhh, build this too?
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @since [v1.8]
-     * @return Fuckall
+     * @since [v6.0.14]
+     * @return Redirect
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update($id)
+    public function update(Request $request, $id)
     {
-        //
+        $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());
+
+        }
+
+        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
     }
 
     /**
@@ -202,7 +234,7 @@ class CustomFieldsetsController extends Controller
      */
     public function makeFieldRequired($fieldset_id, $field_id)
     {
-        $this->authorize('update', CustomFieldset::class);
+        $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($field_id);
         $fieldset = CustomFieldset::findOrFail($fieldset_id);
         $fields[$field->id] = ['required' => 1];
@@ -220,7 +252,7 @@ class CustomFieldsetsController extends Controller
      */
     public function makeFieldOptional($fieldset_id, $field_id)
     {
-        $this->authorize('update', CustomFieldset::class);
+        $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($field_id);
         $fieldset = CustomFieldset::findOrFail($fieldset_id);
         $fields[$field->id] = ['required' => 0];
diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php
index 4b2b97ce7f..2d456c0a4a 100644
--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -170,6 +170,8 @@ class DepartmentsController extends Controller
         $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->phone = $request->input('phone');
+        $department->fax = $request->input('fax');
 
         $department = $request->handleImages($department);
 
diff --git a/app/Http/Controllers/GoogleAuthController.php b/app/Http/Controllers/GoogleAuthController.php
new file mode 100644
index 0000000000..a93fcd1fc2
--- /dev/null
+++ b/app/Http/Controllers/GoogleAuthController.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Socialite\Facades\Socialite;
+use Laravel\Socialite\Two\InvalidStateException;
+use App\Models\Setting;
+
+
+class GoogleAuthController extends Controller
+{
+    /**
+     * We need this constructor so that we override the socialite expected config variables,
+     * since we want to allow this to be changed via database fields
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $setting = Setting::getSettings();
+        config(['services.google.redirect' => config('app.url').'/google/callback']);
+        config(['services.google.client_id' => $setting->google_client_id]);
+        config(['services.google.client_secret' => $setting->google_client_secret]);
+    }
+
+    public function redirectToGoogle()
+    {
+        return Socialite::driver('google')->redirect();
+    }
+
+    public function handleGoogleCallback()
+    {
+        try {
+            $socialUser = Socialite::driver('google')->user();
+            \Log::debug('Google user found in Google Workspace');
+        } catch (InvalidStateException $exception) {
+            \Log::debug('Google user NOT found in Google Workspace');
+            return redirect()->route('login')
+                ->withErrors(
+                    [
+                        'username' => [
+                           trans('auth/general.google_login_failed')
+                        ],
+                    ]
+                );
+        }
+
+
+        $user = User::where('username', $socialUser->getEmail())->first();
+
+
+        if ($user) {
+            \Log::debug('Google user '.$socialUser->getEmail().' found in Snipe-IT');
+            $user->update([
+                'avatar'   => $socialUser->avatar,
+            ]);
+
+            Auth::login($user, true);
+            return redirect()->route('home');
+        }
+
+        \Log::debug('Google user '.$socialUser->getEmail().' NOT found in Snipe-IT');
+        return redirect()->route('login')
+            ->withErrors(
+                [
+                    'username' => [
+                        trans('auth/general.google_login_failed'),
+                    ],
+                ]
+            );
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index abe3e0682a..b98156824a 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -92,7 +92,7 @@ class GroupsController extends Controller
             return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
         }
 
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found'));
+        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
     }
 
     /**
@@ -107,7 +107,7 @@ class GroupsController extends Controller
     public function update(Request $request, $id = null)
     {
         if (! $group = Group::find($id)) {
-            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('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'));
@@ -133,14 +133,13 @@ class GroupsController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Exception
      */
-    public function destroy($id = null)
+    public function destroy($id)
     {
         if (! config('app.lock_passwords')) {
             if (! $group = Group::find($id)) {
-                return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+                return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
             }
             $group->delete();
-            // Redirect to the group management page
             return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete'));
         }
 
@@ -164,6 +163,6 @@ class GroupsController extends Controller
             return view('groups/view', compact('group'));
         }
 
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
     }
 }
diff --git a/app/Http/Controllers/ImportsController.php b/app/Http/Controllers/ImportsController.php
deleted file mode 100644
index 5c2ca6175b..0000000000
--- a/app/Http/Controllers/ImportsController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Transformers\ImportsTransformer;
-use App\Models\Asset;
-use App\Models\Import;
-
-class ImportsController extends Controller
-{
-    /**
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function index()
-    {
-        $this->authorize('import');
-        $imports = (new ImportsTransformer)->transformImports(Import::latest()->get());
-
-        return view('importer/import')->with('imports', $imports);
-    }
-}
diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index d585e6714c..50e20c7985 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -59,6 +59,12 @@ class LicenseCheckinController extends Controller
         }
 
         $license = License::find($licenseSeat->license_id);
+
+        // LicenseSeat is not assigned, it can't be checked in
+        if (is_null($licenseSeat->assigned_to) && is_null($licenseSeat->asset_id)) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkin.error'));
+        }
+
         $this->authorize('checkout', $license);
 
         if (! $license->reassignable) {
@@ -106,4 +112,54 @@ class LicenseCheckinController extends Controller
         // Redirect to the license page with error
         return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkin.error'));
     }
+
+    /**
+     * Bulk checkin all license seats
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LicenseCheckinController::create() method that provides the form view
+     * @since [v6.1.1]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+
+    public function bulkCheckin(Request $request, $licenseId) {
+
+        $license = License::findOrFail($licenseId);
+        $this->authorize('checkin', $license);
+
+        $licenseSeatsByUser = LicenseSeat::where('license_id', '=', $licenseId)
+            ->whereNotNull('assigned_to')
+            ->with('user')
+            ->get();
+
+        foreach ($licenseSeatsByUser as $user_seat) {
+            $user_seat->assigned_to = null;
+
+            if ($user_seat->save()) {
+                \Log::debug('Checking in '.$license->name.' from user '.$user_seat->username);
+                $user_seat->logCheckin($user_seat->user, trans('admin/licenses/general.bulk.checkin_all.log_msg'));
+            }
+        }
+
+        $licenseSeatsByAsset = LicenseSeat::where('license_id', '=', $licenseId)
+            ->whereNotNull('asset_id')
+            ->with('asset')
+            ->get();
+
+        $count = 0;
+        foreach ($licenseSeatsByAsset as $asset_seat) {
+            $asset_seat->asset_id = null;
+
+            if ($asset_seat->save()) {
+                \Log::debug('Checking in '.$license->name.' from asset '.$asset_seat->asset_tag);
+                $asset_seat->logCheckin($asset_seat->asset, trans('admin/licenses/general.bulk.checkin_all.log_msg'));
+                $count++;
+            }
+        }
+
+        return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkin_all.success', 2, ['count' => $count] ));
+
+    }
+
 }
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 6f2ae003ca..3a0f806584 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -30,15 +30,17 @@ class LicenseCheckoutController extends Controller
         // Check that the license is valid
         if ($license = License::find($licenseId)) {
 
+            $this->authorize('checkout', $license);
             // If the license is valid, check that there is an available seat
             if ($license->avail_seats_count < 1) {
                 return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
             }
+            return view('licenses/checkout', compact('license'));
         }
 
-        $this->authorize('checkout', $license);
+        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+
 
-        return view('licenses/checkout', compact('license'));
     }
 
     /**
@@ -126,4 +128,70 @@ class LicenseCheckoutController extends Controller
 
         return false;
     }
+
+    /**
+     * Bulk checkin all license seats
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LicenseCheckinController::create() method that provides the form view
+     * @since [v6.1.1]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+
+    public function bulkCheckout($licenseId) {
+
+        \Log::debug('Checking out '.$licenseId.' via bulk');
+        $license = License::findOrFail($licenseId);
+        $this->authorize('checkin', $license);
+        $avail_count = $license->getAvailSeatsCountAttribute();
+
+        $users = User::whereNull('deleted_at')->where('autoassign_licenses', '=', 1)->with('licenses')->get();
+        \Log::debug($avail_count.' will be assigned');
+
+        if ($users->count() > $avail_count) {
+            \Log::debug('You do not have enough free seats to complete this task, so we will check out as many as we can. ');
+        }
+
+        // If the license is valid, check that there is an available seat
+        if ($license->availCount()->count() < 1) {
+            return redirect()->back()->with('error', trans('admin/licenses/general.bulk.checkout_all.error_no_seats'));
+        }
+
+
+        $assigned_count = 0;
+
+        foreach ($users as $user) {
+
+            // Check to make sure this user doesn't already have this license checked out to them
+            if ($user->licenses->where('id', '=', $licenseId)->count()) {
+                \Log::debug($user->username.' already has this license checked out to them. Skipping... ');
+                continue;
+            }
+
+            $licenseSeat = $license->freeSeat();
+
+            // Update the seat with checkout info
+            $licenseSeat->assigned_to = $user->id;
+
+            if ($licenseSeat->save()) {
+                $avail_count--;
+                $assigned_count++;
+                $licenseSeat->logCheckout(trans('admin/licenses/general.bulk.checkout_all.log_msg'), $user);
+                \Log::debug('License '.$license->name.' seat '.$licenseSeat->id.' checked out to '.$user->username);
+            }
+
+            if ($avail_count ==  0) {
+                return redirect()->back()->with('warning', trans('admin/licenses/general.bulk.checkout_all.warn_not_enough_seats', ['count' => $assigned_count]));
+            }
+        }
+
+        if ($assigned_count ==  0) {
+            return redirect()->back()->with('warning', trans('admin/licenses/general.bulk.checkout_all.warn_no_avail_users', ['count' => $assigned_count]));
+        }
+
+        return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkout_all.success', 2, ['count' => $assigned_count] ));
+
+
+    }
 }
diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php
index db414edebf..d457d4983a 100644
--- a/app/Http/Controllers/Licenses/LicenseFilesController.php
+++ b/app/Http/Controllers/Licenses/LicenseFilesController.php
@@ -91,29 +91,30 @@ class LicenseFilesController extends Controller
      */
     public function destroy($licenseId = null, $fileId = null)
     {
-        $license = License::find($licenseId);
+        if ($license = License::find($licenseId)) {
 
-        // the asset is valid
-        if (isset($license->id)) {
             $this->authorize('update', $license);
-            $log = Actionlog::find($fileId);
 
-            // Remove the file if one exists
-            if (Storage::exists('licenses/'.$log->filename)) {
-                try {
-                    Storage::delete('licenses/'.$log->filename);
-                } catch (\Exception $e) {
-                    \Log::debug($e);
+            if ($log = Actionlog::find($fileId)) {
+
+                // Remove the file if one exists
+                if (Storage::exists('licenses/'.$log->filename)) {
+                    try {
+                        Storage::delete('licenses/'.$log->filename);
+                    } catch (\Exception $e) {
+                        \Log::debug($e);
+                    }
                 }
+                
+                $log->delete();
+
+                return redirect()->back()
+                    ->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->route('licenses.index')->with('error', trans('general.log_does_not_exist'));
         }
 
-        // Redirect to the licence management page
         return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
     }
 
@@ -129,7 +130,6 @@ class LicenseFilesController extends Controller
      */
     public function show($licenseId = null, $fileId = null, $download = true)
     {
-        \Log::info('Private filesystem is: '.config('filesystems.default'));
         $license = License::find($licenseId);
 
         // the license is valid
diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index a0467654ca..02e2163207 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -6,6 +6,8 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Company;
 use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -86,7 +88,7 @@ class LicensesController extends Controller
         $license->name              = $request->input('name');
         $license->notes             = $request->input('notes');
         $license->order_number      = $request->input('order_number');
-        $license->purchase_cost     = Helper::ParseCurrency($request->input('purchase_cost'));
+        $license->purchase_cost     = $request->input('purchase_cost');
         $license->purchase_date     = $request->input('purchase_date');
         $license->purchase_order    = $request->input('purchase_order');
         $license->purchase_order    = $request->input('purchase_order');
@@ -164,7 +166,7 @@ class LicensesController extends Controller
         $license->name              = $request->input('name');
         $license->notes             = $request->input('notes');
         $license->order_number      = $request->input('order_number');
-        $license->purchase_cost     = Helper::ParseCurrency($request->input('purchase_cost'));
+        $license->purchase_cost     = $request->input('purchase_cost');
         $license->purchase_date     = $request->input('purchase_date');
         $license->purchase_order    = $request->input('purchase_order');
         $license->reassignable      = $request->input('reassignable', 0);
@@ -205,7 +207,7 @@ class LicensesController extends Controller
         if ($license->assigned_seats_count == 0) {
             // Delete the license and the associated license seats
             DB::table('license_seats')
-                ->where('id', $license->id)
+                ->where('license_id', $license->id)
                 ->update(['assigned_to' => null, 'asset_id' => null]);
 
             $licenseSeats = $license->licenseseats();
@@ -233,16 +235,40 @@ class LicensesController extends Controller
     {
         $license = License::with('assignedusers')->find($licenseId);
 
-        if ($license) {
-            $this->authorize('view', $license);
-
-            return view('licenses/view', compact('license'));
+        if (!$license) {
+            return redirect()->route('licenses.index')
+            ->with('error', trans('admin/licenses/message.does_not_exist'));
         }
 
-        return redirect()->route('licenses.index')
-            ->with('error', trans('admin/licenses/message.does_not_exist'));
+        $users_count = User::where('autoassign_licenses', '1')->count();
+        $total_seats_count = $license->totalSeatsByLicenseID();
+        $available_seats_count = $license->availCount()->count();
+        $checkedout_seats_count = ($total_seats_count - $available_seats_count);
+
+        \Log::debug('Total: '.$total_seats_count);
+        \Log::debug('Users: '.$users_count);
+        \Log::debug('Available: '.$available_seats_count);
+        \Log::debug('Checkedout: '.$checkedout_seats_count);
+
+
+        $this->authorize('view', $license);
+        return view('licenses.view', compact('license'))
+            ->with('users_count', $users_count)
+            ->with('total_seats_count', $total_seats_count)
+            ->with('available_seats_count', $available_seats_count)
+            ->with('checkedout_seats_count', $checkedout_seats_count);
+
     }
 
+
+    /**
+     * Returns a view with prepopulated data for clone
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $licenseId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
     public function getClone($licenseId = null)
     {
         if (is_null($license_to_clone = License::find($licenseId))) {
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index 9524abf6ee..08dc38b3ac 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -79,6 +79,8 @@ class LocationsController extends Controller
         $location->ldap_ou = $request->input('ldap_ou');
         $location->manager_id = $request->input('manager_id');
         $location->user_id = Auth::id();
+        $location->phone = request('phone');
+        $location->fax = request('fax');
 
         $location = $request->handleImages($location);
 
@@ -139,6 +141,8 @@ class LocationsController extends Controller
         $location->state = $request->input('state');
         $location->country = $request->input('country');
         $location->zip = $request->input('zip');
+        $location->phone = request('phone');
+        $location->fax = request('fax');
         $location->ldap_ou = $request->input('ldap_ou');
         $location->manager_id = $request->input('manager_id');
 
@@ -227,6 +231,36 @@ class LocationsController extends Controller
 
     }
 
+
+    /**
+     * Returns a view that presents a form to clone a location.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $locationId
+     * @since [v6.0.14]
+     * @return View
+     */
+    public function getClone($locationId = null)
+    {
+        $this->authorize('create', Location::class);
+
+        // Check if the asset exists
+        if (is_null($location_to_clone = Location::find($locationId))) {
+            // Redirect to the asset management page
+            return redirect()->route('licenses.index')->with('error', trans('admin/locations/message.does_not_exist'));
+        }
+
+        $location = clone $location_to_clone;
+
+        // unset these values
+        $location->id = null;
+        $location->image = null;
+
+        return view('locations/edit')
+            ->with('item', $location);
+    }
+
+
     public function print_all_assigned($id)
     {
         if ($location = Location::where('id', $id)->first()) {
diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php
index 1f7d2f2c07..e98644f46f 100755
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -68,6 +68,7 @@ class ManufacturersController extends Controller
         $manufacturer->user_id = 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 = $request->handleImages($manufacturer);
@@ -123,10 +124,11 @@ class ManufacturersController extends Controller
             return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
         }
 
-        // Save the  data
+        // 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');
 
diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index 385877a3ec..6f6b39dd12 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -17,7 +17,7 @@ class ModalController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @return View
      */
-    function show ($type, $itemId = null) {
+    public function show ($type, $itemId = null) {
 
         // These values should correspond to a file in resources/views/modals/
         $allowed_types = [
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 739376e3ab..d67d673a21 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -8,7 +8,7 @@ use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
 use Illuminate\Support\Facades\Auth;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
@@ -67,37 +67,9 @@ class ProfileController extends Controller
             $user->location_id = $request->input('location_id');
         }
 
+        // Handle the avatar upload and/or delete if necessary
+        app('\App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
-        if ($request->input('avatar_delete') == 1) {
-            $user->avatar = null;
-        }
-
-
-        if ($request->hasFile('avatar')) {
-            $path = 'avatars';
-
-            if (! Storage::disk('public')->exists($path)) {
-                Storage::disk('public')->makeDirectory($path, 775);
-            }
-
-            $upload = $image = $request->file('avatar');
-            $ext = $image->getClientOriginalExtension();
-            $file_name = 'avatar-'.str_random(18).'.'.$ext;
-
-            if ($image->getClientOriginalExtension() != 'svg') {
-                $upload = Image::make($image->getRealPath())->resize(84, 84);
-            }
-
-            // This requires a string instead of an object, so we use ($string)
-            Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode());
-
-            // Remove Current image if exists
-            if (($user->avatar) && (Storage::disk('public')->exists($path.'/'.$user->avatar))) {
-                Storage::disk('public')->delete($path.'/'.$user->avatar);
-            }
-
-            $user->avatar = $file_name;
-        }
 
         if ($user->save()) {
             return redirect()->route('profile')->with('success', 'Account successfully updated');
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 6cf2091f60..b2a86bf240 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -51,9 +51,8 @@ class ReportsController extends Controller
     public function getAccessoryReport()
     {
         $this->authorize('reports.view');
-        $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
 
-        return view('reports/accessories', compact('accessories'));
+        return view('reports/accessories');
     }
 
     /**
@@ -285,7 +284,7 @@ class ReportsController extends Controller
 
                     $row = [
                         $actionlog->created_at,
-                        ($actionlog->user) ? e($actionlog->user->getFullNameAttribute()) : '',
+                        ($actionlog->admin) ? e($actionlog->admin->getFullNameAttribute()) : '',
                         $actionlog->present()->actionType(),
                         e($actionlog->itemType()),
                         ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
@@ -502,7 +501,6 @@ class ReportsController extends Controller
                 $header[] = trans('general.zip');
             }
 
-
             if ($request->filled('assigned_to')) {
                 $header[] = trans('admin/hardware/table.checkoutto');
                 $header[] = trans('general.type');
@@ -533,13 +531,14 @@ class ReportsController extends Controller
             }
 
             if ($request->filled('warranty')) {
-                $header[] = 'Warranty';
-                $header[] = 'Warranty Expires';
+                $header[] = trans('admin/hardware/form.warranty');
+                $header[] = trans('admin/hardware/form.warranty_expires');
             }
+
             if ($request->filled('depreciation')) {
-                $header[] = 'Value';
-                $header[] = 'Diff';
-                $header[] = 'Fully Depreciated';
+                $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')) {
@@ -596,23 +595,23 @@ class ReportsController extends Controller
                 'model.category', 'model.manufacturer', 'supplier');
             
             if ($request->filled('by_location_id')) {
-                $assets->where('assets.location_id', $request->input('by_location_id'));
+                $assets->whereIn('assets.location_id', $request->input('by_location_id'));
             }
 
             if ($request->filled('by_rtd_location_id')) {
-                $assets->where('assets.rtd_location_id', $request->input('by_rtd_location_id'));
+                $assets->whereIn('assets.rtd_location_id', $request->input('by_rtd_location_id'));
             }
 
             if ($request->filled('by_supplier_id')) {
-                $assets->where('assets.supplier_id', $request->input('by_supplier_id'));
+                $assets->whereIn('assets.supplier_id', $request->input('by_supplier_id'));
             }
 
             if ($request->filled('by_company_id')) {
-                $assets->where('assets.company_id', $request->input('by_company_id'));
+                $assets->whereIn('assets.company_id', $request->input('by_company_id'));
             }
 
             if ($request->filled('by_model_id')) {
-                $assets->where('assets.model_id', $request->input('by_model_id'));
+                $assets->whereIn('assets.model_id', $request->input('by_model_id'));
             }
 
             if ($request->filled('by_category_id')) {
@@ -632,7 +631,7 @@ class ReportsController extends Controller
             }
 
             if ($request->filled('by_status_id')) {
-                $assets->where('assets.status_id', $request->input('by_status_id'));
+                $assets->whereIn('assets.status_id', $request->input('by_status_id'));
             }
 
             if (($request->filled('purchase_start')) && ($request->filled('purchase_end'))) {
@@ -642,6 +641,9 @@ class ReportsController extends Controller
             if (($request->filled('created_start')) && ($request->filled('created_end'))) {
                 $assets->whereBetween('assets.created_at', [$request->input('created_start'), $request->input('created_end')]);
             }
+            if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
+                $assets->whereBetween('assets.last_checkout', [$request->input('checkout_date_start'), $request->input('checkout_date_end')]);
+            }
 
             if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
                 $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
@@ -664,6 +666,7 @@ class ReportsController extends Controller
                 $assets->onlyTrashed();
             }
 
+            \Log::debug($assets->toSql());
             $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
             
                 $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
@@ -899,12 +902,8 @@ class ReportsController extends Controller
     public function getAssetMaintenancesReport()
     {
         $this->authorize('reports.view');
-        // Grab all the improvements
-        $assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company')
-                                              ->orderBy('created_at', 'DESC')
-                                              ->get();
 
-        return view('reports/asset_maintenances', compact('assetMaintenances'));
+        return view('reports.asset_maintenances');
     }
 
     /**
@@ -1025,7 +1024,11 @@ class ReportsController extends Controller
         if (is_null($acceptance->created_at)){
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
         } else {
-            $logItem = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get()[0];
+            $logItem_res = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get();
+            if ($logItem_res->isEmpty()){
+                return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
+            }
+            $logItem = $logItem_res[0];
         }
 
         if(!$assetItem->assignedTo->locale){
@@ -1120,8 +1123,6 @@ class ReportsController extends Controller
                 $row[]  = str_replace(',', '', e($item['assetItem']->asset_tag));
                 $row[]  = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
                 $rows[] = implode(',', $row);
-            } else {
-                // Log the error maybe?
             }
         }
 
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 5479b5649b..f8c0638422 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -65,18 +65,27 @@ class SettingsController extends Controller
             $start_settings['db_error'] = $e->getMessage();
         }
 
-        $protocol = array_key_exists('HTTPS', $_SERVER) && ('on' == $_SERVER['HTTPS']) ? 'https://' : 'http://';
+        if (array_key_exists("HTTP_X_FORWARDED_PROTO", $_SERVER)) {
+            $protocol = $_SERVER["HTTP_X_FORWARDED_PROTO"] . "://";
+        } elseif (array_key_exists('HTTPS', $_SERVER) && ('on' == $_SERVER['HTTPS'])) {
+            $protocol = "https://";
+        } else {
+            $protocol = "http://";
+        }
 
-        $host = array_key_exists('SERVER_NAME', $_SERVER) ? $_SERVER['SERVER_NAME'] : null;
-        $port = array_key_exists('SERVER_PORT', $_SERVER) ? $_SERVER['SERVER_PORT'] : null;
-        if (('http://' === $protocol && '80' != $port) || ('https://' === $protocol && '443' != $port)) {
-            $host .= ':'.$port;
+        if (array_key_exists("HTTP_X_FORWARDED_HOST", $_SERVER)) {
+            $host = $_SERVER["HTTP_X_FORWARDED_HOST"];
+        } else {
+            $host = array_key_exists('SERVER_NAME', $_SERVER) ? $_SERVER['SERVER_NAME'] : null;
+            $port = array_key_exists('SERVER_PORT', $_SERVER) ? $_SERVER['SERVER_PORT'] : null;
+            if (('http://' === $protocol && '80' != $port) || ('https://' === $protocol && '443' != $port)) {
+                $host .= ':'.$port;
+            }
         }
         $pageURL = $protocol.$host.$_SERVER['REQUEST_URI'];
 
-        $start_settings['url_valid'] = (url('/').'/setup' === $pageURL);
-
-        $start_settings['url_config'] = url('/');
+        $start_settings['url_config'] = config('app.url').'/setup';
+        $start_settings['url_valid'] = ($start_settings['url_config'] === $pageURL);
         $start_settings['real_url'] = $pageURL;
         $start_settings['php_version_min'] = true;
 
@@ -111,17 +120,17 @@ class SettingsController extends Controller
             $start_settings['prod'] = true;
         }
 
+        $start_settings['owner'] = '';
+
         if (function_exists('posix_getpwuid')) { // Probably Linux
             $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME']));
-            $start_settings['owner'] = $owner['name'];
-        } else { // Windows
-            // TODO: Is there a way of knowing if a windows user has elevated permissions
-            // This just gets the user name, which likely isn't 'root'
-            // $start_settings['owner'] = getenv('USERNAME');
-            $start_settings['owner'] = '';
+            // This *should* be an array, but we've seen this return a bool in some chrooted environments
+            if (is_array($owner)) {
+                $start_settings['owner'] = $owner['name'];
+            }
         }
 
-        if (('root' === $start_settings['owner']) || ('0' === $start_settings['owner'])) {
+        if (($start_settings['owner'] === 'root') || ($start_settings['owner'] === '0')) {
             $start_settings['owner_is_admin'] = true;
         } else {
             $start_settings['owner_is_admin'] = false;
@@ -679,33 +688,6 @@ class SettingsController extends Controller
         return view('settings.slack', 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 postSlack(SlackSettingsRequest $request)
-    {
-        if (is_null($setting = Setting::getSettings())) {
-            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
-        }
-
-        $setting->slack_endpoint = $request->input('slack_endpoint');
-        $setting->slack_channel = $request->input('slack_channel');
-        $setting->slack_botname = $request->input('slack_botname');
-
-        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.
      *
@@ -807,7 +789,7 @@ class SettingsController extends Controller
      */
     public function getPhpInfo()
     {
-        if (true === config('app.debug')) {
+        if (config('app.debug') === true) {
             return view('settings.phpinfo');
         }
 
@@ -987,6 +969,7 @@ class SettingsController extends Controller
             $setting->ldap_phone_field = $request->input('ldap_phone');
             $setting->ldap_jobtitle = $request->input('ldap_jobtitle');
             $setting->ldap_country = $request->input('ldap_country');
+            $setting->ldap_location = $request->input('ldap_location');
             $setting->ldap_dept = $request->input('ldap_dept');
             $setting->ldap_client_tls_cert   = $request->input('ldap_client_tls_cert');
             $setting->ldap_client_tls_key    = $request->input('ldap_client_tls_key');
@@ -1064,6 +1047,48 @@ class SettingsController extends Controller
         return $pdf_branding;
     }
 
+
+    /**
+     * Show Google login settings form
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @return View
+     */
+    public function getGoogleLoginSettings()
+    {
+        $setting = Setting::getSettings();
+        return view('settings.google', compact('setting'));
+    }
+
+    /**
+     * ShSaveow Google login settings form
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @return View
+     */
+    public function postGoogleLoginSettings(Request $request)
+    {
+        if (!config('app.lock_passwords')) {
+            $setting = Setting::getSettings();
+
+            $setting->google_login = $request->input('google_login', 0);
+            $setting->google_client_id = $request->input('google_client_id');
+            $setting->google_client_secret = $request->input('google_client_secret');
+
+            if ($setting->save()) {
+                return redirect()->route('settings.index')
+                    ->with('success', trans('admin/settings/message.update.success'));
+            }
+
+            return redirect()->back()->withInput()->withErrors($setting->getErrors());
+        }
+
+        return redirect()->back()->with('error', trans('general.feature_disabled'));
+    }
+
+
     /**
      * Show the listing of backups.
      *
@@ -1119,7 +1144,7 @@ class SettingsController extends Controller
     public function postBackups()
     {
         if (! config('app.lock_passwords')) {
-            Artisan::call('backup:run');
+            Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H-i-s')]);
             $output = Artisan::output();
 
             // Backup completed
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index 3550b43708..a2d3d496da 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Users;
 
+use App\Events\UserMerged;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
@@ -13,6 +14,7 @@ use App\Models\LicenseSeat;
 use App\Models\ConsumableAssignment;
 use App\Models\Consumable;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -21,7 +23,7 @@ use Illuminate\Support\Facades\Password;
 class BulkUsersController extends Controller
 {
     /**
-     * Returns a view that confirms the user's a bulk delete will be applied to.
+     * Returns a view that confirms the user's a bulk action will be applied to.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
@@ -35,16 +37,32 @@ class BulkUsersController extends Controller
 
         // Make sure there were users selected
         if (($request->filled('ids')) && (count($request->input('ids')) > 0)) {
+
             // Get the list of affected users
             $user_raw_array = request('ids');
             $users = User::whereIn('id', $user_raw_array)
                 ->with('groups', 'assets', 'licenses', 'accessories')->get();
 
+            // bulk edit, display the bulk edit form
             if ($request->input('bulk_actions') == 'edit') {
                 return view('users/bulk-edit', compact('users'))
                     ->with('groups', Group::pluck('name', 'id'));
+
+            // bulk delete, display the bulk delete confirmation form
             } elseif ($request->input('bulk_actions') == 'delete') {
                 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') {
+
+                if (($request->filled('ids')) && (count($request->input('ids')) > 1)) {
+                    return view('users/confirm-merge')->with('users', $users);
+                // Not enough users selected, send them back
+                } else {
+                    return redirect()->back()->with('error', trans('general.not_enough_users_selected', ['count' => 2]));
+                }
+
+            // bulk password reset, just do the thing
             } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {
                 foreach ($users as $user) {
                     if (($user->activated == '1') && ($user->email != '')) {
@@ -59,7 +77,7 @@ class BulkUsersController extends Controller
             }
         }
 
-        return redirect()->back()->with('error', 'No users selected');
+        return redirect()->back()->with('error', trans('general.no_users_selected'));
     }
 
     /**
@@ -76,7 +94,7 @@ class BulkUsersController extends Controller
         $this->authorize('update', User::class);
 
         if ((! $request->filled('ids')) || $request->input('ids') <= 0) {
-            return redirect()->back()->with('error', 'No users selected');
+            return redirect()->back()->with('error', trans('general.no_users_selected'));
         }
         $user_raw_array = $request->input('ids');
 
@@ -95,7 +113,8 @@ class BulkUsersController extends Controller
             ->conditionallyAddItem('locale')
             ->conditionallyAddItem('remote')
             ->conditionallyAddItem('ldap_import')
-            ->conditionallyAddItem('activated');
+            ->conditionallyAddItem('activated')
+            ->conditionallyAddItem('autoassign_licenses');
 
 
         // If the manager_id is one of the users being updated, generate a warning.
@@ -105,6 +124,11 @@ class BulkUsersController extends Controller
                 'warning' => trans('admin/users/message.bulk_manager_warn'),
             ];
         }
+
+        if ($request->input('null_location_id')=='1') {
+            $this->update_array['location_id'] = null;
+        }
+
         if (! $manager_conflict) {
             $this->conditionallyAddItem('manager_id');
         }
@@ -163,11 +187,11 @@ class BulkUsersController extends Controller
         $this->authorize('update', User::class);
 
         if ((! $request->filled('ids')) || (count($request->input('ids')) == 0)) {
-            return redirect()->back()->with('error', 'No users selected');
+            return redirect()->back()->with('error', trans('general.no_users_selected'));
         }
 
         if (config('app.lock_passwords')) {
-            return redirect()->route('users.index')->with('error', 'Bulk delete is not enabled in this installation');
+            return redirect()->route('users.index')->with('error', trans('general.feature_disabled'));
         }
 
         $user_raw_array = request('ids');
@@ -249,4 +273,80 @@ class BulkUsersController extends Controller
             $logAction->logaction('checkin from');
         }
     }
+
+    /**
+     * Save bulk-edited users
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function merge(Request $request)
+    {
+        $this->authorize('update', User::class);
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('users.index')->with('error', trans('general.feature_disabled'));
+        }
+
+        $user_ids_to_merge = $request->input('ids_to_merge');
+        $user_ids_to_merge = array_diff($user_ids_to_merge, array($request->input('merge_into_id')));
+
+        if ((!$request->filled('merge_into_id')) || (count($user_ids_to_merge) < 1)) {
+            return redirect()->back()->with('error', trans('general.no_users_selected'));
+        }
+
+        // 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);
+
+        // Walk users
+        foreach ($users_to_merge as $user_to_merge) {
+
+            foreach ($user_to_merge->assets as $asset) {
+                \Log::debug('Updating asset: '.$asset->asset_tag . ' to '.$merge_into_user->id);
+                $asset->assigned_to = $request->input('merge_into_id');
+                $asset->save();
+            }
+
+            foreach ($user_to_merge->licenses as $license) {
+                \Log::debug('Updating license pivot: '.$license->id . ' to '.$merge_into_user->id);
+                $user_to_merge->licenses()->updateExistingPivot($license->id, ['assigned_to' => $merge_into_user->id]);
+            }
+
+            foreach ($user_to_merge->consumables as $consumable) {
+                \Log::debug('Updating consumable pivot: '.$consumable->id . ' to '.$merge_into_user->id);
+                $user_to_merge->consumables()->updateExistingPivot($consumable->id, ['assigned_to' => $merge_into_user->id]);
+            }
+
+            foreach ($user_to_merge->accessories as $accessory) {
+                $user_to_merge->accessories()->updateExistingPivot($accessory->id, ['assigned_to' => $merge_into_user->id]);
+            }
+
+            foreach ($user_to_merge->userlog as $log) {
+                $log->target_id = $user_to_merge->id;
+                $log->save();
+            }
+
+            User::where('manager_id', '=', $user_to_merge->id)->update(['manager_id' => $merge_into_user->id]);
+
+            foreach ($user_to_merge->managedLocations as $managedLocation) {
+                $managedLocation->manager_id = $merge_into_user->id;
+                $managedLocation->save();
+            }
+
+            $user_to_merge->delete();
+            //$user_to_merge->save();
+
+            event(new UserMerged($user_to_merge, $merge_into_user, $admin));
+
+        }
+
+        return redirect()->route('users.index')->with('success', trans('general.merge_success', ['count' => $users_to_merge->count(), 'into_username' => $merge_into_user->username]));
+
+
+    }
 }
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 52d423036f..25a64e5cb2 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -74,7 +74,6 @@ class UsersController extends Controller
         $permissions = $this->filterDisplayable($permissions);
 
         $user = new User;
-        $user->activated = 1;
 
         return view('users/edit', compact('groups', 'userGroups', 'permissions', 'userPermissions'))
             ->with('user', $user);
@@ -121,6 +120,7 @@ class UsersController extends Controller
         $user->created_by = Auth::user()->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);
 
         // Strip out the superuser permission if the user isn't a superadmin
         $permissions_array = $request->input('permission');
@@ -131,7 +131,7 @@ class UsersController extends Controller
         $user->permissions = json_encode($permissions_array);
 
         // we have to invoke the
-        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'image', 'avatars', 'avatar');
+        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
         if ($user->save()) {
             if ($request->filled('groups')) {
@@ -210,7 +210,6 @@ class UsersController extends Controller
      */
     public function update(SaveUserRequest $request, $id = null)
     {
-
         // We need to reverse the UI specific logic for our
         // permissions here before we update the user.
         $permissions = $request->input('permissions', []);
@@ -268,12 +267,15 @@ class UsersController extends Controller
         $user->city = $request->input('city', null);
         $user->state = $request->input('state', null);
         $user->country = $request->input('country', null);
-        $user->activated = $request->input('activated', 0);
+        // 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)
@@ -296,7 +298,7 @@ class UsersController extends Controller
         $user->permissions = json_encode($permissions_array);
 
         // Handle uploaded avatar
-        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
         //\Log::debug(print_r($user, true));
 
@@ -668,4 +670,4 @@ class UsersController extends Controller
 
         return redirect()->back()->with('error', 'User is not activated, is LDAP synced, or does not have an email address ');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index ee3e4b14c6..c9aafd2c78 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -82,7 +82,7 @@ class ViewAssetsController extends Controller
         return view('account/requestable-assets', compact('assets', 'models'));
     }
 
-    public function getRequestItem(Request $request, $itemType, $itemId = null)
+    public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null)
     {
         $item = null;
         $fullItemType = 'App\\Models\\'.studly_case($itemType);
@@ -119,16 +119,16 @@ class ViewAssetsController extends Controller
 
         $settings = Setting::getSettings();
 
-        if ($item_request = $item->isRequestedBy($user)) {
-            $item->cancelRequest();
-            $data['item_quantity'] = $item_request->qty;
+        if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {
+            $item->cancelRequest($requestingUser);
+            $data['item_quantity'] = ($item_request) ? $item_request->qty : 1;
             $logaction->logaction('request_canceled');
 
             if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
                 $settings->notify(new RequestAssetCancelation($data));
             }
 
-            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
+            return redirect()->back()->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
         } else {
             $item->request();
             if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php
new file mode 100644
index 0000000000..2e1137bcd2
--- /dev/null
+++ b/app/Http/Livewire/Importer.php
@@ -0,0 +1,529 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use App\Models\CustomField;
+use Livewire\Component;
+
+use App\Models\Import;
+use Storage;
+
+use Log;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+
+class Importer extends Component
+{
+    use AuthorizesRequests;
+
+    public $files;
+
+    public $progress; //upload progress - '-1' means don't show
+    public $progress_message;
+    public $progress_bar_class;
+
+    public $message; //status/error message?
+    public $message_type; //success/error?
+
+    //originally from ImporterFile
+    public $import_errors; //
+    public ?Import $activeFile = null;
+    public $importTypes;
+    public $columnOptions;
+    public $statusType;
+    public $statusText;
+    public $update;
+    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 $licenses_fields;
+    public $locations_fields;
+    public $consumables_fields;
+    public $components_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',
+        'field_map' => 'array'
+    ];
+
+    public function generate_field_map()
+    {
+        \Log::debug("header row is: ".print_r($this->activeFile->header_row,true));
+        \Log::debug("Field map is: ".print_r($this->field_map,true));
+        $tmp = array_combine($this->activeFile->header_row, $this->field_map);
+        return json_encode(array_filter($tmp));
+    }
+
+
+
+    private function getColumns($type)
+    {
+        switch ($type) {
+            case 'asset':
+                $results = $this->assets_fields;
+                break;
+            case 'accessory':
+                $results = $this->accessories_fields;
+                break;
+            case 'consumable':
+                $results = $this->consumables_fields;
+                break;
+            case 'component':
+                $results = $this->components_fields;
+                break;
+            case 'license':
+                $results = $this->licenses_fields;
+                break;
+            case 'user':
+                $results = $this->users_fields;
+                break;
+            case 'location':
+                $results = $this->locations_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') . "———’";
+            foreach (CustomField::orderBy('name')->get() as $field) {
+                $results[$field->db_column_name()] = $field->name;
+            }
+        }
+        return $results;
+    }
+
+    public function updating($name, $new_import_type)
+    {
+        if ($name == "activeFile.import_type") {
+            \Log::debug("WE ARE CHANGING THE import_type!!!!! TO: " . $new_import_type);
+            \Log::debug("so, what's \$this->>field_map at?: " . print_r($this->field_map, true));
+            // 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.
+                }
+                // 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
+                            }
+                        }
+                    }
+                }
+                // 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'),
+        ];
+
+        /**
+         * These are the item-type specific columns
+         */
+        $this->accessories_fields  = [
+            'company' => trans('general.company'),
+            'location' => trans('general.location'),
+            'quantity' => trans('general.qty'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.accessory')]),
+            'model_number' => trans('general.model_no'),
+            'notes' => trans('general.notes'),
+            'category' => trans('general.category'),
+            'supplier' => trans('general.supplier'),
+            'min_amt' => trans('mail.min_QTY'),
+            'purchase_cost' => trans('general.purchase_cost'),
+            'purchase_date' => trans('general.purchase_date'),
+            'manufacturer' => trans('general.manufacturer'),
+            'order_number' => trans('general.order_number'),
+        ];
+
+        $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'),
+            'asset_model' => trans('general.model_name'),
+            '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'),
+            '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'),
+            /**
+             * Checkout fields:
+             * Assets can be checked out to other assets, people, or locations, but we currently
+             * only support checkout to people and locations in the importer
+             **/
+            'checkout_class' => trans('general.importer.checkout_type'),
+            'first_name' => trans('general.importer.checked_out_to_first_name'),
+            'last_name' => trans('general.importer.checked_out_to_last_name'),
+            'full_name' => trans('general.importer.checked_out_to_fullname'),
+            'email' => trans('general.importer.checked_out_to_email'),
+            'username' => trans('general.importer.checked_out_to_username'),
+            'checkout_location' => trans('general.importer.checkout_location'),
+        ];
+
+        $this->consumables_fields = [
+            'company' => trans('general.company'),
+            'location' => trans('general.location'),
+            'quantity' => trans('general.qty'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.consumable')]),
+            'model_number' => trans('general.model_no'),
+            'notes' => trans('general.notes'),
+            'min_amt' => trans('mail.min_QTY'),
+            'category' => trans('general.category'),
+            'purchase_cost' => trans('general.purchase_cost'),
+            'purchase_date' => trans('general.purchase_date'),
+            'checkout_class' => trans('general.importer.checkout_type'),
+            '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 = [
+            'company' => trans('general.company'),
+            'location' => trans('general.location'),
+            'quantity' => trans('general.qty'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.component')]),
+            'model_number' => trans('general.model_no'),
+            'notes' => trans('general.notes'),
+            'category' => trans('general.category'),
+            'supplier' => trans('general.supplier'),
+            'min_amt' => trans('mail.min_QTY'),
+            'purchase_cost' => trans('general.purchase_cost'),
+            'purchase_date' => trans('general.purchase_date'),
+            'manufacturer' => trans('general.manufacturer'),
+            'order_number' => trans('general.order_number'),
+            'serial' => trans('general.serial_number'),
+        ];
+
+        $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'),
+            'expiration_date' => trans('admin/licenses/form.expiration'),
+            'full_name' => trans('general.importer.checked_out_to_fullname'),
+            'license_email' => trans('admin/licenses/form.to_email'),
+            'license_name' => trans('admin/licenses/form.to_name'),
+            'purchase_order' => trans('admin/licenses/form.purchase_order'),
+            'reassignable' => trans('admin/licenses/form.reassignable'),
+            'seats' => trans('admin/licenses/form.seats'),
+            'notes' => trans('general.notes'),
+            'category' => trans('general.category'),
+            'supplier' => trans('general.supplier'),
+            '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'),
+            'serial' => trans('general.license_serial'),
+            'email' => trans('general.importer.checked_out_to_email'),
+            'username' => trans('general.importer.checked_out_to_username'),
+            'manufacturer' => trans('general.manufacturer'),
+        ];
+
+        $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'),
+            'gravatar' => trans('general.importer.gravatar'),
+            'start_date'    => trans('general.start_date'),
+            'end_date'   => trans('general.end_date'),
+            'employee_num'   => trans('general.employee_number'),
+        ];
+
+        $this->locations_fields  = [
+            'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
+            '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'),
+            'parent_location' => trans('admin/locations/table.parent'),
+        ];
+
+        // "real fieldnames" to a list of aliases for that field
+        $this->aliases_fields = [
+            'item_name' =>
+                [
+                    'item name',
+                    'asset name',
+                    'accessory name',
+                    'user name',
+                    'consumable name',
+                    'component name',
+                    'name',
+                ],
+            'item_no' => [
+                'item number',
+                'item no.',
+                'item #',
+            ],
+            'asset_model' =>
+                [
+                    'model name',
+                    'model',
+                ],
+            'gravatar' =>
+                [
+                    'gravatar',
+                ],
+            'currency' =>
+                [
+                    '$',
+                ],
+            'jobtitle' =>
+                [
+                    'job title for user',
+                    'job title',
+                ],
+            'username' =>
+                [
+                    'user name',
+                    'username',
+                    trans('general.importer.checked_out_to_username'),
+                ],
+            'first_name' =>
+                [
+                    'first name',
+                    trans('general.importer.checked_out_to_first_name'),
+                ],
+            'last_name' =>
+                [
+                    'last name',
+                    'lastname',
+                    trans('general.importer.checked_out_to_last_name'),
+                ],
+            'email' =>
+                [
+                    'email',
+                    'e-mail',
+                    trans('general.importer.checked_out_to_email'),
+                ],
+            'phone_number' =>
+                [
+                    'phone',
+                    'phone number',
+                    'phone num',
+                    'telephone number',
+                    'telephone',
+                    'tel.',
+                ],
+            'serial' =>
+                [
+                    'serial number',
+                    'serial no.',
+                    'serial no',
+                    'product key',
+                    'key',
+                ],
+            'model_number' =>
+                [
+                    'model',
+                    'model no',
+                    'model no.',
+                    'model number',
+                    'model num',
+                    'model num.'
+                ],
+            'warranty_months' =>
+                [
+                    'Warranty',
+                    'Warranty Months'
+                ],
+            'qty' =>
+                [
+                    'QTY',
+                    'Quantity'
+                ],
+            'zip' =>
+                [
+                    'Postal Code',
+                    'Post Code',
+                    'Zip Code'
+                ],
+            'min_amt' =>
+                [
+                    'Min Amount',
+                    'Minimum Amount',
+                    'Min Quantity',
+                    'Minimum Quantity',
+                ],
+            'next_audit_date' =>
+                [
+                    'Next Audit',
+                ],
+            'address2' =>
+                [
+                    'Address 2',
+                    'Address2',
+                ],
+            'ldap_ou' =>
+                [
+                    'LDAP OU',
+                    'OU',
+                ],
+            'parent_location' =>
+                [
+                    'Parent',
+                    'Parent Location',
+                ],
+            'manager' =>
+                [
+                    'Managed By',
+                    'Manager Name',
+                    'Manager Full Name',
+                ],
+            'manager_username' =>
+                [
+                    'Manager Username',
+                ],
+        ];
+
+        $this->columnOptions[''] = $this->getColumns(''); //blank mode? I don't know what this is supposed to mean
+        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->activeFile = Import::find($id);
+        $this->field_map = null;
+        foreach($this->activeFile->header_row 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;
+
+    }
+
+    public function destroy($id)
+    {
+        // TODO: why don't we just do File::find($id)? This seems dumb.
+        foreach($this->files as $file) {
+            \Log::debug("File id is: ".$file->id);
+            if($id == $file->id) {
+                if(Storage::delete('private_uploads/imports/'.$file->file_path)) {
+                    $file->delete();
+
+                    $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';
+                }
+            }
+        }
+    }
+
+    public function render()
+    {
+        $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.
+        return view('livewire.importer')
+                ->extends('layouts.default')
+                ->section('content');
+    }
+}
diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
new file mode 100644
index 0000000000..bb3a7bd7f6
--- /dev/null
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use GuzzleHttp\Client;
+use Livewire\Component;
+use App\Models\Setting;
+use App\Helpers\Helper;
+
+class SlackSettingsForm extends Component
+{
+    public $webhook_endpoint;
+    public $webhook_channel;
+    public $webhook_botname;
+    public $isDisabled ='' ;
+    public $webhook_name;
+    public $webhook_link;
+    public $webhook_placeholder;
+    public $webhook_icon;
+    public $webhook_selected;
+    public array $webhook_text;
+
+    public Setting $setting;
+
+    protected $rules = [
+        'webhook_endpoint'                      => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services|nullable',
+        'webhook_channel'                       => 'required_with:webhook_endpoint|starts_with:#|nullable',
+        'webhook_botname'                       => 'string|nullable',
+    ];
+
+    public function mount() {
+        $this->webhook_text= [
+            "slack" => array(
+                "name" => trans('admin/settings/general.slack') ,
+            "icon" => 'fab fa-slack',
+            "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => 'https://api.slack.com/messaging/webhooks',
+        ),
+            "general"=> array(
+                "name" => trans('admin/settings/general.general_webhook'),
+                "icon" => "fab fa-hashtag",
+                "placeholder" => "",
+                "link" => "",
+            ),
+        ];
+
+        $this->setting = Setting::getSettings();
+        $this->save_button = trans('general.save');
+        $this->webhook_selected = $this->setting->webhook_selected;
+        $this->webhook_placeholder = $this->webhook_text[$this->setting->webhook_selected]["placeholder"];
+        $this->webhook_name = $this->webhook_text[$this->setting->webhook_selected]["name"];
+        $this->webhook_icon = $this->webhook_text[$this->setting->webhook_selected]["icon"];
+        $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->setting->webhook_selected == 'general'){
+            $this->isDisabled='';
+        }
+        if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
+            $this->isDisabled= '';
+        }
+
+    }
+    public function updated($field) {
+
+        if($this->webhook_selected != 'general') {
+            $this->validateOnly($field, $this->rules);
+        }
+    }
+
+    public function updatedWebhookSelected() {
+        $this->webhook_name = $this->webhook_text[$this->webhook_selected]['name'];
+        $this->webhook_icon = $this->webhook_text[$this->webhook_selected]["icon"]; ;
+        $this->webhook_placeholder = $this->webhook_text[$this->webhook_selected]["placeholder"];
+        $this->webhook_link = $this->webhook_text[$this->webhook_selected]["link"];
+        if($this->webhook_selected != 'slack'){
+            $this->isDisabled= '';
+            $this->save_button = trans('general.save');
+        }
+    }
+
+    private function isButtonDisabled() {
+        if($this->webhook_selected == 'slack') {
+            if (empty($this->webhook_endpoint)) {
+                $this->isDisabled = 'disabled';
+                $this->save_button = trans('admin/settings/general.webhook_presave');
+            }
+            if (empty($this->webhook_channel)) {
+                $this->isDisabled = 'disabled';
+                $this->save_button = trans('admin/settings/general.webhook_presave');
+            }
+        }
+
+    }
+
+    public function render()
+    {
+        $this->isButtonDisabled();
+        return view('livewire.slack-settings-form');
+    }
+
+    public function testWebhook(){
+
+        $webhook = new Client([
+            'base_url' => e($this->webhook_endpoint),
+            'defaults' => [
+                'exceptions' => false,
+            ],
+        ]);
+
+        $payload = json_encode(
+            [
+                'channel'    => e($this->webhook_channel),
+                'text'       => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
+                'username'    => e($this->webhook_botname),
+                'icon_emoji' => ':heart:',
+            ]);
+
+        try {
+
+            $webhook->post($this->webhook_endpoint, ['body' => $payload]);
+            $this->isDisabled='';
+            $this->save_button = trans('general.save');
+            return session()->flash('success' , 'Your '.$this->webhook_name.' Integration works!');
+
+        } catch (\Exception $e) {
+
+            $this->isDisabled= 'disabled';
+            return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name]));
+        }
+
+        return session()->flash('error' , trans('admin/settings/message.webhook.error_misc'));
+
+    }
+
+    public function clearSettings(){
+
+        if (Helper::isDemoMode()) {
+            session()->flash('error',trans('general.feature_disabled'));
+        } else {
+            $this->webhook_endpoint = '';
+            $this->webhook_channel = '';
+            $this->webhook_botname = '';
+            $this->setting->webhook_endpoint = '';
+            $this->setting->webhook_channel = '';
+            $this->setting->webhook_botname = '';
+
+            $this->setting->save();
+
+            session()->flash('success', trans('admin/settings/message.update.success'));
+        }
+    }
+
+    public function submit()
+    {
+        if (Helper::isDemoMode()) {
+            session()->flash('error',trans('general.feature_disabled'));
+        } else {
+            if ($this->webhook_selected != 'general') {
+                $this->validate($this->rules);
+            }
+
+            $this->setting->webhook_selected = $this->webhook_selected;
+            $this->setting->webhook_endpoint = $this->webhook_endpoint;
+            $this->setting->webhook_channel = $this->webhook_channel;
+            $this->setting->webhook_botname = $this->webhook_botname;
+
+            $this->setting->save();
+
+            session()->flash('success',trans('admin/settings/message.update.success'));
+
+        }
+
+    }
+}
diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php
index b4beb70588..4e399ffcff 100644
--- a/app/Http/Middleware/CheckForSetup.php
+++ b/app/Http/Middleware/CheckForSetup.php
@@ -20,13 +20,13 @@ class CheckForSetup
 
         if (Setting::setupCompleted()) {
             if ($request->is('setup*')) {
-                return redirect(url('/'));
+                return redirect(config('app.url'));
             } else {
                 return $next($request);
             }
         } else {
             if (! ($request->is('setup*')) && ! ($request->is('.env')) && ! ($request->is('health'))) {
-                return redirect(url('/').'/setup');
+                return redirect(config('app.url').'/setup');
             }
 
             return $next($request);
diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.php
index fd630ef10c..2b72deb8a9 100644
--- a/app/Http/Middleware/CheckForTwoFactor.php
+++ b/app/Http/Middleware/CheckForTwoFactor.php
@@ -11,7 +11,7 @@ class CheckForTwoFactor
     /**
      * Routes to ignore for Two Factor Auth
      */
-    const IGNORE_ROUTES = ['two-factor', 'two-factor-enroll', 'setup', 'logout'];
+    public const IGNORE_ROUTES = ['two-factor', 'two-factor-enroll', 'setup', 'logout'];
 
     /**
      * Handle an incoming request.
diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php
index 48df11ba51..a51484f283 100644
--- a/app/Http/Middleware/CheckPermissions.php
+++ b/app/Http/Middleware/CheckPermissions.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 
 class CheckPermissions
 {
diff --git a/app/Http/Requests/AssetFileRequest.php b/app/Http/Requests/AssetFileRequest.php
index f8631f23ba..697b49f3d6 100644
--- a/app/Http/Requests/AssetFileRequest.php
+++ b/app/Http/Requests/AssetFileRequest.php
@@ -24,7 +24,7 @@ class AssetFileRequest extends Request
         $max_file_size = \App\Helpers\Helper::file_upload_max_size();
 
         return [
-          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,webp|max:'.$max_file_size,
+          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,json,webp|max:'.$max_file_size,
         ];
     }
 }
diff --git a/app/Http/Requests/CustomFieldRequest.php b/app/Http/Requests/CustomFieldRequest.php
index 7c6ba1e97e..0c2ec0ae60 100644
--- a/app/Http/Requests/CustomFieldRequest.php
+++ b/app/Http/Requests/CustomFieldRequest.php
@@ -26,6 +26,8 @@ class CustomFieldRequest extends FormRequest
     {
         $rules = [];
 
+        $rules['associate_fieldsets.*'] = 'nullable|integer|exists:custom_fieldsets,id';
+
         switch ($this->method()) {
 
             // Brand new
@@ -54,4 +56,11 @@ class CustomFieldRequest extends FormRequest
 
         return  $rules;
     }
+
+    public function messages()
+    {
+        return [
+            'associate_fieldsets.*.exists' => trans('admin/custom_fields/message/does_not_exist'),
+        ];
+    }
 }
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 1b0b051366..b3cd6e102c 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -7,7 +7,9 @@ use enshrined\svgSanitize\Sanitizer;
 use Intervention\Image\Facades\Image;
 use App\Http\Traits\ConvertsBase64ToFiles;
 use Illuminate\Http\UploadedFile;
-use Storage;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Exception\NotReadableException;
+
 
 class ImageUploadRequest extends Request
 {
@@ -63,11 +65,13 @@ class ImageUploadRequest extends Request
      * @param string $path  location for uploaded images, defaults to uploads/plural of item type.
      * @return SnipeModel        Target asset is being checked out to.
      */
-    public function handleImages($item, $w = 600, $form_fieldname = null, $path = null, $db_fieldname = 'image')
+    public function handleImages($item, $w = 600, $form_fieldname = 'image', $path = null, $db_fieldname = 'image')
     {
+
         $type = strtolower(class_basename(get_class($item)));
 
         if (is_null($path)) {
+
             $path = str_plural($type);
 
             if ($type == 'assetmodel') {
@@ -79,49 +83,47 @@ class ImageUploadRequest extends Request
             }
         }
 
-        if (is_null($form_fieldname)) {
-            $form_fieldname = 'image';
-        }
-
-        // This is dumb, but we need it for overriding field names for exceptions like avatars and logo uploads
-        if (is_null($db_fieldname)) {
-            $use_db_field = $form_fieldname;
-        } else {
-            $use_db_field = $db_fieldname;
-        }
-
-        
-        // ConvertBase64ToFiles just changes object type, 
-        // as it cannot currently insert files to $this->files
         if ($this->offsetGet($form_fieldname) instanceof UploadedFile) {
-           $image=$this->offsetGet($form_fieldname);
+           $image = $this->offsetGet($form_fieldname);
+           \Log::debug('Image is an instance of UploadedFile');
+        } elseif ($this->hasFile($form_fieldname)) {
+            $image = $this->file($form_fieldname);
+            \Log::debug('Just use regular upload for '.$form_fieldname);
         } else {
-            if ($this->hasFile($form_fieldname)) {
-                $image = $this->file($form_fieldname);
-            }
+            \Log::debug('No image found for form fieldname: '.$form_fieldname);
         }
 
         if (isset($image)) {
-            \Log::debug($image);
 
             if (!config('app.lock_passwords')) {
 
                 $ext = $image->getClientOriginalExtension();
-                $file_name = $type.'-'.$form_fieldname.'-'.str_random(10).'.'.$ext;
+                $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->getClientOriginalExtension() !== 'webp') && ($image->getClientOriginalExtension() !== 'svg')) {
+
                     \Log::debug('Not an SVG or webp - resize');
                     \Log::debug('Trying to upload to: '.$path.'/'.$file_name);
-                    $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                     });
+
+                    try {
+                        $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) {
+                            $constraint->aspectRatio();
+                            $constraint->upsize();
+                        });
+                    } catch(NotReadableException $e) {
+                        \Log::debug($e);
+                        $validator = \Validator::make([], []);
+                        $validator->errors()->add($form_fieldname, trans('general.unaccepted_image_type', ['mimetype' => $image->getClientMimeType()]));
+
+                        throw new \Illuminate\Validation\ValidationException($validator);
+                    }
 
                     // This requires a string instead of an object, so we use ($string)
                     Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode());
+
                 } else {
                     // If the file is a webp, we need to just move it since webp support
                     // needs to be compiled into gd for resizing to be available
@@ -146,30 +148,30 @@ class ImageUploadRequest extends Request
                 }
 
                  // Remove Current image if exists
-                if (($item->{$use_db_field}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$use_db_field}))) {
+                if (($item->{$form_fieldname}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$db_fieldname}))) {
                     \Log::debug('A file already exists that we are replacing - we should delete the old one.');
                     try {
-                         Storage::disk('public')->delete($path.'/'.$item->{$use_db_field});
+                         Storage::disk('public')->delete($path.'/'.$item->{$form_fieldname});
                          \Log::debug('Old file '.$path.'/'.$file_name.' has been deleted.');
                     } catch (\Exception $e) {
                         \Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?');
                     }
                 }
 
-                $item->{$use_db_field} = $file_name;
+                $item->{$db_fieldname} = $file_name;
             }
 
+
         // If the user isn't uploading anything new but wants to delete their old image, do so
-        } else {
-            if ($this->input('image_delete') == '1') {
-                \Log::debug('Deleting image');
-                try {
-                    Storage::disk('public')->delete($path.'/'.$item->{$use_db_field});
-                        $item->{$use_db_field} = null;
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                }
+        } elseif ($this->input('image_delete') == '1') {
+            \Log::debug('Deleting image');
+            try {
+                Storage::disk('public')->delete($path.'/'.$item->{$db_fieldname});
+                    $item->{$db_fieldname} = null;
+            } catch (\Exception $e) {
+                \Log::debug($e);
             }
+
         }
 
         return $item;
diff --git a/app/Http/Requests/SaveUserRequest.php b/app/Http/Requests/SaveUserRequest.php
index b6e44c3f44..98e561549e 100644
--- a/app/Http/Requests/SaveUserRequest.php
+++ b/app/Http/Requests/SaveUserRequest.php
@@ -39,14 +39,12 @@ class SaveUserRequest extends FormRequest
 
             // Brand new user
             case 'POST':
-            {
                 $rules['first_name'] = 'required|string|min:1';
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                 if ($this->request->get('ldap_import') == false) {
                     $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed';
                 }
                 break;
-            }
 
             // Save all fields
             case 'PUT':
@@ -57,12 +55,11 @@ class SaveUserRequest extends FormRequest
 
             // Save only what's passed
             case 'PATCH':
-            {
                 $rules['password'] = Setting::passwordComplexityRulesSaving('update');
                 break;
-            }
 
-            default:break;
+            default:
+                break;
         }
 
         return $rules;
diff --git a/app/Http/Requests/SlackSettingsRequest.php b/app/Http/Requests/SlackSettingsRequest.php
deleted file mode 100644
index 1f44215198..0000000000
--- a/app/Http/Requests/SlackSettingsRequest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-class SlackSettingsRequest extends Request
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:"https://hooks.slack.com"|nullable',
-            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
-            'slack_botname'                       => 'string|nullable',
-
-        ];
-    }
-
-
-}
diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index 6f254b3b87..7b79973a9a 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Accessory;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -32,13 +32,14 @@ class AccessoriesTransformer
             'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null,
             'category' => ($accessory->category) ? ['id' => $accessory->category->id, 'name'=> e($accessory->category->name)] : null,
             'location' => ($accessory->location) ? ['id' => $accessory->location->id, 'name'=> e($accessory->location->name)] : null,
-            'notes' => ($accessory->notes) ? e($accessory->notes) : null,
+            'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedownInline($accessory->notes) : null,
             'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
             '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' => $accessory->numRemaining(),
+            'remaining_qty' => (int) $accessory->numRemaining(),
+            'users_count' =>  $accessory->users_count,
 
             'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'),
@@ -50,6 +51,8 @@ class AccessoriesTransformer
             'checkin' =>  false,
             'update' => Gate::allows('update', Accessory::class),
             'delete' => Gate::allows('delete', Accessory::class),
+            'clone' => Gate::allows('create', Accessory::class),
+            
         ];
 
         $permissions_array['user_can_checkout'] = false;
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index c58760d4de..7b7a7fc011 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -60,12 +60,14 @@ class ActionlogsTransformer
             if ($actionlog->action_type == 'accepted') {
                 $file_url = route('log.storedeula.download', ['filename' => $actionlog->filename]);
             } else {
-                if ($actionlog->itemType() == 'asset') {
-                    $file_url = route('show/assetfile', ['assetId' => $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]);
+                if ($actionlog->item) {
+                    if ($actionlog->itemType() == 'asset') {
+                        $file_url = route('show/assetfile', ['assetId' => $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]);
+                    }
                 }
             }
         }
@@ -108,7 +110,7 @@ class ActionlogsTransformer
                 'type' => e($actionlog->targetType()),
             ] : null,
 
-            'note'          => ($actionlog->note) ? e($actionlog->note): null,
+            'note'          => ($actionlog->note) ? Helper::parseEscapedMarkedownInline($actionlog->note): null,
             'signature_file'   => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
             'log_meta'          => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
             'action_date'   => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
index 72ec786f68..fa92640823 100644
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -5,7 +5,7 @@ namespace App\Http\Transformers;
 use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class AssetMaintenancesTransformer
@@ -45,7 +45,11 @@ class AssetMaintenancesTransformer
                 'name'=> e($assetmaintenance->asset->location->name),
 
             ] : null,
-            'notes'         => ($assetmaintenance->notes) ? e($assetmaintenance->notes) : null,
+            'rtd_location' => ($assetmaintenance->asset->defaultLoc) ? [
+                'id' => (int) $assetmaintenance->asset->defaultLoc->id,
+                '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,
             'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
             'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
@@ -55,6 +59,7 @@ class AssetMaintenancesTransformer
             'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id, 'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
             'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
+            'is_warranty'=> $assetmaintenance->is_warranty,
 
         ];
 
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index d694ac5b49..f3a658c872 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\AssetModel;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -63,7 +63,7 @@ class AssetModelsTransformer
             'default_fieldset_values' => $default_field_values,
             'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
             'requestable' => ($assetmodel->requestable == '1') ? true : false,
-            'notes' => e($assetmodel->notes),
+            'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
             'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
             'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'),
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index a36d0ab89b..869666d7a0 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -5,7 +5,7 @@ namespace App\Http\Transformers;
 use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\Setting;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 
@@ -38,7 +38,8 @@ class AssetsTransformer
             'byod' => ($asset->byod ? true : false),
 
             'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
-            'eol' => ($asset->purchase_date != '') ? Helper::getFormattedDateObject($asset->present()->eol_date(), 'date') : null,
+            'eol' => (($asset->model) && ($asset->model->eol != '')) ? $asset->model->eol : 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,
                 'name'=> e($asset->assetstatus->name),
@@ -57,7 +58,7 @@ class AssetsTransformer
                 'id' => (int) $asset->supplier->id,
                 'name'=> e($asset->supplier->name),
             ] : null,
-            'notes' => ($asset->notes) ? e($asset->notes) : null,
+            'notes' => ($asset->notes) ? Helper::parseEscapedMarkedownInline($asset->notes) : null,
             'order_number' => ($asset->order_number) ? e($asset->order_number) : null,
             'company' => ($asset->company) ? [
                 'id' => (int) $asset->company->id,
@@ -83,7 +84,7 @@ class AssetsTransformer
             '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 ? Helper::AgeFormat($asset->purchase_date) : '',
+            'age' => $asset->purchase_date ? $asset->purchase_date->diffForHumans() : '',
             'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
             'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
             'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost),
@@ -91,6 +92,7 @@ class AssetsTransformer
             'checkout_counter' => (int) $asset->checkout_counter,
             'requests_counter' => (int) $asset->requests_counter,
             'user_can_checkout' => (bool) $asset->availableForCheckout(),
+            'book_value' => Helper::formatCurrencyOutput($asset->getLinearDepreciatedValue()),
         ];
 
 
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index 5ea8ee3e01..d5e1ceb51b 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Category;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -38,6 +38,9 @@ class CategoriesTransformer
             case 'component':
                 $category->item_count = $category->components_count;
                 break;
+            case 'license':
+                $category->item_count = $category->licenses_count;
+                break;
             default:
                 $category->item_count = 0;
         }
@@ -47,7 +50,7 @@ class CategoriesTransformer
                 'id' => (int) $category->id,
                 'name' => e($category->name),
                 'image' =>   ($category->image) ? Storage::disk('public')->url('categories/'.e($category->image)) : null,
-                'category_type' => ucwords(e($category->category_type)),
+                'category_type' => Helper::categoryTypeList($category->category_type),
                 'has_eula' => ($category->getEula() ? true : false),
                 'use_default_eula' => ($category->use_default_eula=='1' ? true : false),
                 'eula' => ($category->getEula()),
diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php
index bafe1f9f68..4726630c4e 100644
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Company;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -26,6 +26,8 @@ class CompaniesTransformer
             $array = [
                 'id' => (int) $company->id,
                 'name' => e($company->name),
+                'phone' => ($company->phone!='') ? e($company->phone): null,
+                'fax' => ($company->fax!='') ? e($company->fax): 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'),
diff --git a/app/Http/Transformers/ComponentsAssetsTransformer.php b/app/Http/Transformers/ComponentsAssetsTransformer.php
index c2c7784fe4..437d00ca22 100644
--- a/app/Http/Transformers/ComponentsAssetsTransformer.php
+++ b/app/Http/Transformers/ComponentsAssetsTransformer.php
@@ -3,7 +3,7 @@
 namespace App\Http\Transformers;
 
 use App\Models\Asset;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class ComponentsAssetsTransformer
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index 20e2fc4abb..d18870bdc3 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Component;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -37,6 +37,7 @@ class ComponentsTransformer
                 'id' => (int) $component->category->id,
                 'name' => e($component->category->name),
             ] : null,
+            'supplier' => ($component->supplier) ? ['id' => $component->supplier->id, 'name'=> e($component->supplier->name)] : null,
             'order_number'  => e($component->order_number),
             'purchase_date' =>  Helper::getFormattedDateObject($component->purchase_date, 'date'),
             'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
@@ -45,7 +46,7 @@ class ComponentsTransformer
                 'id' => (int) $component->company->id,
                 'name' => e($component->company->name),
             ] : null,
-            'notes' => ($component->notes) ? e($component->notes) : null,
+            'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : 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,
diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php
index b6c3d18748..f23ebc0382 100644
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Consumable;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -31,6 +31,7 @@ class ConsumablesTransformer
             'item_no'       => e($consumable->item_no),
             'location'      => ($consumable->location) ? ['id' => (int) $consumable->location->id, 'name' => e($consumable->location->name)] : null,
             'manufacturer'  => ($consumable->manufacturer) ? ['id' => (int) $consumable->manufacturer->id, 'name' => e($consumable->manufacturer->name)] : null,
+            'supplier' => ($consumable->supplier) ? ['id' => $consumable->supplier->id, 'name'=> e($consumable->supplier->name)] : null,
             'min_amt'       => (int) $consumable->min_amt,
             'model_number'  => ($consumable->model_number != '') ? e($consumable->model_number) : null,
             'remaining'  => $consumable->numRemaining(),
@@ -38,7 +39,7 @@ class ConsumablesTransformer
             'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
             'purchase_date'  => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
             'qty'           => (int) $consumable->qty,
-            'notes'         => ($consumable->notes) ? e($consumable->notes) : null,
+            'notes'         => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null,
             'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
         ];
diff --git a/app/Http/Transformers/CustomFieldsTransformer.php b/app/Http/Transformers/CustomFieldsTransformer.php
index 9ada5183ab..d6401a3e5e 100644
--- a/app/Http/Transformers/CustomFieldsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsTransformer.php
@@ -48,6 +48,8 @@ class CustomFieldsTransformer
             'type'   =>  e($field->element),
             'required'   =>  (($field->pivot) && ($field->pivot->required=='1')) ? true : false,
             '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,
             '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 4f80249adf..546cedf04f 100644
--- a/app/Http/Transformers/DepartmentsTransformer.php
+++ b/app/Http/Transformers/DepartmentsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Department;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -26,6 +26,8 @@ class DepartmentsTransformer
             $array = [
                 'id' => (int) $department->id,
                 'name' => e($department->name),
+                'phone' => ($department->phone!='') ? e($department->phone): null,
+                'fax' => ($department->fax!='') ? e($department->fax): null,
                 'image' =>   ($department->image) ? Storage::disk('public')->url(app('departments_upload_url').e($department->image)) : null,
                 'company' => ($department->company) ? [
                     'id' => (int) $department->company->id,
diff --git a/app/Http/Transformers/DepreciationsTransformer.php b/app/Http/Transformers/DepreciationsTransformer.php
index 71aa6c97f7..78a01b4c1e 100644
--- a/app/Http/Transformers/DepreciationsTransformer.php
+++ b/app/Http/Transformers/DepreciationsTransformer.php
@@ -5,7 +5,7 @@ namespace App\Http\Transformers;
 use App\Helpers\Helper;
 use App\Models\Depreciable;
 use App\Models\Depreciation;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class DepreciationsTransformer
diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php
index 313ad113ec..81755afa43 100644
--- a/app/Http/Transformers/GroupsTransformer.php
+++ b/app/Http/Transformers/GroupsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Group;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class GroupsTransformer
diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php
index 126361b17a..f82fd3a49f 100644
--- a/app/Http/Transformers/LicenseSeatsTransformer.php
+++ b/app/Http/Transformers/LicenseSeatsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Models\License;
 use App\Models\LicenseSeat;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class LicenseSeatsTransformer
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index 3fb2a8943b..f68ad738d8 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\License;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class LicensesTransformer
@@ -34,7 +34,7 @@ class LicensesTransformer
             'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
             'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost),
             'purchase_cost_numeric' => $license->purchase_cost,
-            'notes' => e($license->notes),
+            'notes' => Helper::parseEscapedMarkedownInline($license->notes),
             'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
             'seats' => (int) $license->seats,
             'free_seats_count' => (int) $license->free_seats_count,
@@ -56,7 +56,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),
+            'delete' => (Gate::allows('delete', License::class) && ($license->seats == $license->availCount()->count())) ? true : false,
         ];
 
         $array += $permissions_array;
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
index a55c41b350..635a90cbc7 100644
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Location;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -43,6 +43,8 @@ class LocationsTransformer
                 'state' =>  ($location->state) ? e($location->state) : null,
                 'country' => ($location->country) ? e($location->country) : null,
                 'zip' => ($location->zip) ? e($location->zip) : null,
+                'phone' => ($location->phone!='') ? e($location->phone): null,
+                'fax' => ($location->fax!='') ? e($location->fax): null,
                 'assigned_assets_count' => (int) $location->assigned_assets_count,
                 'assets_count'    => (int) $location->assets_count,
                 'rtd_assets_count'    => (int) $location->rtd_assets_count,
@@ -63,6 +65,7 @@ class LocationsTransformer
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Location::class) ? true : false,
                 'delete' => $location->isDeletable(),
+                'clone' => (Gate::allows('create', Location::class) && ($location->deleted_at == '')),
             ];
 
             $array += $permissions_array;
diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php
index a7ac0e6a42..9c84fd50fe 100644
--- a/app/Http/Transformers/ManufacturersTransformer.php
+++ b/app/Http/Transformers/ManufacturersTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Manufacturer;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -29,6 +29,7 @@ class ManufacturersTransformer
                 'url' => e($manufacturer->url),
                 'image' =>   ($manufacturer->image) ? Storage::disk('public')->url('manufacturers/'.e($manufacturer->image)) : null,
                 'support_url' => e($manufacturer->support_url),
+                'warranty_lookup_url' => e($manufacturer->warranty_lookup_url),
                 'support_phone' => e($manufacturer->support_phone),
                 'support_email' => e($manufacturer->support_email),
                 'assets_count' => (int) $manufacturer->assets_count,
diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php
index ebd91aef0c..a5d37e5c72 100644
--- a/app/Http/Transformers/PredefinedKitsTransformer.php
+++ b/app/Http/Transformers/PredefinedKitsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Models\PredefinedKit;
 use App\Models\SnipeModel;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 /**
diff --git a/app/Http/Transformers/StatuslabelsTransformer.php b/app/Http/Transformers/StatuslabelsTransformer.php
index cc229a590f..41dd336068 100644
--- a/app/Http/Transformers/StatuslabelsTransformer.php
+++ b/app/Http/Transformers/StatuslabelsTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Statuslabel;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class StatuslabelsTransformer
diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php
index 76b2a01514..1fdc93c193 100644
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Supplier;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -41,7 +41,9 @@ class SuppliersTransformer
                 'assets_count' => (int) $supplier->assets_count,
                 'accessories_count' => (int) $supplier->accessories_count,
                 'licenses_count' => (int) $supplier->licenses_count,
-                'notes' => ($supplier->notes) ? e($supplier->notes) : null,
+                'consumables_count' => (int) $supplier->consumables_count,
+                'components_count' => (int) $supplier->components_count,
+                'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
                 'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),
 
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index f8636cc574..76c0288073 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -4,7 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\User;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 
 class UsersTransformer
@@ -36,6 +36,7 @@ class UsersTransformer
                     'name'=> e($user->manager->first_name).' '.e($user->manager->last_name),
                 ] : null,
                 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null,
+                'vip' => ($user->vip == '1') ? true : false,
                 'phone' => ($user->phone) ? e($user->phone) : null,
                 'website' => ($user->website) ? e($user->website) : null,
                 'address' => ($user->address) ? e($user->address) : null,
@@ -52,9 +53,10 @@ class UsersTransformer
                     'id' => (int) $user->userloc->id,
                     'name'=> e($user->userloc->name),
                 ] : null,
-                'notes'=> e($user->notes),
+                'notes'=> Helper::parseEscapedMarkedownInline($user->notes),
                 'permissions' => $user->decodePermissions(),
                 'activated' => ($user->activated == '1') ? true : false,
+                'autoassign_licenses' => ($user->autoassign_licenses == '1') ? true : false,
                 'ldap_import' => ($user->ldap_import == '1') ? true : false,
                 'two_factor_enrolled' => ($user->two_factor_active_and_enrolled()) ? true : false,
                 'two_factor_optin' => ($user->two_factor_active()) ? true : false,
diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php
index 10f3883bcc..be19455618 100644
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -12,7 +12,10 @@ class AssetImporter extends ItemImporter
     public function __construct($filename)
     {
         parent::__construct($filename);
-        $this->defaultStatusLabelId = Statuslabel::first()->id;
+
+        if (!is_null(Statuslabel::first())) {
+            $this->defaultStatusLabelId = Statuslabel::first()->id;
+        }
     }
 
     protected function handle($row)
@@ -60,7 +63,7 @@ class AssetImporter extends ItemImporter
             $asset_tag = Asset::autoincrement_asset();
         }
 
-        $asset = Asset::where(['asset_tag'=> $asset_tag])->first();
+        $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first();
         if ($asset) {
             if (! $this->updating) {
                 $this->log('A matching Asset '.$asset_tag.' already exists');
@@ -76,10 +79,12 @@ class AssetImporter extends ItemImporter
         }
         $this->item['notes'] = $this->findCsvMatch($row, 'asset_notes');
         $this->item['image'] = $this->findCsvMatch($row, 'image');
-        $this->item['requestable'] = $this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable'));
-        $asset->requestable = $this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable'));
+        $this->item['requestable'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable')) == 1) ? '1' : 0;
+        $asset->requestable = $this->item['requestable'];
         $this->item['warranty_months'] = intval($this->findCsvMatch($row, 'warranty_months'));
         $this->item['model_id'] = $this->createOrFetchAssetModel($row);
+        $this->item['byod'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'byod')) == 1) ? '1' : 0;
+
 
         // If no status ID is found
         if (! array_key_exists('status_id', $this->item) && ! $editingAsset) {
@@ -112,6 +117,11 @@ class AssetImporter extends ItemImporter
             $item['next_audit_date'] = $this->item['next_audit_date'];
         }
 
+        $item['asset_eol_date'] = null;
+        if (isset($this->item['asset_eol_date'])) {
+            $item['asset_eol_date'] = $this->item['asset_eol_date'];
+        }
+
         if ($editingAsset) {
             $asset->update($item);
         } else {
@@ -125,17 +135,16 @@ class AssetImporter extends ItemImporter
             }
         }
 
-        //FIXME: this disables model validation.  Need to find a way to avoid double-logs without breaking everything.
-        // $asset->unsetEventDispatcher();
+
         if ($asset->save()) {
-            $asset->logCreate('Imported using csv importer');
+            $asset->logCreate(trans('general.importer.import_note'));
             $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 setted by
             //-- the class that needs to use it (command importer or GUI importer inside the project).
             if (isset($target)) {
-                $asset->fresh()->checkOut($target, $this->user_id, date('Y-m-d H:i:s'));
+                $asset->fresh()->checkOut($target, $this->user_id, date('Y-m-d H:i:s'), null, $asset->notes, $asset->name);
             }
 
             return;
diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php
index 1ee90b399c..4c60f0beed 100644
--- a/app/Importer/Importer.php
+++ b/app/Importer/Importer.php
@@ -27,57 +27,14 @@ abstract class Importer
     protected $updating;
     /**
      * Default Map of item fields->csv names
+     *
+     * This has been moved into Livewire/Importer.php to be more granular.
+     * @todo - remove references to this property since we don't use it anymore.
+     *
      * @var array
      */
     private $defaultFieldMap = [
-        'asset_tag' => 'asset tag',
-        'activated' => 'activated',
-        'category' => 'category',
-        'checkout_class' => 'checkout type', // Supports Location or User for assets.  Using checkout_class instead of checkout_type because type exists on asset already.
-        'checkout_location' => 'checkout location',
-        'company' => 'company',
-        'item_name' => 'item name',
-        'item_number' => 'item number',
-        'image' => 'image',
-        'expiration_date' => 'expiration date',
-        'location' => 'location',
-        'notes' => 'notes',
-        'license_email' => 'licensed to email',
-        'license_name' => 'licensed to name',
-        'maintained' => 'maintained',
-        'manufacturer' => 'manufacturer',
-        'asset_model' => 'model name',
-        'model_number' => 'model number',
-        'order_number' => 'order number',
-        'purchase_cost' => 'purchase cost',
-        'purchase_date' => 'purchase date',
-        'purchase_order' => 'purchase order',
-        'qty' => 'quantity',
-        'reassignable' => 'reassignable',
-        'requestable' => 'requestable',
-        'seats' => 'seats',
-        'serial' => 'serial number',
-        'status' => 'status',
-        'supplier' => 'supplier',
-        'termination_date' => 'termination date',
-        'warranty_months' => 'warranty',
-        'full_name' => 'full name',
-        'email' => 'email',
-        'username' => 'username',
-        'address' => 'address',
-        'city' => 'city',
-        'state' => 'state',
-        'country' => 'country',
-        'jobtitle' => 'job title',
-        'employee_num' => 'employee number',
-        'phone_number' => 'phone number',
-        'first_name' => 'first name',
-        'last_name' => 'last name',
-        'department' => 'department',
-        'manager_first_name' => 'manager first name',
-        'manager_last_name' => 'manager last name',
-        'min_amt' => 'minimum quantity',
-        'remote' => 'remote',
+
     ];
     /**
      * Map of item fields->csv names
@@ -119,7 +76,7 @@ abstract class Importer
         } else {
             $this->csv = Reader::createFromString($file);
         }
-        $this->tempPassword = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20);
+        $this->tempPassword = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 40);
     }
 
     // Cached Values for import lookups
@@ -198,11 +155,11 @@ abstract class Importer
         $val = $default;
         $key = $this->lookupCustomKey($key);
 
-        $this->log("Custom Key: ${key}");
+       // $this->log("Custom Key: ${key}");
         if (array_key_exists($key, $array)) {
             $val = Encoding::toUTF8(trim($array[$key]));
         }
-        $this->log("${key}: ${val}");
+        //$this->log("${key}: ${val}");
         return $val;
     }
 
@@ -280,10 +237,13 @@ abstract class Importer
      * @return User Model w/ matching name
      * @internal param array $user_array User details parsed from csv
      */
-    protected function createOrFetchUser($row)
+    protected function createOrFetchUser($row, $type = 'user')
     {
+
         $user_array = [
             'full_name' => $this->findCsvMatch($row, 'full_name'),
+            'first_name' => $this->findCsvMatch($row, 'first_name'),
+            'last_name' => $this->findCsvMatch($row, 'last_name'),
             'email'     => $this->findCsvMatch($row, 'email'),
             'manager_id'=>  '',
             'department_id' =>  '',
@@ -292,48 +252,53 @@ abstract class Importer
             'remote'    => $this->fetchHumanBoolean(($this->findCsvMatch($row, 'remote'))),
         ];
 
-        // Maybe we're lucky and the user already exists.
-        if ($user = User::where('username', $user_array['username'])->first()) {
-            $this->log('User '.$user_array['username'].' already exists');
-
-            return $user;
+        if ($type == 'manager') {
+            $user_array['full_name'] = $this->findCsvMatch($row, 'manager');
+            $user_array['username'] = $this->findCsvMatch($row, 'manager_username');
         }
 
-        // If the full name is empty, bail out--we need this to extract first name (at the very least)
-        if (empty($user_array['full_name'])) {
-            $this->log('Insufficient user data provided (Full name is required)- skipping user creation, just adding asset');
+        // Maybe we're lucky and the username was passed and it already exists.
+        if (!empty($user_array['username'])) {
+            if ($user = User::where('username', $user_array['username'])->first()) {
+                $this->log('User '.$user_array['username'].' already exists');
+                return $user;
+            }
+        }
 
+
+        // If the full name and username is empty, bail out--we need this to extract first name (at the very least)
+        if ((empty($user_array['username'])) && (empty($user_array['full_name'])) && (empty($user_array['first_name']))) {
+            $this->log('Insufficient user data provided (Full name, first name or username is required) - skipping user creation.');
+            \Log::debug('User array: ');
+            \Log::debug(print_r($user_array, true));
+            \Log::debug(print_r($row, true));
             return false;
         }
 
-        // Is the user actually an ID?
-        if ($user = $this->findUserByNumber($user_array['full_name'])) {
-            return $user;
-        }
-        $this->log('User does not appear to be an id with number: '.$user_array['full_name'].'.  Continuing through our processes');
 
         // Populate email if it does not exist.
         if (empty($user_array['email'])) {
             $user_array['email'] = User::generateEmailFromFullName($user_array['full_name']);
         }
 
-        $user_formatted_array = User::generateFormattedNameFromFullName($user_array['full_name'], Setting::getSettings()->username_format);
-        $user_array['first_name'] = $user_formatted_array['first_name'];
-        $user_array['last_name'] = $user_formatted_array['last_name'];
+        if (empty($user_array['first_name'])) {
+            // Get some fields for first name and last name based off of full name
+            $user_formatted_array = User::generateFormattedNameFromFullName($user_array['full_name'], Setting::getSettings()->username_format);
+            $user_array['first_name'] = $user_formatted_array['first_name'];
+            $user_array['last_name'] = $user_formatted_array['last_name'];
+        }
 
         if (empty($user_array['username'])) {
             $user_array['username'] = $user_formatted_array['username'];
             if ($this->usernameFormat == 'email') {
                 $user_array['username'] = $user_array['email'];
             }
-        }
 
-        // Does this ever actually fire??
-        // Check for a matching user after trying to guess username.
-        if ($user = User::where('username', $user_array['username'])->first()) {
-            $this->log('User '.$user_array['username'].' already exists');
-
-            return $user;
+            // Check for a matching username one more time after trying to guess username.
+            if ($user = User::where('username', $user_array['username'])->first()) {
+                $this->log('User '.$user_array['username'].' already exists');
+                return $user;
+            }
         }
 
         // If at this point we have not found a username or first name, bail out in shame.
@@ -341,7 +306,7 @@ abstract class Importer
             return false;
         }
 
-        // No Luck, let's create one.
+        // 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'];
@@ -356,9 +321,9 @@ abstract class Importer
 
         if ($user->save()) {
             $this->log('User '.$user_array['username'].' created');
-
             return $user;
         }
+
         $this->logError($user, 'User "'.$user_array['username'].'" was not able to be created.');
 
         return false;
diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index d332200368..9e80cb9572 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -60,8 +60,8 @@ class ItemImporter extends Importer
             $this->item['department_id'] = $this->createOrFetchDepartment($item_department);
         }
 
-        $item_manager_first_name = $this->findCsvMatch($row, 'manage_first_name');
-        $item_manager_last_name = $this->findCsvMatch($row, 'manage_last_name');
+        $item_manager_first_name = $this->findCsvMatch($row, 'manager_first_name');
+        $item_manager_last_name = $this->findCsvMatch($row, 'manager_last_name');
 
         if ($this->shouldUpdateField($item_manager_first_name)) {
             $this->item['manager_id'] = $this->fetchManager($item_manager_first_name, $item_manager_last_name);
@@ -74,7 +74,7 @@ class ItemImporter extends Importer
 
         $this->item['purchase_date'] = null;
         if ($this->findCsvMatch($row, 'purchase_date') != '') {
-            $this->item['purchase_date'] = date('Y-m-d 00:00:01', strtotime($this->findCsvMatch($row, 'purchase_date')));
+            $this->item['purchase_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'purchase_date')));
         }
 
         $this->item['last_audit_date'] = null;
@@ -87,10 +87,15 @@ class ItemImporter extends Importer
             $this->item['next_audit_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'next_audit_date')));
         }
 
+        $this->item['asset_eol_date'] = null;
+        if ($this->findCsvMatch($row, 'asset_eol_date') != '') {
+            $this->item['asset_eol_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'asset_eol_date')));
+        }
+
         $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 number');
+        $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');
@@ -103,13 +108,13 @@ class ItemImporter extends Importer
     /**
      * Parse row to determine what (if anything) we should checkout to.
      * @param  array $row CSV Row being parsed
-     * @return SnipeModel      Model to be checked out to
+     * @return ?SnipeModel      Model to be checked out to
      */
     protected function determineCheckout($row)
     {
-        // We only support checkout-to-location for asset, so short circuit otherwise.
-        if (get_class($this) != AssetImporter::class) {
-            return $this->createOrFetchUser($row);
+        // Locations don't get checked out to anyone/anything
+        if (get_class($this) == LocationImporter::class) {
+            return;
         }
 
         if (strtolower($this->item['checkout_class']) === 'location' && $this->findCsvMatch($row, 'checkout_location') != null ) {
@@ -222,11 +227,11 @@ class ItemImporter extends Importer
             $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
             $item['name'] = $asset_model_name;
             $item['notes'] = $this->findCsvMatch($row, 'model_notes');
-            
+
             if(!empty($asset_modelNumber)){
                 $item['model_number'] = $asset_modelNumber;
             }
-            
+
             $asset_model->update($item);
             $asset_model->save();
             $this->log('Asset Model Updated');
diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php
index 894c50bbfa..ce07585ab5 100644
--- a/app/Importer/LicenseImporter.php
+++ b/app/Importer/LicenseImporter.php
@@ -27,15 +27,24 @@ class LicenseImporter extends ItemImporter
      * @since 4.0
      * @param array $row
      * @return License|mixed|null
+     * updated @author Jes Vinsmoke
+     * @since 6.1
+     *
      */
     public function createLicenseIfNotExists(array $row)
     {
         $editingLicense = false;
-        $license = License::where('name', $this->item['name'])
+        $license = License::where('serial', $this->item['serial'])->where('name', $this->item['name'])
                     ->first();
         if ($license) {
             if (! $this->updating) {
-                $this->log('A matching License '.$this->item['name'].' with serial '.$this->item['serial'].' already exists');
+
+                if($this->item['serial'] != "") {
+                    $this->log('A matching License ' . $this->item['name'] . ' with serial ' . $this->item['serial'] . ' already exists');
+                }
+                else {
+                    $this->log('A matching License ' . $this->item['name'] . ' with no serial number already exists');
+                }
 
                 return;
             }
@@ -57,6 +66,12 @@ class LicenseImporter extends ItemImporter
         $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
         $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
         $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
+        $this->item['manufacturer'] = $this->createOrFetchManufacturer($this->findCsvMatch($row, 'manufacturer'));
+
+        if($this->item['reassignable'] == "")
+        {
+            $this->item['reassignable'] = 1;
+        }
         $this->item['seats'] = $this->findCsvMatch($row, 'seats');
         
         $this->item["termination_date"] = null;
@@ -80,6 +95,11 @@ class LicenseImporter extends ItemImporter
                 $checkout_target = $this->item['checkout_target'];
                 $asset = Asset::where('asset_tag', $asset_tag)->first();
                 $targetLicense = $license->freeSeat();
+
+                if (is_null($targetLicense)){
+                    return;
+                }
+
                 if ($checkout_target) {
                     $targetLicense->assigned_to = $checkout_target->id;
                     $targetLicense->user_id = Auth::id();
diff --git a/app/Importer/LocationImporter.php b/app/Importer/LocationImporter.php
new file mode 100644
index 0000000000..25140abe00
--- /dev/null
+++ b/app/Importer/LocationImporter.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Importer;
+
+use App\Models\Location;
+
+/**
+ * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
+ * Importer\Importer.php. [ALG]
+ *
+ * Class LocationImporter
+ */
+class LocationImporter extends ItemImporter
+{
+    protected $locations;
+
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+
+    protected function handle($row)
+    {
+        parent::handle($row);
+        $this->createLocationIfNotExists($row);
+    }
+
+    /**
+     * Create a location if a duplicate does not exist.
+     * @todo Investigate how this should interact with Importer::createLocationIfNotExists
+     *
+     * @author A. Gianotto
+     * @since 6.1.0
+     * @param array $row
+     */
+    public function createLocationIfNotExists(array $row)
+    {
+
+        $editingLocation = false;
+        $location = Location::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
+
+        if ($location) {
+            if (! $this->updating) {
+                $this->log('A matching Location '.$this->item['name'].' already exists');
+                return;
+            }
+
+            $this->log('Updating Location');
+            $editingLocation = true;
+        } else {
+            $this->log('No Matching Location, Create a new one');
+            $location = new Location;
+        }
+
+        // Pull the records from the CSV to determine their values
+        $this->item['name'] = $this->findCsvMatch($row, 'name');
+        $this->item['address'] = $this->findCsvMatch($row, 'address');
+        $this->item['address2'] = $this->findCsvMatch($row, 'address2');
+        $this->item['city'] = $this->findCsvMatch($row, 'city');
+        $this->item['state'] = $this->findCsvMatch($row, 'state');
+        $this->item['country'] = $this->findCsvMatch($row, 'country');
+        $this->item['zip'] = $this->findCsvMatch($row, 'zip');
+        $this->item['currency'] = $this->findCsvMatch($row, 'currency');
+        $this->item['ldap_ou'] = $this->findCsvMatch($row, 'ldap_ou');
+        $this->item['manager'] = $this->findCsvMatch($row, 'manager');
+        $this->item['manager_username'] = $this->findCsvMatch($row, 'manager_username');
+        $this->item['user_id'] = \Auth::user()->id;
+
+        if ($this->findCsvMatch($row, 'parent_location')) {
+            $this->item['parent_id'] = $this->createOrFetchLocation($this->findCsvMatch($row, 'parent_location'));
+        }
+
+        if (!empty($this->item['manager'])) {
+            if ($manager = $this->createOrFetchUser($row, 'manager')) {
+                $this->item['manager_id'] = $manager->id;
+            }
+        }
+
+        \Log::debug('Item array is: ');
+        \Log::debug(print_r($this->item, true));
+
+
+        if ($editingLocation) {
+            \Log::debug('Updating existing location');
+            $location->update($this->sanitizeItemForUpdating($location));
+        } else {
+            \Log::debug('Creating location');
+            $location->fill($this->sanitizeItemForStoring($location));
+        }
+
+        if ($location->save()) {
+            $this->log('Location '.$location->name.' created or updated from CSV import');
+            return $location;
+
+        } else {
+            \Log::debug($location->getErrors());
+            return $location->errors;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index b062c16bca..e13d4c4cce 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -42,22 +42,30 @@ class UserImporter extends ItemImporter
     public function createUserIfNotExists(array $row)
     {
         // Pull the records from the CSV to determine their values
+        $this->item['id'] = $this->findCsvMatch($row, 'id');
         $this->item['username'] = $this->findCsvMatch($row, 'username');
         $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
         $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
         $this->item['email'] = $this->findCsvMatch($row, 'email');
+        $this->item['gravatar'] = $this->findCsvMatch($row, 'gravatar');
         $this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
+        $this->item['website'] = $this->findCsvMatch($row, 'website');
         $this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
         $this->item['address'] = $this->findCsvMatch($row, 'address');
         $this->item['city'] = $this->findCsvMatch($row, 'city');
         $this->item['state'] = $this->findCsvMatch($row, 'state');
         $this->item['country'] = $this->findCsvMatch($row, 'country');
+        $this->item['start_date'] = $this->findCsvMatch($row, 'start_date');
+        $this->item['end_date'] = $this->findCsvMatch($row, 'end_date');
         $this->item['zip'] = $this->findCsvMatch($row, 'zip');
         $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0;
         $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
         $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department'));
         $this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name'));
         $this->item['remote'] =($this->fetchHumanBoolean($this->findCsvMatch($row, 'remote')) ==1 ) ? '1' : 0;
+        $this->item['vip'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'vip')) ==1 ) ? '1' : 0;
+        $this->item['autoassign_licenses'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'autoassign_licenses')) ==1 ) ? '1' : 0;
+
 
         $user_department = $this->findCsvMatch($row, 'department');
         if ($this->shouldUpdateField($user_department)) {
@@ -69,13 +77,18 @@ class UserImporter extends ItemImporter
             $user_formatted_array = User::generateFormattedNameFromFullName($user_full_name, Setting::getSettings()->username_format);
             $this->item['username'] = $user_formatted_array['username'];
         }
-        
-        $user = User::where('username', $this->item['username'])->first();
-        if ($user) {
-            if (! $this->updating) {
-                $this->log('A matching User '.$this->item['name'].' already exists.  ');
-                \Log::debug('A matching User '.$this->item['name'].' already exists.  ');
 
+        // Check if a numeric ID was passed. If it does, use that above all else.
+        if ((array_key_exists('id', $this->item) && ($this->item['id'] != "") && (is_numeric($this->item['id']))))  {
+            $user = User::find($this->item['id']);
+        } else {
+            $user = User::where('username', $this->item['username'])->first();
+        }
+
+        if ($user) {
+
+            if (! $this->updating) {
+                \Log::debug('A matching User '.$this->item['name'].' already exists.  ');
                 return;
             }
             $this->log('Updating User');
@@ -102,7 +115,6 @@ class UserImporter extends ItemImporter
         $user->fill($this->sanitizeItemForStoring($user));
 
         if ($user->save()) {
-            // $user->logCreate('Imported using CSV Importer');
             $this->log('User '.$this->item['name'].' was created');
 
             if (($user->email) && ($user->activated == '1')) {
diff --git a/app/Importer/import_mappings.md b/app/Importer/import_mappings.md
deleted file mode 100644
index 211a68bc9c..0000000000
--- a/app/Importer/import_mappings.md
+++ /dev/null
@@ -1,43 +0,0 @@
-| CSV                 | Item             | Applicable Types                          |
-|---------------------|------------------|-------------------------------------------|
-| activated           |                  | User                                      |
-| asset tag           | asset_tag        | Asset                                     |
-| category            | category         | All                                       |
-| company             | company          | All                                       |
-| department_id       |                  | User ? All                                |
-| item name           | item_name        | All                                       |
-| image               | image            | Asset                                     |
-| email               |                  |                                           |
-| expiration date     | expiration_date  | License                                   |
-| location            | location         | All                                       |
-| notes               | notes            | All                                       |
-| licensed to email   | license_email    | License                                   |
-| licensed to name    | license_name     | License                                   |
-| maintained          | maintained       | License                                   |
-| manager_id          |                  | User                                      |
-| manufacturer        | manufacturer     | All                                       |
-| model name          | asset_model      | Asset                                     |
-| model number        | model_number     | Asset                                     |
-| order number        | order_number     | All ?                                     |
-| purchase cost       | purchase_cost    | All ?                                     |
-| purchase date       | purchase_date    | All ?                                     |
-| purchase order      | purchase_order   | License                                   |
-| quantity            | qty              | Accessory, Consumable, Component, License |
-| reassignable        | reassignable     | License                                   |
-| requestable         | requestable      | Asset, Accessory?                         |
-| seats               | seats            | License                                   |
-| serial number       | serial           | Asset, license                            |
-| status              | status           | Asset ? All                               |
-| supplier            | supplier         | Asset ? All                               |
-| minimum quantity    | min_amt          | Consumable                                |
-| termination date    | termination_date | License                                   |
-| warranty months     | warranty_months  | Asset                                     |
-| User Related Fields | assigned_to      | Asset                                     |
-| name                |                  |                                           |
-| email               |                  |                                           |
-| username            |                  |                                           |
-| address             | address          |  User                                     |
-| city                | city             |  User                                     |
-| state               | state            |  User                                     |
-| country             | country          |  User                                     |
-
diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
index 9d6cd942bd..09cb3ae8f2 100644
--- a/app/Listeners/CheckoutableListener.php
+++ b/app/Listeners/CheckoutableListener.php
@@ -2,22 +2,21 @@
 
 namespace App\Listeners;
 
+use App\Events\CheckoutableCheckedOut;
 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\Setting;
-use App\Models\User;
 use App\Notifications\CheckinAccessoryNotification;
 use App\Notifications\CheckinAssetNotification;
-use App\Notifications\CheckinLicenseNotification;
 use App\Notifications\CheckinLicenseSeatNotification;
 use App\Notifications\CheckoutAccessoryNotification;
 use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CheckoutConsumableNotification;
-use App\Notifications\CheckoutLicenseNotification;
 use App\Notifications\CheckoutLicenseSeatNotification;
 use Illuminate\Support\Facades\Notification;
 use Exception;
@@ -25,18 +24,17 @@ use Log;
 
 class CheckoutableListener
 {
+    private array $skipNotificationsFor = [
+        Component::class,
+    ];
+
     /**
-     * Notify the user about the checked out checkoutable and add a record to the
-     * checkout_requests table.
+     * 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)
     {
-
-
-        /**
-         * When the item wasn't checked out to a user, we can't send notifications
-         */
-        if (! $event->checkedOutTo instanceof User) {
+        if ($this->shouldNotSendAnyNotifications($event->checkoutable)){
             return;
         }
 
@@ -46,6 +44,11 @@ class CheckoutableListener
         $acceptance = $this->getCheckoutAcceptance($event);       
 
         try {
+            if ($this->shouldSendWebhookNotification()) {
+                Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+                    ->notify($this->getCheckoutNotification($event));
+            }
+
             if (! $event->checkedOutTo->locale) {
                 Notification::locale(Setting::getSettings()->locale)->send(
                     $this->getNotifiables($event),
@@ -63,16 +66,13 @@ class CheckoutableListener
     }
 
     /**
-     * Notify the user about the checked in checkoutable
+     * Notify the user and post to webhook about the checked in checkoutable
      */    
     public function onCheckedIn($event)
     {
         \Log::debug('onCheckedIn in the Checkoutable listener fired');
 
-        /**
-         * When the item wasn't checked out to a user, we can't send notifications
-         */
-        if (! $event->checkedOutTo instanceof User) {
+        if ($this->shouldNotSendAnyNotifications($event->checkoutable)) {
             return;
         }
 
@@ -90,6 +90,11 @@ class CheckoutableListener
         }
 
         try {
+            if ($this->shouldSendWebhookNotification()) {
+                Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+                    ->notify($this->getCheckinNotification($event));
+            }
+
             // Use default locale
             if (! $event->checkedOutTo->locale) {
                 Notification::locale(Setting::getSettings()->locale)->send(
@@ -182,11 +187,11 @@ class CheckoutableListener
     /**
      * Get the appropriate notification for the event
      * 
-     * @param  CheckoutableCheckedIn $event 
-     * @param  CheckoutAcceptance $acceptance 
+     * @param  CheckoutableCheckedOut $event
+     * @param  CheckoutAcceptance|null $acceptance
      * @return Notification
      */
-    private function getCheckoutNotification($event, $acceptance)
+    private function getCheckoutNotification($event, $acceptance = null)
     {
         $notificationClass = null;
 
@@ -225,4 +230,14 @@ class CheckoutableListener
             'App\Listeners\CheckoutableListener@onCheckedOut'
         ); 
     }
+
+    private function shouldNotSendAnyNotifications($checkoutable): bool
+    {
+        return in_array(get_class($checkoutable), $this->skipNotificationsFor);
+    }
+
+    private function shouldSendWebhookNotification(): bool
+    {
+        return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;
+    }
 }
diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php
index 791a84f57a..d14b674364 100644
--- a/app/Listeners/LogListener.php
+++ b/app/Listeners/LogListener.php
@@ -18,7 +18,9 @@ use App\Events\ItemDeclined;
 use App\Events\LicenseCheckedIn;
 use App\Events\LicenseCheckedOut;
 use App\Models\Actionlog;
+use App\Models\User;
 use App\Models\LicenseSeat;
+use App\Events\UserMerged;
 
 class LogListener
 {
@@ -87,6 +89,43 @@ class LogListener
         $logaction->save();
     }
 
+
+    public function onUserMerged(UserMerged $event)
+    {
+
+        $to_from_array = [
+            'to_id' => $event->merged_to->id,
+            'to_username' => $event->merged_to->username,
+            'from_id' => $event->merged_from->id,
+            'from_username' => $event->merged_from->username,
+        ];
+
+        // Add a record to the users being merged FROM
+        \Log::debug('Users merged: '.$event->merged_from->id .' ('.$event->merged_from->username.') merged into '. $event->merged_to->id. ' ('.$event->merged_to->username.')');
+        $logaction = new Actionlog();
+        $logaction->item_id = $event->merged_from->id;
+        $logaction->item_type = User::class;
+        $logaction->target_id = $event->merged_to->id;
+        $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->save();
+
+        // Add a record to the users being merged TO
+        $logaction = new Actionlog();
+        $logaction->target_id = $event->merged_from->id;
+        $logaction->target_type = User::class;
+        $logaction->item_id = $event->merged_to->id;
+        $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->save();
+
+
+    }
+
     /**
      * Register the listeners for the subscriber.
      *
@@ -99,6 +138,7 @@ class LogListener
             'CheckoutableCheckedOut',
             'CheckoutAccepted',
             'CheckoutDeclined',
+            'UserMerged',
         ];
 
         foreach ($list as $event) {
@@ -108,4 +148,6 @@ class LogListener
             );
         }
     }
+
+
 }
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index 3f2004b047..7576cc644f 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -63,6 +63,7 @@ class Accessory extends SnipeModel
         'company_id'        => 'integer|nullable',
         'min_amt'           => 'integer|min:0|nullable',
         'purchase_cost'     => 'numeric|nullable|gte:0',
+        'purchase_date'   => 'date_format:Y-m-d|nullable',
     ];
 
 
@@ -327,23 +328,13 @@ class Accessory extends SnipeModel
         return null;
     }
 
-     /**
-     * Check how many items within an accessory are checked out
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.0]
-     * @return int
-     */
-    public function numCheckedOut()
-    {
-        $checkedout = 0;
-        $checkedout = $this->users->count();
-
-        return $checkedout;
-    }
 
     /**
-     * Check how many items of an accessory remain
+     * 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
+     * bad things happen.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
@@ -351,11 +342,11 @@ class Accessory extends SnipeModel
      */
     public function numRemaining()
     {
-        $checkedout = $this->users->count();
+        $checkedout = $this->users_count;
         $total = $this->qty;
         $remaining = $total - $checkedout;
 
-        return $remaining;
+        return (int) $remaining;
     }
 
     /**
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index f8e0cab314..95e1c3a166 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -34,9 +34,9 @@ class Asset extends Depreciable
     use CompanyableTrait;
     use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait;
 
-    const LOCATION = 'location';
-    const ASSET = 'asset';
-    const USER = 'user';
+    public const LOCATION = 'location';
+    public const ASSET = 'asset';
+    public const USER = 'user';
 
     use Acceptable;
 
@@ -70,25 +70,12 @@ class Asset extends Depreciable
     */
     protected $injectUniqueIdentifier = true;
 
-    // We set these as protected dates so that they will be easily accessible via Carbon
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'purchase_date',
-        'last_checkout',
-        'expected_checkin',
-        'last_audit_date',
-        'next_audit_date'
-    ];
-
-
     protected $casts = [
-        'purchase_date' => 'datetime',
+        'purchase_date' => 'date',
         'last_checkout' => 'datetime',
-        'expected_checkin' => 'datetime',
+        'expected_checkin' => 'date',
         'last_audit_date' => 'datetime',
-        'next_audit_date' => 'datetime',
+        'next_audit_date' => 'date',
         'model_id'       => 'integer',
         'status_id'      => 'integer',
         'company_id'     => 'integer',
@@ -96,26 +83,28 @@ class Asset extends Depreciable
         'rtd_company_id' => 'integer',
         'supplier_id'    => 'integer',
         'byod'           => 'boolean',
+        'created_at'     => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'  => 'datetime',
     ];
 
     protected $rules = [
         'name'            => 'max:255|nullable',
-        'model_id'        => 'required|integer|exists:models,id',
+        'model_id'        => 'required|integer|exists:models,id,deleted_at,NULL',
         'status_id'       => 'required|integer|exists:status_labels,id',
         'company_id'      => 'integer|nullable',
         'warranty_months' => 'numeric|nullable|digits_between:0,240',
         'physical'        => 'numeric|max:1|nullable',
-        'checkout_date'   => 'date|max:10|min:10|nullable',
-        'checkin_date'    => 'date|max:10|min:10|nullable',
+        'last_checkout'    => 'date_format:Y-m-d H:i:s|nullable',
+        'expected_checkin' => 'date|nullable',
         'location_id'     => 'exists:locations,id|nullable',
         'rtd_location_id' => 'exists:locations,id|nullable',
         'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
-        'status'          => 'integer',
+        'purchase_date'   => 'date|date_format:Y-m-d|nullable',
         'serial'          => 'unique_serial|nullable',
         'purchase_cost'   => 'numeric|nullable|gte:0',
-        'next_audit_date' => 'date|nullable',
-        'last_audit_date' => 'date|nullable',
         'supplier_id'     => 'exists:suppliers,id|nullable',
+        'asset_eol_date'  => 'date|max:10|min:10|nullable',
     ];
 
   /**
@@ -145,6 +134,9 @@ class Asset extends Depreciable
         'last_checkout',
         'expected_checkin',
         'byod',
+        'asset_eol_date',
+        'last_audit_date',
+        'next_audit_date',
     ];
 
     use Searchable;
@@ -167,6 +159,7 @@ class Asset extends Depreciable
       'expected_checkin', 
       'next_audit_date', 
       'last_audit_date',
+      'asset_eol_date',
     ];
 
     /**
@@ -180,11 +173,19 @@ class Asset extends Depreciable
         'company'            => ['name'],
         'defaultLoc'         => ['name'],
         'location'           => ['name'],
-        'model'              => ['name', 'model_number'],
+        'model'              => ['name', 'model_number', 'eol'],
         'model.category'     => ['name'],
         'model.manufacturer' => ['name'],
     ];
 
+    // To properly set the expected checkin as Y-m-d
+    public function setExpectedCheckinAttribute($value)
+    {
+        if ($value == '') {
+            $value = null;
+        }
+        $this->attributes['expected_checkin'] = $value;
+    }
 
     /**
      * This handles the custom field validation for assets
@@ -389,7 +390,7 @@ class Asset extends Depreciable
      */
     public function depreciation()
     {
-        return $this->model->belongsTo(\App\Models\Depreciation::class, 'depreciation_id');
+        return $this->hasOneThrough(\App\Models\Depreciation::class,\App\Models\AssetModel::class,'id','id','model_id','depreciation_id');
     }
 
 
@@ -402,7 +403,7 @@ class Asset extends Depreciable
      */
     public function components()
     {
-        return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty', 'created_at')->withTrashed();
+        return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty', 'created_at');
     }
 
 
@@ -536,6 +537,28 @@ class Asset extends Depreciable
         return strtolower(class_basename($this->assigned_type));
     }
 
+
+
+    /**
+     * This is annoying, but because we don't say "assets" in our route names, we have to make an exception here
+     * @todo - normalize the route names - API endpoint URLS can stay the same
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.0]
+     * @return string
+     */
+    public function targetShowRoute()
+    {
+        $route = str_plural($this->assignedType());
+        if ($route=='assets') {
+            return 'hardware';
+        }
+
+        return $route;
+
+    }
+
+
     /**
      * Get the asset's location based on default RTD location
      *
@@ -762,24 +785,17 @@ class Asset extends Depreciable
      * @since [v4.0]
      * @return string | false
      */
-    public static function autoincrement_asset()
+    public static function autoincrement_asset(int $additional_increment = 0)
     {
         $settings = \App\Models\Setting::getSettings();
 
 
         if ($settings->auto_increment_assets == '1') {
-            $temp_asset_tag = \DB::table('assets')
-                ->where('physical', '=', '1')
-                ->max('asset_tag');
-
-            $asset_tag_digits = preg_replace('/\D/', '', $temp_asset_tag);
-            $asset_tag = preg_replace('/^0*/', '', $asset_tag_digits);
-
             if ($settings->zerofill_count > 0) {
-                return $settings->auto_increment_prefix.self::zerofill($settings->next_auto_tag_base, $settings->zerofill_count);
+                return $settings->auto_increment_prefix.self::zerofill($settings->next_auto_tag_base + $additional_increment, $settings->zerofill_count);
             }
 
-            return $settings->auto_increment_prefix.$settings->next_auto_tag_base;
+            return $settings->auto_increment_prefix.($settings->next_auto_tag_base + $additional_increment);
         } else {
             return false;
         }
@@ -886,7 +902,13 @@ class Asset extends Depreciable
 
         return false;
     }
-
+    public function getComponentCost(){
+        $cost = 0;
+        foreach($this->components as $component) {
+            $cost += $component->pivot->assigned_qty*$component->purchase_cost;
+        }
+        return $cost;
+    }
 
     /**
     * -----------------------------------------------
@@ -918,8 +940,10 @@ class Asset extends Depreciable
                 ->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%')
-                ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$term%"]);
-
+                ->orWhereMultipleColumns([
+                    'assets_users.first_name',
+                    'assets_users.last_name',
+                ], $term);
         }
 
         /**
@@ -1314,7 +1338,10 @@ class Asset extends Depreciable
                 })->orWhere(function ($query) use ($search) {
                     $query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
-                        ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$search%"])
+                        ->orWhereMultipleColumns([
+                            'assets_users.first_name',
+                            'assets_users.last_name',
+                        ], $search)
                         ->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
@@ -1532,7 +1559,7 @@ class Asset extends Depreciable
     */
     public function scopeOrderModelNumber($query, $order)
     {
-        return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.model_number', $order);
+        return $query->leftJoin('models as model_number_sort', 'assets.model_id', '=', 'model_number_sort.id')->orderBy('model_number_sort.model_number', $order);
     }
 
 
@@ -1632,9 +1659,9 @@ class Asset extends Depreciable
      */
     public function scopeOrderManufacturer($query, $order)
     {
-        return $query->join('models', 'assets.model_id', '=', 'models.id')
-            ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')
-            ->orderBy('manufacturers.name', $order);
+        return $query->join('models as order_asset_model', 'assets.model_id', '=', 'order_asset_model.id')
+            ->leftjoin('manufacturers as manufacturer_order', 'order_asset_model.manufacturer_id', '=', 'manufacturer_order.id')
+            ->orderBy('manufacturer_order.name', $order);
     }
 
    /**
diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php
index 41ab802579..292e529571 100644
--- a/app/Models/AssetMaintenance.php
+++ b/app/Models/AssetMaintenance.php
@@ -95,8 +95,8 @@ class AssetMaintenance extends Model implements ICompanyableChild
      */
     public function setCostAttribute($value)
     {
-        $value = Helper::ParseFloat($value);
-        if ($value == '0.0') {
+        $value = Helper::ParseCurrency($value);
+        if ($value == 0) {
             $value = null;
         }
         $this->attributes['cost'] = $value;
diff --git a/app/Models/Category.php b/app/Models/Category.php
index b00e5a7bf9..c06ac38543 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -194,7 +194,25 @@ class Category extends SnipeModel
      */
     public function assets()
     {
-        return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'category_id', 'model_id');
+        return $this->hasManyThrough(Asset::class, \App\Models\AssetModel::class, 'category_id', 'model_id');
+    }
+
+    /**
+     * Establishes the category -> assets relationship but also takes into consideration
+     * the setting to show archived in lists.
+     *
+     * We could have complicated the assets() method above, but keeping this separate
+     * should give us more flexibility if we need to return actually archived assets
+     * by their category.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.0]
+     * @see \App\Models\Asset::scopeAssetsForShow()
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function showableAssets()
+    {
+        return $this->hasManyThrough(Asset::class, \App\Models\AssetModel::class, 'category_id', 'model_id')->AssetsForShow();
     }
 
     /**
diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php
index 79a6da5415..4a4360c40a 100644
--- a/app/Models/CheckoutAcceptance.php
+++ b/app/Models/CheckoutAcceptance.php
@@ -3,25 +3,33 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Notifications\Notifiable;
 
 class CheckoutAcceptance extends Model
 {
-    use SoftDeletes, Notifiable;
+    use HasFactory, SoftDeletes, Notifiable;
 
     protected $casts = [
         'accepted_at' => 'datetime',
         'declined_at' => 'datetime',
     ];
 
-    // Get the mail recipient from the config
-    public function routeNotificationForMail(): string
+    /**
+     * Get the mail recipient from the config
+     *
+     * @return mixed|string|null
+     */
+    public function routeNotificationForMail()
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
-        return (config('mail.reply_to.address')) ? config('mail.reply_to.address') : '' ;
+        $recipients_string = explode(',', Setting::getSettings()->alert_email);
+        $recipients = array_map('trim', $recipients_string);
+
+        return array_filter($recipients);
     }
 
     /**
diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php
index 26abdd301e..b717a332aa 100644
--- a/app/Models/CheckoutRequest.php
+++ b/app/Models/CheckoutRequest.php
@@ -18,7 +18,7 @@ class CheckoutRequest extends Model
 
     public function requestingUser()
     {
-        return $this->user()->first();
+        return $this->user()->withTrashed()->first();
     }
 
     public function requestedItem()
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 413011b9a7..10b44077ae 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -45,7 +45,7 @@ final class Company extends SnipeModel
      * 
      * @var array
      */
-    protected $searchableAttributes = ['name', 'created_at', 'updated_at'];
+    protected $searchableAttributes = ['name', 'phone', 'fax', 'created_at', 'updated_at'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -59,7 +59,11 @@ final class Company extends SnipeModel
      *
      * @var array
      */
-    protected $fillable = ['name'];
+    protected $fillable = [
+        'name',
+        'phone',
+        'fax',
+    ];
 
     private static function isFullMultipleCompanySupportEnabled()
     {
diff --git a/app/Models/Component.php b/app/Models/Component.php
index dc353d288c..052ec1219d 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -33,9 +33,10 @@ class Component extends SnipeModel
         'name'           => 'required|min:3|max:255',
         'qty'            => 'required|integer|min:1',
         'category_id'    => 'required|integer|exists:categories,id',
-        'company_id'     => 'integer|nullable',
+        'supplier_id'    => 'nullable|integer|exists:suppliers,id',
+        'company_id'     => 'integer|nullable|exists:companies,id',
         'min_amt'        => 'integer|min:0|nullable',
-        'purchase_date'  => 'date|nullable',
+        'purchase_date'   => 'date_format:Y-m-d|nullable',
         'purchase_cost'  => 'numeric|nullable|gte:0',
     ];
 
@@ -57,6 +58,7 @@ class Component extends SnipeModel
     protected $fillable = [
         'category_id',
         'company_id',
+        'supplier_id',
         'location_id',
         'name',
         'purchase_cost',
@@ -86,6 +88,7 @@ class Component extends SnipeModel
         'category'     => ['name'],
         'company'      => ['name'],
         'location'     => ['name'],
+        'supplier'     => ['name'],
     ];
 
 
@@ -168,6 +171,18 @@ class Component extends SnipeModel
         return $this->belongsTo(\App\Models\Category::class, 'category_id');
     }
 
+    /**
+     * Establishes the item -> supplier relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
+    }
+
     /**
      * Establishes the component -> action logs relationship
      *
@@ -247,4 +262,17 @@ class Component extends SnipeModel
     {
         return $query->leftJoin('companies', 'components.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
     }
+
+    /**
+     * Query builder scope to order on supplier
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderSupplier($query, $order)
+    {
+        return $query->leftJoin('suppliers', 'components.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
+    }
 }
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index c04c9b53d5..a3a0d59178 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -27,6 +27,7 @@ class Consumable extends SnipeModel
         'requestable'    => 'boolean',
         'category_id'    => 'integer',
         'company_id'     => 'integer',
+        'supplier_id',
         'qty'            => 'integer',
         'min_amt'        => 'integer',    
      ];
@@ -41,6 +42,7 @@ class Consumable extends SnipeModel
         'company_id'  => 'integer|nullable',
         'min_amt'     => 'integer|min:0|nullable',
         'purchase_cost'   => 'numeric|nullable|gte:0',
+        'purchase_date'   => 'date_format:Y-m-d|nullable',
     ];
 
     /**
@@ -94,6 +96,7 @@ class Consumable extends SnipeModel
         'company'      => ['name'],
         'location'     => ['name'],
         'manufacturer' => ['name'],
+        'supplier'     => ['name'],
     ];
 
 
@@ -248,6 +251,18 @@ class Consumable extends SnipeModel
         return $this->belongsToMany(\App\Models\User::class, 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps();
     }
 
+    /**
+     * Establishes the item -> supplier relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
+    }
+
 
     /**
      * Determine whether to send a checkin/checkout email based on
@@ -375,4 +390,17 @@ class Consumable extends SnipeModel
     {
         return $query->leftJoin('companies', 'consumables.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
     }
+
+    /**
+     * Query builder scope to order on supplier
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderSupplier($query, $order)
+    {
+        return $query->leftJoin('suppliers', 'consumables.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
+    }
 }
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index e0b06318bb..e7fddd1aad 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -21,7 +21,7 @@ class CustomField extends Model
      *
      * @var array
      */
-    const PREDEFINED_FORMATS = [
+    public const PREDEFINED_FORMATS = [
             'ANY'           => '',
             'CUSTOM REGEX'  => '',
             'ALPHA'         => 'alpha',
@@ -52,6 +52,8 @@ class CustomField extends Model
         'name' => 'required|unique:custom_fields',
         'element' => 'required|in:text,listbox,textarea,checkbox,radio',
         'field_encrypted' => 'nullable|boolean',
+        'auto_add_to_fieldsets' => 'boolean',
+        'show_in_listview' => 'boolean',
     ];
 
     /**
@@ -69,6 +71,9 @@ class CustomField extends Model
         'show_in_email',
         'is_unique',
         'display_in_user_view',
+        'auto_add_to_fieldsets',
+        'show_in_listview',
+
     ];
 
     /**
@@ -238,7 +243,7 @@ class CustomField extends Model
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @return string
      */
     public function db_column_name()
     {
@@ -303,9 +308,9 @@ class CustomField extends Model
             $arr_parts = explode('|', $arr[$x]);
             if ($arr_parts[0] != '') {
                 if (array_key_exists('1', $arr_parts)) {
-                    $result[$arr_parts[0]] = $arr_parts[1];
+                    $result[$arr_parts[0]] = trim($arr_parts[1]);
                 } else {
-                    $result[$arr_parts[0]] = $arr_parts[0];
+                    $result[$arr_parts[0]] = trim($arr_parts[0]);
                 }
             }
         }
diff --git a/app/Models/Department.php b/app/Models/Department.php
index 74e2b23df9..90fde79df4 100644
--- a/app/Models/Department.php
+++ b/app/Models/Department.php
@@ -43,6 +43,8 @@ class Department extends SnipeModel
     protected $fillable = [
         'user_id',
         'name',
+        'phone',
+        'fax',
         'location_id',
         'company_id',
         'manager_id',
@@ -56,7 +58,7 @@ class Department extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'notes'];
+    protected $searchableAttributes = ['name', 'notes', 'phone', 'fax'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php
index 250894820c..cfc42aa945 100644
--- a/app/Models/Depreciable.php
+++ b/app/Models/Depreciable.php
@@ -68,7 +68,7 @@ class Depreciable extends SnipeModel
      */
     public function getLinearDepreciatedValue() // TODO - for testing it might be nice to have an optional $relative_to param here, defaulted to 'now'
     {
-        if ($this->purchase_date) {
+        if (($this->get_depreciation()) && ($this->purchase_date)) {
             $months_passed = ($this->purchase_date->diff(now())->m)+($this->purchase_date->diff(now())->y*12);
         } else {
             return null;
@@ -127,7 +127,7 @@ class Depreciable extends SnipeModel
             $yearsPast = 0;
         }
 
-        return round($yearsPast / $deprecationYears * $this->purchase_cost, 2);
+        return $this->purchase_cost - round($yearsPast / $deprecationYears * $this->purchase_cost, 2);
     }
 
     /**
diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php
index 39fb935494..9faa1b86e2 100755
--- a/app/Models/Depreciation.php
+++ b/app/Models/Depreciation.php
@@ -16,7 +16,7 @@ class Depreciation extends SnipeModel
     // Declare the rules for the form validation
     protected $rules = [
         'name' => 'required|min:3|max:255|unique:depreciations,name',
-        'months' => 'required|max:3600|integer',
+        'months' => 'required|max:3600|integer|gt:0',
     ];
 
     /**
diff --git a/app/Models/Group.php b/app/Models/Group.php
index a68579adac..c0de8c263d 100755
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -16,6 +16,11 @@ class Group extends SnipeModel
       'name' => 'required|min:2|max:255',
     ];
 
+    protected $fillable = [
+        'name',
+        'permissions'
+    ];
+
     /**
      * Whether the model should inject it's identifier to the unique
      * validation rules before attempting validation. If this property
diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php
index 4c47147625..4eb496a2ab 100644
--- a/app/Models/Ldap.php
+++ b/app/Models/Ldap.php
@@ -213,20 +213,22 @@ class Ldap extends Model
         $ldap_result_phone = Setting::getSettings()->ldap_phone;
         $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;
         // Get LDAP user data
         $item = [];
-        $item['username'] = isset($ldapattributes[$ldap_result_username][0]) ? $ldapattributes[$ldap_result_username][0] : '';
-        $item['employee_number'] = isset($ldapattributes[$ldap_result_emp_num][0]) ? $ldapattributes[$ldap_result_emp_num][0] : '';
-        $item['lastname'] = isset($ldapattributes[$ldap_result_last_name][0]) ? $ldapattributes[$ldap_result_last_name][0] : '';
-        $item['firstname'] = isset($ldapattributes[$ldap_result_first_name][0]) ? $ldapattributes[$ldap_result_first_name][0] : '';
-        $item['email'] = isset($ldapattributes[$ldap_result_email][0]) ? $ldapattributes[$ldap_result_email][0] : '';
-        $item['telephone'] = isset($ldapattributes[$ldap_result_phone][0]) ? $ldapattributes[$ldap_result_phone][0] : '';
-        $item['jobtitle'] = isset($ldapattributes[$ldap_result_jobtitle][0]) ? $ldapattributes[$ldap_result_jobtitle][0] : '';
-        $item['country'] = isset($ldapattributes[$ldap_result_country][0]) ? $ldapattributes[$ldap_result_country][0] : '';
-        $item['department'] = isset($ldapattributes[$ldap_result_dept][0]) ? $ldapattributes[$ldap_result_dept][0] : '';
-        $item['manager'] = isset($ldapattributes[$ldap_result_manager][0]) ? $ldapattributes[$ldap_result_manager][0] : '';
+        $item['username'] = $ldapattributes[$ldap_result_username][0] ?? '';
+        $item['employee_number'] = $ldapattributes[$ldap_result_emp_num][0] ?? '';
+        $item['lastname'] = $ldapattributes[$ldap_result_last_name][0] ?? '';
+        $item['firstname'] = $ldapattributes[$ldap_result_first_name][0] ?? '';
+        $item['email'] = $ldapattributes[$ldap_result_email][0] ?? '';
+        $item['telephone'] = $ldapattributes[$ldap_result_phone][0] ?? '';
+        $item['jobtitle'] = $ldapattributes[$ldap_result_jobtitle][0] ?? '';
+        $item['country'] = $ldapattributes[$ldap_result_country][0] ?? '';
+        $item['department'] = $ldapattributes[$ldap_result_dept][0] ?? '';
+        $item['manager'] = $ldapattributes[$ldap_result_manager][0] ?? '';
+        $item['location'] = $ldapattributes[$ldap_result_location][0] ?? '';
 
         return $item;
     }
diff --git a/app/Models/License.php b/app/Models/License.php
index b59387a42e..162b3d662a 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -33,10 +33,9 @@ class License extends Depreciable
     protected $table = 'licenses';
 
     protected $casts = [
-        'purchase_date' => 'datetime',
-        'expiration_date' => 'datetime',
-        'termination_date' => 'datetime',
-        'seats'   => 'integer',
+        'purchase_date' => 'date',
+        'expiration_date' => 'date',
+        'termination_date' => 'date',
         'category_id'  => 'integer',
         'company_id'   => 'integer',
     ];
@@ -50,6 +49,9 @@ 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',
+        'expiration_date'   => 'date_format:Y-m-d|nullable|max:10',
+        'termination_date'   => 'date_format:Y-m-d|nullable|max:10',
     ];
 
     /**
@@ -104,10 +106,10 @@ class License extends Depreciable
      * @var array
      */
     protected $searchableRelations = [
-      'manufacturer' => ['name'],
-      'company'      => ['name'],
-      'category'     => ['name'],
-      'depreciation' => ['name'],
+        'manufacturer' => ['name'],
+        'company'      => ['name'],
+        'category'     => ['name'],
+        'depreciation' => ['name'],
     ];
 
     /**
@@ -365,7 +367,7 @@ class License extends Depreciable
      */
     public function assignedusers()
     {
-        return $this->belongsToMany(\App\Models\User::class, 'license_seats', 'assigned_to', 'license_id');
+        return $this->belongsToMany(\App\Models\User::class, 'license_seats', 'license_id', 'assigned_to');
     }
 
     /**
@@ -423,7 +425,7 @@ class License extends Depreciable
     public static function assetcount()
     {
         return LicenseSeat::whereNull('deleted_at')
-                   ->count();
+            ->count();
     }
 
 
@@ -439,8 +441,8 @@ class License extends Depreciable
     public function totalSeatsByLicenseID()
     {
         return LicenseSeat::where('license_id', '=', $this->id)
-                   ->whereNull('deleted_at')
-                   ->count();
+            ->whereNull('deleted_at')
+            ->count();
     }
 
     /**
@@ -484,11 +486,12 @@ class License extends Depreciable
     public static function availassetcount()
     {
         return LicenseSeat::whereNull('assigned_to')
-                   ->whereNull('asset_id')
-                   ->whereNull('deleted_at')
-                   ->count();
+            ->whereNull('asset_id')
+            ->whereNull('deleted_at')
+            ->count();
     }
 
+
     /**
      * Returns the number of total available seats for this license
      *
@@ -531,7 +534,7 @@ class License extends Depreciable
     {
         return $this->licenseSeatsRelation()->where(function ($query) {
             $query->whereNotNull('assigned_to')
-            ->orWhereNotNull('asset_id');
+                ->orWhereNotNull('asset_id');
         });
     }
 
@@ -619,13 +622,13 @@ class License extends Depreciable
     public function freeSeat()
     {
         return  $this->licenseseats()
-                    ->whereNull('deleted_at')
-                    ->where(function ($query) {
-                        $query->whereNull('assigned_to')
-                            ->whereNull('asset_id');
-                    })
-                    ->orderBy('id', 'asc')
-                    ->first();
+            ->whereNull('deleted_at')
+            ->where(function ($query) {
+                $query->whereNull('assigned_to')
+                    ->whereNull('asset_id');
+            })
+            ->orderBy('id', 'asc')
+            ->first();
     }
 
 
@@ -655,11 +658,11 @@ class License extends Depreciable
         $days = (is_null($days)) ? 60 : $days;
 
         return self::whereNotNull('expiration_date')
-        ->whereNull('deleted_at')
-        ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))
-        ->where('expiration_date', '>', date('Y-m-d'))
-        ->orderBy('expiration_date', 'ASC')
-        ->get();
+            ->whereNull('deleted_at')
+            ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))
+            ->where('expiration_date', '>', date('Y-m-d'))
+            ->orderBy('expiration_date', 'ASC')
+            ->get();
     }
 
     /**
@@ -703,4 +706,4 @@ 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
diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php
index 2207edd02c..d2a99d3c56 100755
--- a/app/Models/LicenseSeat.php
+++ b/app/Models/LicenseSeat.php
@@ -6,13 +6,15 @@ use App\Models\Traits\Acceptable;
 use App\Notifications\CheckinLicenseNotification;
 use App\Notifications\CheckoutLicenseNotification;
 use App\Presenters\Presentable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class LicenseSeat extends SnipeModel implements ICompanyableChild
 {
     use CompanyableChildTrait;
-    use SoftDeletes;
+    use HasFactory;
     use Loggable;
+    use SoftDeletes;
 
     protected $presenter = \App\Presenters\LicenseSeatPresenter::class;
     use Presentable;
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 8181f406cd..145d6cef9a 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -26,11 +26,12 @@ class Location extends SnipeModel
     protected $table = 'locations';
     protected $rules = [
         'name'          => 'required|min:2|max:255|unique_undeleted',
-        'city'          => 'min:2|max:255|nullable',
-        'country'       => 'min:2|max:255|nullable',
-        'address'       => 'max:80|nullable',
-        'address2'      => 'max:80|nullable',
-        'zip'           => 'min:3|max:10|nullable',
+        'address'       => 'max:191|nullable',
+        'address2'      => 'max:191|nullable',
+        'city'          => 'max:191|nullable',
+        'state'         => 'min:2|max:191|nullable',
+        'country'       => 'min:2|max:191|nullable',
+        'zip'           => 'max:10|nullable',
         'manager_id'    => 'exists:users,id|nullable',
         'parent_id'     => 'non_circular:locations,id',
     ];
@@ -65,6 +66,8 @@ class Location extends SnipeModel
         'state',
         'country',
         'zip',
+        'phone',
+        'fax',
         'ldap_ou',
         'currency',
         'manager_id',
@@ -79,7 +82,7 @@ class Location extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'address', 'city', 'state', 'zip', 'created_at', 'ldap_ou'];
+    protected $searchableAttributes = ['name', 'address', 'city', 'state', 'zip', 'created_at', 'ldap_ou', 'phone', 'fax'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -267,7 +270,7 @@ class Location extends SnipeModel
 
         foreach ($locations_with_children[$parent_id] as $location) {
             $location->use_text = $prefix.' '.$location->name;
-            $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null;
+            $location->use_image = ($location->image) ? config('app.url').'/uploads/locations/'.$location->image : null;
             $results[] = $location;
             //now append the children. (if we have any)
             if (array_key_exists($location->id, $locations_with_children)) {
diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php
index 53ff279a09..d0bbd10733 100644
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -93,8 +93,12 @@ trait Loggable
     {
         $settings = Setting::getSettings();
         $log = new Actionlog;
-        $log->target_type = get_class($target);
-        $log->target_id = $target->id;
+
+        if($target != null){
+            $log->target_type = get_class($target);
+            $log->target_id = $target->id;
+
+        }
 
         if (static::class == LicenseSeat::class) {
             $log->item_type = License::class;
diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php
index 5f01c3c273..da4f26b02f 100755
--- a/app/Models/Manufacturer.php
+++ b/app/Models/Manufacturer.php
@@ -23,8 +23,9 @@ class Manufacturer extends SnipeModel
     protected $rules = [
         'name'   => 'required|min:2|max:255|unique:manufacturers,name,NULL,id,deleted_at,NULL',
         'url'   => 'url|nullable',
-        'support_url'   => 'url|nullable',
         'support_email'   => 'email|nullable',
+        'support_url'   => 'nullable|url',
+        'warranty_lookup_url' => 'nullable|starts_with:http://,https://,afp://,facetime://,file://,irc://'
     ];
 
     protected $hidden = ['user_id'];
@@ -51,6 +52,7 @@ class Manufacturer extends SnipeModel
         'support_phone',
         'support_url',
         'url',
+        'warranty_lookup_url',
     ];
 
     use Searchable;
diff --git a/app/Models/Requestable.php b/app/Models/Requestable.php
index 3983254e41..bf5c9c427b 100644
--- a/app/Models/Requestable.php
+++ b/app/Models/Requestable.php
@@ -38,8 +38,12 @@ trait Requestable
         $this->requests()->where('user_id', Auth::id())->delete();
     }
 
-    public function cancelRequest()
+    public function cancelRequest($user_id = null)
     {
-        $this->requests()->where('user_id', Auth::id())->update(['canceled_at' => \Carbon\Carbon::now()]);
+        if (!$user_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 f2a4184178..6c95d6b01e 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -31,7 +31,7 @@ class Setting extends Model
      *
      * @var string
      */
-    const SETUP_CHECK_KEY = 'snipeit_setup_check';
+    public const SETUP_CHECK_KEY = 'snipeit_setup_check';
 
     /**
      * Whether the model should inject it's identifier to the unique
@@ -76,6 +76,7 @@ class Setting extends Model
           'audit_interval'                      => 'numeric|nullable',
           'custom_forgot_pass_url'              => 'url|nullable',
           'privacy_policy_link'                 => 'nullable|url',
+          'google_client_id'                    => 'nullable|ends_with:apps.googleusercontent.com'
     ];
 
     protected $fillable = [
@@ -83,6 +84,12 @@ class Setting extends Model
         'email_domain',
         'email_format',
         'username_format',
+        'webhook_endpoint',
+        'webhook_channel',
+        'webhook_botname',
+        'google_login',
+        'google_client_id',
+        'google_client_secret',
     ];
 
     /**
@@ -262,7 +269,7 @@ class Setting extends Model
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
-        return self::getSettings()->slack_endpoint;
+        return self::getSettings()->webhook_endpoint;
     }
 
     /**
@@ -338,7 +345,15 @@ class Setting extends Model
             'ad_domain',
             'ad_append_domain',
             'ldap_client_tls_key',
-            'ldap_client_tls_cert'
+            'ldap_client_tls_cert',
+            'ldap_default_group',
+            'ldap_dept',
+            'ldap_emp_num',
+            'ldap_phone_field',
+            'ldap_jobtitle',
+            'ldap_manager',
+            'ldap_country',
+            'ldap_location',
             ])->first()->getAttributes();
 
         return collect($ldapSettings);
diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php
index e5a039a4e1..af12c3d29b 100644
--- a/app/Models/SnipeModel.php
+++ b/app/Models/SnipeModel.php
@@ -21,9 +21,9 @@ class SnipeModel extends Model
      */
     public function setPurchaseCostAttribute($value)
     {
-        $value = Helper::ParseFloat($value);
+        $value = Helper::ParseCurrency($value);
 
-        if ($value == '0.0') {
+        if ($value == 0) {
             $value = null;
         }
         $this->attributes['purchase_cost'] = $value;
diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php
index 36a9ac855c..7ec25645e6 100644
--- a/app/Models/SnipeSCIMConfig.php
+++ b/app/Models/SnipeSCIMConfig.php
@@ -12,94 +12,9 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
 {
     public function getUserConfig()
     {
-        $config = parent::getUserConfig();
-
         // Much of this is copied verbatim from the library, then adjusted for our needs
-        $config['class'] = SCIMUser::class;
 
-        unset($config['mapping']['example:name:space']);
-
-        $config['map_unmapped'] = false; // anything we don't explicitly map will _not_ show up.
-
-        $core_namespace = 'urn:ietf:params:scim:schemas:core:2.0:User';
-        $core = $core_namespace.':'; 
-        $mappings =& $config['mapping'][$core_namespace]; //grab this entire key, we don't want to be repeating ourselves
-
-        //username - *REQUIRED*
-        $config['validations'][$core.'userName'] = 'required';
-        $mappings['userName'] = AttributeMapping::eloquent('username');
-
-        //human name - *FIRST NAME REQUIRED*
-        $config['validations'][$core.'name.givenName'] = 'required';
-        $config['validations'][$core.'name.familyName'] = 'string'; //not required
-
-        $mappings['name']['familyName'] = AttributeMapping::eloquent("last_name");
-        $mappings['name']['givenName'] = AttributeMapping::eloquent("first_name");
-        $mappings['name']['formatted'] = (new AttributeMapping())->ignoreWrite()->setRead(
-            function (&$object) {
-                return $object->getFullNameAttribute();
-            } 
-        );
-
-        // externalId support
-        $config['validations'][$core.'externalId'] = 'string|nullable'; // not required, but supported mostly just for Okta
-        // note that the mapping is *not* namespaced like the other $mappings
-        $config['mapping']['externalId'] = AttributeMapping::eloquent('scim_externalid');
-
-        $config['validations'][$core.'emails'] = 'nullable|array';         // emails are not required in Snipe-IT...
-        $config['validations'][$core.'emails.*.value'] = 'email'; // ...(had to remove the recommended 'required' here)
-
-        $mappings['emails'] = [[
-            "value" => AttributeMapping::eloquent("email"),
-            "display" => null,
-            "type" => AttributeMapping::constant("work")->ignoreWrite(),
-            "primary" => AttributeMapping::constant(true)->ignoreWrite()
-        ]];
-
-        //active
-        $config['validations'][$core.'active'] = 'boolean';
-
-        $mappings['active'] = AttributeMapping::eloquent('activated');
-
-        //phone
-        $config['validations'][$core.'phoneNumbers'] = 'nullable|array';
-        $config['validations'][$core.'phoneNumbers.*.value'] = 'string'; // another one where want to say 'we don't _need_ a phone number, but if you have one it better have a value.
-
-        $mappings['phoneNumbers'] = [[
-            "value" => AttributeMapping::eloquent("phone"),
-            "display" => null,
-            "type" => AttributeMapping::constant("work")->ignoreWrite(),
-            "primary" => AttributeMapping::constant(true)->ignoreWrite()
-        ]];
-
-        //address
-        $config['validations'][$core.'addresses'] = 'nullable|array';
-        $config['validations'][$core.'addresses.*.streetAddress'] = 'string';
-        $config['validations'][$core.'addresses.*.locality'] = 'string';
-        $config['validations'][$core.'addresses.*.region'] = 'nullable|string';
-        $config['validations'][$core.'addresses.*.postalCode'] = 'nullable|string';
-        $config['validations'][$core.'addresses.*.country'] = 'string';
-
-        $mappings['addresses'] = [[
-            'type' => AttributeMapping::constant("work")->ignoreWrite(),
-            'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right.
-            'streetAddress' => AttributeMapping::eloquent("address"),
-            'locality' => AttributeMapping::eloquent("city"),
-            'region' => AttributeMapping::eloquent("state"),
-            'postalCode' => AttributeMapping::eloquent("zip"),
-            'country' => AttributeMapping::eloquent("country"),
-            'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example?
-        ]];
-
-        //title
-        $config['validations'][$core.'title'] = 'string';
-        $mappings['title'] = AttributeMapping::eloquent('jobtitle');
-
-        //Preferred Language
-        $config['validations'][$core.'preferredLanguage'] = 'string';
-        $mappings['preferredLanguage'] = AttributeMapping::eloquent('locale');
-
-        /* 
+        /*
           more snipe-it attributes I'd like to check out (to map to 'enterprise' maybe?):
          - website
          - notes?
@@ -108,66 +23,216 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
          - company_id to "organization?"
         */
 
-        $enterprise_namespace = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User';
-        $ent = $enterprise_namespace.':';
 
-        // we remove the 'example' namespace and add the Enterprise one
-        $config['mapping']['schemas'] = AttributeMapping::constant( [$core_namespace, $enterprise_namespace] )->ignoreWrite();
+        $user_prefix = 'urn:ietf:params:scim:schemas:core:2.0:User:';
+        $enterprise_prefix = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:';
 
-        $config['validations'][$ent.'employeeNumber'] = 'string';
-        $config['validations'][$ent.'department'] = 'string';
-        $config['validations'][$ent.'manager'] = 'nullable';
-        $config['validations'][$ent.'manager.value'] = 'string';
+        return [
 
-        $config['mapping'][$enterprise_namespace] = [
-            'employeeNumber' => AttributeMapping::eloquent('employee_num'),
-            'department' =>(new AttributeMapping())->setAdd( // FIXME parent?
-                function ($value, &$object) {
-                    $department = Department::where("name", $value)->first();
-                    if ($department) {
-                        $object->department_id = $department->id;
-                    }
-                }
-                )->setReplace(
-                    function ($value, &$object) {
-                        $department = Department::where("name", $value)->first();
-                        if ($department) {
-                            $object->department_id = $department->id;
-                        }
-                    }
-                )->setRead(
+            // Set to 'null' to make use of auth.providers.users.model (App\User::class)
+            'class' => SCIMUser::class,
+
+            'validations' => [
+                $user_prefix . 'userName' => 'required',
+                $user_prefix . 'name.givenName' => 'required',
+                $user_prefix . 'name.familyName' => 'nullable|string',
+                $user_prefix . 'externalId' => 'nullable|string',
+                $user_prefix . 'emails' => 'nullable|array',
+                $user_prefix . 'emails.*.value' => 'nullable|email',
+                $user_prefix . 'active' => 'boolean',
+                $user_prefix . 'phoneNumbers' => 'nullable|array',
+                $user_prefix . 'phoneNumbers.*.value' => 'nullable|string',
+                $user_prefix . 'addresses' => 'nullable|array',
+                $user_prefix . 'addresses.*.streetAddress' => 'nullable|string',
+                $user_prefix . 'addresses.*.locality' => 'nullable|string',
+                $user_prefix . 'addresses.*.region' => 'nullable|string',
+                $user_prefix . 'addresses.*.postalCode' => 'nullable|string',
+                $user_prefix . 'addresses.*.country' => 'nullable|string',
+                $user_prefix . 'title' => 'nullable|string',
+                $user_prefix . 'preferredLanguage' => 'nullable|string',
+
+                // Enterprise validations:
+                $enterprise_prefix . 'employeeNumber' => 'nullable|string',
+                $enterprise_prefix . 'department' => 'nullable|string',
+                $enterprise_prefix . 'manager' => 'nullable',
+                $enterprise_prefix . 'manager.value' => 'nullable|string'
+            ],
+
+            'singular' => 'User',
+            'schema' => [Schema::SCHEMA_USER],
+
+            //eager loading
+            'withRelations' => [],
+            'map_unmapped' => false,
+//            'unmapped_namespace' => 'urn:ietf:params:scim:schemas:laravel:unmapped',
+            'description' => 'User Account',
+
+            // Map a SCIM attribute to an attribute of the object.
+            'mapping' => [
+
+                'id' => (new AttributeMapping())->setRead(
                     function (&$object) {
-                        return $object->department ? $object->department->name : null;
-                    } 
-                ),
-            'manager' => [
-                // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool.
-                // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
-                // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
-                // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing
-                'value' => (new AttributeMapping())->setAdd(
-                    function ($value, &$object) {
-                        $manager = User::find($value);
-                        if ($manager) {
-                            $object->manager_id = $manager->id;
-                        }
+                        return (string)$object->id;
                     }
+                )->disableWrite(),
+
+                'externalId' => AttributeMapping::eloquent('scim_externalid'), // FIXME - I have a PR that changes a lot of this.
+
+                'meta' => [
+                    'created' => AttributeMapping::eloquent("created_at")->disableWrite(),
+                    'lastModified' => AttributeMapping::eloquent("updated_at")->disableWrite(),
+
+                    'location' => (new AttributeMapping())->setRead(
+                        function ($object) {
+                            return route(
+                                'scim.resource',
+                                [
+                                    'resourceType' => 'Users',
+                                    'resourceObject' => $object->id
+                                ]
+                            );
+                        }
+                    )->disableWrite(),
+
+                    'resourceType' => AttributeMapping::constant("User")
+                ],
+
+                'schemas' => AttributeMapping::constant(
+                    [
+                        'urn:ietf:params:scim:schemas:core:2.0:User',
+                        'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'
+                    ]
+                )->ignoreWrite(),
+
+                'urn:ietf:params:scim:schemas:core:2.0:User' => [
+
+                    'userName' => AttributeMapping::eloquent("username"),
+
+                    'name' => [
+                        'formatted' => (new AttributeMapping())->ignoreWrite()->setRead(
+                            function (&$object) {
+                                return $object->getFullNameAttribute();
+                            }
+                        ),
+                        'familyName' => AttributeMapping::eloquent("last_name"),
+                        'givenName' => AttributeMapping::eloquent("first_name"),
+                        'middleName' => null,
+                        'honorificPrefix' => null,
+                        'honorificSuffix' => null
+                    ],
+
+                    'displayName' => null,
+                    'nickName' => null,
+                    'profileUrl' => null,
+                    'title' => AttributeMapping::eloquent('jobtitle'),
+                    'userType' => null,
+                    'preferredLanguage' => AttributeMapping::eloquent('locale'), // Section 5.3.5 of [RFC7231]
+                    'locale' => null, // see RFC5646
+                    'timezone' => null, // see RFC6557
+                    'active' => AttributeMapping::eloquent('activated'),
+
+                    'password' => AttributeMapping::eloquent('password')->disableRead(),
+
+                    // Multi-Valued Attributes
+                    'emails' => [[
+                        "value" => AttributeMapping::eloquent("email"),
+                        "display" => null,
+                        "type" => AttributeMapping::constant("work")->ignoreWrite(),
+                        "primary" => AttributeMapping::constant(true)->ignoreWrite()
+                    ]],
+
+                    'phoneNumbers' => [[
+                        "value" => AttributeMapping::eloquent("phone"),
+                        "display" => null,
+                        "type" => AttributeMapping::constant("work")->ignoreWrite(),
+                        "primary" => AttributeMapping::constant(true)->ignoreWrite()
+                    ]],
+
+                    'ims' => [[
+                        "value" => null,
+                        "display" => null,
+                        "type" => null,
+                        "primary" => null
+                    ]], // Instant messaging addresses for the User
+
+                    'photos' => [[
+                        "value" => null,
+                        "display" => null,
+                        "type" => null,
+                        "primary" => null
+                    ]],
+
+                    'addresses' => [[
+                        'type' => AttributeMapping::constant("work")->ignoreWrite(),
+                        'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right.
+                        'streetAddress' => AttributeMapping::eloquent("address"),
+                        'locality' => AttributeMapping::eloquent("city"),
+                        'region' => AttributeMapping::eloquent("state"),
+                        'postalCode' => AttributeMapping::eloquent("zip"),
+                        'country' => AttributeMapping::eloquent("country"),
+                        'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example?
+                    ]],
+
+                    'groups' => [[
+                        'value' => null,
+                        '$ref' => null,
+                        'display' => null,
+                        'type' => null,
+                    ]],
+
+                    'entitlements' => null,
+                    'roles' => null,
+                    'x509Certificates' => null
+                ],
+
+                'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User' => [
+                    'employeeNumber' => AttributeMapping::eloquent('employee_num'),
+                    'department' => (new AttributeMapping())->setAdd( // FIXME parent?
+                        function ($value, &$object) {
+                            $department = Department::where("name", $value)->first();
+                            if ($department) {
+                                $object->department_id = $department->id;
+                            }
+                        }
                     )->setReplace(
                         function ($value, &$object) {
-                            $manager = User::find($value);
-                            if ($manager) {
-                                $object->manager_id = $manager->id;
+                            $department = Department::where("name", $value)->first();
+                            if ($department) {
+                                $object->department_id = $department->id;
                             }
                         }
                     )->setRead(
                         function (&$object) {
-                            return $object->manager_id;
-                        } 
+                            return $object->department ? $object->department->name : null;
+                        }
                     ),
+                    'manager' => [
+                        // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool.
+                        // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
+                        // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
+                        // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing
+                        'value' => (new AttributeMapping())->setAdd(
+                            function ($value, &$object) {
+                                $manager = User::find($value);
+                                if ($manager) {
+                                    $object->manager_id = $manager->id;
+                                }
+                            }
+                        )->setReplace(
+                            function ($value, &$object) {
+                                $manager = User::find($value);
+                                if ($manager) {
+                                    $object->manager_id = $manager->id;
+                                }
+                            }
+                        )->setRead(
+                            function (&$object) {
+                                return $object->manager_id;
+                            }
+                        ),
+                    ]
+                ]
             ]
         ];
-
-        return $config;
     }
-
 }
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 393e7ddb29..e198d10c10 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -16,17 +16,17 @@ class Supplier extends SnipeModel
     protected $table = 'suppliers';
 
     protected $rules = [
-        'name'              => 'required|min:1|max:255|unique_undeleted',
-        'address'           => 'max:250|nullable',
-        'address2'          => 'max:250|nullable',
-        'city'              => 'max:255|nullable',
-        'state'             => 'max:32|nullable',
-        'country'           => 'max:3|nullable',
+        'name'               => 'required|min:1|max:255|unique_undeleted',
         'fax'               => 'min:7|max:35|nullable',
         'phone'             => 'min:7|max:35|nullable',
         'contact'           => 'max:100|nullable',
         'notes'             => 'max:191|nullable', // Default string length is 191 characters..
         'email'             => 'email|max:150|nullable',
+        'address'            => 'max:250|nullable',
+        'address2'           => 'max:250|nullable',
+        'city'               => 'max:191|nullable',
+        'state'              => 'min:2|max:191|nullable',
+        'country'            => 'min:2|max:191|nullable',
         'zip'               => 'max:10|nullable',
         'url'               => 'sometimes|nullable|string|max:250',
     ];
@@ -78,24 +78,7 @@ class Supplier extends SnipeModel
     {
         return $this->hasMany(Asset::class)->whereNull('deleted_at')->selectRaw('supplier_id, count(*) as count')->groupBy('supplier_id');
     }
-
-    /**
-     * Sets the license seat count attribute
-     *
-     * @todo I don't see the licenseSeatsRelation here?
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v1.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function getLicenseSeatsCountAttribute()
-    {
-        if ($this->licenseSeatsRelation->first()) {
-            return $this->licenseSeatsRelation->first()->count;
-        }
-
-        return 0;
-    }
+    
 
     /**
      * Establishes the supplier -> assets relationship
@@ -121,6 +104,30 @@ class Supplier extends SnipeModel
         return $this->hasMany(\App\Models\Accessory::class, 'supplier_id');
     }
 
+    /**
+     * Establishes the supplier -> component relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function components()
+    {
+        return $this->hasMany(\App\Models\Component::class, 'supplier_id');
+    }
+
+    /**
+     * Establishes the supplier -> component relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function consumables()
+    {
+        return $this->hasMany(\App\Models\Consumable::class, 'supplier_id');
+    }
+
     /**
      * Establishes the supplier -> asset maintenances relationship
      *
diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index db46e305df..06e05348fb 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -5,6 +5,7 @@ namespace App\Models\Traits;
 use App\Models\Asset;
 use App\Models\CustomField;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
 
 /**
  * This trait allows for cleaner searching of models,
@@ -164,7 +165,13 @@ trait Searchable
                 }
                 // I put this here because I only want to add the concat one time in the end of the user relation search
                 if($relation == 'user') {
-                    $query->orWhereRaw('CONCAT (users.first_name, " ", users.last_name) LIKE ?', ["%$term%"]);
+                    $query->orWhereRaw(
+                            $this->buildMultipleColumnSearch([
+                                'users.first_name',
+                                'users.last_name',
+                            ]),
+                            ["%{$term}%"]
+                        );
                 }
             });
         }
@@ -195,7 +202,7 @@ trait Searchable
      */
     private function getSearchableAttributes()
     {
-        return isset($this->searchableAttributes) ? $this->searchableAttributes : [];
+        return $this->searchableAttributes ?? [];
     }
 
     /**
@@ -205,7 +212,7 @@ trait Searchable
      */
     private function getSearchableRelations()
     {
-        return isset($this->searchableRelations) ? $this->searchableRelations : [];
+        return $this->searchableRelations ?? [];
     }
 
     /**
@@ -257,4 +264,37 @@ trait Searchable
 
         return $related->getTable();
     }
+
+    /**
+     * Builds a search string for either MySQL or sqlite by separating the provided columns with a space.
+     *
+     * @param array $columns Columns to include in search string.
+     * @return string
+     */
+    private function buildMultipleColumnSearch(array $columns): string
+    {
+        $mappedColumns = collect($columns)->map(fn($column) => DB::getTablePrefix() . $column)->toArray();
+
+        $driver = config('database.connections.' . config('database.default') . '.driver');
+
+        if ($driver === 'sqlite') {
+            return implode("||' '||", $mappedColumns) . ' LIKE ?';
+        }
+
+        // Default to MySQL's concatenation method
+        return 'CONCAT(' . implode('," ",', $mappedColumns) . ') LIKE ?';
+    }
+
+    /**
+     * Search a string across multiple columns separated with a space.
+     *
+     * @param Builder $query
+     * @param array $columns - Columns to include in search string.
+     * @param $term
+     * @return Builder
+     */
+    public function scopeOrWhereMultipleColumns($query, array $columns, $term)
+    {
+        return $query->orWhereRaw($this->buildMultipleColumnSearch($columns), ["%{$term}%"]);
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
old mode 100755
new mode 100644
index 399008430b..98a3ec346b
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -61,7 +61,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'remote',
         'start_date',
         'end_date',
-        'scim_externalid'
+        'scim_externalid',
+        'avatar',
+        'gravatar',
+        'vip',
+        'autoassign_licenses',
     ];
 
     protected $casts = [
@@ -69,18 +73,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'manager_id'   => 'integer',
         'location_id'  => 'integer',
         'company_id'   => 'integer',
+        'vip'      => 'boolean',
+        'created_at'   => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'   => 'datetime',
+        'autoassign_licenses'    => 'boolean',
     ];
 
-
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'start_date',
-        'end_date',
-    ];
-
-
     /**
      * Model validation rules
      *
@@ -96,8 +95,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'website'                 => 'url|nullable|max:191',
         'manager_id'              => 'nullable|exists:users,id|cant_manage_self',
         'location_id'             => 'exists:locations,id|nullable',
-        'start_date'              => 'nullable|date',
-        'end_date'                => 'nullable|date|after_or_equal:start_date',
+        'start_date'              => 'nullable|date_format:Y-m-d',
+        'end_date'                => 'nullable|date_format:Y-m-d|after_or_equal:start_date',
+        'autoassign_licenses'     => 'boolean',
+        'address'                 => 'max:191|nullable',
+        'city'                    => 'max:191|nullable',
+        'state'                   => 'min:2|max:191|nullable',
+        'country'                 => 'min:2|max:191|nullable',
+        'zip'                     => 'max:10|nullable',
     ];
 
     /**
@@ -259,20 +264,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return $this->last_name.', '.$this->first_name.' ('.$this->username.')';
     }
 
-    /**
-     * The url for slack notifications.
-     * Used by Notifiable trait.
-     * @return mixed
-     */
-    public function routeNotificationForSlack()
-    {
-        // At this point the endpoint is the same for everything.
-        //  In the future this may want to be adapted for individual notifications.
-        $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint;
-
-        return $this->endpoint;
-    }
-
 
     /**
      * Establishes the user -> assets relationship
@@ -283,7 +274,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function assets()
     {
-        return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
+        return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed()->orderBy('id');
     }
 
     /**
@@ -311,7 +302,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     public function accessories()
     {
         return $this->belongsToMany(\App\Models\Accessory::class, 'accessories_users', 'assigned_to', 'accessory_id')
-            ->withPivot('id', 'created_at', 'note')->withTrashed();
+            ->withPivot('id', 'created_at', 'note')->withTrashed()->orderBy('accessory_id');
     }
 
     /**
@@ -653,14 +644,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function scopeSimpleNameSearch($query, $search)
     {
-           $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
-               ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$search%"]);
-
-        return $query;
+        return $query->where('first_name', 'LIKE', '%' . $search . '%')
+            ->orWhere('last_name', 'LIKE', '%' . $search . '%')
+            ->orWhereMultipleColumns([
+                'users.first_name',
+                'users.last_name',
+            ], $search);
     }
 
-
     /**
      * Run additional, advanced searches.
      *
@@ -669,9 +660,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function advancedTextSearch(Builder $query, array $terms) {
-
         foreach($terms as $term) {
-            $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$term%"]);
+            $query->orWhereMultipleColumns([
+                'users.first_name',
+                'users.last_name',
+            ], $term);
         }
 
         return $query;
diff --git a/app/Notifications/AcceptanceAssetAcceptedNotification.php b/app/Notifications/AcceptanceAssetAcceptedNotification.php
index c667588dae..ca016acd34 100644
--- a/app/Notifications/AcceptanceAssetAcceptedNotification.php
+++ b/app/Notifications/AcceptanceAssetAcceptedNotification.php
@@ -40,12 +40,17 @@ class AcceptanceAssetAcceptedNotification extends Notification
     public function via()
     {
 
-        $notifyBy[] = 'mail';
+        $notifyBy = ['mail'];
 
         return $notifyBy;
 
     }
 
+    public function shouldSend($notifiable, $channel)
+    {
+        return $this->settings->alerts_enabled && ! empty($this->settings->alert_email);
+    }
+
     /**
      * Get the mail representation of the notification.
      *
diff --git a/app/Notifications/AcceptanceAssetDeclinedNotification.php b/app/Notifications/AcceptanceAssetDeclinedNotification.php
index 9446747353..11b022e095 100644
--- a/app/Notifications/AcceptanceAssetDeclinedNotification.php
+++ b/app/Notifications/AcceptanceAssetDeclinedNotification.php
@@ -38,12 +38,17 @@ class AcceptanceAssetDeclinedNotification extends Notification
      */
     public function via($notifiable)
     {
-        $notifyBy[] = 'mail';
+        $notifyBy = ['mail'];
 
         return $notifyBy;
 
     }
 
+    public function shouldSend($notifiable, $channel)
+    {
+        return $this->settings->alerts_enabled && ! empty($this->settings->alert_email);
+    }
+
     /**
      * Get the mail representation of the notification.
      *
diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php
index 84f1753767..1377c29e7e 100644
--- a/app/Notifications/AuditNotification.php
+++ b/app/Notifications/AuditNotification.php
@@ -23,6 +23,7 @@ class AuditNotification extends Notification
     public function __construct($params)
     {
         //
+        $this->settings = Setting::getSettings();
         $this->params = $params;
     }
 
@@ -34,7 +35,7 @@ class AuditNotification extends Notification
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->slack_endpoint) {
+        if (Setting::getSettings()->webhook_endpoint) {
             $notifyBy[] = 'slack';
         }
 
@@ -43,9 +44,12 @@ class AuditNotification extends Notification
 
     public function toSlack()
     {
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
         return (new SlackMessage)
             ->success()
             ->content(class_basename(get_class($this->params['item'])).' Audited')
+            ->from(($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot')
+            ->to($channel)
             ->attachment(function ($attachment) {
                 $item = $this->params['item'];
                 $admin_user = $this->params['admin'];
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
index f9abba59f9..53be68f58f 100644
--- a/app/Notifications/CheckinAccessoryNotification.php
+++ b/app/Notifications/CheckinAccessoryNotification.php
@@ -39,11 +39,7 @@ class CheckinAccessoryNotification extends Notification
         \Log::debug('via called');
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint) {
-            $notifyBy[] = 'slack';
-        }
-
-        if (Setting::getSettings()->slack_endpoint != '') {
+        if (Setting::getSettings()->webhook_endpoint != '') {
             $notifyBy[] = 'slack';
         }
 
@@ -95,7 +91,8 @@ class CheckinAccessoryNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
@@ -105,6 +102,7 @@ class CheckinAccessoryNotification extends Notification
         return (new SlackMessage)
             ->content(':arrow_down: :keyboard: '.trans('mail.Accessory_Checkin_Notification'))
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index 9868ad1b4d..5389c8ddde 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -43,9 +43,8 @@ class CheckinAssetNotification extends Notification
     public function via()
     {
         $notifyBy = [];
-
-        if (Setting::getSettings()->slack_endpoint != '') {
-            \Log::debug('use slack');
+        if (Setting::getSettings()->webhook_endpoint != '') {
+            \Log::debug('use webhook');
             $notifyBy[] = 'slack';
         }
 
@@ -65,7 +64,8 @@ class CheckinAssetNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname != '') ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname != '') ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
@@ -76,6 +76,7 @@ class CheckinAssetNotification extends Notification
         return (new SlackMessage)
             ->content(':arrow_down: :computer: '.trans('mail.Asset_Checkin_Notification'))
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
index faeafecb1b..2c7fe2fd85 100644
--- a/app/Notifications/CheckinLicenseSeatNotification.php
+++ b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -41,7 +41,7 @@ class CheckinLicenseSeatNotification extends Notification
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint != '') {
+        if (Setting::getSettings()->webhook_endpoint != '') {
             $notifyBy[] = 'slack';
         }
 
@@ -62,7 +62,8 @@ class CheckinLicenseSeatNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         if ($admin) {
             $fields = [
@@ -79,6 +80,7 @@ class CheckinLicenseSeatNotification extends Notification
         return (new SlackMessage)
             ->content(':arrow_down: :floppy_disk: '.trans('mail.License_Checkin_Notification'))
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
index 5882fdf275..f5635d1af0 100644
--- a/app/Notifications/CheckoutAccessoryNotification.php
+++ b/app/Notifications/CheckoutAccessoryNotification.php
@@ -37,7 +37,7 @@ class CheckoutAccessoryNotification extends Notification
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint != '') {
+        if (Setting::getSettings()->webhook_endpoint != '') {
             $notifyBy[] = 'slack';
         }
 
@@ -78,7 +78,8 @@ class CheckoutAccessoryNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
@@ -88,6 +89,7 @@ class CheckoutAccessoryNotification extends Notification
         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())
                     ->fields($fields)
diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
index c56c1a3711..e57825f5c6 100644
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -53,8 +53,8 @@ class CheckoutAssetNotification extends Notification
     {
         $notifyBy = [];
 
-        if ((Setting::getSettings()) && (Setting::getSettings()->slack_endpoint != '')) {
-            \Log::debug('use slack');
+        if ((Setting::getSettings()) && (Setting::getSettings()->webhook_endpoint != '')) {
+            \Log::debug('use webhook');
             $notifyBy[] = 'slack';
         }
 
@@ -95,7 +95,8 @@ class CheckoutAssetNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
@@ -107,8 +108,9 @@ class CheckoutAssetNotification extends Notification
         }
 
         return (new SlackMessage)
-            ->content(':arrow_up: :computer: Asset Checked Out')
+            ->content(':arrow_up: :computer: '.trans('mail.Asset_Checkout_Notification'))
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
index bfebe2c7d5..376c70fdea 100644
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/app/Notifications/CheckoutConsumableNotification.php
@@ -43,7 +43,7 @@ class CheckoutConsumableNotification extends Notification
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint != '') {
+        if (Setting::getSettings()->webhook_endpoint != '') {
             $notifyBy[] = 'slack';
         }
 
@@ -84,7 +84,8 @@ class CheckoutConsumableNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
@@ -94,6 +95,7 @@ class CheckoutConsumableNotification extends Notification
         return (new SlackMessage)
             ->content(':arrow_up: :paperclip: Consumable Checked Out')
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php
index 50d8313c09..2dd6480a30 100644
--- a/app/Notifications/CheckoutLicenseSeatNotification.php
+++ b/app/Notifications/CheckoutLicenseSeatNotification.php
@@ -43,7 +43,7 @@ class CheckoutLicenseSeatNotification extends Notification
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint != '') {
+        if (Setting::getSettings()->webhook_endpoint != '') {
             $notifyBy[] = 'slack';
         }
 
@@ -84,7 +84,8 @@ class CheckoutLicenseSeatNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
@@ -94,6 +95,7 @@ class CheckoutLicenseSeatNotification extends Notification
         return (new SlackMessage)
             ->content(':arrow_up: :floppy_disk: License Checked Out')
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/CurrentInventory.php b/app/Notifications/CurrentInventory.php
index d0161aa165..158955b273 100644
--- a/app/Notifications/CurrentInventory.php
+++ b/app/Notifications/CurrentInventory.php
@@ -44,7 +44,7 @@ class CurrentInventory extends Notification
                 'accessories'  => $this->user->accessories,
                 'licenses'  => $this->user->licenses,
             ])
-            ->subject('Inventory Report');
+            ->subject(trans('mail.inventory_report'));
 
         return $message;
     }
diff --git a/app/Notifications/FirstAdminNotification.php b/app/Notifications/FirstAdminNotification.php
index 71637b5e80..83e3a65de7 100644
--- a/app/Notifications/FirstAdminNotification.php
+++ b/app/Notifications/FirstAdminNotification.php
@@ -24,7 +24,7 @@ class FirstAdminNotification extends Notification
         $this->_data['last_name'] = $content['last_name'];
         $this->_data['username'] = $content['username'];
         $this->_data['password'] = $content['password'];
-        $this->_data['url'] = url('/');
+        $this->_data['url'] = config('app.url');
     }
 
     /**
diff --git a/app/Notifications/InventoryAlert.php b/app/Notifications/InventoryAlert.php
index ff88b548c0..6d59e3b42a 100644
--- a/app/Notifications/InventoryAlert.php
+++ b/app/Notifications/InventoryAlert.php
@@ -32,7 +32,7 @@ class InventoryAlert extends Notification
      */
     public function via()
     {
-        $notifyBy[] = 'mail';
+        $notifyBy = ['mail'];
 
         return $notifyBy;
     }
diff --git a/app/Notifications/RequestAssetCancelation.php b/app/Notifications/RequestAssetCancelation.php
index ea76056af3..fa3546bbc8 100644
--- a/app/Notifications/RequestAssetCancelation.php
+++ b/app/Notifications/RequestAssetCancelation.php
@@ -57,8 +57,8 @@ class RequestAssetCancelation extends Notification
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint != '') {
-            \Log::debug('use slack');
+        if (Setting::getSettings()->webhook_endpoint != '') {
+            \Log::debug('use webhook');
             $notifyBy[] = 'slack';
         }
 
@@ -73,7 +73,8 @@ class RequestAssetCancelation extends Notification
         $item = $this->item;
         $note = $this->note;
         $qty = $this->item_quantity;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'QTY' => $qty,
@@ -87,6 +88,7 @@ class RequestAssetCancelation extends Notification
         return (new SlackMessage)
             ->content(trans('mail.a_user_canceled'))
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/RequestAssetNotification.php b/app/Notifications/RequestAssetNotification.php
index 22a8f3d464..d2001f2e13 100644
--- a/app/Notifications/RequestAssetNotification.php
+++ b/app/Notifications/RequestAssetNotification.php
@@ -58,7 +58,7 @@ class RequestAssetNotification extends Notification
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->slack_endpoint != '') {
+        if (Setting::getSettings()->webhook_endpoint != '') {
             $notifyBy[] = 'slack';
         }
 
@@ -73,7 +73,8 @@ class RequestAssetNotification extends Notification
         $qty = $this->item_quantity;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
             'QTY' => $qty,
@@ -83,6 +84,7 @@ class RequestAssetNotification extends Notification
         return (new SlackMessage)
             ->content(trans('mail.Item_Requested'))
             ->from($botname)
+            ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $fields) {
                 $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
diff --git a/app/Notifications/SendUpcomingAuditNotification.php b/app/Notifications/SendUpcomingAuditNotification.php
index a883220f2f..a1005494f6 100644
--- a/app/Notifications/SendUpcomingAuditNotification.php
+++ b/app/Notifications/SendUpcomingAuditNotification.php
@@ -40,7 +40,7 @@ class SendUpcomingAuditNotification extends Notification
      */
     public function toMail()
     {
-        $message = (new MailMessage)->markdown('notifications.markdown.upcoming-audits',
+        $message = (new MailMessage())->markdown('notifications.markdown.upcoming-audits',
             [
                 'assets'  => $this->assets,
                 'threshold'  => $this->threshold,
diff --git a/app/Notifications/WelcomeNotification.php b/app/Notifications/WelcomeNotification.php
index 639f622188..1e27ca7364 100644
--- a/app/Notifications/WelcomeNotification.php
+++ b/app/Notifications/WelcomeNotification.php
@@ -24,7 +24,7 @@ class WelcomeNotification extends Notification
         $this->_data['last_name'] = htmlspecialchars_decode($content['last_name']);
         $this->_data['username'] = htmlspecialchars_decode($content['username']);
         $this->_data['password'] = htmlspecialchars_decode($content['password']);
-        $this->_data['url'] = url('/');
+        $this->_data['url'] = config('app.url');
     }
 
     /**
@@ -44,7 +44,7 @@ class WelcomeNotification extends Notification
      */
     public function toMail()
     {
-        return (new MailMessage)
+        return (new MailMessage())
             ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']]))
             ->markdown('notifications.Welcome', $this->_data);
     }
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index a399e1d2a6..84595f04b3 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -71,12 +71,33 @@ class AssetObserver
     public function created(Asset $asset)
     {
         if ($settings = Setting::getSettings()) {
-            $settings->increment('next_auto_tag_base');
-            $settings->save();
+            $tag = $asset->asset_tag;
+            $prefix = $settings->auto_increment_prefix;
+            $number = substr($tag, strlen($prefix));
+            // IF - auto_increment_assets is on, AND (the prefix matches the start of the tag OR there is no prefix)
+            //      AND the rest of the string after the prefix is all digits, THEN...
+            if ($settings->auto_increment_assets && (strpos($tag, $prefix) === 0 || $prefix=='') && preg_match('/\d+/',$number) === 1) {
+                // new way of auto-trueing-up auto_increment ID's
+                $next_asset_tag = intval($number, 10) + 1;
+                // we had to use 'intval' because the $number could be '01234' and
+                // might get interpreted in Octal instead of decimal
+
+                // only modify the 'next' one if it's *bigger* than the stored base
+                //
+                if($next_asset_tag > $settings->next_auto_tag_base) {
+                    $settings->next_auto_tag_base = $next_asset_tag;
+                    $settings->save();
+                }
+
+            } else {
+                // legacy method
+                $settings->increment('next_auto_tag_base');
+                $settings->save();
+            }
         }
 
         $logAction = new Actionlog();
-        $logAction->item_type = Asset::class;
+        $logAction->item_type = Asset::class; // can we instead say $logAction->item = $asset ?
         $logAction->item_id = $asset->id;
         $logAction->created_at = date('Y-m-d H:i:s');
         $logAction->user_id = Auth::id();
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 7d77acc8d7..cc4f9badfc 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -80,19 +80,25 @@ class AccessoryPresenter extends Presenter
             ], [
                 'field' => 'qty',
                 'searchable' => false,
-                'sortable' => false,
-                'title' => trans('admin/accessories/general.total'),
-            ],  [
-                'field' => 'min_qty',
-                'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.min_amt'),
+                'title' => trans('admin/accessories/general.total'),
             ], [
                 'field' => 'remaining_qty',
                 'searchable' => false,
                 'sortable' => false,
                 'visible' => false,
                 'title' => trans('admin/accessories/general.remaining'),
+            ],[
+                'field' => 'users_count',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => true,
+                'title' => trans('general.checked_out'),
+            ], [
+                'field' => 'min_qty',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.min_amt'),
             ], [
                 'field' => 'purchase_date',
                 'searchable' => true,
diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
index 617cdb6a2a..cd581d33ce 100644
--- a/app/Presenters/ActionlogPresenter.php
+++ b/app/Presenters/ActionlogPresenter.php
@@ -50,6 +50,8 @@ class ActionlogPresenter extends Presenter
             return 'far fa-save';
         } elseif ($this->itemType() == 'component') {
             return 'far fa-hdd';
+        } elseif ($this->itemType() == 'user') {
+            return 'fa-solid fa-people-arrows';
         }
 
     }
diff --git a/app/Presenters/AssetAuditPresenter.php b/app/Presenters/AssetAuditPresenter.php
index 2c25a6aa06..a332950de1 100644
--- a/app/Presenters/AssetAuditPresenter.php
+++ b/app/Presenters/AssetAuditPresenter.php
@@ -44,13 +44,13 @@ class AssetAuditPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'hardwareLinkFormatter',
             ], [
-                'field' => 'image',
+                'field' => 'file',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' => trans('admin/hardware/table.image'),
                 'visible' => false,
-                'formatter' => 'imageFormatter',
+                'formatter' => 'auditImageFormatter',
             ], [
                 'field' => 'asset_tag',
                 'searchable' => true,
diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
index 8906b420d3..c4446c0b2a 100644
--- a/app/Presenters/AssetMaintenancesPresenter.php
+++ b/app/Presenters/AssetMaintenancesPresenter.php
@@ -95,6 +95,7 @@ class AssetMaintenancesPresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/asset_maintenances/table.is_warranty'),
+                'formatter' => 'trueFalseFormatter'
             ], [
                 'field' => 'cost',
                 'searchable' => true,
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index fd74108ee3..8da192ebb2 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -123,6 +123,7 @@ class AssetModelPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.notes'),
                 'visible' => false,
+                'formatter' => 'notesFormatter',
             ],
             [
                 'field' => 'created_at',
@@ -210,7 +211,7 @@ class AssetModelPresenter extends Presenter
     public function imageUrl()
     {
         if (! empty($this->image)) {
-            return '<img src="'.url('/').'/uploads/models/'.$this->image.'" alt="'.$this->name.'" height="50" width="50">';
+            return '<img src="'.config('app.url').'/uploads/models/'.$this->image.'" alt="'.$this->name.'" height="50" width="50">';
         }
 
         return '';
@@ -223,7 +224,7 @@ class AssetModelPresenter extends Presenter
     public function imageSrc()
     {
         if (! empty($this->image)) {
-            return url('/').'/uploads/models/'.$this->image;
+            return config('app.url').'/uploads/models/'.$this->image;
         }
 
         return '';
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index ccc4a4cf13..ec50933583 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -154,6 +154,13 @@ class AssetPresenter extends Presenter
                 'footerFormatter' => 'sumFormatter',
                 'class' => 'text-right',
             ], [
+                "field" => "book_value",
+                "searchable" => false,
+                "sortable" => false,
+                "title" => trans('admin/hardware/table.book_value'),
+                "footerFormatter" => 'sumFormatter',
+                "class" => "text-right",
+            ],[
                 'field' => 'order_number',
                 'searchable' => true,
                 'sortable' => true,
@@ -163,9 +170,16 @@ class AssetPresenter extends Presenter
             ], [
                 'field' => 'eol',
                 'searchable' => false,
-                'sortable' => false,
+                'sortable' => true,
                 'visible' => false,
                 'title' => trans('general.eol'),
+            ],
+            [
+                'field' => 'asset_eol_date',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('admin/hardware/form.eol_date'),
                 'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'warranty_months',
@@ -285,7 +299,7 @@ class AssetPresenter extends Presenter
                 'formatter'=> 'customFieldsFormatter',
                 'escape' => true,
                 'class' => ($field->field_encrypted == '1') ? 'css-padlock' : '',
-                'visible' => true,
+                'visible' => ($field->show_in_listview == '1') ? true : false,
             ];
         }
 
@@ -527,6 +541,18 @@ class AssetPresenter extends Presenter
         return false;
     }
 
+    /**
+     * Used to take user created warranty URL and dynamically fill in the needed values per asset
+     * @return string
+     */
+    public function dynamicWarrantyUrl()
+    {
+        $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('{SERIAL}',$this->model->serial,$url));
+        return $url;
+    }
+
     /**
      * Url to view this item.
      * @return string
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index a6aaebf7e4..767def2e36 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -29,6 +29,22 @@ class CompanyPresenter extends Presenter
                 'title' => trans('admin/companies/table.name'),
                 'visible' => true,
                 'formatter' => 'companiesLinkFormatter',
+            ], [
+                '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' => 'image',
                 'searchable' => false,
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 16a96f3c4c..c7468911a1 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -59,6 +59,15 @@ class ComponentPresenter extends Presenter
                 'title' => trans('general.category'),
                 'formatter' => 'categoriesLinkObjFormatter',
             ], [
+                'field' => 'supplier',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.supplier'),
+                'visible' => false,
+                'formatter' => 'suppliersLinkObjFormatter',
+            ],
+            [
                 'field' => 'qty',
                 'searchable' => false,
                 'sortable' => true,
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index e931fc1228..abb599de4f 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -53,6 +53,14 @@ class ConsumablePresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('general.category'),
                 'formatter' => 'categoriesLinkObjFormatter',
+            ], [
+                'field' => 'supplier',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.supplier'),
+                'visible' => false,
+                'formatter' => 'suppliersLinkObjFormatter',
             ], [
                 'field' => 'model_number',
                 'searchable' => true,
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 1e8784f2fc..f2d54549e1 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -33,7 +33,7 @@ class LicensePresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => trans('admin/licenses/table.title'),
+                'title' => trans('general.name'),
                 'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'product_key',
@@ -151,6 +151,21 @@ class LicensePresenter extends Presenter
                 'visible' => false,
                 'title' => trans('general.order_number'),
             ], [
+                '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' => 'notes',
                 'searchable' => true,
                 'sortable' => true,
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index d4281839a1..bf4ee27bba 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -141,6 +141,24 @@ class LocationPresenter extends Presenter
                 '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' => 'ldap_ou',
                 'searchable' => true,
diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index 5b44a76933..f5c15f1fe5 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -47,7 +47,7 @@ class ManufacturerPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('admin/manufacturers/table.url'),
                 'visible' => true,
-                'formatter' => 'linkFormatter',
+                'formatter' => 'externalLinkFormatter',
             ],
             [
                 'field' => 'support_url',
@@ -56,7 +56,7 @@ class ManufacturerPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('admin/manufacturers/table.support_url'),
                 'visible' => true,
-                'formatter' => 'linkFormatter',
+                'formatter' => 'externalLinkFormatter',
             ],
 
             [
@@ -78,6 +78,15 @@ class ManufacturerPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'emailFormatter',
             ],
+            [
+                'field' => 'warranty_lookup_url',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/manufacturers/table.warranty_lookup_url'),
+                'visible' => false,
+                'formatter' => 'externalLinkFormatter',
+            ],
 
             [
                 'field' => 'assets_count',
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 8f5cfcccf5..080a2d10e9 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -7,6 +7,7 @@ use App\Models\Setting;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 /**
  * Class UserPresenter
@@ -85,6 +86,15 @@ class UserPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'usersLinkFormatter',
             ],
+            [
+                'field' => 'vip',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/users/general.vip_label'),
+                'visible' => false,
+                'formatter' => 'trueFalseFormatter',
+            ],
             [
                 'field' => 'remote',
                 'searchable' => false,
@@ -285,6 +295,15 @@ class UserPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'trueFalseFormatter',
             ],
+            [
+                'field' => 'autoassign_licenses',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.autoassign_licenses'),
+                'visible' => false,
+                'formatter' => 'trueFalseFormatter',
+            ],
             [
                 'field' => 'created_by',
                 'searchable' => false,
@@ -346,8 +365,7 @@ class UserPresenter extends Presenter
     public function emailLink()
     {
         if ($this->email) {
-            return '<a href="mailto:'.$this->email.'">'.$this->email.'</a>'
-                .'<a href="mailto:'.$this->email.'" class="hidden-xs hidden-sm"><i class="far fa-envelope"></i></a>';
+            return '<a href="mailto:'.$this->email.'">'.$this->email.'</a><a href="mailto:'.$this->email.'" class="hidden-xs hidden-sm"><i class="far fa-envelope"></i></a>';
         }
 
         return '';
@@ -382,23 +400,31 @@ class UserPresenter extends Presenter
     public function gravatar()
     {
         if ($this->avatar) {
+
+            // Check if it's a google avatar or some external avatar
+            if (Str::startsWith($this->avatar, ['http://', 'https://'])) {
+                return $this->avatar;
+            }
+
+            // Otherwise assume it's an uploaded image
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
         if (Setting::getSettings()->load_remote == '1') {
             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)));
 
+            } elseif ($this->email != '') {
+
+                $gravatar = md5(strtolower(trim($this->email)));
                 return '//gravatar.com/avatar/'.$gravatar;
             }
         }
 
         // Set a fun, gender-neutral default icon
-        return url('/').'/img/default-sm.png';
+        return config('app.url').'/img/default-sm.png';
     }
 
     /**
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 90520738d0..d5b10bde3a 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::group([
             'middleware' => 'web',
-            'namespace' => $this->namespace,
+//            'namespace' => $this->namespace, //okay, I don't know what this means, but somehow this might be a problem for us?
         ], function ($router) {
             require base_path('routes/web/hardware.php');
             require base_path('routes/web/models.php');
@@ -65,7 +65,7 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::group([
             'middleware' => 'auth:api',
-            'namespace' => $this->namespace,
+//            'namespace' => $this->namespace, // this might also be a problem? I don't really know :/
             'prefix' => 'api',
         ], function ($router) {
             require base_path('routes/api.php');
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
index 8ab77c6631..371fc234de 100644
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -29,6 +29,23 @@ class SettingsServiceProvider extends ServiceProvider
             $view->with('snipeSettings', Setting::getSettings());
         });
 
+
+        // Make sure the limit is actually set, is an integer and does not exceed system limits
+        \App::singleton('api_limit_value', function () {
+            $limit = config('app.max_results');
+
+            if ((abs(intval(request('limit'))) > 0) && (abs(request('limit')) <= config('app.max_results'))) {
+                $limit = abs(request('limit'));
+            }
+            \Log::debug('Max in env: '.config('app.max_results'));
+            \Log::debug('Original requested limit: '.request('limit'));
+            \Log::debug('Modified limit: '.$limit);
+            \Log::debug('------------------------------');
+
+            return $limit;
+        });
+
+
         /**
          * Set some common variables so that they're globally available.
          * The paths should always be public (versus private uploads)
@@ -150,6 +167,7 @@ class SettingsServiceProvider extends ServiceProvider
         // Set the monetary locale to the configured locale to make helper::parseFloat work.
         setlocale(LC_MONETARY, config('app.locale'));
         setlocale(LC_NUMERIC, config('app.locale'));
+        
     }
 
     /**
diff --git a/app/Services/Saml.php b/app/Services/Saml.php
index c8fed32bb1..f80b1c1fb9 100644
--- a/app/Services/Saml.php
+++ b/app/Services/Saml.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
  */
 class Saml
 {
-    const DATA_SESSION_KEY = '_samlData';
+    public const DATA_SESSION_KEY = '_samlData';
 
     /**
      * OneLogin_Saml2_Auth instance.
@@ -161,7 +161,7 @@ class Saml
             //Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
             OneLogin_Saml2_Utils::setProxyVars(request()->isFromTrustedProxy());
 
-            data_set($settings, 'sp.entityId', url('/'));
+            data_set($settings, 'sp.entityId', config('app.url'));
             data_set($settings, 'sp.assertionConsumerService.url', route('saml.acs'));
             data_set($settings, 'sp.singleLogoutService.url', route('saml.sls'));
             data_set($settings, 'sp.x509cert', $setting->saml_sp_x509cert);
@@ -308,12 +308,9 @@ class Saml
      */
     public function samlLogin($data)
     {
-        $setting = Setting::getSettings();
         $this->saveDataToSession($data);
         $this->loadDataFromSession();
-
         $username = $this->getUsername();
-
         return User::where('username', '=', $username)->whereNull('deleted_at')->where('activated', '=', '1')->first();
     }
 
diff --git a/composer.json b/composer.json
index ccddd5ab2f..bb9acd9b1d 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "require": {
-    "php": ">=7.4 <8.3",
+    "php": ">=7.4.3 <8.2",
     "ext-curl": "*",
     "ext-fileinfo": "*",
     "ext-json": "*",
@@ -46,10 +46,11 @@
     "laravel/helpers": "^1.4",
     "laravel/passport": "^10.1",
     "laravel/slack-notification-channel": "^2.3",
+    "laravel/socialite": "^5.6",
     "laravel/tinker": "^2.6",
     "laravel/ui": "^3.3",
     "laravelcollective/html": "^6.2",
-    "lcobucci/clock": "1.2.0|2.0.0",
+    "lcobucci/clock": "^1.2.0|^2.0.0",
     "lcobucci/jwt": "^3.4.5|^4.0.4",
     "league/csv": "^9.7",
     "league/flysystem-aws-s3-v3": "^1.0",
@@ -61,26 +62,31 @@
     "nunomaduro/collision": "^5.4",
     "onelogin/php-saml": "^3.4",
     "paragonie/constant_time_encoding": "^2.3",
-    "symfony/polyfill-mbstring": "^1.22",
+    "paragonie/sodium_compat": "^1.19",
     "phpdocumentor/reflection-docblock": "^5.1",
     "phpspec/prophecy": "^1.10",
     "pragmarx/google2fa-laravel": "^1.3",
     "rollbar/rollbar-laravel": "^7.0",
     "spatie/laravel-backup": "^6.16",
+    "symfony/polyfill-mbstring": "^1.22",
     "tecnickcom/tc-lib-barcode": "^1.15",
     "tecnickcom/tcpdf": "^6.5.0",
     "unicodeveloper/laravel-password": "^1.0",
     "watson/validating": "^6.1"
   },
   "require-dev": {
+    "brianium/paratest": "^6.6",
     "fakerphp/faker": "^1.16",
-    "laravel/dusk": "^6.19",
+    "laravel/dusk": "^6.25",
     "mockery/mockery": "^1.4",
+    "nunomaduro/larastan": "^1.0",
+    "nunomaduro/phpinsights": "^2.7",
     "phpunit/php-token-stream": "^3.1",
     "phpunit/phpunit": "^9.0",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/css-selector": "^4.4",
-    "symfony/dom-crawler": "^4.4"
+    "symfony/dom-crawler": "^4.4",
+    "vimeo/psalm": "^5.13"
   },
   "extra": {
     "laravel": {
@@ -124,6 +130,9 @@
     "sort-packages": true,
     "optimize-autoloader": true,
     "discard-changes": true,
-    "process-timeout": 3000
+    "process-timeout": 3000,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }
diff --git a/composer.lock b/composer.lock
index bf8cb1f758..46cb36476c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0c1f3848f8c9ede2b5f1513e4feaa7d7",
+    "content-hash": "ba3150255e8c263677ad9bc203852fb0",
     "packages": [
         {
             "name": "alek13/slack",
@@ -78,12 +78,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/grokability/laravel-scim-server.git",
-                "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369"
+                "reference": "9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/2c7ecc450eee59234e059ec2e7724b2d8f3a8369",
-                "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369",
+                "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419",
+                "reference": "9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419",
                 "shasum": ""
             },
             "require": {
@@ -133,7 +133,7 @@
             "support": {
                 "source": "https://github.com/grokability/laravel-scim-server/tree/master"
             },
-            "time": "2022-11-22T20:26:54+00:00"
+            "time": "2023-01-12T00:32:07+00:00"
         },
         {
             "name": "asm89/stack-cors",
@@ -1810,24 +1810,24 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v2.0.0",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "79573d8b8a141ec8a17312515de8740eed014fa9"
+                "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9",
-                "reference": "79573d8b8a141ec8a17312515de8740eed014fa9",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85",
+                "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-mbstring": "*",
                 "masterminds/html5": "^2.0",
-                "phenx/php-font-lib": "^0.5.4",
-                "phenx/php-svg-lib": "^0.3.3 || ^0.4.0",
+                "phenx/php-font-lib": ">=0.5.4 <1.0.0",
+                "phenx/php-svg-lib": ">=0.3.3 <1.0.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
@@ -1858,25 +1858,17 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Ménager",
-                    "email": "fabien.menager@gmail.com"
-                },
-                {
-                    "name": "Brian Sweeney",
-                    "email": "eclecticgeek@gmail.com"
-                },
-                {
-                    "name": "Gabriel Bull",
-                    "email": "me@gabrielbull.com"
+                    "name": "The Dompdf Community",
+                    "homepage": "https://github.com/dompdf/dompdf/blob/master/AUTHORS.md"
                 }
             ],
             "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v2.0.0"
+                "source": "https://github.com/dompdf/dompdf/tree/v2.0.3"
             },
-            "time": "2022-06-21T21:14:57+00:00"
+            "time": "2023-02-07T12:51:48+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
@@ -2681,6 +2673,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2022-02-23T14:25:13+00:00"
         },
         {
@@ -3612,6 +3605,75 @@
             },
             "time": "2022-01-12T18:07:54+00:00"
         },
+        {
+            "name": "laravel/socialite",
+            "version": "v5.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/socialite.git",
+                "reference": "a14a177f2cc71d8add71e2b19e00800e83bdda09"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/a14a177f2cc71d8add71e2b19e00800e83bdda09",
+                "reference": "a14a177f2cc71d8add71e2b19e00800e83bdda09",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^6.0|^7.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "league/oauth1-client": "^1.10.1",
+                "php": "^7.2|^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.0",
+                "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0",
+                "phpunit/phpunit": "^8.0|^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ],
+                    "aliases": {
+                        "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Socialite\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",
+            "homepage": "https://laravel.com",
+            "keywords": [
+                "laravel",
+                "oauth"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/socialite/issues",
+                "source": "https://github.com/laravel/socialite"
+            },
+            "time": "2023-01-20T15:42:35+00:00"
+        },
         {
             "name": "laravel/tinker",
             "version": "v2.7.2",
@@ -3811,6 +3873,7 @@
                 "issues": "https://github.com/LaravelCollective/html/issues",
                 "source": "https://github.com/LaravelCollective/html"
             },
+            "abandoned": "spatie/laravel-html",
             "time": "2022-02-08T21:02:54+00:00"
         },
         {
@@ -4540,6 +4603,82 @@
             ],
             "time": "2022-04-17T13:12:02+00:00"
         },
+        {
+            "name": "league/oauth1-client",
+            "version": "v1.10.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/oauth1-client.git",
+                "reference": "d6365b901b5c287dd41f143033315e2f777e1167"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
+                "reference": "d6365b901b5c287dd41f143033315e2f777e1167",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-openssl": "*",
+                "guzzlehttp/guzzle": "^6.0|^7.0",
+                "guzzlehttp/psr7": "^1.7|^2.0",
+                "php": ">=7.1||>=8.0"
+            },
+            "require-dev": {
+                "ext-simplexml": "*",
+                "friendsofphp/php-cs-fixer": "^2.17",
+                "mockery/mockery": "^1.3.3",
+                "phpstan/phpstan": "^0.12.42",
+                "phpunit/phpunit": "^7.5||9.5"
+            },
+            "suggest": {
+                "ext-simplexml": "For decoding XML-based responses."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth1\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Corlett",
+                    "email": "bencorlett@me.com",
+                    "homepage": "http://www.webcomm.com.au",
+                    "role": "Developer"
+                }
+            ],
+            "description": "OAuth 1.0 Client Library",
+            "keywords": [
+                "Authentication",
+                "SSO",
+                "authorization",
+                "bitbucket",
+                "identity",
+                "idp",
+                "oauth",
+                "oauth1",
+                "single sign on",
+                "trello",
+                "tumblr",
+                "twitter"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/oauth1-client/issues",
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
+            },
+            "time": "2022-04-15T14:02:14+00:00"
+        },
         {
             "name": "league/oauth2-server",
             "version": "8.3.5",
@@ -5015,6 +5154,10 @@
                 "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.1"
             },
             "funding": [
+                {
+                    "url": "https://github.com/maennchen",
+                    "type": "github"
+                },
                 {
                     "url": "https://opencollective.com/zipstream",
                     "type": "open_collective"
@@ -5131,16 +5274,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.7.5",
+            "version": "2.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
+                "reference": "897eb517a343a2281f11bc5556d6548db7d93947"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab",
-                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947",
+                "reference": "897eb517a343a2281f11bc5556d6548db7d93947",
                 "shasum": ""
             },
             "require": {
@@ -5194,9 +5337,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.7.5"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.7.6"
             },
-            "time": "2021-07-01T14:25:37+00:00"
+            "time": "2022-08-18T16:18:26+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -6299,6 +6442,92 @@
             },
             "time": "2020-10-15T08:29:30+00:00"
         },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933",
+                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": ">=1",
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+            },
+            "suggest": {
+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "support": {
+                "issues": "https://github.com/paragonie/sodium_compat/issues",
+                "source": "https://github.com/paragonie/sodium_compat/tree/v1.19.0"
+            },
+            "time": "2022-09-26T03:40:35+00:00"
+        },
         {
             "name": "phenx/php-font-lib",
             "version": "0.5.4",
@@ -6345,21 +6574,21 @@
         },
         {
             "name": "phenx/php-svg-lib",
-            "version": "0.4.1",
+            "version": "0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02"
+                "reference": "76876c6cf3080bcb6f249d7d59705108166a6685"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02",
-                "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685",
+                "reference": "76876c6cf3080bcb6f249d7d59705108166a6685",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^7.1 || ^7.2 || ^7.3 || ^7.4 || ^8.0",
+                "php": "^7.1 || ^8.0",
                 "sabberworm/php-css-parser": "^8.4"
             },
             "require-dev": {
@@ -6385,9 +6614,9 @@
             "homepage": "https://github.com/PhenX/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.4.1"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.0"
             },
-            "time": "2022-03-07T12:52:04+00:00"
+            "time": "2022-09-06T12:16:56+00:00"
         },
         {
             "name": "php-http/message-factory",
@@ -11727,6 +11956,999 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "amphp/amp",
+            "version": "v2.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/amp.git",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "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",
+                "psalm/phar": "^3.11@dev",
+                "react/promise": "^2"
+            },
+            "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.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-20T17:52:18+00:00"
+        },
+        {
+            "name": "amphp/byte-stream",
+            "version": "v1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/byte-stream.git",
+                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "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",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "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": "http://amphp.org/byte-stream",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "io",
+                "non-blocking",
+                "stream"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/amphp",
+                "issues": "https://github.com/amphp/byte-stream/issues",
+                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-30T17:13:30+00:00"
+        },
+        {
+            "name": "brianium/paratest",
+            "version": "v6.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paratestphp/paratest.git",
+                "reference": "5249af4e25e79da66d1ec3b54b474047999c10b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/5249af4e25e79da66d1ec3b54b474047999c10b8",
+                "reference": "5249af4e25e79da66d1ec3b54b474047999c10b8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-simplexml": "*",
+                "jean85/pretty-package-versions": "^2.0.5",
+                "php": "^7.3 || ^8.0",
+                "phpunit/php-code-coverage": "^9.2.15",
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-timer": "^5.0.3",
+                "phpunit/phpunit": "^9.5.21",
+                "sebastian/environment": "^5.1.4",
+                "symfony/console": "^5.4.9 || ^6.1.2",
+                "symfony/polyfill-php80": "^v1.26.0",
+                "symfony/process": "^5.4.8 || ^6.1.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9.0.0",
+                "ext-pcov": "*",
+                "ext-posix": "*",
+                "infection/infection": "^0.26.13",
+                "malukenho/mcbumpface": "^1.1.5",
+                "squizlabs/php_codesniffer": "^3.7.1",
+                "symfony/filesystem": "^5.4.9 || ^6.1.0",
+                "vimeo/psalm": "^4.26.0"
+            },
+            "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.6.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/Slamdunk",
+                    "type": "github"
+                },
+                {
+                    "url": "https://paypal.me/filippotessarotto",
+                    "type": "paypal"
+                }
+            ],
+            "time": "2022-08-22T10:45:51+00:00"
+        },
+        {
+            "name": "cmgmyr/phploc",
+            "version": "8.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cmgmyr/phploc.git",
+                "reference": "35e308033e02264a59cb1b56cc2abb1a22483ca8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cmgmyr/phploc/zipball/35e308033e02264a59cb1b56cc2abb1a22483ca8",
+                "reference": "35e308033e02264a59cb1b56cc2abb1a22483ca8",
+                "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",
+                "sebastian/version": "^3.0|^4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "phpunit/phpunit": "^9.0|^10.0",
+                "vimeo/psalm": "^5.7"
+            },
+            "bin": [
+                "phploc"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "8.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Gmyr",
+                    "email": "cmgmyr@gmail.com",
+                    "role": "lead"
+                }
+            ],
+            "description": "A tool for quickly measuring the size of a PHP project.",
+            "homepage": "https://github.com/cmgmyr/phploc",
+            "support": {
+                "issues": "https://github.com/cmgmyr/phploc/issues",
+                "source": "https://github.com/cmgmyr/phploc/tree/8.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/cmgmyr",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-03-19T10:37:20+00:00"
+        },
+        {
+            "name": "composer/ca-bundle",
+            "version": "1.3.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/ca-bundle.git",
+                "reference": "90d087e988ff194065333d16bc5cf649872d9cdb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb",
+                "reference": "90d087e988ff194065333d16bc5cf649872d9cdb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "ext-pcre": "*",
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.55",
+                "psr/log": "^1.0",
+                "symfony/phpunit-bridge": "^4.2 || ^5",
+                "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\CaBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "keywords": [
+                "cabundle",
+                "cacert",
+                "certificate",
+                "ssl",
+                "tls"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/ca-bundle/issues",
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.6"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-06-06T12:02:59+00:00"
+        },
+        {
+            "name": "composer/composer",
+            "version": "2.3.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/composer.git",
+                "reference": "ebac357c0a41359f3981098729042ed6dedc97ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/composer/zipball/ebac357c0a41359f3981098729042ed6dedc97ba",
+                "reference": "ebac357c0a41359f3981098729042ed6dedc97ba",
+                "shasum": ""
+            },
+            "require": {
+                "composer/ca-bundle": "^1.0",
+                "composer/metadata-minifier": "^1.0",
+                "composer/pcre": "^2 || ^3",
+                "composer/semver": "^3.0",
+                "composer/spdx-licenses": "^1.2",
+                "composer/xdebug-handler": "^2.0.2 || ^3.0.3",
+                "justinrainbow/json-schema": "^5.2.11",
+                "php": "^7.2.5 || ^8.0",
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
+                "react/promise": "^2.8",
+                "seld/jsonlint": "^1.4",
+                "seld/phar-utils": "^1.2",
+                "symfony/console": "^5.4.7 || ^6.0.7",
+                "symfony/filesystem": "^5.4 || ^6.0",
+                "symfony/finder": "^5.4 || ^6.0",
+                "symfony/polyfill-php73": "^1.24",
+                "symfony/polyfill-php80": "^1.24",
+                "symfony/process": "^5.4 || ^6.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.4.1",
+                "phpstan/phpstan-deprecation-rules": "^1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1",
+                "phpstan/phpstan-symfony": "^1.1",
+                "symfony/phpunit-bridge": "^6.0"
+            },
+            "suggest": {
+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+                "ext-zip": "Enabling the zip extension allows you to unzip archives",
+                "ext-zlib": "Allow gzip compression of HTTP requests"
+            },
+            "bin": [
+                "bin/composer"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.3-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "phpstan/rules.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\": "src/Composer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "https://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "https://seld.be"
+                }
+            ],
+            "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
+            "homepage": "https://getcomposer.org/",
+            "keywords": [
+                "autoload",
+                "dependency",
+                "package"
+            ],
+            "support": {
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/composer/issues",
+                "source": "https://github.com/composer/composer/tree/2.3.10"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-13T13:48:23+00:00"
+        },
+        {
+            "name": "composer/metadata-minifier",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/metadata-minifier.git",
+                "reference": "c549d23829536f0d0e984aaabbf02af91f443207"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207",
+                "reference": "c549d23829536f0d0e984aaabbf02af91f443207",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "composer/composer": "^2",
+                "phpstan/phpstan": "^0.12.55",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\MetadataMinifier\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Small utility library that handles metadata minification and expansion.",
+            "keywords": [
+                "composer",
+                "compression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/metadata-minifier/issues",
+                "source": "https://github.com/composer/metadata-minifier/tree/1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-04-07T13:37:33+00:00"
+        },
+        {
+            "name": "composer/pcre",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-11-17T09:50:14+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.4",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-01T19:23:25+00:00"
+        },
+        {
+            "name": "composer/spdx-licenses",
+            "version": "1.5.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/spdx-licenses.git",
+                "reference": "c848241796da2abf65837d51dce1fae55a960149"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149",
+                "reference": "c848241796da2abf65837d51dce1fae55a960149",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.55",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Spdx\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "SPDX licenses list and validation library.",
+            "keywords": [
+                "license",
+                "spdx",
+                "validator"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/spdx-licenses/issues",
+                "source": "https://github.com/composer/spdx-licenses/tree/1.5.7"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-23T07:37:50+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "shasum": ""
+            },
+            "require": {
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
+                "psr/log": "^1 || ^2 || ^3"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without Xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-02-25T21:32:43+00:00"
+        },
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/composer-installer.git",
+                "reference": "4be43904336affa5c2f70744a348312336afd0da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da",
+                "reference": "4be43904336affa5c2f70744a348312336afd0da",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "ext-json": "*",
+                "ext-zip": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "yoast/phpunit-polyfills": "^1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcbf",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/composer-installer/issues",
+                "source": "https://github.com/PHPCSStandards/composer-installer"
+            },
+            "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": "fakerphp/faker",
             "version": "v1.20.0",
@@ -11794,6 +13016,257 @@
             },
             "time": "2022-07-20T13:12:54+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": "0.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
+                "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "fidry/makefile": "^0.2.0",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^1.9.2",
+                "phpstan/phpstan-deprecation-rules": "^1.0.0",
+                "phpstan/phpstan-phpunit": "^1.2.2",
+                "phpstan/phpstan-strict-rules": "^1.4.4",
+                "phpunit/phpunit": "^9.5.26 || ^8.5.31",
+                "theofidry/php-cs-fixer-config": "^1.0",
+                "webmozarts/strict-phpunit": "^7.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\CpuCoreCounter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Tiny utility to get the number of CPU cores.",
+            "keywords": [
+                "CPU",
+                "core"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-24T12:35:10+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.13.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3952f08a81bd3b1b15e11c3de0b6bf037faa8496",
+                "reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496",
+                "shasum": ""
+            },
+            "require": {
+                "composer/semver": "^3.2",
+                "composer/xdebug-handler": "^3.0.3",
+                "doctrine/annotations": "^1.13",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": "^7.4 || ^8.0",
+                "sebastian/diff": "^4.0",
+                "symfony/console": "^5.4 || ^6.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0",
+                "symfony/filesystem": "^5.4 || ^6.0",
+                "symfony/finder": "^5.4 || ^6.0",
+                "symfony/options-resolver": "^5.4 || ^6.0",
+                "symfony/polyfill-mbstring": "^1.23",
+                "symfony/polyfill-php80": "^1.25",
+                "symfony/polyfill-php81": "^1.25",
+                "symfony/process": "^5.4 || ^6.0",
+                "symfony/stopwatch": "^5.4 || ^6.0"
+            },
+            "require-dev": {
+                "justinrainbow/json-schema": "^5.2",
+                "keradus/cli-executor": "^2.0",
+                "mikey179/vfsstream": "^1.6.10",
+                "php-coveralls/php-coveralls": "^2.5.2",
+                "php-cs-fixer/accessible-object": "^1.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
+                "phpspec/prophecy": "^1.15",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "phpunitgoodpractices/polyfill": "^1.6",
+                "phpunitgoodpractices/traits": "^1.9.2",
+                "symfony/phpunit-bridge": "^6.0",
+                "symfony/yaml": "^5.4 || ^6.0"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "support": {
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-01-02T23:53:50+00:00"
+        },
         {
             "name": "hamcrest/hamcrest-php",
             "version": "v2.0.1",
@@ -11846,17 +13319,146 @@
             "time": "2020-07-09T08:09:16+00:00"
         },
         {
-            "name": "laravel/dusk",
-            "version": "v6.25.0",
+            "name": "jean85/pretty-package-versions",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laravel/dusk.git",
-                "reference": "b4632b7493a187d31afc5c9ddec437c81b16421a"
+                "url": "https://github.com/Jean85/pretty-package-versions.git",
+                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/dusk/zipball/b4632b7493a187d31afc5c9ddec437c81b16421a",
-                "reference": "b4632b7493a187d31afc5c9ddec437c81b16421a",
+                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2.0.0",
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.17",
+                "jean85/composer-provided-replaced-stub-package": "^1.0",
+                "phpstan/phpstan": "^0.12.66",
+                "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.5"
+            },
+            "time": "2021-10-08T21:21:46+00:00"
+        },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "5.2.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
+                "json-schema/json-schema-test-suite": "1.2.0",
+                "phpunit/phpunit": "^4.8.35"
+            },
+            "bin": [
+                "bin/validate-json"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JsonSchema\\": "src/JsonSchema/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "seroscho@googlemail.com"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "support": {
+                "issues": "https://github.com/justinrainbow/json-schema/issues",
+                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
+            },
+            "time": "2022-04-13T08:02:27+00:00"
+        },
+        {
+            "name": "laravel/dusk",
+            "version": "v6.25.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/dusk.git",
+                "reference": "25a595ac3dc82089a91af10dd23b0d58fd3f6d0b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/dusk/zipball/25a595ac3dc82089a91af10dd23b0d58fd3f6d0b",
+                "reference": "25a595ac3dc82089a91af10dd23b0d58fd3f6d0b",
                 "shasum": ""
             },
             "require": {
@@ -11914,9 +13516,91 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/dusk/issues",
-                "source": "https://github.com/laravel/dusk/tree/v6.25.0"
+                "source": "https://github.com/laravel/dusk/tree/v6.25.2"
             },
-            "time": "2022-07-11T11:38:43+00:00"
+            "time": "2022-09-29T09:37:07+00:00"
+        },
+        {
+            "name": "league/container",
+            "version": "4.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/container.git",
+                "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab",
+                "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "psr/container": "^1.1 || ^2.0"
+            },
+            "provide": {
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "orno/di": "~2.0"
+            },
+            "require-dev": {
+                "nette/php-generator": "^3.4",
+                "nikic/php-parser": "^4.10",
+                "phpstan/phpstan": "^0.12.47",
+                "phpunit/phpunit": "^8.5.17",
+                "roave/security-advisories": "dev-latest",
+                "scrutinizer/ocular": "^1.8",
+                "squizlabs/php_codesniffer": "^3.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.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": {
+                    "League\\Container\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Bennett",
+                    "email": "mail@philbennett.co.uk",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A fast and intuitive dependency injection container.",
+            "homepage": "https://github.com/thephpleague/container",
+            "keywords": [
+                "container",
+                "dependency",
+                "di",
+                "injection",
+                "league",
+                "provider",
+                "service"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/container/issues",
+                "source": "https://github.com/thephpleague/container/tree/4.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/philipobenito",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-11-16T10:29:06+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -12049,6 +13733,261 @@
             ],
             "time": "2022-03-03T13:19:32+00:00"
         },
+        {
+            "name": "netresearch/jsonmapper",
+            "version": "v4.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cweiske/jsonmapper.git",
+                "reference": "f60565f8c0566a31acf06884cdaa591867ecc956"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956",
+                "reference": "f60565f8c0566a31acf06884cdaa591867ecc956",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.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.2.0"
+            },
+            "time": "2023-04-09T17:37:40+00:00"
+        },
+        {
+            "name": "nunomaduro/larastan",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nunomaduro/larastan.git",
+                "reference": "769bc6346a6cce3b823c30eaace33d9c3a0dd40e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/769bc6346a6cce3b823c30eaace33d9c3a0dd40e",
+                "reference": "769bc6346a6cce3b823c30eaace33d9c3a0dd40e",
+                "shasum": ""
+            },
+            "require": {
+                "composer/composer": "^1.0 || ^2.0",
+                "ext-json": "*",
+                "illuminate/console": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "illuminate/container": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "illuminate/pipeline": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "mockery/mockery": "^0.9 || ^1.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.0 <1.9",
+                "symfony/process": "^4.3 || ^5.0 || ^6.0"
+            },
+            "require-dev": {
+                "nikic/php-parser": "^4.13.0",
+                "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "phpunit/phpunit": "^7.3 || ^8.2 || ^9.3"
+            },
+            "suggest": {
+                "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "NunoMaduro\\Larastan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "keywords": [
+                "PHPStan",
+                "code analyse",
+                "code analysis",
+                "larastan",
+                "laravel",
+                "package",
+                "php",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/nunomaduro/larastan/issues",
+                "source": "https://github.com/nunomaduro/larastan/tree/1.0.4"
+            },
+            "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": "2022-11-09T09:09:31+00:00"
+        },
+        {
+            "name": "nunomaduro/phpinsights",
+            "version": "v2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nunomaduro/phpinsights.git",
+                "reference": "a701b7acfda9940ef0140c7276319df9026824c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/a701b7acfda9940ef0140c7276319df9026824c4",
+                "reference": "a701b7acfda9940ef0140c7276319df9026824c4",
+                "shasum": ""
+            },
+            "require": {
+                "cmgmyr/phploc": "^8.0",
+                "composer/semver": "^3.3",
+                "ext-iconv": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-tokenizer": "*",
+                "friendsofphp/php-cs-fixer": "^3.0.0",
+                "justinrainbow/json-schema": "^5.1",
+                "league/container": "^3.2|^4.2",
+                "php": "^7.4 || ^8.0 || ^8.1",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "psr/container": "^1.0|^2.0",
+                "psr/simple-cache": "^1.0|^2.0|^3.0",
+                "sebastian/diff": "^4.0|^5.0",
+                "slevomat/coding-standard": "^7.0.8|^8.0",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/cache": "^4.4|^5.0|^6.0",
+                "symfony/console": "^4.2.12|^5.0|^6.0",
+                "symfony/finder": "^4.2.12|^5.0|^6.0",
+                "symfony/http-client": "^4.3.8|^5.0|^6.0",
+                "symfony/process": "^5.4|^6.0"
+            },
+            "require-dev": {
+                "ergebnis/phpstan-rules": "^0.15.0",
+                "illuminate/console": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "mockery/mockery": "^1.0",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^8.0|^9.0|^10.0",
+                "rector/rector": "0.11.56",
+                "symfony/var-dumper": "^4.2.12|^5.0|^6.0",
+                "thecodingmachine/phpstan-strict-rules": "^0.12.0"
+            },
+            "suggest": {
+                "ext-simplexml": "It is needed for the checkstyle formatter"
+            },
+            "bin": [
+                "bin/phpinsights"
+            ],
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "NunoMaduro\\PhpInsights\\Application\\Adapters\\Laravel\\InsightsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "NunoMaduro\\PhpInsights\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Instant PHP quality checks from your console.",
+            "keywords": [
+                "Insights",
+                "code",
+                "console",
+                "php",
+                "quality",
+                "source"
+            ],
+            "support": {
+                "issues": "https://github.com/nunomaduro/phpinsights/issues",
+                "source": "https://github.com/nunomaduro/phpinsights/tree/v2.8.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/JustSteveKing",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/cmgmyr",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-03-18T18:38:03+00:00"
+        },
         {
             "name": "phar-io/manifest",
             "version": "2.0.3",
@@ -12160,6 +14099,63 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
+        {
+            "name": "php-parallel-lint/php-parallel-lint",
+            "version": "v1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
+                "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de",
+                "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.3.0"
+            },
+            "replace": {
+                "grogy/php-parallel-lint": "*",
+                "jakub-onderka/php-parallel-lint": "*"
+            },
+            "require-dev": {
+                "nette/tester": "^1.3 || ^2.0",
+                "php-parallel-lint/php-console-highlighter": "0.* || ^1.0",
+                "squizlabs/php_codesniffer": "^3.6"
+            },
+            "suggest": {
+                "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet"
+            },
+            "bin": [
+                "parallel-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "ahoj@jakubonderka.cz"
+                }
+            ],
+            "description": "This tool check syntax of PHP files about 20x faster than serial check.",
+            "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint",
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2"
+            },
+            "time": "2022-02-21T12:50:22+00:00"
+        },
         {
             "name": "php-webdriver/webdriver",
             "version": "1.12.1",
@@ -12225,6 +14221,112 @@
             },
             "time": "2022-05-03T12:16:34+00:00"
         },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "1.22.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0",
+                "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^4.15",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^1.5",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "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.22.1"
+            },
+            "time": "2023-06-29T20:46:06+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.8.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "46e223dd68a620da18855c23046ddb00940b4014"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46e223dd68a620da18855c23046ddb00940b4014",
+                "reference": "46e223dd68a620da18855c23046ddb00940b4014",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.11"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-24T15:45:13+00:00"
+        },
         {
             "name": "phpunit/php-code-coverage",
             "version": "9.2.15",
@@ -12705,6 +14807,78 @@
             ],
             "time": "2022-06-19T12:14:25+00:00"
         },
+        {
+            "name": "react/promise",
+            "version": "v2.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38",
+                "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "keywords": [
+                "promise",
+                "promises"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v2.10.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-05-02T15:15:43+00:00"
+        },
         {
             "name": "sebastian/cli-parser",
             "version": "1.0.1",
@@ -13389,6 +15563,423 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1",
+                "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/jsonlint/issues",
+                "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-11T13:16:46+00:00"
+        },
+        {
+            "name": "seld/phar-utils",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/phar-utils.git",
+                "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
+                "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Seld\\PharUtils\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be"
+                }
+            ],
+            "description": "PHAR file format utilities, for when PHP phars you up",
+            "keywords": [
+                "phar"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/phar-utils/issues",
+                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1"
+            },
+            "time": "2022-08-31T10:31:18+00:00"
+        },
+        {
+            "name": "slevomat/coding-standard",
+            "version": "8.13.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slevomat/coding-standard.git",
+                "reference": "a13c15e20f2d307a1ca8dec5313ec462a4466470"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/a13c15e20f2d307a1ca8dec5313ec462a4466470",
+                "reference": "a13c15e20f2d307a1ca8dec5313ec462a4466470",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpdoc-parser": "^1.22.0",
+                "squizlabs/php_codesniffer": "^3.7.1"
+            },
+            "require-dev": {
+                "phing/phing": "2.17.4",
+                "php-parallel-lint/php-parallel-lint": "1.3.2",
+                "phpstan/phpstan": "1.10.21",
+                "phpstan/phpstan-deprecation-rules": "1.1.3",
+                "phpstan/phpstan-phpunit": "1.3.13",
+                "phpstan/phpstan-strict-rules": "1.5.1",
+                "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.2.2"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SlevomatCodingStandard\\": "SlevomatCodingStandard/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
+            "keywords": [
+                "dev",
+                "phpcs"
+            ],
+            "support": {
+                "issues": "https://github.com/slevomat/coding-standard/issues",
+                "source": "https://github.com/slevomat/coding-standard/tree/8.13.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/kukulich",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-06-25T12:52:34+00:00"
+        },
+        {
+            "name": "spatie/array-to-xml",
+            "version": "2.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/array-to-xml.git",
+                "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/5cbec9c6ab17e320c58a259f0cebe88bde4a7c46",
+                "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "php": "^7.4|^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.2",
+                "pestphp/pest": "^1.21",
+                "phpunit/phpunit": "^9.0",
+                "spatie/pest-plugin-snapshots": "^1.1"
+            },
+            "type": "library",
+            "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/2.17.1"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-26T08:22:07+00:00"
+        },
+        {
+            "name": "symfony/cache",
+            "version": "v5.4.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache.git",
+                "reference": "e2013521c0f07473ae69a01fce0af78fc3ec0f23"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/e2013521c0f07473ae69a01fce0af78fc3ec0f23",
+                "reference": "e2013521c0f07473ae69a01fce0af78fc3ec0f23",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0",
+                "psr/log": "^1.1|^2|^3",
+                "symfony/cache-contracts": "^1.1.7|^2",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<2.13.1",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/http-kernel": "<4.4",
+                "symfony/var-dumper": "<4.4"
+            },
+            "provide": {
+                "psr/cache-implementation": "1.0|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0",
+                "symfony/cache-implementation": "1.0|2.0"
+            },
+            "require-dev": {
+                "cache/integration-tests": "dev-master",
+                "doctrine/cache": "^1.6|^2.0",
+                "doctrine/dbal": "^2.13.1|^3.0",
+                "predis/predis": "^1.1",
+                "psr/simple-cache": "^1.0|^2.0",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/filesystem": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0",
+                "symfony/messenger": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Cache\\": ""
+                },
+                "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": "Provides extended PSR-6, PSR-16 (and tags) implementations",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "caching",
+                "psr6"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/cache/tree/v5.4.25"
+            },
+            "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": "2023-06-22T08:06:06+00:00"
+        },
+        {
+            "name": "symfony/cache-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache-contracts.git",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0|^3.0"
+            },
+            "suggest": {
+                "symfony/cache-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Cache\\": ""
+                }
+            },
+            "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": "Generic abstractions related to caching",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2"
+            },
+            "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": "2022-01-02T09:53:40+00:00"
+        },
         {
             "name": "symfony/dom-crawler",
             "version": "v4.4.42",
@@ -13463,6 +16054,443 @@
             ],
             "time": "2022-04-30T18:34:00+00:00"
         },
+        {
+            "name": "symfony/filesystem",
+            "version": "v5.4.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
+                "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.25"
+            },
+            "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": "2023-05-31T13:04:02+00:00"
+        },
+        {
+            "name": "symfony/http-client",
+            "version": "v5.4.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-client.git",
+                "reference": "ccbb572627466f03a3d7aa1b23483787f5969afc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/ccbb572627466f03a3d7aa1b23483787f5969afc",
+                "reference": "ccbb572627466f03a3d7aa1b23483787f5969afc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/log": "^1|^2|^3",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/http-client-contracts": "^2.4",
+                "symfony/polyfill-php73": "^1.11",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.0|^2|^3"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "*",
+                "php-http/client-implementation": "*",
+                "psr/http-client-implementation": "1.0",
+                "symfony/http-client-implementation": "2.4"
+            },
+            "require-dev": {
+                "amphp/amp": "^2.5",
+                "amphp/http-client": "^4.2.1",
+                "amphp/http-tunnel": "^1.0",
+                "amphp/socket": "^1.1",
+                "guzzlehttp/promises": "^1.4",
+                "nyholm/psr7": "^1.0",
+                "php-http/httplug": "^1.0|^2.0",
+                "php-http/message-factory": "^1.0",
+                "psr/http-client": "^1.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4.13|^5.1.5|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/stopwatch": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpClient\\": ""
+                },
+                "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": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "http"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/http-client/tree/v5.4.25"
+            },
+            "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": "2023-06-21T14:44:30+00:00"
+        },
+        {
+            "name": "symfony/http-client-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-client-contracts.git",
+                "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
+                "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5"
+            },
+            "suggest": {
+                "symfony/http-client-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\HttpClient\\": ""
+                }
+            },
+            "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": "Generic abstractions related to HTTP clients",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.2"
+            },
+            "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": "2022-04-12T15:48:08+00:00"
+        },
+        {
+            "name": "symfony/options-resolver",
+            "version": "v5.4.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9",
+                "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php73": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an improved replacement for the array_replace PHP function",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.21"
+            },
+            "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": "2023-02-14T08:03:56+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v5.4.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee",
+                "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/service-contracts": "^1|^2|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a way to profile code",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.21"
+            },
+            "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": "2023-02-14T08:03:56+00:00"
+        },
+        {
+            "name": "symfony/var-exporter",
+            "version": "v5.4.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-exporter.git",
+                "reference": "be74908a6942fdd331554b3cec27ff41b45ccad4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/be74908a6942fdd331554b3cec27ff41b45ccad4",
+                "reference": "be74908a6942fdd331554b3cec27ff41b45ccad4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\VarExporter\\": ""
+                },
+                "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": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clone",
+                "construct",
+                "export",
+                "hydrate",
+                "instantiate",
+                "serialize"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-exporter/tree/v5.4.21"
+            },
+            "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": "2023-02-21T19:46:44+00:00"
+        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.1",
@@ -13512,6 +16540,112 @@
                 }
             ],
             "time": "2021-07-28T10:34:58+00:00"
+        },
+        {
+            "name": "vimeo/psalm",
+            "version": "5.13.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vimeo/psalm.git",
+                "reference": "086b94371304750d1c673315321a55d15fc59015"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/086b94371304750d1c673315321a55d15fc59015",
+                "reference": "086b94371304750d1c673315321a55d15fc59015",
+                "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",
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "nikic/php-parser": "^4.14",
+                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+                "sebastian/diff": "^4.0 || ^5.0",
+                "spatie/array-to-xml": "^2.17.0 || ^3.0",
+                "symfony/console": "^4.1.6 || ^5.0 || ^6.0",
+                "symfony/filesystem": "^5.4 || ^6.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"
+            },
+            "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": "library",
+            "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": {
+                "issues": "https://github.com/vimeo/psalm/issues",
+                "source": "https://github.com/vimeo/psalm/tree/5.13.1"
+            },
+            "time": "2023-06-27T16:39:49+00:00"
         }
     ],
     "aliases": [],
@@ -13522,7 +16656,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4 <8.3",
+        "php": ">=7.4.3 <8.2",
         "ext-curl": "*",
         "ext-fileinfo": "*",
         "ext-json": "*",
diff --git a/config/app.php b/config/app.php
index 8833ea2ae7..2559b8012c 100755
--- a/config/app.php
+++ b/config/app.php
@@ -216,7 +216,8 @@ return [
     */
 
     'require_saml' => env('REQUIRE_SAML', false),
-    
+
+
     /*
     |--------------------------------------------------------------------------
     | Demo Mode Lockdown
@@ -294,6 +295,7 @@ return [
         Laravel\Tinker\TinkerServiceProvider::class,
         Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
         Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,
+        Laravel\Socialite\SocialiteServiceProvider::class,
 
         /*
         * Application Service Providers...
@@ -366,6 +368,7 @@ return [
         '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)
+        'Socialite' => Laravel\Socialite\Facades\Socialite::class,
 
 
     ],
diff --git a/config/database.php b/config/database.php
index 9d94454db2..36440b2127 100755
--- a/config/database.php
+++ b/config/database.php
@@ -102,6 +102,7 @@ return [
         'pgsql' => [
             'driver'   => 'pgsql',
             'host'     => env('DB_HOST', 'localhost'),
+            'port'     => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
diff --git a/config/dompdf.php b/config/dompdf.php
index a2cdae8599..22f5f6c27e 100644
--- a/config/dompdf.php
+++ b/config/dompdf.php
@@ -74,8 +74,11 @@ return array(
          * This is only checked on command line call by dompdf.php, but not by
          * direct class use like:
          * $dompdf = new DOMPDF();	$dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
+         * 
+         * 
+         * Hardcoding 2 Paths needed for Docker Containers
          */
-        "chroot" => realpath(base_path()),
+        "chroot" => realpath(base_path()) . ",/var/lib/snipeit/data/uploads,/var/lib/snipeit/data/private_uploads",
 
         /**
          * Whether to enable font subsetting or not.
diff --git a/config/hashing.php b/config/hashing.php
index d3c8e2fb22..06f18a0c6d 100644
--- a/config/hashing.php
+++ b/config/hashing.php
@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'driver' => 'bcrypt',
+    'driver' => env('HASHING_DRIVER', 'bcrypt'),
 
     /*
     |--------------------------------------------------------------------------
@@ -44,9 +44,9 @@ return [
     */
 
     'argon' => [
-        'memory' => 1024,
-        'threads' => 2,
-        'time' => 2,
+        'memory' => env('ARGON_MEMORY', 1024),
+        'threads' => env('ARGON_THREADS', 2),
+        'time' => env('ARGON_TIME', 2),
     ],
 
 ];
diff --git a/config/insights.php b/config/insights.php
new file mode 100644
index 0000000000..f0393edeca
--- /dev/null
+++ b/config/insights.php
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenDefineFunctions;
+use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenFinalClasses;
+use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses;
+use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenPrivateMethods;
+use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenTraits;
+use NunoMaduro\PhpInsights\Domain\Metrics\Architecture\Classes;
+use SlevomatCodingStandard\Sniffs\Commenting\UselessFunctionDocCommentSniff;
+use SlevomatCodingStandard\Sniffs\Namespaces\AlphabeticallySortedUsesSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\DeclareStrictTypesSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\DisallowMixedTypeHintSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\PropertyTypeHintSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Preset
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default preset that will be used by PHP Insights
+    | to make your code reliable, simple, and clean. However, you can always
+    | adjust the `Metrics` and `Insights` below in this configuration file.
+    |
+    | Supported: "default", "laravel", "symfony", "magento2", "drupal"
+    |
+    */
+
+    'preset' => 'laravel',
+
+    /*
+    |--------------------------------------------------------------------------
+    | IDE
+    |--------------------------------------------------------------------------
+    |
+    | This options allow to add hyperlinks in your terminal to quickly open
+    | files in your favorite IDE while browsing your PhpInsights report.
+    |
+    | Supported: "textmate", "macvim", "emacs", "sublime", "phpstorm",
+    | "atom", "vscode".
+    |
+    | If you have another IDE that is not in this list but which provide an
+    | url-handler, you could fill this config with a pattern like this:
+    |
+    | myide://open?url=file://%f&line=%l
+    |
+    */
+
+    'ide' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may adjust all the various `Insights` that will be used by PHP
+    | Insights. You can either add, remove or configure `Insights`. Keep in
+    | mind that all added `Insights` must belong to a specific `Metric`.
+    |
+    */
+
+    'exclude' => [
+        //  'path/to/directory-or-file'
+    ],
+
+    'add' => [
+        Classes::class => [
+            ForbiddenFinalClasses::class,
+        ],
+    ],
+
+    'remove' => [
+        AlphabeticallySortedUsesSniff::class,
+        DeclareStrictTypesSniff::class,
+        DisallowMixedTypeHintSniff::class,
+        ForbiddenDefineFunctions::class,
+        ForbiddenNormalClasses::class,
+        ForbiddenTraits::class,
+        ParameterTypeHintSniff::class,
+        PropertyTypeHintSniff::class,
+        ReturnTypeHintSniff::class,
+        UselessFunctionDocCommentSniff::class,
+    ],
+
+    'config' => [
+        ForbiddenPrivateMethods::class => [
+            'title' => 'The usage of private methods is not idiomatic in Laravel.',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Requirements
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define a level you want to reach per `Insights` category.
+    | When a score is lower than the minimum level defined, then an error
+    | code will be returned. This is optional and individually defined.
+    |
+    */
+
+    'requirements' => [
+//        'min-quality' => 0,
+//        'min-complexity' => 0,
+//        'min-architecture' => 0,
+//        'min-style' => 0,
+//        'disable-security-check' => false,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Threads
+    |--------------------------------------------------------------------------
+    |
+    | Here you may adjust how many threads (core) PHPInsights can use to perform
+    | the analyse. This is optional, don't provide it and the tool will guess
+    | the max core number available. It accepts null value or integer > 0.
+    |
+    */
+
+    'threads' => null,
+
+];
diff --git a/config/logging.php b/config/logging.php
index cdd0bbcbdf..7cb5d86039 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -1,5 +1,4 @@
 <?php
-
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
@@ -119,9 +118,25 @@ $config = [
 ];
 
 
-// Only add rollbar if the .env has a rollbar token
 if ((env('APP_ENV')=='production') && (env('ROLLBAR_TOKEN'))) {
+    // Only add rollbar if the .env has a rollbar token
     $config['channels']['stack']['channels'] = ['single', 'rollbar'];
+
+    // and only add the rollbar filter under the same conditions
+    // Note: it will *not* be cacheable
+    $config['channels']['rollbar']['check_ignore'] = function ($isUncaught, $args, $payload) {
+        if (App::environment('production') && is_object($args) && get_class($args) == Rollbar\ErrorWrapper::class && $args->errorLevel == E_WARNING ) {
+            \Log::info("IGNORING E_WARNING in production mode: ".$args->getMessage());
+            return true; // "TRUE - you should ignore it!"
+        }
+        $needle = "ArieTimmerman\\Laravel\\SCIMServer\\Exceptions\\SCIMException";
+        if (App::environment('production') && is_string($args) && strncmp($args, $needle, strlen($needle) ) === 0 ) {
+            \Log::info("String: '$args' looks like a SCIM Exception; ignoring error");
+            return true; //yes, *do* ignore it
+        }
+        return false;
+    };
+
 }
 
 
diff --git a/config/mail.php b/config/mail.php
index d47d182ed3..f650cf5387 100755
--- a/config/mail.php
+++ b/config/mail.php
@@ -140,8 +140,8 @@ return [
     |
     */
 
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
+    'sendmail' => env('SENDMAIL_PATH', ini_get('sendmail_path')),
+ 
     'markdown' => [
         'theme' => 'default',
         'paths' => [
diff --git a/config/scim.php b/config/scim.php
index d7d578efc2..4e343cd3a6 100644
--- a/config/scim.php
+++ b/config/scim.php
@@ -3,6 +3,6 @@
 return [
     "trace" => env("SCIM_TRACE",false),
     // below, if we ever get 'sure' that we can change this default to 'true' we should
-    "omit_main_schema_in_return" => env('SCIM_STANDARDS_COMPLIANCE', false),
+    "omit_main_schema_in_return" => env('SCIM_STANDARDS_COMPLIANCE', true),
     "publish_routes" => false,
 ];
diff --git a/config/services.php b/config/services.php
index 3f7362fd51..de8c4ed71a 100644
--- a/config/services.php
+++ b/config/services.php
@@ -43,10 +43,10 @@ return [
         'secret' => env('STRIPE_SECRET'),
     ],
 
-    'stunning' => [
-        'enabled' => env('ENABLE_STUNNING', false),
-        'app_key'  => env('STUNNING_APP_KEY'),
-        'stripe_id'    => env('STUNNING_STRIPE_ID'),
+    'baremetrics' => [
+        'enabled' => env('ENABLE_BMPAY', false),
+        'app_key'  => env('BMPAY_PUBLIC_KEY',  null),
+        'stripe_id'    => env('BMPAY_STRIPE_ID', null),
     ],
 
     'google' => [
diff --git a/config/session.php b/config/session.php
index dee8d9103e..a47294a8cb 100644
--- a/config/session.php
+++ b/config/session.php
@@ -130,7 +130,7 @@ return [
     |
     */
 
-    'path' => '/',
+    'path' => env('SESSION_COOKIE_PATH', '/'),
 
     /*
     |--------------------------------------------------------------------------
@@ -158,4 +158,20 @@ return [
 
     'secure' => env('SECURE_COOKIES', false),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Bootstrap Table Storage Type
+    |--------------------------------------------------------------------------
+    |
+    | Set the storage that this Bootstrap Table will use.
+    | Valid options are:
+    | - cookieStorage
+    | - localStorage: use this if you have a LOT of custom fields and are getting a REQUEST TOO LARGE error
+    | - sessionStorage
+    |
+    | More info: https://bootstrap-table.com/docs/extensions/cookie/#cookiestorage
+    */
+
+    'bs_table_storage' => env('BS_TABLE_STORAGE', 'cookieStorage'),
+
 ];
diff --git a/config/version.php b/config/version.php
index f111cfb8d1..ba0dd3bace 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.14',
-  'full_app_version' => 'v6.0.14 - build 9161-g799c9c910',
-  'build_version' => '9161',
+  'app_version' => 'v6.1.2',
+  'full_app_version' => 'v6.1.2 - build 10938-g32747cafd',
+  'build_version' => '10938',
   'prerelease_version' => '',
-  'hash_version' => 'g799c9c910',
-  'full_hash' => 'v6.0.14-117-g799c9c910',
-  'branch' => 'master',
+  'hash_version' => 'g32747cafd',
+  'full_hash' => 'v6.1.2-89-g32747cafd',
+  'branch' => 'develop',
 );
\ No newline at end of file
diff --git a/crowdin.yml b/crowdin.yml
index 4eccb2adbc..7abe441e4f 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -3,6 +3,7 @@
 "files": [
   {
     "source" : "/resources/lang/en/**/*.php",
-    "translation" : "/resources/lang/%locale%/%original_file_name%"
+    # https://developer.crowdin.com/configuration-file/#placeholders
+    "translation" : "/resources/lang/%locale%/**/%original_file_name%"
   }
 ]
diff --git a/database/factories/AccessoryFactory.php b/database/factories/AccessoryFactory.php
index 84edcb705c..8ce34303b3 100644
--- a/database/factories/AccessoryFactory.php
+++ b/database/factories/AccessoryFactory.php
@@ -2,17 +2,14 @@
 
 namespace Database\Factories;
 
+use App\Models\Accessory;
+use App\Models\Category;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Asset Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating models ..
-|
-*/
-
 class AccessoryFactory extends Factory
 {
     /**
@@ -20,7 +17,7 @@ class AccessoryFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Accessory::class;
+    protected $model = Accessory::class;
 
     /**
      * Define the model's default state.
@@ -30,9 +27,16 @@ class AccessoryFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => 1,
+            'name' => sprintf(
+                '%s %s',
+                $this->faker->randomElement(['Bluetooth', 'Wired']),
+                $this->faker->randomElement(['Keyboard', 'Wired'])
+            ),
+            'user_id' => User::factory()->superuser(),
+            'category_id' => Category::factory(),
             'model_number' => $this->faker->numberBetween(1000000, 50000000),
-            'location_id' => rand(1, 5),
+            'location_id' => Location::factory(),
+            'qty' => 1,
         ];
     }
 
@@ -42,11 +46,15 @@ class AccessoryFactory extends Factory
             return [
                 'name' => 'Bluetooth Keyboard',
                 'image' => 'bluetooth.jpg',
-                'category_id' => 8,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Keyboards')->first() ?? Category::factory()->accessoryKeyboardCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'qty' => 10,
                 'min_amt' => 2,
-                'supplier_id' => rand(1, 5),
+                'supplier_id' => Supplier::factory(),
             ];
         });
     }
@@ -57,11 +65,15 @@ class AccessoryFactory extends Factory
             return [
                 'name' => 'USB Keyboard',
                 'image' => 'usb-keyboard.jpg',
-                'category_id' => 8,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Keyboards')->first() ?? Category::factory()->accessoryKeyboardCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'qty' => 15,
                 'min_amt' => 2,
-                'supplier_id' => rand(1, 5),
+                'supplier_id' => Supplier::factory(),
             ];
         });
     }
@@ -72,11 +84,15 @@ class AccessoryFactory extends Factory
             return [
                 'name' => 'Magic Mouse',
                 'image' => 'magic-mouse.jpg',
-                'category_id' => 9,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Mouse')->first() ?? Category::factory()->accessoryMouseCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'qty' => 13,
                 'min_amt' => 2,
-                'supplier_id' => rand(1, 5),
+                'supplier_id' => Supplier::factory(),
             ];
         });
     }
@@ -87,8 +103,12 @@ class AccessoryFactory extends Factory
             return [
                 'name' => 'Sculpt Comfort Mouse',
                 'image' => 'comfort-mouse.jpg',
-                'category_id' => 9,
-                'manufacturer_id' => 2,
+                'category_id' => function () {
+                    return Category::where('name', 'Mouse')->first() ?? Category::factory()->accessoryMouseCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Microsoft')->first() ?? Manufacturer::factory()->microsoft();
+                },
                 'qty' => 13,
                 'min_amt' => 2,
             ];
diff --git a/database/factories/ActionlogFactory.php b/database/factories/ActionlogFactory.php
index 33cc83ead4..c25fdcc70a 100644
--- a/database/factories/ActionlogFactory.php
+++ b/database/factories/ActionlogFactory.php
@@ -4,20 +4,12 @@ namespace Database\Factories;
 
 use App\Models\Actionlog;
 use App\Models\Asset;
-use App\Models\Company;
+use App\Models\License;
+use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Action Log Factories
-|--------------------------------------------------------------------------
-|
-| This simulates checkin/checkout/etc activities 
-|
-*/
-
 class ActionlogFactory extends Factory
 {
     /**
@@ -25,7 +17,7 @@ class ActionlogFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Actionlog::class;
+    protected $model = Actionlog::class;
 
     /**
      * Define the model's default state.
@@ -34,71 +26,83 @@ class ActionlogFactory extends Factory
      */
     public function definition()
     {
-        $asset = \App\Models\Asset::factory()->create();
         return [
-            'item_type' => get_class($asset),
-            'item_id' => 1,
-            'user_id' => 1,
+            'item_id' => Asset::factory(),
+            'item_type' => Asset::class,
+            'user_id' => User::factory()->superuser(),
             'action_type' => 'uploaded',
         ];
     }
 
-
     public function assetCheckoutToUser()
     {
         return $this->state(function () {
-            $target = \App\Models\User::inRandomOrder()->first();
-            $item = \App\Models\Asset::RTD()->inRandomOrder()->first();
-            $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins
-            $asset = Asset::where('id', $item->id)
-                ->update(
+            $target = User::inRandomOrder()->first();
+            $asset = Asset::RTD()->inRandomOrder()->first();
+
+            $asset->update(
                     [
                         'assigned_to' => $target->id,
-                        'assigned_type' => \App\Models\User::class,
-                        'assigned_to' => $target->location_id,
+                        'assigned_type' => User::class,
+                        'location_id' => $target->location_id,
                     ]
                 );
     
             return [
                 'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
-                'user_id' => $user_id,
                 'action_type' => 'checkout',
-                'item_id' => $item->id,
-                'item_type'  => \App\Models\Asset::class,
+                'item_id' => $asset->id,
+                'item_type'  => Asset::class,
                 'target_id' => $target->id,
-                'target_type' => get_class($target),
-    
+                'target_type' => User::class,
             ];
         });
     }
 
-
     public function assetCheckoutToLocation()
     {
         return $this->state(function () {
-            $target = \App\Models\Location::inRandomOrder()->first();
-            $item = \App\Models\Asset::inRandomOrder()->RTD()->first();
-            $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins
-            $asset = \App\Models\Asset::where('id', $item->id)
-                ->update(
+            $target = Location::inRandomOrder()->first();
+            $asset = Asset::inRandomOrder()->RTD()->first();
+
+            $asset->update(
                     [
                         'assigned_to' => $target->id,
-                        'assigned_type' => \App\Models\Location::class,
-                        'assigned_to' => $target->id,
+                        'assigned_type' => Location::class,
+                        'location_id' => $target->id,
                     ]
                 );
 
             return [
                 'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
-                'user_id' => $user_id,
                 'action_type' => 'checkout',
-                'item_id' => $item->id,
-                'item_type'  => \App\Models\Asset::class,
+                'item_id' => $asset->id,
+                'item_type'  => Asset::class,
                 'target_id' => $target->id,
-                'target_type' => get_class($target),
+                'target_type' => Location::class,
             ];
         });
     }
 
+    public function licenseCheckoutToUser()
+    {
+        return $this->state(function () {
+            $target = User::inRandomOrder()->first();
+            $licenseSeat = LicenseSeat::whereNull('assigned_to')->inRandomOrder()->first();
 
+            $licenseSeat->update([
+                'assigned_to' => $target->id,
+                'user_id' => 1, // not ideal but works
+            ]);
+
+            return [
+                'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
+                'action_type' => 'checkout',
+                'item_id' => $licenseSeat->license->id,
+                'item_type'  => License::class,
+                'target_id' => $target->id,
+                'target_type' => User::class,
+            ];
+        });
+    }
 }
diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php
index 24021921b3..0e0c3931d8 100644
--- a/database/factories/AssetFactory.php
+++ b/database/factories/AssetFactory.php
@@ -4,22 +4,12 @@ namespace Database\Factories;
 
 use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\Category;
 use App\Models\Location;
+use App\Models\Statuslabel;
 use App\Models\Supplier;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to modelling assets.
-|
-*/
-
-// These are just for unit tests, not to generate data
-
 class AssetFactory extends Factory
 {
     /**
@@ -38,16 +28,19 @@ class AssetFactory extends Factory
     {
         return [
             'name' => null,
-            'rtd_location_id' => Location::all()->random()->id,
-            'serial' => $this->faker->uuid,
-            'status_id' => 1,
-            'user_id' => 1,
+            'model_id' => AssetModel::factory(),
+            'rtd_location_id' => Location::factory(),
+            'serial' => $this->faker->uuid(),
+            'status_id' => function () {
+                return Statuslabel::where('name', 'Ready to Deploy')->first() ?? Statuslabel::factory()->rtd()->create(['name' => 'Ready to Deploy']);
+            },
+            'user_id' => 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()),
+            'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d'),
             'purchase_cost' => $this->faker->randomFloat(2, '299.99', '2999.99'),
             'order_number' => $this->faker->numberBetween(1000000, 50000000),
-            'supplier_id' => Supplier::all()->random()->id,
+            'supplier_id' => Supplier::factory(),
             'requestable' => $this->faker->boolean(),
             'assigned_to' => null,
             'assigned_type' => null,
@@ -60,7 +53,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Macbook Pro 13"')->first() ?? AssetModel::factory()->mbp13Model();
+                },
             ];
         });
     }
@@ -69,8 +64,12 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
-                'status_id' => 2,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Macbook Pro 13"')->first() ?? AssetModel::factory()->mbp13Model();
+                },
+                'status_id' => function () {
+                    return Statuslabel::where('name', 'Pending')->first() ?? Statuslabel::factory()->pending()->make(['name' => 'Pending']);
+                },
             ];
         });
     }
@@ -79,8 +78,12 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
-                'status_id' => 3,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Macbook Pro 13"')->first() ?? AssetModel::factory()->mbp13Model();
+                },
+                'status_id' => function () {
+                    return Statuslabel::where('name', 'Archived')->first() ?? Statuslabel::factory()->archived()->make(['name' => 'Archived']);
+                },
             ];
         });
     }
@@ -89,7 +92,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 2,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Macbook Air')->first() ?? AssetModel::factory()->mbpAirModel();
+                },
             ];
         });
     }
@@ -98,7 +103,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 3,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Surface')->first() ?? AssetModel::factory()->surfaceModel();
+                },
             ];
         });
     }
@@ -107,7 +114,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 4,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'XPS 13')->first() ?? AssetModel::factory()->xps13Model();
+                },
             ];
         });
     }
@@ -116,7 +125,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 5,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Spectre')->first() ?? AssetModel::factory()->spectreModel();
+                },
             ];
         });
     }
@@ -125,7 +136,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 6,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'ZenBook UX310')->first() ?? AssetModel::factory()->zenbookModel();
+                },
             ];
         });
     }
@@ -134,7 +147,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 7,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Yoga 910')->first() ?? AssetModel::factory()->yogaModel();
+                },
             ];
         });
     }
@@ -143,7 +158,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 8,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'iMac Pro')->first() ?? AssetModel::factory()->macproModel();
+                },
             ];
         });
     }
@@ -152,7 +169,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 9,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Lenovo Intel Core i5')->first() ?? AssetModel::factory()->lenovoI5Model();
+                },
             ];
         });
     }
@@ -161,7 +180,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 10,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'OptiPlex')->first() ?? AssetModel::factory()->optiplexModel();
+                },
             ];
         });
     }
@@ -170,7 +191,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 11,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'SoundStation 2')->first() ?? AssetModel::factory()->polycomModel();
+                },
             ];
         });
     }
@@ -179,7 +202,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 12,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Polycom CX3000 IP Conference Phone')->first() ?? AssetModel::factory()->polycomcxModel();
+                },
             ];
         });
     }
@@ -188,7 +213,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 13,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'iPad Pro')->first() ?? AssetModel::factory()->ipadModel();
+                },
             ];
         });
     }
@@ -197,7 +224,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 14,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Tab3')->first() ?? AssetModel::factory()->tab3Model();
+                },
             ];
         });
     }
@@ -206,7 +235,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 15,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'iPhone 11')->first() ?? AssetModel::factory()->iphone11Model();
+                },
             ];
         });
     }
@@ -215,7 +246,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 16,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'iPhone 12')->first() ?? AssetModel::factory()->iphone12Model();
+                },
             ];
         });
     }
@@ -224,7 +257,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 17,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Ultrafine 4k')->first() ?? AssetModel::factory()->ultrafine();
+                },
             ];
         });
     }
@@ -233,7 +268,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 18,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Ultrasharp U2415')->first() ?? AssetModel::factory()->ultrasharp();
+                },
             ];
         });
     }
@@ -242,9 +279,8 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
-                'assigned_to' => \App\Models\User::factory()->create()->id,
-                'assigned_type' => \App\Models\User::class,
+                'assigned_to' => User::factory(),
+                'assigned_type' => User::class,
             ];
         });
     }
@@ -253,9 +289,8 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
-                'assigned_to' => \App\Models\Location::factory()->create()->id,
-                'assigned_type' => \App\Models\Location::class,
+                'assigned_to' => Location::factory(),
+                'assigned_type' => Location::class,
             ];
         });
     }
@@ -265,8 +300,8 @@ class AssetFactory extends Factory
         return $this->state(function () {
             return [
                 'model_id' => 1,
-                'assigned_to' => \App\Models\Asset::factory()->create()->id,
-                'assigned_type' => \App\Models\Asset::class,
+                'assigned_to' => Asset::factory(),
+                'assigned_type' => Asset::class,
             ];
         });
     }
@@ -275,7 +310,9 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Macbook Pro 13')->first() ?? AssetModel::factory()->mbp13Model();
+                },
             ];
         });
     }
@@ -284,9 +321,21 @@ class AssetFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'model_id' => 1,
+                'model_id' => function () {
+                    return AssetModel::where('name', 'Macbook Pro 13')->first() ?? AssetModel::factory()->mbp13Model();
+                },
                 'deleted_at' => $this->faker->dateTime(),
             ];
         });
     }
+
+    public function requestable()
+    {
+        return $this->state(['requestable' => true]);
+    }
+
+    public function nonrequestable()
+    {
+        return $this->state(['requestable' => false]);
+    }
 }
diff --git a/database/factories/AssetMaintenanceFactory.php b/database/factories/AssetMaintenanceFactory.php
index f9351f5188..ada73f7ed8 100644
--- a/database/factories/AssetMaintenanceFactory.php
+++ b/database/factories/AssetMaintenanceFactory.php
@@ -3,19 +3,10 @@
 namespace Database\Factories;
 
 use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Category;
+use App\Models\AssetMaintenance;
+use App\Models\Supplier;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to modelling assets.
-|
-*/
-
 class AssetMaintenanceFactory extends Factory
 {
     /**
@@ -23,7 +14,7 @@ class AssetMaintenanceFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\AssetMaintenance::class;
+    protected $model = AssetMaintenance::class;
 
     /**
      * Define the model's default state.
@@ -33,14 +24,10 @@ class AssetMaintenanceFactory extends Factory
     public function definition()
     {
         return [
-            'asset_id' => function () {
-                return \App\Models\Asset::factory()->create()->id;
-            },
-            'supplier_id' => function () {
-                return \App\Models\Supplier::factory()->create()->id;
-            },
+            'asset_id' => Asset::factory(),
+            'supplier_id' => Supplier::factory(),
             'asset_maintenance_type' => $this->faker->randomElement(['maintenance', 'repair', 'upgrade']),
-            'title' => $this->faker->sentence,
+            'title' => $this->faker->sentence(),
             'start_date' => $this->faker->date(),
             'is_warranty' => $this->faker->boolean(),
             'notes' => $this->faker->paragraph(),
diff --git a/database/factories/AssetModelFactory.php b/database/factories/AssetModelFactory.php
index 187bc539fc..4881d6560b 100644
--- a/database/factories/AssetModelFactory.php
+++ b/database/factories/AssetModelFactory.php
@@ -2,68 +2,14 @@
 
 namespace Database\Factories;
 
+use App\Models\AssetModel;
+use App\Models\CustomFieldset;
+use App\Models\Depreciation;
+use App\Models\Manufacturer;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\Category;
 
-/*
-|--------------------------------------------------------------------------
-| Asset Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating models ..
-|
-*/
-
-/*
-|--------------------------------------------------------------------------
-| Laptops
-|--------------------------------------------------------------------------
-*/
-
-// 1
-
-// 2
-
-// 3
-
-// 4
-
-// 5
-
-// 6
-
-// 7
-
-/*
-|--------------------------------------------------------------------------
-| Desktops
-|--------------------------------------------------------------------------
-*/
-
-/*
-|--------------------------------------------------------------------------
-| Conference Phones
-|--------------------------------------------------------------------------
-*/
-
-/*
-|--------------------------------------------------------------------------
-| Tablets
-|--------------------------------------------------------------------------
-*/
-
-/*
-|--------------------------------------------------------------------------
-| Mobile Phones
-|--------------------------------------------------------------------------
-*/
-
-/*
-|--------------------------------------------------------------------------
-| Displays
-|--------------------------------------------------------------------------
-*/
-
 class AssetModelFactory extends Factory
 {
     /**
@@ -71,7 +17,7 @@ class AssetModelFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\AssetModel::class;
+    protected $model = AssetModel::class;
 
     /**
      * Define the model's default state.
@@ -81,8 +27,9 @@ class AssetModelFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => 1,
+            'user_id' => User::factory()->superuser(),
             'name' => $this->faker->catchPhrase(),
+            'category_id' => Category::factory(),
             'model_number' => $this->faker->creditCardNumber(),
             'notes' => 'Created by demo seeder',
 
@@ -94,11 +41,17 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Macbook Pro 13"',
-                'category_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'mbp.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -108,12 +61,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Macbook Air',
-                'category_id' => 1,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'macbookair.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -123,12 +84,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Surface',
-                'category_id' => 1,
-                'manufacturer_id' => 2,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Microsoft')->first() ?? Manufacturer::factory()->microsoft();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'surface.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -138,12 +107,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'XPS 13',
-                'category_id' => 1,
-                'manufacturer_id' => 3,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Dell')->first() ?? Manufacturer::factory()->dell();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'xps.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -153,12 +130,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'ZenBook UX310',
-                'category_id' => 1,
-                'manufacturer_id' => 4,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Asus')->first() ?? Manufacturer::factory()->asus();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'zenbook.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -168,12 +153,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Spectre',
-                'category_id' => 1,
-                'manufacturer_id' => 5,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'HP')->first() ?? Manufacturer::factory()->hp();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'spectre.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -183,12 +176,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Yoga 910',
-                'category_id' => 1,
-                'manufacturer_id' => 6,
+                'category_id' => function () {
+                    return Category::where('name', 'Laptops')->first() ?? Category::factory()->assetLaptopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Lenovo')->first() ?? Manufacturer::factory()->lenovo();
+                },
                 'eol' => '36',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'yoga.png',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -198,12 +199,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'iMac Pro',
-                'category_id' => 2,
-                'manufacturer_id' => 1,
+                'category_id' => function (){
+                    return Category::where('name', 'Desktops')->first() ?? Category::factory()->assetDesktopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'eol' => '24',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'imacpro.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -213,12 +222,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Lenovo Intel Core i5',
-                'category_id' => 2,
-                'manufacturer_id' => 6,
+                'category_id' => function () {
+                    return Category::where('name', 'Desktops')->first() ?? Category::factory()->assetDesktopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Lenovo')->first() ?? Manufacturer::factory()->lenovo();
+                },
                 'eol' => '24',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'lenovoi5.png',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -228,13 +245,21 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'OptiPlex',
-                'category_id' => 2,
-                'manufacturer_id' => 3,
+                'category_id' => function (){
+                    return Category::where('name', 'Desktops')->first() ?? Category::factory()->assetDesktopCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Dell')->first() ?? Manufacturer::factory()->dell();
+                },
                 'model_number' => '5040 (MRR81)',
                 'eol' => '24',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'optiplex.jpg',
-                'fieldset_id' => 2,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Laptops and Desktops')->first() ?? CustomFieldset::factory()->computer();
+                },
             ];
         });
     }
@@ -244,10 +269,16 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'SoundStation 2',
-                'category_id' => 6,
-                'manufacturer_id' => 8,
+                'category_id' => function () {
+                    return Category::where('name', 'VOIP Phones')->first() ?? Category::factory()->assetVoipCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Polycom')->first() ?? Manufacturer::factory()->polycom();
+                },
                 'eol' => '12',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'soundstation.jpg',
             ];
         });
@@ -258,10 +289,16 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Polycom CX3000 IP Conference Phone',
-                'category_id' => 6,
-                'manufacturer_id' => 8,
+                'category_id' => function () {
+                    return Category::where('name', 'VOIP Phones')->first() ?? Category::factory()->assetVoipCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Polycom')->first() ?? Manufacturer::factory()->polycom();
+                },
                 'eol' => '12',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'cx3000.png',
             ];
         });
@@ -272,10 +309,16 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'iPad Pro',
-                'category_id' => 3,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Tablets')->first() ?? Category::factory()->assetTabletCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'eol' => '12',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'ipad.jpg',
             ];
         });
@@ -286,10 +329,16 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Tab3',
-                'category_id' => 3,
-                'manufacturer_id' => 6,
+                'category_id' => function () {
+                    return Category::where('name', 'Tablets')->first() ?? Category::factory()->assetTabletCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Lenovo')->first() ?? Manufacturer::factory()->lenovo();
+                },
                 'eol' => '12',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'tab3.png',
             ];
         });
@@ -300,12 +349,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'iPhone 11',
-                'category_id' => 4,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Mobile Phones')->first() ?? Category::factory()->assetMobileCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'eol' => '12',
-                'depreciation_id' => 3,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Mobile Phone Depreciation')->first() ?? Depreciation::factory()->mobilePhones();
+                },
                 'image' => 'iphone11.jpeg',
-                'fieldset_id' => 1,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Mobile Devices')->first() ?? CustomFieldset::factory()->mobile();
+                },
             ];
         });
     }
@@ -315,12 +372,20 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'iPhone 12',
-                'category_id' => 4,
-                'manufacturer_id' => 1,
+                'category_id' => function () {
+                    return Category::where('name', 'Mobile Phones')->first() ?? Category::factory()->assetMobileCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Apple')->first() ?? Manufacturer::factory()->apple();
+                },
                 'eol' => '12',
-                'depreciation_id' => 1,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Computer Depreciation')->first() ?? Depreciation::factory()->computer();
+                },
                 'image' => 'iphone12.jpeg',
-                'fieldset_id' => 1,
+                'fieldset_id' => function () {
+                    return CustomFieldset::where('name', 'Mobile Devices')->first() ?? CustomFieldset::factory()->mobile();
+                },
             ];
         });
     }
@@ -330,10 +395,16 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Ultrafine 4k',
-                'category_id' => 5,
-                'manufacturer_id' => 7,
+                'category_id' => function () {
+                    return Category::where('name', 'Displays')->first() ?? Category::factory()->assetDisplayCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'LG')->first() ?? Manufacturer::factory()->lg();
+                },
                 'eol' => '12',
-                'depreciation_id' => 2,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Display Depreciation')->first() ?? Depreciation::factory()->display();
+                },
                 'image' => 'ultrafine.jpg',
             ];
         });
@@ -344,10 +415,16 @@ class AssetModelFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Ultrasharp U2415',
-                'category_id' => 5,
-                'manufacturer_id' => 3,
+                'category_id' => function () {
+                    return Category::where('name', 'Displays')->first() ?? Category::factory()->assetDisplayCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Dell')->first() ?? Manufacturer::factory()->dell();
+                },
                 'eol' => '12',
-                'depreciation_id' => 2,
+                'depreciation_id' => function () {
+                    return Depreciation::where('name', 'Display Depreciation')->first() ?? Depreciation::factory()->display();
+                },
                 'image' => 'ultrasharp.jpg',
             ];
         });
diff --git a/database/factories/CategoryFactory.php b/database/factories/CategoryFactory.php
index 8f9dd90e3f..94a9626da4 100644
--- a/database/factories/CategoryFactory.php
+++ b/database/factories/CategoryFactory.php
@@ -2,18 +2,10 @@
 
 namespace Database\Factories;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\Category;
 
-/*
-|--------------------------------------------------------------------------
-| Category Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating categories and the various states..
-|
-*/
-
 class CategoryFactory extends Factory
 {
     /**
@@ -21,7 +13,7 @@ class CategoryFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Category::class;
+    protected $model = Category::class;
 
     /**
      * Define the model's default state.
@@ -32,18 +24,19 @@ class CategoryFactory extends Factory
     {
         return [
             'name' => $this->faker->catchPhrase(),
+            'category_type' => 'asset',
             'checkin_email' => $this->faker->boolean(),
             'eula_text' => $this->faker->paragraph(),
             'require_acceptance' => false,
             'use_default_eula' => $this->faker->boolean(),
-            'user_id' => 1,
+            'user_id' => User::factory()->superuser(),
         ];
     }
 
     // usage: Category::factory()->assetLaptopCategory();
     public function assetLaptopCategory()
     {
-        return Category::factory()->create([
+        return $this->state([
             'name' => 'Laptops',
             'category_type' => 'asset',
             'require_acceptance' => true,
@@ -53,7 +46,7 @@ class CategoryFactory extends Factory
     // usage: Category::factory()->assetDesktopCategory();
     public function assetDesktopCategory()
     {
-        return Category::factory()->create([
+        return $this->state([
             'name' => 'Desktops',
             'category_type' => 'asset',
             'require_acceptance' => true,
@@ -63,7 +56,7 @@ class CategoryFactory extends Factory
     // usage: Category::factory()->assetDisplayCategory();
     public function assetDisplayCategory()
     {
-        return Category::factory()->create([
+        return $this->state([
             'name' => 'Displays',
             'category_type' => 'asset',
         ]);
@@ -72,7 +65,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->assetTabletCategory();
      public function assetTabletCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Tablets',
              'category_type' => 'asset',
          ]);
@@ -81,7 +74,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->assetMobileCategory();
      public function assetMobileCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Mobile Phones',
              'category_type' => 'asset',
          ]);
@@ -90,7 +83,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->assetConferenceCategory();
      public function assetConferenceCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Conference Phones',
              'category_type' => 'asset',
          ]);
@@ -100,7 +93,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->assetVoipCategory();
      public function assetVoipCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'VOIP Phones',
              'category_type' => 'asset',
          ]);
@@ -109,8 +102,8 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->accessoryKeyboardCategory();
      public function accessoryKeyboardCategory()
      {
-         return Category::factory()->create([
-             'name' => 'Keyboardss',
+         return $this->state([
+             'name' => 'Keyboards',
              'category_type' => 'accessory',
          ]);
      }
@@ -119,7 +112,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->accessoryMouseCategory();
      public function accessoryMouseCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Mouse',
              'category_type' => 'accessory',
          ]);
@@ -128,7 +121,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->componentHddCategory();
      public function componentHddCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'HDD/SSD',
              'category_type' => 'component',
          ]);
@@ -137,7 +130,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->componentRamCategory();
      public function componentRamCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'RAM',
              'category_type' => 'component',
          ]);
@@ -146,7 +139,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->consumablePaperCategory();
      public function consumablePaperCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Printer Paper',
              'category_type' => 'consumable',
          ]);
@@ -155,7 +148,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->consumableInkCategory();
      public function consumableInkCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Printer Ink',
              'category_type' => 'consumable',
          ]);
@@ -164,7 +157,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->licenseGraphicsCategory();
      public function licenseGraphicsCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Graphics Software',
              'category_type' => 'license',
          ]);
@@ -173,7 +166,7 @@ class CategoryFactory extends Factory
      // usage: Category::factory()->licenseGraphicsCategory();
      public function licenseOfficeCategory()
      {
-         return Category::factory()->create([
+         return $this->state([
              'name' => 'Office Software',
              'category_type' => 'license',
          ]);
diff --git a/database/factories/CheckoutAcceptanceFactory.php b/database/factories/CheckoutAcceptanceFactory.php
new file mode 100644
index 0000000000..b5744527f8
--- /dev/null
+++ b/database/factories/CheckoutAcceptanceFactory.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class CheckoutAcceptanceFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'checkoutable_type' => Asset::class,
+            'checkoutable_id' => Asset::factory(),
+            'assigned_to_id' => User::factory(),
+        ];
+    }
+
+    public function forAccessory()
+    {
+        return $this->state([
+            'checkoutable_type' => Accessory::class,
+            'checkoutable_id' => Accessory::factory(),
+        ]);
+    }
+
+    public function pending()
+    {
+        return $this->state([
+            'accepted_at' => null,
+            'declined_at' => null,
+        ]);
+    }
+}
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index 695a2dbdb5..bf4b7ce242 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -1,25 +1,8 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Here you may define all of your model factories. Model factories give
-| you a convenient way to create models for testing and seeding your
-| database. Just tell the factory how a default model should look.
-|
-*/
-
 namespace Database\Factories;
 
-use App\Models\AssetModel;
-use App\Models\Category;
 use App\Models\Company;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Statuslabel;
-use App\Models\Supplier;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CompanyFactory extends Factory
@@ -29,7 +12,7 @@ class CompanyFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Company::class;
+    protected $model = Company::class;
 
     /**
      * Define the model's default state.
@@ -39,7 +22,7 @@ class CompanyFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->company,
+            'name' => $this->faker->company(),
         ];
     }
 }
diff --git a/database/factories/ComponentFactory.php b/database/factories/ComponentFactory.php
index bd971162ab..caac70078f 100644
--- a/database/factories/ComponentFactory.php
+++ b/database/factories/ComponentFactory.php
@@ -2,16 +2,12 @@
 
 namespace Database\Factories;
 
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Location;
 use Illuminate\Database\Eloquent\Factories\Factory;
-
-/*
-|--------------------------------------------------------------------------
-| Components Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating components ..
-|
-*/
+use App\Models\Supplier;
 
 class ComponentFactory extends Factory
 {
@@ -20,7 +16,7 @@ class ComponentFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Component::class;
+    protected $model = Component::class;
 
     /**
      * Define the model's default state.
@@ -31,19 +27,16 @@ class ComponentFactory extends Factory
     {
         return [
             'name' => $this->faker->text(20),
-            'category_id' => function () {
-                return \App\Models\Category::factory()->create()->id;
-            },
-            'location_id' => 1,
-            'serial'   => $this->faker->uuid,
+            'category_id' => Category::factory(),
+            'location_id' => Location::factory(),
+            'serial'   => $this->faker->uuid(),
             'qty' => $this->faker->numberBetween(3, 10),
             'order_number' => $this->faker->numberBetween(1000000, 50000000),
-            'purchase_date' => $this->faker->dateTime(),
+            'purchase_date' => $this->faker->dateTime()->format('Y-m-d'),
             'purchase_cost' => $this->faker->randomFloat(2),
             'min_amt' => $this->faker->numberBetween($min = 1, $max = 2),
-            'company_id' => function () {
-                return \App\Models\Company::factory()->create()->id;
-            },
+            'company_id' => Company::factory(),
+            'supplier_id' => Supplier::factory(),
         ];
     }
 
@@ -52,11 +45,12 @@ class ComponentFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Crucial 4GB DDR3L-1600 SODIMM',
-                'category_id' => 13,
+                'category_id' => function () {
+                    return Category::where('name', 'RAM')->first() ?? Category::factory()->componentRamCategory();
+                },
                 'qty' => 10,
                 'min_amt' => 2,
-                'location_id' => 3,
-                'company_id' => 2,
+                'location_id' => Location::factory(),
             ];
         });
     }
@@ -66,7 +60,9 @@ class ComponentFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Crucial 8GB DDR3L-1600 SODIMM Memory for Mac',
-                'category_id' => 13,
+                'category_id' => function () {
+                    return Category::where('name', 'RAM')->first() ?? Category::factory()->componentRamCategory();
+                },
                 'qty' => 10,
                 'min_amt' => 2,
             ];
@@ -78,7 +74,9 @@ class ComponentFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Crucial BX300 120GB SATA Internal SSD',
-                'category_id' => 12,
+                'category_id' => function () {
+                    return Category::where('name', 'HDD/SSD')->first() ?? Category::factory()->componentHddCategory();
+                },
                 'qty' => 10,
                 'min_amt' => 2,
             ];
@@ -90,7 +88,9 @@ class ComponentFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Crucial BX300 240GB SATA Internal SSD',
-                'category_id' => 12,
+                'category_id' => function () {
+                    return Category::where('name', 'HDD/SSD')->first() ?? Category::factory()->componentHddCategory();
+                },
                 'qty' => 10,
                 'min_amt' => 2,
             ];
diff --git a/database/factories/ConsumableFactory.php b/database/factories/ConsumableFactory.php
index 50a9db0ba2..18a116418b 100644
--- a/database/factories/ConsumableFactory.php
+++ b/database/factories/ConsumableFactory.php
@@ -2,16 +2,13 @@
 
 namespace Database\Factories;
 
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\Manufacturer;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
-
-/*
-|--------------------------------------------------------------------------
-| Consumables Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating consumables ..
-|
-*/
+use App\Models\Supplier;
 
 class ConsumableFactory extends Factory
 {
@@ -20,7 +17,7 @@ class ConsumableFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Consumable::class;
+    protected $model = Consumable::class;
 
     /**
      * Define the model's default state.
@@ -30,13 +27,17 @@ class ConsumableFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => 1,
+            'name' => $this->faker->words(3, true),
+            'category_id' => Category::factory(),
+            'user_id' => 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()),
+            'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d'),
             'purchase_cost' => $this->faker->randomFloat(2, 1, 50),
             'qty' => $this->faker->numberBetween(5, 10),
             'min_amt' => $this->faker->numberBetween($min = 1, $max = 2),
+            'company_id' => Company::factory(),
+            'supplier_id' => Supplier::factory(),
         ];
     }
 
@@ -45,11 +46,14 @@ class ConsumableFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Cardstock (White)',
-                'category_id' => 10,
-                'manufacturer_id' => 10,
+                'category_id' => function () {
+                    return Category::where('name', 'Printer Paper')->first() ?? Category::factory()->consumablePaperCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Avery')->first() ?? Manufacturer::factory()->avery();
+                },
                 'qty' => 10,
                 'min_amt' => 2,
-                'company_id' => 3,
             ];
         });
     }
@@ -59,8 +63,12 @@ class ConsumableFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Laserjet Paper (Ream)',
-                'category_id' => 10,
-                'manufacturer_id' => 10,
+                'category_id' => function () {
+                    return Category::where('name', 'Printer Paper')->first() ?? Category::factory()->consumablePaperCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Avery')->first() ?? Manufacturer::factory()->avery();
+                },
                 'qty' => 20,
                 'min_amt' => 2,
             ];
@@ -72,8 +80,12 @@ class ConsumableFactory extends Factory
         return $this->state(function () {
             return [
                 'name' => 'Laserjet Toner (black)',
-                'category_id' => 11,
-                'manufacturer_id' => 5,
+                'category_id' => function () {
+                    return Category::where('name', 'Printer Ink')->first() ?? Category::factory()->consumableInkCategory();
+                },
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'HP')->first() ?? Manufacturer::factory()->hp();
+                },
                 'qty' => 20,
                 'min_amt' => 2,
             ];
diff --git a/database/factories/CustomFieldFactory.php b/database/factories/CustomFieldFactory.php
index c964ea44d1..adcca9cae1 100644
--- a/database/factories/CustomFieldFactory.php
+++ b/database/factories/CustomFieldFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use App\Models\CustomField;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CustomFieldFactory extends Factory
@@ -11,7 +12,7 @@ class CustomFieldFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\CustomField::class;
+    protected $model = CustomField::class;
 
     /**
      * Define the model's default state.
@@ -21,9 +22,10 @@ class CustomFieldFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->catchPhrase,
+            'name' => $this->faker->catchPhrase(),
             'format' => '',
             'element' => 'text',
+            'auto_add_to_fieldsets' => '0',
         ];
     }
 
diff --git a/database/factories/CustomFieldsetFactory.php b/database/factories/CustomFieldsetFactory.php
index 1dd834d052..f369121c8f 100644
--- a/database/factories/CustomFieldsetFactory.php
+++ b/database/factories/CustomFieldsetFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use App\Models\CustomFieldset;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CustomFieldsetFactory extends Factory
@@ -11,7 +12,7 @@ class CustomFieldsetFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\CustomFieldset::class;
+    protected $model = CustomFieldset::class;
 
     /**
      * Define the model's default state.
@@ -21,7 +22,7 @@ class CustomFieldsetFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->catchPhrase,
+            'name' => $this->faker->catchPhrase(),
         ];
     }
 
diff --git a/database/factories/DepartmentFactory.php b/database/factories/DepartmentFactory.php
index ad80d32841..cd8c86a875 100644
--- a/database/factories/DepartmentFactory.php
+++ b/database/factories/DepartmentFactory.php
@@ -2,17 +2,11 @@
 
 namespace Database\Factories;
 
+use App\Models\Department;
+use App\Models\Location;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Asset Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating models ..
-|
-*/
-
 class DepartmentFactory extends Factory
 {
     /**
@@ -20,7 +14,7 @@ class DepartmentFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Department::class;
+    protected $model = Department::class;
 
     /**
      * Define the model's default state.
@@ -30,8 +24,9 @@ class DepartmentFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => 1,
-            'location_id' => rand(1, 5),
+            'name' => $this->faker->word() . ' Department',
+            'user_id' => User::factory()->superuser(),
+            'location_id' => Location::factory(),
         ];
     }
 
diff --git a/database/factories/DepreciationFactory.php b/database/factories/DepreciationFactory.php
index 17940ac515..6a648d7ade 100644
--- a/database/factories/DepreciationFactory.php
+++ b/database/factories/DepreciationFactory.php
@@ -2,17 +2,10 @@
 
 namespace Database\Factories;
 
+use App\Models\Depreciation;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Asset Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating models ..
-|
-*/
-
 class DepreciationFactory extends Factory
 {
     /**
@@ -20,7 +13,7 @@ class DepreciationFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Depreciation::class;
+    protected $model = Depreciation::class;
 
     /**
      * Define the model's default state.
@@ -31,7 +24,7 @@ class DepreciationFactory extends Factory
     {
         return [
             'name' => $this->faker->catchPhrase(),
-            'user_id' => 1,
+            'user_id' => User::factory()->superuser(),
             'months' => 36,
         ];
     }
diff --git a/database/factories/GroupFactory.php b/database/factories/GroupFactory.php
index 17f3493c2b..9dee88a965 100644
--- a/database/factories/GroupFactory.php
+++ b/database/factories/GroupFactory.php
@@ -1,25 +1,8 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Here you may define all of your model factories. Model factories give
-| you a convenient way to create models for testing and seeding your
-| database. Just tell the factory how a default model should look.
-|
-*/
-
 namespace Database\Factories;
 
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\Company;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Statuslabel;
-use App\Models\Supplier;
+use App\Models\Group;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class GroupFactory extends Factory
@@ -29,7 +12,7 @@ class GroupFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Group::class;
+    protected $model = Group::class;
 
     /**
      * Define the model's default state.
@@ -39,7 +22,7 @@ class GroupFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->name,
+            'name' => $this->faker->name(),
         ];
     }
 }
diff --git a/database/factories/LicenseFactory.php b/database/factories/LicenseFactory.php
index 2aa681c0d2..6360735c5f 100644
--- a/database/factories/LicenseFactory.php
+++ b/database/factories/LicenseFactory.php
@@ -2,25 +2,12 @@
 namespace Database\Factories;
 
 use App\Models\Category;
+use App\Models\License;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Asset Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating models ..
-|
-*/
-
-// 1
-
-// 2
-
-// 3
-
-// 4
-
 class LicenseFactory extends Factory
 {
     /**
@@ -28,7 +15,7 @@ class LicenseFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\License::class;
+    protected $model = License::class;
 
     /**
      * Define the model's default state.
@@ -37,22 +24,20 @@ class LicenseFactory extends Factory
      */
     public function definition()
     {
-
-
         return [
-            'user_id' => 1,
-            'name' => $this->faker->name,
-            'license_email' => $this->faker->safeEmail,
-            'serial' => $this->faker->uuid,
+            'user_id' => User::factory()->superuser(),
+            'name' => $this->faker->name(),
+            'license_email' => $this->faker->safeEmail(),
+            'serial' => $this->faker->uuid(),
             'notes'   => 'Created by DB seeder',
             'seats' => $this->faker->numberBetween(1, 10),
-            'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
+            'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d'),
             'order_number' => $this->faker->numberBetween(1000000, 50000000),
             'expiration_date' => $this->faker->dateTimeBetween('now', '+3 years', date_default_timezone_get())->format('Y-m-d H:i:s'),
             'reassignable' => $this->faker->boolean(),
             'termination_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d H:i:s'),
-            'supplier_id' => $this->faker->numberBetween(1, 5),
-            'category_id' => Category::where('category_type', '=', 'license')->inRandomOrder()->first()->id
+            'supplier_id' => Supplier::factory(),
+            'category_id' => Category::factory(),
         ];
     }
 
@@ -61,12 +46,16 @@ class LicenseFactory extends Factory
         return $this->state(function () {
             $data = [
                 'name' => 'Photoshop',
-                'manufacturer_id' => 9,
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Adobe')->first() ?? Manufacturer::factory()->adobe();
+                },
                 'purchase_cost' => '299.99',
                 'seats' => 10,
                 'purchase_order' => '13503Q',
                 'maintained' => true,
-                'category_id' => 14,
+                'category_id' => function () {
+                    return Category::where('name', 'Graphics Software')->first() ?? Category::factory()->licenseGraphicsCategory();
+                },
             ];
 
             return $data;
@@ -78,10 +67,14 @@ class LicenseFactory extends Factory
         return $this->state(function () {
             $data = [
                 'name' => 'Acrobat',
-                'manufacturer_id' => 9,
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Adobe')->first() ?? Manufacturer::factory()->adobe();
+                },
                 'purchase_cost' => '29.99',
                 'seats' => 10,
-                'category_id' => 14,
+                'category_id' => function () {
+                    return Category::where('name', 'Graphics Software')->first() ?? Category::factory()->licenseGraphicsCategory();
+                },
             ];
 
             return $data;
@@ -93,10 +86,14 @@ class LicenseFactory extends Factory
         return $this->state(function () {
             $data = [
                 'name' => 'InDesign',
-                'manufacturer_id' => 9,
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Adobe')->first() ?? Manufacturer::factory()->adobe();
+                },
                 'purchase_cost' => '199.99',
                 'seats' => 10,
-                'category_id' => 14,
+                'category_id' => function () {
+                    return Category::where('name', 'Graphics Software')->first() ?? Category::factory()->licenseGraphicsCategory();
+                },
             ];
     
 
@@ -109,10 +106,14 @@ class LicenseFactory extends Factory
         return $this->state(function () {
             $data = [
                 'name' => 'Office',
-                'manufacturer_id' => 2,
+                'manufacturer_id' => function () {
+                    return Manufacturer::where('name', 'Microsoft')->first() ?? Manufacturer::factory()->microsoft();
+                },
                 'purchase_cost' => '49.99',
                 'seats' => 20,
-                'category_id' => 15,
+                'category_id' => function () {
+                    return Category::where('name', 'Office Software')->first() ?? Category::factory()->licenseOfficeCategory();
+                },
             ];
 
             return $data;
diff --git a/database/factories/LicenseSeatFactory.php b/database/factories/LicenseSeatFactory.php
new file mode 100644
index 0000000000..3c6cc4246b
--- /dev/null
+++ b/database/factories/LicenseSeatFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\License;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class LicenseSeatFactory extends Factory
+{
+    public function definition()
+    {
+        return [
+            'license_id' => License::factory(),
+        ];
+    }
+}
diff --git a/database/factories/LocationFactory.php b/database/factories/LocationFactory.php
index f6a4bb973b..6db268e8c1 100644
--- a/database/factories/LocationFactory.php
+++ b/database/factories/LocationFactory.php
@@ -23,8 +23,6 @@ class LocationFactory extends Factory
             'currency' => $this->faker->currencyCode(),
             'zip' => $this->faker->postcode(),
             'image' => rand(1, 9).'.jpg',
-
         ];
     }
-
 }
diff --git a/database/factories/ManufacturerFactory.php b/database/factories/ManufacturerFactory.php
index 427cd0b6db..4e736b8d8a 100644
--- a/database/factories/ManufacturerFactory.php
+++ b/database/factories/ManufacturerFactory.php
@@ -2,39 +2,10 @@
 
 namespace Database\Factories;
 
+use App\Models\Manufacturer;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/*
-|--------------------------------------------------------------------------
-| Asset Model Factories
-|--------------------------------------------------------------------------
-|
-| Factories related exclusively to creating models ..
-|
-*/
-
-// 1
-
-// 2
-
-// 3
-
-// 4
-
-// 5
-
-// 6
-
-// 7
-
-// 8
-
-// 9
-
-// 10
-
-// 11
-
 class ManufacturerFactory extends Factory
 {
     /**
@@ -42,7 +13,7 @@ class ManufacturerFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Manufacturer::class;
+    protected $model = Manufacturer::class;
 
     /**
      * Define the model's default state.
@@ -52,7 +23,8 @@ class ManufacturerFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => 1,
+            'name' => $this->faker->company(),
+            'user_id' => User::factory()->superuser(),
             'support_phone' => $this->faker->phoneNumber(),
             'url' => $this->faker->url(),
             'support_email' => $this->faker->safeEmail(),
@@ -66,6 +38,7 @@ class ManufacturerFactory extends Factory
                 'name' => 'Apple',
                 'url' => 'https://apple.com',
                 'support_url' => 'https://support.apple.com',
+                'warranty_lookup_url' => 'https://checkcoverage.apple.com',
                 'image' => 'apple.jpg',
             ];
         });
@@ -78,6 +51,7 @@ class ManufacturerFactory extends Factory
                 'name' => 'Microsoft',
                 'url' => 'https://microsoft.com',
                 'support_url' => 'https://support.microsoft.com',
+                'warranty_lookup_url' => 'https://account.microsoft.com/devices',
                 'image' => 'microsoft.png',
             ];
         });
@@ -90,6 +64,7 @@ class ManufacturerFactory extends Factory
                 'name' => 'Dell',
                 'url' => 'https://dell.com',
                 'support_url' => 'https://support.dell.com',
+                'warranty_lookup_url' => 'https://www.dell.com/support/home/en-us/Products/?app=warranty',
                 'image' => 'dell.png',
             ];
         });
diff --git a/database/factories/SettingFactory.php b/database/factories/SettingFactory.php
index 73a9e049dc..1655bd3350 100644
--- a/database/factories/SettingFactory.php
+++ b/database/factories/SettingFactory.php
@@ -1,25 +1,8 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Here you may define all of your model factories. Model factories give
-| you a convenient way to create models for testing and seeding your
-| database. Just tell the factory how a default model should look.
-|
-*/
-
 namespace Database\Factories;
 
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\Company;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Statuslabel;
-use App\Models\Supplier;
+use App\Models\Setting;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class SettingFactory extends Factory
@@ -29,7 +12,7 @@ class SettingFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Setting::class;
+    protected $model = Setting::class;
 
     /**
      * Define the model's default state.
@@ -39,14 +22,13 @@ class SettingFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => 1,
             'per_page' => 20,
-            'site_name' => $this->faker->sentence,
+            'site_name' => $this->faker->sentence(),
             'auto_increment_assets' => false,
             'alert_email' => $this->faker->safeEmail(),
             'alerts_enabled' => true,
             'brand' => 1,
-            'default_currency' => $this->faker->currencyCode,
+            'default_currency' => $this->faker->currencyCode(),
             'locale' => 'en',
             'pwd_secure_min' => 10, // Match web setup
             'email_domain' => 'test.com',
diff --git a/database/factories/StatuslabelFactory.php b/database/factories/StatuslabelFactory.php
index 051e8131ee..0b8359dd5b 100644
--- a/database/factories/StatuslabelFactory.php
+++ b/database/factories/StatuslabelFactory.php
@@ -3,6 +3,7 @@
 namespace Database\Factories;
 
 use App\Models\Statuslabel;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class StatuslabelFactory extends Factory
@@ -22,10 +23,10 @@ class StatuslabelFactory extends Factory
     public function definition()
     {
         return [
-            'name'      => $this->faker->sentence,
+            'name'      => $this->faker->sentence(),
             'created_at' => $this->faker->dateTime(),
             'updated_at' => $this->faker->dateTime(),
-            'user_id' => 1,
+            'user_id' => User::factory()->superuser(),
             'deleted_at' => null,
             'deployable' => 0,
             'pending' => 0,
@@ -38,7 +39,7 @@ class StatuslabelFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'notes' => $this->faker->sentence,
+                'notes' => $this->faker->sentence(),
                 'deployable' => 1,
                 'default_label' => 1,
             ];
@@ -49,7 +50,7 @@ class StatuslabelFactory extends Factory
     {
         return $this->state(function () {
             return [
-                'notes' => $this->faker->sentence,
+                'notes' => $this->faker->sentence(),
                 'pending' => 1,
                 'default_label' => 1,
             ];
diff --git a/database/factories/SupplierFactory.php b/database/factories/SupplierFactory.php
index 344dfe7d5b..971cd28990 100644
--- a/database/factories/SupplierFactory.php
+++ b/database/factories/SupplierFactory.php
@@ -1,24 +1,7 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Here you may define all of your model factories. Model factories give
-| you a convenient way to create models for testing and seeding your
-| database. Just tell the factory how a default model should look.
-|
-*/
-
 namespace Database\Factories;
 
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\Company;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Statuslabel;
 use App\Models\Supplier;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -29,7 +12,7 @@ class SupplierFactory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\Supplier::class;
+    protected $model = Supplier::class;
 
     /**
      * Define the model's default state.
@@ -39,18 +22,18 @@ class SupplierFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->company,
-            'address' => $this->faker->streetAddress,
-            'address2' => $this->faker->secondaryAddress,
-            'city' => $this->faker->city,
-            'state' => $this->faker->stateAbbr,
-            'zip' => $this->faker->postCode,
-            'country' => $this->faker->countryCode,
-            'contact' => $this->faker->name,
-            'phone' => $this->faker->phoneNumber,
-            'fax'   => $this->faker->phoneNumber,
-            'email' => $this->faker->safeEmail,
-            'url'   => $this->faker->url,
+            'name' => $this->faker->company(),
+            'address' => $this->faker->streetAddress(),
+            'address2' => $this->faker->secondaryAddress(),
+            'city' => $this->faker->city(),
+            'state' => $this->faker->stateAbbr(),
+            'zip' => $this->faker->postCode(),
+            'country' => $this->faker->countryCode(),
+            'contact' => $this->faker->name(),
+            'phone' => $this->faker->phoneNumber(),
+            'fax'   => $this->faker->phoneNumber(),
+            'email' => $this->faker->safeEmail(),
+            'url'   => $this->faker->url(),
             'notes' => $this->faker->text(191), // Supplier notes can be a max of 255 characters.
         ];
     }
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index bc23625749..2445a351f3 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,6 +2,8 @@
 
 namespace Database\Factories;
 
+use App\Models\Company;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use \Auth;
 
@@ -18,10 +20,9 @@ class UserFactory extends Factory
             'activated' => 1,
             'address' => $this->faker->address(),
             'city' => $this->faker->city(),
-            'company_id' => rand(1, 4),
+            'company_id' => Company::factory(),
             'country' => $this->faker->country(),
-            'department_id' => rand(1, 6),
-            'email' => $this->faker->safeEmail,
+            'email' => $this->faker->safeEmail(),
             'employee_num' => $this->faker->numberBetween(3500, 35050),
             'first_name' => $this->faker->firstName(),
             'jobtitle' => $this->faker->jobTitle(),
@@ -30,10 +31,10 @@ class UserFactory extends Factory
             'notes' => 'Created by DB seeder',
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'permissions' => '{"user":"0"}',
-            'phone' => $this->faker->phoneNumber,
-            'state' => $this->faker->stateAbbr,
-            'username' => $this->faker->username,
-            'zip' => $this->faker->postcode,
+            'phone' => $this->faker->phoneNumber(),
+            'state' => $this->faker->stateAbbr(),
+            'username' => $this->faker->username(),
+            'zip' => $this->faker->postcode(),
         ];
     }
     
@@ -64,6 +65,20 @@ class UserFactory extends Factory
         });
     }
 
+    public function testAdmin()
+    {
+        return $this->state(function () {
+            return [
+                'first_name' => 'Alison',
+                'last_name' => 'Gianotto',
+                'username' => 'agianotto@grokability.com',
+                'avatar' => '2.jpg',
+                'email' => 'agianotto@grokability.com',
+                'permissions' => '{"superuser":"1"}',
+            ];
+        });
+    }
+
     public function superuser()
     {
         return $this->state(function () {
@@ -78,7 +93,9 @@ class UserFactory extends Factory
         return $this->state(function () {
             return [
                 'permissions' => '{"admin":"1"}',
-                'manager_id' => rand(1, 2),
+                'manager_id' => function () {
+                    return User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin();
+                },
             ];
         });
     }
@@ -254,6 +271,15 @@ class UserFactory extends Factory
         });
     }
 
+    public function viewDepartments()
+    {
+        return $this->state(function () {
+            return [
+                'permissions' => '{"departments.view":"1"}',
+            ];
+        });
+    }
+
     public function viewLicenses()
     {
         return $this->state(function () {
@@ -398,4 +424,12 @@ class UserFactory extends Factory
         });
     }
 
+    public function canEditOwnLocation()
+    {
+        return $this->state(function () {
+            return [
+                'permissions' => '{"self.edit_location":"1"}',
+            ];
+        });
+    }
 }
diff --git a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php
index cd45847bc7..55d7318736 100644
--- a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php
+++ b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php
@@ -44,6 +44,8 @@ class MigrationCartalystSentryInstallGroups extends Migration
      */
     public function down()
     {
-        Schema::drop('permission_groups');
+        // See 2014_11_04_231416_update_group_field_for_reporting.php and 2019_06_12_184327_rename_groups_table.php
+        Schema::dropIfExists('permission_groups');
+        Schema::dropIfExists('groups');
     }
 }
diff --git a/database/migrations/2013_11_17_054526_add_physical_to_assets.php b/database/migrations/2013_11_17_054526_add_physical_to_assets.php
index 2ccc7c43dc..28d1117201 100755
--- a/database/migrations/2013_11_17_054526_add_physical_to_assets.php
+++ b/database/migrations/2013_11_17_054526_add_physical_to_assets.php
@@ -26,6 +26,6 @@ class AddPhysicalToAssets extends Migration
      */
     public function down()
     {
-        $table->dropColumn('physical');
+        // $table->dropColumn('physical');
     }
 }
diff --git a/database/migrations/2013_11_25_013244_recreate_licenses_table.php b/database/migrations/2013_11_25_013244_recreate_licenses_table.php
index fb18452794..a22349dcd6 100755
--- a/database/migrations/2013_11_25_013244_recreate_licenses_table.php
+++ b/database/migrations/2013_11_25_013244_recreate_licenses_table.php
@@ -37,7 +37,7 @@ class ReCreateLicensesTable extends Migration
      */
     public function down()
     {
-        //
-        Schema::drop('licenses');
+        // This was most likely handled in 2013_11_17_054359_drop_licenses_table.php
+        Schema::dropIfExists('licenses');
     }
 }
diff --git a/database/migrations/2013_11_25_031458_create_license_seats_table.php b/database/migrations/2013_11_25_031458_create_license_seats_table.php
index 466ef00870..d023b8ebec 100755
--- a/database/migrations/2013_11_25_031458_create_license_seats_table.php
+++ b/database/migrations/2013_11_25_031458_create_license_seats_table.php
@@ -31,6 +31,6 @@ class CreateLicenseSeatsTable extends Migration
      */
     public function down()
     {
-        //
+        Schema::dropIfExists('license_seats');
     }
 }
diff --git a/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php b/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
index be62374dce..d63a6ad9b4 100755
--- a/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
+++ b/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
@@ -23,6 +23,8 @@ class AlterWarrantyColumnOnAssets extends Migration
      */
     public function down()
     {
-        //
+        Schema::table('assets', function ($table) {
+            $table->renameColumn('warranty_months', 'warrantee_months');
+        });
     }
 }
diff --git a/database/migrations/2013_12_10_084038_add_eol_on_models_table.php b/database/migrations/2013_12_10_084038_add_eol_on_models_table.php
index d8d222deec..97e7b266e6 100755
--- a/database/migrations/2013_12_10_084038_add_eol_on_models_table.php
+++ b/database/migrations/2013_12_10_084038_add_eol_on_models_table.php
@@ -24,7 +24,7 @@ class AddEolOnModelsTable extends Migration
     public function down()
     {
         Schema::table('models', function ($table) {
-            $table->dropColumn('old');
+            $table->dropColumn('eol');
         });
     }
 }
diff --git a/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php b/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php
index eefc283e3f..f14dc078cc 100644
--- a/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php
+++ b/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php
@@ -105,10 +105,10 @@
          */
         public function down()
         {
-            Schema::table('asset_logs', function (Blueprint $table) {
-                $table->dropIndex('thread_id');
-                $table->dropColumn('thread_id');
-            });
+            // Schema::table('asset_logs', function (Blueprint $table) {
+            //     $table->dropIndex('thread_id');
+            //     $table->dropColumn('thread_id');
+            // });
         }
 
         /**
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 516b5c2ec7..3c4bf93e15 100644
--- a/database/migrations/2015_09_22_003413_migrate_mac_address.php
+++ b/database/migrations/2015_09_22_003413_migrate_mac_address.php
@@ -48,13 +48,19 @@ class MigrateMacAddress extends Migration
      */
     public function down()
     {
-        //
         $f = \App\Models\CustomFieldset::where(['name' => 'Asset with MAC Address'])->first();
-        $f->fields()->delete();
-        $f->delete();
+
+        if ($f) {
+            $f->fields()->delete();
+            $f->delete();
+        }
+
         Schema::table('models', function (Blueprint $table) {
             $table->renameColumn('deprecated_mac_address', 'show_mac_address');
         });
-        DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)');
+
+        if (Schema::hasColumn('assets', '_snipeit_mac_address')) {
+            DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)');
+        }
     }
 }
diff --git a/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php b/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php
index c4e1a18177..5ea26bf4c1 100644
--- a/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php
+++ b/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php
@@ -25,7 +25,7 @@ class AddShowInNavToStatusLabels extends Migration
     public function down()
     {
         Schema::table('status_labels', function (Blueprint $table) {
-            $table->dropColumn('show_in_nav', 'field_encrypted');
+            $table->dropColumn('show_in_nav');
         });
     }
 }
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 72e85698e0..4725cccfe1 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
@@ -4,6 +4,7 @@ use App\Models\CustomField;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 
 /**
  * Fixes issue #2551 where columns got donked if the field name in non-ascii
@@ -71,6 +72,25 @@ class FixUtf8CustomFieldColumnNames extends Migration
      */
     public function down()
     {
+        // In the up method above, updateLegacyColumnName is called and custom fields in the assets table are prefixed
+        // with "_snipe_it_", suffixed with "_{id of the CustomField}", and stored in custom_fields.db_column.
+        // The following reverses those changes.
+        foreach (CustomField::all() as $field) {
+            $currentColumnName = $field->db_column;
+
+            // "_snipeit_imei_1" becomes "_snipeit_imei"
+            $legacyColumnName = (string) Str::of($currentColumnName)->replaceMatches('/_(\d)+$/', '');
+
+            if (Schema::hasColumn(CustomField::$table_name, $currentColumnName)) {
+                Schema::table(CustomField::$table_name, function (Blueprint $table) use ($currentColumnName, $legacyColumnName) {
+                    $table->renameColumn(
+                        $currentColumnName,
+                        $legacyColumnName
+                    );
+                });
+            }
+        }
+
         Schema::table('custom_fields', function ($table) {
             $table->dropColumn('db_column');
             $table->dropColumn('help_text');
diff --git a/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php b/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php
index 0d05a680c1..05af7c8316 100644
--- a/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php
+++ b/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php
@@ -28,7 +28,7 @@ class AddFieldsToManufacturer extends Migration
      */
     public function down()
     {
-        Schema::table('settings', function ($table) {
+        Schema::table('manufacturers', function ($table) {
             $table->dropColumn('url');
             $table->dropColumn('support_url');
             $table->dropColumn('support_phone');
diff --git a/database/migrations/2021_04_14_180125_add_ids_to_tables.php b/database/migrations/2021_04_14_180125_add_ids_to_tables.php
index 07172164fe..bac56466ce 100644
--- a/database/migrations/2021_04_14_180125_add_ids_to_tables.php
+++ b/database/migrations/2021_04_14_180125_add_ids_to_tables.php
@@ -22,7 +22,7 @@ class AddIdsToTables extends Migration
 
         Schema::table('password_resets', function (Blueprint $table) {
             // Add the id column to the password_resets table if it doesn't yet have one
-            if (! Schema::hasColumn('password_resets', 'id')) {
+            if (! Schema::hasColumn('password_resets', 'id') && $this->notUsingSqlite()) {
                 $table->increments('id');
             }
         });
@@ -47,4 +47,9 @@ class AddIdsToTables extends Migration
             }
         });
     }
+
+    private function notUsingSqlite()
+    {
+        return Schema::connection($this->getConnection())->getConnection()->getDriverName() !== 'sqlite';
+    }
 }
diff --git a/database/migrations/2022_11_15_232525_adds_should_autoassign_bool_to_users_table.php b/database/migrations/2022_11_15_232525_adds_should_autoassign_bool_to_users_table.php
new file mode 100644
index 0000000000..b728e1f22b
--- /dev/null
+++ b/database/migrations/2022_11_15_232525_adds_should_autoassign_bool_to_users_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddsShouldAutoassignBoolToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('autoassign_licenses')->nullable(false)->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('autoassign_licenses');
+        });
+    }
+}
diff --git a/database/migrations/2023_01_21_225350_add_eol_date_on_assets_table.php b/database/migrations/2023_01_21_225350_add_eol_date_on_assets_table.php
new file mode 100644
index 0000000000..9f5c5aa1e5
--- /dev/null
+++ b/database/migrations/2023_01_21_225350_add_eol_date_on_assets_table.php
@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Asset;
+use App\Models\AssetModel;
+
+class AddEolDateOnAssetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        Schema::table('assets', function (Blueprint $table) {
+            if (!Schema::hasColumn('assets', 'asset_eol_date')) {
+                $table->date('asset_eol_date')->after('purchase_date')->nullable()->default(null);
+            }
+        });
+
+        // Chunk the model query to get the models that do have an EOL date
+        AssetModel::whereNotNull('eol')->chunk(10, function ($models) {
+            foreach ($models as $model) {
+                foreach ($model->assets as $asset) {
+
+                    if ($asset->purchase_date!='') {
+                        $asset->asset_eol_date = $asset->present()->eol_date();
+                        $asset->save();
+                    }
+
+                }
+            }
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            if (Schema::hasColumn('assets', 'asset_eol_date')) {
+                $table->dropColumn('asset_eol_date');
+            }
+        });
+    }
+}
diff --git a/database/migrations/2023_01_23_232933_add_vip_to_users.php b/database/migrations/2023_01_23_232933_add_vip_to_users.php
new file mode 100644
index 0000000000..344f35d240
--- /dev/null
+++ b/database/migrations/2023_01_23_232933_add_vip_to_users.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddVipToUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('vip')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (Schema::hasColumn('users', 'vip')) {
+                $table->dropColumn('vip');
+            }
+        });
+    }
+}
diff --git a/database/migrations/2023_02_12_224353_fix_unescaped_customfields_format.php b/database/migrations/2023_02_12_224353_fix_unescaped_customfields_format.php
new file mode 100644
index 0000000000..f1779e996a
--- /dev/null
+++ b/database/migrations/2023_02_12_224353_fix_unescaped_customfields_format.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\CustomField;
+
+class FixUnescapedCustomfieldsFormat extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $customfields = CustomField::where('format', 'LIKE', '%&%')->get();
+
+        foreach($customfields as $customfield){
+            $customfield->update(['format' => html_entity_decode($customfield->format)]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
new file mode 100644
index 0000000000..269a625182
--- /dev/null
+++ b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddsWebhookOptionToSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        /**
+         * So...you're probably wondering why this isn't all in one Schema::table()...
+         * Turns out we'll get the following error:
+         * "SQLite doesn't support multiple calls to dropColumn / renameColumn in a single modification."
+         * if we're running sqlite so a solution is to make multiple calls.
+         * ¯\_(ツ)_/¯
+         */
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('webhook_selected')->after('slack_botname')->default('slack')->nullable();
+        });
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->renameColumn('slack_botname', 'webhook_botname');
+        });
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->renameColumn('slack_endpoint', 'webhook_endpoint');
+        });
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->renameColumn('slack_channel', 'webhook_channel');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('webhook_selected');
+            $table->renameColumn('webhook_botname', 'slack_botname');
+            $table->renameColumn('webhook_endpoint', 'slack_endpoint');
+            $table->renameColumn('webhook_channel', 'slack_channel');
+        });
+    }
+}
diff --git a/database/migrations/2023_03_21_215218_update_slack_setting.php b/database/migrations/2023_03_21_215218_update_slack_setting.php
new file mode 100644
index 0000000000..e4fdf75600
--- /dev/null
+++ b/database/migrations/2023_03_21_215218_update_slack_setting.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Setting;
+
+class UpdateSlackSetting extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        /*
+         * This is a dumb migration that would only affect a few people that would have been caught in the back-in-time
+         * migration change to change Slack to slack
+         */
+        $settings = Setting::where('webhook_selected', '=', 'Slack')->get();
+
+        foreach($settings as $setting){
+            $setting->webhook_selected = 'slack';
+            $setting->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2023_04_12_135822_add_supplier_to_components.php b/database/migrations/2023_04_12_135822_add_supplier_to_components.php
new file mode 100644
index 0000000000..447c7850a9
--- /dev/null
+++ b/database/migrations/2023_04_12_135822_add_supplier_to_components.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSupplierToComponents extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            if (!Schema::hasColumn('components', 'supplier_id')) {
+                $table->integer('supplier_id')->after('user_id')->nullable()->default(null);
+            }
+        });
+
+        Schema::table('consumables', function (Blueprint $table) {
+            if (!Schema::hasColumn('consumables', 'supplier_id')) {
+                $table->integer('supplier_id')->after('user_id')->nullable()->default(null);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            if (Schema::hasColumn('components', 'supplier_id')) {
+                $table->dropColumn('supplier_id');
+            }
+        });
+
+        Schema::table('consumables', function (Blueprint $table) {
+            if (Schema::hasColumn('consumables', 'supplier_id')) {
+                $table->dropColumn('supplier_id');
+            }
+        });
+    }
+}
diff --git a/database/migrations/2023_04_25_085912_add_autoadd_to_customfields.php b/database/migrations/2023_04_25_085912_add_autoadd_to_customfields.php
new file mode 100644
index 0000000000..918bec9c5c
--- /dev/null
+++ b/database/migrations/2023_04_25_085912_add_autoadd_to_customfields.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAutoaddToCustomfields extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->boolean('auto_add_to_fieldsets')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            if (Schema::hasColumn('custom_fields', 'auto_add_to_fieldsets')) {
+                $table->dropColumn('auto_add_to_fieldsets');
+            }
+        });
+    }
+}
diff --git a/database/migrations/2023_04_25_181817_adds_ldap_location_to_settings_table.php b/database/migrations/2023_04_25_181817_adds_ldap_location_to_settings_table.php
new file mode 100644
index 0000000000..60c0e31a67
--- /dev/null
+++ b/database/migrations/2023_04_25_181817_adds_ldap_location_to_settings_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddsLdapLocationToSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('ldap_location')->after('ldap_country')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('ldap_location');
+        });
+    }
+}
diff --git a/database/migrations/2023_04_26_160235_add_warranty_url_to_manufacturers.php b/database/migrations/2023_04_26_160235_add_warranty_url_to_manufacturers.php
new file mode 100644
index 0000000000..52a655f2e4
--- /dev/null
+++ b/database/migrations/2023_04_26_160235_add_warranty_url_to_manufacturers.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWarrantyUrlToManufacturers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('manufacturers', function (Blueprint $table) {
+            $table->string('warranty_lookup_url')->after('support_url')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('manufacturers', function (Blueprint $table) {
+            $table->dropColumn('warranty_lookup_url');
+        });
+    }
+}
diff --git a/database/migrations/2023_05_08_132921_increase_state_to_more_than_3.php b/database/migrations/2023_05_08_132921_increase_state_to_more_than_3.php
new file mode 100644
index 0000000000..7ffc0c3860
--- /dev/null
+++ b/database/migrations/2023_05_08_132921_increase_state_to_more_than_3.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class IncreaseStateToMoreThan3 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('state', 191)->nullable()->default(null)->change();
+        });
+
+        Schema::table('suppliers', function (Blueprint $table) {
+            $table->string('state', 191)->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('state', 3)->nullable()->default(null)->change();
+        });
+
+        Schema::table('suppliers', function (Blueprint $table) {
+            $table->string('state', 32)->nullable()->default(null)->change();
+        });
+    }
+}
diff --git a/database/migrations/2023_05_10_001836_add_google_auth_to_settings.php b/database/migrations/2023_05_10_001836_add_google_auth_to_settings.php
new file mode 100644
index 0000000000..7f15e0d6e1
--- /dev/null
+++ b/database/migrations/2023_05_10_001836_add_google_auth_to_settings.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGoogleAuthToSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('google_login')->nullable()->default(0);
+            $table->string('google_client_id')->nullable()->default(null);
+            $table->string('google_client_secret')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('google_login');
+            $table->dropColumn('google_client_id');
+            $table->dropColumn('google_client_secret');
+
+        });
+    }
+}
diff --git a/database/migrations/2023_07_05_092237_change_settings_table_increase_saml_idp_metadata_size.php b/database/migrations/2023_07_05_092237_change_settings_table_increase_saml_idp_metadata_size.php
new file mode 100644
index 0000000000..0e200e11b5
--- /dev/null
+++ b/database/migrations/2023_07_05_092237_change_settings_table_increase_saml_idp_metadata_size.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeSettingsTableIncreaseSamlIdpMetadataSize extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * This migration changes the format of the saml_idp_metadata field to MEDIUMTEXT
+     * to avoid truncating
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->mediumText('saml_idp_metadata')->nullable()->default(null)->change();
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->text('saml_idp_metadata')->nullable()->default(null)->change();
+        });
+    }
+}
diff --git a/database/migrations/2023_07_06_092507_add_phone_fax_to_locations.php b/database/migrations/2023_07_06_092507_add_phone_fax_to_locations.php
new file mode 100644
index 0000000000..d6835ac295
--- /dev/null
+++ b/database/migrations/2023_07_06_092507_add_phone_fax_to_locations.php
@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPhoneFaxToLocations extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->string('phone', 20)->after('zip')->nullable()->default(null);
+            $table->string('fax', 20)->after('zip')->nullable()->default(null);
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->string('phone', 20)->after('name')->nullable()->default(null);
+            $table->string('fax', 20)->after('name')->nullable()->default(null);
+        });
+
+        Schema::table('departments', function (Blueprint $table) {
+            $table->string('phone', 20)->after('name')->nullable()->default(null);
+            $table->string('fax', 20)->after('name')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->dropColumn('phone');
+            $table->dropColumn('fax');
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->dropColumn('phone');
+            $table->dropColumn('fax');
+        });
+
+        Schema::table('departments', function (Blueprint $table) {
+            $table->dropColumn('phone');
+            $table->dropColumn('fax');
+        });
+    }
+}
diff --git a/database/migrations/2023_07_14_004221_add_show_in_list_view_to_custom_fields.php b/database/migrations/2023_07_14_004221_add_show_in_list_view_to_custom_fields.php
new file mode 100644
index 0000000000..227a8bd6c3
--- /dev/null
+++ b/database/migrations/2023_07_14_004221_add_show_in_list_view_to_custom_fields.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddShowInListViewToCustomFields extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->boolean('show_in_listview')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            if (Schema::hasColumn('custom_fields', 'show_in_listview')) {
+                $table->dropColumn('show_in_listview');
+            }
+        });
+    }
+}
diff --git a/database/seeders/AccessorySeeder.php b/database/seeders/AccessorySeeder.php
index 6c4123c08b..31f0c478d4 100644
--- a/database/seeders/AccessorySeeder.php
+++ b/database/seeders/AccessorySeeder.php
@@ -3,6 +3,9 @@
 namespace Database\Seeders;
 
 use App\Models\Accessory;
+use App\Models\Location;
+use App\Models\Supplier;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -14,10 +17,45 @@ class AccessorySeeder extends Seeder
     {
         Accessory::truncate();
         DB::table('accessories_users')->truncate();
-        Accessory::factory()->count(1)->appleUsbKeyboard()->create();
-        Accessory::factory()->count(1)->appleBtKeyboard()->create();
-        Accessory::factory()->count(1)->appleMouse()->create();
-        Accessory::factory()->count(1)->microsoftMouse()->create();
+
+        if (! Location::count()) {
+            $this->call(LocationSeeder::class);
+        }
+
+        $locationIds = Location::all()->pluck('id');
+
+        if (! Supplier::count()) {
+            $this->call(SupplierSeeder::class);
+        }
+
+        $supplierIds = Supplier::all()->pluck('id');
+
+        $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+
+        Accessory::factory()->appleUsbKeyboard()->create([
+            'location_id' => $locationIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Accessory::factory()->appleBtKeyboard()->create([
+            'location_id' => $locationIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Accessory::factory()->appleMouse()->create([
+            'location_id' => $locationIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Accessory::factory()->microsoftMouse()->create([
+            'location_id' => $locationIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
 
         $src = public_path('/img/demo/accessories/');
         $dst = 'accessories'.'/';
diff --git a/database/seeders/ActionlogSeeder.php b/database/seeders/ActionlogSeeder.php
index 06eb27bdeb..28191d53b0 100644
--- a/database/seeders/ActionlogSeeder.php
+++ b/database/seeders/ActionlogSeeder.php
@@ -3,6 +3,9 @@
 namespace Database\Seeders;
 
 use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Location;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 class ActionlogSeeder extends Seeder
@@ -10,9 +13,30 @@ class ActionlogSeeder extends Seeder
     public function run()
     {
         Actionlog::truncate();
-        Actionlog::factory()->count(300)->assetCheckoutToUser()->create();
-        Actionlog::factory()->count(100)->assetCheckoutToLocation()->create();
 
-        
+        if (! Asset::count()) {
+            $this->call(AssetSeeder::class);
+        }
+
+        if (! Location::count()) {
+            $this->call(LocationSeeder::class);
+        }
+
+        $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+
+        Actionlog::factory()
+            ->count(300)
+            ->assetCheckoutToUser()
+            ->create(['user_id' => $admin->id]);
+
+        Actionlog::factory()
+            ->count(100)
+            ->assetCheckoutToLocation()
+            ->create(['user_id' => $admin->id]);
+
+        Actionlog::factory()
+            ->count(20)
+            ->licenseCheckoutToUser()
+            ->create(['user_id' => $admin->id]);
     }
 }
diff --git a/database/seeders/AssetModelSeeder.php b/database/seeders/AssetModelSeeder.php
index 0652fbfb84..1fc0b28cd3 100755
--- a/database/seeders/AssetModelSeeder.php
+++ b/database/seeders/AssetModelSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\AssetModel;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
@@ -13,35 +14,37 @@ class AssetModelSeeder extends Seeder
     {
         AssetModel::truncate();
 
+        $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+
         // Laptops
-        AssetModel::factory()->count(1)->mbp13Model()->create(); // 1
-        AssetModel::factory()->count(1)->mbpAirModel()->create(); // 2
-        AssetModel::factory()->count(1)->surfaceModel()->create(); // 3
-        AssetModel::factory()->count(1)->xps13Model()->create(); // 4
-        AssetModel::factory()->count(1)->spectreModel()->create(); // 5
-        AssetModel::factory()->count(1)->zenbookModel()->create(); // 6
-        AssetModel::factory()->count(1)->yogaModel()->create(); // 7
+        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]);
 
         // Desktops
-        AssetModel::factory()->count(1)->macproModel()->create(); // 8
-        AssetModel::factory()->count(1)->lenovoI5Model()->create(); // 9
-        AssetModel::factory()->count(1)->optiplexModel()->create(); // 10
+        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]);
 
         // Conference Phones
-        AssetModel::factory()->count(1)->polycomModel()->create(); // 11
-        AssetModel::factory()->count(1)->polycomcxModel()->create(); // 12
+        AssetModel::factory()->count(1)->polycomModel()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->polycomcxModel()->create(['user_id' => $admin->id]);
 
         // Tablets
-        AssetModel::factory()->count(1)->ipadModel()->create(); // 13
-        AssetModel::factory()->count(1)->tab3Model()->create(); // 14
+        AssetModel::factory()->count(1)->ipadModel()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->tab3Model()->create(['user_id' => $admin->id]);
 
         // Phones
-        AssetModel::factory()->count(1)->iphone11Model()->create(); // 15
-        AssetModel::factory()->count(1)->iphone12Model()->create(); // 16
+        AssetModel::factory()->count(1)->iphone11Model()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->iphone12Model()->create(['user_id' => $admin->id]);
 
         // Displays
-        AssetModel::factory()->count(1)->ultrafine()->create(); // 17
-        AssetModel::factory()->count(1)->ultrasharp()->create(); // 18
+        AssetModel::factory()->count(1)->ultrafine()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->ultrasharp()->create(['user_id' => $admin->id]);
 
         $src = public_path('/img/demo/models/');
         $dst = 'models'.'/';
diff --git a/database/seeders/AssetSeeder.php b/database/seeders/AssetSeeder.php
index c5ea479a34..5fdc09bdb3 100644
--- a/database/seeders/AssetSeeder.php
+++ b/database/seeders/AssetSeeder.php
@@ -3,6 +3,10 @@
 namespace Database\Seeders;
 
 use App\Models\Asset;
+use App\Models\Location;
+use App\Models\Supplier;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Sequence;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -10,40 +14,47 @@ use Illuminate\Support\Facades\Storage;
 
 class AssetSeeder extends Seeder
 {
+    private $admin;
+    private $locationIds;
+    private $supplierIds;
+
     public function run()
     {
         Asset::truncate();
-        Asset::factory()->count(1000)->laptopMbp()->create();
-        Asset::factory()->count(50)->laptopMbpPending()->create();
-        Asset::factory()->count(50)->laptopMbpArchived()->create();
-        Asset::factory()->count(50)->laptopAir()->create();
-        Asset::factory()->count(5)->laptopSurface()->create();
-        Asset::factory()->count(5)->laptopXps()->create();
-        Asset::factory()->count(5)->laptopSpectre()->create();
-        Asset::factory()->count(5)->laptopZenbook()->create();
-        Asset::factory()->count(3)->laptopYoga()->create();
 
-        Asset::factory()->count(30)->desktopMacpro()->create();
-        Asset::factory()->count(30)->desktopLenovoI5()->create();
-        Asset::factory()->count(30)->desktopOptiplex()->create();
+        $this->ensureLocationsSeeded();
+        $this->ensureSuppliersSeeded();
 
-        Asset::factory()->count(5)->confPolycom()->create();
-        Asset::factory()->count(2)->confPolycomcx()->create();
+        $this->admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+        $this->locationIds = Location::all()->pluck('id');
+        $this->supplierIds = Supplier::all()->pluck('id');
 
-        Asset::factory()->count(12)->tabletIpad()->create();
-        Asset::factory()->count(4)->tabletTab3()->create();
-
-        Asset::factory()->count(27)->phoneIphone11()->create();
-        Asset::factory()->count(40)->phoneIphone12()->create();
-
-        Asset::factory()->count(10)->ultrafine()->create();
-        Asset::factory()->count(10)->ultrasharp()->create();
+        Asset::factory()->count(2000)->laptopMbp()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(50)->laptopMbpPending()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(50)->laptopMbpArchived()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(50)->laptopAir()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(50)->laptopSurface()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(5)->laptopXps()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(5)->laptopSpectre()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(50)->laptopZenbook()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(30)->laptopYoga()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(30)->desktopMacpro()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(30)->desktopLenovoI5()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(30)->desktopOptiplex()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(50)->confPolycom()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(20)->confPolycomcx()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(30)->tabletIpad()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(10)->tabletTab3()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(27)->phoneIphone11()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(40)->phoneIphone12()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(20)->ultrafine()->state(new Sequence($this->getState()))->create();
+        Asset::factory()->count(20)->ultrasharp()->state(new Sequence($this->getState()))->create();
 
         $del_files = Storage::files('assets');
         foreach ($del_files as $del_file) { // iterate files
-            Log::debug('Deleting: '.$del_files);
+            Log::debug('Deleting: ' . $del_files);
             try {
-                Storage::disk('public')->delete('assets'.'/'.$del_files);
+                Storage::disk('public')->delete('assets' . '/' . $del_files);
             } catch (\Exception $e) {
                 Log::debug($e);
             }
@@ -51,4 +62,27 @@ class AssetSeeder extends Seeder
 
         DB::table('checkout_requests')->truncate();
     }
+
+    private function ensureLocationsSeeded()
+    {
+        if (! Location::count()) {
+            $this->call(LocationSeeder::class);
+        }
+    }
+
+    private function ensureSuppliersSeeded()
+    {
+        if (! Supplier::count()) {
+            $this->call(SupplierSeeder::class);
+        }
+    }
+
+    private function getState()
+    {
+        return fn($sequence) => [
+            'rtd_location_id' => $this->locationIds->random(),
+            'supplier_id' => $this->supplierIds->random(),
+            'user_id' => $this->admin->id,
+        ];
+    }
 }
diff --git a/database/seeders/CategorySeeder.php b/database/seeders/CategorySeeder.php
index 6a554fc825..da542cff9e 100755
--- a/database/seeders/CategorySeeder.php
+++ b/database/seeders/CategorySeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\Category;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 class CategorySeeder extends Seeder
@@ -11,20 +12,22 @@ class CategorySeeder extends Seeder
     {
         Category::truncate();
 
-        Category::factory()->count(1)->assetLaptopCategory()->create(); // 1
-        Category::factory()->count(1)->assetDesktopCategory()->create(); // 2
-        Category::factory()->count(1)->assetTabletCategory()->create(); // 3
-        Category::factory()->count(1)->assetMobileCategory()->create(); // 4
-        Category::factory()->count(1)->assetDisplayCategory()->create(); // 5
-        Category::factory()->count(1)->assetVoipCategory()->create(); // 6
-        Category::factory()->count(1)->assetConferenceCategory()->create(); // 7
-        Category::factory()->count(1)->accessoryKeyboardCategory()->create(); // 8
-        Category::factory()->count(1)->accessoryMouseCategory()->create(); // 9
-        Category::factory()->count(1)->consumablePaperCategory()->create(); // 10
-        Category::factory()->count(1)->consumableInkCategory()->create(); // 11
-        Category::factory()->count(1)->componentHddCategory()->create(); // 12
-        Category::factory()->count(1)->componentRamCategory()->create(); // 13
-        Category::factory()->count(1)->licenseGraphicsCategory()->create(); // 14
-        Category::factory()->count(1)->licenseOfficeCategory()->create(); // 15
+        $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]);
     }
 }
diff --git a/database/seeders/ComponentSeeder.php b/database/seeders/ComponentSeeder.php
index 46380e1682..5a80243466 100644
--- a/database/seeders/ComponentSeeder.php
+++ b/database/seeders/ComponentSeeder.php
@@ -2,7 +2,9 @@
 
 namespace Database\Seeders;
 
+use App\Models\Company;
 use App\Models\Component;
+use App\Models\Location;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 
@@ -12,9 +14,34 @@ class ComponentSeeder extends Seeder
     {
         Component::truncate();
         DB::table('components_assets')->truncate();
-        Component::factory()->count(1)->ramCrucial4()->create(); // 1
-        Component::factory()->count(1)->ramCrucial8()->create(); // 1
-        Component::factory()->count(1)->ssdCrucial120()->create(); // 1
-        Component::factory()->count(1)->ssdCrucial240()->create(); // 1
+
+        if (! Company::count()) {
+            $this->call(CompanySeeder::class);
+        }
+
+        $companyIds = Company::all()->pluck('id');
+
+        if (! Location::count()) {
+            $this->call(LocationSeeder::class);
+        }
+
+        $locationIds = Location::all()->pluck('id');
+
+        Component::factory()->ramCrucial4()->create([
+            'company_id' => $companyIds->random(),
+            'location_id' => $locationIds->random(),
+        ]);
+        Component::factory()->ramCrucial8()->create([
+            'company_id' => $companyIds->random(),
+            'location_id' => $locationIds->random(),
+        ]);
+        Component::factory()->ssdCrucial120()->create([
+            'company_id' => $companyIds->random(),
+            'location_id' => $locationIds->random(),
+        ]);
+        Component::factory()->ssdCrucial240()->create([
+            'company_id' => $companyIds->random(),
+            'location_id' => $locationIds->random(),
+        ]);
     }
 }
diff --git a/database/seeders/ConsumableSeeder.php b/database/seeders/ConsumableSeeder.php
index 240741fe6d..42527e1df8 100644
--- a/database/seeders/ConsumableSeeder.php
+++ b/database/seeders/ConsumableSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\Consumable;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 
@@ -12,8 +13,11 @@ class ConsumableSeeder extends Seeder
     {
         Consumable::truncate();
         DB::table('consumables_users')->truncate();
-        Consumable::factory()->count(1)->cardstock()->create(); // 1
-        Consumable::factory()->count(1)->paper()->create(); // 2
-        Consumable::factory()->count(1)->ink()->create(); // 3
+
+        $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]);
     }
 }
diff --git a/database/seeders/CustomFieldSeeder.php b/database/seeders/CustomFieldSeeder.php
index 8776872644..551e05f40f 100644
--- a/database/seeders/CustomFieldSeeder.php
+++ b/database/seeders/CustomFieldSeeder.php
@@ -38,24 +38,34 @@ class CustomFieldSeeder extends Seeder
             [
                 'custom_field_id' => '1',
                 'custom_fieldset_id' => '1',
+                'order' => 0,
+                'required' => 0,
             ],
             [
                 'custom_field_id' => '2',
                 'custom_fieldset_id' => '1',
+                'order' => 0,
+                'required' => 0,
             ],
             [
-              'custom_field_id' => '3',
-              'custom_fieldset_id' => '2',
+                'custom_field_id' => '3',
+                'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
             ],
             [
-              'custom_field_id' => '4',
-              'custom_fieldset_id' => '2',
+                'custom_field_id' => '4',
+                'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
             ],
             [
-              'custom_field_id' => '5',
-              'custom_fieldset_id' => '2',
+                'custom_field_id' => '5',
+                'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
             ],
 
-      ]);
+        ]);
     }
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 54fb1e088b..1429604139 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -3,15 +3,6 @@
 namespace Database\Seeders;
 
 use App\Models\Setting;
-use Database\Seeders\AccessorySeeder;
-use Database\Seeders\ActionlogSeeder;
-use Database\Seeders\AssetModelSeeder;
-use Database\Seeders\AssetSeeder;
-use Database\Seeders\CategorySeeder;
-use Database\Seeders\CompanySeeder;
-use Database\Seeders\ComponentSeeder;
-use Database\Seeders\ConsumableSeeder;
-use Database\Seeders\CustomFieldSeeder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Artisan;
@@ -38,9 +29,9 @@ class DatabaseSeeder extends Seeder
         $this->call(CompanySeeder::class);
         $this->call(CategorySeeder::class);
         $this->call(LocationSeeder::class);
+        $this->call(DepartmentSeeder::class);
         $this->call(UserSeeder::class);
         $this->call(DepreciationSeeder::class);
-        $this->call(DepartmentSeeder::class);
         $this->call(ManufacturerSeeder::class);
         $this->call(SupplierSeeder::class);
         $this->call(AssetModelSeeder::class);
diff --git a/database/seeders/DepartmentSeeder.php b/database/seeders/DepartmentSeeder.php
index f82e355edd..7406b97afb 100644
--- a/database/seeders/DepartmentSeeder.php
+++ b/database/seeders/DepartmentSeeder.php
@@ -3,6 +3,8 @@
 namespace Database\Seeders;
 
 use App\Models\Department;
+use App\Models\Location;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 class DepartmentSeeder extends Seeder
@@ -10,11 +12,43 @@ class DepartmentSeeder extends Seeder
     public function run()
     {
         Department::truncate();
-        Department::factory()->count(1)->hr()->create(); // 1
-        Department::factory()->count(1)->engineering()->create(); // 2
-        Department::factory()->count(1)->marketing()->create(); // 3
-        Department::factory()->count(1)->client()->create(); // 4
-        Department::factory()->count(1)->product()->create(); // 5
-        Department::factory()->count(1)->silly()->create(); // 6
+
+        if (! Location::count()) {
+            $this->call(LocationSeeder::class);
+        }
+
+        $locationIds = Location::all()->pluck('id');
+
+        $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+
+        Department::factory()->count(1)->hr()->create([
+            'location_id' => $locationIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Department::factory()->count(1)->engineering()->create([
+            'location_id' => $locationIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Department::factory()->count(1)->marketing()->create([
+            'location_id' => $locationIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Department::factory()->count(1)->client()->create([
+            'location_id' => $locationIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Department::factory()->count(1)->product()->create([
+            'location_id' => $locationIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        Department::factory()->count(1)->silly()->create([
+            'location_id' => $locationIds->random(),
+            'user_id' => $admin->id,
+        ]);
     }
 }
diff --git a/database/seeders/DepreciationSeeder.php b/database/seeders/DepreciationSeeder.php
index 1dfebd3062..349d8aff53 100644
--- a/database/seeders/DepreciationSeeder.php
+++ b/database/seeders/DepreciationSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\Depreciation;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 class DepreciationSeeder extends Seeder
@@ -10,8 +11,11 @@ class DepreciationSeeder extends Seeder
     public function run()
     {
         Depreciation::truncate();
-        Depreciation::factory()->count(1)->computer()->create(); // 1
-        Depreciation::factory()->count(1)->display()->create(); // 2
-        Depreciation::factory()->count(1)->mobilePhones()->create(); // 3
+
+        $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]);
     }
 }
diff --git a/database/seeders/LicenseSeeder.php b/database/seeders/LicenseSeeder.php
index 843eeb42f1..4868dd41e1 100644
--- a/database/seeders/LicenseSeeder.php
+++ b/database/seeders/LicenseSeeder.php
@@ -2,8 +2,11 @@
 
 namespace Database\Seeders;
 
+use App\Models\Category;
 use App\Models\License;
 use App\Models\LicenseSeat;
+use App\Models\Supplier;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 class LicenseSeeder extends Seeder
@@ -12,9 +15,43 @@ class LicenseSeeder extends Seeder
     {
         License::truncate();
         LicenseSeat::truncate();
-        License::factory()->count(1)->photoshop()->create();
-        License::factory()->count(1)->acrobat()->create();
-        License::factory()->count(1)->indesign()->create();
-        License::factory()->count(1)->office()->create();
+
+        if (! Category::count()) {
+            $this->call(CategorySeeder::class);
+        }
+
+        $categoryIds = Category::all()->pluck('id');
+
+        if (! Supplier::count()) {
+            $this->call(SupplierSeeder::class);
+        }
+
+        $supplierIds = Supplier::all()->pluck('id');
+
+        $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+
+        License::factory()->count(1)->photoshop()->create([
+            'category_id' => $categoryIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        License::factory()->count(1)->acrobat()->create([
+            'category_id' => $categoryIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        License::factory()->count(1)->indesign()->create([
+            'category_id' => $categoryIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
+
+        License::factory()->count(1)->office()->create([
+            'category_id' => $categoryIds->random(),
+            'supplier_id' => $supplierIds->random(),
+            'user_id' => $admin->id,
+        ]);
     }
 }
diff --git a/database/seeders/ManufacturerSeeder.php b/database/seeders/ManufacturerSeeder.php
index fc6a3c34e9..cbd70f4c3d 100644
--- a/database/seeders/ManufacturerSeeder.php
+++ b/database/seeders/ManufacturerSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\Manufacturer;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
@@ -12,17 +13,20 @@ class ManufacturerSeeder extends Seeder
     public function run()
     {
         Manufacturer::truncate();
-        Manufacturer::factory()->count(1)->apple()->create(); // 1
-        Manufacturer::factory()->count(1)->microsoft()->create(); // 2
-        Manufacturer::factory()->count(1)->dell()->create(); // 3
-        Manufacturer::factory()->count(1)->asus()->create(); // 4
-        Manufacturer::factory()->count(1)->hp()->create(); // 5
-        Manufacturer::factory()->count(1)->lenovo()->create(); // 6
-        Manufacturer::factory()->count(1)->lg()->create(); // 7
-        Manufacturer::factory()->count(1)->polycom()->create(); // 8
-        Manufacturer::factory()->count(1)->adobe()->create(); // 9
-        Manufacturer::factory()->count(1)->avery()->create(); // 10
-        Manufacturer::factory()->count(1)->crucial()->create(); // 10
+
+        $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]);
 
         $src = public_path('/img/demo/manufacturers/');
         $dst = 'manufacturers'.'/';
diff --git a/database/seeders/StatuslabelSeeder.php b/database/seeders/StatuslabelSeeder.php
index 94cd2140ae..fbc6a9fb66 100755
--- a/database/seeders/StatuslabelSeeder.php
+++ b/database/seeders/StatuslabelSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\Statuslabel;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 class StatuslabelSeeder extends Seeder
@@ -10,12 +11,27 @@ class StatuslabelSeeder extends Seeder
     public function run()
     {
         Statuslabel::truncate();
-        Statuslabel::factory()->rtd()->create(['name' => 'Ready to Deploy']);
-        Statuslabel::factory()->pending()->create(['name' => 'Pending']);
-        Statuslabel::factory()->archived()->create(['name' => 'Archived']);
-        Statuslabel::factory()->outForDiagnostics()->create();
-        Statuslabel::factory()->outForRepair()->create();
-        Statuslabel::factory()->broken()->create();
-        Statuslabel::factory()->lost()->create();
+
+        $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+
+        Statuslabel::factory()->rtd()->create([
+            'name' => 'Ready to Deploy',
+            'user_id' => $admin->id,
+        ]);
+
+        Statuslabel::factory()->pending()->create([
+            'name' => 'Pending',
+            'user_id' => $admin->id,
+        ]);
+
+        Statuslabel::factory()->archived()->create([
+            'name' => 'Archived',
+            'user_id' => $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]);
     }
 }
diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php
index 04f46e29b4..9c237b169e 100644
--- a/database/seeders/UserSeeder.php
+++ b/database/seeders/UserSeeder.php
@@ -2,7 +2,10 @@
 
 namespace Database\Seeders;
 
+use App\Models\Company;
+use App\Models\Department;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Sequence;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
@@ -17,11 +20,60 @@ class UserSeeder extends Seeder
     public function run()
     {
         User::truncate();
-        User::factory()->count(1)->firstAdmin()->create();
-        User::factory()->count(1)->snipeAdmin()->create();
-        User::factory()->count(3)->superuser()->create();
-        User::factory()->count(3)->admin()->create();
-        User::factory()->count(50)->viewAssets()->create();
+
+        if (! Company::count()) {
+            $this->call(CompanySeeder::class);
+        }
+
+        $companyIds = Company::all()->pluck('id');
+
+        if (! Department::count()) {
+            $this->call(DepartmentSeeder::class);
+        }
+
+        $departmentIds = Department::all()->pluck('id');
+
+        User::factory()->count(1)->firstAdmin()
+            ->state(new Sequence(fn($sequence) => [
+                'company_id' => $companyIds->random(),
+                'department_id' => $departmentIds->random(),
+            ]))
+            ->create();
+
+        User::factory()->count(1)->snipeAdmin()
+            ->state(new Sequence(fn($sequence) => [
+                'company_id' => $companyIds->random(),
+                'department_id' => $departmentIds->random(),
+            ]))
+            ->create();
+
+        User::factory()->count(1)->testAdmin()
+            ->state(new Sequence(fn($sequence) => [
+                'company_id' => $companyIds->random(),
+                'department_id' => $departmentIds->random(),
+            ]))
+            ->create();
+
+        User::factory()->count(3)->superuser()
+            ->state(new Sequence(fn($sequence) => [
+                'company_id' => $companyIds->random(),
+                'department_id' => $departmentIds->random(),
+            ]))
+            ->create();
+
+        User::factory()->count(3)->admin()
+            ->state(new Sequence(fn($sequence) => [
+                'company_id' => $companyIds->random(),
+                'department_id' => $departmentIds->random(),
+            ]))
+            ->create();
+
+        User::factory()->count(50)->viewAssets()
+            ->state(new Sequence(fn($sequence) => [
+                'company_id' => $companyIds->random(),
+                'department_id' => $departmentIds->random(),
+            ]))
+            ->create();
 
         $src = public_path('/img/demo/avatars/');
         $dst = 'avatars'.'/';
diff --git a/package-lock.json b/package-lock.json
index b03e7eb62c..a27782777e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1329,9 +1329,9 @@
             "dev": true
         },
         "@fortawesome/fontawesome-free": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
-            "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A=="
+            "version": "6.4.0",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz",
+            "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ=="
         },
         "@jridgewell/gen-mapping": {
             "version": "0.1.1",
@@ -1346,26 +1346,43 @@
         "@jridgewell/resolve-uri": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-            "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
-            "dev": true
+            "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="
         },
         "@jridgewell/set-array": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-            "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
-            "dev": true
+            "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="
+        },
+        "@jridgewell/source-map": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+            "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "dependencies": {
+                "@jridgewell/gen-mapping": {
+                    "version": "0.3.3",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+                    "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+                    "requires": {
+                        "@jridgewell/set-array": "^1.0.1",
+                        "@jridgewell/sourcemap-codec": "^1.4.10",
+                        "@jridgewell/trace-mapping": "^0.3.9"
+                    }
+                }
+            }
         },
         "@jridgewell/sourcemap-codec": {
             "version": "1.4.13",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-            "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
-            "dev": true
+            "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
         },
         "@jridgewell/trace-mapping": {
             "version": "0.3.13",
             "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
             "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
-            "dev": true,
             "requires": {
                 "@jridgewell/resolve-uri": "^3.0.3",
                 "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -1405,6 +1422,21 @@
             "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
             "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
         },
+        "@swc/helpers": {
+            "version": "0.3.17",
+            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.17.tgz",
+            "integrity": "sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==",
+            "requires": {
+                "tslib": "^2.4.0"
+            },
+            "dependencies": {
+                "tslib": {
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+                    "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+                }
+            }
+        },
         "@szmarczak/http-timer": {
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
@@ -1533,9 +1565,9 @@
             }
         },
         "@types/eslint": {
-            "version": "8.4.5",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
-            "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+            "version": "8.44.0",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.0.tgz",
+            "integrity": "sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==",
             "requires": {
                 "@types/estree": "*",
                 "@types/json-schema": "*"
@@ -1551,9 +1583,9 @@
             }
         },
         "@types/estree": {
-            "version": "0.0.51",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-            "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+            "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
         },
         "@types/express": {
             "version": "4.17.13",
@@ -1852,133 +1884,133 @@
             }
         },
         "@webassemblyjs/ast": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-            "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+            "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
             "requires": {
-                "@webassemblyjs/helper-numbers": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+                "@webassemblyjs/helper-numbers": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
             }
         },
         "@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-            "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+            "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
         },
         "@webassemblyjs/helper-api-error": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-            "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+            "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
         },
         "@webassemblyjs/helper-buffer": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-            "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+            "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
         },
         "@webassemblyjs/helper-numbers": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-            "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+            "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
             "requires": {
-                "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-                "@webassemblyjs/helper-api-error": "1.11.1",
+                "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+                "@webassemblyjs/helper-api-error": "1.11.6",
                 "@xtuc/long": "4.2.2"
             }
         },
         "@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-            "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+            "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
         },
         "@webassemblyjs/helper-wasm-section": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-            "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+            "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
             "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1"
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6"
             }
         },
         "@webassemblyjs/ieee754": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-            "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+            "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
             "requires": {
                 "@xtuc/ieee754": "^1.2.0"
             }
         },
         "@webassemblyjs/leb128": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-            "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+            "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
             "requires": {
                 "@xtuc/long": "4.2.2"
             }
         },
         "@webassemblyjs/utf8": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-            "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+            "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
         },
         "@webassemblyjs/wasm-edit": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-            "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+            "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
             "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/helper-wasm-section": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1",
-                "@webassemblyjs/wasm-opt": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1",
-                "@webassemblyjs/wast-printer": "1.11.1"
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/helper-wasm-section": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6",
+                "@webassemblyjs/wasm-opt": "1.11.6",
+                "@webassemblyjs/wasm-parser": "1.11.6",
+                "@webassemblyjs/wast-printer": "1.11.6"
             }
         },
         "@webassemblyjs/wasm-gen": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-            "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+            "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
             "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/ieee754": "1.11.1",
-                "@webassemblyjs/leb128": "1.11.1",
-                "@webassemblyjs/utf8": "1.11.1"
+                "@webassemblyjs/ast": "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/wasm-opt": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-            "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+            "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
             "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1"
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6",
+                "@webassemblyjs/wasm-parser": "1.11.6"
             }
         },
         "@webassemblyjs/wasm-parser": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-            "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+            "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
             "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-api-error": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/ieee754": "1.11.1",
-                "@webassemblyjs/leb128": "1.11.1",
-                "@webassemblyjs/utf8": "1.11.1"
+                "@webassemblyjs/ast": "1.11.6",
+                "@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/wast-printer": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-            "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+            "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
             "requires": {
-                "@webassemblyjs/ast": "1.11.1",
+                "@webassemblyjs/ast": "1.11.6",
                 "@xtuc/long": "4.2.2"
             }
         },
@@ -2033,14 +2065,14 @@
             }
         },
         "acorn": {
-            "version": "8.8.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-            "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
         },
         "acorn-import-assertions": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-            "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+            "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="
         },
         "acorn-node": {
             "version": "1.8.2",
@@ -2155,12 +2187,6 @@
             "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
             "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
         },
-        "amdefine": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-            "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-            "optional": true
-        },
         "ansi-html-community": {
             "version": "0.0.8",
             "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -2200,11 +2226,6 @@
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
-        "array-from": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-            "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU="
-        },
         "array-union": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
@@ -2252,58 +2273,6 @@
                 }
             }
         },
-        "ast-transform": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
-            "integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=",
-            "requires": {
-                "escodegen": "~1.2.0",
-                "esprima": "~1.0.4",
-                "through": "~2.3.4"
-            },
-            "dependencies": {
-                "escodegen": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
-                    "integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=",
-                    "requires": {
-                        "esprima": "~1.0.4",
-                        "estraverse": "~1.5.0",
-                        "esutils": "~1.0.0",
-                        "source-map": "~0.1.30"
-                    }
-                },
-                "esprima": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-                    "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0="
-                },
-                "estraverse": {
-                    "version": "1.5.1",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-                    "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E="
-                },
-                "esutils": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
-                    "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA="
-                },
-                "source-map": {
-                    "version": "0.1.43",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-                    "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-                    "optional": true,
-                    "requires": {
-                        "amdefine": ">=0.0.4"
-                    }
-                }
-            }
-        },
-        "ast-types": {
-            "version": "0.7.8",
-            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
-            "integrity": "sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk="
-        },
         "asynckit": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2973,6 +2942,7 @@
             "version": "6.26.0",
             "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
             "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+            "dev": true,
             "requires": {
                 "core-js": "^2.4.0",
                 "regenerator-runtime": "^0.11.0"
@@ -3157,11 +3127,11 @@
             }
         },
         "bootstrap-datepicker": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz",
-            "integrity": "sha1-5L/OP8zhlnh2sh3Ggz7FmUqu0JA=",
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz",
+            "integrity": "sha512-lWxtSYddAQOpbAO8UhYhHLcK6425eWoSjb5JDvZU3ePHEPF6A3eUr51WKaFy4PccU19JRxUG6wEU3KdhtKfvpg==",
             "requires": {
-                "jquery": ">=1.7.1 <4.0.0"
+                "jquery": ">=3.4.0 <4.0.0"
             }
         },
         "bootstrap-daterangepicker": {
@@ -3184,9 +3154,9 @@
             "integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
         },
         "bootstrap-table": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.20.2.tgz",
-            "integrity": "sha512-6j9zfjjK6VZyJj8KsH+LnGczqglmMvMctGAoEAKDvrQ92ExQbA3mHGYPQr9iPrzoyeGL8+6Dyx6LqJbWmWmBoA=="
+            "version": "1.22.0",
+            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.22.0.tgz",
+            "integrity": "sha512-N1MLgPcIOa9cfwr7CaoLOekKJ9nHq/z8lk6LsC3mLUZq77VeMC/vTh+EqN7+iT8JADmoAsX7RqQbYfVxF9ZCig=="
         },
         "brace-expansion": {
             "version": "1.1.11",
@@ -3205,26 +3175,15 @@
                 "fill-range": "^7.0.1"
             }
         },
-        "brfs": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brfs/-/brfs-2.0.2.tgz",
-            "integrity": "sha512-IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ==",
-            "requires": {
-                "quote-stream": "^1.0.1",
-                "resolve": "^1.1.5",
-                "static-module": "^3.0.2",
-                "through2": "^2.0.0"
-            }
-        },
         "brorand": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
             "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
         },
         "brotli": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
-            "integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+            "integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
             "requires": {
                 "base64-js": "^1.1.2"
             }
@@ -3396,31 +3355,6 @@
                 "safe-buffer": "^5.1.2"
             }
         },
-        "browserify-optional": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
-            "integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=",
-            "requires": {
-                "ast-transform": "0.0.0",
-                "ast-types": "^0.7.0",
-                "browser-resolve": "^1.8.1"
-            },
-            "dependencies": {
-                "browser-resolve": {
-                    "version": "1.11.3",
-                    "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-                    "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-                    "requires": {
-                        "resolve": "1.1.7"
-                    }
-                },
-                "resolve": {
-                    "version": "1.1.7",
-                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-                    "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-                }
-            }
-        },
         "browserify-rsa": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
@@ -3505,11 +3439,6 @@
                 "ieee754": "^1.1.4"
             }
         },
-        "buffer-equal": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
-            "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs="
-        },
         "buffer-from": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -3626,15 +3555,15 @@
             },
             "dependencies": {
                 "core-js": {
-                    "version": "3.22.5",
-                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
-                    "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==",
+                    "version": "3.29.1",
+                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz",
+                    "integrity": "sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==",
                     "optional": true
                 },
                 "regenerator-runtime": {
-                    "version": "0.13.9",
-                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-                    "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+                    "version": "0.13.11",
+                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+                    "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
                     "optional": true
                 }
             }
@@ -3950,46 +3879,6 @@
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
             "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
         },
-        "concat-stream": {
-            "version": "1.6.2",
-            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-            "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.2.2",
-                "typedarray": "^0.0.6"
-            },
-            "dependencies": {
-                "process-nextick-args": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-                    "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-                },
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
-            }
-        },
         "connect-history-api-fallback": {
             "version": "1.6.0",
             "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
@@ -4048,6 +3937,7 @@
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
             "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+            "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.1"
             }
@@ -4075,7 +3965,8 @@
         "core-js": {
             "version": "2.6.12",
             "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-            "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+            "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+            "dev": true
         },
         "core-js-compat": {
             "version": "3.23.2",
@@ -4406,15 +4297,6 @@
                 "css-tree": "^1.1.2"
             }
         },
-        "d": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-            "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-            "requires": {
-                "es5-ext": "^0.10.50",
-                "type": "^1.0.1"
-            }
-        },
         "dash-ast": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
@@ -4468,23 +4350,127 @@
             }
         },
         "deep-equal": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-            "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz",
+            "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==",
             "requires": {
-                "is-arguments": "^1.0.4",
-                "is-date-object": "^1.0.1",
-                "is-regex": "^1.0.4",
-                "object-is": "^1.0.1",
+                "call-bind": "^1.0.2",
+                "es-get-iterator": "^1.1.2",
+                "get-intrinsic": "^1.1.3",
+                "is-arguments": "^1.1.1",
+                "is-array-buffer": "^3.0.1",
+                "is-date-object": "^1.0.5",
+                "is-regex": "^1.1.4",
+                "is-shared-array-buffer": "^1.0.2",
+                "isarray": "^2.0.5",
+                "object-is": "^1.1.5",
                 "object-keys": "^1.1.1",
-                "regexp.prototype.flags": "^1.2.0"
+                "object.assign": "^4.1.4",
+                "regexp.prototype.flags": "^1.4.3",
+                "side-channel": "^1.0.4",
+                "which-boxed-primitive": "^1.0.2",
+                "which-collection": "^1.0.1",
+                "which-typed-array": "^1.1.9"
+            },
+            "dependencies": {
+                "available-typed-arrays": {
+                    "version": "1.0.5",
+                    "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+                    "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
+                },
+                "define-properties": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+                    "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+                    "requires": {
+                        "has-property-descriptors": "^1.0.0",
+                        "object-keys": "^1.1.1"
+                    }
+                },
+                "get-intrinsic": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+                    "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+                    "requires": {
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.3"
+                    }
+                },
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+                },
+                "is-arguments": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+                    "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+                    "requires": {
+                        "call-bind": "^1.0.2",
+                        "has-tostringtag": "^1.0.0"
+                    }
+                },
+                "is-date-object": {
+                    "version": "1.0.5",
+                    "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+                    "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+                    "requires": {
+                        "has-tostringtag": "^1.0.0"
+                    }
+                },
+                "is-regex": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+                    "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+                    "requires": {
+                        "call-bind": "^1.0.2",
+                        "has-tostringtag": "^1.0.0"
+                    }
+                },
+                "is-typed-array": {
+                    "version": "1.1.10",
+                    "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+                    "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+                    "requires": {
+                        "available-typed-arrays": "^1.0.5",
+                        "call-bind": "^1.0.2",
+                        "for-each": "^0.3.3",
+                        "gopd": "^1.0.1",
+                        "has-tostringtag": "^1.0.0"
+                    }
+                },
+                "isarray": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+                    "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+                },
+                "object.assign": {
+                    "version": "4.1.4",
+                    "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+                    "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+                    "requires": {
+                        "call-bind": "^1.0.2",
+                        "define-properties": "^1.1.4",
+                        "has-symbols": "^1.0.3",
+                        "object-keys": "^1.1.1"
+                    }
+                },
+                "which-typed-array": {
+                    "version": "1.1.9",
+                    "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+                    "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+                    "requires": {
+                        "available-typed-arrays": "^1.0.5",
+                        "call-bind": "^1.0.2",
+                        "for-each": "^0.3.3",
+                        "gopd": "^1.0.1",
+                        "has-tostringtag": "^1.0.0",
+                        "is-typed-array": "^1.1.10"
+                    }
+                }
             }
         },
-        "deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-        },
         "default-gateway": {
             "version": "6.0.3",
             "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
@@ -4659,9 +4645,9 @@
             }
         },
         "dompurify": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.7.tgz",
-            "integrity": "sha512-fsVZLywBd3awZIG3qU4JEdw7DCb0uUCajTfWRrLhsgKjTBd5CIIluPoAkNfco05GuNYQGj4/+bQIhlq96eT9eQ==",
+            "version": "2.4.5",
+            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.5.tgz",
+            "integrity": "sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==",
             "optional": true
         },
         "domutils": {
@@ -4768,9 +4754,9 @@
             }
         },
         "enhanced-resolve": {
-            "version": "5.10.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-            "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+            "version": "5.15.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+            "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
             "requires": {
                 "graceful-fs": "^4.2.4",
                 "tapable": "^2.2.0"
@@ -4827,10 +4813,57 @@
                 "string.prototype.trimstart": "^1.0.3"
             }
         },
+        "es-get-iterator": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+            "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+            "requires": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.1.3",
+                "has-symbols": "^1.0.3",
+                "is-arguments": "^1.1.1",
+                "is-map": "^2.0.2",
+                "is-set": "^2.0.2",
+                "is-string": "^1.0.7",
+                "isarray": "^2.0.5",
+                "stop-iteration-iterator": "^1.0.0"
+            },
+            "dependencies": {
+                "get-intrinsic": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+                    "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+                    "requires": {
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.3"
+                    }
+                },
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+                },
+                "is-arguments": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+                    "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+                    "requires": {
+                        "call-bind": "^1.0.2",
+                        "has-tostringtag": "^1.0.0"
+                    }
+                },
+                "isarray": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+                    "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+                }
+            }
+        },
         "es-module-lexer": {
-            "version": "0.9.3",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-            "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+            "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
         },
         "es-to-primitive": {
             "version": "1.2.1",
@@ -4842,71 +4875,6 @@
                 "is-symbol": "^1.0.2"
             }
         },
-        "es5-ext": {
-            "version": "0.10.61",
-            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
-            "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==",
-            "requires": {
-                "es6-iterator": "^2.0.3",
-                "es6-symbol": "^3.1.3",
-                "next-tick": "^1.1.0"
-            }
-        },
-        "es6-iterator": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-            "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-            "requires": {
-                "d": "1",
-                "es5-ext": "^0.10.35",
-                "es6-symbol": "^3.1.1"
-            }
-        },
-        "es6-map": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-            "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-            "requires": {
-                "d": "1",
-                "es5-ext": "~0.10.14",
-                "es6-iterator": "~2.0.1",
-                "es6-set": "~0.1.5",
-                "es6-symbol": "~3.1.1",
-                "event-emitter": "~0.3.5"
-            }
-        },
-        "es6-set": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-            "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-            "requires": {
-                "d": "1",
-                "es5-ext": "~0.10.14",
-                "es6-iterator": "~2.0.1",
-                "es6-symbol": "3.1.1",
-                "event-emitter": "~0.3.5"
-            },
-            "dependencies": {
-                "es6-symbol": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-                    "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-                    "requires": {
-                        "d": "1",
-                        "es5-ext": "~0.10.14"
-                    }
-                }
-            }
-        },
-        "es6-symbol": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-            "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-            "requires": {
-                "d": "^1.0.1",
-                "ext": "^1.1.2"
-            }
-        },
         "escalade": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -4924,26 +4892,6 @@
             "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
             "dev": true
         },
-        "escodegen": {
-            "version": "1.14.3",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-            "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-            "requires": {
-                "esprima": "^4.0.1",
-                "estraverse": "^4.2.0",
-                "esutils": "^2.0.2",
-                "optionator": "^0.8.1",
-                "source-map": "~0.6.1"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "optional": true
-                }
-            }
-        },
         "eslint-scope": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -4953,11 +4901,6 @@
                 "estraverse": "^4.1.1"
             }
         },
-        "esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        },
         "esrecurse": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -4978,15 +4921,11 @@
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
             "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
         },
-        "estree-is-function": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/estree-is-function/-/estree-is-function-1.0.0.tgz",
-            "integrity": "sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA=="
-        },
         "esutils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q="
+            "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=",
+            "dev": true
         },
         "etag": {
             "version": "1.8.1",
@@ -4999,15 +4938,6 @@
             "resolved": "https://registry.npmjs.org/eve-raphael/-/eve-raphael-0.5.0.tgz",
             "integrity": "sha1-F8dUt5K+7z+maE15z1pHxjxM2jA="
         },
-        "event-emitter": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-            "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-            "requires": {
-                "d": "1",
-                "es5-ext": "~0.10.14"
-            }
-        },
         "eventemitter3": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -5106,21 +5036,6 @@
                 }
             }
         },
-        "ext": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-            "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
-            "requires": {
-                "type": "^2.5.0"
-            },
-            "dependencies": {
-                "type": {
-                    "version": "2.6.0",
-                    "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
-                    "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ=="
-                }
-            }
-        },
         "fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5143,11 +5058,6 @@
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM="
         },
-        "fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-        },
         "fast-safe-stringify": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
@@ -5313,42 +5223,27 @@
             "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
         },
         "fontkit": {
-            "version": "1.8.1",
-            "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.1.tgz",
-            "integrity": "sha512-BsNCjDoYRxmNWFdAuK1y9bQt+igIxGtTC9u/jSFjR9MKhmI00rP1fwSvERt+5ddE82544l0XH5mzXozQVUy2Tw==",
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.9.0.tgz",
+            "integrity": "sha512-HkW/8Lrk8jl18kzQHvAw9aTHe1cqsyx5sDnxncx652+CIfhawokEPkeM3BoIC+z/Xv7a0yMr0f3pRRwhGH455g==",
             "requires": {
-                "babel-runtime": "^6.26.0",
-                "brfs": "^2.0.0",
-                "brotli": "^1.2.0",
-                "browserify-optional": "^1.0.1",
-                "clone": "^1.0.4",
-                "deep-equal": "^1.0.0",
+                "@swc/helpers": "^0.3.13",
+                "brotli": "^1.3.2",
+                "clone": "^2.1.2",
+                "deep-equal": "^2.0.5",
                 "dfa": "^1.2.0",
-                "restructure": "^0.5.3",
-                "tiny-inflate": "^1.0.2",
-                "unicode-properties": "^1.2.2",
-                "unicode-trie": "^0.3.0"
-            },
-            "dependencies": {
-                "clone": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-                    "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-                },
-                "pako": {
-                    "version": "0.2.9",
-                    "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-                    "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
-                },
-                "unicode-trie": {
-                    "version": "0.3.1",
-                    "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
-                    "integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
-                    "requires": {
-                        "pako": "^0.2.5",
-                        "tiny-inflate": "^1.0.0"
-                    }
-                }
+                "restructure": "^2.0.1",
+                "tiny-inflate": "^1.0.3",
+                "unicode-properties": "^1.3.1",
+                "unicode-trie": "^2.0.0"
+            }
+        },
+        "for-each": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+            "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+            "requires": {
+                "is-callable": "^1.1.3"
             }
         },
         "foreach": {
@@ -14872,6 +14767,11 @@
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
             "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
         },
+        "functions-have-names": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+        },
         "gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -14959,6 +14859,31 @@
                 }
             }
         },
+        "gopd": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+            "requires": {
+                "get-intrinsic": "^1.1.3"
+            },
+            "dependencies": {
+                "get-intrinsic": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+                    "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+                    "requires": {
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.3"
+                    }
+                },
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+                }
+            }
+        },
         "got": {
             "version": "11.8.5",
             "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
@@ -15011,17 +14936,45 @@
                 "ansi-regex": "^2.0.0"
             }
         },
+        "has-bigints": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+            "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
+        },
         "has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
             "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
             "dev": true
         },
+        "has-property-descriptors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "requires": {
+                "get-intrinsic": "^1.1.1"
+            }
+        },
         "has-symbols": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
             "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg="
         },
+        "has-tostringtag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+            "requires": {
+                "has-symbols": "^1.0.2"
+            },
+            "dependencies": {
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+                }
+            }
+        },
         "hash-base": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -15316,11 +15269,6 @@
             "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
             "dev": true
         },
-        "icheck": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/icheck/-/icheck-1.0.2.tgz",
-            "integrity": "sha1-BtCNo9R65EjBU7Jjm4bprX/fcSg="
-        },
         "iconv-lite": {
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -15513,6 +15461,33 @@
                 }
             }
         },
+        "internal-slot": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+            "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+            "requires": {
+                "get-intrinsic": "^1.2.0",
+                "has": "^1.0.3",
+                "side-channel": "^1.0.4"
+            },
+            "dependencies": {
+                "get-intrinsic": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+                    "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+                    "requires": {
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.3"
+                    }
+                },
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+                }
+            }
+        },
         "interpret": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
@@ -15552,12 +15527,64 @@
                 "call-bind": "^1.0.0"
             }
         },
+        "is-array-buffer": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+            "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+            "requires": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.2.0",
+                "is-typed-array": "^1.1.10"
+            },
+            "dependencies": {
+                "available-typed-arrays": {
+                    "version": "1.0.5",
+                    "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+                    "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
+                },
+                "get-intrinsic": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+                    "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+                    "requires": {
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.3"
+                    }
+                },
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+                },
+                "is-typed-array": {
+                    "version": "1.1.10",
+                    "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+                    "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+                    "requires": {
+                        "available-typed-arrays": "^1.0.5",
+                        "call-bind": "^1.0.2",
+                        "for-each": "^0.3.3",
+                        "gopd": "^1.0.1",
+                        "has-tostringtag": "^1.0.0"
+                    }
+                }
+            }
+        },
         "is-arrayish": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
             "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
             "dev": true
         },
+        "is-bigint": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+            "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+            "requires": {
+                "has-bigints": "^1.0.1"
+            }
+        },
         "is-binary-path": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -15567,6 +15594,15 @@
                 "binary-extensions": "^2.0.0"
             }
         },
+        "is-boolean-object": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+            "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+            "requires": {
+                "call-bind": "^1.0.2",
+                "has-tostringtag": "^1.0.0"
+            }
+        },
         "is-buffer": {
             "version": "1.1.6",
             "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -15620,6 +15656,11 @@
                 "is-extglob": "^2.1.1"
             }
         },
+        "is-map": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+            "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="
+        },
         "is-negative-zero": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
@@ -15630,6 +15671,14 @@
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
         },
+        "is-number-object": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+            "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+            "requires": {
+                "has-tostringtag": "^1.0.0"
+            }
+        },
         "is-plain-obj": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
@@ -15654,12 +15703,33 @@
                 "has-symbols": "^1.0.1"
             }
         },
+        "is-set": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+            "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="
+        },
+        "is-shared-array-buffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+            "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+            "requires": {
+                "call-bind": "^1.0.2"
+            }
+        },
         "is-stream": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
             "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
             "dev": true
         },
+        "is-string": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+            "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+            "requires": {
+                "has-tostringtag": "^1.0.0"
+            }
+        },
         "is-symbol": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -15680,6 +15750,20 @@
                 "has-symbols": "^1.0.1"
             }
         },
+        "is-weakmap": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+            "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="
+        },
+        "is-weakset": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+            "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+            "requires": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.1.1"
+            }
+        },
         "is-what": {
             "version": "3.14.1",
             "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
@@ -15855,9 +15939,9 @@
             },
             "dependencies": {
                 "core-js": {
-                    "version": "3.22.5",
-                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
-                    "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==",
+                    "version": "3.29.1",
+                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz",
+                    "integrity": "sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==",
                     "optional": true
                 }
             }
@@ -16276,15 +16360,6 @@
                 }
             }
         },
-        "levn": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-            "requires": {
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2"
-            }
-        },
         "lilconfig": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
@@ -16292,19 +16367,18 @@
             "dev": true
         },
         "linebreak": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/linebreak/-/linebreak-1.0.2.tgz",
-            "integrity": "sha512-bJwSRsJeAmaZYnkcwl5sCQNfSDAhBuXxb6L27tb+qkBRtUQSSTUa5bcgCPD6hFEkRNlpWHfK7nFMmcANU7ZP1w==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz",
+            "integrity": "sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==",
             "requires": {
                 "base64-js": "0.0.8",
-                "brfs": "^2.0.2",
-                "unicode-trie": "^1.0.0"
+                "unicode-trie": "^2.0.0"
             },
             "dependencies": {
                 "base64-js": {
                     "version": "0.0.8",
                     "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-                    "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg="
+                    "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw=="
                 }
             }
         },
@@ -16411,14 +16485,6 @@
                 "yallist": "^4.0.0"
             }
         },
-        "magic-string": {
-            "version": "0.25.1",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
-            "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
-            "requires": {
-                "sourcemap-codec": "^1.4.1"
-            }
-        },
         "md5": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
@@ -16756,11 +16822,6 @@
             "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
         },
-        "next-tick": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
-        },
         "no-case": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -17081,19 +17142,6 @@
                 "is-wsl": "^2.2.0"
             }
         },
-        "optionator": {
-            "version": "0.8.3",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-            "requires": {
-                "deep-is": "~0.1.3",
-                "fast-levenshtein": "~2.0.6",
-                "levn": "~0.3.0",
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2",
-                "word-wrap": "~1.2.3"
-            }
-        },
         "os-browserify": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -17329,7 +17377,7 @@
         "performance-now": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+            "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
             "optional": true
         },
         "picocolors": {
@@ -18002,11 +18050,6 @@
             "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
             "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
         },
-        "prelude-ls": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-        },
         "prettier": {
             "version": "1.19.1",
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
@@ -18129,16 +18172,6 @@
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
             "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
         },
-        "quote-stream": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
-            "integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
-            "requires": {
-                "buffer-equal": "0.0.1",
-                "minimist": "^1.1.3",
-                "through2": "^2.0.0"
-            }
-        },
         "raf": {
             "version": "3.4.1",
             "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
@@ -18289,7 +18322,8 @@
         "regenerator-runtime": {
             "version": "0.11.1",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-            "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
+            "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=",
+            "dev": true
         },
         "regenerator-transform": {
             "version": "0.10.1",
@@ -18303,12 +18337,13 @@
             }
         },
         "regexp.prototype.flags": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-            "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+            "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
             "requires": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
+                "define-properties": "^1.1.3",
+                "functions-have-names": "^1.2.2"
             }
         },
         "regexpu-core": {
@@ -18421,12 +18456,9 @@
             }
         },
         "restructure": {
-            "version": "0.5.4",
-            "resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz",
-            "integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=",
-            "requires": {
-                "browserify-optional": "^1.0.0"
-            }
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz",
+            "integrity": "sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg=="
         },
         "retry": {
             "version": "0.13.1",
@@ -18442,7 +18474,7 @@
         "rgbcolor": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
-            "integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0=",
+            "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
             "optional": true
         },
         "rimraf": {
@@ -18496,27 +18528,6 @@
                 "ajv-keywords": "^3.5.2"
             }
         },
-        "scope-analyzer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/scope-analyzer/-/scope-analyzer-2.1.2.tgz",
-            "integrity": "sha512-5cfCmsTYV/wPaRIItNxatw02ua/MThdIUNnUOCYp+3LSEJvnG804ANw2VLaavNILIfWXF1D1G2KNANkBBvInwQ==",
-            "requires": {
-                "array-from": "^2.1.1",
-                "dash-ast": "^2.0.1",
-                "es6-map": "^0.1.5",
-                "es6-set": "^0.1.5",
-                "es6-symbol": "^3.1.1",
-                "estree-is-function": "^1.0.0",
-                "get-assigned-identifiers": "^1.1.0"
-            },
-            "dependencies": {
-                "dash-ast": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-2.0.1.tgz",
-                    "integrity": "sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ=="
-                }
-            }
-        },
         "select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -18576,6 +18587,7 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
             "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+            "dev": true,
             "requires": {
                 "randombytes": "^2.1.0"
             }
@@ -18675,11 +18687,6 @@
                 "kind-of": "^6.0.2"
             }
         },
-        "shallow-copy": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
-            "integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA="
-        },
         "shasum-object": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
@@ -18723,7 +18730,6 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
             "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "dev": true,
             "requires": {
                 "call-bind": "^1.0.0",
                 "get-intrinsic": "^1.0.2",
@@ -18801,11 +18807,6 @@
                 }
             }
         },
-        "sourcemap-codec": {
-            "version": "1.4.8",
-            "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-        },
         "spdy": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
@@ -18913,72 +18914,6 @@
             "integrity": "sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==",
             "optional": true
         },
-        "static-eval": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz",
-            "integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==",
-            "requires": {
-                "escodegen": "^1.11.1"
-            }
-        },
-        "static-module": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.4.tgz",
-            "integrity": "sha512-gb0v0rrgpBkifXCa3yZXxqVmXDVE+ETXj6YlC/jt5VzOnGXR2C15+++eXuMDUYsePnbhf+lwW0pE1UXyOLtGCw==",
-            "requires": {
-                "acorn-node": "^1.3.0",
-                "concat-stream": "~1.6.0",
-                "convert-source-map": "^1.5.1",
-                "duplexer2": "~0.1.4",
-                "escodegen": "^1.11.1",
-                "has": "^1.0.1",
-                "magic-string": "0.25.1",
-                "merge-source-map": "1.0.4",
-                "object-inspect": "^1.6.0",
-                "readable-stream": "~2.3.3",
-                "scope-analyzer": "^2.0.1",
-                "shallow-copy": "~0.0.1",
-                "static-eval": "^2.0.5",
-                "through2": "~2.0.3"
-            },
-            "dependencies": {
-                "merge-source-map": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
-                    "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
-                    "requires": {
-                        "source-map": "^0.5.6"
-                    }
-                },
-                "process-nextick-args": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-                    "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-                },
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
-            }
-        },
         "statuses": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -18991,6 +18926,14 @@
             "integrity": "sha512-/c645XdExBypL01TpFKiG/3RAa/Qmu+zRi0MwAmrdEkwHNuN0ebo8ccAXBBDa5Z0QOJgBskUIbuCK91x0sCVEw==",
             "dev": true
         },
+        "stop-iteration-iterator": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+            "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+            "requires": {
+                "internal-slot": "^1.0.4"
+            }
+        },
         "stream-browserify": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
@@ -19261,9 +19204,9 @@
             }
         },
         "tableexport.jquery.plugin": {
-            "version": "1.26.0",
-            "resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.26.0.tgz",
-            "integrity": "sha512-PMad8npkQviiZG/J0kV6zphmcpNwMglxbxZjGR/7DtcKOTfiOzpcQQFIjHVqpnnKgpHHzOfV6GB9km6EkUAt4A==",
+            "version": "1.27.0",
+            "resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.27.0.tgz",
+            "integrity": "sha512-aJ6XBeqtPqV8P2v8vvKNa54SGp9R4V4CIwaIhA1WTkflvoYaWqCyTmf/O6WH5kKBvDpva+RhLnYwsPHEPwdSsg==",
             "requires": {
                 "file-saver": ">=2.0.1",
                 "html2canvas": ">=1.0.0",
@@ -19282,6 +19225,7 @@
             "version": "5.10.0",
             "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
             "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
+            "dev": true,
             "requires": {
                 "commander": "^2.20.0",
                 "source-map": "~0.7.2",
@@ -19291,12 +19235,14 @@
                 "commander": {
                     "version": "2.20.3",
                     "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-                    "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+                    "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+                    "dev": true
                 },
                 "source-map": {
                     "version": "0.7.3",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+                    "dev": true
                 }
             }
         },
@@ -19304,6 +19250,7 @@
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz",
             "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==",
+            "dev": true,
             "requires": {
                 "jest-worker": "^27.4.1",
                 "schema-utils": "^3.1.1",
@@ -19315,12 +19262,14 @@
                 "@types/json-schema": {
                     "version": "7.0.9",
                     "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-                    "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
+                    "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+                    "dev": true
                 },
                 "schema-utils": {
                     "version": "3.1.1",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
                     "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+                    "dev": true,
                     "requires": {
                         "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
@@ -19330,7 +19279,8 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
                 }
             }
         },
@@ -19454,19 +19404,6 @@
             "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
             "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
         },
-        "type": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-            "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-        },
-        "type-check": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-            "requires": {
-                "prelude-ls": "~1.1.2"
-            }
-        },
         "type-is": {
             "version": "1.6.18",
             "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -19522,28 +19459,12 @@
             "dev": true
         },
         "unicode-properties": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.3.1.tgz",
-            "integrity": "sha512-nIV3Tf3LcUEZttY/2g4ZJtGXhWwSkuLL+rCu0DIAMbjyVPj+8j5gNVz4T/sVbnQybIsd5SFGkPKg/756OY6jlA==",
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+            "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
             "requires": {
                 "base64-js": "^1.3.0",
                 "unicode-trie": "^2.0.0"
-            },
-            "dependencies": {
-                "pako": {
-                    "version": "0.2.9",
-                    "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-                    "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
-                },
-                "unicode-trie": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
-                    "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
-                    "requires": {
-                        "pako": "^0.2.5",
-                        "tiny-inflate": "^1.0.0"
-                    }
-                }
             }
         },
         "unicode-property-aliases-ecmascript": {
@@ -19553,9 +19474,9 @@
             "dev": true
         },
         "unicode-trie": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-1.0.0.tgz",
-            "integrity": "sha512-v5raLKsobbFbWLMoX9+bChts/VhPPj3XpkNr/HbqkirXR1DPk8eo9IYKyvk0MQZFkaoRsFj2Rmaqgi2rfAZYtA==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+            "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
             "requires": {
                 "pako": "^0.2.5",
                 "tiny-inflate": "^1.0.0"
@@ -19564,7 +19485,7 @@
                 "pako": {
                     "version": "0.2.9",
                     "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-                    "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+                    "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
                 }
             }
         },
@@ -19758,21 +19679,21 @@
             }
         },
         "webpack": {
-            "version": "5.74.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-            "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+            "version": "5.88.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz",
+            "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==",
             "requires": {
                 "@types/eslint-scope": "^3.7.3",
-                "@types/estree": "^0.0.51",
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/wasm-edit": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1",
+                "@types/estree": "^1.0.0",
+                "@webassemblyjs/ast": "^1.11.5",
+                "@webassemblyjs/wasm-edit": "^1.11.5",
+                "@webassemblyjs/wasm-parser": "^1.11.5",
                 "acorn": "^8.7.1",
-                "acorn-import-assertions": "^1.7.6",
+                "acorn-import-assertions": "^1.9.0",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.10.0",
-                "es-module-lexer": "^0.9.0",
+                "enhanced-resolve": "^5.15.0",
+                "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
                 "glob-to-regexp": "^0.4.1",
@@ -19781,33 +19702,88 @@
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
-                "schema-utils": "^3.1.0",
+                "schema-utils": "^3.2.0",
                 "tapable": "^2.1.1",
-                "terser-webpack-plugin": "^5.1.3",
+                "terser-webpack-plugin": "^5.3.7",
                 "watchpack": "^2.4.0",
                 "webpack-sources": "^3.2.3"
             },
             "dependencies": {
+                "@jridgewell/resolve-uri": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+                    "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+                },
+                "@jridgewell/sourcemap-codec": {
+                    "version": "1.4.14",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+                    "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+                },
+                "@jridgewell/trace-mapping": {
+                    "version": "0.3.18",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+                    "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+                    "requires": {
+                        "@jridgewell/resolve-uri": "3.1.0",
+                        "@jridgewell/sourcemap-codec": "1.4.14"
+                    }
+                },
                 "@types/json-schema": {
-                    "version": "7.0.11",
-                    "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-                    "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
+                    "version": "7.0.12",
+                    "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+                    "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
+                },
+                "commander": {
+                    "version": "2.20.3",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+                    "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
                 },
                 "graceful-fs": {
-                    "version": "4.2.10",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-                    "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+                    "version": "4.2.11",
+                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+                    "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
                 },
                 "schema-utils": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
                     "requires": {
                         "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
                 },
+                "serialize-javascript": {
+                    "version": "6.0.1",
+                    "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+                    "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+                    "requires": {
+                        "randombytes": "^2.1.0"
+                    }
+                },
+                "terser": {
+                    "version": "5.18.2",
+                    "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz",
+                    "integrity": "sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==",
+                    "requires": {
+                        "@jridgewell/source-map": "^0.3.3",
+                        "acorn": "^8.8.2",
+                        "commander": "^2.20.0",
+                        "source-map-support": "~0.5.20"
+                    }
+                },
+                "terser-webpack-plugin": {
+                    "version": "5.3.9",
+                    "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+                    "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+                    "requires": {
+                        "@jridgewell/trace-mapping": "^0.3.17",
+                        "jest-worker": "^27.4.5",
+                        "schema-utils": "^3.1.1",
+                        "serialize-javascript": "^6.0.1",
+                        "terser": "^5.16.8"
+                    }
+                },
                 "webpack-sources": {
                     "version": "3.2.3",
                     "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
@@ -20117,6 +20093,29 @@
                 "isexe": "^2.0.0"
             }
         },
+        "which-boxed-primitive": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+            "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+            "requires": {
+                "is-bigint": "^1.0.1",
+                "is-boolean-object": "^1.1.0",
+                "is-number-object": "^1.0.4",
+                "is-string": "^1.0.5",
+                "is-symbol": "^1.0.3"
+            }
+        },
+        "which-collection": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+            "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+            "requires": {
+                "is-map": "^2.0.1",
+                "is-set": "^2.0.1",
+                "is-weakmap": "^2.0.1",
+                "is-weakset": "^2.0.1"
+            }
+        },
         "which-typed-array": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz",
@@ -20147,11 +20146,6 @@
             "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
             "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
         },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
-        },
         "wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -20224,11 +20218,11 @@
             }
         },
         "xmldoc": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.1.2.tgz",
-            "integrity": "sha512-ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.3.0.tgz",
+            "integrity": "sha512-y7IRWW6PvEnYQZNZFMRLNJw+p3pezM4nKYPfr15g4OOW9i8VpeydycFuipE2297OvZnh3jSb2pxOt9QpkZUVng==",
             "requires": {
-                "sax": "^1.2.1"
+                "sax": "^1.2.4"
             }
         },
         "xtend": {
diff --git a/package.json b/package.json
index b3b5f99999..1c97f0fadc 100644
--- a/package.json
+++ b/package.json
@@ -24,22 +24,21 @@
         "vue-template-compiler": "2.4.4"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.2.1",
-        "acorn": "^8.8.0",
-        "acorn-import-assertions": "^1.8.0",
+        "@fortawesome/fontawesome-free": "^6.4.0",
+        "acorn": "^8.9.0",
+        "acorn-import-assertions": "^1.9.0",
         "admin-lte": "^2.4.18",
         "ajv": "^6.12.6",
         "alpinejs": "^3.10.5",
         "blueimp-file-upload": "^9.34.0",
         "bootstrap": "^3.4.1",
         "bootstrap-colorpicker": "^2.5.3",
-        "bootstrap-datepicker": "^1.9.0",
+        "bootstrap-datepicker": "^1.10.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "1.20.2",
+        "bootstrap-table": "1.22.0",
         "chart.js": "^2.9.4",
         "css-loader": "^4.0.0",
         "ekko-lightbox": "^5.1.1",
-        "icheck": "^1.0.2",
         "imagemin": "^8.0.1",
         "jquery-form-validator": "^2.3.79",
         "jquery-slimscroll": "^1.3.8",
@@ -53,9 +52,9 @@
         "papaparse": "^4.3.3",
         "select2": "4.0.13",
         "sheetjs": "^2.0.0",
-        "tableexport.jquery.plugin": "1.26.0",
+        "tableexport.jquery.plugin": "1.27.0",
         "tether": "^1.4.0",
         "vue-resource": "^1.5.2",
-        "webpack": "^5.74.0"
+        "webpack": "^5.87.0"
     }
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 0000000000..d5edda6884
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,12 @@
+includes:
+    - ./vendor/nunomaduro/larastan/extension.neon
+
+parameters:
+    paths:
+        - app
+        - config
+        - database/migrations
+        - resources/lang
+        - resources/views
+
+    level: 4
diff --git a/phpstan.neon.example b/phpstan.neon.example
new file mode 100644
index 0000000000..a9bc1a30de
--- /dev/null
+++ b/phpstan.neon.example
@@ -0,0 +1,8 @@
+# Copy this file to "phpstan.neon" and update the parameters section as needed
+
+includes:
+    - phpstan.neon.dist
+
+parameters:
+    # https://phpstan.org/user-guide/output-format#opening-file-in-an-editor
+    editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
diff --git a/phpunit.xml b/phpunit.xml
index bf3fd2dc33..4ee53b57b3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="bootstrap/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+>
   <coverage>
     <include>
       <directory suffix=".php">app/</directory>
     </include>
   </coverage>
   <testsuites>
-    <testsuite name="Application Test Suite">
-      <directory>./tests/</directory>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Feature">
+      <directory suffix="Test.php">./tests/Feature</directory>
     </testsuite>
   </testsuites>
   <php>
-    <env name="APP_ENV" value="testing-ci"/>
+    <env name="APP_ENV" value="testing"/>
+    <env name="BCRYPT_ROUNDS" value="4"/>
     <env name="CACHE_DRIVER" value="array"/>
-    <env name="SESSION_DRIVER" value="array"/>
+    <env name="MAIL_DRIVER" value="array"/>
     <env name="QUEUE_DRIVER" value="sync"/>
-    <env name="DB_CONNECTION" value="sqlite"/>
-    <server name="SERVER_NAME" value="http://127.0.0.1:8000"/>
+    <env name="SESSION_DRIVER" value="array"/>
     <ini name="display_errors" value="true"/>
   </php>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 0000000000..4c8b877262
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+>
+    <projectFiles>
+        <directory name="app" />
+        <directory name="database/factories" />
+        <directory name="database/seeders" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/public/css/build/app.css b/public/css/build/app.css
index 13b44a11ea..c8fc025597 100644
Binary files a/public/css/build/app.css and b/public/css/build/app.css differ
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index ec9e3fb85e..5111695ac7 100644
Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 59e1dd4d0e..3313bdac45 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/public/css/dist/bootstrap-table.css b/public/css/dist/bootstrap-table.css
index b95d3d2b77..c8749ad4b4 100644
Binary files a/public/css/dist/bootstrap-table.css and b/public/css/dist/bootstrap-table.css differ
diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css
index 5ba6c5eadd..3e17735603 100644
Binary files a/public/css/dist/skins/skin-black-dark.css and b/public/css/dist/skins/skin-black-dark.css differ
diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
index 5ba6c5eadd..3e17735603 100644
Binary files a/public/css/dist/skins/skin-black-dark.min.css and b/public/css/dist/skins/skin-black-dark.min.css differ
diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
index a393ee578c..c4f2672931 100644
Binary files a/public/css/dist/skins/skin-blue-dark.css and b/public/css/dist/skins/skin-blue-dark.css differ
diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index a393ee578c..c4f2672931 100644
Binary files a/public/css/dist/skins/skin-blue-dark.min.css and b/public/css/dist/skins/skin-blue-dark.min.css differ
diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css
index b5d7fc4e9b..50dfc577e2 100644
Binary files a/public/css/dist/skins/skin-contrast.css and b/public/css/dist/skins/skin-contrast.css differ
diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css
index b5d7fc4e9b..50dfc577e2 100644
Binary files a/public/css/dist/skins/skin-contrast.min.css and b/public/css/dist/skins/skin-contrast.min.css differ
diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
index 3fe0a606d3..8e5430e5cd 100644
Binary files a/public/css/dist/skins/skin-green-dark.css and b/public/css/dist/skins/skin-green-dark.css differ
diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index 3fe0a606d3..8e5430e5cd 100644
Binary files a/public/css/dist/skins/skin-green-dark.min.css and b/public/css/dist/skins/skin-green-dark.min.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
index fe7af4f628..1ec2c0701a 100644
Binary files a/public/css/dist/skins/skin-orange-dark.css and b/public/css/dist/skins/skin-orange-dark.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index fe7af4f628..1ec2c0701a 100644
Binary files a/public/css/dist/skins/skin-orange-dark.min.css and b/public/css/dist/skins/skin-orange-dark.min.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
index e1bd8edb4a..cec9819d7d 100644
Binary files a/public/css/dist/skins/skin-purple-dark.css and b/public/css/dist/skins/skin-purple-dark.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index e1bd8edb4a..cec9819d7d 100644
Binary files a/public/css/dist/skins/skin-purple-dark.min.css and b/public/css/dist/skins/skin-purple-dark.min.css differ
diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
index cbb5b07d14..17d495cbbb 100644
Binary files a/public/css/dist/skins/skin-red-dark.css and b/public/css/dist/skins/skin-red-dark.css differ
diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index cbb5b07d14..17d495cbbb 100644
Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
index 5691df2194..09babaa6ab 100644
Binary files a/public/css/dist/skins/skin-yellow-dark.css and b/public/css/dist/skins/skin-yellow-dark.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index 5691df2194..09babaa6ab 100644
Binary files a/public/css/dist/skins/skin-yellow-dark.min.css and b/public/css/dist/skins/skin-yellow-dark.min.css differ
diff --git a/public/css/webfonts/fa-brands-400.ttf b/public/css/webfonts/fa-brands-400.ttf
index 502f3621e7..774d51ac4b 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 d801b51f66..71e3185268 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 e0abe2710f..8a9d6344d1 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 d736e4b24c..7f021680b9 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 13c9489771..993dbe1f95 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 3516fdbe33..5c16cd3e8a 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 dc2981941d..ab6ae22482 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 28d46b15ac..9027e38bcd 100644
Binary files a/public/css/webfonts/fa-v4compatibility.woff2 and b/public/css/webfonts/fa-v4compatibility.woff2 differ
diff --git a/public/img/demo/manufacturers/dellicon.png b/public/img/demo/manufacturers/dellicon.png
new file mode 100644
index 0000000000..899de3ccab
Binary files /dev/null and b/public/img/demo/manufacturers/dellicon.png differ
diff --git a/public/img/demo/manufacturers/lenovoicon.png b/public/img/demo/manufacturers/lenovoicon.png
new file mode 100644
index 0000000000..b8f7967bf8
Binary files /dev/null and b/public/img/demo/manufacturers/lenovoicon.png differ
diff --git a/public/img/snipe-logo-bug.png b/public/img/snipe-logo-bug.png
new file mode 100644
index 0000000000..423a5b7490
Binary files /dev/null and b/public/img/snipe-logo-bug.png differ
diff --git a/public/js/build/app.js b/public/js/build/app.js
index 5c1c0197f5..cfbed799e6 100644
Binary files a/public/js/build/app.js and b/public/js/build/app.js differ
diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js
index b5ee42d9f6..9c591006f2 100644
Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 65f596fac2..4d5e9ac818 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
index 0fafbbff9b..53d6e2d52d 100644
Binary files a/public/js/dist/bootstrap-table.js and b/public/js/dist/bootstrap-table.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 293f8dc3ae..f9faf4e818 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,54 +1,52 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=f05cc05b9000ba73e1949bcf137d4301",
+    "/js/build/app.js": "/js/build/app.js?id=82ddaa718cced6fb0be6e8db6f16a0c0",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=0465141b9ecb0662ba6790c1460f391f",
-    "/css/build/app.css": "/css/build/app.css?id=c3a896cab26e2093f8be24336b7db1b9",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=5166569ede5a36802eadeea982686ca6",
+    "/css/build/app.css": "/css/build/app.css?id=b612c48e78fece2e1e8042ae24cc5f1e",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/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=f343f659ca1d45534d2c2c3cc30fb619",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=57e634d63101d3613f4c73aaa2e3f50a",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=5120ce6a4b70d11bbc84a5125aa31949",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6e53eef152bba01a4c666a4d8b01117",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=07273f6ca3c698a39e8fc2075af4fa07",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=c1f33574ecb9d3e69d9b8fe5bd68e101",
     "/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=713b1205aa2d7c9db282f8cd5754c0e4",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=7d92dea45d94be7e1d4e427c728d335d",
     "/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=6ea1eecb7f939256c373c92f58749e72",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=1c0f59079342d1a10099bf41d2e46f59",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=8ca888bbc050d9680cbb65021382acba",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bdfc704731682c67645a2248b0b8d2d7",
     "/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=c0d21166315b7c2cdd4819fa4a5e4d1e",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/all.css": "/css/dist/all.css?id=ef030b613d45620b907cf0184a14e868",
-    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
-    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
+    "/css/dist/all.css": "/css/dist/all.css?id=ae5d0ce9886bbe4ad4b021c6be19ec36",
     "/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=0b834d6c0ecc5bf275a83414eb38efd4",
-    "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=a46924ee2a2a7702ef7fe7ead62fca18",
-    "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=93d1ca4fec25c46c9ac67b07058b3f72",
-    "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=d8373194363409c201ee33fcd48ba574",
-    "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=a7d60e1f645d1b80e0879b2c8e72ed06",
-    "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=3e1cccc95e0dadb2168d67c2f0f23bf3",
-    "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=ee335846f3552dc6af2ef7c8cafae1dc",
-    "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=1ad361f755ce9c96dadb8da2d7318975",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ee4896df8b8f008ce73a9a0c2549aefd",
-    "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2",
-    "/js/dist/all.js": "/js/dist/all.js?id=4f9355ac85d380301f6f62e55b1a6e5e",
+    "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=e2e2b1797606a266ed55549f5bb5a179",
+    "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=fe912d1c4a7e0e1db87a64eb7e54c945",
+    "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=31a6b5ecfc8d018d0e3a294f0c80e9e9",
+    "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=bf8eabe300a00a3adb0293596987abc4",
+    "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=cd687455c6d6c058e2e9f84f409e2965",
+    "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=eea38615e7b5dbbaf88c263f2230cc32",
+    "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=6ebbf5afc34f54463abc2b81ca637364",
+    "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=67b8a78b7e80e805cfa4ee0421895ba4",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=f5935cf8eaf9c1f71da0c9245d730471",
+    "/js/build/vendor.js": "/js/build/vendor.js?id=3592e07ae9a6d1805a4ea3bd3c034aef",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=40e2dc8b5b29e244bb545f78e2a3242b",
+    "/js/dist/all.js": "/js/dist/all.js?id=ba07d399f23b294f7c4983030b757423",
     "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=7d1b362ddda912bce36f333cd492191b",
     "/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=c0d21166315b7c2cdd4819fa4a5e4d1e",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d",
     "/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=1c0f59079342d1a10099bf41d2e46f59",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=bdfc704731682c67645a2248b0b8d2d7",
     "/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=57e634d63101d3613f4c73aaa2e3f50a",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=07273f6ca3c698a39e8fc2075af4fa07",
     "/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=5120ce6a4b70d11bbc84a5125aa31949",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=c1f33574ecb9d3e69d9b8fe5bd68e101",
     "/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=6ea1eecb7f939256c373c92f58749e72",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=8ca888bbc050d9680cbb65021382acba",
     "/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=713b1205aa2d7c9db282f8cd5754c0e4",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=7d92dea45d94be7e1d4e427c728d335d",
     "/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=f343f659ca1d45534d2c2c3cc30fb619",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b"
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=e6e53eef152bba01a4c666a4d8b01117",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da"
 }
diff --git a/resources/assets/js/components/alert.vue b/resources/assets/js/components/alert.vue
deleted file mode 100644
index 1a20334656..0000000000
--- a/resources/assets/js/components/alert.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<style scoped>
-</style>
-
-<template>
-        <div class="col-md-12" :class="alertType">
-            <div class="alert" :class="alertClassName">
-                <button type="button" class="close" @click="hideEvent">&times;</button>
-                <i class="fas fa-check faa-pulse animated" aria-hidden="true" v-show="alertType == 'success'"></i>
-                <strong>{{ title }} </strong>
-                <slot></slot>
-            </div>
-        </div>
-</template>
-
-<script>
-    export default {
-        /*
-         * The component's data.
-         */
-        props: ['alertType', 'title'],
-
-        computed: {
-            alertClassName() {
-                return 'alert-' + this.alertType;
-            }
-        },
-
-        methods: {
-            hideEvent() {
-                this.$emit('hide');
-            }
-        }
-    }
-
-</script>
diff --git a/resources/assets/js/components/importer/importer-errors.vue b/resources/assets/js/components/importer/importer-errors.vue
deleted file mode 100644
index adc6841d4d..0000000000
--- a/resources/assets/js/components/importer/importer-errors.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<style scoped>
-</style>
-
-<template>
-    <div class="box" v-if="errors">
-  <div class="box-body">
-    <div class="alert alert-warning">
-      <strong>Warning</strong> Some Errors occured while importing
-    </div>
-
-    <div class="errors-table">
-      <table class="table table-striped table-bordered" id="errors-table">
-        <thead>
-          <th>Item</th>
-          <th>Errors</th>
-        </thead>
-        <tbody>
-          <tr v-for="(error, item) in errors">
-            <td>{{ item }}</td>
-            <td v-for="(value, field) in error">
-                <b>{{ field }}:</b>
-                <span v-for="errorString in value">{{errorString[0]}}</span>
-              <br />
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-</template>
-
-<script>
-    export default {
-        /*
-         * The component's data.
-         */
-         props: ['errors'],
-    }
-
-</script>
diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
deleted file mode 100644
index eeeed7c722..0000000000
--- a/resources/assets/js/components/importer/importer-file.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-<template>
-  <tr v-show="processDetail">
-    <td colspan="5">
-    <div class="col-md-12">
-
-            <div class="row">
-                <div class="dynamic-form-row">
-                    <div class="col-md-5 col-xs-12">
-                        <label for="import-type">Import Type:</label>
-                    </div>
-
-                    <div class="col-md-7 col-xs-12">
-                        <select2 :options="options.importTypes" v-model="options.importType" required>
-                            <option disabled value="0"></option>
-                        </select2>
-                    </div>
-
-                </div><!-- /dynamic-form-row -->
-                <div class="dynamic-form-row">
-                    <div class="col-md-5 col-xs-12">
-                        <label for="import-update">Update Existing Values?:</label>
-                    </div>
-                    <div class="col-md-7 col-xs-12">
-                        <input type="checkbox" class="icheckbox_minimal" name="import-update" v-model="options.update">
-                    </div>
-                </div><!-- /dynamic-form-row -->
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-5 col-xs-12">
-                        <label for="send-welcome">Send Welcome Email for new Users?</label>
-                    </div>
-                    <div class="col-md-7 col-xs-12">
-                        <input type="checkbox" class="icheckbox_minimal" name="send-welcome" v-model="options.send_welcome">
-                    </div>
-                </div><!-- /dynamic-form-row -->
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-5 col-xs-12">
-                        <label for="run-backup">Backup before importing?</label>
-                    </div>
-                    <div class="col-md-7 col-xs-12">
-                        <input type="checkbox" class="icheckbox_minimal" name="run-backup" v-model="options.run_backup">
-                    </div>
-                </div><!-- /dynamic-form-row -->
-
-                <div class="alert col-md-8 col-md-offset-2" style="text-align:left"
-                     :class="alertClass"
-                     v-if="statusText">
-                    {{ this.statusText }}
-                </div><!-- /alert -->
-        </div> <!-- /div row -->
-
-        <div class="row">
-            <div class="col-md-12" style="padding-top: 30px;">
-                <div class="col-md-4 text-right"><h4>Header Field</h4></div>
-                <div class="col-md-4"><h4>Import Field</h4></div>
-                <div class="col-md-4"><h4>Sample Value</h4></div>
-            </div>
-        </div><!-- /div row -->
-
-        <template v-for="(header, index) in file.header_row">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="col-md-4 text-right">
-                        <label :for="header" class="control-label">{{ header }}</label>
-                    </div>
-                    <div class="col-md-4 form-group">
-                        <div required>
-                            <select2 :options="columns" v-model="columnMappings[header]">
-                                <option value="0">Do Not Import</option>
-                            </select2>
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <p class="form-control-static">{{ activeFile.first_row[index] }}</p>
-                    </div>
-                </div><!-- /div col-md-8 -->
-            </div><!-- /div row -->
-        </template>
-
-        <div class="row">
-            <div class="col-md-6 col-md-offset-2 text-right" style="padding-top: 20px;">
-                <button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button>
-                <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
-                <br><br>
-            </div>
-        </div><!-- /div row -->
-        <div class="row">
-            <div class="alert col-md-8 col-md-offset-2" style="padding-top: 20px;"
-                 :class="alertClass"
-                 v-if="statusText">
-                {{ this.statusText }}
-            </div>
-        </div><!-- /div row -->
-
-    </div><!-- /div v-show -->
-
-    </td>
-  </tr>
-</template>
-
-<script>
-    var baseUrl = $('meta[name="baseUrl"]').attr('content');
-    export default {
-        props: ['file', 'customFields'],
-        data() {
-            return {
-                activeFile: this.file,
-                processDetail: false,
-                statusText: null,
-                statusType: null,
-                options: {
-                    importType: this.file.import_type,
-                    update: false,
-                    send_welcome: false,
-                    run_backup: false,
-                    importTypes: [
-                        { id: 'asset', text: 'Assets' },
-                        { id: 'accessory', text: 'Accessories' },
-                        { id: 'consumable', text: 'Consumables' },
-                        { id: 'component', text: 'Components' },
-                        { id: 'license', text: 'Licenses' },
-                        { id: 'user', text: 'Users' }
-                    ],
-                    statusText: null,
-                },
-                columnOptions: {
-                    general: [
-                        {id: 'category', text: 'Category' },
-                        {id: 'company', text: 'Company' },
-                        {id: 'email', text: 'Email' },
-                        {id: 'item_name', text: 'Item Name' },
-                        {id: 'location', text: 'Location' },
-                        {id: 'maintained', text: 'Maintained' },
-                        {id: 'manufacturer', text: 'Manufacturer' },
-                        {id: 'order_number', text: 'Order Number' },
-                        {id: 'purchase_cost', text: 'Purchase Cost' },
-                        {id: 'purchase_date', text: 'Purchase Date' },
-                        {id: 'quantity', text: 'Quantity' },
-                        {id: 'requestable', text: 'Requestable' },
-                        {id: 'serial', text: 'Serial Number' },
-                        {id: 'supplier', text: 'Supplier' },
-                        {id: 'username', text: 'Username' },
-                        {id: 'department', text: 'Department' },
-                    ],
-                    accessories:[
-                        {id: 'model_number', text: 'Model Number'},
-                        {id: 'notes', text: 'Notes' },
-                    ],
-                    assets: [
-                        {id: 'asset_tag', text: 'Asset Tag' },
-                        {id: 'asset_model', text: 'Model Name' },
-                        {id: 'checkout_class', text: 'Checkout Type' },
-                        {id: 'checkout_location', text: 'Checkout Location' },
-                        {id: 'image', text: 'Image Filename' },
-                        {id: 'model_number', text: 'Model Number' },
-                        {id: 'asset_notes', text: 'Asset Notes' },
-                        {id: 'model_notes', text: 'Model Notes' },
-                        {id: 'full_name', text: 'Full Name' },
-                        {id: 'status', text: 'Status' },
-                        {id: 'warranty_months', text: 'Warranty Months' },
-                        {id: 'last_audit_date', text: 'Last Audit Date' },
-                        {id: 'next_audit_date', text: 'Audit Date' },
-                    ],
-                    consumables: [
-                        {id: 'item_no', text: "Item Number"},
-                        {id: 'model_number', text: "Model Number"},
-                        {id: 'min_amt', text: "Minimum Quantity"},
-                        {id: 'notes', text: 'Notes' },
-                    ],
-                    licenses: [
-                        {id: 'asset_tag', text: 'Assigned To Asset'},
-                        {id: 'expiration_date', text: 'Expiration Date' },
-                        {id: 'full_name', text: 'Full Name' },
-                        {id: 'license_email', text: 'Licensed To Email' },
-                        {id: 'license_name', text: 'Licensed To Name' },
-                        {id: 'notes', text: 'Notes' },
-                        {id: 'purchase_order', text: 'Purchase Order' },
-                        {id: 'reassignable', text: 'Reassignable' },
-                        {id: 'seats', text: 'Seats' },
-                    ],
-                    users: [
-                        {id: 'employee_num', text: 'Employee Number' },
-                        {id: 'first_name', text: 'First Name' },
-                        {id: 'jobtitle', text: 'Job Title' },
-                        {id: 'last_name', text: 'Last Name' },
-                        {id: 'phone_number', text: 'Phone Number' },
-                        {id: 'manager_first_name', text: 'Manager First Name' },
-                        {id: 'notes', text: 'Notes' },
-                        {id: 'manager_last_name', text: 'Manager Last Name' },
-                        {id: 'activated', text: 'Activated' },
-                        {id: 'address', text: 'Address' },
-                        {id: 'city', text: 'City' },
-                        {id: 'state', text: 'State' },
-                        {id: 'country', text: 'Country' },
-                        {id: 'zip', text: 'ZIP' },
-                        {id: 'remote', text: 'Remote'},
-
-                    ],
-                    customFields: this.customFields,
-                },
-                columnMappings: this.file.field_map || {},
-                activeColumn: null,
-            }
-        },
-        created() {
-            window.eventHub.$on('showDetails', this.toggleExtendedDisplay)
-            this.populateSelect2ActiveItems();
-        },
-        computed: {
-            columns() {
-                // function to sort objects by their display text.
-                function sorter(a,b) {
-                    if (a.text < b.text)
-                        return -1;
-                    if (a.text > b.text)
-                        return 1;
-                    return 0;
-                }
-                switch(this.options.importType) {
-                    case 'asset':
-                        return this.columnOptions.general
-                            .concat(this.columnOptions.assets)
-                            .concat(this.columnOptions.customFields)
-                            .sort(sorter);
-                    case 'accessory':
-                        return this.columnOptions.general
-                            .concat(this.columnOptions.accessories)
-                            .sort(sorter);
-                    case 'consumable':
-                    	console.log('Returned consumable');
-                        return this.columnOptions.general
-                            .concat(this.columnOptions.consumables)
-                            .sort(sorter);
-                    case 'license':
-                        return this.columnOptions.general.concat(this.columnOptions.licenses).sort(sorter);
-                    case 'user':
-                        return this.columnOptions.general.concat(this.columnOptions.users).sort(sorter);
-                }
-                return this.columnOptions.general;
-            },
-            alertClass() {
-                if(this.statusType=='success') {
-                    return 'alert-success';
-                }
-                if(this.statusType=='error') {
-                    return 'alert-danger';
-                }
-                return 'alert-info';
-            },
-        },
-        watch: {
-            columns() {
-                this.populateSelect2ActiveItems();
-            }
-        },
-        methods: {
-            postSave() {
-                console.log('saving');
-                console.log(this.options.importType);
-                if(!this.options.importType) {
-                    this.statusType='error';
-                    this.statusText= "An import type is required... ";
-                    return;
-                }
-                this.statusType='pending';
-                this.statusText = "Processing...";
-                this.$http.post(baseUrl + 'api/v1/imports/process/' + this.file.id, {
-                    'import-update': this.options.update,
-                    'send-welcome': this.options.send_welcome,
-                    'import-type': this.options.importType,
-                    'run-backup': this.options.run_backup,
-                    'column-mappings': this.columnMappings
-                }).then( ({body}) => {
-                    // Success
-                    this.statusType="success";
-                    this.statusText = "Success... Redirecting.";
-                    window.location.href = body.messages.redirect_url;
-                }, ({body}) => {
-                    // Failure
-                    if(body.status == 'import-errors') {
-                        window.eventHub.$emit('importErrors', body.messages);
-                        this.statusType='error';
-                        this.statusText = "Error";
-                    } else {
-                        this.$emit('alert', {
-                            message: body.messages,
-                            type: "danger",
-                            visible: true,
-                        })
-                    }
-                    this.displayImportModal=false;
-                });
-            },
-            populateSelect2ActiveItems() {
-                if(this.file.field_map == null) {
-                    // Begin by populating the active selection in dropdowns with blank values.
-                    for (var i=0; i < this.file.header_row.length; i++) {
-                        this.$set(this.columnMappings, this.file.header_row[i], null);
-                    }
-                    // Then, for any values that have a likely match, we make that active.
-                    for(var j=0; j < this.columns.length; j++) {
-                        let column = this.columns[j];
-                        let lower = this.file.header_row.map((value) => value.toLowerCase());
-                        let index = lower.indexOf(column.text.toLowerCase())
-                        if(index != -1) {
-                            this.$set(this.columnMappings, this.file.header_row[index], column.id)
-                        }
-                    }
-                }
-            },
-            toggleExtendedDisplay(fileId) {
-                if(fileId == this.file.id) {
-                    this.processDetail = !this.processDetail
-                }
-            },
-            updateModel(header, value) {
-                this.columnMappings[header] = value;
-            }
-        },
-        components: {
-            select2: require('../select2.vue').default
-        }
-    }
-</script>
diff --git a/resources/assets/js/components/importer/importer.vue b/resources/assets/js/components/importer/importer.vue
deleted file mode 100644
index 474f8f1451..0000000000
--- a/resources/assets/js/components/importer/importer.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-<script>
-    require('blueimp-file-upload');
-    var baseUrl = $('meta[name="baseUrl"]').attr('content');
-    export default {
-        /*
-         * The component's data.
-         */
-        data() {
-            return {
-                files: [],
-                displayImportModal: false,
-                activeFile: null,
-                alert: {
-                    type: null,
-                    message: null,
-                    visible: false,
-                },
-                importErrors: null,
-                progress: {
-                    currentClass: "progress-bar-warning",
-                    currentPercent: "0",
-                    statusText: '',
-                    visible: false
-                },
-                customFields: [],
-            };
-        },
-
-        mounted() {
-            window.eventHub.$on('importErrors', this.updateImportErrors);
-            this.fetchFiles();
-            this.fetchCustomFields();
-            let vm = this;
-            $('#fileupload').fileupload({
-                dataType: 'json',
-                done(e, data) {
-                    vm.progress.currentClass="progress-bar-success";
-                    vm.progress.statusText = "Success!";
-                    vm.files = data.result.files.concat(vm.files);
-                    console.log(data.result.header_row);
-                },
-                add(e, data) {
-                    data.headers = {
-                        "X-Requested-With": 'XMLHttpRequest',
-                        "X-CSRF-TOKEN": Laravel.csrfToken
-                    };
-                    data.process().done( () => {data.submit();});
-                    vm.progress.visible=true;
-                },
-                progress(e, data) {
-                    var progress = parseInt((data.loaded / data.total * 100, 10));
-                    vm.progress.currentPercent = progress;
-                    vm.progress.statusText = progress+'% Complete';
-                },
-                fail(e, data) {
-                    vm.progress.currentClass = "progress-bar-danger";
-                    // Display any errors returned from the $.ajax()
-                    vm.progress.statusText = data.jqXHR.responseJSON.messages;
-                }
-            })
-        },
-
-        methods: {
-            fetchFiles() {
-                this.$http.get(baseUrl + 'api/v1/imports')
-                .then( ({data}) => this.files = data, // Success
-                    //Fail
-                (response) => {
-                    this.alert.type="danger";
-                    this.alert.visible=true;
-                    this.alert.message="Something went wrong fetching files...";
-                });
-            },
-            fetchCustomFields() {
-                this.$http.get(baseUrl + 'api/v1/fields')
-                .then( ({data}) => {
-                    data = data.rows;
-                    data.forEach((item) => {
-                        this.customFields.push({
-                            'id': item.db_column_name,
-                            'text': item.name,
-                        })
-                    })
-                });
-            },
-            deleteFile(file, key) {
-                this.$http.delete(baseUrl + 'api/v1/imports/' + file.id)
-                .then(
-                    // Success, remove file from array.
-                    (response) => {
-                        this.files.splice(key, 1);
-                        this.alert.type = response.body.status; // A failed delete can still cause a 200 status code.
-                        this.alert.visible = true;
-                        this.alert.message = response.body.messages;
-                    },
-                    (response) => {// Fail
-                        // this.files.splice(key, 1);
-                        this.alert.type="error";
-                        this.alert.visible=true;
-                        this.alert.message=response.body.messages;
-                    }
-                );
-            },
-            toggleEvent(fileId) {
-                window.eventHub.$emit('showDetails', fileId)
-            },
-            updateAlert(alert) {
-                this.alert = alert;
-            },
-            updateImportErrors(errors) {
-                this.importErrors = errors;
-            },
-        },
-
-        computed: {
-            progressWidth() {
-                return "width: "+this.progress.currentPercent*10+'%';
-            }
-        },
-
-        components: {
-            alert: require('../alert.vue').default,
-            errors: require('./importer-errors.vue').default,
-            importFile: require('./importer-file.vue').default,
-        }
-    }
-
-</script>
diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js
index 62abdafde3..70e4f80a8f 100755
--- a/resources/assets/js/snipeit.js
+++ b/resources/assets/js/snipeit.js
@@ -185,14 +185,6 @@ $(document).ready(function () {
         }
      });
 
-     /*
-     * iCheck checkbox plugin
-     */
-
-     $('input[type="checkbox"].minimal, input[type="radio"].minimal').iCheck({
-         checkboxClass: 'icheckbox_minimal-blue',
-         radioClass: 'iradio_minimal-blue'
-     });
 
 
      /*
@@ -540,10 +532,16 @@ $(document).ready(function () {
         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');
@@ -554,17 +552,15 @@ $(document).ready(function () {
             $(id + '-info').append('<span class="label label-default">' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ')</span> ');
         }
 
-        console.log('Max size is: ' + max_size);
-        console.log('Real size is: ' + total_size);
-
         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();
         }
 
 
@@ -601,3 +597,32 @@ function htmlEntities(str) {
     };
     
 })(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 $_instance->id (via `{{ }}` if you're in a blade,
+ *    or just $_instance->id if not).
+ */
+$(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 $_instance->id or {{ $_instance->id }}, as appropriate")
+            return false
+        }
+        window.livewire.find(target.data('livewire-component')).set(event.target.name, this.options[this.selectedIndex].value)
+    })
+
+    window.livewire.hook('message.processed', function (el,component) {
+        $('.livewire-select2').select2();
+    });
+
+})
\ No newline at end of file
diff --git a/resources/assets/js/vue.js b/resources/assets/js/vue.js
index 65cd4393c1..a5b903e51c 100644
--- a/resources/assets/js/vue.js
+++ b/resources/assets/js/vue.js
@@ -26,10 +26,11 @@ Vue.component(
     require('./components/passport/PersonalAccessTokens.vue').default
 );
 
-Vue.component(
-    'importer',
-    require('./components/importer/importer.vue').default
-);
+// This component has been removed and replaced with a Livewire implementation
+// Vue.component(
+//     'importer',
+//     require('./components/importer/importer.vue').default
+// );
 
 // This component has been removed and replaced with a Livewire implementation
 // Vue.component(
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index ae427f3392..f5625bd7b4 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -141,6 +141,9 @@ a.accordion-header {
 .dropdown-menu li a {
   //color: inherit;
 }
+.pull-text-right{
+  text-align: right !important;
+}
 
 .main-header .sidebar-toggle:before {
   content: "\f0c9";
@@ -192,6 +195,9 @@ a.accordion-header {
 .btn-info.btn-outline {
   color: #5bc0de;
 }
+.btn-warning{
+  background-color:#f39c12 !important;
+}
 
 .btn-warning.btn-outline {
   color: #f0ad4e;
@@ -496,14 +502,14 @@ h4 {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
   display: table-row;
-  
+
 }
 
 .row-new-striped > .row:nth-of-type(odd)  {
   background-color: #F8F8F8;
   border-top: 1px solid #dddddd;
   display: table-row;
-  
+
 }
 
 .row-new-striped div {
@@ -666,23 +672,23 @@ th.css-accessory > .th-inner::before
   border-radius: 0px;
 }
 
-.bs-checkbox input {
-  zoom: 1.5;
-}
 @media screen and (max-width: 511px){
+  .tab-content .tab-pane .alert-block {
+    margin-top: 120px
+  }
   .sidebar-menu{
-    margin-top:64px;
+    margin-top:160px;
   }
 }
 @media screen and (max-width: 771px) and (min-width: 512px){
   .sidebar-menu {
-    margin-top:14px
+    margin-top:160px
   }
 }
 
 @media screen and (max-width: 1098px) and (min-width: 772px){
   .sidebar-menu {
-    margin-top:51px
+    margin-top:98px
   }
 }
 
@@ -690,4 +696,167 @@ th.css-accessory > .th-inner::before
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-}
\ No newline at end of file
+}
+
+
+/** Form-stuff overrides for checkboxes and stuff **/
+
+label.form-control {
+  display: grid;
+  grid-template-columns: 1.8em auto;
+  gap: 0.5em;
+  border: 0px;
+  padding-left: 0px;
+  background-color: inherit;
+  color: inherit;
+  font-size: inherit;
+  font-weight: inherit;
+}
+
+label.form-control--disabled {
+  color: #959495;
+  pointer-events:none;
+  cursor: not-allowed;
+}
+
+/** --------------------------------------- **/
+/** Start checkbox styles to replace iCheck **/
+/** --------------------------------------- **/
+input[type="checkbox"] {
+  /* Add if not using autoprefixer */
+  -webkit-appearance: none;
+  appearance: none;
+  /* For iOS < 15 to remove gradient background */
+  background-color: #fff;
+  /* Not removed via appearance */
+  margin: 0;
+  font: inherit;
+  color: #959495;
+  width: 1.8em;
+  height: 1.8em;
+  border: 0.05em solid;
+  border-radius: 0em;
+  transform: translateY(-0.075em);
+  display: grid;
+  place-content: center;
+  /*Windows High Contrast Mode*/
+}
+
+/** This sets the display of a checkbox, and what the "fill" checkmark should look like */
+
+input[type="checkbox"]::before {
+
+  /** If you want to use the non-checkbox, filled square, use this instead **/
+  content: "";
+  width: 1em;
+  height: 1em;
+  transform: scale(0);
+  transition: 120ms transform ease-in-out;
+  box-shadow: inset 1em 1em rgb(211, 211, 211);
+
+  content: "";
+  width: 1em;
+  height: 1em;
+  clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
+  transform: scale(0);
+  transform-origin: bottom left;
+  transition: 120ms transform ease-in-out;
+  box-shadow: inset 1em 1em #428bca;
+  /* Windows High Contrast Mode */
+  background-color: CanvasText;
+}
+
+/** This sets the size of the scale up for the shape we defined above **/
+input[type="checkbox"]:checked::before {
+  transform: scale(1);
+}
+
+/** This sets the scale and color of the DISABLED but CHECKED checkbox */
+input[type=checkbox]:disabled::before, input[type=radio]:disabled::before {
+  content: "";
+  width: 1em;
+  height: 1em;
+  transform: scale(1);
+  box-shadow: inset 1em 1em rgb(211, 211, 211);
+}
+
+/* This sets the scale and style of a DISABLED checkbox that is NOT checked */
+input[type=checkbox]:disabled:not(:checked)::before, input[type=radio]:disabled:not(:checked)::before {
+  content: "";
+  transform: scale(0);
+  cursor: not-allowed;
+  pointer-events:none;
+}
+
+/** this is the color of the checkbox and content on a disabled, checked box **/
+input[type=checkbox]:disabled, input[type=radio]:disabled {
+  --form-control-color: rgb(211, 211, 211);
+  color: #959495;
+  cursor: not-allowed;
+  pointer-events:none;
+}
+
+
+/** Radio styles to replace iCheck **/
+
+input[type="radio"] {
+  appearance: none;
+  background-color: #fff;
+  margin: 0;
+  font: inherit;
+  color: #959495;
+  width: 1.8em;
+  height: 1.8em;
+  border: 0.05em solid;
+  border-radius: 50%;
+  transform: translateY(-0.075em);
+  display: grid;
+  place-content: center;
+}
+
+input[type="radio"]::before {
+  content: "";
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  transform: scale(0);
+  transition: 120ms transform ease-in-out;
+  box-shadow: inset 1em 1em #428bca;
+}
+
+input[type="radio"]:checked::before {
+  transform: scale(1);
+}
+
+
+/**
+* This addresses the column selector in bootstrap-table. Without these two lines, the
+* checkbox and the <span></span> with the label text that BS tables generates will
+* end up on two different lines and it looks assy.
+ */
+.dropdown-item-marker input[type=checkbox] {
+  font-size: 10px;
+}
+
+.bootstrap-table .fixed-table-toolbar li.dropdown-item-marker label {
+  font-weight: normal;
+  display: grid;
+  grid-template-columns: .1em auto;
+  gap: 1.5em;
+}
+
+.container.row-striped .col-md-6 {
+  overflow-wrap:anywhere;
+}
+
+.nav-tabs-custom > .nav-tabs > li {
+  z-index: 1;
+}
+
+.select2-container .select2-search--inline .select2-search__field{
+  padding-left:15px;
+}
+
+/** --------------------------------------- **/
+/** End checkbox styles to replace iCheck   **/
+/** --------------------------------------- **/
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less
index cd2c2d1de6..69a393e80d 100644
--- a/resources/assets/less/skins/skin-black-dark.less
+++ b/resources/assets/less/skins/skin-black-dark.less
@@ -135,6 +135,38 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+a.actions {
+  color:#fff !important;
+}
+//pagination
+.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);
diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less
index a5f5c93988..6c502b1781 100644
--- a/resources/assets/less/skins/skin-blue-dark.less
+++ b/resources/assets/less/skins/skin-blue-dark.less
@@ -132,6 +132,35 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+a.actions {
+  color:#fff !important;
+}
+//pagination
+.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);
@@ -368,6 +397,12 @@ a {
     color: var(--visited-link)
   }
 }
+#customFieldsTable a[href*='/models'] {
+  color: var(--back-sub);
+}
+#customFieldsTable a[href*='/fieldsets']{
+  background-color: transparent;
+}
 
 .row-striped {
   vertical-align: top;
diff --git a/resources/assets/less/skins/skin-contrast.less b/resources/assets/less/skins/skin-contrast.less
index f66e76676b..eba7001b0b 100644
--- a/resources/assets/less/skins/skin-contrast.less
+++ b/resources/assets/less/skins/skin-contrast.less
@@ -84,7 +84,13 @@
     color: #fff;
   }
 }
-
+a.btn.btn-link.text-left{
+  color:@navy;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover{
+  color:@navy;
+}
 
 a {
   color: @navy;
@@ -102,10 +108,6 @@ a.btn {
   &:hover {
     color: #fff;
     text-decoration: underline;
-
-  }
-  &:visited {
-    color: #fff;
   }
 }
 
diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less
index 80937c66bd..a69f918acf 100644
--- a/resources/assets/less/skins/skin-green-dark.less
+++ b/resources/assets/less/skins/skin-green-dark.less
@@ -131,6 +131,35 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+a.actions {
+  color:#fff !important;
+}
+//pagination
+.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);
@@ -154,10 +183,6 @@ a {
   color: var(--text-main);
 }
 
-a:link {
-  color: var(--link);
-}
-
 .btn-primary.hover {
   color: var(--nav-link);
 }
@@ -288,10 +313,6 @@ input[type=text], input[type=search] {
 .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);
@@ -327,7 +348,7 @@ input[type=text], input[type=search] {
   color: var(--text-main);
 }
 .skin-green-dark .main-header .navbar .dropdown-menu li a {
-  color: var(--header);
+  color: var(--link);
 }
 .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;
@@ -363,6 +384,12 @@ a {
     color: var(--visited-link)
   }
 }
+#customFieldsTable a[href*='/models'] {
+  color: var(--back-sub);
+}
+#customFieldsTable a[href*='/fieldsets']{
+  background-color: transparent;
+}
 
 .row-striped {
   vertical-align: top;
diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less
index a62403d416..98925b475e 100644
--- a/resources/assets/less/skins/skin-orange-dark.less
+++ b/resources/assets/less/skins/skin-orange-dark.less
@@ -119,6 +119,35 @@ li.dropdown-item-marker {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+a.actions {
+  color:#fff !important;
+}
+//pagination
+.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);
@@ -352,6 +381,12 @@ input[type=text], input[type=search] {
 .box-header.with-border {
   border-bottom: #000;
 }
+#customFieldsTable a[href*='/models'] {
+  color: var(--back-sub);
+}
+#customFieldsTable a[href*='/fieldsets']{
+  background-color: transparent;
+}
 
 .row-striped {
   vertical-align: top;
diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less
index 10c8fbfb3c..10868045af 100644
--- a/resources/assets/less/skins/skin-purple-dark.less
+++ b/resources/assets/less/skins/skin-purple-dark.less
@@ -132,6 +132,32 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.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);
@@ -299,7 +325,7 @@ input[type=text], input[type=search] {
 }
 .navbar-nav>.tasks-menu>.dropdown-menu>li.header {
   background-color: var(--back-main);
-  color: var(--header);
+  color: var(--link);
 }
 .open>.dropdown-toggle.btn-default {
   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 b5e3c96c62..3fded5f067 100644
--- a/resources/assets/less/skins/skin-red-dark.less
+++ b/resources/assets/less/skins/skin-red-dark.less
@@ -58,8 +58,6 @@
   }
 }
 
-
-
 .btn, .btn:hover {
   color: #fff;
 
@@ -135,6 +133,32 @@ a {
   color: var(--back-main);
 }
 
+//pagination
+.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: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);
@@ -161,14 +185,12 @@ a {
 a:link {
   color: var(--link);
 }
-
-a:visited {
-  color: var(--nav-link);
-}
-
 a:hover {
   color: var(--hover-link);
 }
+a:visited {
+  color: var(--nav-link);
+}
 .far fa-life-ring{
   color:var(--link);
 }
@@ -209,7 +231,6 @@ body {
 }
 .btn-default{
   background-color: var(--back-sub);
-  color: var(--link);
 }
 
 .btn-default dropdown-toggle {
@@ -356,7 +377,6 @@ input[type=text], input[type=search] {
 }
 .table-striped>tbody>tr:nth-of-type(even){
   background-color: var(--back-sub-alt);
-  color: var(--text-alt);
 }
 #webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
@@ -365,21 +385,31 @@ input[type=text], input[type=search] {
 .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);
 
   &:link {
-    color: var(--link)  }
+    color: var(--nav-link);
+  }
   &:hover {
-    color: var(--hover-link);
+    color: var(--nav-link);
     text-decoration: underline;
   }
   &:visited {
-    color: var(--visited-link)
+    color: var(--nav-link);
   }
 }
-
+#customFieldsTable a[href*='/models'] {
+  color: var(--back-sub);
+}
+#customFieldsTable a[href*='/fieldsets']{
+  background-color: transparent;
+}
 .row-striped {
   vertical-align: top;
   line-height: 2.6;
diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less
index b1688c09ac..c111cb122c 100644
--- a/resources/assets/less/skins/skin-yellow-dark.less
+++ b/resources/assets/less/skins/skin-yellow-dark.less
@@ -52,7 +52,6 @@
 }
 
 .btn, .btn:hover {
-  color: #000;
 
   &.btn-primary, .btn-primary:link {
     background-color: var(--button-default);
@@ -60,7 +59,6 @@
     color: #545454;
   }
 
-
   &a.btn-primary:hover {
     background-color: var(--button-hover);
     border-color: var(--button-hover);
@@ -77,7 +75,12 @@
     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
  */
@@ -125,21 +128,44 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.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: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);
   background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);
   border-color: var(--header);
 }
-.label-default{
-  background-color:var(--back-sub);
-}
 a.btn.btn-default{
   color:var(--nav-link);
 }
 .bootstrap-table .fixed-table-container .table thead th .sortable {
-  color: var(--nav-link);
+  color: var(--text-main);
 }
 .bootstrap-table .fixed-table-toolbar .columns label {
   color:#000;
@@ -329,12 +355,9 @@ input[type=text], input[type=search] {
 .skin-yellow-dark .main-header .navbar .dropdown-menu li a {
   color: var(--header);
 }
-div.th-inner{
+tr th div.th-inner {
   color:var(--text-main);
 }
-.fixed-table-body thead th .th-inner, .skin-yellow-dark, .skin-yellow {
-  background-color: var(--header)!important;
-}
 .tab-content, .tab-pane {
   background-color: var(--back-main);
   color: var(--text-main);
diff --git a/resources/lang/af/admin/accessories/general.php b/resources/lang/af/admin/accessories/general.php
index fb4968061a..9c8e527625 100644
--- a/resources/lang/af/admin/accessories/general.php
+++ b/resources/lang/af/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Opdatering bywerk',
     'use_default_eula'					=> 'Gebruik eerder die <a href="#" data-toggle="modal" data-target="#eulaModal">primary standaard EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Gebruik die primêre standaardverlof in plaas daarvan.</del> Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/af/admin/accessories/message.php b/resources/lang/af/admin/accessories/message.php
index 36c2fd100b..68fe79fc31 100644
--- a/resources/lang/af/admin/accessories/message.php
+++ b/resources/lang/af/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/af/admin/asset_maintenances/form.php b/resources/lang/af/admin/asset_maintenances/form.php
index eb6caf5937..8734717e2a 100644
--- a/resources/lang/af/admin/asset_maintenances/form.php
+++ b/resources/lang/af/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Onderhoudstipe',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titel',
-        'start_date'             => 'begin',
-        'completion_date'        => 'voltooi',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'koste',
         'is_warranty'            => 'Garantieverbetering',
-        'asset_maintenance_time' => 'dae',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'notas',
-        'update'                 => 'Opdateer',
-        'create'                 => 'Skep'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/af/admin/categories/message.php b/resources/lang/af/admin/categories/message.php
index 85103589b2..6b01196c2b 100644
--- a/resources/lang/af/admin/categories/message.php
+++ b/resources/lang/af/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorie is nie opgedateer nie, probeer asseblief weer',
-        'success' => 'Kategorie suksesvol opgedateer.'
+        'success' => 'Kategorie suksesvol opgedateer.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/af/admin/components/general.php b/resources/lang/af/admin/components/general.php
index 61ea3b215d..77bf2f615e 100644
--- a/resources/lang/af/admin/components/general.php
+++ b/resources/lang/af/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'oorblywende',
     'total' 			                 => 'totale',
     'update'                            => 'Opdateer komponent',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/af/admin/components/message.php b/resources/lang/af/admin/components/message.php
index a841a29e6d..e2bbfb92ed 100644
--- a/resources/lang/af/admin/components/message.php
+++ b/resources/lang/af/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponent is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Komponent is suksesvol nagegaan.',
-        'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
+        'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/af/admin/consumables/message.php b/resources/lang/af/admin/consumables/message.php
index 0dca909303..20999a76ff 100644
--- a/resources/lang/af/admin/consumables/message.php
+++ b/resources/lang/af/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Verbruiksgoedere is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Verbruiksgoedere is suksesvol nagegaan.',
-        'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
+        'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/af/admin/custom_fields/general.php b/resources/lang/af/admin/custom_fields/general.php
index 7137cf3b30..5821f4bbf2 100644
--- a/resources/lang/af/admin/custom_fields/general.php
+++ b/resources/lang/af/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Gebruik deur modelle',
     'order'   		            => 'Orde',
     'create_fieldset'         => 'Nuwe 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'            => 'Nuwe aangepaste veld',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/af/admin/groups/message.php b/resources/lang/af/admin/groups/message.php
index 8a9f6e8fa1..5ea896ce7e 100644
--- a/resources/lang/af/admin/groups/message.php
+++ b/resources/lang/af/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Groep bestaan ​​reeds!',
-    'group_not_found'     => 'Groep [: id] bestaan ​​nie.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Die naam veld is nodig',
 
     'success' => array(
diff --git a/resources/lang/af/admin/hardware/form.php b/resources/lang/af/admin/hardware/form.php
index 2331413364..8f6517acd1 100644
--- a/resources/lang/af/admin/hardware/form.php
+++ b/resources/lang/af/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Bevestig bates vir die verwydering van grootmaat',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Hersien die bates vir grootmaatverwydering hieronder. Sodra dit verwyder is, kan hierdie bates herstel word, maar hulle word nie meer geassosieer met enige gebruikers wat hulle tans toegewys is nie.',
+  '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'	=> 'Jy is op die punt om te verwyder: bate_count bates.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Grootskaalse opdateringsbates',
     'bulk_update_help'	=> 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/af/admin/hardware/general.php b/resources/lang/af/admin/hardware/general.php
index c6fc9f0bb9..9194e11782 100644
--- a/resources/lang/af/admin/hardware/general.php
+++ b/resources/lang/af/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Wysig bate',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'versoek',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Herstel bate',
     'pending'  					=> 'hangende',
     'undeployable'  			=> 'Undeployable',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/af/admin/hardware/message.php b/resources/lang/af/admin/hardware/message.php
index a408a43f0c..4612a20d98 100644
--- a/resources/lang/af/admin/hardware/message.php
+++ b/resources/lang/af/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Bate is nie herstel nie, probeer asseblief weer',
         'success' 		=> 'Bate herstel suksesvol.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/af/admin/hardware/table.php b/resources/lang/af/admin/hardware/table.php
index 7595033684..1ec32fa16e 100644
--- a/resources/lang/af/admin/hardware/table.php
+++ b/resources/lang/af/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In uit',
     'checkout_date' => 'Checkout Datum',
     'checkoutto' 	=> 'Gekontroleer',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'diff',
     'dl_csv' 		=> 'Laai CSV af',
diff --git a/resources/lang/af/admin/licenses/general.php b/resources/lang/af/admin/licenses/general.php
index 7b4f741389..3eece139af 100644
--- a/resources/lang/af/admin/licenses/general.php
+++ b/resources/lang/af/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Oor lisensies',
-    'about_licenses'                  => 'Lisensies word gebruik om sagteware op te spoor. Hulle het \'n gespesifiseerde aantal sitplekke wat aan individue nagekeken kan word',
+    'about_licenses_title'      => 'Oor lisensies',
+    'about_licenses'            => 'Lisensies word gebruik om sagteware op te spoor. Hulle het \'n gespesifiseerde aantal sitplekke wat aan individue nagekeken kan word',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Afhandeling Geskiedenis',
     'checkout'  				=> 'Checkout License Seat',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Sagteware lisensies',
     'user'  					=> 'gebruiker',
     'view'  					=> 'Bekyk lisensie',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/af/admin/manufacturers/message.php b/resources/lang/af/admin/manufacturers/message.php
index fa3c570978..3a1b017807 100644
--- a/resources/lang/af/admin/manufacturers/message.php
+++ b/resources/lang/af/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Vervaardiger bestaan ​​nie.',
     'assoc_users'	 => 'Hierdie vervaardiger word tans geassosieer met ten minste een model en kan nie verwyder word nie. Dateer asseblief jou modelle op om nie meer hierdie vervaardiger te gebruik nie en probeer weer.',
 
diff --git a/resources/lang/af/admin/manufacturers/table.php b/resources/lang/af/admin/manufacturers/table.php
index cb869350ab..de3fedaf48 100644
--- a/resources/lang/af/admin/manufacturers/table.php
+++ b/resources/lang/af/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Ondersteunings-e-pos',
     'support_phone'   		=> 'Ondersteuningsfoon',
     'support_url'   		=> 'Ondersteunings-URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Fabrikant',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/af/admin/models/general.php b/resources/lang/af/admin/models/general.php
index 522061cfc7..e036502985 100644
--- a/resources/lang/af/admin/models/general.php
+++ b/resources/lang/af/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Herstel Model',
     'requestable'               => 'Gebruikers kan hierdie model aanvra',
 	'show_mac_address'			      => 'Wys MAC adres veld in bates in hierdie model',
diff --git a/resources/lang/af/admin/models/message.php b/resources/lang/af/admin/models/message.php
index 3c09500b07..6f9f4e4d3e 100644
--- a/resources/lang/af/admin/models/message.php
+++ b/resources/lang/af/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model bestaan ​​nie.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model is nie opgedateer nie, probeer asseblief weer',
-        'success' => 'Model suksesvol opgedateer.'
+        'success' => 'Model suksesvol opgedateer.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Geen velde is verander nie, so niks is opgedateer nie.',
-        'success' 		=> 'Modelle opgedateer.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/af/admin/settings/general.php b/resources/lang/af/admin/settings/general.php
index 2b79f41d6a..0d76d3d592 100644
--- a/resources/lang/af/admin/settings/general.php
+++ b/resources/lang/af/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Dit is \'n Active Directory-bediener',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Alerts aangeskakel',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP-instellings',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Naam',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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-weergawe',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/af/admin/settings/message.php b/resources/lang/af/admin/settings/message.php
index 275f446e5e..3375a85ce0 100644
--- a/resources/lang/af/admin/settings/message.php
+++ b/resources/lang/af/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/af/admin/users/general.php b/resources/lang/af/admin/users/general.php
index 48ba9cf5c6..735893a729 100644
--- a/resources/lang/af/admin/users/general.php
+++ b/resources/lang/af/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.',
+    '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',
     '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'         => 'Sien gebruiker: naam',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/af/admin/users/message.php b/resources/lang/af/admin/users/message.php
index c1b46ab57f..fb48c59da6 100644
--- a/resources/lang/af/admin/users/message.php
+++ b/resources/lang/af/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 [: id] bestaan ​​nie.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Die aanmeldingsveld is nodig',
     'user_password_required'    => 'Die wagwoord is nodig.',
     'insufficient_permissions'  => 'Onvoldoende Toestemmings.',
diff --git a/resources/lang/af/auth/general.php b/resources/lang/af/auth/general.php
index 4fc408fd3b..a997ada792 100644
--- a/resources/lang/af/auth/general.php
+++ b/resources/lang/af/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Onthou my',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
index 2df45287d2..e15140fd7d 100644
--- a/resources/lang/af/general.php
+++ b/resources/lang/af/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'bykomstighede',
     'activated'			    => 'geaktiveer',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Bykomstigheid',
     'accessory_report'		=> 'Toebehoreverslag',
     'action'                => 'aksie',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'oudit',
     'audit_report'			=> 'Ouditlogboek',
     'assets'				=> 'bates',
+    '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'         => 'Verwyder Avatar',
     'avatar_upload'         => 'Laai avatar op',
     'back'      			=> 'terug',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'kanselleer',
     'categories'			=> 'kategorieë',
@@ -83,6 +92,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.',
     'deleted'  				=> 'geskrap',
     'delete_seats'  		=> 'Plekke verwyder',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'invoer',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'item',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Onvoldoende toestemmings!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Taal',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Versoek gekanselleer',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Kies',
     'select_all'            => 'Select All',
     'search'				=> 'Soek',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Handtekening',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Sommige funksies is afgeskakel vir hierdie installasie.',
     'site_name'				=> 'Site Naam',
     'state'  				=> 'staat',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Is jy seker jy wil verwyder',
     'submit'				=> 'Indien',
     'target'                => 'teiken',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Tyd en datum vertoon',
     'total_assets'			=> 'totale bates',
     'total_licenses'		=> 'totale lisensies',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/af/help.php b/resources/lang/af/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/af/help.php
+++ b/resources/lang/af/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/af/localizations.php b/resources/lang/af/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/af/localizations.php
+++ b/resources/lang/af/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/af/mail.php b/resources/lang/af/mail.php
index 8cf581c0ec..60d990e312 100644
--- a/resources/lang/af/mail.php
+++ b/resources/lang/af/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Teken in op jou nuwe Snipe-IT-installasie deur die volgende inligting te gebruik:',
     'login' => 'Teken aan:',
     'Low_Inventory_Report' => 'Lae voorraadverslag',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'naam',
     'new_item_checked' => '\'N Nuwe item is onder u naam nagegaan, besonderhede is hieronder.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Jou Snipe-IT-referenties',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/af/validation.php b/resources/lang/af/validation.php
index 2de84f25b4..a4eb0e4316 100644
--- a/resources/lang/af/validation.php
+++ b/resources/lang/af/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Die: Attribuut moet ten minste: min items hê.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Die gekose: attribuut is ongeldig.',
     'numeric'              => 'Die: Attribuut moet \'n nommer wees.',
     'present'              => 'Die: attribuut veld moet teenwoordig wees.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Jou huidige wagwoord is verkeerd',
         'dumbpwd'          => 'Daardie wagwoord is te algemeen.',
         'statuslabel_type' => 'U moet \'n geldige statusetiket tipe kies',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/am/admin/accessories/general.php b/resources/lang/am/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/am/admin/accessories/general.php
+++ b/resources/lang/am/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/am/admin/accessories/message.php b/resources/lang/am/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/am/admin/accessories/message.php
+++ b/resources/lang/am/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/am/admin/asset_maintenances/form.php b/resources/lang/am/admin/asset_maintenances/form.php
index 2aa005c45f..785d06b08f 100644
--- a/resources/lang/am/admin/asset_maintenances/form.php
+++ b/resources/lang/am/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'Completed',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/am/admin/categories/message.php b/resources/lang/am/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/am/admin/categories/message.php
+++ b/resources/lang/am/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/am/admin/components/general.php b/resources/lang/am/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/am/admin/components/general.php
+++ b/resources/lang/am/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/am/admin/components/message.php b/resources/lang/am/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/am/admin/components/message.php
+++ b/resources/lang/am/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/am/admin/consumables/message.php b/resources/lang/am/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/am/admin/consumables/message.php
+++ b/resources/lang/am/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/am/admin/custom_fields/general.php b/resources/lang/am/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/am/admin/custom_fields/general.php
+++ b/resources/lang/am/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/am/admin/groups/message.php b/resources/lang/am/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/am/admin/groups/message.php
+++ b/resources/lang/am/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/am/admin/hardware/form.php b/resources/lang/am/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/am/admin/hardware/form.php
+++ b/resources/lang/am/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/am/admin/hardware/general.php b/resources/lang/am/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/am/admin/hardware/general.php
+++ b/resources/lang/am/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/am/admin/hardware/message.php b/resources/lang/am/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/am/admin/hardware/message.php
+++ b/resources/lang/am/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/am/admin/hardware/table.php b/resources/lang/am/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/am/admin/hardware/table.php
+++ b/resources/lang/am/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/am/admin/licenses/general.php b/resources/lang/am/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/am/admin/licenses/general.php
+++ b/resources/lang/am/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/am/admin/manufacturers/message.php b/resources/lang/am/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/am/admin/manufacturers/message.php
+++ b/resources/lang/am/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/am/admin/manufacturers/table.php b/resources/lang/am/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/am/admin/manufacturers/table.php
+++ b/resources/lang/am/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/am/admin/models/general.php b/resources/lang/am/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/am/admin/models/general.php
+++ b/resources/lang/am/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/am/admin/models/message.php b/resources/lang/am/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/am/admin/models/message.php
+++ b/resources/lang/am/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/am/admin/settings/general.php b/resources/lang/am/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/am/admin/settings/general.php
+++ b/resources/lang/am/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/am/admin/settings/message.php b/resources/lang/am/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/am/admin/settings/message.php
+++ b/resources/lang/am/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/am/admin/users/general.php b/resources/lang/am/admin/users/general.php
index daa568e8bf..b097ccec69 100644
--- a/resources/lang/am/admin/users/general.php
+++ b/resources/lang/am/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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/am/admin/users/message.php b/resources/lang/am/admin/users/message.php
index 247a1b321e..adf26b3229 100644
--- a/resources/lang/am/admin/users/message.php
+++ b/resources/lang/am/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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/am/auth/general.php b/resources/lang/am/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/am/auth/general.php
+++ b/resources/lang/am/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/am/general.php b/resources/lang/am/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/am/general.php
+++ b/resources/lang/am/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/am/help.php b/resources/lang/am/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/am/help.php
+++ b/resources/lang/am/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/am/localizations.php b/resources/lang/am/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/am/localizations.php
+++ b/resources/lang/am/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/am/mail.php b/resources/lang/am/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/am/mail.php
+++ b/resources/lang/am/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/am/validation.php b/resources/lang/am/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/am/validation.php
+++ b/resources/lang/am/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ar/admin/accessories/general.php b/resources/lang/ar/admin/accessories/general.php
index ca72ba694c..44eab533cd 100644
--- a/resources/lang/ar/admin/accessories/general.php
+++ b/resources/lang/ar/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'تحديث الملحق',
     'use_default_eula'					=> 'قم باستعمال <a href="#" data-toggle="modal" data-target="#eulaModal">اتفاقية ترخيص المستخدم الافتراضية الاساسية</a>.',
     'use_default_eula_disabled'			=> '<del>استخدام (اتفاقية ترخيص المستخدم) الافتراضية الأساسية بدلا من ذلك.</del> لم يتم تحديد (اتفاقية ترخيص المستخدم) الافتراضية الأساسية. الرجاء إضافتها في الإعدادات.',
+    'clone'                             => 'استنساخ الملحق',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ar/admin/accessories/message.php b/resources/lang/ar/admin/accessories/message.php
index 9c4ee00a22..a5b1b7b5e5 100644
--- a/resources/lang/ar/admin/accessories/message.php
+++ b/resources/lang/ar/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'لم يتم إخراج الملحق، الرجاء المحاولة مرة أخرى',
         'success' 		=> 'تم إخراج الملحق بنجاح.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
     ),
 
diff --git a/resources/lang/ar/admin/asset_maintenances/form.php b/resources/lang/ar/admin/asset_maintenances/form.php
index 26921bab04..6c98bfa556 100644
--- a/resources/lang/ar/admin/asset_maintenances/form.php
+++ b/resources/lang/ar/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'نوع الصيانة',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'المسمى',
-        'start_date'             => 'بدأت',
-        'completion_date'        => 'أنجزت',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'التكلفة',
         'is_warranty'            => 'تحسين الضمان',
-        'asset_maintenance_time' => 'أيام',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'مُلاحظات',
-        'update'                 => 'تعديل',
-        'create'                 => 'إنشاء'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ar/admin/categories/message.php b/resources/lang/ar/admin/categories/message.php
index 275321cecb..4440c670fb 100644
--- a/resources/lang/ar/admin/categories/message.php
+++ b/resources/lang/ar/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'لقد فشل تحديث التصنيف، الرجاء المحاولة مرة أخرى',
-        'success' => 'تم تحديث التصنيف بنجاح.'
+        'success' => 'تم تحديث التصنيف بنجاح.',
+        'cannot_change_category_type'   => 'لا يمكنك تغيير نوع الفئة بمجرد إنشائها',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ar/admin/components/general.php b/resources/lang/ar/admin/components/general.php
index a99b2336f1..538c2e516b 100644
--- a/resources/lang/ar/admin/components/general.php
+++ b/resources/lang/ar/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'المتبقية',
     'total' 			                 => 'المجموع',
     'update'                            => 'تحديث مكون',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/ar/admin/components/message.php b/resources/lang/ar/admin/components/message.php
index c2b1931214..9b06c537df 100644
--- a/resources/lang/ar/admin/components/message.php
+++ b/resources/lang/ar/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'لم تتم عملية اخراج المكون، الرجاء المحاولة مرة اخرى',
         'success' 		=> 'تم إخراج المكون بنجاح.',
-        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
+        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.',
+        'unavailable'      => 'لا توجد عناصر كافية remaining: :remaining متبقية، :requested مطلوبة ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ar/admin/consumables/message.php b/resources/lang/ar/admin/consumables/message.php
index 8819d48fde..96f256ac50 100644
--- a/resources/lang/ar/admin/consumables/message.php
+++ b/resources/lang/ar/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'لم يتم إخراج المادة الإستهلاكية، الرجاء المحاولة مرة اخرى',
         'success' 		=> 'تم إخراج المادة الإستهلاكية بنجاح.',
-        'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.'
+        'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ar/admin/custom_fields/general.php b/resources/lang/ar/admin/custom_fields/general.php
index 31f1694fa9..2ed06bd1f6 100644
--- a/resources/lang/ar/admin/custom_fields/general.php
+++ b/resources/lang/ar/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'مستخدم في الموديلات',
     'order'   		            => 'طلب',
     'create_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'            => 'حقل جديد مخصص',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ar/admin/groups/message.php b/resources/lang/ar/admin/groups/message.php
index 56e9755c0b..3712859192 100644
--- a/resources/lang/ar/admin/groups/message.php
+++ b/resources/lang/ar/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'المجموعة موجودة مسبقا!',
-    'group_not_found'     => 'المجموعة رقم :id غير موجودة.',
+    'group_not_found'     => 'معرف المجموعة :id غير موجود.',
     'group_name_required' => 'حقل الإسم اجباري',
 
     'success' => array(
diff --git a/resources/lang/ar/admin/hardware/form.php b/resources/lang/ar/admin/hardware/form.php
index 47fbf21429..45c8447eb2 100644
--- a/resources/lang/ar/admin/hardware/form.php
+++ b/resources/lang/ar/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'تاكيد إجراء حذف للاُصول المحددة',
+    'bulk_restore'      => 'تأكيد استعادة الأصول بالجملة', 
   'bulk_delete_help'	=> 'الرجاء مراجعة الأصول المحددة للحذف أدناه. بمجرد الحذف، يمكن استعادة هذه الأصول، لكنها لن تكون مرتبطة مع أي من المستخدمين اللذين تم اخراج الأصول لهم من قبل.',
+  'bulk_restore_help'	=> 'مراجعة الأصول للاستعادة بالجملة أدناه. بمجرد إعادتها لن تكون هذه الأصول مرتبطة بأي مستعملين سبق تعيينهم.',
   'bulk_delete_warn'	=> 'أنت على وشك حذف :asset_count من الأصول.',
+  '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'معالجة... (قد يستغرق هذا بعض الوقت على ملفات كبيرة)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ar/admin/hardware/general.php b/resources/lang/ar/admin/hardware/general.php
index f6718b34bb..2e3b1dc843 100644
--- a/resources/lang/ar/admin/hardware/general.php
+++ b/resources/lang/ar/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'تم حذف هذا الأصل.',
     'edit'  					=> 'تعديل الأصل',
     'model_deleted'  			=> 'تم حذف موديل الأصول هذا. يجب استعادة الموديل قبل أن تتمكن من استعادة الأصل.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'قابل للطلب',
     'requested'				    => 'تم الطلب',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'استعادة الأصل',
     'pending'  					=> 'قيد الانتظار',
     'undeployable'  			=> 'غير قابل للتوزيع',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ar/admin/hardware/message.php b/resources/lang/ar/admin/hardware/message.php
index 4103f9dd7f..8a2611885f 100644
--- a/resources/lang/ar/admin/hardware/message.php
+++ b/resources/lang/ar/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'لم تتم استعادة الأصل، يرجى إعادة المحاولة',
         'success' 		=> 'تمت استعادة الأصل بنجاح.',
+        'bulk_success' 		=> 'تمت استعادة الأصل بنجاح.',
+        'nothing_updated'   => 'ولم يتم اختيار أي أصول، وبالتالي لم يتم استعادة أي شيء.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'تم استيراد الملف الخاص بك',
         'file_delete_success'   => 'تم حذف ملفك بنجاح',
         'file_delete_error'      => 'تعذر حذف الملف',
+        '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',
     ],
 
 
diff --git a/resources/lang/ar/admin/hardware/table.php b/resources/lang/ar/admin/hardware/table.php
index 84c7afc762..f5c2800398 100644
--- a/resources/lang/ar/admin/hardware/table.php
+++ b/resources/lang/ar/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'ادخال \\ اخراج',
     'checkout_date' => 'تاريخ الاخراج',
     'checkoutto' 	=> 'الاخراج',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'الفرق',
     'dl_csv' 		=> 'التنزيل كملف CSV',
diff --git a/resources/lang/ar/admin/licenses/general.php b/resources/lang/ar/admin/licenses/general.php
index 9a9e0df1b7..3040d05bcb 100644
--- a/resources/lang/ar/admin/licenses/general.php
+++ b/resources/lang/ar/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'حول التراخيص',
-    'about_licenses'                  => 'تستخدم التراخيص لتتبع البرمجيات. كل لديه عدد محدد من المقاعد التي يمكن اخراجها للأفراد',
+    'about_licenses_title'      => 'حول التراخيص',
+    'about_licenses'            => 'تستخدم التراخيص لتتبع البرمجيات. كل لديه عدد محدد من المقاعد التي يمكن اخراجها للأفراد',
     'checkin'  					=> 'ادخال مقعد الترخيص',
     'checkout_history'  		=> 'أرشيف الاخراج',
     'checkout'  				=> 'اخراج مقعد ترخيص',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'تراخيص البرامج',
     'user'  					=> 'مستخدم',
     'view'  					=> 'عرض الترخيص',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ar/admin/locations/message.php b/resources/lang/ar/admin/locations/message.php
index 9b4b03fc49..547b5db18a 100644
--- a/resources/lang/ar/admin/locations/message.php
+++ b/resources/lang/ar/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'هذا الموقع مرتبط حاليا بمستخدم واحد على الأقل ولا يمكن حذفه. يرجى تحديث المستخدمين لم يعد يشيروا إلى هذا الموقع ثم أعد المحاولة. ',
     'assoc_assets'	 => 'هذا الموقع مرتبط حاليا بمادة عرض واحدة على الأقل ولا يمكن حذفها. يرجى تحديث مواد العرض لم تعد تشير إلى هذا الموقع ثم أعد المحاولة. ',
     'assoc_child_loc'	 => 'هذا الموقع هو حاليا أحد الوالدين لموقع طفل واحد على الأقل ولا يمكن حذفه. يرجى تحديث مواقعك لم تعد تشير إلى هذا الموقع ثم أعد المحاولة.',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'الأصول المعينة',
+    'current_location' => 'الموقع الحالي',
 
 
     'create' => array(
diff --git a/resources/lang/ar/admin/locations/table.php b/resources/lang/ar/admin/locations/table.php
index 1a6ce3f8e9..7a05d8c8e0 100644
--- a/resources/lang/ar/admin/locations/table.php
+++ b/resources/lang/ar/admin/locations/table.php
@@ -20,21 +20,21 @@ return [
     'parent'                    => 'الأبوين',
     'currency'                  => 'عملة الموقع',
     'ldap_ou'                   => 'لداب البحث أو',
-    'user_name'                 => 'User Name',
-    'department'                => 'Department',
-    'location'                  => 'Location',
-    'asset_tag'                 => 'Assets Tag',
-    'asset_name'                => 'Name',
-    'asset_category'            => 'Category',
-    'asset_manufacturer'        => 'Manufacturer',
-    'asset_model'               => 'Model',
-    'asset_serial'              => 'Serial',
-    'asset_location'            => 'Location',
-    'asset_checked_out'         => 'Checked Out',
-    'asset_expected_checkin'    => 'Expected Checkin',
-    'date'                      => 'Date:',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'user_name'                 => 'اسم المستخدم',
+    'department'                => 'القسم',
+    'location'                  => 'الموقع',
+    'asset_tag'                 => 'علامة الأصول',
+    'asset_name'                => 'الإسم',
+    'asset_category'            => 'الفئة',
+    'asset_manufacturer'        => 'الجهة المنتجة',
+    'asset_model'               => 'النموذج',
+    'asset_serial'              => 'التسلسل',
+    'asset_location'            => 'المكان',
+    'asset_checked_out'         => 'الاخراج',
+    'asset_expected_checkin'    => 'تاريخ الادخال المتوقع',
+    'date'                      => 'التاريخ:',
+    'signed_by_asset_auditor'   => 'موقعة من قبل (مراجع الأصل):',
+    'signed_by_finance_auditor' => 'موقعة من قبل (مراجع الحسابات المالي):',
+    'signed_by_location_manager' => 'توقيع بواسطة (مدير الموقع):',
+    'signed_by'                 => 'تم توقيعه من قبل:',
 ];
diff --git a/resources/lang/ar/admin/manufacturers/message.php b/resources/lang/ar/admin/manufacturers/message.php
index 569536b9ff..261039cada 100644
--- a/resources/lang/ar/admin/manufacturers/message.php
+++ b/resources/lang/ar/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'الشركة المصنعة غير موجودة.',
     'assoc_users'	 => 'هذه الشركة المصنعة مرتبطة حاليا مع موديل واحد على الأقل وبالتالي لا يمكن حذفها. يرجى تحديث الموديلات الخاصة بك بحيث لا تشير لهذه الشركة المصنعة وحاول مرة أخرى. ',
 
diff --git a/resources/lang/ar/admin/manufacturers/table.php b/resources/lang/ar/admin/manufacturers/table.php
index ff5f3cff63..936ef8d762 100644
--- a/resources/lang/ar/admin/manufacturers/table.php
+++ b/resources/lang/ar/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'دعم البريد الإلكتروني',
     'support_phone'   		=> 'دعم الهاتف',
     'support_url'   		=> 'رابط الدعم التقني',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'تحديث الشركة المصنعة',
     'url'   				=> 'الرابط',
 
diff --git a/resources/lang/ar/admin/models/general.php b/resources/lang/ar/admin/models/general.php
index 94e438651b..df6fda1a4d 100644
--- a/resources/lang/ar/admin/models/general.php
+++ b/resources/lang/ar/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'تم حذف هذا الموديل.',
     'bulk_delete'               => 'حذف موديلات الاصول بالجملة',
     'bulk_delete_help'               => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
-    'bulk_delete_warn'          => 'أنت على وشك حذف :model_count من موديلات الأصول.',
+    'bulk_delete_warn'          => 'أنت على وشك حذف نموذج واحد للأصول.|أنت على وشك حذف :model_count من نماذج الأصول.',
     'restore'                   => 'إستعادة الموديل',
     'requestable'               => 'يمكن للمستخدمين طلب هذا الموديل',
 	'show_mac_address'			      => 'عرض حقل عنوان ماك MAC في الأصول لهذا الموديل',
diff --git a/resources/lang/ar/admin/models/message.php b/resources/lang/ar/admin/models/message.php
index e690990305..5a3cb89382 100644
--- a/resources/lang/ar/admin/models/message.php
+++ b/resources/lang/ar/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'الموديل غير موجود.',
+    'no_association' => 'غير مرتبط بنموذج.',
+    'no_association_fix' => 'سيؤدي هذا إلى كسر الأمور بطرق غريبة وفظيعة. قم بتعديل هذا الأصل الآن لربطه بنموذج.',
     'assoc_users'	 => 'هذا الموديل مرتبط حاليا بواحد أو أكثر من الأصول ولا يمكن حذفه. يرجى حذف الأصول، ثم محاولة الحذف مرة أخرى. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'لم يتم تحديث الموديل، يرجى إعادة المحاولة',
-        'success' => 'تم تحديث الموديل بنجاح.'
+        'success' => 'تم تحديث الموديل بنجاح.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'لم يتم تغيير أي حقول، لذلك لم يتم تحديث أي شيء.',
-        'success' 		=> 'تم تحديث الموديل.'
+        'success' 		=> 'تم تحديث النموذج بنجاح. |تم تحديث :model_count نموذج بنجاح.',
+        'warn'          => 'أنت على وشك تحديث خصائص النموذج التالي model: |أنت على وشك تعديل خصائص :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'لم يتم اختيار أي موديلات، لذلك لم يتم حذف أي شيء.',
-        'success' 		    => 'تم حذف success_count: من الموديلات!',
+        'success' 		    => 'تم حذف النموذج!|تم حذف :success_count نموذج!',
         'success_partial' 	=> 'تم حذف:success_count: من الموديلات، ومع ذلك تعذر حذف fail_count: نظرًا لأنها لا تزال تحتوي على أصول مقترنة بها.'
     ),
 
diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php
index b235699bc5..923762f0c2 100644
--- a/resources/lang/ar/admin/settings/general.php
+++ b/resources/lang/ar/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'إذا كنت ترغب في إرسال نسخة من رسائل البريد الإلكتروني لتسجيل الدخول / الخروج التي يتم إرسالها إلى المستخدمين إلى حساب بريد إلكتروني إضافي، فقم بإدخالها هنا. خلاف ذلك، اترك هذه الخانة فارغة.',
     'is_ad'				        => 'هذا هو ملقم أكتيف ديركتوري',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'تحديث إعدادات الإشعارات',
     'alert_email'				=> 'إرسال تنبيهات إلى',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'التنبيهان ممكنه',
@@ -32,7 +32,7 @@ return [
     '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_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'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'إعدادات الباركود',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'أدخل اسم مستخدم وكلمة مرور LDAP من الاسم المميز الأساسي DN الذي حددته أعلاه لاختبار ما إذا كان قد تمت تهيئة معلومات تسجيل الدخول إلى LDAP بشكل صحيح أم لا. يجب حفظ تحديث LDAP الخاص بك أولا.',
     'ldap_login_sync_help'      => 'هذا يختبر فقط أن LDAP يستطيع المزامنة بشكل صحيح. إذا كان استعلام التوثيق الى LDAP الخاص بك غير صحيح، قد لا يزال المستخدمون غير قادرين على تسجيل الدخول. يجب عليك اولا حفظ اي تغييرات في إعدادات LDAP.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'إظهار الصور في رسائل البريد الإلكتروني',
     'show_images_in_email_help'   => 'قم بإلغاء تحديد هذا المربع إذا كان تثبيت Snipe-IT وراء شبكة VPN أو شبكة مغلقة ولن يتمكن المستخدمون خارج الشبكة من تحميل الصور التي يخدمها هذا التثبيت في رسائل البريد الإلكتروني الخاصة بهم.',
     'site_name'                 => 'اسم الموقع',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'سلاك بوتنام',
-    'slack_channel'             => 'قناة سلاك',
-    'slack_endpoint'            => 'نقطة نهاية سلاك',
-    'slack_integration'         => 'إعدادات سلاك',
-    'slack_integration_help'    => 'التكامل الأسود اختياري، ولكن نقطة النهاية والقناة مطلوبة إذا كنت ترغب في استخدامها. لتكوين تكامل Slack ، يجب أولاً <a href=":slack_link" target="_new" rel="noopener">إنشاء ويب هوك وارد</a> على حساب Slack الخاص بك. انقر على زر <strong>اختبار التكامل السوداء</strong> لتأكيد أن إعداداتك صحيحة قبل الحفظ. ',
-    'slack_integration_help_button'    => 'عند الانتهاء من حفظ معلومات Slack الخاصة بك، سوف يظهر زر الفحص.',
-    'slack_test_help'           => 'اختبر ما إذا كان تكامل Slack الخاص بك قد تم تكوينه بشكل صحيح. لقد قمت بحفظ إعدادات SLACK الخاصة بك.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> 'قنص-إيت الإصدار',
     'support_footer'            => 'دعم روابط تذييل الصفحة ',
     'support_footer_help'       => 'تحديد من يرى الروابط إلى دليل معلومات الدعم للمستخدمين عن طريق القناصة',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ar/admin/settings/message.php b/resources/lang/ar/admin/settings/message.php
index df67acadc5..f5253f571e 100644
--- a/resources/lang/ar/admin/settings/message.php
+++ b/resources/lang/ar/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ar/admin/users/general.php b/resources/lang/ar/admin/users/general.php
index e7d0100aee..487400586d 100644
--- a/resources/lang/ar/admin/users/general.php
+++ b/resources/lang/ar/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.',
+    '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',
     'send_email_help'   => 'يجب عليك توفير عنوان بريد إلكتروني لهذا المستخدم لإرسال بيانات اعتماده. لا يمكن إرسال بيانات الاعتماد البريدية إلا عند إنشاء المستخدم. يتم تخزين كلمات المرور في تجزئة ذات اتجاه واحد ولا يمكن استرجاعها بمجرد الحفظ.',
     'view_user'         => 'عرض المستخدم :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'تحذير:',
     'warning_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',
@@ -41,4 +42,13 @@ 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_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' => 'تم إنشاؤها في:',
+    'email_user_creds_on_create' => 'إرسال بيانات دخول هذا المستخدم بالبريد الإلكتروني؟',
 ];
diff --git a/resources/lang/ar/admin/users/message.php b/resources/lang/ar/admin/users/message.php
index 9f76734c37..81c392f699 100644
--- a/resources/lang/ar/admin/users/message.php
+++ b/resources/lang/ar/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'لقد رفضت هذا الأصل بنجاح.',
     'bulk_manager_warn'	        => 'تم تحديث المستخدمين بنجاح، ولكن لم يتم حفظ إدخال مديرك لأن المدير الذي حددته كان أيضا في قائمة المستخدمين التي سيتم تعديلها، وقد لا يكون المستخدمون مديرهم الخاص. يرجى تحديد المستخدمين مرة أخرى، باستثناء المدير.',
     'user_exists'               => 'المستخدم موجود مسبقاً!',
-    'user_not_found'            => 'المستخدم :id غير موجود.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'حقل تسجيل الدخول اجباري',
     'user_password_required'    => 'كلمة المرور اجبارية.',
     'insufficient_permissions'  => 'صلاحيات غير كافية.',
diff --git a/resources/lang/ar/auth/general.php b/resources/lang/ar/auth/general.php
index 6d1360b7fa..227db5e10c 100644
--- a/resources/lang/ar/auth/general.php
+++ b/resources/lang/ar/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'تذكرني',
     'username_help_top'                 => 'أدخل اسم المستخدم الخاص بك <strong></strong> ليتم إرسال رابط إعادة تعيين كلمة المرور إلى البريد الإلكتروني.',
     'username_help_bottom'          => 'قد يكون اسم المستخدم وعنوان البريد الإلكتروني الخاصين بك متماثلين، ولكن قد لا يكونا كذلك، بناءً على الإعدادات الخاصة بك. إذا كنت لا تستطيع تذكر اسم المستخدم الخاص بك، اتصل بالمسؤول. لن يتم إرسال رابط إعادة تعيين كلمة المرور عبر البريد الإلكتروني إلى أسماء المستخدمين التي لا تحتوي على عنوان بريد إلكتروني مرتبط بها ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
index 9b77333115..9d91a0d9f5 100644
--- a/resources/lang/ar/general.php
+++ b/resources/lang/ar/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'ملحقات',
     'activated'			    => 'مفعل',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'ملحق',
     'accessory_report'		=> 'تقرير الملحقات',
     'action'                => 'الإجراء',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'تدقيق',
     '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'           => 'مسنَدة إلى :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'حذف الصورة الرمزية',
     'avatar_upload'         => 'رفع صورة رمزية',
     'back'      			=> 'الرجوع للخلف',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'تحرير بالجملة',
     'bulk_delete'           => 'حذف بالجملة',
     'bulk_actions'          => 'مجموعة إجراءات',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'حسب الحالة',
     'cancel'  				=> 'إلغاء',
     'categories'			=> 'التصنيفات',
@@ -83,6 +92,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.',
     'deleted'  				=> 'تم حذفها',
     'delete_seats'  		=> 'المقاعد المحذوفة',
     'deletion_failed'       => 'فشل الحذف',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => 'نوع الملف المقبول هو :types. الحد الأقصى لحجم التحميل المسموح به هو :size.|أنواع الملف المقبول هي :types. الحد الأقصى لحجم التحميل المسموح به هو :size.',
     'filetypes_size_help'   => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
     'image_filetypes_help'  => 'أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. الحد الأقصى المسموح به للتحميل هو :size.',
+    'unaccepted_image_type'  => 'ملف الصورة هذا غير قابل للقراءة. أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. نوع هذا الملف هو: :mimetype.',
     'import'         	    => 'استيراد',
     'importing'         	=> 'الاستيراد',
     'importing_help'        => 'يمكنك استيراد الأصول، الملحقات، التراخيص، المكونات، المواد الاستهلاكية، والمستخدمين عبر ملف CSV. <br><br>يجب أن تكون CSV محددة بفواصل وأن يتم تنسيقها مع رؤوس تطابق تلك الموجودة في <a href="https://snipe-it.readme.io/docs/importing" target="_new">عينة CSVs في الوثائق</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'صيانة الأصول',
     'item'  				=> 'بند',
     'item_name'             => 'إسم العنصر',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'صلاحيات غير كافية!',
     'kits'       			=> 'مجموعات محددة مسبقاً',
     'language'				=> 'لغة',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'الأصول المطلوبة',
     'request_canceled'      => 'تم إلغاء الطلب',
     'save'  				=> 'حفظ',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'تحديد',
     'select_all'            => 'اختر الكل',
     'search'				=> 'بحث',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'التوقيع',
     'signed_off_by'         => 'تم توقيعه من قبل',
     'skin'       			=> 'المظهر',
-    'slack_msg_note'        => 'سيتم إرسال رسالة التراخي',
-    'slack_test_msg'        => 'مرحباً! يبدو أن التكامل مع Slack مع Snipe-IT يعمل!',
+    'webhook_msg_note'        => 'سيتم إرسال إشعار عبر الربط البرمجي (webhook)',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'التثبيت التجريبي (DEMO): يتم تعطيل بعض الميزات لهذا التثبيت.',
     'site_name'				=> 'إسم الموقع',
     'state'  				=> 'المنطقة / الولاية',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'هل تريد بالتأكيد حذفها',
     'submit'				=> 'عرض',
     'target'                => 'استهداف',
-    'toggle_navigation'     => 'تبديل القائمة',
     'time_and_date_display' => 'عرض الوقت والتاريخ',
     'total_assets'			=> 'إجمالي الأصول',
     'total_licenses'		=> 'مجموع التراخيص',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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_information' =>  'سيؤدي هذا إلى دمج :count مستخدمين في مستخدم واحد. حدد المستخدم الذي ترغب في دمج بقية المستخدمين بالأسفل، والأصول المرتبطة ، والتراخيص ، إلخ سيتم نقلها إلى المستخدم المحدد وسيتم وضع علامة على المستخدمين الآخرين كمحذوفين.',
+    'warning_merge_information' => 'لا يمكن التراجع عن هذا الإجراء، ويجب أن تستخدم فقط عندما تحتاج إلى دمج المستخدمين بسبب سوء الاستيراد أو المزامنة. تأكد من تشغيل النسخ الاحتياطي أولاً.',
+    'no_users_selected'     => 'لا يوجد مستخدمين محددين',
+    'not_enough_users_selected'     => 'يجب اختيارعدد :count مستخدم على الأقل',
+    'merge_success'         => 'تم دمج :count من المستخدمين بنجاح في :into_username!',
+    'merged'                => 'دُمِجَت',
+    'merged_log_this_user_into' => 'تم دمج هذا المستخدم (رقم :to_id - :to_username) إلى المستخدم رقم :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'تم دمج المستخدم رقم :from_id (:from_username) في هذا المستخدم (رقم :to_id - :to_username)',
+    'clear_and_save'            => 'Clear & Save',
+    'update_existing_values'    => '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 Welcome Email for new Users?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'setup_successful_migrations' => 'تم إنشاء جداول قاعدة البيانات الخاصة بك',
+    'setup_migration_output' => 'ناتج الهجرة:',
+    'setup_migration_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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ar/help.php b/resources/lang/ar/help.php
index 8b912823d6..4541426293 100644
--- a/resources/lang/ar/help.php
+++ b/resources/lang/ar/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'المزيد من المعلومات',
 
-    'audit_help' => 'التحقق من هذا المربع سيؤدي إلى تعديل سجل الأصول لعكس هذا الموقع الجديد. تركه غير محدد سيلاحظ ببساطة الموقع في سجل المراجعة.<br><br>لاحظ أن هذا الأصل تم التحقق منه، فهو لن يغير موقع الشخص أو الأصل أو الموقع الذي يتم التحقق منه إليه.',
+    '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' => 'الأصول هي العناصر التي يتم تتبعها بواسطة الرقم التسلسلي أو ترميز الأصل. وهي تميل إلى أن تكون ممتلكات ذات قيمة أعلى حيث انه من المهم توثيقها.',
 
diff --git a/resources/lang/ar/localizations.php b/resources/lang/ar/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ar/localizations.php
+++ b/resources/lang/ar/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ar/mail.php b/resources/lang/ar/mail.php
index 2458d43224..8bdbb8f952 100644
--- a/resources/lang/ar/mail.php
+++ b/resources/lang/ar/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'قم بتسجيل الدخول إلى التثبيت الجديد من Snipe-IT باستخدام البيانات أدناه:',
     'login' => 'تسجيل الدخول:',
     'Low_Inventory_Report' => 'تقرير المخزون المنخفض',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'دقيقة الكمية',
     'name' => 'اسم',
     'new_item_checked' => 'تم فحص عنصر جديد تحت اسمك، التفاصيل أدناه.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'أوراق اعتماد قنص-إيت الخاص بك',
     'Accessory_Checkin_Notification' => 'تم تسحيل الملحق',
     'Asset_Checkin_Notification' => 'تم تسجيل الأصل',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'تم تسجيل الرخصة',
     'Expected_Checkin_Report' => 'تقرير تسجيل الأصول المتوقع',
     'Expected_Checkin_Notification' => 'تذكير: تاريخ تحقق :name يقترب من الموعد النهائي',
     'Expected_Checkin_Date' => 'من المقرر أن يتم التحقق من الأصول التي تم إخراجها إليك في :date',
     'your_assets' => 'عرض الأصول الخاصة بك',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ar/validation.php b/resources/lang/ar/validation.php
index 4e7249c78c..09c2a8d805 100644
--- a/resources/lang/ar/validation.php
+++ b/resources/lang/ar/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'يجب أن تحتوي :attribute على الأقل :min من العناصر.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => ':attribute المحدد غير صالح.',
     'numeric'              => 'يجب أن يكون :attribute رقما.',
     'present'              => 'يجب أن يكون :attribute موجود.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'كلمة المرور الحالية غير صحيحة',
         'dumbpwd'          => 'كلمة المرور هذه شائعة جدا.',
         'statuslabel_type' => 'يجب تحديد نوع تسمية حالة صالح',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/bg/admin/accessories/general.php b/resources/lang/bg/admin/accessories/general.php
index b9cd2d55ec..6232a89dd0 100644
--- a/resources/lang/bg/admin/accessories/general.php
+++ b/resources/lang/bg/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Обновяване на аксесоар',
     'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
     'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/bg/admin/accessories/message.php b/resources/lang/bg/admin/accessories/message.php
index 5101415a34..f367dfdb13 100644
--- a/resources/lang/bg/admin/accessories/message.php
+++ b/resources/lang/bg/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Аксесоарът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Аксесоарът изписан успешно.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     ),
 
diff --git a/resources/lang/bg/admin/asset_maintenances/form.php b/resources/lang/bg/admin/asset_maintenances/form.php
index 6c038d272c..c2cc72a1cd 100644
--- a/resources/lang/bg/admin/asset_maintenances/form.php
+++ b/resources/lang/bg/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Тип на поддръжка на актив',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Заглавие',
-        'start_date'             => 'Начална дата',
-        'completion_date'        => 'Крайна дата',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Стойност',
         'is_warranty'            => 'Подобрение на гаранцията',
-        'asset_maintenance_time' => 'Време за поддръжка на актив (в дни)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Бележки',
-        'update'                 => 'Редакция на поддръжка на актив',
-        'create'                 => 'Създаване на поддръжка на актив'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/bg/admin/categories/message.php b/resources/lang/bg/admin/categories/message.php
index fb6fef505b..af9833423a 100644
--- a/resources/lang/bg/admin/categories/message.php
+++ b/resources/lang/bg/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Категорията не беше обновена. Моля опитайте отново',
-        'success' => 'Категорията е обновена успешно.'
+        'success' => 'Категорията е обновена успешно.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/bg/admin/components/general.php b/resources/lang/bg/admin/components/general.php
index b55bbc5ae0..46b1033f0e 100644
--- a/resources/lang/bg/admin/components/general.php
+++ b/resources/lang/bg/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Оставащо',
     'total' 			                 => 'Общо',
     'update'                            => 'Обновяване на компонент',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/bg/admin/components/message.php b/resources/lang/bg/admin/components/message.php
index 1a83a345f3..0d494276f6 100644
--- a/resources/lang/bg/admin/components/message.php
+++ b/resources/lang/bg/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Компонентът не беше отписан, моля опитайте отново.',
         'success' 		=> 'Компонентът отписан успешно.',
-        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/bg/admin/consumables/message.php b/resources/lang/bg/admin/consumables/message.php
index a1e21eea01..bb99dbdfb3 100644
--- a/resources/lang/bg/admin/consumables/message.php
+++ b/resources/lang/bg/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Консумативът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Консумативът изписан успешно.',
-        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/bg/admin/custom_fields/general.php b/resources/lang/bg/admin/custom_fields/general.php
index 964e7110af..3e9f5877f5 100644
--- a/resources/lang/bg/admin/custom_fields/general.php
+++ b/resources/lang/bg/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ 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_field'            => 'Ново персонализирано поле',
     'create_field_title' => 'Създай ново персонализирано поле',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/bg/admin/groups/message.php b/resources/lang/bg/admin/groups/message.php
index d27a62e61c..40417df94b 100644
--- a/resources/lang/bg/admin/groups/message.php
+++ b/resources/lang/bg/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Групата вече съществува!',
-    'group_not_found'     => 'Групата [:id] не съществува.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Полето име е задължително',
 
     'success' => array(
diff --git a/resources/lang/bg/admin/hardware/form.php b/resources/lang/bg/admin/hardware/form.php
index a4e3049ca3..2051ea657f 100644
--- a/resources/lang/bg/admin/hardware/form.php
+++ b/resources/lang/bg/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Потвърдете масовото изтриване на активи',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -40,12 +43,12 @@ 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_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...',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'asset_location' => 'Обновяване на местоположение',
+    'asset_location_update_default_current' => 'Актуализиране на местоположение по подразбиране и текущото местоположение',
+    'asset_location_update_default' => 'Актуализиране на местоположението по подразбиране',
+    'asset_not_deployable' => 'Актива не може да бъде предоставен. Този активк не може да бъде изписан.',
+    'asset_deployable' => 'Актива може да бъде предоставен. Този активк може да бъде изписан.',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'optional_infos'  => 'Допълнителна информация',
+    'order_details'   => 'Информация за състоянието на поръчка'
 ];
diff --git a/resources/lang/bg/admin/hardware/general.php b/resources/lang/bg/admin/hardware/general.php
index 2acde0c4ad..866179b38b 100644
--- a/resources/lang/bg/admin/hardware/general.php
+++ b/resources/lang/bg/admin/hardware/general.php
@@ -6,23 +6,26 @@ return [
     'archived'  				=> 'Архивиран',
     'asset'  					=> 'Актив',
     'bulk_checkout'             => 'Изписване на активи',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkin'              => 'Връщане на актив',
     'checkin'  					=> 'Връщане на актив',
     'checkout'  				=> 'Проверка на активите',
     'clone'  					=> 'Копиране на актив',
     'deployable'  				=> 'Може да бъде предоставен',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Този актив беше изтрит.',
     'edit'  					=> 'Редакция на актив',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Този Модел на актив беше изтрит. Вие трябва да възстановите този модел преди да можете да възстановите актива.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     '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.',
     'view'  					=> 'Преглед на актив',
-    'csv_error' => 'You have an error in your CSV file:',
+    '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 Admin &gt; General Settings.
@@ -37,8 +40,9 @@ return [
     'csv_import_match_first' => 'Try to match users by first name (jane) format',
     'csv_import_match_email' => 'Try to match users by email as username',
     'csv_import_match_username' => 'Try to match users by username',
-    'error_messages' => 'Error messages:',
+    'error_messages' => 'Съобщение за грешка:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/bg/admin/hardware/message.php b/resources/lang/bg/admin/hardware/message.php
index d8ae25ec3b..a1a07b0bdb 100644
--- a/resources/lang/bg/admin/hardware/message.php
+++ b/resources/lang/bg/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Активът не беше възстановен. Моля опитайте отново.',
         'success' 		=> 'Активът възстановен успешно.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Вашият файл беше въведен.',
         'file_delete_success'   => 'Вашият файл беше изтрит успешно.',
         'file_delete_error'      => 'Файлът не е в състояние да бъде изтрит',
+        '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',
     ],
 
 
diff --git a/resources/lang/bg/admin/hardware/table.php b/resources/lang/bg/admin/hardware/table.php
index 2e15ec24f6..9408d54a85 100644
--- a/resources/lang/bg/admin/hardware/table.php
+++ b/resources/lang/bg/admin/hardware/table.php
@@ -4,11 +4,12 @@ return [
 
     'asset_tag'   	=> 'Инвентарен номер',
     'asset_model'       => 'Модел',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Текуща стойност',
     'change' 		=> 'Предоставяне',
     'checkout_date' => 'Дата на изписване',
     'checkoutto' 	=> 'Изписан',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Total Components Cost',
+    'current_value' => 'Текуща стойност',
     'diff' 			=> 'Разлика',
     'dl_csv' 		=> 'Сваляне на CSV',
     'eol' 			=> 'EOL',
@@ -22,9 +23,9 @@ return [
     'image'		    => 'Изображение на устройството',
     'days_without_acceptance' => 'Дни без да е предаден',
     'monthly_depreciation' => 'Месечна Амортизация',
-    'assigned_to'    => 'Assigned To',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'assigned_to'    => 'Предоставен на',
+    'requesting_user' => 'Изискан от',
+    'requested_date' => 'Дата на заявката',
+    'changed'       => 'Променен',
+    'icon' => 'Икона',
 ];
diff --git a/resources/lang/bg/admin/licenses/general.php b/resources/lang/bg/admin/licenses/general.php
index 9ad54be10a..36a5230b5e 100644
--- a/resources/lang/bg/admin/licenses/general.php
+++ b/resources/lang/bg/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Относно лицензи',
-    'about_licenses'                  => 'Лицензите се използват за проследяване на софтуер.  Те имат определен брой места, които могат да бъдат отписани към лица',
+    'about_licenses_title'      => 'Относно лицензи',
+    'about_licenses'            => 'Лицензите се използват за проследяване на софтуер.  Те имат определен брой места, които могат да бъдат отписани към лица',
     'checkin'  					=> 'Вписване на потребителски лиценз',
     'checkout_history'  		=> 'История на изписванията',
     'checkout'  				=> 'Изписване на потребителски лиценз',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Софтуерни лицензи',
     'user'  					=> 'Потребител',
     'view'  					=> 'Преглед на лиценз',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/bg/admin/locations/message.php b/resources/lang/bg/admin/locations/message.php
index f08af6ffb2..e6c7f9ec8e 100644
--- a/resources/lang/bg/admin/locations/message.php
+++ b/resources/lang/bg/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Местоположението е свързано с поне един потребител и не може да бъде изтрито. Моля, актуализирайте потребителите, така че да не са свързани с това местоположение и опитайте отново. ',
     'assoc_assets'	 => 'Местоположението е свързано с поне един актив и не може да бъде изтрито. Моля, актуализирайте активите, така че да не са свързани с това местоположение и опитайте отново. ',
     'assoc_child_loc'	 => 'В избраното местоположение е присъединено едно или повече местоположения. Моля преместете ги в друго и опитайте отново.',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Изписани Активи',
+    'current_location' => 'Текущо местоположение',
 
 
     'create' => array(
diff --git a/resources/lang/bg/admin/locations/table.php b/resources/lang/bg/admin/locations/table.php
index 0c4cb1b4a3..d6f4994d2b 100644
--- a/resources/lang/bg/admin/locations/table.php
+++ b/resources/lang/bg/admin/locations/table.php
@@ -20,19 +20,19 @@ return [
     'parent'                    => 'Присъединено към',
     'currency'                  => 'Валута на местоположението',
     'ldap_ou'                   => 'Търсене в LDAP 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:',
+    'user_name'                 => 'Потребителско име',
+    'department'                => 'Отдел',
+    'location'                  => 'Местоположение',
+    'asset_tag'                 => 'Инвентарен номер',
+    'asset_name'                => 'Име',
+    'asset_category'            => 'Категория',
+    'asset_manufacturer'        => 'Производител',
+    'asset_model'               => 'Модел',
+    'asset_serial'              => 'Сериен номер',
+    'asset_location'            => 'Местоположение',
+    'asset_checked_out'         => 'Изписано на',
+    'asset_expected_checkin'    => 'Очаквана дата на вписване',
+    'date'                      => 'Дата:',
     'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
diff --git a/resources/lang/bg/admin/manufacturers/message.php b/resources/lang/bg/admin/manufacturers/message.php
index 36ce40de1e..b20f677635 100644
--- a/resources/lang/bg/admin/manufacturers/message.php
+++ b/resources/lang/bg/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Несъществуващ производител.',
     'assoc_users'	 => 'Този производител е асоцииран с поне един от моделите и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този производител и опитайте отново. ',
 
diff --git a/resources/lang/bg/admin/manufacturers/table.php b/resources/lang/bg/admin/manufacturers/table.php
index c7a478c5cb..5990882ba5 100644
--- a/resources/lang/bg/admin/manufacturers/table.php
+++ b/resources/lang/bg/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email за поддръжка',
     'support_phone'   		=> 'Телефон за поддръжка',
     'support_url'   		=> 'URL адрес за поддръжка',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Обновяване на производител',
     'url'   				=> 'URL адрес',
 
diff --git a/resources/lang/bg/admin/models/general.php b/resources/lang/bg/admin/models/general.php
index 1b666e285a..661154b365 100644
--- a/resources/lang/bg/admin/models/general.php
+++ b/resources/lang/bg/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Масово изтриване на модели на активите',
     'bulk_delete_help'               => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
-    'bulk_delete_warn'          => 'Ще бъдат изтрити :model_count модели на активи.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Възстановяване на модел',
     'requestable'               => 'Потребителите могат да поискат този модел',
 	'show_mac_address'			      => 'Визуализиране на поле за MAC адрес в активите за този модел',
diff --git a/resources/lang/bg/admin/models/message.php b/resources/lang/bg/admin/models/message.php
index 5315483d53..206bbd124b 100644
--- a/resources/lang/bg/admin/models/message.php
+++ b/resources/lang/bg/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Моделът не съществува.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Този модел е асоцииран с един или повече активи и не може да бъде изтрит. Моля изтрийте активите и опитайте отново.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Моделът не беше обновен. Моля опитайте отново.',
-        'success' => 'Моделът обновен успешно.'
+        'success' => 'Моделът обновен успешно.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Няма полета, който да са се променили, така че нищо не е осъвременено.',
-        'success' 		=> 'Моделите са осъвременени.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Няма избрани модели, така че нищо не бе изтрито.',
-        'success' 		    => ':success_count модела бяха изтрити!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count модела бяха изтрити, но :fail_count не бяха, тъй като към тях има асоциирани активи.'
     ),
 
diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php
index be7920426f..fc2bc1e10d 100644
--- a/resources/lang/bg/admin/settings/general.php
+++ b/resources/lang/bg/admin/settings/general.php
@@ -10,10 +10,10 @@ return [
     'admin_cc_email'            => 'CC електронна поща',
     'admin_cc_email_help'       => 'Въведете допълнителни електронни адреси, ако желаете да се изпраща копие на електронните пощи при вписване и изписване на активи.',
     'is_ad'				        => 'Това е активна директория на сървър',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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'    => 'Е-майл адреси или групов е-маил за известяване, разделен със запетайка',
     'alerts_enabled'			=> 'Включване на известията',
     'alert_interval'			=> 'Изтичаш праг на известия (в дни)',
     'alert_inv_threshold'		=> 'Праг на известия за запаси',
@@ -21,20 +21,20 @@ return [
     '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_interval_help'       => 'Ако искадате да правите периодична инвентаризация на вашите активи, въведете интервала в месеци за инвентаризация. Ако въведете този интервал, всички активи ще им се смени датата за следваща инвентаризация.',
     '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',
+    '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_help'              => 'Създаване, сваляне и възстановяване на архиви ',
+    'backups_restoring'         => 'Възстановяване от архив',
+    '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'         => '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_large'             => 'Много големите архиви може да не могат да се възстановят поради изтичане на времето на сесията и ще трябва да се възстановят ръчно през команден ред. ',
     'barcode_settings'			=> 'Настройки на баркод',
     'confirm_purge'			    => 'Потвърдете пречистване ',
     'confirm_purge_help'		=> 'Моля да потвърдите изтриването като въведете думата "DELETE" в полето. Изтриването не може да се прекрати и всички записи който са маркирани за истриване, ще бъдат безвъзвратно изтрити. (Добре е да направите архив преди това.)',
@@ -57,7 +57,7 @@ return [
     'barcode_type'				=> '2D тип на баркод',
     'alt_barcode_type'			=> '1D тип на баркод',
     'email_logo_size'       => 'Квадратно лого в е-майлът изглежда най-добре. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Активно',
     'eula_settings'				=> 'Настройки на EULA',
     'eula_markdown'				=> 'Съдържанието на EULA може да бъде форматирано с <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'favicon'                   => 'Favicon',
@@ -67,7 +67,7 @@ return [
     'footer_text_help'          => 'Този текст ще се визуализира в дясната част на футъра. Връзки могат да бъдат добавяни с използването на <a href="https://help.github.com/articles/github-flavored-markdown/">Github тип markdown</a>. Нови редове, хедър тагове, изображения и т.н. могат да доведат до непредвидими резултати.',
     'general_settings'			=> 'Общи настройки',
     'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_help'     => 'Общи условия и други',
     'generate_backup'			=> 'Създаване на архив',
     'header_color'              => 'Цвят на хедъра',
     'info'                      => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Въведете валидни LDAP потребител и парола от базовия DN, който указахте по-горе, за да тествате коректната конфигурация. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
     'ldap_login_sync_help'      => 'Това единствено проверява дали LDAP може да се синхронизира успешно. Ако вашата LDAP заявка за оторизация не е коректна е възможно потребителите да не могат да влязат. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Показване на изображения в електронните съобщения',
     'show_images_in_email_help'   => 'Премахнете отметката, ако Вашата инсталация е достъпна единствено във вътрешната мрежа или през VPN.',
     'site_name'                 => 'Име на системата',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Име на Slack bot',
-    'slack_channel'             => 'Slack канал',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack настройки',
-    'slack_integration_help'    => 'Slack интеграцията е по избор, въпреки че крайната цел и канала са задължителни, ако искате да я ползате. За да се конфигурира Slack интеграцията трябва първо да <a href=":slack_link" target="_new" rel="noopener">създадете входяща връзка</a> във вашият Slack акаунт. Кликнете на <strong>Тест интеграция</strong> бутона за да потвърдите, че всичко работи преди да запишете настройките. ',
-    'slack_integration_help_button'    => 'След запис на Slack информацията ще бъде показан бутон за тест.',
-    'slack_test_help'           => 'Тест за коректна конфигурация на интеграцията със Slack. НЕОБХОДИМО Е ПЪРВО ДА ЗАПИШЕТЕ SLACK НАСТРОЙКИТЕ.',
+    'general_webhook'           => 'General Webhook',
+    '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 версия',
     'support_footer'            => 'Връзки към Snipe-it поддръжката във футъра',
     'support_footer_help'       => 'Указва визуализацията на връзки към поддръжката на Snipe-IT и потребителската документация',
@@ -301,7 +309,7 @@ return [
     'localization_keywords' => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/bg/admin/settings/message.php b/resources/lang/bg/admin/settings/message.php
index 780610f2f5..0413b59cbd 100644
--- a/resources/lang/bg/admin/settings/message.php
+++ b/resources/lang/bg/admin/settings/message.php
@@ -27,17 +27,18 @@ return [
     ],
     'ldap' => [
         'testing' => 'Testing LDAP Connection, Binding & Query ...',
-        '500' => '500 Server Error. Please check your server logs for more information.',
-        'error' => 'Something went wrong :(',
+        '500' => 'Грешка 500. Моля проверете логовете на сървъра за повече информация.',
+        'error' => 'Възникна грешка :(',
         'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/bg/admin/statuslabels/message.php b/resources/lang/bg/admin/statuslabels/message.php
index dbe486797f..ef223c21be 100644
--- a/resources/lang/bg/admin/statuslabels/message.php
+++ b/resources/lang/bg/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ 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>.',
+        'deployable'   => 'Тези активи могат да бъдат изписани. След като бъдат изписани, те ще сменят статуса си на<i class="fas fa-circle text-blue"></i> <strong>Изписани</strong>.',
         'archived'   => 'Тези активи не могат да бъдат отметнати и ще се показват само в архивирания изглед. Това е полезно за запазване на информация за активи за бюджетиране / исторически цели, но задържането им извън ежедневния списък на активите.',
         'pending'   => 'Тези активи все още не могат да бъдат прехвърляни на никого, често използвани за артикули, които са предназначени за ремонт, но се очаква да се върнат в обръщение.',
     ],
diff --git a/resources/lang/bg/admin/users/general.php b/resources/lang/bg/admin/users/general.php
index f9e70019b8..77104b5f05 100644
--- a/resources/lang/bg/admin/users/general.php
+++ b/resources/lang/bg/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.',
+    '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',
     'send_email_help'   => 'Трябва да предоставите е-майл адрес за този потребител за да му се изпратят името и паролата. Изпращането на име и парола може да стане при създаването на потребителя. Паролите се съхраняват криптирани и не могат да се възстановят.',
     'view_user'         => 'Преглед на потребител :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Само админ може да даде администраторски достъп на потребител.',
     'admin_permission_warning' => 'Само потребители с административни права може да дадат админ достъп.',
     'remove_group_memberships' => 'Премахни членовете на групата',
-    'warning_deletion' => 'ВНИМАНИЕ:',
     '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' => 'Впиши всички асоцирани настройки към тези потребители',
@@ -41,4 +42,13 @@ 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_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/bg/admin/users/message.php b/resources/lang/bg/admin/users/message.php
index 93fb86a9f7..862278d3fd 100644
--- a/resources/lang/bg/admin/users/message.php
+++ b/resources/lang/bg/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Активът беше отказан.',
     'bulk_manager_warn'	        => 'Вашите потребителски профили бяха обновени успешно, обаче вашето управителско вписване не беше запазено, защото управителят, които сте избрали бе в списъка с потребителски профили за промяна и потребителите не могат да бъдат свои управители. Моля изберете вашите потребителски профили отново, с изключение на управителя.',
     'user_exists'               => 'Потребителят вече съществува!',
-    'user_not_found'            => 'Потребител [:id] не съществува.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Полето за вход е задължително',
     'user_password_required'    => 'Паролата е задължителна.',
     'insufficient_permissions'  => 'Нямате необходимите права.',
diff --git a/resources/lang/bg/auth/general.php b/resources/lang/bg/auth/general.php
index bab7f4ff23..39b55dfc17 100644
--- a/resources/lang/bg/auth/general.php
+++ b/resources/lang/bg/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Запомни ме',
     'username_help_top'                 => 'Въведете вашето <strong>потребителско име</strong> за да получите линк за смяна на парола.',
     'username_help_bottom'          => 'Вашето потребителско име и е-майл адрес <em>може да</em> са еднакви или да не са, зависимост от вашата конфигурация. Ако не помните вашето потребителско име се свържете с Администратора. <br><br><strong>Потребители които нямат въведен е-майл адрес няма да получат линк за смяна на парола.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php
index 503ea77a8b..fb647c5069 100644
--- a/resources/lang/bg/general.php
+++ b/resources/lang/bg/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Аксесоари',
     'activated'			    => 'Активирано',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Аксесоар',
     'accessory_report'		=> 'Справка за аксесоарите',
     'action'                => 'Действие',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'проверка',
     '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'           => 'Активи предадени на :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Изтриване на аватар',
     'avatar_upload'         => 'Качване на аватар',
     'back'      			=> 'Назад',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Групово редактиране',
     'bulk_delete'           => 'Групово изтриване',
     'bulk_actions'          => 'Пакетни действия',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'по Статус',
     'cancel'  				=> 'Отказ',
     'categories'			=> 'Категории',
@@ -66,13 +75,13 @@ return [
     'create'				=> 'Създаване на нов',
     'created'               => 'Създадени артикули',
     'created_asset'			=> 'създадени активи',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Създаден на',
+    'created_by'            => 'Създаден от',
     'record_created' 		=> 'Създаден на',
     'updated_at' 			=> 'Обновено на',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Текущи',
-    'current_password'      => 'Current Password',
+    'current_password'      => 'Текуща парола',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Потребителски справки за активи',
     'dashboard'				=> 'Табло',
@@ -83,6 +92,7 @@ return [
     'debug_warning_text'    => 'Това приложение се изпълнява в режим на производство с разрешено отстраняване на грешки. Това може да изложи чувствителни данни, ако приложението ви е достъпно за външния свят. Забранете режим отстраняване на грешки чрез задаване на стойността <code>APP_DEBUF</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.',
     'deleted'  				=> 'Изтрито',
     'delete_seats'  		=> 'Изтрити работни места за лиценз',
     'deletion_failed'       => 'Deletion failed',
@@ -101,7 +111,7 @@ return [
     'email_format'			=> 'Email формат',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Използвайте това за да генерирате email адреси при въвеждане',
-    'error'				    => 'Error',
+    'error'				    => 'Грешка',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Файлов формат в jpg, webp, png, gif и svg. Максимален размер е :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'         	    => 'Зареждане',
     'importing'         	=> 'Импортиране',
     'importing_help'        => 'Може да импортирате активи, аксесоари, лицензи, компоненти, консумативи и потребители чрез CSV файл. <br><br>CSV файла трябва да е разделен със запетая и форматирани колони, като тези от <a href="https://snipe-it.readme.io/docs/importing" target="_new">примерен CSV файл</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Поддръжки на активи',
     'item'  				=> 'Информация',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Нямате необходимите права!',
     'kits'       			=> 'Комплекти',
     'language'				=> 'Език',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Заявка отменена',
     'save'  				=> 'Запис',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Избор',
     'select_all'            => 'Select All',
     'search'				=> 'Търсене',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Подпис',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Тема',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Вашата Slack интеграция с Snipe-IT работи!',
+    '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: Някои свойства не са разрешени за тази инсталация.',
     'site_name'				=> 'Име на системата',
     'state'  				=> 'Област',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Сигурни ли сте, че искате да изтриете',
     'submit'				=> 'Изпрати',
     'target'                => 'Цел',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Показване на време и дата',
     'total_assets'			=> 'общо активи',
     'total_licenses'		=> 'общо лицензи',
@@ -314,7 +327,7 @@ return [
     'checked_out'           => 'Checked Out',
     'checked_out_to'        => 'Checked out to',
     'fields'                => 'Fields',
-    'last_checkout'         => '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.',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/bg/help.php b/resources/lang/bg/help.php
index 547178b246..38863d19f2 100644
--- a/resources/lang/bg/help.php
+++ b/resources/lang/bg/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Допълнителна информация',
 
-    'audit_help' => 'Отмятането на това поле, ще редактира записа, за да се отрази новото местоположение. Оставайки това поле без отметка ще се отрази местоположението на актива само при одит.<br><br>Ако актива е изписан няма да се смени леговата локация.',
+    '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' => 'Дълготрайни материални активи (ДМА), за кратко активи, се приемат всички материални ресурси на предприятието, които се използват повече от един отчетен период (за стопански и други цели). Проследават се по техния сериен или инвентарен номер.',
 
diff --git a/resources/lang/bg/localizations.php b/resources/lang/bg/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/bg/localizations.php
+++ b/resources/lang/bg/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/bg/mail.php b/resources/lang/bg/mail.php
index cfd5aa7a30..8802dfc736 100644
--- a/resources/lang/bg/mail.php
+++ b/resources/lang/bg/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Влезте в своята Snipe-IT инсталация използвайки данните по-долу:',
     'login' => 'Вход:',
     'Low_Inventory_Report' => 'Доклад за нисък запас',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Минимално количество',
     'name' => 'Име',
     'new_item_checked' => 'Нов артикул беше изписан под вашете име, детайлите са отдолу.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Вашите идентификационни данни за Snipe-IT',
     'Accessory_Checkin_Notification' => 'Аксесоарат е вписан',
     'Asset_Checkin_Notification' => 'Актива е вписан',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Лиценза е вписан',
     'Expected_Checkin_Report' => 'Очакван рапорт за вписване на актив',
     'Expected_Checkin_Notification' => 'Напомняне: :name крайната дата за вписване наближава',
     'Expected_Checkin_Date' => 'Наближава срока за връщане на актив който е заведен на Вас, трябва да се върна на :date',
     'your_assets' => 'Преглед на вашите активи',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/bg/validation.php b/resources/lang/bg/validation.php
index 9ef214a3f7..93d104559f 100644
--- a/resources/lang/bg/validation.php
+++ b/resources/lang/bg/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Атрибутът: трябва да има поне: min елементи.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Избраният :attribute е невалиден.',
     'numeric'              => ':attribute трябва да бъде число.',
     'present'              => 'Полето на атрибута трябва да е налице.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Текущата ви парола е неправилна',
         'dumbpwd'          => 'Тази парола е твърде често срещана.',
         'statuslabel_type' => 'Трябва да изберете валиден тип етикет на състоянието',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ca/admin/accessories/general.php b/resources/lang/ca/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/ca/admin/accessories/general.php
+++ b/resources/lang/ca/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/ca/admin/accessories/message.php b/resources/lang/ca/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/ca/admin/accessories/message.php
+++ b/resources/lang/ca/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/ca/admin/asset_maintenances/form.php b/resources/lang/ca/admin/asset_maintenances/form.php
index 2aa005c45f..785d06b08f 100644
--- a/resources/lang/ca/admin/asset_maintenances/form.php
+++ b/resources/lang/ca/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'Completed',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ca/admin/categories/message.php b/resources/lang/ca/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/ca/admin/categories/message.php
+++ b/resources/lang/ca/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ca/admin/components/general.php b/resources/lang/ca/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/ca/admin/components/general.php
+++ b/resources/lang/ca/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/ca/admin/components/message.php b/resources/lang/ca/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/ca/admin/components/message.php
+++ b/resources/lang/ca/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ca/admin/consumables/message.php b/resources/lang/ca/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/ca/admin/consumables/message.php
+++ b/resources/lang/ca/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/ca/admin/custom_fields/general.php b/resources/lang/ca/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/ca/admin/custom_fields/general.php
+++ b/resources/lang/ca/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ca/admin/groups/message.php b/resources/lang/ca/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/ca/admin/groups/message.php
+++ b/resources/lang/ca/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/ca/admin/hardware/form.php b/resources/lang/ca/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/ca/admin/hardware/form.php
+++ b/resources/lang/ca/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ca/admin/hardware/general.php b/resources/lang/ca/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/ca/admin/hardware/general.php
+++ b/resources/lang/ca/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ca/admin/hardware/message.php b/resources/lang/ca/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/ca/admin/hardware/message.php
+++ b/resources/lang/ca/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/ca/admin/hardware/table.php b/resources/lang/ca/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/ca/admin/hardware/table.php
+++ b/resources/lang/ca/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/ca/admin/licenses/general.php b/resources/lang/ca/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/ca/admin/licenses/general.php
+++ b/resources/lang/ca/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ca/admin/manufacturers/message.php b/resources/lang/ca/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/ca/admin/manufacturers/message.php
+++ b/resources/lang/ca/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/ca/admin/manufacturers/table.php b/resources/lang/ca/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/ca/admin/manufacturers/table.php
+++ b/resources/lang/ca/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ca/admin/models/general.php b/resources/lang/ca/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/ca/admin/models/general.php
+++ b/resources/lang/ca/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/ca/admin/models/message.php b/resources/lang/ca/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/ca/admin/models/message.php
+++ b/resources/lang/ca/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/ca/admin/settings/general.php b/resources/lang/ca/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/ca/admin/settings/general.php
+++ b/resources/lang/ca/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ca/admin/settings/message.php b/resources/lang/ca/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/ca/admin/settings/message.php
+++ b/resources/lang/ca/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ca/admin/users/general.php b/resources/lang/ca/admin/users/general.php
index daa568e8bf..b097ccec69 100644
--- a/resources/lang/ca/admin/users/general.php
+++ b/resources/lang/ca/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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ca/admin/users/message.php b/resources/lang/ca/admin/users/message.php
index 247a1b321e..adf26b3229 100644
--- a/resources/lang/ca/admin/users/message.php
+++ b/resources/lang/ca/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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/ca/auth/general.php b/resources/lang/ca/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/ca/auth/general.php
+++ b/resources/lang/ca/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ca/general.php b/resources/lang/ca/general.php
index df4ab7975c..540bd4042b 100644
--- a/resources/lang/ca/general.php
+++ b/resources/lang/ca/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessoris',
     'activated'			    => 'Activat',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessori',
     'accessory_report'		=> 'Informe d\'Accessoris',
     'action'                => 'Acció',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     'audit_report'			=> 'Registre d\'auditoria',
     'assets'				=> 'Recursos',
+    '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'      			=> 'Enrere',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Cancel·la',
     'categories'			=> 'Categories',
@@ -83,6 +92,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.',
     'deleted'  				=> 'S\'ha suprimit',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     'importing'         	=> 'Importing',
     'importing_help'        => 'Podeu importar recursos, accessoris, llicències, components, consumibles, and usuaris via fitxer CSV. <br><br>El CSV cal que estigui delimitat per comes i formatat amb capçaleres que coincideixin amb les de les <a href="https://snipe-it.readme.io/docs/importing" target="_new">mostres de CSV a la documentació</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Manteniments de Recursos',
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'recursos totals',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ca/help.php b/resources/lang/ca/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ca/help.php
+++ b/resources/lang/ca/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ca/localizations.php b/resources/lang/ca/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ca/localizations.php
+++ b/resources/lang/ca/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ca/mail.php b/resources/lang/ca/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/ca/mail.php
+++ b/resources/lang/ca/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ca/validation.php b/resources/lang/ca/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/ca/validation.php
+++ b/resources/lang/ca/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/cs/account/general.php b/resources/lang/cs/account/general.php
index 7fc060a849..59d4ab2905 100644
--- a/resources/lang/cs/account/general.php
+++ b/resources/lang/cs/account/general.php
@@ -1,12 +1,12 @@
 <?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' => 'Osobní API klíče',
+    'api_key_warning' => 'Při generování tokenu API se ujistěte, že jej ihned zkopírujete, protože
+                    nebudou viditelné.',
+    'api_base_url' => 'Základní adresa API je umístěna 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.',
+    'api_token_expiration_time' => 'API tokeny vyprší:',
+    'api_reference' => 'Zkontrolujte prosím <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> pro
+                    nalezení konkrétního koncového bodu a další API dokumentaci.',
 );
diff --git a/resources/lang/cs/admin/accessories/general.php b/resources/lang/cs/admin/accessories/general.php
index bb7c198b6b..4c046677f7 100644
--- a/resources/lang/cs/admin/accessories/general.php
+++ b/resources/lang/cs/admin/accessories/general.php
@@ -17,5 +17,7 @@ return array(
     'use_default_eula'					=> 'Použít <a href="#" data-toggle="modal" data-target="#eulaModal">primární výchozí EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Použít výchozí EULA.</del>
 Žádná výchozí EULA nenastavena. Zadejte novou v nastevení.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'Toto příslušenství ještě nelze odstranit, protože některé jeho položky jsou stále vydány.',
 
 );
diff --git a/resources/lang/cs/admin/accessories/message.php b/resources/lang/cs/admin/accessories/message.php
index f0d409f5d6..ee85bb132d 100644
--- a/resources/lang/cs/admin/accessories/message.php
+++ b/resources/lang/cs/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Příslušenství nebylo převzato, zkuste to znovu',
         'success' 		=> 'Příslušenství úspěšně předáno.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.'
     ),
 
diff --git a/resources/lang/cs/admin/asset_maintenances/form.php b/resources/lang/cs/admin/asset_maintenances/form.php
index 86d2d92504..7adc3de57c 100644
--- a/resources/lang/cs/admin/asset_maintenances/form.php
+++ b/resources/lang/cs/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Druh údržby',
+        'asset_maintenance_type' => 'Druh údržby majetku',
         'title'                  => 'Název',
-        'start_date'             => 'Začátek',
-        'completion_date'        => 'Dokončeno',
+        'start_date'             => 'Počáteční datum',
+        'completion_date'        => 'Datum dokončení',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Rozšíření záruky',
-        'asset_maintenance_time' => 'Dnů',
+        'asset_maintenance_time' => 'Doba údržby majetku (ve dnech)',
         'notes'                  => 'Poznámky',
-        'update'                 => 'Aktualizace',
-        'create'                 => 'Vytvořit'
+        'update'                 => 'Upravit údržbu zařízení',
+        'create'                 => 'Založit údržbu zařízení'
     ];
diff --git a/resources/lang/cs/admin/asset_maintenances/general.php b/resources/lang/cs/admin/asset_maintenances/general.php
index 4027be906b..a30bb147c2 100644
--- a/resources/lang/cs/admin/asset_maintenances/general.php
+++ b/resources/lang/cs/admin/asset_maintenances/general.php
@@ -11,6 +11,6 @@
         'calibration'        => 'Kalibrace',
         'software_support'   => 'Softwarová podpora',
         'hardware_support'   => 'Hardwarová podpora',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'configuration_change'   => 'Změna konfigurace',
+        'pat_test'           => 'Test PAT',
     ];
diff --git a/resources/lang/cs/admin/categories/message.php b/resources/lang/cs/admin/categories/message.php
index 2970ef9af8..3381d07484 100644
--- a/resources/lang/cs/admin/categories/message.php
+++ b/resources/lang/cs/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorie nebyla aktualizována, zkuste to znovu prosím',
-        'success' => 'Kategorie aktualizována úspěšně.'
+        'success' => 'Kategorie aktualizována úspěšně.',
+        'cannot_change_category_type'   => 'Jakmile byla kategorie vytvořena, nelze měnit její typ',
     ),
 
     'delete' => array(
diff --git a/resources/lang/cs/admin/categories/table.php b/resources/lang/cs/admin/categories/table.php
index 834a6349b2..c1b2e8ce02 100644
--- a/resources/lang/cs/admin/categories/table.php
+++ b/resources/lang/cs/admin/categories/table.php
@@ -4,7 +4,7 @@ return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
     'parent'   					=> 'Nadřazená složka',
-    'require_acceptance'      	=> 'Míra souhlasu',
+    'require_acceptance'      	=> 'Vyžadovat souhlas',
     'title'      				=> 'Jméno kategorie majetku',
 
 );
diff --git a/resources/lang/cs/admin/components/general.php b/resources/lang/cs/admin/components/general.php
index f6f248a861..8c42d75e77 100644
--- a/resources/lang/cs/admin/components/general.php
+++ b/resources/lang/cs/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Zbývá',
     'total' 			                 => 'Celkem',
     'update'                            => 'Upravit díl',
+    'checkin_limit'            => 'Přijaté množství musí odpovídat, nebo být nižší než :assigned_qty'
 );
diff --git a/resources/lang/cs/admin/components/message.php b/resources/lang/cs/admin/components/message.php
index 35730112ef..02cbd4d354 100644
--- a/resources/lang/cs/admin/components/message.php
+++ b/resources/lang/cs/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Díl se nepodařilo předat, zkuste to prosím znovu',
         'success' 		=> 'Díl byl v pořádku předán.',
-        'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.'
+        'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/cs/admin/consumables/message.php b/resources/lang/cs/admin/consumables/message.php
index ab98153e2e..c3cc881937 100644
--- a/resources/lang/cs/admin/consumables/message.php
+++ b/resources/lang/cs/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Spotřební materiál se nepodařilo přidělit, pokuste se o to znovu',
         'success' 		=> 'Spotřební materiál byl v pořádku přidělen.',
-        'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.'
+        'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/cs/admin/custom_fields/general.php b/resources/lang/cs/admin/custom_fields/general.php
index 6825f868d9..44a277e7ca 100644
--- a/resources/lang/cs/admin/custom_fields/general.php
+++ b/resources/lang/cs/admin/custom_fields/general.php
@@ -5,8 +5,8 @@ return [
     'manage'                    => 'Spravovat',
     'field'		                => 'Pole',
     'about_fieldsets_title'		=> 'O sadách polí',
-    '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'		=> 'Sady polí Vám umožňují vytvořit si vlastní hodnoty, které chcete evidovat u modelů majetku.',
+    'custom_format'             => 'Vlastní formát regexu...',
     'encrypt_field'      	        => 'Zašifrovat hodnotu tohoto pole v databázi',
     'encrypt_field_help'      => 'UPOZORNĚNÍ: Šifrování pole je udělá nevyhledatelné.',
     'encrypted'      	        => 'Šifrováno',
@@ -27,23 +27,28 @@ return [
     'used_by_models'   		    => 'Užito u modelů',
     'order'   		            => 'Pořadí',
     'create_fieldset'         => 'Nová sada',
-    'create_fieldset_title' => 'Create a new fieldset',
+    'update_fieldset'         => 'Upravit sadu polí',
+    'fieldset_does_not_exist'   => 'Sada polí neexistuje',
+    'fieldset_updated'         => 'Sada polí upravena',
+    'create_fieldset_title' => 'Vytvořit nový fieldset',
     'create_field'            => 'Nové vlastní pole',
-    'create_field_title' => 'Create a new custom field',
+    '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ů.',
-    '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',
+    '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',
+    'about_custom_fields_text' => 'Vlastní pole umožňují přidat libovolné atributy k aktivům.',
+    'add_field_to_fieldset' => 'Přidat pole do fieldsetu',
+    'make_optional' => 'Vyžadováno - klikněte pro nastavení na volitelné',
+    'make_required' => 'Volitelné - klikněte pro nastavení na vyžadované',
+    'reorder' => 'Změnit pořadí',
+    'db_field' => 'Databázové pole',
+    'db_convert_warning' => 'VAROVÁNÍ. Toto pole je v tabulce vlastních polí jako <code>:db_column</code>, ale mělo by být <code>:expected</code>.',
+    'is_unique' => 'Tato hodnota musí být jedinečná pro všechny aktiva',
     'unique' => 'Unikátní',
-    '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' => 'Povolit uživateli vyhledat tyto hodnoty na stránce Zobrazit přiřazené položky',
+    'display_in_user_view_table' => 'Viditelné pro uživatele',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/cs/admin/custom_fields/message.php b/resources/lang/cs/admin/custom_fields/message.php
index ac35d69c85..a924d7a19e 100644
--- a/resources/lang/cs/admin/custom_fields/message.php
+++ b/resources/lang/cs/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Chyba při ověřování hodnot ve fieldsetu.',
 
     ),
 
diff --git a/resources/lang/cs/admin/departments/message.php b/resources/lang/cs/admin/departments/message.php
index b14cceef5f..b50734586f 100644
--- a/resources/lang/cs/admin/departments/message.php
+++ b/resources/lang/cs/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Oddělení neexistuje.',
-    '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' => 'Oddělení s tímto názvem již existuje. ',
     'assoc_users'	 => 'Toto oddělení je momentálně přiřazeno alespoň jednomu uživateli a nelze jej smazat. Aktualizujte své uživatele tak, aby již neodkázali na toto oddělení a zkuste to znovu.',
     'create' => array(
         'error'   => 'Oddělení nebylo vytvořeno, zkuste to prosím znovu.',
diff --git a/resources/lang/cs/admin/depreciations/general.php b/resources/lang/cs/admin/depreciations/general.php
index cc1c3173be..8eff5ad873 100644
--- a/resources/lang/cs/admin/depreciations/general.php
+++ b/resources/lang/cs/admin/depreciations/general.php
@@ -6,11 +6,11 @@ return [
     'asset_depreciations'  					=> 'Amortizace majetku',
     'create'  					            => 'Vytvořit amortizaci',
     'depreciation_name'  					=> 'Jméno amortizace',
-    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'depreciation_min'                      => 'Minimální hodnota odpisu',
     'number_of_months'  					=> 'Počet měsíců',
     'update'  					            => 'Aktualizovat amortizaci',
-    '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ální hodnota po odpisech',
+    '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.',
 ];
diff --git a/resources/lang/cs/admin/depreciations/table.php b/resources/lang/cs/admin/depreciations/table.php
index 85bbeae692..be4807e07f 100644
--- a/resources/lang/cs/admin/depreciations/table.php
+++ b/resources/lang/cs/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
     'months'   => 'Měsíců',
     'term'   => 'Podmínka',
     'title'      => 'Název ',
-    'depreciation_min' => 'Floor Value',
+    'depreciation_min' => 'Minimální hodnota',
 
 ];
diff --git a/resources/lang/cs/admin/groups/message.php b/resources/lang/cs/admin/groups/message.php
index 08724d2bc5..e385c93ccd 100644
--- a/resources/lang/cs/admin/groups/message.php
+++ b/resources/lang/cs/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Skupina již existuje!',
-    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Název je vyžadován',
 
     'success' => array(
diff --git a/resources/lang/cs/admin/groups/titles.php b/resources/lang/cs/admin/groups/titles.php
index e4e873934f..1f05b364dd 100644
--- a/resources/lang/cs/admin/groups/titles.php
+++ b/resources/lang/cs/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> 'Správce skupiny',
     'allow' 	 			=> 'Povolit',
     'deny' 	 				=> 'Zakázat',
-    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
-    'no_permissions'        => 'This group has no permissions.'
+    'permission'            => 'Oprávnění',
+    'grant'                 => 'Udělit',
+    'no_permissions'        => 'Tato skupina nemá žádná oprávnění.'
 ];
diff --git a/resources/lang/cs/admin/hardware/form.php b/resources/lang/cs/admin/hardware/form.php
index 8c34abdad8..1874499b8c 100644
--- a/resources/lang/cs/admin/hardware/form.php
+++ b/resources/lang/cs/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Potvrzení hromadného odstranění majetku',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Zkontrolujte seznam odstraňovaného majetku níže. Jakmile jej potvrdíte, nebude možné tento majetek obnovit a budou zrušeny i vazby na uživatele, kteří jej měli v držení.',
+  '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'	=> 'Chystáte se odstranit :asset_count položek majetku.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Hromadná aktualizace majetku',
     'bulk_update_help'	=> 'Tento formulář umožňuje hromadnou editaci majetku. Vyplňte pouze položky, které chcete změnit. Jakékoliv prázné položky zůstanou nezměněny. ',
-    '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_warn'	=> 'Chystáte se upravit vlastnosti 1 položky.|Chystáte se upravit vlastnosti :asset_count položek.',
     'checkedout_to'		=> 'Vydané komu',
     'checkout_date'		=> 'Datum vydání',
     'checkin_date'		=> 'Datum převzetí',
@@ -40,12 +43,12 @@ return [
     'warranty'			=> 'Záruka',
         'warranty_expires'		=> 'Záruka končí',
     'years'				=> 'roky',
-    'asset_location' => 'Update Asset Location',
-    'asset_location_update_default_current' => 'Update default location AND actual location',
-    'asset_location_update_default' => 'Update only default location',
-    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Zpracovává se...',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'asset_location' => 'Upravit umístění',
+    'asset_location_update_default_current' => 'Aktualizovat výchozí umístění A aktuální umístění',
+    'asset_location_update_default' => 'Aktualizovat pouze výchozí umístění',
+    'asset_not_deployable' => 'Tento majetek nelze vyskladnit.',
+    'asset_deployable' => 'Tento majetek lze vyskladnit.',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'optional_infos'  => 'Volitelné informace',
+    'order_details'   => 'Informace související s objednávkou'
 ];
diff --git a/resources/lang/cs/admin/hardware/general.php b/resources/lang/cs/admin/hardware/general.php
index f581ba6319..e778245824 100644
--- a/resources/lang/cs/admin/hardware/general.php
+++ b/resources/lang/cs/admin/hardware/general.php
@@ -6,39 +6,43 @@ return [
     'archived'  				=> 'Archivováno',
     'asset'  					=> 'Majetek',
     'bulk_checkout'             => 'Vyskladnit majetek',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkin'              => 'Převzít majetek',
     'checkin'  					=> 'Převzít majetek',
     'checkout'  				=> 'Pokladní majetek',
     'clone'  					=> 'Klonovat majetek',
     'deployable'  				=> 'Připraveno k nasazení',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Tento majetek byl odstraněn.',
     'edit'  					=> 'Upravit majetek',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Tento model majetku byl odstraněn. Před obnovením majetku musíte model obnovit.',
+    'model_invalid'             => 'Model tohoto majetku je neplatný.',
+    'model_invalid_fix'         => 'Měli byste tento majetek upravit dříve, než jej vydáte, či přijmete.',
     'requestable'               => 'Lze vyžádat',
     'requested'				    => 'Požadováno',
-    'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change  requestable status',
+    'not_requestable'           => 'Nelze vyžádat',
+    'requestable_status_warning' => 'Neměnit požadovaný stav',
     'restore'  					=> 'Obnovit zařízení',
     'pending'  					=> 'Čekající',
-    'undeployable'  			=> 'Nepřiřaditelné',
+    'undeployable'  			=> 'Nelze vyskladnit',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Zobrazit majetek',
-    'csv_error' => 'You have an error in your CSV file:',
+    'csv_error' => 'Máte chybu v souboru 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 Admin &gt; General Settings.
+    Nahrajte CSV obsahující historii aktiv. Majetek a uživatelé MUSÍ již v systému existovat, nebo budou přeskočeni. Odpovídající aktiva se dopárují přes inventární číslo. Pokusíme se najít odpovídající uživatele na základě uživatelského jména a kritérií, která vyberete níže. Pokud nevyberete žádná kritéria níže, pokusíme se data spárovat pomocí uživatelského jména, který jste nakonfigurovali v Admin &gt; Obecná nastavení.
     </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>Pole zahrnutá do CSV musí odpovídat hlavičkám: <strong>Inventární číslo, Jméno, Datum převzetí majetku, Datum vydání majetku</strong>. Všechna další pole budou ignorována. </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>
+    <p>Odevzdání majetku: prázdná nebo budoucí data automaticky odhlásí majetek přidruženému uživateli. Vyloučením sloupce odevzdání majetku nastaví datum odevzdání na dnešek.</p>
     ',
-    'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format',
-    'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format',
-    'csv_import_match_first' => 'Try to match users by first name (jane) format',
-    'csv_import_match_email' => 'Try to match users by email as username',
-    'csv_import_match_username' => 'Try to match users by username',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
-    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Uživatelsky definovaný export'
+    'csv_import_match_f-l' => 'Formát jmeno.prijmeni (karel.novak)',
+    'csv_import_match_initial_last' => 'Formát jprijmeni (knovak)',
+    'csv_import_match_first' => 'Formát jmeno (karel)',
+    'csv_import_match_email' => 'Email jako uživatelské jméno',
+    'csv_import_match_username' => 'Uživatelské jméno podle uživatelského jména',
+    'error_messages' => 'Chybové zprávy:',
+    'success_messages' => 'Úspěšné zprávy:',
+    'alert_details' => 'Podrobnosti naleznete níže.',
+    'custom_export' => 'Uživatelsky definovaný export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/cs/admin/hardware/message.php b/resources/lang/cs/admin/hardware/message.php
index 1d7b64934f..66f6bb90a9 100644
--- a/resources/lang/cs/admin/hardware/message.php
+++ b/resources/lang/cs/admin/hardware/message.php
@@ -5,7 +5,7 @@ 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_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    '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. ',
 
     'create' => [
@@ -17,12 +17,14 @@ return [
         'error'   			=> 'Majetek se nepodařilo upravit, zkuste to prosím znovu',
         'success' 			=> 'Majetek úspěšně aktualizován.',
         'nothing_updated'	=>  'Nebyla zvolena žádná pole, nic se tedy neupravilo.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'Nebyl zvolen žádný majetek, nic se tedy neupravilo.',
     ],
 
     'restore' => [
         'error'   		=> 'Majetek se nepodařilo obnovit, zkuste to prosím později',
         'success' 		=> 'Majetek byl v pořádku obnoven.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Váš soubor byl importován',
         'file_delete_success'   => 'Váš soubor byl úspěšně odstraněn',
         'file_delete_error'      => 'Soubor nelze odstranit',
+        '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',
     ],
 
 
diff --git a/resources/lang/cs/admin/hardware/table.php b/resources/lang/cs/admin/hardware/table.php
index 3f0c7cd0cc..7b60a1b204 100644
--- a/resources/lang/cs/admin/hardware/table.php
+++ b/resources/lang/cs/admin/hardware/table.php
@@ -4,11 +4,12 @@ return [
 
     'asset_tag'   	=> 'Označení majetku',
     'asset_model'       => 'Model',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Aktuální hodnota',
     'change' 		=> 'Příjem/Výdej',
     'checkout_date' => 'Datum vydání',
     'checkoutto' 	=> 'Vydané',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Total Components Cost',
+    'current_value' => 'Aktuální hodnota',
     'diff' 			=> 'Rozdíl',
     'dl_csv' 		=> 'Stáhnout CSV',
     'eol' 			=> 'Konec životnosti',
@@ -21,10 +22,10 @@ return [
     'title'      	=> 'Majetek ',
     'image'		    => 'Obrázek zařízení',
     'days_without_acceptance' => 'Dní bez schválení',
-    'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
+    'monthly_depreciation' => 'Měsíční odpisy',
+    'assigned_to'    => 'Přiděleno',
+    'requesting_user' => 'Požaduje uživatel',
+    'requested_date' => 'Požadované datum',
+    'changed'       => 'Upraveno',
     'icon' => 'Ikona',
 ];
diff --git a/resources/lang/cs/admin/kits/general.php b/resources/lang/cs/admin/kits/general.php
index f724ecbf07..f1a1f10ab6 100644
--- a/resources/lang/cs/admin/kits/general.php
+++ b/resources/lang/cs/admin/kits/general.php
@@ -1,50 +1,50 @@
 <?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'                    => '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 předdefinovaných sadách',
+    'about_kits_text'                   => 'Předdefinované sady vám umožní rychle se podívat na sbírku položek (majetek, licence atd.) pro uživatele. To může být užitečné, pokud je váš proces předávání majetku stejný napříč mnoha uživateli a všichni uživatelé obdrží stejné položky.',
+    'checkout'                          => 'Vydat sadu ',
+    'create_success'                    => 'Sada byla úspěšně vytvořena.',
+    'create'                            => 'Vytvořit předdefinovanou sadu',
+    'update'                            => 'Aktualizovat předdefinovanou sadu',
+    'delete_success'                    => 'Sada byla úspěšně smazána.',
+    'update_success'                    => 'Sada byla úspěšně aktualizována.',
+    'none_models'                       => 'Není dostatek dostupných položek pro :model aby mohl být vydán. Potřeba :qty. ',
+    'none_licenses'                     => 'Není dostatek volných licencí :license aby mohl být vydán. Potřeba :qty. ',
+    'none_consumables'                  => 'Není dostatek dostupných položek pro :consumable aby mohl být vydán. Potřeba :qty. ',
+    'none_accessory'                    => 'Není dostatek dostupných položek :accessory aby mohl být vydán. Potřeba :qty. ',
+    'append_accessory'                  => 'Přiložit příslušenství',
+    'update_appended_accessory'         => 'Aktualizovat přiložené příslušenství',
+    'append_consumable'                 => 'Přiložit spotřební materiál',
+    'update_appended_consumable'        => 'Upravit přiložený spotřební materiál',
+    'append_license'                    => 'Přiložit licenci',
+    'update_appended_license'           => 'Upravit přiloženou licenci',
+    'append_model'                      => 'Přiložit model',
+    'update_appended_model'             => 'Upravit přiložený model',
+    'license_error'                     => 'Licence již je v sadě',
+    'license_added_success'             => 'Licence byla úspěšně přidána',
+    'license_updated'                   => 'Lincece byla úspěšně aktualizována',
+    'license_none'                      => 'Licence neexistuje',
+    'license_detached'                  => 'Licence úspěšně odpojena',
+    'consumable_added_success'          => 'Spotřební materiál úspěšně přidán',
+    'consumable_updated'                => 'Spotřební materiál byl úspěšně upraven',
+    'consumable_error'                  => 'Spotřební materiál již je v sadě',
+    'consumable_deleted'                => 'Smazání bylo úspěšné',
+    'consumable_none'                   => 'Spotřební materiál neexistuje',
+    'consumable_detached'               => 'Spotřební materiál byl úspěšně odpojen',
+    'accessory_added_success'           => 'Příslušenství úspěšně přidáno',
+    'accessory_updated'                 => 'Příslušenství úspěšně aktualizováno',
+    'accessory_detached'                => 'Příslušenství úspěšně odpojeno',
+    'accessory_error'                   => 'Příslušenství již je připojené k sadě',
+    'accessory_deleted'                 => 'Smazání bylo úspěšné',
+    'accessory_none'                    => 'Příslušenství neexistuje',
+    'checkout_success'                  => 'Vydání proběhlo úspěšně',
+    'checkout_error'                    => 'Chyba vydání',
+    'kit_none'                          => 'Kit neexistuje',
+    'kit_created'                       => 'Kit byl úspěšně vytvořen',
+    'kit_updated'                       => 'Sada byla úspěšně aktualizována',
+    'kit_not_found'                     => 'Sada nenalezena',
+    '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',
 ];
diff --git a/resources/lang/cs/admin/licenses/general.php b/resources/lang/cs/admin/licenses/general.php
index c2b56ec195..896eea554c 100644
--- a/resources/lang/cs/admin/licenses/general.php
+++ b/resources/lang/cs/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'O licencích',
-    'about_licenses'                  => 'Licence jsou používány ke sledování softwaru. Mají stanovený počet uživatelských licencí, které mohou být přiděleny jednotlivcům',
+    'about_licenses_title'      => 'O licencích',
+    'about_licenses'            => 'Licence jsou používány ke sledování softwaru. Mají stanovený počet uživatelských licencí, které mohou být přiděleny jednotlivcům',
     'checkin'  					=> 'Převzít jednu licenci',
     'checkout_history'  		=> 'Historie',
     'checkout'  				=> 'Předat jednu licenci',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Softwarové licence',
     'user'  					=> 'Uživatel',
     'view'  					=> 'Ukaž licenci',
+    'delete_disabled'           => 'Tuto položku zatím nelze odstranit, neboť jsou vydány některé license.',
+    'bulk'                      =>
+        [
+            '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í.',
+                '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',
+                'success'           => 'Lincece úspěšně převzata! | Licence úspěšně převzaty!',
+                'log_msg'           => 'Převzato pomocí hromadného zpracování licencí',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Vydat všchny licence',
+                'modal'                 => 'Tímto vydáte jednu licenci prvnímu dostupnému uživateli. | Tímto vydáte všech :available_seats_count licencí dostupným uživatelům, přičemž dostupný uživatel je takový, který ještě nepřevzal tuto licenci a přitom má zapnutou volbu automatického přiřazování licencí.',
+                'enabled_tooltip'   => 'Vydat všechny (dostupné) licence všem uživatelům',
+                'disabled_tooltip'  => 'Nelze provést, neboť nejsou volné žádné licence',
+                'success'           => 'Licence byla úspěšně vydána! | :count licenses licencí bylo úspěšně vydáno!',
+                'error_no_seats'    => 'Nejsou žádné volné (nevydané) licence.',
+                'warn_not_enough_seats'    => 'Licence byly přiřazeny :count uživatelům, ale již nezbyly žádné volné.',
+                'warn_no_avail_users'    => 'Nelze provést, neboť již nezbývají žádní uživatelé, kteří tuto licenci nemají přiřazenu.',
+                'log_msg'           => 'Vydáno pomocí hromadného zpracování licencí',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/cs/admin/licenses/message.php b/resources/lang/cs/admin/licenses/message.php
index 9d85ccfb2b..c541538872 100644
--- a/resources/lang/cs/admin/licenses/message.php
+++ b/resources/lang/cs/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Licence neexistuje nebo nemáte oprávnění k jejímu zobrazení.',
     'user_does_not_exist' => 'Uživatel neexistuje.',
     'asset_does_not_exist' 	=> 'Majetek, který se pokoušíte spojit s touto licencí, neexistuje.',
     'owner_doesnt_match_asset' => 'Majetek, který se pokoušíte spojit s touto licencí, vlastní někdo jiný než osoba vybraná v rozbalovací nabídce k této licenci.',
diff --git a/resources/lang/cs/admin/locations/message.php b/resources/lang/cs/admin/locations/message.php
index 87326d47b4..7286792e86 100644
--- a/resources/lang/cs/admin/locations/message.php
+++ b/resources/lang/cs/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Toto umístění je spojeno s alespoň jedním uživatelem a nemůže být smazáno. Aktualizujte uživatele aby nenáleželi k tomuto umístění a zkuste to znovu. ',
     '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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Přiřazený majetek',
+    'current_location' => 'Současné umístění',
 
 
     'create' => array(
diff --git a/resources/lang/cs/admin/locations/table.php b/resources/lang/cs/admin/locations/table.php
index 1443c5f250..4feede6729 100644
--- a/resources/lang/cs/admin/locations/table.php
+++ b/resources/lang/cs/admin/locations/table.php
@@ -30,11 +30,11 @@ return [
     'asset_model'               => 'Model',
     'asset_serial'              => 'Sériové číslo',
     'asset_location'            => 'Umístění',
-    'asset_checked_out'         => 'Checked Out',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_checked_out'         => 'Vydané',
+    'asset_expected_checkin'    => 'Očekávané datum vrácení',
     'date'                      => 'Datum:',
-    '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:',
+    'signed_by_asset_auditor'   => 'Podepsáno (auditor majetku):',
+    'signed_by_finance_auditor' => 'Podepsáno (Finanční auditor):',
+    'signed_by_location_manager' => 'Podepsáno (Manager):',
+    'signed_by'                 => 'Odepsal:',
 ];
diff --git a/resources/lang/cs/admin/manufacturers/message.php b/resources/lang/cs/admin/manufacturers/message.php
index be73b254ee..cb071e267d 100644
--- a/resources/lang/cs/admin/manufacturers/message.php
+++ b/resources/lang/cs/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Výrobce neexistuje.',
     'assoc_users'	 => 'Tento výrobce je uveden minimálně u jednoho modelu a nemůže být smazán. Odstraňte výrobce z modelů a zkuste to znovu. ',
 
diff --git a/resources/lang/cs/admin/manufacturers/table.php b/resources/lang/cs/admin/manufacturers/table.php
index 4254e895a7..ea8d942683 100644
--- a/resources/lang/cs/admin/manufacturers/table.php
+++ b/resources/lang/cs/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Emailová podpora',
     'support_phone'   		=> 'Telefonní podpora',
     'support_url'   		=> 'URL podpory',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Upravit Výrobce',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/cs/admin/models/general.php b/resources/lang/cs/admin/models/general.php
index 04ac152826..64b707d790 100644
--- a/resources/lang/cs/admin/models/general.php
+++ b/resources/lang/cs/admin/models/general.php
@@ -3,10 +3,10 @@
 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'  					        => 'This model has been deleted.',
+    '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 smazat :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Obnovení Modelu',
     'requestable'               => 'Uživatelé můžou požádat o tento model',
 	'show_mac_address'			      => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu',
diff --git a/resources/lang/cs/admin/models/message.php b/resources/lang/cs/admin/models/message.php
index 421bf5625e..5e6e5f4efa 100644
--- a/resources/lang/cs/admin/models/message.php
+++ b/resources/lang/cs/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model neexistuje.',
+    'no_association' => 'BEZ PŘIŘAZENÉHO MODELU.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model nebyl aktualizován, zkuste to prosím znovu',
-        'success' => 'Model byl úspěšně aktualizován.'
+        'success' => 'Model byl úspěšně aktualizován.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Žádné pole nebyly změněny, takže nic nebylo aktualizováno.',
-        'success' 		=> 'Modely byly aktualizovány.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nebyly vybrány žádné modely, takže nebylo nic smazáno.',
-        'success' 		    => ':success_count modelů smazáno!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count modelů smazáno, ale :fail_count nebylo možné smazat protože pořád mají přiřazený majetek.'
     ),
 
diff --git a/resources/lang/cs/admin/reports/general.php b/resources/lang/cs/admin/reports/general.php
index 662535f37f..ea78128896 100644
--- a/resources/lang/cs/admin/reports/general.php
+++ b/resources/lang/cs/admin/reports/general.php
@@ -2,9 +2,9 @@
 
 return [
     'info'   => 'Zvolte možnosti zprávy o majetku.',
-    'deleted_user' => 'Deleted user',
+    'deleted_user' => 'Odstraněný uživatel',
     'send_reminder' => 'Poslat připomínku',
     'reminder_sent' => 'Připomínka odeslána',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'acceptance_deleted' => 'Žádost o přijetí byla smazána',
+    'acceptance_request' => 'Žádost o přijetí'
 ];
\ No newline at end of file
diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php
index 4fdf30f6ae..277d97bd01 100644
--- a/resources/lang/cs/admin/settings/general.php
+++ b/resources/lang/cs/admin/settings/general.php
@@ -4,16 +4,16 @@ return [
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Doména služby Active Directory',
     'ad_domain_help'			=> 'Toto je někdy stejné jako vaše emailová doména, ale ne vždy.',
-    '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".',
+    'ad_append_domain_label'    => 'Uveďte název domény',
+    '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é.',
     'is_ad'				        => 'Toto je server služby Active Directory',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alerts'                	=> 'Výstrahy',
+    'alert_title'               => 'Aktualizace nastavení oznámení',
     'alert_email'				=> 'Zasílat upozornění na',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    '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',
@@ -21,23 +21,23 @@ return [
     'allow_user_skin_help_text' => 'Zaškrtnutí tohoto políčka umožní uživateli přepsat vzhled uživatelského rozhraní jiným.',
     'asset_ids'					=> 'ID majetku',
     'audit_interval'            => 'Interval auditu',
-    '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'       => 'Pokud máte povinnost provádět pravidelný fyzický audit svých aktiv, zadejte interval v měsících, které používáte. Pokud tuto hodnotu aktualizujete, všechna „další data auditu“ pro aktiva s nadcházejícím datem auditu budou aktualizována.',
     'audit_warning_days'        => 'Prah výstrahy auditu',
     'audit_warning_days_help'   => 'Kolik dní předem bychom vás měli varovat, když jsou aktiva splatná pro audit?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generovat automatické inventární číslo položek',
     'auto_increment_prefix'		=> 'Předpona (volitnelná)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Pro nastavení musíte nejdřív povolit automatickou generaci inventárních čísel',
     'backups'					=> 'Zálohy',
-    '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'              => 'Vytvořit, stáhnout a obnovit zálohy ',
+    'backups_restoring'         => 'Obnovit ze zálohy',
+    'backups_upload'            => 'Nahrát zálohu',
+    'backups_path'              => 'Zálohy jsou uloženy 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š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'		=> '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'		=> '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_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',
@@ -53,38 +53,41 @@ return [
     'display_eol'               => 'Zobrazit EOL v tabulkovém zobrazení',
     'display_qr'                => 'Zobrazit kódy',
     'display_alt_barcode'		=> 'Zobrazit 1D čárový kód',
-    'email_logo'                => 'Email Logo',
+    'email_logo'                => 'Email logo',
     'barcode_type'				=> 'Typ 2D čárového kódu',
     'alt_barcode_type'			=> 'Typ 1D čárového kódu',
-    'email_logo_size'       => 'Square logos in email look best. ',
-    'enabled'                   => 'Enabled',
+    '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>.',
-    '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.',
+    '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.',
     'general_settings'			=> 'Obecné nastavení',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_keywords' => 'technická podpora, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránce, náhled, eula, licenční podmínky, hlavní stránka, soukromí',
+    'general_settings_help'     => 'Výchozí EULA a další',
     'generate_backup'			=> 'Vytvořit zálohu',
     'header_color'              => 'Barva záhlaví',
     'info'                      => 'Tato nastavení umožňují zvolit určité prvky instalace.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    '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',
-    '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.',
+    'ldap_default_group'        => 'Výchozí skupina oprávnění',
+    'ldap_default_group_info'   => 'Vyberte skupinu, kterou chcete přiřadit novým uživatelům. Nezapomeňte, že uživatel přebírá oprávnění skupiny, která je mu přiřazena.',
+    'no_default_group'          => 'Žádná výchozí skupina',
     '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 povoleno',
     'ldap_integration'          => 'LDAP integrace',
     'ldap_settings'             => 'Nastavení 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_client_tls_cert_help' => 'Client-Side TLS Certificate a klíč pro LDAP jsou obvykle užitečné pouze v konfiguracích Google Workspace společně s "Secure LDAP." Oba jsou vyžadovány.',
      'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Zadejte platné LDAP uživatelské jméno a heslo ze základu rozlišeného názvu který jste určili výše a vyzkoušejte zda je LDAP přihlašování správně nastavené. NEJPRVE JE TŘEBA ULOŽIT ZMĚNĚNÉ NASTAVENÍ LDAP.',
     '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',
@@ -115,16 +118,16 @@ return [
     'ldap_emp_num'              => 'LDAP číslo zaměstnance',
     'ldap_email'                => 'LDAP email',
     'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test_sync'            => 'Test LDAP synchronizace',
     'license'                   => 'Softwarová licence',
     'load_remote_text'          => 'Vzdálené skripty',
     'load_remote_help_text'		=> 'Tato instalace Snipe-IT může nahrávat skripty z vnějšího světa.',
-    'login'                     => 'Login Attempts',
-    'login_attempt'             => 'Login Attempt',
-    'login_ip'                  => 'IP Address',
-    'login_success'             => 'Success?',
+    'login'                     => 'Pokusů o přihlášení',
+    'login_attempt'             => 'Pokus o přihlášení',
+    'login_ip'                  => 'IP adresa',
+    'login_success'             => 'Hotovo?',
     'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
+    'login_help'                => 'Seznam pokusů o přihlášení',
     'login_note'                => 'Přihlásit se Poznámka',
     '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',
@@ -134,8 +137,8 @@ return [
     'login_common_disabled_help' => 'Tato volba vypne ostatní způsoby ověřování. Použijte ji pouze pokud jste si jistí, že už funguje přihlašování REMOTE_USER',
     'login_remote_user_custom_logout_url_text' => 'Uživatelsky určená URL adresa odhlašování',
     'login_remote_user_custom_logout_url_help' => 'Pokud je zde uvedena adresa URL, uživatelé budou po odhlášení ze Snipe-IT přesměrování na tuto URL. To je užitečné pro správné ukončení relací Authentication providera.',
-    '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_remote_user_header_name_text' => 'Záhlaví uživatelského jména',
+    'login_remote_user_header_name_help' => 'Použít zadané záhlaví místo REMOTE_USER',
     'logo'                    	=> 'Logo',
     'logo_print_assets'         => 'Použijte v tisku',
     'logo_print_assets_help'    => 'Používat branding na seznamech k tisku ',
@@ -147,66 +150,71 @@ return [
     'php'                       => 'Verze PHP',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
+    '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.',
     'pwd_secure_complexity'     => 'Složitost hesla',
     'pwd_secure_complexity_help' => 'Zvolte pravidla složitosti hesla, která chcete vynutit.',
-    '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' => 'Heslo nemůže být stejné jako křestní jméno, příjmení, e-mail nebo uživatelské jméno',
+    'pwd_secure_complexity_letters' => 'Vyžaduje alespoň jedno písmeno',
+    'pwd_secure_complexity_numbers' => 'Vyžaduje alespoň jedno číslo',
+    'pwd_secure_complexity_symbols' => 'Vyžaduje alespoň jeden symbol',
+    'pwd_secure_complexity_case_diff' => 'Vyžaduje alespoň jedno velké písmeno a jedno malé písmeno',
     'pwd_secure_min'            => 'Minimální znaky hesla',
-    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_min_help'       => 'Minimální povolená hodnota je 8',
     'pwd_secure_uncommon'       => 'Zabraňte běžným heslům',
     'pwd_secure_uncommon_help'  => 'To uživatelům zakáže používání běžných hesel z nejvyšších 10 000 hesel hlášených v porušení.',
     'qr_help'                   => 'Nejprve povolte QR kódy',
     'qr_text'                   => 'Text QR kódu',
     '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_title'                => 'Upravit nastavení SAML',
+    'saml_help'                 => 'Nastavení SAML',
+    'saml_enabled'              => 'SAML povolen',
+    'saml_integration'          => 'Integrace SAML',
+    'saml_sp_entityid'          => 'ID entity',
     '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_x509cert'          => 'Veřejný certifikát',
     'saml_sp_metadata_url'      => 'URL metadat',
-    '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_idp_metadata'         => 'SAML IdP metadata',
+    'saml_idp_metadata_help'    => 'Můžete zadat IdP metadata pomocí URL nebo XML souboru.',
+    'saml_attr_mapping_username' => 'Mapování atributů - uživatelské jméno',
+    'saml_attr_mapping_username_help' => 'NameID bude použito, pokud není specifikováno nebo není zadané přiřazování atributů.',
+    'saml_forcelogin_label'     => 'SAML vynucené přihlášení',
+    'saml_forcelogin'           => 'Nastavit SAML jako primární přihlášení',
+    'saml_forcelogin_help'      => 'Můžete použít \'/login?nosaml\', abyste se dostali na normální přihlašovací stránku.',
+    'saml_slo_label'            => 'Single Log Out (SLO) SAML',
+    'saml_slo'                  => 'Odeslat LogoutRequest na idP při odhlášení',
+    'saml_slo_help'             => 'Toto způsobí, že uživatel bude při odhlášení nejprve přesměrován na IdP. Nechte nezaškrtnuto, pokud IdP nepodporuje SP SAML SLO.',
+    'saml_custom_settings'      => 'Vlastní nastavení SAML',
+    'saml_custom_settings_help' => 'Můžete zadat vlastní nastavení do knihovny onelogin/php-saml. Na vlastní riziko.',
+    'saml_download'             => 'Stáhnout metadata',
     'setting'                   => 'Nastavení',
     'settings'                  => 'Nastavení',
     'show_alerts_in_menu'       => 'Zobrazovat upozornění v horní nabídce',
     'show_archived_in_list'     => 'Archivovaný majetek',
     'show_archived_in_list_text'     => 'Zobrazit archivovaný majetek ve výpisu „veškerý majetek“',
-    '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_assigned_assets'      => 'Zobrazit aktiva přiřazená k aktivům',
+    'show_assigned_assets_help' => 'Zobrazí položky, které byly přiřazeny k ostatním položkám v Zobrazit uživatele -> Aktiva, Zobrazit uživatele -> Info -> Vytisknout všechny přiřazené a v účtu -> Zobrazit přiřazené aktiva.',
     'show_images_in_email'     => 'Zobrazovat obrázky v e-mailech',
     'show_images_in_email_help'   => 'Zrušte zaškrtnutí této kolonky, pokud je instalace Snipe-IT za VPN nebo uzavřenou sítí a uživatelé mimo síť nebudou moci do svých e-mailů načíst obrázky z této instalace.',
     'site_name'                 => 'Název stránky',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack kanál',
-    'slack_endpoint'            => 'Slack koncový bod',
-    'slack_integration'         => 'Nastavení Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Po uložení informací ke Slack se zobrazí tlačítko pro vyzkoušení.',
-    'slack_test_help'           => 'Zkontrolujte, zda je správně nakonfigurována integrace Slack. MUSÍTE NEJDŘÍVE ULOŽIT NASTAVENÍ SLACK POKUD BYLO ZMĚNĚNO.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -216,9 +224,9 @@ return [
     'update'                    => 'Upravit nastavení',
     'value'                     => 'Hodnota',
     'brand'                     => 'Opatřit značkou',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
-    'web_brand'                 => 'Web Branding Type',
+    '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í',
     'about_settings_text'       => 'Tato nastavení umožňují zvolit určité prvky instalace.',
     'labels_per_page'           => 'Štítků na stránku',
@@ -229,7 +237,7 @@ return [
     'privacy_policy'            => 'Zásady ochrany soukromí',
     'privacy_policy_link_help'  => 'Pokud je zde zahrnuta URL adresa, odkaz na zásady ochrany osobních údajů budou obsaženy do zápatí aplikace a pokud bude zahrnuto ve všech e-mailech, které systém odešle, díky čemuž bude odpovídat požadavkům předpisu GDPR. ',
     'purge'                     => 'Vyčištění odstraněných záznamů',
-    'purge_deleted'             => 'Purge Deleted ',
+    'purge_deleted'             => 'Vymazat smazané ',
     'labels_display_bgutter'    => 'Spodní okraj štítku',
     'labels_display_sgutter'    => 'Boční okraj štítku',
     'labels_fontsize'           => 'Velikost písma štítku',
@@ -274,52 +282,57 @@ return [
     'unique_serial'                => 'Neopakující se sériová čísla',
     'unique_serial_help_text'                => 'Zaškrtnutím tohoto políčka bude vynucena jedinečnost seriových čísel položek majetku',
     'zerofill_count'        => 'Délka značek majetku včetně 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',
+    'username_format_help'   => 'Toto nastavení bude použito pouze v případě, že není zadáno uživatelské jméno a my pro vás musíme vygenerovat uživatelské jméno.',
+    'oauth_title' => 'Nastavení OAuth API',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'oauth_help' => 'Nastavení koncových bodů Oauth',
+    'asset_tag_title' => 'Aktualizovat nastavení inventárních čísel',
+    'barcode_title' => 'Aktualizovat nastavení čárového kódu',
+    'barcodes' => 'Čárové kódy',
+    'barcodes_help_overview' => 'Čárový kód &amp; nastavení QR',
+    'barcodes_help' => 'Toto se pokusí odstranit čárové kódy v mezipaměti. Obvykle se používá v případě, kdy došlo ke změně nastavení čárového kódu nebo v případě, že se změnila URL adresa Snipe-IT. Kódy budou vygenerovány znovu.',
+    'barcodes_spinner' => 'Pokouším se odstranit soubory...',
+    'barcode_delete_cache' => 'Odstranit mezipaměť čárových kódů',
+    'branding_title' => 'Aktualizovat nastavení brandingu',
+    'general_title' => 'Aktualizovat obecné nastavení',
+    'mail_test' => 'Odeslat test',
+    'mail_test_help' => 'Pokusím se odeslat testovací e-mail na :replyto.',
+    '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' => 'Smazat',
+    'purge_keywords' => 'trvale odstranit',
+    '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',
-    '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',
+    'employee_number' => 'Osobní číslo',
+    'create_admin_user' => 'Vytvořit uživatele ::',
+    'create_admin_success' => 'Úspěch! Administrátorský účet byl přidán!',
+    'create_admin_redirect' => 'Klikněte zde pro přihlášení do aplikace!',
+    'setup_migrations' => 'Migrace databáze ::',
+    'setup_no_migrations' => 'Nebylo co migrovat. Databázové tabulky již byly nastaveny!',
+    'setup_successful_migrations' => 'Vaše databázové tabulky byly vytvořeny',
+    'setup_migration_output' => 'Výstup migrace:',
+    'setup_migration_create_user' => 'Další: Vytvořit uživatele',
+    'ldap_settings_link' => 'Nastavení LDAP',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integrace',
+    '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. ',
+
 ];
diff --git a/resources/lang/cs/admin/settings/message.php b/resources/lang/cs/admin/settings/message.php
index f2c817d570..8d68c2b531 100644
--- a/resources/lang/cs/admin/settings/message.php
+++ b/resources/lang/cs/admin/settings/message.php
@@ -11,8 +11,8 @@ return [
         'file_deleted'          => 'Záložní soubor byl úspěšně smazán. ',
         'generated'             => 'Byla úspěšně vytvořena nová záloha.',
         'file_not_found'        => 'Tento záložní soubor nebyl na serveru nalezen.',
-        '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'       => '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?'
     ],
     'purge' => [
         'error'     => 'Během čištění došlo k chybě. ',
@@ -20,24 +20,25 @@ return [
         'success'               => 'Vymazané záznamy byly úspěšně vyčištěny.',
     ],
     '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' => 'Odesílání testovacího e-mailu...',
+        'success' => 'E-mail odeslán!',
+        'error' => 'E-mail se nepodařilo odeslat.',
+        'additional' => 'Porobná zpárva o chybě není dostupná. Zkontrolujte nastavení pošty a 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!'
+        'testing' => 'Testování LDAP připojení, vazby a dotazu ...',
+        '500' => '500 Server error. Zkontrolujte serverové logy pro více informací.',
+        'error' => 'Něco se pokazilo :(',
+        'sync_success' => '10 příkladových uživatelů z LDAP serveru podle vašeho nastavení:',
+        'testing_authentication' => 'Testování LDAP ověření...',
+        'authentication_success' => 'Uživatel byl úspěšně ověřen přes LDAP!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/cs/admin/settings/table.php b/resources/lang/cs/admin/settings/table.php
index 22db5c84ed..b2b64e2f6c 100644
--- a/resources/lang/cs/admin/settings/table.php
+++ b/resources/lang/cs/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Vytvořeno',
+    'size' => 'Velikost',
 );
diff --git a/resources/lang/cs/admin/statuslabels/message.php b/resources/lang/cs/admin/statuslabels/message.php
index 53b8b132f3..39c106b074 100644
--- a/resources/lang/cs/admin/statuslabels/message.php
+++ b/resources/lang/cs/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
 
     'help' => [
         'undeployable'   => 'Tyto prostředky nelze nikomu přiřadit.',
-        '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>.',
+        'deployable'   => 'Tento majetek může být vydán. Jakmile je přiřazen, změní se jeho status na <i class="fas fa-circle text-blue"></i> <strong>Vydáno</strong>.',
         'archived'   => 'Tyto prostředky nelze odhlásit a zobrazí se pouze v zobrazení Archivováno. To je užitečné pro uchovávání informací o prostředcích pro účely rozpočtování / historických účelů, ale jejich uchování mimo denní seznam aktiv.',
         'pending'   => 'Tento majetek zatím nemůže být přiřazen nikomu, často používanému pro položky, které jsou určeny k opravě, ale očekává se, že se vrátí do oběhu.',
     ],
diff --git a/resources/lang/cs/admin/users/general.php b/resources/lang/cs/admin/users/general.php
index dc8ad1ec6b..c6bad24444 100644
--- a/resources/lang/cs/admin/users/general.php
+++ b/resources/lang/cs/admin/users/general.php
@@ -17,28 +17,38 @@ return [
     'last_login'        => 'Poslední přihlášení',
     'ldap_config_text'  => 'Nastavení konfigurace LDAP lze nalézt v menu Správce> Nastavení. Vybrané (volitelně) místo bude nastaven pro všechny importované uživatele.',
     'print_assigned'    => 'Vypsat všechna přiřazení',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    '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.',
+    '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',
-    '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'   => 'Musíte zadat e-mailovou adresu tohoto uživatele pro odeslání přihlašovacích údajů. Odeslání přihlašovacích údajů lze provést pouze při vytvoření uživatele. Hesla jsou zašifrována a nelze je zjistit po tom, co jsou uložena.',
     'view_user'         => 'Zobraz uživatele',
     'usercsv'           => 'CSV soubor',
     'two_factor_admin_optin_help' => 'Vaše současná nastavení administrátora umožňují selektivní vynucení dvoufaktorového ověřování.  ',
-    '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' => 'WARNING:',
-    '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',
+    'two_factor_enrolled' => '2FA zařízení přihlášeno ',
+    'two_factor_active'   => '2FA aktivní ',
+    'user_deactivated'  => 'Uživatel nemá právo k přihlášení',
+    'user_activated'  => 'Uživatel se může přihlásit',
+    'activation_status_warning' => 'Neměnit stav aktivace',
+    'group_memberships_helpblock' => 'Pouze superadmini mohou upravovat členství ve skupině.',
+    'superadmin_permission_warning' => 'Pouze superadmini mohou povolit uživateli superadmin přístup.',
+    'admin_permission_warning' => 'Pouze uživatelé s právy administrátorů a výše mohou udělit uživatelskému adminovi přístup.',
+    'remove_group_memberships' => 'Odebrat členství ve skupině',
+    'warning_deletion_information' => 'Chystáte se zaškrtnout VŠECHNY položky od níže uvedených :count uživatelů. Super administrátorská jména jsou zvýrazněna červeně.',
+    'update_user_assets_status' => 'Aktualizovat všechny položky pro tyto uživatele na tento stav',
+    'checkin_user_properties' => 'Zkontrolujte všechny vlastnosti spojené s těmito uživateli',
+    'remote_label'   => 'Toto je vzdálený uživatel',
+    'remote'   => 'Vzdálený',
+    'remote_help' => 'To může být užitečné, pokud potřebujete filtrovat vzdálené uživatele, kteří nikdy nebo jen zřídka přicházejí do firmy.',
+    'not_remote_label' => 'Toto není vzdálený uživatel',
+    'vip_label' => 'VIP uživatel',
+    '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' => 'Založit uživatele',
+    'create_user_page_explanation' => 'Tyto údaje použijtete pro první přihlášení na stránku.',
+    'email_credentials' => 'Poslat přihlašovací údaje',
+    'email_credentials_text' => 'Odešle moje přihlašovací údaje na e-mailovou adresu výše',
+    'next_save_user' => 'Další: Uložení uživatele',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/cs/admin/users/message.php b/resources/lang/cs/admin/users/message.php
index 4988416de9..db6b0d3b40 100644
--- a/resources/lang/cs/admin/users/message.php
+++ b/resources/lang/cs/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 [:id] neexistuje.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Přihlašovací pole je povinné',
     'user_password_required'    => 'Je vyžadováno heslo.',
     'insufficient_permissions'  => 'Nedostatečná oprávnění.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'Integrace LDAP nebyla pro tuto instalaci nakonfigurována.',
     'password_resets_sent'      => 'Vybraným uživatelům, kteří jsou aktivováni a mají platné e-mailové adresy, byl zaslán odkaz pro obnovení hesla.',
     'password_reset_sent'       => 'Odkaz pro obnovení hesla byl odeslán na :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'Tento uživatel nemá e-mailovou adresu ve svém profilu.',
+    'user_has_no_assets_assigned'   => 'Tento uživatel nemá přiřazené žádné položky',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Tento uživatel nemá nastaven žádný e-mail.',
+        'success' => 'Uživatel byl informován o svém aktuálním majetku.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/cs/admin/users/table.php b/resources/lang/cs/admin/users/table.php
index b1c74daaf7..29c51897cb 100644
--- a/resources/lang/cs/admin/users/table.php
+++ b/resources/lang/cs/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
     'email'      			=> 'Email',
     'employee_num'      	=> 'Osobní číslo',
     'first_name' 			=> 'Jméno',
-    '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 pro přiřazení k uživateli. Nezapomeňte, že uživatel přebírá oprávnění skupiny, která je jim přidělena. Použitím ctrl + kliknutí (nebo cmd+kliknutí na MacOS) zrušíte výběr.',
     'id'         			=> 'ID',
     'inherit'  				=> 'Převzít',
     'job' 					=> 'Pracovní pozice',
diff --git a/resources/lang/cs/auth.php b/resources/lang/cs/auth.php
index db310aa1bb..23ed48cd0c 100644
--- a/resources/lang/cs/auth.php
+++ b/resources/lang/cs/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' => '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.',
 
 );
diff --git a/resources/lang/cs/auth/general.php b/resources/lang/cs/auth/general.php
index a31e95336a..f91d81a818 100644
--- a/resources/lang/cs/auth/general.php
+++ b/resources/lang/cs/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Pamatovat si mě',
     'username_help_top'                 => 'Zadejte své <strong>uživatelské jméno</strong> pro zaslání e-mailu s odkazem pro obnovení hesla.',
     'username_help_bottom'          => 'Vaše uživatelské jméno a e-mailová adresa <em>mohou</em> být stejná, ale nemusí být, záleží na Vašem nastavení. Pokud si nepamatujete Vaše uživatelské jméno, kontaktujte Vašeho správce. <br><br><strong>Uživatelským jménům bez přidružené e-mailové adresy nebude zaslán odkaz pro obnovu hesla.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/cs/button.php b/resources/lang/cs/button.php
index 24a6d9b706..e674be04c7 100644
--- a/resources/lang/cs/button.php
+++ b/resources/lang/cs/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Akce',
     'add'    	                => 'Přidej nový',
     'cancel'                    => 'Zrušit',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Vrátit vše / Smazat uživatele',
     'delete'  	                => 'Smazat',
     'edit'    	                => 'Upravit',
     'restore' 	                => 'Obnovit',
diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php
index 5fd7f3c74e..24ab4f4284 100644
--- a/resources/lang/cs/general.php
+++ b/resources/lang/cs/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Příslušenství',
     'activated'			    => 'Aktivováno',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Příslušenství',
     'accessory_report'		=> 'Zpráva o doplňcích',
     'action'                => 'Akce',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Správce',
     'add_seats'             => 'Přidaná licenční místa',
-    'age'                   => "Age",
+    'age'                   => "Stáří",
     'all_assets'			=> 'Všechna zařízení',
     'all'       			=> 'Vše',
     'archived'              => 'Archivováno',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     'audit_report'			=> 'Záznamy auditu',
     'assets'				=> 'Zařízení',
-    'assigned_to'           => 'Assigned to :name',
+    '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'           => 'Přiřazeno :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Smazat avatara',
     'avatar_upload'         => 'Nahrát avatara',
     'back'      			=> 'Zpět',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Hromadná úprava',
     'bulk_delete'           => 'Hromadné odstranění',
     'bulk_actions'          => 'Hromadné akce',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'podle stavu',
     'cancel'  				=> 'Storno',
     'categories'			=> 'Kategorie',
@@ -66,8 +75,8 @@ return [
     'create'				=> 'Vytvořit nové',
     'created'               => 'Položka vytvořena',
     'created_asset'			=> 'vytvořit majetek',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Vytvořeno v',
+    'created_by'            => 'Vytvořil/a',
     'record_created' 		=> 'Záznam vytvořen',
     'updated_at' 			=> 'Aktualizováno',
     'currency'  			=> 'Kč', // this is deprecated
@@ -83,6 +92,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.',
     'deleted'  				=> 'Odstraněno',
     'delete_seats'  		=> 'Vymazaná licenční místa',
     'deletion_failed'       => 'Odstranění se nezdařilo',
@@ -102,9 +112,9 @@ return [
     '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'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    '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)',
@@ -120,7 +130,7 @@ return [
     'files'                 => 'Soubory',
     'file_name'				=> 'Soubor',
     'file_type'             => 'Typ souboru',
-    'filesize'              => 'File Size',
+    'filesize'              => 'Velikost souboru',
     'file_uploads'			=> 'Nahrání souboru',
     'file_upload'           => 'Nahrání souboru',
     'generate'				=> 'Vytvořit',
@@ -134,20 +144,23 @@ return [
     'id'  					=> 'ID',
     'image'                 => 'Obrázek',
     'image_delete'         	=> 'Smazat obrázek',
-    'include_deleted'       => 'Include Deleted Assets',
+    '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'  => 'Podporované typy souborů jsou jpg, png, gif, a svg. Velikost může být nejvýše :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',
     'importing'         	=> 'Importování',
-    '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>.',
+    'importing_help'        => 'Prostřednictvím souboru CSV můžete importovat majetek, příslušenství, licence, komponenty, spotřební materiál a uživatele. <br><br>CSV by měl být oddělený čárkou a formátovaný s hlavičkami, které odpovídají <a href="https://snipe-it.readme.io/docs/importing" target="_new">vzorovému CSV</a>.',
     'import-history'        => 'Historie importu',
     'asset_maintenance'        => 'Údržba zařízení',
     'asset_maintenance_report' => 'Zpráva o údržbě zařízení',
     'asset_maintenances'       => 'Záznamy o údržbě zařízení',
     'item'  				=> 'Položka',
-    'item_name'             => 'Item Name',
+    'item_name'             => 'Název položky',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nedostatečná oprávnění!',
     'kits'       			=> 'Předdefinované sady',
     'language'				=> 'Jazyk',
@@ -164,7 +177,7 @@ return [
     'feature_disabled'      => 'Tato funkce byla deaktivována pro demo instalaci.',
     'location'              => 'Lokalita',
     'locations'				=> 'Umístění',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> 'Čtvercová loga vypadají nejlépe s Logo + Text. Maximální velikost loga je 50px vysoká x 500px široká.  ',
     'logout'				=> 'Odhlásit',
     'lookup_by_tag'     => 'Vyhledávání podle značky majetku',
     'maintenances'          => 'Údržby',
@@ -173,7 +186,7 @@ return [
     'manufacturers'			=> 'Výrobci',
     'markdown'				=> 'Toto pole umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'min_amt'				=> 'Minimální množství',
-    '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'          => 'Minimální počet položek, které by měly být k dispozici před spuštěním výstrahy. Ponechte Min. QTY prázdnou, pokud nechcete dostávat upozornění na malé zásoby.',
     'model_no'				=> 'Modelové č.',
     'months'				=> 'měsíce',
     'moreinfo'				=> 'Další informace',
@@ -188,7 +201,7 @@ return [
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
     'order_number'          => 'Číslo objednávky',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Pouze odstraněné položky',
     'page_menu'				=> 'Zobrazuji _MENU_ položky',
     'pagination_info'		=> 'Zobrazuji  _START_ to _END_ of _TOTAL_ položek',
     'pending'				=> 'Čeká na vyřízení',
@@ -201,23 +214,24 @@ return [
     'purchase_date'         => 'Datum nákupu',
     'qty'		            => 'Množství',
     'quantity'		        => 'Množství',
-    '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'      => 'Máte :count položek pod nebo téměř pod nejnižšími skladovými zásobami',
+    '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í',
     'recent_activity'		=> 'Nedávná aktivita',
-    'remaining'             => 'Remaining',
+    'remaining'             => 'Zbývá',
     'remove_company'        => 'Odstraňte sdružení společnosti',
     'reports'				=> 'Reporty',
     'restored'				=> 'obnoveno',
-    'restore'				=> 'Restore',
-    'requestable_models'    => 'Requestable Models',
+    'restore'				=> 'Obnovit',
+    'requestable_models'    => 'Požadované modely',
     'requested'				=> 'Požadováno',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Požadované datum',
+    'requested_assets'      => 'Vyžádaný majetek',
+    'requested_assets_menu' => 'Vyžádaný majetek',
     'request_canceled'      => 'Žádost zrušena',
     'save'  				=> 'Uložit',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Zvolit',
     'select_all'            => 'Vybrat vše',
     'search'				=> 'Hledat',
@@ -238,22 +252,21 @@ return [
     'show_current'  		=> 'Zobrazit aktuální',
     'sign_in'				=> 'Přihlásit se',
     'signature'             => 'Podpis',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Odepsal:',
     'skin'       			=> 'Vzhled',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'webhook_msg_note'        => 'Oznámení zavolá webhook',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     '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'    			=> 'Stav',
-    'accept_eula'           => 'Acceptance Agreement',
+    'accept_eula'           => 'Licenční podmínky',
     'supplier'              => 'Dodavatel',
     'suppliers'  			=> 'Dodavatelé',
     'sure_to_delete'    => 'Opravdu si přejete odstranit',
     'submit'				=> 'Odeslat',
     'target'                => 'Cíl',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Zobrazení času a data',
     'total_assets'			=> 'celkem zařízení',
     'total_licenses'		=> 'celkem licencí',
@@ -263,130 +276,177 @@ return [
     'undeployable'			=> 'Ne-přiřaditelné',
     'unknown_admin'			=> 'Neznámy správce',
     'username_format'		=> 'Formát uživatelského jména',
-    'username'              => 'Username',
+    'username'              => 'Uživatelské jméno',
     'update'                => 'Aktualizace',
-    '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.',
+    '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',
     'accepted'			    => 'přijato',
     'declined'			    => 'zamítnuto',
     'unaccepted_asset_report' => 'Nepřijatelné majetky',
     'users'                 => 'Uživatelé',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Zobrazit vše',
     'viewassets'  			=> 'Zobrazit přiřazený majetek',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => 'Zobrazit majetky pro :name',
     'website'               => 'Webová stránka',
     'welcome'				=> 'Vítej, :name',
     'years'					=> 'roky',
     'yes' 					=> 'Ano',
     'zip'  					=> 'PSČ',
     'noimage'				=> 'Obrázek nebyl nahrán, nebo nebyl nalezen.',
-    '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'   => 'Požadovaný soubor neexistuje.',
+    'file_upload_success'   => 'Soubor byl úspěšně nahrán!',
+    'no_files_uploaded'     => 'Soubor byl úspěšně nahrán!',
     'token_expired'         => 'Platnost relace formuláře vypršela. Prosím zkuste to znovu.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    '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'         => 'Přihlášení povoleno',
+    'audit_due'             => 'Ke inventuře',
+    'audit_overdue'         => 'Po termínu inventury',
+    'accept'                => 'Přijmout :asset',
+    'i_accept'              => 'Přijímám',
+    'i_decline'             => 'Odmítám',
+    'accept_decline'        => 'Přijímat/zamítnout',
+    'sign_tos'              => 'Podepsáním níže souhlasíte s podmínkami služby:',
+    'clear_signature'       => 'Vymazat podpis',
+    'show_help'             => 'Zobrazit nápovědu',
+    'hide_help'             => 'Skrýt nápovědu',
+    'view_all'              => 'zobrazit vše',
+    'hide_deleted'          => 'Skrýt smazané',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Checked out to',
-    'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
-    'changed'               => 'Changed',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
-            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
-    'information'           => 'Information',
-    'permissions'           => 'Permissions',
-    'managed_ldap'          => '(Managed via LDAP)',
-    'export'                => 'Export',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
-    'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid category',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you 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_success'  => 'Success:',
-    'notification_warning'   => 'Warning:',
+    'do_not_change'         => 'Neměnit',
+    'bug_report'            => 'Nahlásit chybu',
+    'user_manual'           => 'Uživatelská příručka',
+    'setup_step_1'          => 'Krok 1',
+    'setup_step_2'          => 'Krok 2',
+    '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_done'            => 'Hotovo!',
+    'bulk_edit_about_to'    => 'Tímto upravíte následující možnosti: ',
+    'checked_out'           => 'K výdeji',
+    'checked_out_to'        => 'Vydáno',
+    'fields'                => 'Pole',
+    'last_checkout'         => 'Naposledy vydáno',
+    'due_to_checkin'        => 'Následující :count položky mají být zkontrolovány brzy:',
+    'expected_checkin'      => 'Očekávané datum vrácení',
+    'reminder_checked_out_items' => 'Toto je připomínka položek, které vám byly aktuálně dány. Pokud se domníváte, že je něco špatně (něco chybí, nebo se zde objevuje něco, co podle vás nedostanete), napište prosím :reply_to_name na :reply_to_address.',
+    'changed'               => 'Upraveno',
+    'to'                    => 'Pro',
+    'report_fields_info'    => '<p>Vyberte pole, která chcete zahrnout do vlastní sestavy, a klepněte na tlačítko Generovat. Soubor (custom-asset-report-YYYY-mm-dd.csv) se stáhne automaticky a můžete jej otevřít v Excelu.</p>
+            <p>Pokud chcete exportovat pouze některá aktiva, použijte níže uvedené možnosti pro úpravu výsledků.</p>',
+    'range'                 => '(rozsah)',
+    'bom_remark'            => 'Přidat BOM (byte-order mark) do tohoto CSV',
+    'improvements'          => 'Zlepšení',
+    'information'           => 'Informace',
+    'permissions'           => 'Oprávnění',
+    'managed_ldap'          => '(Spravováno přes LDAP)',
+    'export'                => 'Exportovat',
+    'ldap_sync'             => 'LDAP synchronizace',
+    'ldap_user_sync'        => 'LDAP synchronizace uživatelů',
+    'synchronize'           => 'Synchronizovat',
+    'sync_results'          => 'Výsledky synchronizace',
+    'license_serial'        => 'Sériový/produktový klíč',
+    'invalid_category'      => 'Neplatná kategorie',
+    'dashboard_info'        => 'Toto je vaše hlavní stránka.',
+    '60_percent_warning'    => '60% Dokončeno (upozornění)',
+    'dashboard_empty'       => 'Zdá se, že jste ještě nic nepřidali, takže nemáme nic úžasného co bychom vám ukázali. Začněte přidáním něčeho!',
+    'new_asset'             => 'Nový majetek',
+    'new_license'           => 'Nová licence',
+    'new_accessory'         => 'Nové příslušenství',
+    'new_consumable'        => 'Nový spotřební materiál',
+    'collapse'              => 'Sbalit',
+    'assigned'              => 'Přiřazené',
+    'asset_count'           => 'Počet aktiv',
+    'accessories_count'     => 'Počet příslušenství',
+    'consumables_count'     => 'Počet spotřebních materiálů',
+    'components_count'      => 'Počet komponentů',
+    'licenses_count'        => 'Počet licencí',
+    'notification_error'    => 'Chyba:',
+    'notification_error_hint' => 'Pro chyby zkontrolujte formulář níže',
+    'notification_success'  => 'Hotovo:',
+    'notification_warning'   => 'Pozor:',
     'notification_info'      => 'Info:',
-    'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name:',
-    'asset_name'            => 'Asset Name:',
-    'consumable_information' => 'Consumable Information:',
-    'consumable_name'       => 'Consumable Name:',
-    'accessory_information' => 'Accessory Information:',
-    'accessory_name'       => 'Accessory Name:',
-    'clone_item'            => 'Clone Item',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in',
-    'checkout_user_tooltip' => 'Check this item out to a user',
-    '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 ',
-    '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'
+    'asset_information'     => 'Informace o aktivu',
+    'model_name'            => 'Model:',
+    'asset_name'            => 'Název aktiva:',
+    'consumable_information' => 'Spotřební informace:',
+    'consumable_name'       => 'Název sp. materiálu:',
+    'accessory_information' => 'Informace o příslušenství:',
+    'accessory_name'       => 'Název příslušenství:',
+    'clone_item'            => 'Duplikovat položku',
+    'checkout_tooltip' => 'Vydat položku',
+    'checkin_tooltip' => 'Převzít položku',
+    'checkout_user_tooltip' => 'Vydat položku uživateli',
+    'maintenance_mode'      => 'Systém je momentálně nedostupný kvůli aktualizaci. Zkuste to, prosím, později.',
+    'maintenance_mode_title' => 'Systém je dočasně nedostupný',
+    'ldap_import'           => 'Heslo by nemělo být spravováno LDAP. (To vám umožní odeslat žádost o obnovení zapomenutého hesla.)',
+    'purge_not_allowed'     => 'Vymazání smazaných dat bylo v souboru .env zakázáno. Obraťte se na podporu nebo správce systému.',
+    'backup_delete_not_allowed'     => 'Vymazání záloh bylo v souboru .env zakázáno. Obraťte se na podporu nebo správce systému.',
+    'additional_files'           => 'Další soubory',
+    'shitty_browser'        => 'Nebyl zjištěn žádný podpis. Pokud používáte starší prohlížeč, použijte prosím modernější pro dokončení přijetí vašeho majetku.',
+    '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_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    '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í',
+    'start_date'            => 'Od',
+    'end_date'            => 'Do',
+    'alt_uploaded_image_thumbnail' => 'Nahraný náhledový obrázek',
+    'placeholder_kit'       => 'Vyberte sadu',
+    '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'                  => 'Souhlasí',
+    'false'                 => 'Nesouhlasí',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Sloučit uživatele',
+    '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, licences, 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'     => 'Nejsou vybráni žádní uživatelé',
+    '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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'setup_successful_migrations' => 'Vaše databázové tabulky byly vytvořeny',
+    'setup_migration_output' => 'Výstup migrace:',
+    'setup_migration_create_user' => 'Další: Založení uživatele',
+    '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' => 'Potvrdit',
+    'autoassign_licenses' => 'Automatické přiřazení licencí',
+    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
+    'autoassign_licenses_help_long' => 'Povolí uživateli získávat licence skze hromadnou správu licencí, ať již GUI or CLI. Například pokud si nepřejete, aby externisti nedostávali automaticky licence, náležící pouze zaměstnancům. Licenci jim můžete i nadále přiřazovat ručně, pouze nebudou zahrnuti do hromadného zpracování.',
+    'no_autoassign_licenses_help' => 'Nezahrnovat uživatele do hromadného zpracování licencí.',
+    'modal_confirm_generic'      => 'Jste si jistí?',
+    'cannot_be_deleted'      => 'Položka nemůže být odstraněna',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/cs/help.php b/resources/lang/cs/help.php
index d9d7672bef..e9c6b24e78 100644
--- a/resources/lang/cs/help.php
+++ b/resources/lang/cs/help.php
@@ -15,11 +15,11 @@ return [
 
     'more_info_title' => 'Více informací',
 
-    '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
+    'assets' => 'Majetky jsou položky sledované sériovým nebo inventárním čísle,. Bývají u položek, které mají vyšší hodnotu a kde je důležitá identifikace.',
 
-    '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' => 'Kategorie usnadňují organizovat majetek. Takovou kategorii může být např. &quot;Desktopy&quot;, &quot;Notebooky&quot;, &quot;Mobilní telefony&quot;, &quot;Tablety&quot;, apod. Nicméně můžete použít kategorie jakýmkoli způsobem.',
 
     'accessories' => 'Příslušenství je cokoliv, co předáte uživatelům, ale nemá to sériové číslo (nebo je neevidujete), např. myš, nebo klávesnice.',
 
diff --git a/resources/lang/cs/localizations.php b/resources/lang/cs/localizations.php
index be2c321861..726d2c685a 100644
--- a/resources/lang/cs/localizations.php
+++ b/resources/lang/cs/localizations.php
@@ -2,314 +2,315 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Vyberte jazyk',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
-        'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
+        'en'=> 'Angličtina, USA',
+        'en-GB'=> 'Angličtina, UK',
+        'af'=> 'Afrikánština',
+        'ar'=> 'Arabština',
+        'bg'=> 'Bulharština',
+        'zh-CN'=> 'Zjednodušená čínština',
+        'zh-TW'=> 'Tradiční čínština',
+        'hr'=> 'Chorvatština',
+        'cs'=> 'Čeština',
+        'da'=> 'Dánština',
+        'nl'=> 'Holandština',
+        'en-ID'=> 'Angličtina, Indie',
+        'et'=> 'Estonština',
+        'fil'=> 'Filipínština',
+        'fi'=> 'Finština',
+        'fr'=> 'Francouzština',
+        'de'=> 'Němčina',
+        'de-i'=> 'Němčina (neformální)',
+        'el'=> 'Řečtina',
+        'he'=> 'Hebrejština',
+        'hu'=> 'Maďarština',
+        'is' => 'Islandština',
+        'id'=> 'Indonéština',
+        'ga-IE'=> 'Irština',
+        'it'=> 'Italština',
+        'ja'=> 'Japonština',
+        'ko'=> 'Korejština',
+        'lv'=>'Lotyšština',
+        'lt'=> 'Litevština',
+        'mk'=> 'Makedonština',
+        'ms'=> 'Malajština',
         'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
+        'mn'=> 'Mongolština',
+        'no'=> 'Norština',
+        'fa'=> 'Perština',
+        'pl'=> 'Polština',
+        'pt-PT'=> 'Portugalština',
+        'pt-BR'=> 'Portugalština, brazilština',
+        'ro'=> 'Rumunština',
+        'ru'=> 'Ruština',
         'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
-        'tl'=> 'Tagalog',
-        'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'sl'=> 'Slovinština',
+        'es-ES'=> 'Španělština',
+        'es-CO'=> 'Španělština, Kolumbie',
+        'es-MX'=> 'Španělština, Mexiko',
+        'es-VE'=> 'Španělština, Venezuela',
+        'sv-SE'=> 'Švédština',
+        'tl'=> 'Tagalština',
+        'ta'=> 'Tamilština',
+        'th'=> 'Thajština',
+        'tr'=> 'Turečtina',
+        'uk'=> 'Ukrajinština',
+        'vi'=> 'Vietnamština',
+        'cy'=> 'Velština',
+        'zu'=> 'Zuluština',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Zvolte stát',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Ostrov Ascension',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AE'=>'Spojené arabské emiráty',
+        'AF'=>'Afghánistán',
+        'AG'=>'Antigua a Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albánie',
+        'AM'=>'Arménie',
+        'AN'=>'Nizozemské Antily',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'Antarktida',
         'AR'=>'Argentina',
         'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AT'=>'Rakousko',
+        'AU'=>'Austrálie',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Ázerbardžán',
+        'BA'=>'Bosna a Hercegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
-        'BD'=>'Bangladesh',
+        'BE'=>'Belgie',
+        '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'=>'Brunej Darussalam',
+        'BO'=>'Bolívie',
+        'BR'=>'Brazílie',
+        'BS'=>'Bahamy',
+        'BT'=>'Bhútán',
+        'BV'=>'Bouvetův ostrov',
         'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BY'=>'Bělorusko',
         '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',
+        'CA'=>'Kanada',
+        'CC'=>'Kokosové ostrovy',
+        'CD'=>'Konžská demokratická republika',
+        'CF'=>'Středoafrická republika',
+        'CG'=>'Kongo (republika)',
+        'CH'=>'Švýcarsko',
+        'CI'=>'Pobřeží Slonoviny',
+        'CK'=>'Cookovy ostrovy',
         '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',
+        'CM'=>'Kamerun',
+        'CN'=>'Čínská lidová republika',
+        'CO'=>'Kolumbie',
+        'CR'=>'Kostarika',
+        'CU'=>'Kuba',
+        'CV'=>'Kapverdy',
+        'CX'=>'Vánoční ostrov',
+        'CY'=>'Kypr',
+        'CZ'=>'Česká republika',
+        'DE'=>'Německo',
+        'DJ'=>'Džibutsko',
+        'DK'=>'Dánsko',
+        'DM'=>'Dominika',
+        'DO'=>'Dominikánská republika',
+        'DZ'=>'Alžírsko',
+        'EC'=>'Ekvádor',
+        'EE'=>'Estonsko',
         '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',
+        'ES'=>'Španělsko',
+        'ET'=>'Etiopie',
+        'EU'=>'Evropská unie',
+        'FI'=>'Finsko',
+        'FJ'=>'Fidži',
+        'FK'=>'Falklandské ostrovy (Malviny)',
+        'FM'=>'Mikronésie, Federativní státy',
+        'FO'=>'Faerské ostrovy',
+        'FR'=>'Francie',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GE'=>'Gruzie',
+        'GF'=>'Francouzská Guyana',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
-        'GM'=>'Gambia',
+        'GL'=>'Grónsko',
+        'GM'=>'Gambie',
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GQ'=>'Rovníková Guinea',
+        'GR'=>'Řecko',
+        'GS'=>'Jižní Georgie a Jižní Sandwichovy ostrovy',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Heardův ostrov a MacDonaldovy ostrovy',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Chorvatsko (místní název: Hrvatska)',
         'HT'=>'Haiti',
-        'HU'=>'Hungary',
-        'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'HU'=>'Maďarsko',
+        'ID'=>'Indonésie',
+        'IE'=>'Irsko',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
-        'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IM'=>'Ostrov Man',
+        'IN'=>'Indie',
+        'IO'=>'Britské území v Indickém oceánu',
+        'IQ'=>'Irák',
+        'IR'=>'Írán, Islámská republika',
+        'IS'=>'Island',
+        'IT'=>'Itálie',
         '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'=>'Kyrgyzstán',
+        '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'=>'Svatý Kryštof a Nevis',
+        'KR'=>'Korejská republika',
+        'KW'=>'Kuvajt',
+        'KY'=>'Kajmanské ostrovy',
+        'KZ'=>'Kazachstán',
+        'LA'=>'Laoská lidově demokratická republika',
+        'LB'=>'Libanon',
+        'LC'=>'Svatá Lucie',
+        'LI'=>'Lichtenštejnsko',
+        'LK'=>'Srí Lanka',
+        'LR'=>'Libérie',
         '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'=>'Lucembursko',
+        'LV'=>'Lotyšsko',
+        'LY'=>'Libyjská arabská džamáhíríje',
+        'MA'=>'Maroko',
+        'MC'=>'Monako',
+        'MD'=>'Moldavská republika',
+        'ME'=>'Černá Hora',
+        'MG'=>'Madagaskar',
+        'MH'=>'Marshallovy ostrovy',
+        'MK'=>'Makedonie, Bývalá jugoslávská republika',
         'ML'=>'Mali',
         'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
+        'MN'=>'Mongolsko',
+        'MO'=>'Macao',
+        'MP'=>'Severní Mariánské ostrovy',
+        'MQ'=>'Martinik',
+        'MR'=>'Mauretánie',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Mauricius',
+        'MV'=>'Maledivy',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'MX'=>'Mexiko',
+        'MY'=>'Malajsie',
+        'MZ'=>'Mosambik',
+        'NA'=>'Namibie',
+        'NC'=>'Nová Kaledonie',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
-        'NG'=>'Nigeria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
-        'NP'=>'Nepal',
+        'NF'=>'Ostrov Norfolk',
+        'NG'=>'Nigérie',
+        'NI'=>'Nikaragua',
+        'NL'=>'Nizozemsko',
+        'NO'=>'Norsko',
+        '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',
-        'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
-        'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
-        'PT'=>'Portugal',
+        'PF'=>'Francouzská Polynésie',
+        'PG'=>'Papua-Nová Guinea',
+        'PH'=>'Filipíny, Republika',
+        'PK'=>'Pákistán',
+        'PL'=>'Polsko',
+        'PM'=>'Saint-Pierre a Miquelon',
+        'PN'=>'Pitcairnovy ostrovy',
+        'PR'=>'Portoriko',
+        'PS'=>'Palestina',
+        'PT'=>'Portugalsko',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
-        'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
+        'QA'=>'Katar',
+        'RE'=>'Réunion',
+        'RO'=>'Rumunsko',
+        'RS'=>'Srbsko',
+        'RU'=>'Ruská federace',
         'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'SA'=>'Saúdská Arábie',
+        'UK'=>'Skotsko',
+        'SB'=>'Šalamounovy ostrovy',
         'SC'=>'Seychelles',
+        'SS'=>'Jižní Súdán',
         'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SE'=>'Švédsko',
+        'SG'=>'Singapur',
         'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SI'=>'Slovinsko',
+        'SJ'=>'Špicberky a Jan Mayen',
+        'SK'=>'Slovensko (Slovenská republika)',
         'SL'=>'Sierra Leone',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
-        'SO'=>'Somalia',
+        'SO'=>'Somálsko',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'Svatý Tomáš a Princův ostrov',
+        'SU'=>'Sovětský svaz',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
-        'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'SY'=>'Syrská Arabská republika',
+        'SZ'=>'Svazijsko',
+        'TC'=>'Ostrovy Turks a Caicos',
+        'TD'=>'Čad',
+        'TF'=>'Francouzská jižní území',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
+        'TH'=>'Thajsko',
+        'TJ'=>'Tádžikistán',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TI'=>'Východní Timor',
+        'TM'=>'Turkmenistán',
+        'TN'=>'Tunisko',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Východní časovač (starý kód)',
+        'TR'=>'Turecko',
+        'TT'=>'Trinidad a Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TW'=>'Tchaj-wan',
+        'TZ'=>'Tanzanie',
+        'UA'=>'Ukrajina',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'Spojené království',
+        'US'=>'Spojené státy',
+        'UM'=>'Menší odlehlé ostrovy USA',
         'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'UZ'=>'Uzbekistán',
+        'VA'=>'Vatikánský městský stát (Holy See)',
+        'VC'=>'Svatý Vincenc a Grenadiny',
         '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',
+        'WF'=>'Ostrovy Wallis a Futuna',
         'WS'=>'Samoa',
-        'YE'=>'Yemen',
+        'YE'=>'Jemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
-        'ZM'=>'Zambia',
+        'ZA'=>'Jihoafrická republika',
+        'ZM'=>'Zambie',
         'ZW'=>'Zimbabwe',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/cs/mail.php b/resources/lang/cs/mail.php
index 5dde30b878..69aba6e49d 100644
--- a/resources/lang/cs/mail.php
+++ b/resources/lang/cs/mail.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'acceptance_asset_accepted' => 'A user has accepted an item',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_accepted' => 'Uživatel potvrdil vlastnictví',
+    'acceptance_asset_declined' => 'Uživatel zamítl vlastnictví',
     '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',
     'accessory_name' => 'Název příslušenství:',
@@ -11,7 +11,7 @@ return [
     'asset' => 'Majetek:',
     'asset_name' => 'Název majetku:',
     'asset_requested' => 'Požadovaný majetek',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Inventární číslo',
     'assigned_to' => 'Přiděleno',
     'best_regards' => 'S pozdravem,',
     'canceled' => 'Zrušeno:',
@@ -20,12 +20,12 @@ return [
     'click_to_confirm' => 'Kliknutím na následující odkaz potvrdíte váš účet pro :web:',
     'click_on_the_link_accessory' => 'Kliknutím na odkaz v dolní části potvrďte, že jste obdrželi příslušné příslušenství.',
     'click_on_the_link_asset' => 'Kliknutím na odkaz v dolní části potvrďte, že jste obdrželi daný produkt.',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_Asset_Checkin' => 'Potvrzení odevzdání předmětu',
+    'Confirm_Accessory_Checkin' => 'Potvrzení odevzdání příslušenství',
+    'Confirm_accessory_delivery' => 'Potvrďte dodání příslušenství',
+    'Confirm_license_delivery' => 'Potvrdit dodání licence',
+    'Confirm_asset_delivery' => 'Potvrďte dodání majetku',
+    'Confirm_consumable_delivery' => 'Potvrďte dodání spotřebního zboží',
     'current_QTY' => 'Aktuální množství',
     'Days' => 'Dní',
     'days' => 'Dní',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Přihlaste se k nové instalaci Snipe-IT pomocí níže uvedených pověření:',
     'login' => 'Uživatelské jméno:',
     'Low_Inventory_Report' => 'Hlášení o nízkých zásobách',
+    'inventory_report' => 'Zpráva o majetku',
     '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.',
@@ -61,21 +62,23 @@ return [
     'test_mail_text' => 'Toto je test ze systému Snipe-IT Asset Management System. Pokud jste ho dostali, email funguje :)',
     'the_following_item' => 'Následující položka byla převzata: ',
     '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.',
-    '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' => '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.',
     '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.',
     'to_reset' => 'Pro resetování vašeho hesla vyplňte tento formulář:',
     'type' => 'Typ',
-    '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' => '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',
     'welcome' => 'Vítej uživateli :name',
     'welcome_to' => 'Vítejte na :web!',
     'your_credentials' => 'Vaše pověření Snipe-IT',
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'License_Checkin_Notification' => 'License checked in',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
-    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets',
+    'Accessory_Checkin_Notification' => 'Příslušenství přidáno v',
+    'Asset_Checkin_Notification' => 'Majetek přidán v',
+    'Asset_Checkout_Notification' => 'Asset checked out',
+    'License_Checkin_Notification' => 'Licence přidána v',
+    'Expected_Checkin_Report' => 'Předpokládaný report o dostupném majetku',
+    'Expected_Checkin_Notification' => 'Připomenutí: blížící se lhůta pro :name',
+    'Expected_Checkin_Date' => 'Majetek, který vám byl předán, musí být vrácen zpět do :date',
+    'your_assets' => 'Zobrazit vaše položky',
+    'rights_reserved' => 'Všechna práva vyhrazena.',
 ];
diff --git a/resources/lang/cs/passwords.php b/resources/lang/cs/passwords.php
index 25633b4581..8f5d8e7036 100644
--- a/resources/lang/cs/passwords.php
+++ b/resources/lang/cs/passwords.php
@@ -1,8 +1,8 @@
 <?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!',
+    'sent'	        => 'Pokud v našem systému existuje uživatel s touto emailovou adresou, byl odeslán e-mail pro obnovení hesla.',
+    'user'			=> 'Pokud v našem systému existuje uživatel s touto emailovou adresou, byl odeslán e-mail pro obnovení hesla.',
+    'token'         => 'Tento token pro obnovení hesla je neplatný, vypršel, nebo se neshoduje s zadaným uživatelským jménem.',
+    'reset'         => 'Heslo úspěšně změněno!',
 ];
diff --git a/resources/lang/cs/reminders.php b/resources/lang/cs/reminders.php
index 98f935329e..8c2cc27917 100644
--- a/resources/lang/cs/reminders.php
+++ b/resources/lang/cs/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Heslo musí mít šest znaků a schodovat se s potvrzujícím heslem.",
     "user"     => "Uživatelské jméno nebo email je chybný",
-    "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"    => 'Tento token pro obnovení hesla je neplatný, vypršel, nebo se neshoduje s zadaným uživatelským jménem.',
+    'sent'	   => 'Pokud v našem systému existuje uživatel s touto emailovou adresou, byl odeslán e-mail pro obnovení hesla.',
 
 );
diff --git a/resources/lang/cs/validation.php b/resources/lang/cs/validation.php
index 10b1e970ea..1ea00161e2 100644
--- a/resources/lang/cs/validation.php
+++ b/resources/lang/cs/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'Atribut: musí být soubor.',
     'filled'               => 'Pole atributu: musí mít hodnotu.',
     'image'                => ':attribute musí být obrázek.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribut musí mít alespoň: min položky.',
     ],
     'starts_with'          => ':attribute musí končit jednou z následujících hodnot: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Zvolený :attribute je neplatný.',
     'numeric'              => ':attribute musí být číslo.',
     'present'              => 'Pole atributu musí být přítomno.',
@@ -93,27 +95,16 @@ return [
     'url'                  => 'Formát :attribute je neplatný.',
     'unique_undeleted'     => 'Je třeba, aby se :attribute neopakoval.',
     'non_circular'         => ':attribute nesmí vytvořit kruhový odkaz.',
-    '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.',
+    'disallow_same_pwd_as_user_fields' => 'Heslo nemůže být stejné jako uživatelské jméno.',
+    'letters'              => 'Heslo musí obsahovat nejméně jedno písmeno.',
+    'numbers'              => 'Heslo musí obsahovat alespoň jednu číslici.',
+    'case_diff'            => 'Heslo musí použít smíšené znaky.',
+    'symbols'              => 'Heslo musí obsahovat symboly.',
     'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
+        'numeric'          => 'Hodnota nemůže být záporná'
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/cy/admin/accessories/general.php b/resources/lang/cy/admin/accessories/general.php
index c89cfa68e6..d880f1b16b 100644
--- a/resources/lang/cy/admin/accessories/general.php
+++ b/resources/lang/cy/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Diweddaru Ategolyn',
     'use_default_eula'					=> 'Defnyddio\'r <a href="#" data-toggle="modal" data-target="#eulaModal">prif CTDT diofyn</a> yn lle.',
     'use_default_eula_disabled'			=> '<del>Defnyddio\'r CTDT diofn yn lle\'r un presennol.</del>Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch un yn gosodiadau os gwelwch yn dda.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/cy/admin/accessories/message.php b/resources/lang/cy/admin/accessories/message.php
index e5be37a7e1..3db35e4ced 100644
--- a/resources/lang/cy/admin/accessories/message.php
+++ b/resources/lang/cy/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/cy/admin/asset_maintenances/form.php b/resources/lang/cy/admin/asset_maintenances/form.php
index 4d531097c3..209803c54d 100644
--- a/resources/lang/cy/admin/asset_maintenances/form.php
+++ b/resources/lang/cy/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Manylion Cynnal a Chadw',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Teitl',
-        'start_date'             => 'Wedi cychwyn',
-        'completion_date'        => 'Wedi cwbwlhau',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Gwelliant Gwarant',
-        'asset_maintenance_time' => 'Dyddiau',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Nodiadau',
-        'update'                 => 'Diweddaru',
-        'create'                 => 'Creu'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/cy/admin/categories/message.php b/resources/lang/cy/admin/categories/message.php
index 44f3e21732..c40e5a0f2a 100644
--- a/resources/lang/cy/admin/categories/message.php
+++ b/resources/lang/cy/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Ni diweddarwyd y categori, ceisiwch eto o. g. y. dd',
-        'success' => 'Categori wedi diweddaru\'n llwyddiannus.'
+        'success' => 'Categori wedi diweddaru\'n llwyddiannus.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/cy/admin/components/general.php b/resources/lang/cy/admin/components/general.php
index 1685f85492..ea00037160 100644
--- a/resources/lang/cy/admin/components/general.php
+++ b/resources/lang/cy/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Yn weddill',
     'total' 			                 => 'Cyfanswm',
     'update'                            => 'Diweddaru Cydran',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/cy/admin/components/message.php b/resources/lang/cy/admin/components/message.php
index fbd08cf4e3..f89aedb4b8 100644
--- a/resources/lang/cy/admin/components/message.php
+++ b/resources/lang/cy/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Cydran heb ei nodi allan, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Cydran wedi nodi allan yn llwyddiannus.',
-        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.'
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/cy/admin/consumables/message.php b/resources/lang/cy/admin/consumables/message.php
index df0a02f33d..f7f5438001 100644
--- a/resources/lang/cy/admin/consumables/message.php
+++ b/resources/lang/cy/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Nwydd traul heb ei nodi allan, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Nwydd traul wedi nodi allan yn llwyddiannus.',
-        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.'
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/cy/admin/custom_fields/general.php b/resources/lang/cy/admin/custom_fields/general.php
index da1a8293f9..ab1cdc3966 100644
--- a/resources/lang/cy/admin/custom_fields/general.php
+++ b/resources/lang/cy/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Defnyddir gan modelau',
     'order'   		            => 'Trefn',
     'create_fieldset'         => 'Set maes newydd',
+    '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'            => 'Maes Addasedig newydd',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/cy/admin/groups/message.php b/resources/lang/cy/admin/groups/message.php
index e0ee41d447..73fbbb4fb4 100644
--- a/resources/lang/cy/admin/groups/message.php
+++ b/resources/lang/cy/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grwp yn bodoli yn barod!',
-    'group_not_found'     => 'Nid yw grwp [:id] yn bodoli.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Mae angen llenwi\'r maes enw',
 
     'success' => array(
diff --git a/resources/lang/cy/admin/hardware/form.php b/resources/lang/cy/admin/hardware/form.php
index 1388f8c66d..432ae56943 100644
--- a/resources/lang/cy/admin/hardware/form.php
+++ b/resources/lang/cy/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Cadarnahu Dileu Nifer o Asedau',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Adolygwch yr asedau ar gyfer dileu isod. Ar ôl eu dileu, gellir adfer yr asedau hyn, ond ni fyddant yn gysylltiedig mwyach ag unrhyw ddefnyddwyr y maent wedi\'u neilltuo iddynt ar hyn o bryd.',
+  'bulk_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'	=> 'Rydych am dileu :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Diweddaru Nifer o Asedau',
     'bulk_update_help'	=> 'Mae\'r ffurflen hon yn caniatáu ichi ddiweddaru nifer o asedau ar unwaith. Llenwch y meysydd sydd angen i chi eu newid yn unig. Bydd unrhyw bwlch a adewir yn wag yn aros yr un fath. ',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/cy/admin/hardware/general.php b/resources/lang/cy/admin/hardware/general.php
index 4703afe6e4..9d2b5b2ab9 100644
--- a/resources/lang/cy/admin/hardware/general.php
+++ b/resources/lang/cy/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Addasu Ased',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Ar gael',
     'requested'				    => 'Gofynnwyd amdano',
     'not_requestable'           => 'Ddim ar gael',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Adfer Ased',
     'pending'  					=> 'Yn disgwl',
     'undeployable'  			=> 'Dim ar gael',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/cy/admin/hardware/message.php b/resources/lang/cy/admin/hardware/message.php
index f7ced8964c..b38906a244 100644
--- a/resources/lang/cy/admin/hardware/message.php
+++ b/resources/lang/cy/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Nid oedd yn bosib adfer yr ased, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Ased wedi adfer yn llwyddiannus.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/cy/admin/hardware/table.php b/resources/lang/cy/admin/hardware/table.php
index 1d5dcb5424..0f2dd62ec3 100644
--- a/resources/lang/cy/admin/hardware/table.php
+++ b/resources/lang/cy/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Mewn/Allan',
     'checkout_date' => 'Dyddiad Allan',
     'checkoutto' 	=> 'Allan',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Gwahaniaeth',
     'dl_csv' 		=> 'Lawrlwytho CSV',
diff --git a/resources/lang/cy/admin/licenses/general.php b/resources/lang/cy/admin/licenses/general.php
index 188dc06251..dc2b1f7108 100644
--- a/resources/lang/cy/admin/licenses/general.php
+++ b/resources/lang/cy/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Amdan trwyddedau',
-    'about_licenses'                  => 'Mae trwyddedau yn tracio feddalwedd. May yna nifer o seddi fedrwch nodi yn erbyn unigolion',
+    'about_licenses_title'      => 'Amdan trwyddedau',
+    'about_licenses'            => 'Mae trwyddedau yn tracio feddalwedd. May yna nifer o seddi fedrwch nodi yn erbyn unigolion',
     'checkin'  					=> 'Nodi sedd trwydded i fewn',
     'checkout_history'  		=> 'Hanes nodi allan',
     'checkout'  				=> 'Nodi sedd trwydded allan',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Trwyddedau Meddalwedd',
     'user'  					=> 'Defnyddiwr',
     'view'  					=> 'Gweld Trwydded',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/cy/admin/manufacturers/message.php b/resources/lang/cy/admin/manufacturers/message.php
index 80ff96369a..af22998c9c 100644
--- a/resources/lang/cy/admin/manufacturers/message.php
+++ b/resources/lang/cy/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Nid yw\'r gwneuthyrwr yn bodoli.',
     'assoc_users'	 => 'Mae\'r gwneuthyrwr yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y gwneuthyrwr yma ac yna ceisiwch eto. ',
 
diff --git a/resources/lang/cy/admin/manufacturers/table.php b/resources/lang/cy/admin/manufacturers/table.php
index b9c1dd7c7a..595480dcc8 100644
--- a/resources/lang/cy/admin/manufacturers/table.php
+++ b/resources/lang/cy/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Ebost Cefnogaeth',
     'support_phone'   		=> 'Rhif ffôn cefnogaeth',
     'support_url'   		=> 'Wefan cefnogaeth',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Diweddaru Gwneuthyrwr',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/cy/admin/models/general.php b/resources/lang/cy/admin/models/general.php
index 757c90d3f0..c0926c19c2 100644
--- a/resources/lang/cy/admin/models/general.php
+++ b/resources/lang/cy/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Rydych am dileu :model_count o asedau.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Adfer Model',
     'requestable'               => 'Gellir defnyddwyr gwneud cais am yr ased yma',
 	'show_mac_address'			      => 'Dangos cyfeiriad MAC yn asedau o\'r model yma',
diff --git a/resources/lang/cy/admin/models/message.php b/resources/lang/cy/admin/models/message.php
index 0a25c9960c..5a02eacee5 100644
--- a/resources/lang/cy/admin/models/message.php
+++ b/resources/lang/cy/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Nid yw\'r model yn bodoli.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Ni diweddarwyd y model, ceisiwch eto o.g.y.dd',
-        'success' => 'Model wedi diweddaru\'n llwyddiannus.'
+        'success' => 'Model wedi diweddaru\'n llwyddiannus.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Dim newid mewn manylder, felly dim byd i diweddaru.',
-        'success' 		=> 'Modelau wedi diweddaru.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Dim modelau wedi dewis, felly dim byd i\'w ddileu.',
-        'success' 		    => ':success_count model(au) wedi dileu!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(au) wedi\'i dileu, :fail_count heb eu ddileu gan bod asedau wedi perthnasu iddo.'
     ),
 
diff --git a/resources/lang/cy/admin/settings/general.php b/resources/lang/cy/admin/settings/general.php
index 301d15a6cc..a8ef3d5ecc 100644
--- a/resources/lang/cy/admin/settings/general.php
+++ b/resources/lang/cy/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'Os ydych am i cyfrif ebost derbyn copi o negeseuon i ddefnyddwyr wrth nodi asdedau allan i defnyddwyr ac yn ol i fewn rhowch o yma. Fel arall, gadewch yn wag.',
     'is_ad'				        => 'Mae hwn yn Server Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Rhybuddion ebost wedi alluogi',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Gosodiadau 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Gosodwch cyfrif a chyfrinair LDAP dilys o\'r base DN i profi cysyllted a gweithrediad LDAP. RHAID ARBED Y GOSODIADAU LDAP CYNTAF.',
     'ldap_login_sync_help'      => 'Mae\'r prawf yma yn profi\'r gallu i LDAP gwneud sync. Os ydi\'r gosodiadau LDAP yn anghywir mae\'n bosib ni ellith defnyddwyr mewngofnodi. RHAID ARBED GOSODIADAU LDAP CYNTAF.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Dangos lluniau mewn ebyst',
     'show_images_in_email_help'   => 'Tynnwch y tic or bocs yma os yw eich copi o Snipe-IT tu ol i VPN neu o fewn rhwydwaith caedig os ni fydd yn bosib i defnyddwyr gweld lluniau yn ebyst o\'r system yma.',
     'site_name'                 => 'Enw Safle',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Enwbot Slack',
-    'slack_channel'             => 'Sianel Slack',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Gosodiadau Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Ar ol arbed eich wybodaeth Slack cewch fotwm profi.',
-    'slack_test_help'           => 'Profi eich gosodiadau slack. Rhaid i chi arbed eich gosodiadau gyntaf.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labelau',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/cy/admin/settings/message.php b/resources/lang/cy/admin/settings/message.php
index 0f8d658573..648788616e 100644
--- a/resources/lang/cy/admin/settings/message.php
+++ b/resources/lang/cy/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/cy/admin/users/general.php b/resources/lang/cy/admin/users/general.php
index 0fe98f2b55..67fa1dea68 100644
--- a/resources/lang/cy/admin/users/general.php
+++ b/resources/lang/cy/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.',
+    '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',
     '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'         => 'Gweld Defnyddiwr :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/cy/admin/users/message.php b/resources/lang/cy/admin/users/message.php
index f04c85d285..7760e062f8 100644
--- a/resources/lang/cy/admin/users/message.php
+++ b/resources/lang/cy/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 defnyddiwr [:id] yn bodoli.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Mae angen llenwi\'r maes login',
     'user_password_required'    => 'Rhaid gosod cyfrinair.',
     'insufficient_permissions'  => 'Diffyg Hawliau.',
diff --git a/resources/lang/cy/auth/general.php b/resources/lang/cy/auth/general.php
index 2494f5150e..46deef4959 100644
--- a/resources/lang/cy/auth/general.php
+++ b/resources/lang/cy/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Cofiwch fi',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/cy/general.php b/resources/lang/cy/general.php
index a6442a3be8..a62dca8ac6 100644
--- a/resources/lang/cy/general.php
+++ b/resources/lang/cy/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Ategolion',
     'activated'			    => 'Actifadu',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Ategolyn',
     'accessory_report'		=> 'Adroddiad Ategolion',
     'action'                => 'Gweithred',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Awdit',
     'audit_report'			=> 'Log Awdit',
     'assets'				=> 'Asedau',
+    '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'         => 'Dileu Avatar',
     'avatar_upload'         => 'Uwchlwytho Avatar',
     'back'      			=> 'Yn ôl',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Canslo',
     'categories'			=> 'Categoriau',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Wedi Dileu',
     'delete_seats'  		=> 'Seddi wedi dileu',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Mewnforio',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Cynnal a chadw Ased',
     'item'  				=> 'Eitem',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Diffyg Hawliau!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Iaith',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Cais wedi dileu',
     'save'  				=> 'Cadw',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Dewis',
     'select_all'            => 'Dewis Popeth',
     'search'				=> 'Chwilio',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Llofnod',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => 'MODE DEMO: Mae rhai nodweddion wedi analluogi ar gyfer y gosodiad hwn.',
     'site_name'				=> 'Enw Safle',
     'state'  				=> 'Talaith',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Ydych chi\'n sicr eich bod eisiau dileu',
     'submit'				=> 'Cyflwyno',
     'target'                => 'Targed',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Dangos Dyddiad ac Amser',
     'total_assets'			=> 'cyfanswm asedau',
     'total_licenses'		=> 'cyfanswm trwyddedau',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/cy/help.php b/resources/lang/cy/help.php
index ae93bf35cd..7baea163c1 100644
--- a/resources/lang/cy/help.php
+++ b/resources/lang/cy/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mwy o wybodaeth',
 
-    '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/cy/localizations.php b/resources/lang/cy/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/cy/localizations.php
+++ b/resources/lang/cy/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/cy/mail.php b/resources/lang/cy/mail.php
index ef775012fb..c2f8723bf5 100644
--- a/resources/lang/cy/mail.php
+++ b/resources/lang/cy/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Mewngofnodi i\'ch gosodiad Snipe-IT newydd gan ddefnyddio\'r manylion isod:',
     'login' => 'Mewngofnodi:',
     'Low_Inventory_Report' => 'Adroddiad Inventory Isel',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Nifer Lleiaf',
     'name' => 'Enw',
     'new_item_checked' => 'Mae eitem newydd wedi\'i gwirio o dan eich enw, mae\'r manylion isod.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Eich manylion defnyddiwr Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/cy/validation.php b/resources/lang/cy/validation.php
index 5371a43915..a8bdb061a9 100644
--- a/resources/lang/cy/validation.php
+++ b/resources/lang/cy/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Rhaid i\'r :attribute cael o leiaf :min o eitemau.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/da/account/general.php b/resources/lang/da/account/general.php
index 7fc060a849..85326dc4c2 100644
--- a/resources/lang/da/account/general.php
+++ b/resources/lang/da/account/general.php
@@ -1,12 +1,10 @@
 <?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' => 'Personlige API-nøgler',
+    'api_key_warning' => 'Når du genererer en API-nøgle, skal du sørge for at kopiere det ned med det samme, da de ikke vil være synlige for dig igen.',
+    'api_base_url' => 'Din basisadressen til API\'en er:',
     '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.',
+    'api_token_expiration_time' => 'API-nøgler er indstillet til at udløbe efter:',
+    'api_reference' => 'Se venligst i <a href="https://snipe-it.readme.io/reference" target="_blank">API-manualen</a> for at finde specifikke API-endpoints og yderligere API-dokumentation.',
 );
diff --git a/resources/lang/da/admin/accessories/general.php b/resources/lang/da/admin/accessories/general.php
index 5be1f1c1d1..5628485ef9 100644
--- a/resources/lang/da/admin/accessories/general.php
+++ b/resources/lang/da/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Opdater tilbehør',
     'use_default_eula'					=> 'Brug den <a href="#" data-toggle="modal" data-target="#eulaModal">primære standard slutbrugerlicens</a> i stedet for.',
     'use_default_eula_disabled'			=> '<del>Brug den primære standard slutbrugerlicens i stedet for.</del> Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/da/admin/accessories/message.php b/resources/lang/da/admin/accessories/message.php
index 829220a585..48d2e46ae0 100644
--- a/resources/lang/da/admin/accessories/message.php
+++ b/resources/lang/da/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Tilbehør blev ikke tjekket ud, prøv igen',
         'success' 		=> 'Tilbehør er tjekket ud.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.'
     ),
 
diff --git a/resources/lang/da/admin/asset_maintenances/form.php b/resources/lang/da/admin/asset_maintenances/form.php
index cbc11d3549..7828bc0f29 100644
--- a/resources/lang/da/admin/asset_maintenances/form.php
+++ b/resources/lang/da/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Vedligeholdelsestype',
+        'asset_maintenance_type' => 'Aktiv-vedligeholdelsestype',
         'title'                  => 'Titel',
-        'start_date'             => 'Start dato',
-        'completion_date'        => 'Gennemført',
+        'start_date'             => 'Startdato',
+        'completion_date'        => 'Afslutningsdato',
         'cost'                   => 'Omkostninger',
         'is_warranty'            => 'Garantiforbedring',
-        'asset_maintenance_time' => 'Dage',
+        'asset_maintenance_time' => 'Aktiv-vedligeholdelsestid (i dage)',
         'notes'                  => 'Noter',
-        'update'                 => 'Opdatering',
-        'create'                 => 'Opret'
+        'update'                 => 'Opdater aktiv-vedligeholdelse',
+        'create'                 => 'Opret aktiv-vedligeholdelse'
     ];
diff --git a/resources/lang/da/admin/asset_maintenances/general.php b/resources/lang/da/admin/asset_maintenances/general.php
index f7eda47405..41019c5f7e 100644
--- a/resources/lang/da/admin/asset_maintenances/general.php
+++ b/resources/lang/da/admin/asset_maintenances/general.php
@@ -11,6 +11,6 @@
         'calibration'        => 'Kalibrering',
         'software_support'   => 'Software Support',
         'hardware_support'   => 'Hardware support',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'configuration_change'   => 'Konfigurationsændring',
+        'pat_test'           => 'PAT-test',
     ];
diff --git a/resources/lang/da/admin/categories/general.php b/resources/lang/da/admin/categories/general.php
index 377c20db08..8f45feb5f5 100644
--- a/resources/lang/da/admin/categories/general.php
+++ b/resources/lang/da/admin/categories/general.php
@@ -18,6 +18,6 @@ return array(
     'update'  							=> 'Opdater kategori',
     'use_default_eula'					=> 'Brug den <a href="#" data-toggle="modal" data-target="#eulaModal">primære standard slutbrugerlicens</a> i stedet for.',
     'use_default_eula_disabled'			=> '<del>Brug den primære standard slutbrugerlicens i stedet for.</del> Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.',
-    'use_default_eula_column'			=> 'Use default EULA',
+    'use_default_eula_column'			=> 'Brug standard slutbrugerlicensaftale',
 
 );
diff --git a/resources/lang/da/admin/categories/message.php b/resources/lang/da/admin/categories/message.php
index 6b26b7dc1c..fe3b5c2ef9 100644
--- a/resources/lang/da/admin/categories/message.php
+++ b/resources/lang/da/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorien blev ikke opdateret, prøv igen',
-        'success' => 'Kategorien blev opdateret.'
+        'success' => 'Kategorien blev opdateret.',
+        'cannot_change_category_type'   => 'Du kan ikke ændre kategoritypen, når først den er blevet oprettet',
     ),
 
     'delete' => array(
diff --git a/resources/lang/da/admin/companies/general.php b/resources/lang/da/admin/companies/general.php
index 7595d7941e..511e5de36c 100644
--- a/resources/lang/da/admin/companies/general.php
+++ b/resources/lang/da/admin/companies/general.php
@@ -2,6 +2,6 @@
 
 return [
     'select_company' => 'Vælg firma',
-    '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.',
+    'about_companies' => 'Om virksomheder',
+    'about_companies_description' => 'Du kan bruge virksomheder som et simpelt informationsfelt eller du kan bruge dem til at begrænse aktivets synlighed og tilgængelighed for brugere med en bestemt virksomhed ved at aktivere Full Company Support i dine Admin-indstillinger.',
 ];
diff --git a/resources/lang/da/admin/components/general.php b/resources/lang/da/admin/components/general.php
index 531e82dafd..fa506b7bdf 100644
--- a/resources/lang/da/admin/components/general.php
+++ b/resources/lang/da/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Resterende',
     'total' 			                 => 'Total',
     'update'                            => 'Opdater Komponent',
+    'checkin_limit'            => 'Antal tjekket ind skal være lig med eller mindre end :assigned_qty'
 );
diff --git a/resources/lang/da/admin/components/message.php b/resources/lang/da/admin/components/message.php
index e095b0841e..41a39eb3e3 100644
--- a/resources/lang/da/admin/components/message.php
+++ b/resources/lang/da/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponent blev ikke tjekket ud, prøv igen',
         'success' 		=> 'Komponent tjekket ud med succes.',
-        'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.'
+        'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/da/admin/consumables/message.php b/resources/lang/da/admin/consumables/message.php
index bddde98446..63313533d1 100644
--- a/resources/lang/da/admin/consumables/message.php
+++ b/resources/lang/da/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Forbruget blev ikke tjekket ud, prøv igen',
         'success' 		=> 'Forbrugsmaterialet tjekket ud med succes.',
-        'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.'
+        'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/da/admin/custom_fields/general.php b/resources/lang/da/admin/custom_fields/general.php
index 19144a5767..31657d9ba4 100644
--- a/resources/lang/da/admin/custom_fields/general.php
+++ b/resources/lang/da/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Bruges af modeller',
     'order'   		            => 'Ordre',
     'create_fieldset'         => 'Nyt Feltsæt',
+    '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'            => 'Nyt Brugerdefinerede Felt',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/da/admin/custom_fields/message.php b/resources/lang/da/admin/custom_fields/message.php
index f27c3985ec..d2d527d86a 100644
--- a/resources/lang/da/admin/custom_fields/message.php
+++ b/resources/lang/da/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Fejl under validering af standard feltsæt-værdier.',
 
     ),
 
diff --git a/resources/lang/da/admin/departments/message.php b/resources/lang/da/admin/departments/message.php
index bd46d2244a..d6ff5e279e 100644
--- a/resources/lang/da/admin/departments/message.php
+++ b/resources/lang/da/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Afdeling findes ikke.',
-    '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' => 'En afdeling med dette navn findes allerede på denne virksomhedsplacering. Eller vælg et mere specifikt navn for denne afdeling. ',
     'assoc_users'	 => 'Denne afdeling er i øjeblikket knyttet til mindst én bruger og kan ikke slettes. Opdater venligst dine brugere for at ikke længere referere til denne afdeling, og prøv igen. ',
     'create' => array(
         'error'   => 'Afdelingen blev ikke oprettet, prøve igen.',
diff --git a/resources/lang/da/admin/depreciations/general.php b/resources/lang/da/admin/depreciations/general.php
index 2492ead4b4..486c285c94 100644
--- a/resources/lang/da/admin/depreciations/general.php
+++ b/resources/lang/da/admin/depreciations/general.php
@@ -6,11 +6,11 @@ return [
     'asset_depreciations'  					=> 'Aktiv Afskrivninger',
     'create'  					            => 'Opret afskrivninger',
     'depreciation_name'  					=> 'Afskrivningnavn',
-    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'depreciation_min'                      => 'Bæreværdi for afskrivning',
     'number_of_months'  					=> 'Antal måneder',
     'update'  					            => 'Opdater Afskrivninger',
-    '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'                      => 'Minimumsværdi efter afskrivning',
+    'no_depreciations_warning'               => '<strong>Advarsel: </strong>
+                      Du har i øjeblikket ikke opsat nogen afskrivninger.
+                      Opsæt mindst én afskrivning for at se afskrivningsrapporten.',
 ];
diff --git a/resources/lang/da/admin/depreciations/table.php b/resources/lang/da/admin/depreciations/table.php
index 525a1491d5..7627a289d4 100644
--- a/resources/lang/da/admin/depreciations/table.php
+++ b/resources/lang/da/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
     'months'   => 'Måneder',
     'term'   => 'Term',
     'title'      => 'Navn ',
-    'depreciation_min' => 'Floor Value',
+    'depreciation_min' => 'Bæreværdi',
 
 ];
diff --git a/resources/lang/da/admin/groups/message.php b/resources/lang/da/admin/groups/message.php
index af83daa1c4..82e1061b11 100644
--- a/resources/lang/da/admin/groups/message.php
+++ b/resources/lang/da/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Gruppen eksisterer allerede!',
-    'group_not_found'     => 'Gruppen [:id] eksisterer ikke.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Navnefeltet er påkrævet',
 
     'success' => array(
diff --git a/resources/lang/da/admin/groups/titles.php b/resources/lang/da/admin/groups/titles.php
index ffd7d706e1..1b013c5f0e 100644
--- a/resources/lang/da/admin/groups/titles.php
+++ b/resources/lang/da/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> 'Gruppeadministrator',
     'allow' 	 			=> 'Tillad',
     'deny' 	 				=> 'Afvis',
-    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
-    'no_permissions'        => 'This group has no permissions.'
+    'permission'            => 'Rettighed',
+    'grant'                 => 'Tildel',
+    'no_permissions'        => 'Denne gruppe har ingen rettigheder.'
 ];
diff --git a/resources/lang/da/admin/hardware/form.php b/resources/lang/da/admin/hardware/form.php
index b014fa940d..e4da67b043 100644
--- a/resources/lang/da/admin/hardware/form.php
+++ b/resources/lang/da/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Bekræft massefortegnelser',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Gennemgå aktiver for massesletning nedenfor. Disse aktiver kan gendannes når slettet, men de vil ikke længere være forbundet med eventuelle brugere, de i øjeblikket er tildelt.',
+  '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'	=> 'Du er i gang med at slette :asset_count aktiver.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Masseopdater Aktiver',
     'bulk_update_help'	=> 'Denne form tillader dig at opdatere flere aktiver på en gang. Udfyld kun de felter der skal ændres. Ikke udfyldte feltet forbilver uændret.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/da/admin/hardware/general.php b/resources/lang/da/admin/hardware/general.php
index 6429177b88..344dff99c4 100644
--- a/resources/lang/da/admin/hardware/general.php
+++ b/resources/lang/da/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Rediger aktiv',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'kan anmodes',
     'requested'				    => 'Anmodet',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Gendan aktiv',
     'pending'  					=> 'Verserende',
     'undeployable'  			=> 'Undeployable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Se aktiv',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/da/admin/hardware/message.php b/resources/lang/da/admin/hardware/message.php
index 5d673caba8..530cfa6484 100644
--- a/resources/lang/da/admin/hardware/message.php
+++ b/resources/lang/da/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Akten blev ikke gendannet, prøv igen',
         'success' 		=> 'Asset restaureret med succes.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Din fil er blevet importeret',
         'file_delete_success'   => 'Din fil er blevet slettet korrekt',
         'file_delete_error'      => 'Filen kunne ikke slettes',
+        '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',
     ],
 
 
diff --git a/resources/lang/da/admin/hardware/table.php b/resources/lang/da/admin/hardware/table.php
index a23e351cac..a7866f995d 100644
--- a/resources/lang/da/admin/hardware/table.php
+++ b/resources/lang/da/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Ind ud',
     'checkout_date' => 'Checkout dato',
     'checkoutto' 	=> 'Tjekket ud',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Download CSV',
diff --git a/resources/lang/da/admin/licenses/general.php b/resources/lang/da/admin/licenses/general.php
index b8c500395e..2f7e026296 100644
--- a/resources/lang/da/admin/licenses/general.php
+++ b/resources/lang/da/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Om licenser',
-    'about_licenses'                  => 'Licenser bruges til at spore software. De har et bestemt antal pladser, der kan tjekkes ud til enkeltpersoner',
+    'about_licenses_title'      => 'Om licenser',
+    'about_licenses'            => 'Licenser bruges til at spore software. De har et bestemt antal pladser, der kan tjekkes ud til enkeltpersoner',
     'checkin'  					=> 'Checkin Licenssæde',
     'checkout_history'  		=> 'Checkout historie',
     'checkout'  				=> 'Checkout Licenssæde',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Softwarelicenser',
     'user'  					=> 'Bruger',
     'view'  					=> 'Se licens',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/da/admin/licenses/message.php b/resources/lang/da/admin/licenses/message.php
index 933c063c33..0bf04718ec 100644
--- a/resources/lang/da/admin/licenses/message.php
+++ b/resources/lang/da/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Enten findes licensen ikke eller også har du ikke tilladelse til at se den.',
     'user_does_not_exist' => 'Bruger eksisterer ikke.',
     'asset_does_not_exist' 	=> 'Aktivet, du forsøger at associere med denne licens, findes ikke.',
     'owner_doesnt_match_asset' => 'Aktivet, du forsøger at associere med denne licens, ejes af en anden end den person, der er valgt i Tildelt-rullemenuen.',
diff --git a/resources/lang/da/admin/locations/message.php b/resources/lang/da/admin/locations/message.php
index 72ef315b6d..90b60f2057 100644
--- a/resources/lang/da/admin/locations/message.php
+++ b/resources/lang/da/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Denne placering er i øjeblikket forbundet med mindst en bruger og kan ikke slettes. Opdater dine brugere for ikke længere at henvise til denne placering, og prøv igen.',
     '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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Tildelte aktiver',
+    'current_location' => 'Aktuel lokation',
 
 
     'create' => array(
diff --git a/resources/lang/da/admin/locations/table.php b/resources/lang/da/admin/locations/table.php
index 425bed91f9..d3d31ecbb2 100644
--- a/resources/lang/da/admin/locations/table.php
+++ b/resources/lang/da/admin/locations/table.php
@@ -20,21 +20,21 @@ return [
     'parent'                    => 'Forældre',
     'currency'                  => 'Beliggenhed Valuta',
     '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',
+    'user_name'                 => 'Brugernavn',
+    'department'                => 'Afdeling',
+    'location'                  => 'Lokation',
+    'asset_tag'                 => 'Aktivetiket',
+    'asset_name'                => 'Navn',
+    'asset_category'            => 'Kategori',
+    'asset_manufacturer'        => 'Fabrikant',
     'asset_model'               => 'Model',
-    'asset_serial'              => 'Serial',
-    'asset_location'            => 'Location',
-    'asset_checked_out'         => 'Checked Out',
-    'asset_expected_checkin'    => 'Expected Checkin',
-    'date'                      => 'Date:',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'asset_serial'              => 'Serienummer',
+    'asset_location'            => 'Lokation',
+    'asset_checked_out'         => 'Tjekket ud',
+    'asset_expected_checkin'    => 'Forventet indtjekning',
+    'date'                      => 'Dato:',
+    'signed_by_asset_auditor'   => 'Godkendt af (aktivkontrollant):',
+    'signed_by_finance_auditor' => 'Godkendt af (finanskontrollant):',
+    'signed_by_location_manager' => 'Godkendt af (Lokationsadministrator):',
+    'signed_by'                 => 'Godkendt af:',
 ];
diff --git a/resources/lang/da/admin/manufacturers/message.php b/resources/lang/da/admin/manufacturers/message.php
index 7376b2b1a0..d4c3d73a35 100644
--- a/resources/lang/da/admin/manufacturers/message.php
+++ b/resources/lang/da/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Fabrikant eksistere ikke.',
     'assoc_users'	 => 'Denne producent er i øjeblikket forbundet med mindst en model og kan ikke slettes. Opdater dine modeller for ikke længere at henvise til denne producent, og prøv igen.',
 
diff --git a/resources/lang/da/admin/manufacturers/table.php b/resources/lang/da/admin/manufacturers/table.php
index 782e75aa9b..5b39e632dd 100644
--- a/resources/lang/da/admin/manufacturers/table.php
+++ b/resources/lang/da/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Telefon',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Opdater Fabrikant',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/da/admin/models/general.php b/resources/lang/da/admin/models/general.php
index bd1d932e05..171a02be06 100644
--- a/resources/lang/da/admin/models/general.php
+++ b/resources/lang/da/admin/models/general.php
@@ -3,10 +3,10 @@
 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'  					        => 'This model has been deleted.',
+    '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 :model_count aktivmodeller.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Gendanne Model',
     'requestable'               => 'Brugere kan anmode om denne model',
 	'show_mac_address'			      => 'Vis MAC adressefelt i aktiver i denne model',
diff --git a/resources/lang/da/admin/models/message.php b/resources/lang/da/admin/models/message.php
index 53382a3c1a..b17eec9851 100644
--- a/resources/lang/da/admin/models/message.php
+++ b/resources/lang/da/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model findes ikke.',
+    'no_association' => 'INGEN MODEL TILKNYTTET.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modellen blev ikke opdateret, prøv igen',
-        'success' => 'Model opdateret.'
+        'success' => 'Model opdateret.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ingen felter blev ændret, så intet er blevet opdateret.',
-        'success' 		=> 'Modeller opdateret.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ingen modeller blev valgt, så intet blev slettet.',
-        'success' 		    => ':success_count model(ler) slettet!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(ler) blev slettet; men :fail_count kunne ikke slettes fordi de stadig har aktiver knyttet til sig.'
     ),
 
diff --git a/resources/lang/da/admin/reports/general.php b/resources/lang/da/admin/reports/general.php
index 577718d5db..b6127095a0 100644
--- a/resources/lang/da/admin/reports/general.php
+++ b/resources/lang/da/admin/reports/general.php
@@ -2,9 +2,9 @@
 
 return [
     'info'   => 'Vælg de ønskede muligheder for din aktivrapport.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'deleted_user' => 'Slettet bruger',
+    'send_reminder' => 'Send påmindelse',
+    'reminder_sent' => 'Påmindelse sendt',
+    'acceptance_deleted' => 'Accept-anmodning slettet',
+    'acceptance_request' => 'Anmodning om accept'
 ];
\ No newline at end of file
diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php
index 6360a19d68..55666d6ea7 100644
--- a/resources/lang/da/admin/settings/general.php
+++ b/resources/lang/da/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Dette er en Active Directory-server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send advarsler til',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Advarsler aktiveret',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Stregkodeindstillinger',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP-indstillinger',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Indtast validt LDAP brugernavn og kodeord fra den basis DN du angav ovenfor for at teste om dit LDAP login er korrekt konfigureret. DU SKAL FØRST OPDATERE og GEMME DINE LDAP INDSTILLINGER.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Vis billeder i emails',
     'show_images_in_email_help'   => 'Afkryds denne boks hvis din Snipe-IT installation er bag en VPN eller i et lukket netværk og brugere udenfor netværket vil forhinderes i at anvende billeder fra netværket i deres emails.',
     'site_name'                 => 'Side navn',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slap endepunkt',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration er valgfri, men endpoint og kanal er påkrævet, hvis du ønsker at bruge det. For at konfigurere Slack integration, skal du først <a href=":slack_link" target="_new" rel="noopener">oprette en indgående webhook</a> på din Slack konto. Klik på knappen <strong>Test Slack Integration</strong> for at bekræfte, at dine indstillinger er korrekte, før du gemmer. ',
-    'slack_integration_help_button'    => 'Nå du har gemt din Slack information, vil testknappen blive synlig.',
-    'slack_test_help'           => 'Test om din Slack integration er konfigureret korrekt. DU SKAL FØRST OPDATERE OG GEMME DINE SLACK\'s INDSTILLINGER.',
+    'general_webhook'           => 'General Webhook',
+    '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'            => 'Understøt footer links ',
     'support_footer_help'       => 'Angiv hvem der kan se links i Snipe-IT Support info og brugermanual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/da/admin/settings/message.php b/resources/lang/da/admin/settings/message.php
index 82653ef6af..9f95edf605 100644
--- a/resources/lang/da/admin/settings/message.php
+++ b/resources/lang/da/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/da/admin/settings/table.php b/resources/lang/da/admin/settings/table.php
index 22db5c84ed..3a90e6ba7f 100644
--- a/resources/lang/da/admin/settings/table.php
+++ b/resources/lang/da/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Oprettet',
+    'size' => 'Størrelse',
 );
diff --git a/resources/lang/da/admin/statuslabels/message.php b/resources/lang/da/admin/statuslabels/message.php
index 98877221e9..f20e581b27 100644
--- a/resources/lang/da/admin/statuslabels/message.php
+++ b/resources/lang/da/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
 
     'help' => [
         'undeployable'   => 'Disse aktiver kan ikke tildeles nogen.',
-        '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>.',
+        'deployable'   => 'Disse aktiver kan tjekkes ud. Når de er tildelt, antager de en metastatus på <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
         'archived'   => 'Disse aktiver kan ikke tjekkes ud, og vises kun i arkiveret visning. Dette er nyttigt for at bevare oplysninger om aktiver til budgettering / historiske formål, men bevare dem ud af den daglige aktivliste.',
         'pending'   => 'Disse aktiver kan endnu ikke tildeles nogen, der ofte bruges til genstande, der er ude til reparation, men forventes at vende tilbage til omløb.',
     ],
diff --git a/resources/lang/da/admin/users/general.php b/resources/lang/da/admin/users/general.php
index 1f93ba8891..636c35bfc6 100644
--- a/resources/lang/da/admin/users/general.php
+++ b/resources/lang/da/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Udskriv alle tildelte',
     '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',
     'software_user'     => 'Software Checket ud til: navn',
     'send_email_help'   => 'Du skal angive en e-mail-adresse for denne bruger for at sende dem legitimationsoplysninger. E-mailing af legitimationsoplysninger kan kun gøres ved brugeroprettelse. Adgangskoder gemmes i en envejs hash og kan ikke hentes når de er gemt.',
     'view_user'         => 'Se bruger :navn',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/da/admin/users/message.php b/resources/lang/da/admin/users/message.php
index ae5c9ee0e6..60d4627387 100644
--- a/resources/lang/da/admin/users/message.php
+++ b/resources/lang/da/admin/users/message.php
@@ -6,16 +6,16 @@ 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 [: id] findes ikke.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Login-feltet er påkrævet',
     'user_password_required'    => 'Adgangskoden er påkrævet.',
     'insufficient_permissions'  => 'Utilstrækkelige tilladelser.',
     'user_deleted_warning'      => 'Denne bruger er blevet slettet. Du skal gendanne denne bruger for at redigere dem eller tildele dem nye aktiver.',
     'ldap_not_configured'        => 'LDAP-integration er ikke konfigureret til denne installation.',
     'password_resets_sent'      => 'De valgte brugere, der er aktiveret og har en gyldig e-mail-adresser, har fået tilsendt et link til nulstilling af adgangskode.',
-    '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.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'password_reset_sent'       => 'Et link til nulstilling af adgangskode er blevet sendt til :email!',
+    'user_has_no_email'         => 'Denne bruger har ikke en email-adresse i deres profil.',
+    'user_has_no_assets_assigned'   => 'Denne bruger er ikke tildelt nogen aktiver',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Denne bruger har ikke indsat en email.',
+        'success' => 'Brugeren er blevet underrettet om deres aktuelle beholdning.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/da/admin/users/table.php b/resources/lang/da/admin/users/table.php
index 09eca46f88..26e7e614ff 100644
--- a/resources/lang/da/admin/users/table.php
+++ b/resources/lang/da/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
     'email'      			=> 'Email',
     'employee_num'      	=> 'Medarbejder nr.',
     'first_name' 			=> 'Fornavn',
-    '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'			=> 'Vælg en gruppe at tildele til brugeren, husk at en bruger får rettighederne for den gruppe, de er tildelt. Brug ctrl+klik (eller cmd+klik på MacOS) for at fravælge grupper.',
     'id'         			=> 'ID',
     'inherit'  				=> 'Arve',
     'job' 					=> 'Job Titel',
diff --git a/resources/lang/da/auth.php b/resources/lang/da/auth.php
index db310aa1bb..6569980d21 100644
--- a/resources/lang/da/auth.php
+++ b/resources/lang/da/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' => 'Disse oplysninger passer ikke med de gemte.',
+    'password' => 'Adgangskoden er forkert.',
+    'throttle' => 'For mange loginforsøg. Prøv igen om :seconds sekunder.',
 
 );
diff --git a/resources/lang/da/auth/general.php b/resources/lang/da/auth/general.php
index b2f805ea14..fc94b96bd7 100644
--- a/resources/lang/da/auth/general.php
+++ b/resources/lang/da/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Husk mig',
     'username_help_top'                 => 'Indtast dit <strong>brugernavn</strong> for at få tilsendt et link til nulstilling af adgangskoden.',
     'username_help_bottom'          => 'Dit brugernavn og din emailadresse <em>kan</em> være den samme; men din konfiguration kan kæve at de er forskellige. Hvis du ikke kan huske dit brugernavn, så kontakt administratoren. <br><br><strong>Brugernavne uden tilhørende emailadresse vil ikke få tilsendt mail med link til reset af kodeord.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/da/button.php b/resources/lang/da/button.php
index e127c7b2c7..92dc920c36 100644
--- a/resources/lang/da/button.php
+++ b/resources/lang/da/button.php
@@ -4,21 +4,21 @@ return [
     'actions' 	                => 'Handlinger',
     'add'    	                => 'Tilføj Ny',
     'cancel'                    => 'Annuller',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Tjek alt ind og slet bruger',
     'delete'  	                => 'Slet',
     'edit'    	                => 'Rediger',
     'restore' 	                => 'Gendan',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Fjern',
     'request'                   => 'Anmodning',
     'submit'  	                => 'Send',
     'upload'                    => 'Upload',
     'select_file'				=> 'Vælg fil ...',
     'select_files'				=> 'Vælg filer...',
     'generate_labels'           => '{1} Generer etiketter [2,*] Generer etiketter',
-    'send_password_link'        => 'Send Password Reset Link',
-    'go'                        => 'Go',
-    'bulk_actions'              => 'Bulk Actions',
-    'add_maintenance'           => 'Add Maintenance',
-    'append'                    => 'Append',
-    'new'                       => 'New',
+    'send_password_link'        => 'Send link til nulstilling af adgangskode',
+    'go'                        => 'Start',
+    'bulk_actions'              => 'Massehandlinger',
+    'add_maintenance'           => 'Tilføj vedligehold',
+    'append'                    => 'Tilføj',
+    'new'                       => 'Ny',
 ];
diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php
index 7417234c89..6f869af168 100644
--- a/resources/lang/da/general.php
+++ b/resources/lang/da/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Tilbehør',
     'activated'			    => 'Aktiveret',
+    'accepted_date'         => 'Dato accepteret',
     'accessory'				=> 'Tilbehør',
     'accessory_report'		=> 'Tilbehørsrapport',
     'action'                => 'Handling',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Tilføjede pladser',
-    'age'                   => "Age",
+    'age'                   => "Alder",
     'all_assets'			=> 'Alle aktiver',
     'all'       			=> 'Alle',
     'archived'              => 'Arkiveret',
@@ -20,14 +21,20 @@ return [
     'asset'					=> 'Aktiv',
     'asset_report'          => 'Aktiv Rapport',
     'asset_tag'				=> 'Aktiv Mærkat',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'Aktivetiketter',
+    'assets_available'		=> 'Tilgængelige aktiver',
+    'accept_assets'         => 'Accepter aktiver :name',
+    'accept_assets_menu'    => 'Accepter aktiver',
     'audit'				    => 'Revidere',
     'audit_report'			=> 'Revisionslog',
     'assets'				=> 'Aktiver',
-    'assigned_to'           => 'Assigned to :name',
+    'assets_audited'        => 'aktiver revideret',
+    'assets_checked_in_count'     => 'aktiver tjekket ind',
+    'assets_checked_out_count'     => 'aktiver tjekket ud',
+    'asset_deleted_warning'     => 'Dette aktiv er blevet slettet. Du skal gendanne det, før du kan tildele det til nogen.',
+    'assigned_date'         => 'Dato tildelt',
+    'assigned_to'           => 'Tildelt :name',
+    'assignee'              => 'Tildelt',
     'avatar_delete'         => 'Slet avatar',
     'avatar_upload'         => 'Upload Avatar',
     'back'      			=> 'Tilbage',
@@ -35,10 +42,12 @@ return [
     'bulkaudit'             => 'Bulk Audit',
     'bulkaudit_status'      => 'Revisionsstatus',
     'bulk_checkout'  		=> 'Masseudtjekning',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_edit'             => 'Masseredigering',
+    'bulk_delete'           => 'Massesletning',
+    'bulk_actions'          => 'Massehandlinger',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'Eget device',
+    'byod_help'             => 'Denne enhed er ejet af brugeren',
     'bystatus'              => 'efter status',
     'cancel'  				=> 'Annuller',
     'categories'			=> 'Kategorier',
@@ -66,14 +75,14 @@ return [
     'create'				=> 'Opret ny',
     'created'               => 'Elementet er oprettet',
     'created_asset'			=> 'skabte aktiver',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Oprettet den',
+    'created_by'            => 'Oprettet af',
     'record_created' 		=> 'Record dannet',
     'updated_at' 			=> 'Opdateret kl',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Aktuelle',
-    'current_password'      => 'Current Password',
-    'customize_report'      => 'Customize Report',
+    'current_password'      => 'Nuværende adgangskode',
+    'customize_report'      => 'Tilpas rapport',
     'custom_report'         => 'Tilpasset Aktiv Rapport',
     'dashboard'				=> 'Oversigtspanel',
     'days'      			=> 'dage',
@@ -83,14 +92,15 @@ 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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Slettede pladser',
-    'deletion_failed'       => 'Deletion failed',
+    'deletion_failed'       => 'Sletning mislykkedes',
     'departments'           => 'Afdelinger',
     'department'            => 'Afdeling',
     'deployed'				=> 'Implementeret',
     'depreciation'			=> 'Afskrivning',
-    'depreciations'         => 'Depreciations',
+    'depreciations'         => 'Afskrivninger',
     'depreciation_report'	=> 'Afskrivningsrapport',
     'details'               => 'Detaljer',
     'download'				=> 'Hent',
@@ -99,12 +109,12 @@ return [
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email domæne',
     'email_format'			=> 'Email formattering',
-    'employee_number'       => 'Employee Number',
+    'employee_number'       => 'Medarbejdernummer',
     'email_domain_help'		=> 'Dette bruges til at generere email-adresser ved importering',
-    'error'				    => 'Error',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    '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)',
@@ -120,25 +130,26 @@ return [
     'files'                 => 'Filer',
     'file_name'				=> 'Fil',
     'file_type'             => 'Filtype',
-    'filesize'              => 'File Size',
+    'filesize'              => 'Filstørrelse',
     'file_uploads'			=> 'Filoverførsel',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'Filupload',
     'generate'				=> 'Skab',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'Generer etiketter',
     'github_markdown'      => 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar email addresse',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Skift din avatar på Gravatar.com</small></a>.',
     'history'  			    => 'Historik',
     'history_for'  			=> 'Historie for',
     'id'  					=> 'ID',
     'image'                 => 'Billede',
     'image_delete'         	=> 'Slet billede',
-    'include_deleted'       => 'Include Deleted Assets',
+    'include_deleted'       => 'Inkludér slettede aktiver',
     'image_upload'         	=> 'Upload billede',
-    '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.',
+    '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'  => 'Tilladte filtyper er jpg, png, gif, og svg. Maximalt tilladte upload størrelse er :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ér',
     'importing'         	=> 'Importerer',
     'importing_help'        => 'Du kan importere assets, tilbehør, licenser, komponenter, forbrugsvarer og brugere via CSV-fil. <br><br>CSV skal være kommasepareret og formateret med overskrifter, der matcher dem i <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSV\'er i dokumentationen</a>.',
@@ -147,7 +158,9 @@ return [
     'asset_maintenance_report' => 'Aktiv vedligeholdelsesrapport',
     'asset_maintenances'       => 'Vedligeholdelse af aktiv',
     'item'  				=> 'Emne',
-    'item_name'             => 'Item Name',
+    'item_name'             => 'Emnenavn',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Ingen rettigheder!',
     'kits'       			=> 'Prædefinerede Kits',
     'language'				=> 'Sprog',
@@ -159,7 +172,7 @@ return [
     'licenses_available'	=> 'Tilgængelige licenser',
     'licenses'				=> 'Licenser',
     'list_all'				=> 'Vis alle',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Indlæser... Vent venligst...',
     'lock_passwords'        => 'Feltværdien vil ikke blive gemt i en demoinstallation.',
     'feature_disabled'      => 'Denne funktion er blevet deaktiveret til demoinstallationen.',
     'location'              => 'Lokation',
@@ -168,17 +181,17 @@ return [
     'logout'				=> 'Log ud',
     'lookup_by_tag'     => 'Søg på aktivkode',
     'maintenances'          => 'Vedligeholdelse',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Administrer API-nøgler',
     'manufacturer'			=> 'Producent',
     'manufacturers'			=> 'Producenter',
     'markdown'				=> 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github koder</a>.',
     'min_amt'				=> 'Min. antal',
-    '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'          => 'Mindste antal elementer, der skal være tilgængelige, før en advarsel udløses. Lad minimumsbeholdning være tom, hvis du ikke ønsker at modtage advarsler for lavt lager.',
     'model_no'				=> 'Modelnummer',
     'months'				=> 'måneder',
     'moreinfo'				=> 'Mere Info',
     'name'					=> 'Navn',
-    'new_password'          => 'New Password',
+    'new_password'          => 'Ny adgangskode',
     'next'					=> 'Næste',
     'next_audit_date'		=> 'Næste revisionsdato',
     'last_audit'		    => 'Seneste revision',
@@ -188,7 +201,7 @@ return [
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
     'order_number'          => 'Ordrenummer',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Kun slettede aktiver',
     'page_menu'				=> 'Viser _MENU_ emner',
     'pagination_info'		=> 'Viser _START_ til _END_ af _TOTAL_ emner',
     'pending'				=> 'Afventer',
@@ -201,25 +214,26 @@ return [
     'purchase_date'         => 'Købsdato',
     'qty'		            => 'STK',
     'quantity'		        => 'Antal',
-    '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'      => 'Du har :count emner under eller næsten under minimumsbeholdning',
+    'quickscan_checkin'  	=> 'Hurtig tjek ind ved skanning',
+    'quickscan_checkin_status'  	=> 'Status for tjek ind',
     'ready_to_deploy'		=> 'Klar til Implementering',
     'recent_activity'		=> 'Seneste aktivitet',
-    'remaining'             => 'Remaining',
+    'remaining'             => 'Resterende',
     'remove_company'        => 'Fjern association med selskab',
     'reports'				=> 'Rapporter',
     'restored'				=> 'gendannet',
-    'restore'				=> 'Restore',
-    'requestable_models'    => 'Requestable Models',
+    'restore'				=> 'Gendan',
+    'requestable_models'    => 'Modeller der kan anmodes om',
     'requested'				=> 'Anmodet',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Anmodningsdato',
+    'requested_assets'      => 'Anmodede aktiver',
+    'requested_assets_menu' => 'Anmodede aktiver',
     'request_canceled'      => 'Anmodning Annulleret',
     'save'  				=> 'Gem',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Vælg',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Vælg alle',
     'search'				=> 'Søg',
     'select_category'       => 'Vælg en kategori',
     'select_department'     => 'Vælg en afdeling',
@@ -238,22 +252,21 @@ return [
     'show_current'  		=> 'Vis Aktuelle',
     'sign_in'				=> 'Log ind',
     'signature'             => 'Underskrift',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Godkendt af',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Åh hai! Det ser ud til, at din Slack integration med Snipe-IT virker!',
+    '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: Nogle funktioner er deaktiveret for denne installation.',
     'site_name'				=> 'Site Navn',
     'state'  				=> 'Stat',
     'status_labels'			=> 'Status labels',
     'status'    			=> 'Status',
-    'accept_eula'           => 'Acceptance Agreement',
+    'accept_eula'           => 'Licensaftale',
     'supplier'              => 'Leverandør',
     'suppliers'  			=> 'Leverandører',
     'sure_to_delete'    => 'Er du sikker på, at du vil slette',
     'submit'				=> 'Indsend',
     'target'                => 'Mål',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Tid og datovisning',
     'total_assets'			=> 'totale aktiver',
     'total_licenses'		=> 'totale licenser',
@@ -263,7 +276,7 @@ return [
     'undeployable'			=> 'Ikke implementerbar',
     'unknown_admin'			=> 'Ukendt Admin',
     'username_format'		=> 'Brugernavn Format',
-    'username'              => 'Username',
+    'username'              => 'Brugernavn',
     'update'                => 'Opdatering',
     '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',
@@ -274,16 +287,16 @@ return [
     'users'                 => 'Brugere',
     'viewall'				=> 'Vis alle',
     'viewassets'  			=> 'Se Tildelte Aktiver',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => 'Se aktiver for :name',
     'website'               => 'Hjemmeside',
     'welcome'				=> 'Velkommen, :name',
     'years'					=> 'år',
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postnummer',
     'noimage'				=> 'Intet billede uploadet eller billede ikke fundet.',
-    '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'   => 'Den forespurgte fil findes ikke på serveren.',
+    'file_upload_success'   => 'Filupload lykkedes!',
+    'no_files_uploaded'     => 'Filupload lykkedes!',
     'token_expired'         => 'Din form session er udløbet. Prøv igen.',
     'login_enabled'         => 'Login aktiveret',
     'audit_due'             => 'Forfalder til tilsyn',
@@ -291,102 +304,149 @@ return [
     'accept'                => 'Accepter :asset',
     'i_accept'              => 'Jeg accepterer',
     'i_decline'             => 'Jeg afviser',
-    'accept_decline'        => 'Accept/Decline',
+    'accept_decline'        => 'Accepter/afvis',
     'sign_tos'              => 'Bekræft nedenfor for at angive, at du accepterer vilkårene for tjenesten:',
     'clear_signature'       => 'Ryd signatur',
     'show_help'             => 'Vis hjælp',
     'hide_help'             => 'Skjul hjælp',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
+    'view_all'              => 'vis alle',
+    'hide_deleted'          => 'Skjul slettede',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Checked out to',
-    'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
-    'changed'               => 'Changed',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
-            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
+    'do_not_change'         => 'Må ikke ændres',
+    'bug_report'            => 'Rapporter en fejl',
+    '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_done'            => 'Udført!',
+    'bulk_edit_about_to'    => 'Du skal til at redigere følgende: ',
+    'checked_out'           => 'Tjekket ud',
+    'checked_out_to'        => 'Tjekket ud til',
+    'fields'                => 'Felter',
+    'last_checkout'         => 'Seneste udtjekket',
+    'due_to_checkin'        => 'Følgende :count emner skal snart tjekkes ind:',
+    'expected_checkin'      => 'Forventet tjek ind',
+    'reminder_checked_out_items' => 'Dette er en påmindelse om de emner, der for øjeblikket er tjekket ud til dig. Hvis du synes, at denne liste er unøjagtig (noget mangler, eller noget vises her, som du mener du aldrig modtaget), bedes du kontakte :reply_to_name på :reply_to_addresse.',
+    'changed'               => 'Ændret',
+    'to'                    => 'Til',
+    'report_fields_info'    => '<p>Vælg de felter, du gerne vil inkludere i din brugerdefinerede rapport, og klik på Generer. Filen (custom-asset-report-YYYY-mm-dd.csv) downloades automatisk og du kan åbne den i Excel.</p>
+<p>Hvis du kun ønsker at eksportere visse aktiver, skal du bruge mulighederne nedenfor for at finjustere dine resultater.</p>',
+    'range'                 => 'Interval',
+    'bom_remark'            => 'Tilføj et BOM (byte-order mark) til denne CSV',
+    'improvements'          => 'Forbedringer',
     'information'           => 'Information',
-    'permissions'           => 'Permissions',
-    'managed_ldap'          => '(Managed via LDAP)',
-    'export'                => 'Export',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
-    'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid category',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you 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_success'  => 'Success:',
-    'notification_warning'   => 'Warning:',
-    'notification_info'      => 'Info:',
-    'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name:',
-    'asset_name'            => 'Asset Name:',
-    'consumable_information' => 'Consumable Information:',
-    'consumable_name'       => 'Consumable Name:',
-    'accessory_information' => 'Accessory Information:',
-    'accessory_name'       => 'Accessory Name:',
-    'clone_item'            => 'Clone Item',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in',
-    'checkout_user_tooltip' => 'Check this item out to a user',
-    '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 ',
-    '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'
+    'permissions'           => 'Rettigheder',
+    'managed_ldap'          => '(Administreret via LDAP)',
+    'export'                => 'Eksportér',
+    'ldap_sync'             => 'LDAP-synkronisering',
+    'ldap_user_sync'        => 'LDAP-brugersynkronisering',
+    'synchronize'           => 'Synkronisér',
+    'sync_results'          => 'Synkroniseringresultater',
+    'license_serial'        => 'Serienummer/produktnøgle',
+    'invalid_category'      => 'Ugyldig kategori',
+    'dashboard_info'        => 'Dette er din oversigt. Der er mange som den, men denne er din.',
+    '60_percent_warning'    => '60% gennemført (advarsel)',
+    'dashboard_empty'       => 'Det ser ud til, at du ikke har tilføjet noget endnu, så vi har ikke noget fedt at vise. Kom i gang ved at tilføje nogle aktiver, tilbehør, forbrugsvarer eller licenser nu!',
+    'new_asset'             => 'Nyt aktiv',
+    'new_license'           => 'Ny licens',
+    'new_accessory'         => 'Nyt tilbehør',
+    'new_consumable'        => 'Ny forbrugsvare',
+    'collapse'              => 'Skjul',
+    'assigned'              => 'Tildelt',
+    'asset_count'           => 'Antal aktiver',
+    'accessories_count'     => 'Antal tilbehør',
+    'consumables_count'     => 'Antal forbrugsvarer',
+    'components_count'      => 'Antal komponenter',
+    'licenses_count'        => 'Antal licenser',
+    'notification_error'    => 'Fejl:',
+    'notification_error_hint' => 'Tjek venligst nedenstående formular for fejl',
+    'notification_success'  => 'Succes:',
+    'notification_warning'   => 'Advarsel:',
+    'notification_info'      => 'Information:',
+    'asset_information'     => 'Aktivoplysninger',
+    'model_name'            => 'Modelnavn:',
+    'asset_name'            => 'Aktivnavn:',
+    'consumable_information' => 'Forbrugsvareoplysninger:',
+    'consumable_name'       => 'Forbrugsvarenavn:',
+    'accessory_information' => 'Tilbehøroplysninger:',
+    'accessory_name'       => 'Tilbehørsnavn:',
+    'clone_item'            => 'Klon emne',
+    'checkout_tooltip' => 'Tjek dette emne ud',
+    'checkin_tooltip' => 'Tjek dette emne ind',
+    'checkout_user_tooltip' => 'Tjek dette emne ud til en bruger',
+    'maintenance_mode'      => 'Tjenesten er midlertidigt utilgængelig grundet systemopdateringer. Tjek venligst tilbage senere.',
+    'maintenance_mode_title' => 'Systemet er midlertidigt utilgængeligt',
+    'ldap_import'           => 'Brugerkodeord bør ikke administreres af LDAP. (Dette giver dig mulighed for at sende glemt adgangskode-anmodninger.)',
+    'purge_not_allowed'     => 'Fjernelse af slettede data er blevet deaktiveret i .env-filen. Kontakt supporten eller din systemadministrator.',
+    'backup_delete_not_allowed'     => 'Sletning af sikkerhedskopier er blevet deaktiveret i .env-filen. Kontakt supporten eller din systemadministrator.',
+    'additional_files'           => 'Yderligere filer',
+    'shitty_browser'        => 'Ingen signatur fundet. Hvis du bruger en ældre browser, skal du bruge en mere moderne browser til at fuldføre din accept af aktiver.',
+    '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_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    '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',
+    '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',
+    'preview_not_available' => '(ingen forhåndsvisning)',
+    'setup'                 => 'Opsætning',
+    'pre_flight'            => 'Forhåndsopsætning',
+    'skip_to_main_content'  => 'Spring til hovedindhold',
+    'toggle_navigation'     => 'Åben/luk menu',
+    'alerts'                => 'Advarsler',
+    'tasks_view_all'        => 'Vis alle opgaver',
+    'true'                  => 'Sandt',
+    'false'                 => 'Falsk',
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/da/help.php b/resources/lang/da/help.php
index 35f5f68611..16fed06c2f 100644
--- a/resources/lang/da/help.php
+++ b/resources/lang/da/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mere information',
 
-    'audit_help' => 'Afkrydsning af dette felt vil redigere aktivposten så den afspejler denne nye placering. Ingen markering angiver blot, placeringen i revisionsloggen.<br><br>Bemærk, at hvis dette aktiv er tjekkes ud, det vil ikke ændre placeringen af personen, aktivet eller placeringen, det er tjekket ud til.',
+    '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' => 'Aktiver er elementer sporet efter serienummer eller aktiv tag. De har tendens til at være elementer af højere værdi, hvor identificering af en bestemt genstand betyder noget.',
 
diff --git a/resources/lang/da/localizations.php b/resources/lang/da/localizations.php
index be2c321861..5eefb4dd4b 100644
--- a/resources/lang/da/localizations.php
+++ b/resources/lang/da/localizations.php
@@ -2,231 +2,231 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Vælg et sprog',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Engelsk (US)',
+        'en-GB'=> 'Engelsk (UK)',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
-        'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
+        'ar'=> 'Arabisk',
+        'bg'=> 'Bulgarsk',
+        'zh-CN'=> 'Kinesisk (forsimplet)',
+        'zh-TW'=> 'Kinesisk (traditionel)',
+        'hr'=> 'Krotatisk',
+        'cs'=> 'Tjekkisk',
+        'da'=> 'Dansk',
+        'nl'=> 'Hollandsk',
+        'en-ID'=> 'Engelsk (Indonesien)',
+        'et'=> 'Estisk',
+        'fil'=> 'Filippinsk',
+        'fi'=> 'Finsk',
+        'fr'=> 'Fransk',
+        'de'=> 'Tysk',
+        'de-i'=> 'Tysk (uformelt)',
+        'el'=> 'Græsk',
+        'he'=> 'Hebraisk',
+        'hu'=> 'Ungarsk',
+        'is' => 'Islandsk',
+        'id'=> 'Indonesisk',
+        'ga-IE'=> 'Irsk',
+        'it'=> 'Italiensk',
+        'ja'=> 'Japansk',
+        'ko'=> 'Koreansk',
+        'lv'=>'Lettisk',
+        'lt'=> 'Litauisk',
+        'mk'=> 'Makedonsk',
+        'ms'=> 'Malaysisk',
         'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'mn'=> 'Mongolsk',
+        'no'=> 'Norsk',
+        'fa'=> 'Persisk',
+        'pl'=> 'Polsk',
+        'pt-PT'=> 'Portugisisk',
+        'pt-BR'=> 'Portugisisk (Brasilien)',
+        'ro'=> 'Rumænsk',
+        'ru'=> 'Russisk',
+        'sr-CS' => 'Serbisk (latin)',
+        'sl'=> 'Slovensk',
+        'es-ES'=> 'Spansk',
+        'es-CO'=> 'Spansk (Colombia)',
+        'es-MX'=> 'Spansk (Mexico)',
+        'es-VE'=> 'Spansk (Venezuela)',
+        'sv-SE'=> 'Svensk',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
         'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
+        'tr'=> 'Tyrkisk',
+        'uk'=> 'Ukrainsk',
+        'vi'=> 'Vietnamesisk',
+        'cy'=> 'Walisisk',
         'zu'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Vælg et land',
     
     'countries' => [
         'AC'=>'Ascension Island',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
+        'AE'=>'Forenede Arabiske Emirater',
         'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AG'=>'Antigua og Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albanien',
+        'AM'=>'Armenien',
+        'AN'=>'Nederlandske Antiller',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'Antarktis',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AS'=>'Amerikansk Samoa',
+        'AT'=>'Østrig',
+        'AU'=>'Australien',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Aserbajdsjan',
+        'BA'=>'Bosnien-Hercegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
+        'BE'=>'Belgien',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
-        'BG'=>'Bulgaria',
+        'BG'=>'Bulgarien',
         'BH'=>'Bahrain',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
         'BN'=>'Brunei Darussalam',
         'BO'=>'Bolivia',
-        'BR'=>'Brazil',
+        'BR'=>'Brasilien',
         'BS'=>'Bahamas',
         'BT'=>'Bhutan',
         'BV'=>'Bouvet Island',
         'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BY'=>'Belarus / Hviderusland',
         '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',
+        'CC'=>'Cocosøerne (Keelingøerne)',
+        'CD'=>'Congo (den Demokratiske Republik)',
+        'CF'=>'Centralafrikanske Republik',
+        'CG'=>'Congo (Republik)',
+        'CH'=>'Schweiz',
+        'CI'=>'Elfenbenskysten',
+        'CK'=>'Cook-øerne',
         'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CM'=>'Cameroun',
+        'CN'=>'Kina (Folkerepublikken)',
         'CO'=>'Colombia',
         'CR'=>'Costa Rica',
         'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
+        'CV'=>'Kap Verde',
         'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
+        'CY'=>'Cypern',
+        'CZ'=>'Tjekkiet',
+        'DE'=>'Tyskland',
         'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
+        'DK'=>'Danmark',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
+        'DO'=>'Dominikanske Republik',
+        'DZ'=>'Algeriet',
         'EC'=>'Ecuador',
-        'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EE'=>'Estland',
+        'EG'=>'Egypten',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
+        'ES'=>'Spanien',
+        'ET'=>'Etiopien',
+        'EU'=>'Europæiske Union',
         'FI'=>'Finland',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
+        'FK'=>'Falklandsøerne',
+        'FM'=>'Mikronesien (Mikronesiens Forenede Stater)',
+        'FO'=>'Færøerne',
+        'FR'=>'Frankrig',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GE'=>'Georgien',
+        'GF'=>'Fransk Guyana',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GL'=>'Grønland',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GQ'=>'Ækvatorialguinea',
+        'GR'=>'Grækenland',
+        'GS'=>'Sydgeorgien og de Sydlige Sandwichøer',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
-        'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HK'=>'Hongkong',
+        'HM'=>'Heard- og McDonaldøerne',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Kroatien',
         'HT'=>'Haiti',
-        'HU'=>'Hungary',
-        'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'HU'=>'Ungarn',
+        'ID'=>'Indonesien',
+        'IE'=>'Irland',
         'IL'=>'Israel',
         'IM'=>'Isle of Man',
-        'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IN'=>'Indien',
+        'IO'=>'Britiske Territorium i Det Indiske Ocean',
+        'IQ'=>'Irak',
+        'IR'=>'Iran (den Islamiske Republik)',
+        'IS'=>'Island',
+        'IT'=>'Italien',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
         'JO'=>'Jordan',
         'JP'=>'Japan',
         'KE'=>'Kenya',
         'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KH'=>'Cambodja',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Comorerne',
+        'KN'=>'Saint Christopher og Nevis',
+        'KR'=>'Korea (Republikken)',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
+        'KY'=>'Caymanøerne',
+        'KZ'=>'Kasakhstan',
+        'LA'=>'Laos (den Demokratiske Folkerepublik)',
         'LB'=>'Lebanon',
         'LC'=>'Saint Lucia',
         'LI'=>'Liechtenstein',
         'LK'=>'Sri Lanka',
         'LR'=>'Liberia',
         'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
+        'LT'=>'Litauen',
         'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
-        'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
+        'LV'=>'Letland',
+        'LY'=>'Libyen',
+        'MA'=>'Marokko',
         'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
+        'MD'=>'Moldova (Republikken)',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'MH'=>'Marshalløerne',
+        'MK'=>'Makedonien (den Tidligere Jugoslaviske Republik)',
         'ML'=>'Mali',
-        'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
+        'MM'=>'Myanmar / Burma',
+        'MN'=>'Mongoliet',
+        'MO'=>'Macao',
+        'MP'=>'Nordmarianerne',
         'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
+        'MR'=>'Mauretanien',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
         'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MV'=>'Maldiverne',
         'MW'=>'Malawi',
         'MX'=>'Mexico',
         'MY'=>'Malaysia',
         'MZ'=>'Mozambique',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'NC'=>'Ny Kaledonien',
         'NE'=>'Niger',
         'NF'=>'Norfolk Island',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Holland',
+        'NO'=>'Norge',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
@@ -234,81 +234,82 @@ return [
         'OM'=>'Oman',
         'PA'=>'Panama',
         'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PF'=>'Fransk Polynesien',
+        'PG'=>'Papua Ny Guinea',
+        'PH'=>'Filippinerne (Republikken)',
         'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
+        'PL'=>'Polen',
+        'PM'=>'Saint Pierre og Miquelon',
         'PN'=>'Pitcairn',
         'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PS'=>'Palæstina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
         'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
+        'RE'=>'Réunion',
+        'RO'=>'Rumænien',
+        'RS'=>'Serbien',
+        'RU'=>'Rusland (Den Russiske Føderation)',
         'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
-        'SC'=>'Seychelles',
+        'SA'=>'Saudi-Arabien',
+        'UK'=>'Skotland',
+        'SB'=>'Salomonøerne',
+        'SC'=>'Seychellerne',
+        'SS'=>'Sydsudan',
         'SD'=>'Sudan',
-        'SE'=>'Sweden',
+        'SE'=>'Sverige',
         'SG'=>'Singapore',
-        'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SH'=>'Saint Helena',
+        'SI'=>'Slovenien',
+        'SJ'=>'Svalbard og Jan Mayen-øerne',
+        'SK'=>'Slovakiet (den Slovakiske Republik)',
         'SL'=>'Sierra Leone',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
-        'SO'=>'Somalia',
+        'SO'=>'Somalien',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'São Tomé og Príncipe',
+        'SU'=>'Sovjetunionen',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'Syrien (den Syriske Arabiske Republik)',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TC'=>'Turks- og Caicosøerne',
+        'TD'=>'Tchad',
+        'TF'=>'Franske Sydterritorier',
         'TG'=>'Togo',
         'TH'=>'Thailand',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Østtimor',
         'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TN'=>'Tunesien',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Østtimor (gammel kode)',
+        'TR'=>'Tyrkiet',
+        'TT'=>'Trinidad og Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
+        'TZ'=>'Tanzania (den Forenede Republik)',
         'UA'=>'Ukraine',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'England (UK)',
+        'US'=>'USA',
+        'UM'=>'USA\'s Mindre Øbesiddelser',
         'UY'=>'Uruguay',
         'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'VA'=>'Vatikanstaten (Holy See)',
+        'VC'=>'Saint Vincent og Grenadinerne',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Jomfruøerne (Britiske)',
+        'VI'=>'Jomfruøerne (USA)',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Wallis- og Futunaøerne',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Sydafrika',
         'ZM'=>'Zambia',
         'ZW'=>'Zimbabwe',
     ],
diff --git a/resources/lang/da/mail.php b/resources/lang/da/mail.php
index 5019bcbe8f..acd786056b 100644
--- a/resources/lang/da/mail.php
+++ b/resources/lang/da/mail.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'acceptance_asset_accepted' => 'A user has accepted an item',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_accepted' => 'En bruger har accepteret et emne',
+    'acceptance_asset_declined' => 'En bruger har afvist et emne',
     'a_user_canceled' => 'En bruger har annulleret en vareforespørgsel på hjemmesiden',
     'a_user_requested' => 'En bruger har anmodet om et emne på hjemmesiden',
     'accessory_name' => 'Tilbehør Navn:',
@@ -11,7 +11,7 @@ return [
     'asset' => 'aktiv:',
     'asset_name' => 'Aktivnavn:',
     'asset_requested' => 'Aktiver bedt om',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Inventarnummer',
     'assigned_to' => 'Tildelt',
     'best_regards' => 'Med venlig hilsen,',
     'canceled' => 'annulleret:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Log ind på din nye Snipe-IT-installation ved hjælp af nedenstående referencer:',
     'login' => 'Log på:',
     'Low_Inventory_Report' => 'Lav lagerrapport',
+    'inventory_report' => 'Lagerrapport',
     'min_QTY' => 'Min QTY',
     'name' => 'Navn',
     'new_item_checked' => 'En ny vare er blevet tjekket ud under dit navn, detaljerne er nedenfor.',
@@ -61,7 +62,7 @@ return [
     'test_mail_text' => 'Dette er en test fra Snipe-IT Asset Management System. Hvis du fik dette, virker mailen :)',
     'the_following_item' => 'Følgende vare er blevet kontrolleret i:',
     '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.',
-    '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' => '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.',
     'license_expiring_alert' => 'Der er :count licens(er) der udløber indenfor den/de næste :threshold dag(e).',
     'to_reset' => 'Nulstille din :web-adgangskode, udfylde denne formular:',
     'type' => 'Type',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Dine Snipe-IT Legitimationsoplysninger',
     'Accessory_Checkin_Notification' => 'Tilbehør tjekket ind',
     'Asset_Checkin_Notification' => 'Asset tjekket ind',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Licens tjekket ind',
     'Expected_Checkin_Report' => 'Forventet asset checkin rapport',
     'Expected_Checkin_Notification' => 'Påmindelse: :name checkin deadline nærmer sig',
     'Expected_Checkin_Date' => 'Et asset tjekket ud til dig skal tjekkes tilbage den :date',
     'your_assets' => 'Se dine assets',
+    'rights_reserved' => 'Alle rettigheder forbeholdt.',
 ];
diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php
index 25633b4581..d55cdf098b 100644
--- a/resources/lang/da/passwords.php
+++ b/resources/lang/da/passwords.php
@@ -1,8 +1,8 @@
 <?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!',
+    'sent'	        => 'Hvis brugeren findes med en gyldig email-adresse i vores system, er der blevet sendt en e-mail til gendannelse af adgangskoden.',
+    'user'			=> 'Hvis brugeren findes med en gyldig email-adresse i vores system, er der blevet sendt en e-mail til gendannelse af adgangskoden.',
+    'token'         => 'Denne nøgle til nulstilling af adgangskode er ugyldig, udløbet eller stemmer ikke overens med det angivne brugernavn.',
+    'reset'         => 'Din adgangskode er blevet nulstillet!',
 ];
diff --git a/resources/lang/da/reminders.php b/resources/lang/da/reminders.php
index 4f16be94e2..4d0d9f4609 100644
--- a/resources/lang/da/reminders.php
+++ b/resources/lang/da/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Adgangskoder skal være seks tegn og svare til bekræftelsen.",
     "user"     => "Brugernavn eller email adresse er forkert",
-    "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"    => 'Denne nøgle til nulstilling af adgangskode er ugyldig, udløbet eller stemmer ikke overens med det angivne brugernavn.',
+    'sent'	   => 'Hvis brugeren findes med en gyldig email-adresse i vores system, er der blevet sendt en e-mail til gendannelse af adgangskoden.',
 
 );
diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php
index 24d2130418..412a3d143b 100644
--- a/resources/lang/da/validation.php
+++ b/resources/lang/da/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'Attributten skal være en fil.',
     'filled'               => 'Attributfeltet skal have en værdi.',
     'image'                => ':attribute skal være et billede.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -66,7 +66,9 @@ return [
         'string'  => ':attribute skal mindst være :min tegn.',
         'array'   => 'Attributten skal have mindst: min elementer.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'starts_with'          => ':attribute skal starte med en af følgende: :values',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Den valgte :attribute er ugyldig.',
     'numeric'              => ':attribute skal være et tal.',
     'present'              => 'Attributfeltet skal være til stede.',
@@ -93,27 +95,16 @@ return [
     'url'                  => ':attribute formatet er ugyldigt.',
     'unique_undeleted'     => ':attribute skal være unik.',
     'non_circular'         => ':attribute må ikke oprette en cirkulær reference.',
-    '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.',
+    'disallow_same_pwd_as_user_fields' => 'Adgangskoden må ikke være det samme som brugernavnet.',
+    'letters'              => 'Adgangskoden skal indeholde mindst ét bogstav.',
+    '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'          => 'Value cannot be negative'
+        'numeric'          => 'Værdien må ikke være negativ'
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Din nuværende adgangskode er forkert',
         'dumbpwd'          => 'Denne adgangskode er for almindelig.',
         'statuslabel_type' => 'Du skal vælge en gyldig statusetiketype',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute skal være en gyldig dato i YYYY-MM-DD format',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/de-i/admin/accessories/general.php b/resources/lang/de-i/admin/accessories/general.php
index ecfb2625ee..49915e7979 100644
--- a/resources/lang/de-i/admin/accessories/general.php
+++ b/resources/lang/de-i/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Zubehör aktualisieren',
     'use_default_eula'					=> 'Die <a href="#" data-toggle="modal" data-target="#eulaModal">Standard EULA</a> stattdessen verwenden.',
     'use_default_eula_disabled'			=> '<del>Die Standard-EULA verwenden.</del> Es wurde keine Standard-EULA definiert. Bitte füge eine in den Einstellungen hinzu.',
+    'clone'                             => 'Zubehör kopieren',
+    'delete_disabled'                   => 'Dieses Zubehör kann noch nicht gelöscht werden, da einige Artikel noch herausgegeben sind.',
 
 );
diff --git a/resources/lang/de-i/admin/accessories/message.php b/resources/lang/de-i/admin/accessories/message.php
index b922f5b8d1..3f661c643a 100644
--- a/resources/lang/de-i/admin/accessories/message.php
+++ b/resources/lang/de-i/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/de-i/admin/asset_maintenances/form.php b/resources/lang/de-i/admin/asset_maintenances/form.php
index f1e4c6ded7..5d06a11327 100644
--- a/resources/lang/de-i/admin/asset_maintenances/form.php
+++ b/resources/lang/de-i/admin/asset_maintenances/form.php
@@ -4,11 +4,11 @@
         'asset_maintenance_type' => 'Wartungsart',
         'title'                  => 'Bezeichnung',
         'start_date'             => 'Startdatum',
-        'completion_date'        => 'Fertigstellungstermin',
+        'completion_date'        => 'Abschlussdatum',
         'cost'                   => 'Kosten',
         'is_warranty'            => 'Garantie Verbesserung',
-        'asset_maintenance_time' => 'Tage',
+        'asset_maintenance_time' => 'Wartungszeit (in Tagen)',
         'notes'                  => 'Notizen',
-        'update'                 => 'Aktualisieren',
-        'create'                 => 'Erstellen'
+        'update'                 => 'Wartung bearbeiten',
+        'create'                 => 'Wartung erstellen'
     ];
diff --git a/resources/lang/de-i/admin/categories/message.php b/resources/lang/de-i/admin/categories/message.php
index 472306a252..bac81f0a6f 100644
--- a/resources/lang/de-i/admin/categories/message.php
+++ b/resources/lang/de-i/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Die Kategorie konnte nicht aktualisiert werden, bitte versuche es erneut',
-        'success' => 'Die Kategorie wurde erfolgreich aktualisiert.'
+        'success' => 'Die Kategorie wurde erfolgreich aktualisiert.',
+        'cannot_change_category_type'   => 'Sobald der Kategorietyp erstellt wurde, kann dieser nicht mehr angepasst werden',
     ),
 
     'delete' => array(
diff --git a/resources/lang/de-i/admin/components/general.php b/resources/lang/de-i/admin/components/general.php
index eaf5a2b62b..fd1f68770c 100644
--- a/resources/lang/de-i/admin/components/general.php
+++ b/resources/lang/de-i/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Verbleibend',
     'total' 			                 => 'Gesamt',
     'update'                            => 'Komponente aktualisieren',
+    'checkin_limit'            => 'Die angegebene Menge muss gleich oder kleiner sein als :assigned_qty'
 );
diff --git a/resources/lang/de-i/admin/components/message.php b/resources/lang/de-i/admin/components/message.php
index 906bb84ece..5466746668 100644
--- a/resources/lang/de-i/admin/components/message.php
+++ b/resources/lang/de-i/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponente konnte nicht herausgegeben werden. Bitte versuche es erneut',
         'success' 		=> 'Komponente wurde erfolgreich herausgegeben.',
-        '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.',
+        'unavailable'      => 'Nicht genügend verbleibende Komponenten: :remaining verbleibend, :requested angefordert ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/de-i/admin/consumables/message.php b/resources/lang/de-i/admin/consumables/message.php
index 1661f9703c..45d5e12bb4 100644
--- a/resources/lang/de-i/admin/consumables/message.php
+++ b/resources/lang/de-i/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Das Verbrauchsmaterial wurde nicht herausgegeben. Bitte versuche es erneut',
         'success' 		=> 'Verbrauchsmaterial wurde erfolgreich herausgegeben.',
-        '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.',
+         'unavailable'      => 'Es sind nicht genügend Verbrauchsmaterialien für diese Herausgabe vorhanden. Bitte überprüfe die verbleibende Menge. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/de-i/admin/custom_fields/general.php b/resources/lang/de-i/admin/custom_fields/general.php
index 1c743da54b..ba8aa4d173 100644
--- a/resources/lang/de-i/admin/custom_fields/general.php
+++ b/resources/lang/de-i/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Von Modellen benutzt',
     'order'   		            => 'Reihenfolge',
     'create_fieldset'         => 'Neuer Feldsatz',
+    'update_fieldset'         => 'Feldsatz aktualisieren',
+    'fieldset_does_not_exist'   => 'Feldsatz :id existiert nicht',
+    'fieldset_updated'         => 'Feldsatz aktualisiert',
     'create_fieldset_title' => 'Neuen Feldsatz erstellen',
     'create_field'            => 'Neues benutzerdefiniertes Feld',
     'create_field_title' => 'Neues benutzerdefiniertes Feld erstellen',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'WARNUNG. Dieses Feld befindet sich in der Tabelle mit benutzerdefinierten Feldern als <code>:db_column</code> sollte aber <code>:expected</code> sein.',
     'is_unique' => 'Dieser Wert muss für jedes Asset einzigartig sein',
     'unique' => 'Einzigartig',
-    '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' => 'Erlaube dem Benutzer, an den das Asset herausgegeben wurde, diese Werte auf der Seite "Zugeordnete Assets anzeigen" anzeigen zu lassen',
+    'display_in_user_view_table' => 'Für Benutzer sichtbar',
+    'auto_add_to_fieldsets' => 'Automatisch zu jedem neuen Feldsatz hinzufügen',
+    'add_to_preexisting_fieldsets' => 'Zu allen existierenden Feldsätzen hinzufügen',
 ];
diff --git a/resources/lang/de-i/admin/departments/message.php b/resources/lang/de-i/admin/departments/message.php
index 873ccd8184..07ee07e1d9 100644
--- a/resources/lang/de-i/admin/departments/message.php
+++ b/resources/lang/de-i/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Diese Abteilung existiert nicht.',
-    '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' => 'An diesem Firmenstandort existiert bereits eine Abteilung mit diesem Namen. Oder wähle einen spezifischeren Namen für diese Abteilung. ',
     'assoc_users'	 => 'Diese Abteilung ist im Moment mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer aktualisieren und erneut versuchen. ',
     'create' => array(
         'error'   => 'Abteilung wurde nicht erstellt. Bitte versuche es erneut.',
diff --git a/resources/lang/de-i/admin/groups/message.php b/resources/lang/de-i/admin/groups/message.php
index e74fb5c75f..1a7357a236 100644
--- a/resources/lang/de-i/admin/groups/message.php
+++ b/resources/lang/de-i/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Gruppe existiert bereits!',
-    'group_not_found'     => 'Gruppe [: Id] existiert nicht.',
+    'group_not_found'     => 'Die Gruppe mit der ID :id existiert nicht.',
     'group_name_required' => '"Name" darf nicht leer sein',
 
     'success' => array(
diff --git a/resources/lang/de-i/admin/hardware/form.php b/resources/lang/de-i/admin/hardware/form.php
index 05b318385c..02f782df66 100644
--- a/resources/lang/de-i/admin/hardware/form.php
+++ b/resources/lang/de-i/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Massenlöschung von Assets bestätigen',
+    'bulk_restore'      => 'Massenwiederherstellung von Assets bestätigen', 
   'bulk_delete_help'	=> 'Überprüfe die nachfolgenden Assets für die Massenlöschung. Sobald diese gelöscht sind, können diese zwar wiederhergestellt werden, sind aber dem aktuellen Nutzer nicht mehr zugeordnet.',
+  'bulk_restore_help'	=> 'Überprüfe die Assets für die Massenwiederherstellung. Sobald sie wiederhergestellt sind, werden diese Assets nicht mit Benutzern assoziiert, denen sie zuvor zugewiesen wurden.',
   '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_warn'	=> 'Du bearbeitest die Eigenschaften eines Assets.|Du bearbeitest die Eigenschaften von :asset_count Assets.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Nur den Standardort 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.',
-    'processing_spinner' => 'Wird verarbeitet...',
+    'processing_spinner' => 'Verarbeitung... (Dies kann bei großen Dateien etwas Zeit in Anspruch nehmen)',
     'optional_infos'  => 'Optionale Informationen',
     'order_details'   => 'Bestellinformationen'
 ];
diff --git a/resources/lang/de-i/admin/hardware/general.php b/resources/lang/de-i/admin/hardware/general.php
index c9af46f9ac..55aaa68f34 100644
--- a/resources/lang/de-i/admin/hardware/general.php
+++ b/resources/lang/de-i/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Dieses Asset wurde gelöscht.',
     '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_invalid'             => 'Das Modell dieses Assets ist ungültig.',
+    'model_invalid_fix'         => 'Das Asset sollte bearbeitet werden, um dies zu korrigieren, bevor versucht wird, es ein- oder auszuchecken.',
     'requestable'               => 'Anforderbar',
     'requested'				    => 'Angefordert',
     'not_requestable'           => 'Kann nicht angefordert werden',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Asset wiederherstellen',
     'pending'  					=> 'Ausstehende',
     'undeployable'  			=> 'Nicht einsetzbar',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Fehlermeldungen:',
     'success_messages' => 'Erfolgsmeldungen:',
     'alert_details' => 'Siehe unten für Details.',
-    'custom_export' => 'Benutzerdefinierter Export'
+    'custom_export' => 'Benutzerdefinierter Export',
+    'mfg_warranty_lookup' => ':manufacturer Garantiestatus Abfrage',
 ];
diff --git a/resources/lang/de-i/admin/hardware/message.php b/resources/lang/de-i/admin/hardware/message.php
index 345ff84cd5..85d74f7013 100644
--- a/resources/lang/de-i/admin/hardware/message.php
+++ b/resources/lang/de-i/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Asset wurde nicht wiederhergestellt, bitte versuche es noch einmal',
         'success' 		=> 'Asset erfolgreich wiederhergestellt.',
+        'bulk_success' 		=> 'Asset erfolgreich wiederhergestellt.',
+        'nothing_updated'   => 'Es wurden keine Assets ausgewählt, also wurde nichts wiederhergestellt.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Deine Datei wurde importiert',
         'file_delete_success'   => 'Deine Datei wurde erfolgreich gelöscht',
         'file_delete_error'      => 'Die Datei konnte nicht gelöscht werden',
+        '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',
     ],
 
 
diff --git a/resources/lang/de-i/admin/hardware/table.php b/resources/lang/de-i/admin/hardware/table.php
index 1bf97c3197..ef6c2e3430 100644
--- a/resources/lang/de-i/admin/hardware/table.php
+++ b/resources/lang/de-i/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Eingang/Ausgang',
     'checkout_date' => 'Herausgabedatum',
     'checkoutto' 	=> 'Herausgegeben',
+    'components_cost' => 'Gesamtkosten der Komponenten',
     'current_value' => 'Aktueller Wert',
     'diff' 			=> 'Differenz',
     'dl_csv' 		=> 'CSV Herunterladen',
diff --git a/resources/lang/de-i/admin/licenses/general.php b/resources/lang/de-i/admin/licenses/general.php
index 8bdf26b9a7..eab1fe6927 100644
--- a/resources/lang/de-i/admin/licenses/general.php
+++ b/resources/lang/de-i/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Über Lizenzen',
-    'about_licenses'                  => 'Lizenzen werden verwendet, um Software zu verfolgen.  Sie haben eine bestimmte Anzahl von Plätzen, die an Einzelpersonen ausgegeben werden können',
+    'about_licenses_title'      => 'Über Lizenzen',
+    'about_licenses'            => 'Lizenzen werden verwendet, um Software zu verfolgen.  Sie haben eine bestimmte Anzahl von Plätzen, die an Einzelpersonen ausgegeben werden können',
     'checkin'  					=> 'Lizenzaktivierung einbuchen',
     'checkout_history'  		=> 'Zuweisungsverlauf',
     'checkout'  				=> 'Lizenzaktivierung herausgeben',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Benutzer',
     'view'  					=> 'Lizenz ansehen',
+    'delete_disabled'           => 'Diese Lizenz kann noch nicht gelöscht werden, da einige Plätze noch ausgecheckt sind.',
+    'bulk'                      =>
+        [
+            '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.',
+                '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',
+                'success'           => 'Lizenz erfolgreich zurückgenommen! | Alle Lizenzen wurden erfolgreich zurückgenommen!',
+                'log_msg'           => 'Zurückgenommen über Massen-Zurücknehmen in der Lizenzübersicht',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Alle Plätze herausgeben',
+                'modal'                 => 'Diese Aktion wird einen Platz für den ersten verfügbaren Benutzer herausgeben. | Diese Aktion wird alle :available_seats_count Plätze an die ersten verfügbaren Benutzer herausgeben. Ein Benutzer wird als verfügbar für diesen Platz betrachtet, wenn er diese Lizenz noch nicht zugewiesen hat und die "Lizenzen automatisch zuweisen" Eigenschaft auf dem Benutzerkonto aktiviert ist.',
+                'enabled_tooltip'   => 'ALLE Plätze (oder so viele wie verfügbar sind) an ALLE Benutzer herausgeben',
+                'disabled_tooltip'  => 'Dies ist deaktiviert, da derzeit keine Sitze verfügbar sind',
+                'success'           => 'Lizenz erfolgreich herausgegeben! | Alle :count Lizenzen wurden erfolgreich herausgegeben!',
+                'error_no_seats'    => 'Es gibt keine verbleibenden Plätze für diese Lizenz.',
+                'warn_not_enough_seats'    => ':count Benutzern wurde diese Lizenz zugewiesen, aber es gibt keine verfügbaren Lizenzplätze mehr.',
+                'warn_no_avail_users'    => 'Nichts zu tun. Es gibt keine Benutzer, denen diese Lizenz noch nicht zugewiesen ist.',
+                'log_msg'           => 'Herausgegeben über Massen-Herausgeben in Lizenzübersicht',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/de-i/admin/licenses/message.php b/resources/lang/de-i/admin/licenses/message.php
index 7647dbc702..828f9bf7d3 100644
--- a/resources/lang/de-i/admin/licenses/message.php
+++ b/resources/lang/de-i/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Die Lizenz existiert nicht oder Sie haben 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.',
     '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.',
diff --git a/resources/lang/de-i/admin/manufacturers/message.php b/resources/lang/de-i/admin/manufacturers/message.php
index 0d05766dc2..919e9759e0 100644
--- a/resources/lang/de-i/admin/manufacturers/message.php
+++ b/resources/lang/de-i/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Verwenden Sie <code>{LOCALE}</code> und <code>{SERIAL}</code> in Ihrer URL als Variablen, um diese Werte beim Anzeigen von Assets automatisch auszufüllen.',
     'does_not_exist' => 'Hersteller existiert nicht.',
     'assoc_users'	 => 'Dieser Hersteller ist derzeit bereits mit einem Model verknüpft und kann nicht gelöscht werden. Bitte trenne Deine Modelle von diesem Hersteller und versuche es erneut. ',
 
diff --git a/resources/lang/de-i/admin/manufacturers/table.php b/resources/lang/de-i/admin/manufacturers/table.php
index 254195f9f6..a0c696407a 100644
--- a/resources/lang/de-i/admin/manufacturers/table.php
+++ b/resources/lang/de-i/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support per E-Mail',
     'support_phone'   		=> 'Support Telefon',
     'support_url'   		=> 'Support-URL',
+    'warranty_lookup_url'   => 'Garantie-Verweis URL',
     'update'				=> 'Hersteller aktualisieren',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/de-i/admin/models/general.php b/resources/lang/de-i/admin/models/general.php
index 064b20358f..41b2227c00 100644
--- a/resources/lang/de-i/admin/models/general.php
+++ b/resources/lang/de-i/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 im Begriff :model_count Asset-Modelle zu löschen.',
+    'bulk_delete_warn'          => 'Du bist dabei, ein Asset Modell zu löschen.|Du bist dabei, :model_count Asset Modelle zu löschen.',
     'restore'                   => 'Modell wiederherstellen',
     'requestable'               => 'Benutzer können dieses Modell anfordern',
 	'show_mac_address'			      => 'MAC Adressen Feld anzeigen für Assets mit diesem Modell',
diff --git a/resources/lang/de-i/admin/models/message.php b/resources/lang/de-i/admin/models/message.php
index 513b23f5fd..d3f9a96995 100644
--- a/resources/lang/de-i/admin/models/message.php
+++ b/resources/lang/de-i/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modell existiert nicht.',
+    'no_association' => 'KEIN MODELL ZUGEORDNET.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modell wurde nicht aktualisiert. Bitte versuch es noch einmal',
-        'success' => 'Modell wurde erfolgreich aktualisiert.'
+        'success' => 'Modell wurde erfolgreich aktualisiert.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Es wurden keine Felder geändert, somit wurde auch nichts aktualisiert.',
-        'success' 		=> 'Modelle aktualisiert.'
+        'success' 		=> 'Modell erfolgreich aktualisiert. |:model_count Modelle erfolgreich aktualisiert.',
+        'warn'          => 'Du bist dabei, die Eigenschaften des folgenden Modells zu aktualisieren: |Du bist dabei, die Eigenschaften der folgenden :model_count Modelle zu bearbeiten:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Es wurden keine Modelle ausgewählt. Somit wurde auch nichts gelöscht.',
-        'success' 		    => ':success_count Modell(e) gelöscht!',
+        'success' 		    => 'Modell gelöscht!|:success_count Modelle gelöscht!',
         'success_partial' 	=> ':success_count Modell(e) wurden gelöscht. Jedoch konnten :fail_count nicht gelöscht werden, da ihnen noch Assets zugeordnet sind.'
     ),
 
diff --git a/resources/lang/de-i/admin/settings/general.php b/resources/lang/de-i/admin/settings/general.php
index dea51be0f3..be05579c32 100644
--- a/resources/lang/de-i/admin/settings/general.php
+++ b/resources/lang/de-i/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Dies ist ein Active Directory Server',
     'alerts'                	=> 'Alarme',
-    'alert_title'               => 'Alarm-Einstellungen aktualisieren',
+    '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',
     'alerts_enabled'			=> 'E-Mail-Benachrichtigungen aktiviert',
@@ -21,7 +21,7 @@ return [
     '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'       => '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'       => '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_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',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Aus Backup wiederherstellen',
     'backups_upload'            => 'Backup hochladen',
     'backups_path'              => 'Backups auf dem Server werden in <code>:path</code> gespeichert',
-    '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_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_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',
@@ -76,7 +76,8 @@ return [
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Standard-Berechtigungsgruppe',
-    '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.',
+    'ldap_default_group_info'   => 'Wähle eine Gruppe aus, die neu synchronisierten Benutzern zugewiesen werden soll. Denke daran, dass ein Benutzer die Berechtigungen der zugewiesenen Gruppe übernimmt.',
+    'no_default_group'          => 'Keine Standardgruppe',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP Client-seitiger TLS-Schlüssel',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Zertifikat',
@@ -85,6 +86,8 @@ return [
     '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_key'       => 'LDAP Client-seitiger TLS-Schlüssel',
+    '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_manager'              => 'LDAP Manager',
@@ -111,7 +114,7 @@ return [
     'ldap_auth_filter_query'    => 'LDAP-Authentifizierungsabfrage',
     '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_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_emp_num'              => 'LDAP Mitarbeiternummer',
     'ldap_email'                => 'LDAP E-Mail',
     'ldap_test'                 => 'LDAP testen',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Bilder in E-Mails anzeigen',
     'show_images_in_email_help'   => 'Deaktiviere dieses Kästchen, wenn sich Deine Snipe-IT-Installation hinter einem VPN oder einem geschlossenen Netzwerk befindet und Benutzer außerhalb des Netzwerks keine Bilder von dieser Installation in ihren E-Mails laden können.',
     'site_name'                 => 'Seitenname',
+    'integrations'               => 'Integrationen',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Slack Einstellungen aktualisieren',
-    'slack_help'                => 'Slack Einstellungen',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Kanal',
-    'slack_endpoint'            => 'Slack Endpunkt',
-    'slack_integration'         => 'Slack Einstellungen',
-    'slack_integration_help'    => 'Die Slackintegration ist optional. Der Endpunkt und ein channel werden benötigt, wenn man Slack benutzen möchte. Um Slack zu konfigurieren muss zuerst ein <a href=":slack_link" target="_new" rel="noopener"> eingehender Webhook</a> in Slack eingerichtet werden. Klicke auf <strong>Slack Integration testen</strong> um zu prüfen, ob die Einstellungen vor dem Speichern korrekt sind. ',
-    'slack_integration_help_button'    => 'Sobald Du Deine Slack Informationen gespeichert hast, erscheint ein Testknopf.',
-    'slack_test_help'           => 'Teste, ob die Slack-Integration korrekt konfiguriert ist. ZUERST MÜSSEN DIE AKTUALISIERTEN SLACK EINSTELLUNGEN GESPEICHERT WERDEN.',
+    'general_webhook'           => 'Allgemeiner Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Teste zum Speichern',
+    'webhook_title'               => 'Webhook Einstellungen aktualisieren',
+    'webhook_help'                => 'Integrationseinstellungen',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Kanal',
+    'webhook_endpoint'            => ':app Endpunkt',
+    'webhook_integration'         => ':app Einstellungen',
+    'webhook_test'                 =>':app Integration testen',
+    '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.',
     '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
     'ldap_settings_link' => 'LDAP Einstellungsseite',
     'slack_test' => '<i class="fab fa-slack"></i> Integration testen',
+    '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>.',
+    'google_login'      => 'Google Workspace Anmeldeeinstellungen',
+    'enable_google_login'  => 'Anmelden mit Google Workspace für Benutzer aktivieren',
+    'enable_google_login_help'  => 'Benutzer werden nicht automatisch bereitgestellt. Sie müssen ein bestehendes Konto hier UND in Google Workspace haben, und ihr Benutzername muss mit der E-Mail-Adresse von Google Workspace übereinstimmen. ',
+
 ];
diff --git a/resources/lang/de-i/admin/settings/message.php b/resources/lang/de-i/admin/settings/message.php
index d781a93f14..333f6bbc69 100644
--- a/resources/lang/de-i/admin/settings/message.php
+++ b/resources/lang/de-i/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
         'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
     ],
-    'slack' => [
-        'sending' => 'Slack Testnachricht wird gesendet...',
-        'success_pt1' => 'Erfolgreich! Überprüfe die ',
-        'success_pt2' => ' kanal für Deine Testnachricht, und klicke auf Speichern unten, um Deine Einstellungen zu speichern.',
+    'webhook' => [
+        'sending' => ':app Testnachricht wird gesendet ...',
+        'success_pt1' => 'Erfolgreich! Überprüfe den ',
+        'success_pt2' => ' Kanal für deine Testnachricht und klicke unten auf SPEICHERN, um die Einstellungen zu sichern.',
         '500' => '500 Server Fehler.',
-        'error' => 'Etwas ist schiefgelaufen.',
+        'error' => 'Etwas ist schiefgelaufen. :app antwortete mit: :error_message',
+        'error_misc' => 'Etwas ist schiefgelaufen! :( ',
     ]
 ];
diff --git a/resources/lang/de-i/admin/users/general.php b/resources/lang/de-i/admin/users/general.php
index 2d5d27830d..10b5b0d236 100644
--- a/resources/lang/de-i/admin/users/general.php
+++ b/resources/lang/de-i/admin/users/general.php
@@ -19,6 +19,8 @@ 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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Nur Superadmins dürfen einem Benutzer Superadmin Zugriff gewähren.',
     'admin_permission_warning' => 'Nur Benutzer mit Administratorrechten oder höher dürfen einem Benutzer Administratorzugriff gewähren.',
     'remove_group_memberships' => 'Gruppenmitgliedschaften entfernen',
-    'warning_deletion' => 'WARNUNG:',
     'warning_deletion_information' => 'Du bist dabei, ALLE Assets von :count Benutzer(s) einzuchecken. Super-Admins werden rot hervorgehoben.',
     'update_user_assets_status' => 'Alle Assets für diese Benutzer auf diesen Status aktualisieren',
     'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
@@ -41,4 +42,13 @@ return [
     '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.',
     '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.',
+    'email_credentials' => 'E-Mail-Anmeldedaten',
+    'email_credentials_text' => 'Meine Zugangsdaten an die oben genannte E-Mail-Adresse senden',
+    'next_save_user' => 'Weiter: Benutzer speichern',
+    'all_assigned_list_generation' => 'Generiert am:',
+    'email_user_creds_on_create' => 'Diesem Benutzer seine Zugangsdaten per E-Mail senden?',
 ];
diff --git a/resources/lang/de-i/admin/users/message.php b/resources/lang/de-i/admin/users/message.php
index 047a315400..8216393217 100644
--- a/resources/lang/de-i/admin/users/message.php
+++ b/resources/lang/de-i/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     '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.',
     'user_exists'               => 'Benutzer existiert bereits!',
-    'user_not_found'            => 'Benutzer [:id] existiert nicht.',
+    'user_not_found'            => 'Benutzer existiert nicht.',
     'user_login_required'       => 'Das Loginfeld ist erforderlich',
     'user_password_required'    => 'Das Passswortfeld ist erforderlich.',
     'insufficient_permissions'  => 'Unzureichende Berechtigungen.',
@@ -62,6 +62,6 @@ return array(
 
     'inventorynotification' => array(
         'error'   => 'Für diesen Benutzer ist keine E-Mail-Adresse hinterlegt.',
-        'success' => 'The user has been notified about their current inventory.'
+        'success' => 'Der Benutzer wurde über sein aktuelles Inventar informiert.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/de-i/auth/general.php b/resources/lang/de-i/auth/general.php
index 974ae6fa93..000bb555b4 100644
--- a/resources/lang/de-i/auth/general.php
+++ b/resources/lang/de-i/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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> ',
-    ];
+    'google_login'                  => 'Oder mit Google Workspace anmelden',
+    'google_login_failed'           => 'Google-Anmeldung fehlgeschlagen, bitte versuche es erneut.',
+
+];
 
diff --git a/resources/lang/de-i/general.php b/resources/lang/de-i/general.php
index 1d41e332e0..6577ff7965 100644
--- a/resources/lang/de-i/general.php
+++ b/resources/lang/de-i/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Zubehör',
     'activated'			    => 'Aktiviert',
+    'accepted_date'         => 'Datum akzeptiert',
     'accessory'				=> 'Zubehör',
     'accessory_report'		=> 'Zubehörbericht',
     'action'                => 'Aktion',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Lizenzen hinzugefügt',
-    'age'                   => "Age",
+    'age'                   => "Alter",
     'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
     'archived'              => 'Archiviert',
@@ -27,7 +28,13 @@ return [
     'audit'				    => '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.',
+    'assigned_date'         => 'Zuweisungsdatum',
     'assigned_to'           => 'Herausgegeben an :name',
+    'assignee'              => 'Herausgegeben an',
     'avatar_delete'         => 'Avatar löschen',
     'avatar_upload'         => 'Avatar hochladen',
     'back'      			=> 'Zurück',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Massenbearbeitung',
     'bulk_delete'           => 'Massenlöschung',
     'bulk_actions'          => 'Massenaktionen',
-    'bulk_checkin_delete'   => 'Masseneinchecken der Assets von Benutzern',
+    'bulk_checkin_delete'   => 'Massen-Check-in / Benutzer löschen',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Dieses Gerät gehört dem Benutzer',
     'bystatus'              => 'nach Status',
     'cancel'  				=> 'Abbrechen',
     'categories'			=> 'Kategorien',
@@ -83,6 +92,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? Dies kann nicht rückgängig gemacht werden.',
     'deleted'  				=> 'Gelöscht',
     'delete_seats'  		=> 'Gelöschte Lizenzen',
     'deletion_failed'       => 'Löschen fehlgeschlagen',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Akzeptierte Dateitypen sind jpg, png, gif und svg. Maximale Uploadgröße ist :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',
     'importing'         	=> 'Importiere',
     'importing_help'        => 'Du kannst 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.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Wartungen',
     'item'  				=> 'Gegenstand',
     'item_name'             => 'Artikelname',
+    'import_file'  			=> 'CSV-Datei importieren',
+    'import_type'  			=> 'CSV-Import-Typ',
     'insufficient_permissions' => 'Fehlende Berechtigungen!',
     'kits'       			=> 'Vordefinierte Kits',
     'language'				=> 'Sprache',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Angeforderte Assets',
     'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',
+    'select_var'            => ':thing auswählen ... ', // this will eventually replace all of our other selects
     'select'				=> 'Auswählen',
     'select_all'            => 'Alle markieren',
     'search'				=> 'Suche',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Unterschrift',
     'signed_off_by'         => 'Unterschrieben von',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'Eine Slack Nachricht wird gesendet',
-    'slack_test_msg'        => 'Oh hai! Sieht so aus, als ob deine Slack Integration mit Snipe-IT funktioniert!',
+    '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!',
     'some_features_disabled' => 'Einige Funktionen sind für den DEMO-Modus deaktiviert.',
     'site_name'				=> 'Seitenname',
     'state'  				=> 'Bundesland',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Bist du dir sicher, dass du das löschen möchtest',
     'submit'				=> 'Abschicken',
     'target'                => 'Ziel',
-    'toggle_navigation'     => 'Navigation umschalten',
     'time_and_date_display' => 'Zeit- und Datumsanzeige',
     'total_assets'			=> 'Assets',
     'total_licenses'		=> 'Lizenzen',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postleitzahl',
     'noimage'				=> 'Kein Bild hochgeladen oder kein Bild gefunden.',
-    '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'   => 'Die angeforderte Datei existiert nicht.',
+    'file_upload_success'   => 'Dateiupload erfolgreich!',
+    'no_files_uploaded'     => 'Dateiupload erfolgreich!',
     'token_expired'         => 'Deine Sitzung ist abgelaufen. Bitte versuche es erneut.',
     'login_enabled'         => 'Login aktiviert',
     'audit_due'             => 'Prüfung fällig',
@@ -375,7 +388,8 @@ return [
     '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 dieses Asset|Werte für alle :asset_count Assets 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Startdatum',
     'end_date'            => 'Enddatum',
     'alt_uploaded_image_thumbnail' => 'Hochgeladene Miniaturansicht',
-    'placeholder_kit'       => 'Kit auswählen'
+    'placeholder_kit'       => 'Kit auswählen',
+    'file_not_found'        => 'Datei wurde nicht gefunden',
+    'preview_not_available' => '(keine Vorschau vorhanden)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Zum Hauptinhalt springen',
+    'toggle_navigation'     => 'Navigation umschalten',
+    'alerts'                => 'Benachrichtigungen',
+    'tasks_view_all'        => 'Alle Aufgaben anzeigen',
+    'true'                  => 'Wahr',
+    'false'                 => 'Falsch',
+    '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 einzigen 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',
+    'merge_success'         => ':count Benutzer wurden erfolgreich zu :into_username zusammengeführt!',
+    'merged'                => 'zusammengeführt',
+    'merged_log_this_user_into' => 'Benutzer (ID :to_id - :to_username) in Benutzer-ID :from_id (:from_username) zusammengeführt ',
+    'merged_log_this_user_from' => 'Benutzer-ID :from_id (:from_username) in diesen Benutzer (ID :to_id - :to_username) zusammengeführt',
+    'clear_and_save'            => 'Löschen & Speichern',
+    'update_existing_values'    => 'Vorhandene Werte aktualisieren?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Das Generieren von fortlaufenden Asset-Tags ist deaktiviert, daher müssen alle Datensätze die Spalte "Asset Tag" enthalten.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Hinweis: Das Generieren von fortlaufenden Asset-Tags ist aktiviert, daher wird für alle Datensätze, die keinen Asset-Tag angegeben haben, einer erstellt. Datensätze, die einen "Asset Tag" angegeben haben, werden mit den angegebenen Informationen aktualisiert.',
+    'send_welcome_email_to_users'   => ' Willkommens-E-Mail für neue Benutzer senden?',
+    'back_before_importing'     => 'Vor dem Importieren sichern?',
+    'csv_header_field'          => 'CSV-Header-Feld',
+    'import_field'              => 'Feld importieren',
+    'sample_value'              => 'Beispielwert',
+    'no_headers'                => 'Keine Spalten gefunden',
+    'error_in_import_file'      => 'Beim Lesen der CSV-Datei ist ein Fehler aufgetreten: :error',
+    'percent_complete'          => ':percent % abgeschlossen',
+    'errors_importing'          => 'Einige Fehler sind beim Importieren aufgetreten: ',
+    'warning'                   => 'WARNUNG: :warning',
+    'success_redirecting'       => '"Erfolgreich... Weiterleiten.',
+    'setup_successful_migrations' => 'Die Datenbanktabellen wurden erstellt',
+    'setup_migration_output' => 'Ausgabe der Migration:',
+    'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
+    'importer_generic_error'    => 'Dein Dateiimport ist abgeschlossen, aber es ist ein Fehler aufgetreten. Dies wird in der Regel durch eine API-Drosselung von Drittanbietern von einem Benachrichtigungs-Webhook (wie z. B. Slack) verursacht und hätte den Import selbst nicht beeinträchtigt, aber du solltest dies bestätigen.',
+    'confirm' => 'Bestätigen',
+    'autoassign_licenses' => 'Lizenzen automatisch zuweisen',
+    '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' => 'Dies erlaubt es einem Benutzer, Lizenzen über die Massen-Zuweisung GUI oder CLI-Tools zugewiesen zu bekommen. (Zum Beispiel möchten Sie den Auftragnehmern möglicherweise nicht automatisch eine Lizenz zuweisen, die nur Mitarbeitern zur Verfügung stehen würde. Sie können 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'      => 'Sind Sie sich sicher?',
+    'cannot_be_deleted'      => 'Dieser Gegenstand kann nicht gelöscht werden',
+    'undeployable_tooltip'      => 'Dieser Gegenstand kann nicht herausgegeben werden. Überprüfen Sie die verbleibende Menge.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/de-i/help.php b/resources/lang/de-i/help.php
index a86416a712..3d44239609 100644
--- a/resources/lang/de-i/help.php
+++ b/resources/lang/de-i/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mehr Info',
 
-    'audit_help' => 'Mit dem aktivieren dieser Option wird der Asset-Datensatz an diesen neuen Ort angepasst. Wenn diese Option nicht aktiviert wird, wird nur der Ort im Audit-Log angezeigt.<br><br>Falls das Asset ausgecheckt ist, ändert sich nicht die Position der Person, des Assets oder der Position, an der es ausgecheckt wird.',
+    'audit_help' => 'Mit dem aktivieren dieser Option wird der Asset-Datensatz an diesen neuen Ort angepasst. Wenn diese Option nicht aktiviert wird, wird der Ort nur im Audit-Log angezeigt.<br><br>Falls das Asset ausgecheckt ist, ändert sich der Ort der Person, des Assets oder des Orts, an den es ausgecheckt ist, nicht.',
 
     '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.',
 
diff --git a/resources/lang/de-i/localizations.php b/resources/lang/de-i/localizations.php
index 0287f56f8f..cbc88166f3 100644
--- a/resources/lang/de-i/localizations.php
+++ b/resources/lang/de-i/localizations.php
@@ -257,6 +257,7 @@ im Indischen Ozean',
         'UK'=>'Schottland',
         'SB'=>'Salomon-Inseln',
         'SC'=>'Seychellen',
+        'SS'=>'Südsudan',
         'SD'=>'Sudan',
         'SE'=>'Schweden',
         'SG'=>'Singapur',
@@ -296,7 +297,7 @@ im Indischen Ozean',
         'UK'=>'Großbritannien',
         'US'=>'USA',
         'UM'=>'Kleinere abgelegene Inseln der Vereinigten Staaten',
-        'UY'=>'Uruguay',
+        'UY'=>'Urugua',
         'UZ'=>'Usbekistan',
         'VA'=>'Vatikanstadt (Heiliger Stuhl)',
         'VC'=>'St. Vincent und die Grenadinen',
diff --git a/resources/lang/de-i/mail.php b/resources/lang/de-i/mail.php
index 3a2e93f68e..5cebc28d2f 100644
--- a/resources/lang/de-i/mail.php
+++ b/resources/lang/de-i/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Melde Diche zu Deiner neuen Snipe-IT-Installation mithilfe der unten stehenden Anmeldeinformationen an:',
     'login' => 'Anmelden:',
     'Low_Inventory_Report' => 'Bericht über niedrige Lagerbestände',
+    'inventory_report' => 'Bestandsbericht',
     'min_QTY' => 'Mindestmenge',
     'name' => 'Name',
     'new_item_checked' => 'Ein neuer Gegenstand wurde unter Ihrem Namen ausgecheckt. Details folgen.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Ihre Snipe-IT Anmeldedaten',
     'Accessory_Checkin_Notification' => 'Zubehör zurückgenommen',
     'Asset_Checkin_Notification' => 'Asset zurückgenommen',
+    'Asset_Checkout_Notification' => 'Asset herausgegeben',
     'License_Checkin_Notification' => 'Lizenz zurückgenommen',
     'Expected_Checkin_Report' => 'Bericht über erwartete Asset Rückgaben',
     'Expected_Checkin_Notification' => 'Erinnerung: :name Rückgabedatum nähert sich',
     'Expected_Checkin_Date' => 'Ihr ausgebuchtes Asset ist fällig zur Rückgabe am :date',
     'your_assets' => 'Deine Assets anzeigen',
+    'rights_reserved' => 'Alle Rechte vorbehalten.',
 ];
diff --git a/resources/lang/de-i/validation.php b/resources/lang/de-i/validation.php
index 4682689119..8a5518141b 100644
--- a/resources/lang/de-i/validation.php
+++ b/resources/lang/de-i/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute muss eine Datei sein.',
     'filled'               => ':attribute muss einen Wert haben.',
     'image'                => ':attribute muss ein Bild sein.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute muss mindestens :min Elemente enthalten.',
     ],
     'starts_with'          => ':attribute muss mit einem der folgenden Werte beginnen: :values.',
+    'ends_with'            => ':attribute muss mit einem der folgenden Werte enden: :values.',
+
     'not_in'               => 'Auswahl :attribute ist ungültig.',
     'numeric'              => ':attribute muss eine Zahl sein.',
     'present'              => ':attribute muss vorhanden sein.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/de/admin/accessories/general.php b/resources/lang/de/admin/accessories/general.php
index df84e75ac2..9c2cb6c74a 100644
--- a/resources/lang/de/admin/accessories/general.php
+++ b/resources/lang/de/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Zubehör aktualisieren',
     'use_default_eula'					=> 'Die <a href="#" data-toggle="modal" data-target="#eulaModal">Standard EULA</a> stattdessen verwenden.',
     'use_default_eula_disabled'			=> '<del>Die Standard EULA stattdessen verwenden.</del> Keine Standard EULA definiert. Bitte fügen Sie eine in den Einstellungen hinzu.',
+    'clone'                             => 'Zubehör duplizieren',
+    'delete_disabled'                   => 'Dieses Zubehör kann noch nicht gelöscht werden, da einige Artikel noch herausgegeben sind.',
 
 );
diff --git a/resources/lang/de/admin/accessories/message.php b/resources/lang/de/admin/accessories/message.php
index f8e2d31fac..ed6a694aec 100644
--- a/resources/lang/de/admin/accessories/message.php
+++ b/resources/lang/de/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/de/admin/asset_maintenances/form.php b/resources/lang/de/admin/asset_maintenances/form.php
index 73111e98d2..906fd702ca 100644
--- a/resources/lang/de/admin/asset_maintenances/form.php
+++ b/resources/lang/de/admin/asset_maintenances/form.php
@@ -4,11 +4,11 @@
         'asset_maintenance_type' => 'Wartungsart',
         'title'                  => 'Bezeichnung',
         'start_date'             => 'Startdatum',
-        'completion_date'        => 'Fertigstellungstermin',
+        'completion_date'        => 'Abschlussdatum',
         'cost'                   => 'Kosten',
         'is_warranty'            => 'Nachbesserungsarbeiten',
-        'asset_maintenance_time' => 'Tage',
+        'asset_maintenance_time' => 'Wartungszeit (in Tagen)',
         'notes'                  => 'Anmerkungen',
-        'update'                 => 'Aktualisieren',
-        'create'                 => 'Erstellen'
+        'update'                 => 'Wartung bearbeiten',
+        'create'                 => 'Wartung erstellen'
     ];
diff --git a/resources/lang/de/admin/categories/message.php b/resources/lang/de/admin/categories/message.php
index 7d8e28a195..841317e315 100644
--- a/resources/lang/de/admin/categories/message.php
+++ b/resources/lang/de/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Die Kategorie konnte nicht aktualisiert werden, bitte versuchen Sie es erneut',
-        'success' => 'Die Kategorie wurde erfolgreich aktualisiert.'
+        'success' => 'Die Kategorie wurde erfolgreich aktualisiert.',
+        'cannot_change_category_type'   => 'Sie können den Kategorietyp nicht ändern, nachdem er erstellt wurde',
     ),
 
     'delete' => array(
diff --git a/resources/lang/de/admin/components/general.php b/resources/lang/de/admin/components/general.php
index 7094318204..dffffb2805 100644
--- a/resources/lang/de/admin/components/general.php
+++ b/resources/lang/de/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Verbleibend',
     'total' 			                 => 'Gesamt',
     'update'                            => 'Komponente aktualisieren',
+    'checkin_limit'            => 'Die angegebene Menge muss gleich oder kleiner sein als :assigned_qty'
 );
diff --git a/resources/lang/de/admin/components/message.php b/resources/lang/de/admin/components/message.php
index d7dd2a0cfe..e65d336fa3 100644
--- a/resources/lang/de/admin/components/message.php
+++ b/resources/lang/de/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponente konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
         'success' 		=> 'Komponente wurde erfolgreich herausgegeben.',
-        'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuchen Sie es noch einmal.'
+        'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuchen Sie es noch einmal.',
+        'unavailable'      => 'Nicht genügend verbleibende Komponenten: :remaining verbleibend, :requested angefordert ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/de/admin/consumables/message.php b/resources/lang/de/admin/consumables/message.php
index 307ca97f47..2e3dc7540e 100644
--- a/resources/lang/de/admin/consumables/message.php
+++ b/resources/lang/de/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Das Verbrauchsmaterial wurde nicht herausgegeben. Bitte versuchen Sie es erneut',
         'success' 		=> 'Verbrauchsmaterial wurde erfolgreich herausgegeben.',
-        'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuchen Sie es noch einmal.'
+        'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuchen Sie es noch einmal.',
+         'unavailable'      => 'Es sind nicht genügend Verbrauchsmaterialien für diese Herausgabe vorhanden. Bitte überprüfen Sie die verbleibende Menge. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/de/admin/custom_fields/general.php b/resources/lang/de/admin/custom_fields/general.php
index ce95064549..7b8b31efe1 100644
--- a/resources/lang/de/admin/custom_fields/general.php
+++ b/resources/lang/de/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Von Modellen benutzt',
     'order'   		            => 'Reihenfolge',
     'create_fieldset'         => 'Neuer Feldsatz',
+    'update_fieldset'         => 'Feldsatz aktualisieren',
+    'fieldset_does_not_exist'   => 'Feldsatz :id existiert nicht',
+    'fieldset_updated'         => 'Feldsatz aktualisiert',
     'create_fieldset_title' => 'Neuen Feldsatz erstellen',
     'create_field'            => 'Neues benutzerdefiniertes Feld',
     'create_field_title' => 'Neues benutzerdefiniertes Feld erstellen',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'WARNUNG. Dieses Feld befindet sich in der Tabelle mit benutzerdefinierten Feldern als <code>:db_column</code> sollte aber <code>:expected</code> sein.',
     'is_unique' => 'Dieser Wert muss für jedes Asset einzigartig sein',
     'unique' => 'Einzigartig',
-    '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' => 'Erlaube dem Benutzer, an den das Asset herausgegeben wurde, diese Werte auf der Seite "Zugeordnete Assets anzeigen" anzeigen zu lassen',
+    'display_in_user_view_table' => 'Für Benutzer sichtbar',
+    'auto_add_to_fieldsets' => 'Automatisch zu jedem neuen Feldsatz hinzufügen',
+    'add_to_preexisting_fieldsets' => 'Zu allen existierenden Feldsätzen hinzufügen',
 ];
diff --git a/resources/lang/de/admin/departments/message.php b/resources/lang/de/admin/departments/message.php
index f119ff8643..f6e44786bc 100644
--- a/resources/lang/de/admin/departments/message.php
+++ b/resources/lang/de/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Diese Abteilung existiert nicht.',
-    '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' => 'An diesem Firmenstandort existiert bereits eine Abteilung mit diesem Namen. Oder wählen Sie einen spezifischeren Namen für diese Abteilung. ',
     'assoc_users'	 => 'Diese Abteilung ist im Moment mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer aktualisieren, so dass diese Abteilung nicht mehr verknüpft ist und erneut versuchen. ',
     'create' => array(
         'error'   => 'Abteilung wurde nicht erstellt. Bitte versuchen Sie es erneut.',
diff --git a/resources/lang/de/admin/groups/message.php b/resources/lang/de/admin/groups/message.php
index a11b455217..a05c22473c 100644
--- a/resources/lang/de/admin/groups/message.php
+++ b/resources/lang/de/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Gruppe existiert bereits!',
-    'group_not_found'     => 'Gruppe [: Id] existiert nicht.',
+    'group_not_found'     => 'Die Gruppe mit der ID :id existiert nicht.',
     'group_name_required' => '"Name" darf nicht leer sein',
 
     'success' => array(
diff --git a/resources/lang/de/admin/hardware/form.php b/resources/lang/de/admin/hardware/form.php
index 9f7175193f..718e27fb64 100644
--- a/resources/lang/de/admin/hardware/form.php
+++ b/resources/lang/de/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Massenlöschung von Assets bestätigen',
+    'bulk_restore'      => 'Massenwiederherstellung von Assets bestätigen', 
   'bulk_delete_help'	=> 'Überprüfen Sie die nachfolgenden Assets für die Massenlöschung. Sobald diese gelöscht sind, können diese zwar wiederhergestellt werden, sind aber dem aktuellen Nutzer nicht mehr zugeordnet.',
+  'bulk_restore_help'	=> 'Überprüfen Sie die Assets für die Massenwiederherstellung. Sobald sie wiederhergestellt sind, werden diese Assets nicht mit Benutzern assoziiert, denen sie zuvor zugewiesen wurden.',
   'bulk_delete_warn'	=> 'Sie sind 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 Ihnen die Aktualisierung von mehreren Assets zugleich. Füllen Sie die Felder aus welche Sie ändern möchten. Alle leeren Felder bleiben unverändert. ',
     'bulk_update_warn'	=> 'Sie sind dabei, die Eigenschaften eines einzelnen Assets zu bearbeiten. |Sie sind dabei, die Eigenschaften von :asset_count Assets zu bearbeiten.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Nur den Standardort 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.',
-    'processing_spinner' => 'Wird verarbeitet...',
+    'processing_spinner' => 'Verarbeitung... (Dies kann bei großen Dateien etwas Zeit in Anspruch nehmen)',
     'optional_infos'  => 'Optionale Informationen',
     'order_details'   => 'Bestellinformationen'
 ];
diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php
index 617b9a5bc0..961cff1f87 100644
--- a/resources/lang/de/admin/hardware/general.php
+++ b/resources/lang/de/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Dieses Asset wurde gelöscht.',
     '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'             => 'Das Modell dieses Asset ist ungültig.',
+    'model_invalid_fix'         => 'Das Asset sollte bearbeitet werden, um dies zu korrigieren, bevor versucht wird, es ein- oder auszuchecken.',
     'requestable'               => 'Anforderbar',
     'requested'				    => 'Angefordert',
     'not_requestable'           => 'Kann nicht angefordert werden',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Asset wiederherstellen',
     'pending'  					=> 'Ausstehend',
     'undeployable'  			=> 'Nicht einsetzbar',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Fehlermeldungen:',
     'success_messages' => 'Erfolgsmeldungen:',
     'alert_details' => 'Siehe unten für Details.',
-    'custom_export' => 'Benutzerdefinierter Export'
+    'custom_export' => 'Benutzerdefinierter Export',
+    'mfg_warranty_lookup' => ':manufacturer Garantiestatus Abfrage',
 ];
diff --git a/resources/lang/de/admin/hardware/message.php b/resources/lang/de/admin/hardware/message.php
index 21e1ce0ccb..4ac3c63d06 100644
--- a/resources/lang/de/admin/hardware/message.php
+++ b/resources/lang/de/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Asset wurde nicht wiederhergestellt, bitte versuchen Sie es noch einmal',
         'success' 		=> 'Asset erfolgreich wiederhergestellt.',
+        'bulk_success' 		=> 'Asset erfolgreich wiederhergestellt.',
+        'nothing_updated'   => 'Es wurden keine Assets ausgewählt, also wurde nichts wiederhergestellt.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Ihre Datei wurde importiert',
         'file_delete_success'   => 'Die Datei wurde erfolgreich gelöscht',
         'file_delete_error'      => 'Die Datei konnte nicht gelöscht werden',
+        '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',
     ],
 
 
diff --git a/resources/lang/de/admin/hardware/table.php b/resources/lang/de/admin/hardware/table.php
index 8a92d45d29..8cfe2ebde8 100644
--- a/resources/lang/de/admin/hardware/table.php
+++ b/resources/lang/de/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Zurücknehmen/Herausgeben',
     'checkout_date' => 'Herausgabedatum',
     'checkoutto' 	=> 'Herausgegeben',
+    'components_cost' => 'Gesamtkosten der Komponenten',
     'current_value' => 'Aktueller Wert',
     'diff' 			=> 'Differenz',
     'dl_csv' 		=> 'CSV Herunterladen',
diff --git a/resources/lang/de/admin/licenses/general.php b/resources/lang/de/admin/licenses/general.php
index 30e0bf8022..04e84159dd 100644
--- a/resources/lang/de/admin/licenses/general.php
+++ b/resources/lang/de/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Über Lizenzen',
-    'about_licenses'                  => 'Lizenzen werden verwendet, um Software zu verfolgen.  Sie haben eine bestimmte Anzahl von Plätzen, die an Einzelpersonen ausgegeben werden können',
+    'about_licenses_title'      => 'Über Lizenzen',
+    'about_licenses'            => 'Lizenzen werden verwendet, um Software zu verfolgen.  Sie haben eine bestimmte Anzahl von Plätzen, die an Einzelpersonen ausgegeben werden können',
     'checkin'  					=> 'Lizenz einbuchen',
     'checkout_history'  		=> 'Zuweisungsverlauf',
     'checkout'  				=> 'Lizenzaktivierung herausgeben',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Nutzer',
     'view'  					=> 'Lizenz ansehen',
+    'delete_disabled'           => 'Diese Lizenz kann noch nicht gelöscht werden, da einige Plätze noch ausgecheckt sind.',
+    'bulk'                      =>
+        [
+            '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.',
+                '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',
+                'success'           => 'Lizenz erfolgreich zurückgenommen! | Alle Lizenzen wurden erfolgreich zurückgenommen!',
+                'log_msg'           => 'Zurückgenommen über Massen-Zurücknehmen in der Lizenzübersicht',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Alle Plätze herausgeben',
+                'modal'                 => 'Diese Aktion wird einen Platz für den ersten verfügbaren Benutzer herausgeben. | Diese Aktion wird alle :available_seats_count Plätze an die ersten verfügbaren Benutzer herausgeben. Ein Benutzer wird als verfügbar für diesen Platz betrachtet, wenn er diese Lizenz noch nicht zugewiesen hat und die "Lizenzen automatisch zuweisen" Eigenschaft auf dem Benutzerkonto aktiviert ist.',
+                'enabled_tooltip'   => 'ALLE Plätze (oder so viele wie verfügbar sind) an ALLE Benutzer herausgeben',
+                'disabled_tooltip'  => 'Dies ist deaktiviert, da derzeit keine Sitze verfügbar sind',
+                'success'           => 'Lizenz erfolgreich herausgegeben! | Alle :count Lizenzen wurden erfolgreich herausgegeben!',
+                'error_no_seats'    => 'Es gibt keine verbleibenden Plätze für diese Lizenz.',
+                'warn_not_enough_seats'    => ':count Benutzern wurde diese Lizenz zugewiesen, aber es gibt keine verfügbaren Lizenzplätze mehr.',
+                'warn_no_avail_users'    => 'Nichts zu tun. Es gibt keine Benutzer, denen diese Lizenz noch nicht zugewiesen ist.',
+                'log_msg'           => 'Herausgegeben über Massen-Herausgeben in Lizenzübersicht',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/de/admin/manufacturers/message.php b/resources/lang/de/admin/manufacturers/message.php
index 16aa38f4ba..32004717f4 100644
--- a/resources/lang/de/admin/manufacturers/message.php
+++ b/resources/lang/de/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Verwenden Sie <code>{LOCALE}</code> und <code>{SERIAL}</code> in Ihrer URL als Variablen, um diese Werte beim Anzeigen von Assets automatisch zu füllen.',
     'does_not_exist' => 'Hersteller existiert nicht.',
     'assoc_users'	 => 'Dieser Hersteller ist bereits mit einem Model verknüpft und kann nicht gelöscht werden. Bitte trennen sie Ihre Modelle von diesem Hersteller und versuchen Sie es Erneut.',
 
diff --git a/resources/lang/de/admin/manufacturers/table.php b/resources/lang/de/admin/manufacturers/table.php
index 648c50cffe..aadbba6119 100644
--- a/resources/lang/de/admin/manufacturers/table.php
+++ b/resources/lang/de/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support per E-Mail',
     'support_phone'   		=> 'Support Telefon',
     'support_url'   		=> 'Support-URL',
+    'warranty_lookup_url'   => 'Link zu Garantiebedingungen',
     'update'				=> 'Hersteller aktualisieren',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/de/admin/models/general.php b/resources/lang/de/admin/models/general.php
index 0580841319..388afe4509 100644
--- a/resources/lang/de/admin/models/general.php
+++ b/resources/lang/de/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 im Begriff :model_count Asset-Modelle zu löschen.',
+    'bulk_delete_warn'          => 'Sie sind dabei, ein Asset Modell zu löschen.|Sie sind dabei, :model_count Asset Modelle zu löschen.',
     'restore'                   => 'Modell wiederherstellen',
     'requestable'               => 'Benutzer können dieses Modell anfordern',
 	'show_mac_address'			      => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell',
diff --git a/resources/lang/de/admin/models/message.php b/resources/lang/de/admin/models/message.php
index 2c58b2bdbd..058278b00f 100644
--- a/resources/lang/de/admin/models/message.php
+++ b/resources/lang/de/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modell existiert nicht.',
+    'no_association' => 'KEINE MODELL ZUGEORDNET.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modell wurde nicht aktualisiert. Bitte versuch es noch einmal',
-        'success' => 'Modell wurde erfolgreich aktualisiert.'
+        'success' => 'Modell wurde erfolgreich aktualisiert.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
-        'success' 		=> 'Modelle aktualisiert.'
+        'success' 		=> 'Modell erfolgreich aktualisiert. |:model_count Modelle erfolgreich aktualisiert.',
+        'warn'          => 'Du bist dabei, die Eigenschaften des folgenden Modells zu aktualisieren: |Du bist dabei, die Eigenschaften der folgenden :model_count Modelle zu bearbeiten:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Es wurden keine Modelle ausgewählt. Somit wurde auch nichts gelöscht.',
-        'success' 		    => ':success_count Modell(e) gelöscht!',
+        'success' 		    => 'Modell gelöscht!|:success_count Modelle gelöscht!',
         'success_partial' 	=> ':success_count Modell(e) wurden gelöscht. Jedochen konnten :fail_count nicht gelöscht werden, da ihnen noch Assets zugeordnet sind.'
     ),
 
diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php
index 2545499dee..23ca91da7a 100644
--- a/resources/lang/de/admin/settings/general.php
+++ b/resources/lang/de/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Dies ist ein Active Directory Server',
     'alerts'                	=> 'Alarme',
-    'alert_title'               => 'Alarm-Einstellungen aktualisieren',
+    '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',
     'alerts_enabled'			=> 'E-Mail-Benachrichtigungen aktiviert',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Wenn Sie dieses Kästchen aktivieren, kann ein Benutzer das Design mit einem anderen überschreiben.',
     'asset_ids'					=> 'Asset IDs',
     'audit_interval'            => 'Auditintervall',
-    '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'       => 'Wenn Sie verpflichtet sind, Ihre Assets regelmäßig physisch zu überprüfen, geben Sie das Intervall in Monaten an. Wenn Sie diesen Wert aktualisieren, werden alle "nächsten Audittermine" für Assets mit einem anstehenden Prüfungsdatum aktualisiert.',
     'audit_warning_days'        => 'Audit-Warnschwelle',
     'audit_warning_days_help'   => 'Wie viele Tage im Voraus sollten wir Sie warnen, wenn Vermögenswerte zur Prüfung fällig werden?',
     'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset Tags',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Aus Backup wiederherstellen',
     'backups_upload'            => 'Backup hochladen',
     'backups_path'              => 'Sicherungen auf dem Server werden in <code>:path</code> gespeichert',
-    '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_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 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',
@@ -76,7 +76,8 @@ return [
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Standard-Berechtigungsgruppe',
-    '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.',
+    'ldap_default_group_info'   => 'Wählen Sie eine Gruppe aus, die neu synchronisierten Benutzern zugewiesen werden soll. Denken Sie daran, dass ein Benutzer die Berechtigungen der zugewiesenen Gruppe übernimmt.',
+    'no_default_group'          => 'Keine Standardgruppe',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP Client-seitiger TLS-Schlüssel',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Zertifikat',
@@ -85,6 +86,8 @@ return [
     '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_key'       => 'LDAP Client-seitiger TLS-Schlüssel',
+    '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'      => 'Geben Sie einen gültigen LDAP-Benutzernamen und ein Passwort von der oben angegebenen Basis-DN ein, um zu testen, ob Ihre LDAP-Anmeldung korrekt konfiguriert ist. SIE MÜSSEN IHRE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Verwende Bilder in E-Mals',
     'show_images_in_email_help'   => 'Deaktivieren Sie dieses Kontrollkästchen, wenn sich Ihre Snipe-IT-Installation hinter einem VPN oder einem geschlossenen Netzwerk befindet und Benutzer außerhalb des Netzwerks keine Bilder von dieser Installation in ihre E-Mails laden können.',
     'site_name'                 => 'Seitenname',
+    'integrations'               => 'Integrationen',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Slack Einstellungen aktualisieren',
-    'slack_help'                => 'Slack Einstellungen',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Kanal',
-    'slack_endpoint'            => 'Slack Endpunkt',
-    'slack_integration'         => 'Slack Einstellungen',
-    'slack_integration_help'    => 'Die Slackintegration ist optional. Der Endpunkt und ein channel werden benötigt, wenn man Slack benutzen möchte. Um Slack zu konfigurieren muss zuerst ein <a href=":slack_link" target="_new" rel="noopener"> eingehender Webhook</a> in Slack eingerichtet werden. Klicken sie auf <strong>Slack Integration testen</strong> um zu prüfen, ob die Einstellungen vor dem Speichern korrekt sind. ',
-    'slack_integration_help_button'    => 'Sobald Sie Ihre Slack-Informationen gespeichert haben, erscheint eine Test-Schaltfläche.',
-    'slack_test_help'           => 'Testen Sie, ob die Slack-Integration korrekt konfiguriert ist. ZUERST MÜSSEN DIE AKTUALISIERTEN SLACK EINSTELLUNGEN GESPEICHERT WERDEN.',
+    'general_webhook'           => 'Allgemeiner Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Teste zum Speichern',
+    'webhook_title'               => 'Webhook Einstellungen aktualisieren',
+    'webhook_help'                => 'Integrationseinstellungen',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Kanal',
+    'webhook_endpoint'            => ':app Endpunkt',
+    'webhook_integration'         => ':app Einstellungen',
+    'webhook_test'                 =>':app Integration testen',
+    '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.',
     '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
     'ldap_settings_link' => 'LDAP Einstellungsseite',
     'slack_test' => '<i class="fab fa-slack"></i> Integration testen',
+    '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>.',
+    'google_login'      => 'Google Workspace Anmeldeeinstellungen',
+    'enable_google_login'  => 'Anmelden mit Google Workspace für Benutzer aktivieren',
+    'enable_google_login_help'  => 'Benutzer werden nicht automatisch bereitgestellt. Sie müssen ein bestehendes Konto hier UND in Google Workspace haben, und ihr Benutzername muss mit der E-Mail-Adresse von Google Workspace übereinstimmen. ',
+
 ];
diff --git a/resources/lang/de/admin/settings/message.php b/resources/lang/de/admin/settings/message.php
index cb769ea5e4..1ca43d7d96 100644
--- a/resources/lang/de/admin/settings/message.php
+++ b/resources/lang/de/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
         'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
     ],
-    'slack' => [
-        'sending' => 'Slack Testnachricht wird gesendet...',
-        'success_pt1' => 'Erfolgreich! Überprüfen Sie die ',
-        'success_pt2' => ' Kanal für Ihre Testnachricht und klicken Sie auf Speichern unten, um Ihre Einstellungen zu speichern.',
-        '500' => '500 Server Fehler.',
-        'error' => 'Etwas ist schiefgelaufen.',
+    'webhook' => [
+        'sending' => ':app Testnachricht wird gesendet...',
+        'success_pt1' => 'Erfolgreich! Überprüfen Sie den ',
+        'success_pt2' => ' Kanal für Ihre Testnachricht und klicken Sie auf Speichern, um Ihre Einstellungen zu speichern.',
+        '500' => '500 Server Error.',
+        'error' => 'Etwas ist schief gelaufen. :app antwortete mit: :error_message',
+        'error_misc' => 'Etwas ist schiefgelaufen. :( ',
     ]
 ];
diff --git a/resources/lang/de/admin/users/general.php b/resources/lang/de/admin/users/general.php
index 41e78b0ac3..385e206780 100644
--- a/resources/lang/de/admin/users/general.php
+++ b/resources/lang/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.',
+    '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'   => 'Sie müssen 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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Nur Superadmins dürfen einem Benutzer Superadmin Zugriff gewähren.',
     'admin_permission_warning' => 'Nur Benutzer mit Administratorrechten oder höher dürfen einem Benutzer Administratorzugriff gewähren.',
     'remove_group_memberships' => 'Gruppenmitgliedschaften entfernen',
-    'warning_deletion' => 'WARNUNG:',
     'warning_deletion_information' => 'Sie sind dabei, ALLE Gegenstände der/des :count unten angezeigten Benutzer/-s einzuchecken. Super-Admin-Namen werden rot hervorgehoben.',
     'update_user_assets_status' => 'Alle Assets für diese Benutzer auf diesen Status aktualisieren',
     'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Extern',
     'remote_help' => 'Dies kann nützlich sein, wenn Sie nach externen Benutzern filtern müssen, 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, falls man das möchte.',
+    'create_user' => 'Benutzer erstellen',
+    'create_user_page_explanation' => 'Dies sind die Anmeldeinformationen, die Sie verwenden, 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',
+    'all_assigned_list_generation' => 'Generiert am:',
+    'email_user_creds_on_create' => 'Diesem Benutzer seine Zugangsdaten per E-Mail senden?',
 ];
diff --git a/resources/lang/de/admin/users/message.php b/resources/lang/de/admin/users/message.php
index b76e1275df..00f60149e4 100644
--- a/resources/lang/de/admin/users/message.php
+++ b/resources/lang/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 [:id] existiert nicht.',
+    'user_not_found'            => 'Benutzer existiert nicht.',
     'user_login_required'       => 'Das Loginfeld ist erforderlich',
     'user_password_required'    => 'Das Passswortfeld ist erforderlich.',
     'insufficient_permissions'  => 'Unzureichende Berechtigungen.',
@@ -62,6 +62,6 @@ return array(
 
     'inventorynotification' => array(
         'error'   => 'Für diesen Benutzer ist keine E-Mail-Adresse hinterlegt.',
-        'success' => 'The user has been notified about their current inventory.'
+        'success' => 'Der Benutzer wurde über sein aktuelles Inventar informiert.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/de/auth/general.php b/resources/lang/de/auth/general.php
index 6f8f3411c1..3721bf9c27 100644
--- a/resources/lang/de/auth/general.php
+++ b/resources/lang/de/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Angemeldet bleiben',
     '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 Sie ihren Benutzernamen vergessen haben, kontaktieren Sie ihren Administrator.<br><br><strong>Benutzernamen ohne zugeordnete E-Mailadresse erhalten keine E-Mail zum Zurücksetzen des Passwortes.</strong> ',
-    ];
+    'google_login'                  => 'Oder mit Google Workspace anmelden',
+    'google_login_failed'           => 'Google-Anmeldung fehlgeschlagen, bitte versuche es erneut.',
+
+];
 
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
index aa45dd302f..70fa5573b9 100644
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Zubehör',
     'activated'			    => 'Aktiviert',
+    'accepted_date'         => 'Datum akzeptiert',
     'accessory'				=> 'Zubehör',
     'accessory_report'		=> 'Zubehör Bericht',
     'action'                => 'Aktion',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Administrator',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Lizenzen hinzugefügt',
-    'age'                   => "Age",
+    'age'                   => "Alter",
     'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
     'archived'              => 'Archiviert',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Prüfung',
     'audit_report'			=> 'Audit-Log',
     'assets'				=> 'Assets',
+    'assets_audited'        => 'Assets auditiert',
+    'assets_checked_in_count'     => 'Asset zurückgenommen',
+    'assets_checked_out_count'     => 'Assets herausgegeben',
+    'asset_deleted_warning'     => 'Dieses Asset wurde gelöscht. Sie müssen es wiederherstellen, bevor Sie es jemandem zuweisen können.',
+    'assigned_date'         => 'Zuweisungsdatum',
     'assigned_to'           => 'Herausgegeben an :name',
+    'assignee'              => 'Herausgegeben an',
     'avatar_delete'         => 'Avatar löschen',
     'avatar_upload'         => 'Avatar hochladen',
     'back'      			=> 'Zurück',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Massenbearbeitung',
     'bulk_delete'           => 'Massenlöschung',
     'bulk_actions'          => 'Massenaktionen',
-    'bulk_checkin_delete'   => 'Masseneinchecken der Gegenstände von Benutzern',
+    'bulk_checkin_delete'   => 'Massen-Zurücknehmen / -Benutzer löschen',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Dieses Gerät gehört dem Benutzer',
     'bystatus'              => 'nach Status',
     'cancel'  				=> 'Abbrechen',
     'categories'			=> 'Kategorien',
@@ -83,6 +92,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' => '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',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Akzeptierte Dateitypen sind jpg, png, gif und svg. Maximale Uploadgröße ist :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',
     'importing'         	=> 'Importiere',
     '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.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Asset Wartungen',
     'item'  				=> 'Gegenstand',
     'item_name'             => 'Artikelname',
+    'import_file'  			=> 'CSV-Datei importieren',
+    'import_type'  			=> 'CSV Typ',
     'insufficient_permissions' => 'Unzureichende Berechtigungen!',
     'kits'       			=> 'Vordefinierte Kits',
     'language'				=> 'Sprache',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Angeforderte Assets',
     'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',
+    'select_var'            => ':thing auswählen... ', // this will eventually replace all of our other selects
     'select'				=> 'auswählen',
     'select_all'            => 'Alle markieren',
     'search'				=> 'Suche',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Unterschrift',
     'signed_off_by'         => 'Unterschrieben von',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'Eine Slack Nachricht wird gesendet',
-    'slack_test_msg'        => 'Oh hai! Sieht so aus, als ob deine Slack Integration mit Snipe-IT funktioniert!',
+    '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!',
     'some_features_disabled' => 'Einige Funktionen sind für den DEMO-Modus deaktiviert.',
     'site_name'				=> 'Seitenname',
     'state'  				=> 'Bundesland',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Sind Sie sich sicher, dass Sie löschen möchten',
     'submit'				=> 'Abschicken',
     'target'                => 'Ziel',
-    'toggle_navigation'     => 'Navigation umschalten',
     'time_and_date_display' => 'Zeit- und Datumsanzeige',
     'total_assets'			=> 'Gesamte Assets',
     'total_licenses'		=> 'Lizenzen insgesamt',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postleitzahl',
     'noimage'				=> 'Kein Bild hochgeladen oder kein Bild gefunden.',
-    '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'   => 'Die angeforderte Datei existiert nicht.',
+    'file_upload_success'   => 'Dateiupload erfolgreich!',
+    'no_files_uploaded'     => 'Dateiupload erfolgreich!',
     'token_expired'         => 'Ihre Sitzung ist abgelaufen. Bitte versuchen Sie es erneut.',
     'login_enabled'         => 'Login aktiviert',
     'audit_due'             => 'Audit fällig',
@@ -375,18 +388,65 @@ 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 dieses Asset|Werte für alle :asset_count Assets 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'   => 'Sie haben :count Gegenstände, die akzeptiert werden müssen. Klicken Sie hier, um diese anzunehmen oder abzulehnen',
     'start_date'            => 'Startdatum',
     'end_date'            => 'Enddatum',
     'alt_uploaded_image_thumbnail' => 'Hochgeladene Miniaturansicht',
-    'placeholder_kit'       => 'Kit auswählen'
+    'placeholder_kit'       => 'Kit auswählen',
+    'file_not_found'        => 'Datei wurde nicht gefunden',
+    'preview_not_available' => '(keine Vorschau vorhanden)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Zum Hauptinhalt springen',
+    'toggle_navigation'     => 'Navigation umschalten',
+    'alerts'                => 'Benachrichtigungen',
+    'tasks_view_all'        => 'Alle Aufgaben anzeigen',
+    'true'                  => 'Wahr',
+    'false'                 => 'Falsch',
+    '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 einzigen Benutzer zusammenführen. Wählen Sie den Benutzer, in den Sie die anderen zusammenführen möchten und 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 Sie Benutzer aufgrund eines falschen Imports oder einer fehlerhaften Synchronisation zusammenführen müssen. Stellen Sie sicher, dass Sie zuerst ein Backup ausführen.',
+    'no_users_selected'     => 'Keine Benutzer ausgewählt',
+    'not_enough_users_selected'     => 'Mindestens :count Benutzer müssen ausgewählt sein',
+    'merge_success'         => ':count Benutzer wurden erfolgreich zu :into_username zusammengeführt!',
+    'merged'                => 'zusammengeführt',
+    'merged_log_this_user_into' => 'Diesen Benutzer (ID :to_id - :to_username) in Benutzer-ID :from_id (:from_username) zusammengeführt ',
+    'merged_log_this_user_from' => 'Benutzer-ID :from_id (:from_username) in diesen Benutzer zusammengeführt (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Löschen & Speichern',
+    'update_existing_values'    => 'Vorhandene Werte aktualisieren?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Das Generieren von fortlaufenden Asset-Tags ist deaktiviert, daher müssen alle Datensätze die Spalte "Asset Tag" enthalten.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Hinweis: Das Generieren von fortlaufenden Asset-Tags ist aktiviert, daher wird für alle Datensätze, die keinen Asset-Tag angegeben haben, einer erstellt. Datensätze, die einen "Asset Tag" angegeben haben, werden mit den angegebenen Informationen aktualisiert.',
+    'send_welcome_email_to_users'   => ' Willkommens-E-Mail für neue Benutzer senden?',
+    'back_before_importing'     => 'Vor dem Importieren sichern?',
+    'csv_header_field'          => 'CSV-Header-Feld',
+    'import_field'              => 'Feld importieren',
+    'sample_value'              => 'Beispielwert',
+    'no_headers'                => 'Keine Spalten gefunden',
+    'error_in_import_file'      => 'Beim Lesen der CSV-Datei ist ein Fehler aufgetreten: :error',
+    'percent_complete'          => ':percent % abgeschlossen',
+    'errors_importing'          => 'Es sind Fehler während des Importierens aufgetreten: ',
+    'warning'                   => 'WARNUNG: :warning',
+    'success_redirecting'       => '"Erfolgreich... Weiterleiten.',
+    'setup_successful_migrations' => 'Die Datenbank-Tabellen wurden erstellt',
+    'setup_migration_output' => 'Ausgabe der Migration:',
+    'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
+    'importer_generic_error'    => 'Ihr Dateiimport ist abgeschlossen, aber wir haben Fehler erhalten. Es wird in der Regel durch eine API-Drosselung von Drittanbietern von einem Benachrichtigung-Webhooks (wie Slack) verursacht und hat den Import selbst nicht beeinträchtigt, Sie sollten dies allerdings nachprüfen.',
+    'confirm' => 'Bestätigen',
+    'autoassign_licenses' => 'Lizenzen automatisch zuweisen',
+    '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' => 'Dies erlaubt es einem Benutzer, Lizenzen über die Massen-Zuweisung GUI oder CLI-Tools zugewiesen zu bekommen. (Zum Beispiel möchten Sie den Auftragnehmern möglicherweise nicht automatisch eine Lizenz zuweisen, die nur Mitarbeitern zur Verfügung stehen würde. Sie können 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'      => 'Sind Sie sich sicher?',
+    'cannot_be_deleted'      => 'Dieser Gegenstand kann nicht gelöscht werden',
+    'undeployable_tooltip'      => 'Dieser Gegenstand kann nicht herausgegeben werden. Überprüfen Sie die verbleibende Menge.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/de/help.php b/resources/lang/de/help.php
index 7917ea94ed..a1477fe500 100644
--- a/resources/lang/de/help.php
+++ b/resources/lang/de/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mehr Informationen',
 
-    'audit_help' => 'Mit dem aktivieren dieser Option wird der Asset-Datensatz an diesen neuen Ort angepasst. Wenn diese Option nicht aktiviert wird, wird nur der Ort im Audit-Log angezeigt.<br><br>Falls das Asset ausgecheckt ist, ändert sich nicht die Position der Person, des Assets oder der Position, an der es ausgecheckt wird.',
+    'audit_help' => 'Mit dem aktivieren dieser Option wird der Asset-Datensatz an diesen neuen Ort angepasst. Wenn diese Option nicht aktiviert wird, wird der Ort nur im Audit-Log angezeigt.<br><br>Falls das Asset ausgecheckt ist, ändert sich der Ort der Person, des Assets oder des Orts, an den es ausgecheckt ist, nicht.',
 
     '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.',
 
diff --git a/resources/lang/de/localizations.php b/resources/lang/de/localizations.php
index 0287f56f8f..fa8ede714a 100644
--- a/resources/lang/de/localizations.php
+++ b/resources/lang/de/localizations.php
@@ -257,6 +257,7 @@ im Indischen Ozean',
         'UK'=>'Schottland',
         'SB'=>'Salomon-Inseln',
         'SC'=>'Seychellen',
+        'SS'=>'Südsudan',
         'SD'=>'Sudan',
         'SE'=>'Schweden',
         'SG'=>'Singapur',
diff --git a/resources/lang/de/mail.php b/resources/lang/de/mail.php
index 482951b0ff..668d871039 100644
--- a/resources/lang/de/mail.php
+++ b/resources/lang/de/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Melden Sie sich zu Ihrer neuen Snipe-IT-Installation mithilfe der unten stehenden Anmeldeinformationen an:',
     'login' => 'Benutzername:',
     'Low_Inventory_Report' => 'Bericht über niedrige Lagerbestände',
+    'inventory_report' => 'Bestandsbericht',
     'min_QTY' => 'Mindestmenge',
     'name' => 'Name',
     'new_item_checked' => 'Ein neuer Gegenstand wurde unter Ihrem Namen ausgecheckt. Details folgen.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Ihre Snipe-IT Anmeldedaten',
     'Accessory_Checkin_Notification' => 'Zubehör zurückgenommen',
     'Asset_Checkin_Notification' => 'Asset zurückgenommen',
+    'Asset_Checkout_Notification' => 'Asset herausgegeben',
     'License_Checkin_Notification' => 'Lizenz zurückgenommen',
     'Expected_Checkin_Report' => 'Bericht über erwartete Asset Rückgaben',
     'Expected_Checkin_Notification' => 'Erinnerung: :name Rückgabedatum nähert sich',
     'Expected_Checkin_Date' => 'Ihr ausgebuchtes Asset ist fällig zur Rückgabe am :date',
     'your_assets' => 'Ihre Assets anzeigen',
+    'rights_reserved' => 'Alle Rechte vorbehalten.',
 ];
diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index a098cb1a5b..fdd14a7ca6 100644
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute muss eine Datei sein.',
     'filled'               => 'Das :attribute Feld muss einen Wert haben.',
     'image'                => ':attribute muss ein Bild sein.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute muss mindestens :min Elemente enthalten.',
     ],
     'starts_with'          => ':attribute muss mit einem der folgenden Werte beginnen: :values.',
+    'ends_with'            => ':attribute muss mit einem der folgenden Werte enden: :values.',
+
     'not_in'               => 'Auswahl :attribute ist ungültig.',
     'numeric'              => ':attribute muss eine Zahl sein.',
     'present'              => ':attribute muss vorhanden sein.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/el/admin/accessories/general.php b/resources/lang/el/admin/accessories/general.php
index bd09f65ab5..27d61cf7a2 100644
--- a/resources/lang/el/admin/accessories/general.php
+++ b/resources/lang/el/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Ενημέρωση αξεσουάρ',
     'use_default_eula'					=> 'Χρησιμοποιήστε την προεπιλεγμένη <a href="#" data-toggle="modal" data-target="#eulaModal">primary EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Χρησιμοποιήστε την κύρια προεπιλεγμένη EULA instead.</del> καμία κύρια προεπιλεγμένη άδεια χρήσης τελικού χρήστη δεν έχει οριστεί. Παρακαλείσθε να προσθέσετε μία στις ρυθμίσεις.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/el/admin/accessories/message.php b/resources/lang/el/admin/accessories/message.php
index f1b6cf4485..57987c0a5e 100644
--- a/resources/lang/el/admin/accessories/message.php
+++ b/resources/lang/el/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Το αξεσουάρ δεν έχει ελεγχθεί, δοκιμάστε ξανά',
         'success' 		=> 'Το αξεσουάρ ολοκληρώθηκε με επιτυχία.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.'
     ),
 
diff --git a/resources/lang/el/admin/asset_maintenances/form.php b/resources/lang/el/admin/asset_maintenances/form.php
index c26efc1ddd..2c118e48c1 100644
--- a/resources/lang/el/admin/asset_maintenances/form.php
+++ b/resources/lang/el/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Τύπος Συντήρησης',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Τίτλος',
-        'start_date'             => 'Εκτελεσμένες',
-        'completion_date'        => 'Ολοκληρώθηκε',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Κόστος',
         'is_warranty'            => 'Βελτίωση της εγγύησης',
-        'asset_maintenance_time' => 'Ημέρες',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Σημειώσεις',
-        'update'                 => 'Ενημέρωση',
-        'create'                 => 'Δημιουργία'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/el/admin/categories/message.php b/resources/lang/el/admin/categories/message.php
index bede79ccd9..f0089b1cbf 100644
--- a/resources/lang/el/admin/categories/message.php
+++ b/resources/lang/el/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Η κατηγορία δεν ενημερώθηκε, παρακαλώ δοκιμάστε ξανά',
-        'success' => 'Η κατηγορία ενημερώθηκε με επιτυχία.'
+        'success' => 'Η κατηγορία ενημερώθηκε με επιτυχία.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/el/admin/components/general.php b/resources/lang/el/admin/components/general.php
index acb3e05bbd..173bcc0a39 100644
--- a/resources/lang/el/admin/components/general.php
+++ b/resources/lang/el/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Απομένουν',
     'total' 			                 => 'Σύνολο',
     'update'                            => 'Αναβάθμιση εξαρτήματος',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/el/admin/components/message.php b/resources/lang/el/admin/components/message.php
index 79bd1a0c92..6bb850064f 100644
--- a/resources/lang/el/admin/components/message.php
+++ b/resources/lang/el/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Το στοιχείο δεν έχει ελεγχθεί, δοκιμάστε ξανά',
         'success' 		=> 'Η συνιστώσα ολοκληρώθηκε με επιτυχία.',
-        'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.'
+        'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/el/admin/consumables/message.php b/resources/lang/el/admin/consumables/message.php
index b1a5562653..63a37d64e1 100644
--- a/resources/lang/el/admin/consumables/message.php
+++ b/resources/lang/el/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Το αναλώσιμο δεν έχει ελεγχθεί, δοκιμάστε ξανά',
         'success' 		=> 'Το αναλώσιμο ελεγχόταν με επιτυχία.',
-        'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.'
+        'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/el/admin/custom_fields/general.php b/resources/lang/el/admin/custom_fields/general.php
index 9a1113de13..e86b0ab3cd 100644
--- a/resources/lang/el/admin/custom_fields/general.php
+++ b/resources/lang/el/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Χρησιμοποιήθηκε από τα μοντέλα',
     'order'   		            => 'Σειρά',
     'create_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'            => 'Νέο προσαρμοσμένο πεδίο',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/el/admin/groups/message.php b/resources/lang/el/admin/groups/message.php
index 0baa3f3e0a..6feba4c72f 100644
--- a/resources/lang/el/admin/groups/message.php
+++ b/resources/lang/el/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Η ομάδα υπάρχει ήδη!',
-    'group_not_found'     => 'Ομάδα [: Αναγνωριστικό] δεν υπάρχει.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Το όνομα του πεδίου είναι απαραίτητο',
 
     'success' => array(
diff --git a/resources/lang/el/admin/hardware/form.php b/resources/lang/el/admin/hardware/form.php
index fb48ccbe5e..f10419bf43 100644
--- a/resources/lang/el/admin/hardware/form.php
+++ b/resources/lang/el/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Επιβεβαιώστε μαζική διαγραφή περιουσιακών στοιχείων',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/el/admin/hardware/general.php b/resources/lang/el/admin/hardware/general.php
index a0bb7b6b15..9d54e3acaa 100644
--- a/resources/lang/el/admin/hardware/general.php
+++ b/resources/lang/el/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Επεξεργασία παγίων',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Επαναληπτικό',
     'requested'				    => 'Ζητήθηκαν',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Επαναφορά παγίου',
     'pending'  					=> 'Εκκρεμεί',
     'undeployable'  			=> 'Μη διανέμεται',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/el/admin/hardware/message.php b/resources/lang/el/admin/hardware/message.php
index 80a742a563..465c7faaa3 100644
--- a/resources/lang/el/admin/hardware/message.php
+++ b/resources/lang/el/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Το ενεργητικό δεν έχει αποκατασταθεί, δοκιμάστε ξανά',
         'success' 		=> 'Τα πάγια επαναφέρθηκαν επιτυχώς.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Το αρχείο σας έχει εισαχθεί',
         'file_delete_success'   => 'Το αρχείο σας έχει διαγραφεί με επιτυχία',
         'file_delete_error'      => 'Το αρχείο δεν μπόρεσε να διαγραφεί',
+        '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',
     ],
 
 
diff --git a/resources/lang/el/admin/hardware/table.php b/resources/lang/el/admin/hardware/table.php
index a4024b9809..e1d5823ad8 100644
--- a/resources/lang/el/admin/hardware/table.php
+++ b/resources/lang/el/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Εισερχόμενα/Εξερχόμενα',
     'checkout_date' => 'Ημερομηνία αποχώρησης',
     'checkoutto' 	=> 'Checked Out',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Κατεβάστε το CSV',
diff --git a/resources/lang/el/admin/licenses/general.php b/resources/lang/el/admin/licenses/general.php
index da8988b326..20ae283e35 100644
--- a/resources/lang/el/admin/licenses/general.php
+++ b/resources/lang/el/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Σχετικά με τις άδειες',
-    'about_licenses'                  => 'Οι άδειες χρησιμοποιούνται για την παρακολούθηση του λογισμικού. Έχουν καθορισμένο αριθμό καθισμάτων που μπορούν να ελέγχονται σε άτομα',
+    'about_licenses_title'      => 'Σχετικά με τις άδειες',
+    'about_licenses'            => 'Οι άδειες χρησιμοποιούνται για την παρακολούθηση του λογισμικού. Έχουν καθορισμένο αριθμό καθισμάτων που μπορούν να ελέγχονται σε άτομα',
     'checkin'  					=> 'Checkin άδεια',
     'checkout_history'  		=> 'Ιστορικό παραγγελίας',
     'checkout'  				=> 'Καθίσματα άδειας πληρωμής',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Άδειες λογισμικού',
     'user'  					=> 'Χρήστης',
     'view'  					=> 'Προβολή άδειας',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/el/admin/manufacturers/message.php b/resources/lang/el/admin/manufacturers/message.php
index f2ce522307..1578f071c5 100644
--- a/resources/lang/el/admin/manufacturers/message.php
+++ b/resources/lang/el/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Κατασκευαστής δεν υπάρχει.',
     'assoc_users'	 => 'Αυτό κατασκευαστής σχετίζεται με τουλάχιστον ένα μοντέλο και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τα μοντέλα σας προκειμένου να μην αναφέρονται σε αυτόν τον κατασκευαστή και δοκιμάστε ξανά. ',
 
diff --git a/resources/lang/el/admin/manufacturers/table.php b/resources/lang/el/admin/manufacturers/table.php
index 02e516162f..dc193796ea 100644
--- a/resources/lang/el/admin/manufacturers/table.php
+++ b/resources/lang/el/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Υποστήριξη ηλεκτρονικού ταχυδρομείου',
     'support_phone'   		=> 'Υποστήριξη τηλεφώνου',
     'support_url'   		=> 'URL υποστήριξης',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Ενημέρωση Κατασκευαστή',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/el/admin/models/general.php b/resources/lang/el/admin/models/general.php
index b104707e26..f79e3f312f 100644
--- a/resources/lang/el/admin/models/general.php
+++ b/resources/lang/el/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Μαζική διαγραφή μοντέλου Asset',
     'bulk_delete_help'               => 'Χρησιμοποιήστε τα παρακάτω πλαίσια ελέγχου για να επιβεβαιώσετε τη διαγραφή των επιλεγμένων μοντέλων στοιχείων. Τα μοντέλα στοιχείων που έχουν στοιχεία που σχετίζονται με αυτά δεν μπορούν να διαγραφούν έως ότου τα στοιχεία συσχετιστούν με διαφορετικό μοντέλο.',
-    'bulk_delete_warn'          => 'Πρόκειται να διαγράψετε: asset_count περιουσιακών στοιχείων.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Επαναφορά μοντέλου',
     'requestable'               => 'Οι χρήστες μπορούν να αιτηθούν το μοντέλο',
 	'show_mac_address'			      => 'Εμφάνιση MAC διευθύνσεων πεδίου σε περιουσιακά στοιχεία σε αυτό το μοντέλο',
diff --git a/resources/lang/el/admin/models/message.php b/resources/lang/el/admin/models/message.php
index 1afea35d6e..b78c0b84ff 100644
--- a/resources/lang/el/admin/models/message.php
+++ b/resources/lang/el/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Το μοντέλο δεν υπάρχει.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Αυτό το μοντέλο συσχετίζεται επί του παρόντος με ένα ή περισσότερα στοιχεία και δεν μπορεί να διαγραφεί. Διαγράψτε τα στοιχεία και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Μοντέλο δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά',
-        'success' => 'Το μοντέλο ενημερώθηκε επιτυχώς.'
+        'success' => 'Το μοντέλο ενημερώθηκε επιτυχώς.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Δεν άλλαξαν πεδία, επομένως τίποτα δεν ενημερώθηκε.',
-        'success' 		=> 'Τα μοντέλα ενημερώθηκαν.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Δεν επιλέχθηκαν πεδία, επομένως τίποτα δεν διαγράφηκε.',
-        'success' 		    => ':success_count model(s) Διαγράφηκε!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(s) μοντέλα διαγράφηκαν, ωστόσο το :fail_count δεν μπόρεσε να διαγραφεί επειδή εξακολουθούν να έχουν στοιχεία που σχετίζονται με αυτά.'
     ),
 
diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php
index cb7200832f..66e3e5626b 100644
--- a/resources/lang/el/admin/settings/general.php
+++ b/resources/lang/el/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'Εάν θέλετε να στείλετε ένα αντίγραφο checkin/checkout emails που αποστέλλονται στους χρήστες σε έναν επιπλέον λογαριασμό email, εισαγάγετέ το εδώ. Διαφορετικά, αφήστε αυτό το πεδίο κενό.',
     'is_ad'				        => 'Αυτός είναι ένας διακομιστής υπηρεσίας καταλόγου Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Αποστολή ειδοποιήσεων προς',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Ειδοποιήσεις ενεργοποιημένες',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Ρυθμίσεις γραμμωτού κώδικα',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Εισαγάγετε ένα έγκυρο όνομα χρήστη και κωδικό πρόσβασης LDAP από τη βάση DN που καθορίσατε παραπάνω για να ελέγξετε εάν η σύνδεσή LDAP έχει ρυθμιστεί σωστά. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
     'ldap_login_sync_help'      => 'Αυτό ελέγχει μόνο ότι το LDAP μπορεί να συγχρονιστεί σωστά. Εάν το Authentication στο LDAP δεν είναι σωστό, οι χρήστες ενδέχεται να μην μπορούν να συνδεθούν. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Όνομα ιστότοπου',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Χωρίς κανάλι',
-    'slack_endpoint'            => 'Χαμηλό τελικό σημείο',
-    'slack_integration'         => 'Ρυθμίσεις χαλαρών',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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 έκδοση',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/el/admin/settings/message.php b/resources/lang/el/admin/settings/message.php
index f2ec02dcb7..65649c2443 100644
--- a/resources/lang/el/admin/settings/message.php
+++ b/resources/lang/el/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/el/admin/users/general.php b/resources/lang/el/admin/users/general.php
index 411559288e..98909a65cd 100644
--- a/resources/lang/el/admin/users/general.php
+++ b/resources/lang/el/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.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Λογισμικό Έγινε έλεγχος σε: όνομα',
     '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'         => 'Προβολή χρήστη :ονόματος',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/el/admin/users/message.php b/resources/lang/el/admin/users/message.php
index 464cd1d08d..53b61578b8 100644
--- a/resources/lang/el/admin/users/message.php
+++ b/resources/lang/el/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Έχετε απορρίψει επιτυχώς αυτό το στοιχείο.',
     'bulk_manager_warn'	        => 'Οι χρήστες σας ενημερώθηκαν με επιτυχία, ωστόσο η καταχώριση του διαχειριστή σας δεν αποθηκεύτηκε, επειδή ο διαχειριστής που επιλέξατε ήταν επίσης στη λίστα χρηστών για επεξεργασία και οι χρήστες ενδέχεται να μην είναι ο δικός τους διαχειριστής. Επιλέξτε ξανά τους χρήστες σας, εξαιρουμένου του διαχειριστή.',
     'user_exists'               => 'Ο χρήστης υπάρχει ήδη!',
-    'user_not_found'            => 'Ο χρήστης [:id] δεν υπάρχει.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Το πεδίο εισόδου είναι υποχρεωτικό',
     'user_password_required'    => 'Ο κωδικός είναι απαραίτητος.',
     'insufficient_permissions'  => 'Δεν έχετε επαρκή δικαιώματα.',
diff --git a/resources/lang/el/auth/general.php b/resources/lang/el/auth/general.php
index 63acec4fd2..6d155f12bd 100644
--- a/resources/lang/el/auth/general.php
+++ b/resources/lang/el/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php
index 8b7c7f1d85..adadd876b4 100644
--- a/resources/lang/el/general.php
+++ b/resources/lang/el/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Αξεσουάρ',
     'activated'			    => 'Ενεργοποιήθηκε',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Αξεσουάρ',
     'accessory_report'		=> 'Αναφορά αξεσουάρ',
     'action'                => 'Ενέργεια',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Ελεγχος',
     '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',
     'avatar_delete'         => 'Διαγραφή Avatar',
     'avatar_upload'         => 'Ανεβάστε την εικόνα προφίλ σας',
     'back'      			=> 'Προηγούμενο',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Ακύρωση',
     'categories'			=> 'Kατηγορίες',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Διαγράφηκε',
     'delete_seats'  		=> 'Διαγραμμένα καθίσματα',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Εισαγωγή',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Συντήρηση Παγίου',
     'item'  				=> 'Αντικείμενο',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Μη επαρκή δικαιώματα!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Γλώσσα',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Το αίτημα ακυρώθηκε',
     'save'  				=> 'Αποθήκευση',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Επιλογή',
     'select_all'            => 'Select All',
     'search'				=> 'Αναζήτηση',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Υπογραφή',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Ορισμένες λειτουργίες είναι απενεργοποιημένες για αυτήν την εγκατάσταση.',
     'site_name'				=> 'Όνομα ιστότοπου',
     'state'  				=> 'Κατάσταση',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε',
     'submit'				=> 'Υποβολή',
     'target'                => 'Στόχος',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Εμφάνιση ώρας και ημερομηνίας',
     'total_assets'			=> 'σύνολο Παγίων',
     'total_licenses'		=> 'σύνολο αδειών',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/el/help.php b/resources/lang/el/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/el/help.php
+++ b/resources/lang/el/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/el/localizations.php b/resources/lang/el/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/el/localizations.php
+++ b/resources/lang/el/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/el/mail.php b/resources/lang/el/mail.php
index 13f16edb42..554b0bf1b5 100644
--- a/resources/lang/el/mail.php
+++ b/resources/lang/el/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Συνδεθείτε στη νέα σας εγκατάσταση Snipe-IT χρησιμοποιώντας τα παρακάτω διαπιστευτήρια:',
     'login' => 'Σύνδεση:',
     'Low_Inventory_Report' => 'Αναφορά χαμηλού αποθέματος',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Ελάχιστη ποσότητα',
     'name' => 'Όνομα',
     'new_item_checked' => 'Ένα νέο στοιχείο έχει ελεγχθεί με το όνομά σας, οι λεπτομέρειες είναι παρακάτω.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Τα διαπιστευτήρια σας Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/el/validation.php b/resources/lang/el/validation.php
index b3bc8d31aa..8cc695060c 100644
--- a/resources/lang/el/validation.php
+++ b/resources/lang/el/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Το χαρακτηριστικό: πρέπει να έχει τουλάχιστον: λεπτά στοιχεία.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
     'numeric'              => 'Το χαρακτηριστικό πρέπει να είναι ένας αριθμός.',
     'present'              => 'Πρέπει να υπάρχει το πεδίο ιδιοτήτων: attribute.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Ο τρέχων κωδικός πρόσβασης είναι εσφαλμένος',
         'dumbpwd'          => 'Αυτός ο κωδικός πρόσβασης είναι πολύ συνηθισμένος.',
         'statuslabel_type' => 'Πρέπει να επιλέξετε έναν έγκυρο τύπο ετικέτας κατάστασης',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/en-GB/admin/accessories/general.php b/resources/lang/en-GB/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/en-GB/admin/accessories/general.php
+++ b/resources/lang/en-GB/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/en-GB/admin/accessories/message.php b/resources/lang/en-GB/admin/accessories/message.php
index 8fef268853..1652224675 100644
--- a/resources/lang/en-GB/admin/accessories/message.php
+++ b/resources/lang/en-GB/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/en-GB/admin/categories/message.php b/resources/lang/en-GB/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/en-GB/admin/categories/message.php
+++ b/resources/lang/en-GB/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/en-GB/admin/components/general.php b/resources/lang/en-GB/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/en-GB/admin/components/general.php
+++ b/resources/lang/en-GB/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/en-GB/admin/components/message.php b/resources/lang/en-GB/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/en-GB/admin/components/message.php
+++ b/resources/lang/en-GB/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en-GB/admin/consumables/message.php b/resources/lang/en-GB/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/en-GB/admin/consumables/message.php
+++ b/resources/lang/en-GB/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/en-GB/admin/custom_fields/general.php b/resources/lang/en-GB/admin/custom_fields/general.php
index 69fd114d8a..436c8c5c64 100644
--- a/resources/lang/en-GB/admin/custom_fields/general.php
+++ b/resources/lang/en-GB/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/en-GB/admin/groups/message.php b/resources/lang/en-GB/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/en-GB/admin/groups/message.php
+++ b/resources/lang/en-GB/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/en-GB/admin/hardware/form.php b/resources/lang/en-GB/admin/hardware/form.php
index 22aac61d07..9ccea77139 100644
--- a/resources/lang/en-GB/admin/hardware/form.php
+++ b/resources/lang/en-GB/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
   '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing… (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order-related Information'
 ];
diff --git a/resources/lang/en-GB/admin/hardware/general.php b/resources/lang/en-GB/admin/hardware/general.php
index 67226061b1..288bb8197e 100644
--- a/resources/lang/en-GB/admin/hardware/general.php
+++ b/resources/lang/en-GB/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The model of this asset is invalid.',
+    'model_invalid_fix'         => 'The asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php
index d2214ce00c..bcc20a20f8 100644
--- a/resources/lang/en-GB/admin/hardware/message.php
+++ b/resources/lang/en-GB/admin/hardware/message.php
@@ -17,12 +17,14 @@ return [
         'error'   			=> 'Asset was not updated, please try again',
         'success' 			=> 'Asset updated successfully.',
         'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'Nothing was updated because no assets were selected.',
     ],
 
     'restore' => [
         'error'   		=> 'Asset was not restored, please try again',
         'success' 		=> 'Asset restored successfully.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'Nothing was restored because no assets were selected.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/en-GB/admin/hardware/table.php b/resources/lang/en-GB/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/en-GB/admin/hardware/table.php
+++ b/resources/lang/en-GB/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/en-GB/admin/kits/general.php b/resources/lang/en-GB/admin/kits/general.php
index f724ecbf07..2a23072760 100644
--- a/resources/lang/en-GB/admin/kits/general.php
+++ b/resources/lang/en-GB/admin/kits/general.php
@@ -2,7 +2,7 @@
 
 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.',
+    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licences, 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',
@@ -17,15 +17,15 @@ return [
     '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_license'                    => 'Append licence',
+    'update_appended_license'           => 'Update appended licence',
     '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',
+    'license_error'                     => 'Licence already attached to kit',
+    'license_added_success'             => 'Licence added successfully',
+    'license_updated'                   => 'Licence was successfully updated',
+    'license_none'                      => 'Licence does not exist',
+    'license_detached'                  => 'Licence was successfully detached',
     'consumable_added_success'          => 'Consumable added successfully',
     'consumable_updated'                => 'Consumable was successfully updated',
     'consumable_error'                  => 'Consumable 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 25a536ec56..ecd15aa2ef 100644
--- a/resources/lang/en-GB/admin/licenses/general.php
+++ b/resources/lang/en-GB/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
     'view'  					=> 'View License',
+    'delete_disabled'           => 'This licence cannot be deleted yet because some seats are still checked out.',
+    'bulk'                      =>
+        [
+            '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.',
+                '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',
+                'success'           => 'Licence successfully checked in! | All licences were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk licence checkout in licence GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Check Out All Seats',
+                'modal'                 => 'This action will check out one seat to the first available user. | This action will check out 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 licence checked out to them, and the Auto-Assign Licence property is enabled on their user account.',
+                'enabled_tooltip'   => 'Check out ALL seats (or as many as are available) to ALL users',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
+                'success'           => 'Licence successfully checked out! | :count licences were successfully checked out!',
+                'error_no_seats'    => 'There are no remaining seats left for this licence.',
+                'warn_not_enough_seats'    => ':count users were assigned this licence, but we ran out of available licence seats.',
+                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this licence assigned to them.',
+                'log_msg'           => 'Checked out via bulk licence check out in licence GUI',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/en-GB/admin/licenses/message.php b/resources/lang/en-GB/admin/licenses/message.php
index dd7e54dea4..2d0965a7af 100644
--- a/resources/lang/en-GB/admin/licenses/message.php
+++ b/resources/lang/en-GB/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Licence does not exist or you do not have permission to view it.',
     'user_does_not_exist' => 'User does not exist.',
     '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.',
diff --git a/resources/lang/en-GB/admin/manufacturers/message.php b/resources/lang/en-GB/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/en-GB/admin/manufacturers/message.php
+++ b/resources/lang/en-GB/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/en-GB/admin/manufacturers/table.php b/resources/lang/en-GB/admin/manufacturers/table.php
index 418ddea1eb..e51e8bd9cf 100644
--- a/resources/lang/en-GB/admin/manufacturers/table.php
+++ b/resources/lang/en-GB/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/en-GB/admin/models/general.php b/resources/lang/en-GB/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/en-GB/admin/models/general.php
+++ b/resources/lang/en-GB/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/en-GB/admin/models/message.php b/resources/lang/en-GB/admin/models/message.php
index e3b29d5b4b..1ef2426b91 100644
--- a/resources/lang/en-GB/admin/models/message.php
+++ b/resources/lang/en-GB/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models 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' 		    => ':success_count model(s) 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/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 46649db613..8b4e518b2c 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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'			=> 'Alerts Enabled',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack Settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -216,8 +224,8 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name &amp; Skin',
+    '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',
     'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
@@ -299,9 +307,9 @@ return [
     '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 &amp; Currency Display',
+    'localization_help' => 'Language, Date & Currency Display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts &amp; Audit Settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/en-GB/admin/settings/message.php b/resources/lang/en-GB/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/en-GB/admin/settings/message.php
+++ b/resources/lang/en-GB/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/en-GB/admin/users/general.php b/resources/lang/en-GB/admin/users/general.php
index daa568e8bf..e195e2d52a 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.',
+    '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',
     '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/en-GB/admin/users/message.php b/resources/lang/en-GB/admin/users/message.php
index 247a1b321e..4ca5c37031 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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
@@ -62,6 +62,6 @@ return array(
 
     'inventorynotification' => array(
         'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'success' => 'The user has been notified of their current inventory.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/en-GB/admin/users/table.php b/resources/lang/en-GB/admin/users/table.php
index e318d51545..859c879262 100644
--- a/resources/lang/en-GB/admin/users/table.php
+++ b/resources/lang/en-GB/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
     '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.',
+    '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',
diff --git a/resources/lang/en-GB/auth/general.php b/resources/lang/en-GB/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/en-GB/auth/general.php
+++ b/resources/lang/en-GB/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 5e5c3b846a..5fc07d2c20 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Check In / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Cancel',
     'categories'			=> 'Categories',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -282,8 +295,8 @@ return [
     '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!',
+    'file_upload_success'   => 'File upload successful.',
+    'no_files_uploaded'     => 'File upload successful.',
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
@@ -337,7 +350,7 @@ return [
     'invalid_category'      => 'Invalid category',
     'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
     '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you 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'       => '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 licences now!',
     'new_asset'             => 'New Asset',
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
@@ -372,21 +385,68 @@ return [
     '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_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 ',
-    'na_no_purchase_date'   => 'N/A - No purchase date provided',
+    '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'   => '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!',
+    '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'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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 Licences',
+    '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 have licences assigned via the bulk-assign license UI or CLI tools. (For example, you might not want contractors to be auto-assigned a licence you would provide to only staff members. You can still individually assign licences to those users, but they will not be included in the Checkout Licence to All Users functions.)',
+    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the licence UI or CLI tools.',
+    'modal_confirm_generic'      => 'Are you sure?',
+    'cannot_be_deleted'      => 'This item cannot be deleted',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en-GB/localizations.php b/resources/lang/en-GB/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/en-GB/localizations.php
+++ b/resources/lang/en-GB/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/en-GB/mail.php b/resources/lang/en-GB/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/en-GB/mail.php
+++ b/resources/lang/en-GB/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/en-GB/validation.php
+++ b/resources/lang/en-GB/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/en-ID/admin/accessories/general.php b/resources/lang/en-ID/admin/accessories/general.php
index 0dfa64429c..f8a41e2d4c 100644
--- a/resources/lang/en-ID/admin/accessories/general.php
+++ b/resources/lang/en-ID/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Perbarui Aksesoris',
     'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal"> standar primer EULA </a> gantinya.',
     'use_default_eula_disabled'			=> '<del> Gunakan EULA standar utama sebagai gantinya. </ del> Tidak ada standar utama EULA diatur. Silakan menambahkan satu di Settings.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/en-ID/admin/accessories/message.php b/resources/lang/en-ID/admin/accessories/message.php
index ccd4ad1ea6..0d1b685396 100644
--- a/resources/lang/en-ID/admin/accessories/message.php
+++ b/resources/lang/en-ID/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Aksesori itu tidak ada.',
     'assoc_users'	 => 'Aksesori saat ini memiliki :count item untuk pengguna. Silahkan cek di aksesoris dan dan coba lagi. ',
 
     'create' => array(
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/en-ID/admin/asset_maintenances/form.php b/resources/lang/en-ID/admin/asset_maintenances/form.php
index 095d05bd6e..8231c162b1 100644
--- a/resources/lang/en-ID/admin/asset_maintenances/form.php
+++ b/resources/lang/en-ID/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Jenis Pemeliharaan Aset',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Judul',
-        'start_date'             => 'Tanggal Mulai',
-        'completion_date'        => 'Tanggal selesai',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Biaya',
         'is_warranty'            => 'Peningkatan garansi',
-        'asset_maintenance_time' => 'Waktu Maintenance aset (dalam hari)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Catatan',
-        'update'                 => 'Update Maintenance Aset',
-        'create'                 => 'Erstellen'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/en-ID/admin/categories/message.php b/resources/lang/en-ID/admin/categories/message.php
index e90c0d8a58..a3b42e7d86 100644
--- a/resources/lang/en-ID/admin/categories/message.php
+++ b/resources/lang/en-ID/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategori gagal diupdate, silahkan coba lagi',
-        'success' => 'Kategori berhasil diupdate.'
+        'success' => 'Kategori berhasil diupdate.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/en-ID/admin/components/general.php b/resources/lang/en-ID/admin/components/general.php
index fe356c0f41..333100a348 100644
--- a/resources/lang/en-ID/admin/components/general.php
+++ b/resources/lang/en-ID/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Sisa',
     'total' 			                 => 'Total',
     'update'                            => 'Perbaharui Komponen',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/en-ID/admin/components/message.php b/resources/lang/en-ID/admin/components/message.php
index 1cf5256a01..073e1b8a21 100644
--- a/resources/lang/en-ID/admin/components/message.php
+++ b/resources/lang/en-ID/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponen tidak bisa dikeluarkan, silahkan coba kembali',
         'success' 		=> 'Komponen berhasil dikeluarkan.',
-        'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.'
+        'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en-ID/admin/consumables/message.php b/resources/lang/en-ID/admin/consumables/message.php
index d1d176ad56..61574c9cc2 100644
--- a/resources/lang/en-ID/admin/consumables/message.php
+++ b/resources/lang/en-ID/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Consumable tidak diperiksa, silakan coba lagi',
         'success' 		=> 'Consumable berhasil diperiksa.',
-        'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.'
+        'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en-ID/admin/custom_fields/general.php b/resources/lang/en-ID/admin/custom_fields/general.php
index d3fe02fa88..78d92f6e85 100644
--- a/resources/lang/en-ID/admin/custom_fields/general.php
+++ b/resources/lang/en-ID/admin/custom_fields/general.php
@@ -28,6 +28,9 @@ return [
     'used_by_models'   		    => 'Digunakan oleh Model',
     'order'   		            => 'Pesanan',
     'create_fieldset'         => 'Atur bidang baru',
+    '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'            => 'Kostum field baru',
     'create_field_title' => 'Create a new custom field',
@@ -47,4 +50,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/en-ID/admin/groups/message.php b/resources/lang/en-ID/admin/groups/message.php
index 8c399400ab..a4176a1791 100644
--- a/resources/lang/en-ID/admin/groups/message.php
+++ b/resources/lang/en-ID/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grup sudah ada!',
-    'group_not_found'     => 'Group [:id] tidak ada.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Nama field diperlukan',
 
     'success' => array(
diff --git a/resources/lang/en-ID/admin/hardware/form.php b/resources/lang/en-ID/admin/hardware/form.php
index 344a8dd6f4..3aa0d44448 100644
--- a/resources/lang/en-ID/admin/hardware/form.php
+++ b/resources/lang/en-ID/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Konfirmasi hapus semua aset',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Tinjau aset untuk penghapusan massal di bawah ini. Setelah dihapus, aset ini dapat dipulihkan, namun tidak akan dikaitkan lagi dengan pengguna yang saat ini mereka tentukan.',
+  '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'	=> 'Anda akan menghapus :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Perbarui Aset secara massal',
     'bulk_update_help'	=> 'Formulir ini memungkinkan Anda untuk memperbarui beberapa aset sekaligus. Hanya mengisi kolom yang Anda butuhkan untuk mengubah. Setiap bidang dibiarkan kosong tidak berubah. ',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php
index 550d2d7c1f..363fbd506d 100644
--- a/resources/lang/en-ID/admin/hardware/general.php
+++ b/resources/lang/en-ID/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Aset ini telah dihapus.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Permintaan',
     'requested'				    => 'Diminta',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Kembalikan Aset',
     'pending'  					=> 'Tertunda',
     'undeployable'  			=> 'Tidak dapat disebarkan',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php
index a952b4ccf7..beefe7a850 100644
--- a/resources/lang/en-ID/admin/hardware/message.php
+++ b/resources/lang/en-ID/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Aset tidak dikembalikan, coba lagi',
         'success' 		=> 'Aset Berhasil dikembalikan.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'File Anda telah diimpor',
         'file_delete_success'   => 'File anda telah berhasil dihapus',
         'file_delete_error'      => 'File tidak dapat dihapus',
+        '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',
     ],
 
 
diff --git a/resources/lang/en-ID/admin/hardware/table.php b/resources/lang/en-ID/admin/hardware/table.php
index 888b03487c..553b6a1d24 100644
--- a/resources/lang/en-ID/admin/hardware/table.php
+++ b/resources/lang/en-ID/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Masuk/keluar',
     'checkout_date' => 'Tanggal Check out',
     'checkoutto' 	=> 'Memeriksa',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Unduh CSV',
diff --git a/resources/lang/en-ID/admin/licenses/general.php b/resources/lang/en-ID/admin/licenses/general.php
index b1abe81765..7365f2abc0 100644
--- a/resources/lang/en-ID/admin/licenses/general.php
+++ b/resources/lang/en-ID/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Tentang Lisensi',
-    'about_licenses'                  => 'Lisensi digunakan untuk melacak perangkat lunak. Mereka memiliki sejumlah seat tertentu yang bisa diperiksa ke individu',
+    'about_licenses_title'      => 'Tentang Lisensi',
+    'about_licenses'            => 'Lisensi digunakan untuk melacak perangkat lunak. Mereka memiliki sejumlah seat tertentu yang bisa diperiksa ke individu',
     'checkin'  					=> 'Daftar lisensi seat',
     'checkout_history'  		=> 'Periksa riwayat',
     'checkout'  				=> 'Periksa lisensi seat',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Lisensi perangkat lunak',
     'user'  					=> 'Pengguna',
     'view'  					=> 'Lihat lisensi',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/en-ID/admin/manufacturers/message.php b/resources/lang/en-ID/admin/manufacturers/message.php
index 80fc1fa8bf..b1d69901c4 100644
--- a/resources/lang/en-ID/admin/manufacturers/message.php
+++ b/resources/lang/en-ID/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Produsen tidak ada.',
     'assoc_users'	 => 'Produsen ini saat ini terkait dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda agar tidak lagi mereferensikan produsen ini dan coba lagi. ',
 
diff --git a/resources/lang/en-ID/admin/manufacturers/table.php b/resources/lang/en-ID/admin/manufacturers/table.php
index 6920c5459e..1e730b49dc 100644
--- a/resources/lang/en-ID/admin/manufacturers/table.php
+++ b/resources/lang/en-ID/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email pendukung',
     'support_phone'   		=> 'Telepon pendukung',
     'support_url'   		=> 'URL pendukung',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Perbarui produsen',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/en-ID/admin/models/general.php b/resources/lang/en-ID/admin/models/general.php
index 6d2af65653..d083b8c5fe 100644
--- a/resources/lang/en-ID/admin/models/general.php
+++ b/resources/lang/en-ID/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Anda akan menghapus: model aset model_count.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Kembalikan model',
     'requestable'               => 'Pengguna dapat meminta model ini',
 	'show_mac_address'			      => 'Tampilkan bidang alamat MAC dalam aset model ini',
diff --git a/resources/lang/en-ID/admin/models/message.php b/resources/lang/en-ID/admin/models/message.php
index 995b58d058..995e452e2c 100644
--- a/resources/lang/en-ID/admin/models/message.php
+++ b/resources/lang/en-ID/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model tidak ada.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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 saat ini dikaitkan dengan satu atau lebih aset dan tidak dapat dihapus. Harap hapus asetnya, lalu coba hapus lagi. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model tidak diperbarui, silahkan dicoba lagi',
-        'success' => 'Model berhasil diperbarui.'
+        'success' => 'Model berhasil diperbarui.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Tidak ada bidang yang berubah, jadi tidak ada yang diperbarui.',
-        'success' 		=> 'Model diperbarui.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Tidak ada model yang dipilih, jadi tidak ada yang dihapus.',
-        'success' 		    => ':success_count model(s) dihapus!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(s) telah dihapus, namun: fail_count tidak dapat dihapus karena mereka masih memiliki aset yang terkait dengannya.'
     ),
 
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 44d1c4f45c..184a32f4f5 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Ini adalah server aktif direktori',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Peringatan Email Diaktifkan',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Pengaturan 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Masukkan nama pengguna dan kata sandi LDAP yang sah dari DN dasar yang anda tentukan di atas untuk menguji apakah proses masuk LDAP anda dikonfigurasi dengan benar. ANDA HARUS MENYIMPAN PENGATURAN LDAP YANG ANDA PERBARUI PERTAMA.',
     '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',
@@ -197,16 +200,21 @@ 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',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Nama Bot Slack',
-    'slack_channel'             => 'Saluran Slack',
-    'slack_endpoint'            => 'Titik Akhir Slack',
-    'slack_integration'         => 'Pengaturan Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Setelah Anda menyimpan informasi Slack Anda, tombol tes akan muncul.',
-    'slack_test_help'           => 'Uji apakah integrasi Slack Anda dikonfigurasi dengan benar. ANDA HARUS MENYIMPAN SETELAN PENGATURAN KESELAMATAN ANDA PERTAMA.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> 'Versi Snipe-IT',
     'support_footer'            => 'Link footer pendukung ',
     'support_footer_help'       => 'Tentukan siapa yang melihat tautan ke informasi pendukung dan panduan pengguna Snipe-IT',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/en-ID/admin/settings/message.php b/resources/lang/en-ID/admin/settings/message.php
index 4ee2c6480e..245317714b 100644
--- a/resources/lang/en-ID/admin/settings/message.php
+++ b/resources/lang/en-ID/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/en-ID/admin/users/general.php b/resources/lang/en-ID/admin/users/general.php
index 65808a9103..e2d68f50b9 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.',
+    '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',
     'send_email_help'   => 'Anda harus menyediakan sebuah alamat email untuk pengguna ini untuk dikirimkan kredesial pada mereka. Kredensial penyuratan/email hanya dapat dilakukan pada pembuatan pengguna. Kata sandi disimpan dalam sebuah hash satu-arah dan tidak dapat diterima lagi setelah disimpan.',
     'view_user'         => 'Lihat pengguna :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/en-ID/admin/users/message.php b/resources/lang/en-ID/admin/users/message.php
index 1182464314..8908970755 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 [:id] tidak ada.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Bidang masuk diperlukan',
     'user_password_required'    => 'Kata sandi diperlukan.',
     'insufficient_permissions'  => 'Izin tidak cukup.',
diff --git a/resources/lang/en-ID/auth/general.php b/resources/lang/en-ID/auth/general.php
index 78ff6893fd..350b085378 100644
--- a/resources/lang/en-ID/auth/general.php
+++ b/resources/lang/en-ID/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Ingatkan saya',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 72fcf7f364..8223b57ea1 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Aksesoris',
     'activated'			    => 'Diaktifkan',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Aksesoris',
     'accessory_report'		=> 'Laporan Aksesori',
     'action'                => 'Langkah',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Aset',
+    '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'         => 'Hapus Avatar',
     'avatar_upload'         => 'Unggah Avatar',
     'back'      			=> 'Kembali',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Batal',
     'categories'			=> 'Kategori',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Dihapus',
     'delete_seats'  		=> 'Tempat dihapus',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Impor',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Pemeliharaan Aset',
     'item'  				=> 'Item',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Tidak ada hak akses!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Bahasa',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Permintaan dibatalkan',
     'save'  				=> 'Simpan',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Pilih',
     'select_all'            => 'Select All',
     'search'				=> 'Cari',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Tanda tangan',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Beberapa fitur dinonaktifkan untuk penginstalan ini.',
     'site_name'				=> 'Nama Situs',
     'state'  				=> 'Negara',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Apakah anda yakin ingin menghapus',
     'submit'				=> 'Kirim',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Tampilan Waktu dan Tanggal',
     'total_assets'			=> 'total aset',
     'total_licenses'		=> 'total lisensi',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en-ID/help.php b/resources/lang/en-ID/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/en-ID/help.php
+++ b/resources/lang/en-ID/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/en-ID/localizations.php b/resources/lang/en-ID/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/en-ID/localizations.php
+++ b/resources/lang/en-ID/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/en-ID/mail.php b/resources/lang/en-ID/mail.php
index 2a31bfd40f..5b1aca8b92 100644
--- a/resources/lang/en-ID/mail.php
+++ b/resources/lang/en-ID/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login ke instalasi Snipe-IT baru Anda dengan menggunakan kredensial di bawah ini:',
     'login' => 'Masuk:',
     'Low_Inventory_Report' => 'Laporan Inventaris Rendah',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'QTY minimum',
     'name' => 'Nama',
     'new_item_checked' => 'Item baru sudah diperiksa atas nama anda, rinciannya dibawah ini.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Kredensial Snipe-IT Anda',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php
index f44b950f13..193c8f4094 100644
--- a/resources/lang/en-ID/validation.php
+++ b/resources/lang/en-ID/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribut :setidaknya harus memiliki :item min.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Yang dipilih: atribut tidak valid.',
     'numeric'              => 'The: atribut harus berupa angka.',
     'present'              => 'Bidang atribut harus ada.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Kata sandi anda saat ini salah',
         'dumbpwd'          => 'Kata sandi itu terlalu umum.',
         'statuslabel_type' => 'Anda harus pilih jenis label status yang valid',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/en/admin/accessories/general.php b/resources/lang/en/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/en/admin/accessories/general.php
+++ b/resources/lang/en/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/en/admin/accessories/message.php b/resources/lang/en/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/en/admin/accessories/message.php
+++ b/resources/lang/en/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/en/admin/components/general.php
+++ b/resources/lang/en/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/en/admin/components/message.php b/resources/lang/en/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/en/admin/components/message.php
+++ b/resources/lang/en/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en/admin/consumables/message.php b/resources/lang/en/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/en/admin/consumables/message.php
+++ b/resources/lang/en/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php
index 92bf240a76..cb4ab3730a 100644
--- a/resources/lang/en/admin/custom_fields/general.php
+++ b/resources/lang/en/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,9 @@ return [
     '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',
+
 ];
diff --git a/resources/lang/en/admin/groups/message.php b/resources/lang/en/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/en/admin/groups/message.php
+++ b/resources/lang/en/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/en/admin/hardware/form.php b/resources/lang/en/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/en/admin/hardware/form.php
+++ b/resources/lang/en/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php
index 67226061b1..dd7d74e433 100644
--- a/resources/lang/en/admin/hardware/general.php
+++ b/resources/lang/en/admin/hardware/general.php
@@ -12,15 +12,19 @@ return [
     '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'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change  requestable status',
+    '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' => '
@@ -40,5 +44,7 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
+    'user_department' => 'User Department',
 ];
diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/en/admin/hardware/message.php
+++ b/resources/lang/en/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/en/admin/hardware/table.php b/resources/lang/en/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/en/admin/hardware/table.php
+++ b/resources/lang/en/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/en/admin/manufacturers/message.php b/resources/lang/en/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/en/admin/manufacturers/message.php
+++ b/resources/lang/en/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/en/admin/manufacturers/table.php b/resources/lang/en/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/en/admin/manufacturers/table.php
+++ b/resources/lang/en/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/en/admin/models/general.php b/resources/lang/en/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/en/admin/models/general.php
+++ b/resources/lang/en/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/en/admin/models/message.php b/resources/lang/en/admin/models/message.php
index e3b29d5b4b..77c2d88b5f 100644
--- a/resources/lang/en/admin/models/message.php
+++ b/resources/lang/en/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 2ae3dba996..9c038a87be 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -86,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -198,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -302,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -323,7 +330,6 @@ return [
     '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',
@@ -341,10 +347,13 @@ return [
     '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>',
     '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. ',
 ];
diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/en/admin/settings/message.php
+++ b/resources/lang/en/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php
index daa568e8bf..b097ccec69 100644
--- a/resources/lang/en/admin/users/general.php
+++ b/resources/lang/en/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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/en/admin/users/message.php b/resources/lang/en/admin/users/message.php
index 247a1b321e..adf26b3229 100644
--- a/resources/lang/en/admin/users/message.php
+++ b/resources/lang/en/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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/en/auth/general.php b/resources/lang/en/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/en/auth/general.php
+++ b/resources/lang/en/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index acc00501ed..4831845721 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,7 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
     'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
@@ -85,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -141,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -150,6 +159,8 @@ return [
     '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',
@@ -220,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -242,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -252,10 +264,9 @@ return [
     'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
-    'sure_to_delete'    => 'Are you sure you wish to delete',
+    'sure_to_delete'        => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -357,8 +368,8 @@ return [
     'notification_warning'   => 'Warning:',
     'notification_info'      => 'Info:',
     'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name:',
-    'asset_name'            => 'Asset Name:',
+    'model_name'            => 'Model Name',
+    'asset_name'            => 'Asset Name',
     'consumable_information' => 'Consumable Information:',
     'consumable_name'       => 'Consumable Name:',
     'accessory_information' => 'Accessory Information:',
@@ -377,7 +388,8 @@ 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 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',
@@ -387,8 +399,80 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    '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',
+    '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',
+    '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',
+    ],
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en/help.php b/resources/lang/en/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/en/help.php
+++ b/resources/lang/en/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/en/mail.php
+++ b/resources/lang/en/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/es-CO/account/general.php b/resources/lang/es-CO/account/general.php
index 7fc060a849..27118e2f3a 100644
--- a/resources/lang/es-CO/account/general.php
+++ b/resources/lang/es-CO/account/general.php
@@ -1,12 +1,12 @@
 <?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' => 'Claves API personales',
+    'api_key_warning' => 'Al generar un token API, asegúrate de copiarlo inmediatamente ya que
+                    no será visible de nuevo.',
+    'api_base_url' => 'La url base de tu API es:',
     '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.',
+    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
+    'api_reference' => 'Por favor, revise la <a href="https://snipe-it.readme.io/reference" target="_blank">referencia API</a> para
+                    encontrar endpoints específicos de la API y documentación adicional de la API.',
 );
diff --git a/resources/lang/es-CO/admin/accessories/general.php b/resources/lang/es-CO/admin/accessories/general.php
index 619cd9c1e5..1b74602d34 100644
--- a/resources/lang/es-CO/admin/accessories/general.php
+++ b/resources/lang/es-CO/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Actualizar Accesorio',
     'use_default_eula'					=> 'En su lugar, use el <a href="#" data-toggle="modal" data-target="#eulaModal">EULA por defecto</a>.',
     'use_default_eula_disabled'			=> '<del>En su lugar, use el EULA por defecto.</del> No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.',
+    'clone'                             => 'Clonar accesorio',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/es-CO/admin/accessories/message.php b/resources/lang/es-CO/admin/accessories/message.php
index 806ce547a5..6b32dc76a1 100644
--- a/resources/lang/es-CO/admin/accessories/message.php
+++ b/resources/lang/es-CO/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'El accesorio no fue retirado, por favor vuelva a intentarlo',
         'success' 		=> 'Accesorio retirado correctamente.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.'
     ),
 
diff --git a/resources/lang/es-CO/admin/asset_maintenances/form.php b/resources/lang/es-CO/admin/asset_maintenances/form.php
index 22cfe26eda..d8345ceddb 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',
+        'asset_maintenance_type' => 'Tipo de Mantenimiento de Equipo',
         'title'                  => 'Puesto',
-        'start_date'             => 'Comenzado',
-        'completion_date'        => 'Terminado',
+        'start_date'             => 'Fecha de inicio',
+        'completion_date'        => 'Fecha de Terminación',
         'cost'                   => 'Precio',
         'is_warranty'            => 'Mejora de la Garantía',
-        'asset_maintenance_time' => 'Dias',
+        'asset_maintenance_time' => 'Tiempo de Mantenimiento de Equipo (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar',
-        'create'                 => 'Crear'
+        'update'                 => 'Actualizar Mantenimiento de Equipo',
+        'create'                 => 'Crear Mantenimiento de Equipo'
     ];
diff --git a/resources/lang/es-CO/admin/categories/message.php b/resources/lang/es-CO/admin/categories/message.php
index d0536f8f77..91c0367a5d 100644
--- a/resources/lang/es-CO/admin/categories/message.php
+++ b/resources/lang/es-CO/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'La categoría no se actualizó, por favor, inténtalo de nuevo',
-        'success' => 'Categoría actualizada con éxito.'
+        'success' => 'Categoría actualizada con éxito.',
+        'cannot_change_category_type'   => 'No se puede cambiar el tipo de categoría una vez que se ha creado',
     ),
 
     'delete' => array(
diff --git a/resources/lang/es-CO/admin/components/general.php b/resources/lang/es-CO/admin/components/general.php
index 271344e965..3a63af3506 100644
--- a/resources/lang/es-CO/admin/components/general.php
+++ b/resources/lang/es-CO/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
     'update'                            => 'Actualizar Componente',
+    'checkin_limit'            => 'La cantidad de checkins 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 81125e81be..5d7c4720b8 100644
--- a/resources/lang/es-CO/admin/components/message.php
+++ b/resources/lang/es-CO/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-CO/admin/consumables/message.php b/resources/lang/es-CO/admin/consumables/message.php
index c1762b0ff1..716adf4129 100644
--- a/resources/lang/es-CO/admin/consumables/message.php
+++ b/resources/lang/es-CO/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'El consumible no fue retirado, por favor, inténtalo de nuevo',
         'success' 		=> 'Consumible retirado con éxito.',
-        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.'
+        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-CO/admin/custom_fields/general.php b/resources/lang/es-CO/admin/custom_fields/general.php
index 58723a24ec..f987f9f9c5 100644
--- a/resources/lang/es-CO/admin/custom_fields/general.php
+++ b/resources/lang/es-CO/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Usado por Modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo Fieldset',
+    'update_fieldset'         => 'Actualizar grupo de campos',
+    'fieldset_does_not_exist'   => 'Grupo de campos :id no existe',
+    'fieldset_updated'         => 'Grupo de campos actualizado',
     'create_fieldset_title' => 'Crear nuevo grupo de campos',
     'create_field'            => 'Nuevo Campo Personalizado',
     'create_field_title' => 'Crear nuevo campo personalizado',
@@ -44,6 +47,8 @@ return [
     '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',
     'unique' => 'Único',
-    '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' => 'Permitir al usuario ver estos valores en su página Ver Recursos asignados',
+    'display_in_user_view_table' => 'Visible para el usuario',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/es-CO/admin/custom_fields/message.php b/resources/lang/es-CO/admin/custom_fields/message.php
index 49bac21a9c..e436dd4b5c 100644
--- a/resources/lang/es-CO/admin/custom_fields/message.php
+++ b/resources/lang/es-CO/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Error al validar los valores por defecto 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 d56a74ecfb..f31bc3a97d 100644
--- a/resources/lang/es-CO/admin/departments/message.php
+++ b/resources/lang/es-CO/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'El departamento no existe.',
-    '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' => 'Ya existe un departamento con ese nombre en la ubicación de la empresa. 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. ',
     'create' => array(
         'error'   => 'El departamento no fue creado, por favor, inténtalo de nuevo.',
diff --git a/resources/lang/es-CO/admin/groups/message.php b/resources/lang/es-CO/admin/groups/message.php
index 921da8509c..1a3e32d18d 100644
--- a/resources/lang/es-CO/admin/groups/message.php
+++ b/resources/lang/es-CO/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'El grupo ya existe!',
-    'group_not_found'     => 'El grupo[:id] no existe.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'El campo nombre es requerido',
 
     'success' => array(
diff --git a/resources/lang/es-CO/admin/hardware/form.php b/resources/lang/es-CO/admin/hardware/form.php
index 9f712af2a7..dd1ceb1211 100644
--- a/resources/lang/es-CO/admin/hardware/form.php
+++ b/resources/lang/es-CO/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirma la Eliminación Masiva de Equipos',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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'	=> 'Estás a punto de eliminar :asset_count equipos.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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 activo.|Está a punto de editar las propiedades de :asset_count activos.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_not_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
     'asset_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
-    'processing_spinner' => 'Procesando...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Información opcional',
     'order_details'   => 'Información relacionada con el pedido'
 ];
diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php
index 3333041087..75cd1782c3 100644
--- a/resources/lang/es-CO/admin/hardware/general.php
+++ b/resources/lang/es-CO/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Este activo ha sido borrado.',
     'edit'  					=> 'Editar Equipo',
     'model_deleted'  			=> 'El modelo de este activo ha sido borrado. Debe restaurar el modelo antes de restaurar o crear el activo.',
+    'model_invalid'             => 'El modelo de este activo no es válido.',
+    'model_invalid_fix'         => 'El Activo debe ser editado para corregir esto antes de intentar retirarlo o asignarlo.',
     'requestable'               => 'Puede Solicitarse',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No solicitable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restaurar equipo',
     'pending'  					=> 'Equipos Pendiente',
     'undeployable'  			=> 'No desplegable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Ver Equipo',
     'csv_error' => 'Tiene un error en su archivo CSV:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     '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'
+    'custom_export' => 'Exportación personalizada',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de Garantía para :manufacturer',
 ];
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index c0fbd1ec32..3c91f8b5e5 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/resources/lang/es-CO/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'El equipo no fue restaurado, por favor intente nuevamente',
         'success' 		=> 'Equipo restaurado correctamente.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Tu archivo ha sido importado',
         'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
         'file_delete_error'      => 'No pudimos eliminar tu archivo',
+        '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',
     ],
 
 
diff --git a/resources/lang/es-CO/admin/hardware/table.php b/resources/lang/es-CO/admin/hardware/table.php
index 029f7da5da..dd675b03e0 100644
--- a/resources/lang/es-CO/admin/hardware/table.php
+++ b/resources/lang/es-CO/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Operación',
     'checkout_date' => 'Fecha de devolución',
     'checkoutto' 	=> 'Asignado a',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Valor Actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
diff --git a/resources/lang/es-CO/admin/licenses/general.php b/resources/lang/es-CO/admin/licenses/general.php
index 8a5d6db90e..ed7d6408e3 100644
--- a/resources/lang/es-CO/admin/licenses/general.php
+++ b/resources/lang/es-CO/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licencias Software',
     'user'  					=> 'Usuario',
     'view'  					=> 'Ver Licencias',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/es-CO/admin/licenses/message.php b/resources/lang/es-CO/admin/licenses/message.php
index 182b6ce2e1..869a00dd84 100644
--- a/resources/lang/es-CO/admin/licenses/message.php
+++ b/resources/lang/es-CO/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
     'user_does_not_exist' => 'Usuario inexistente.',
     'asset_does_not_exist' 	=> 'El equipo que intentas asignar a esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El equipo al que estas intentando asignar esta licenciam, está asignado a un usuario diferente que el de la licencia.',
diff --git a/resources/lang/es-CO/admin/locations/message.php b/resources/lang/es-CO/admin/locations/message.php
index f6d51df14e..49a4e627aa 100644
--- a/resources/lang/es-CO/admin/locations/message.php
+++ b/resources/lang/es-CO/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'La ubicación esta asociada con al menos un usuario, por lo que no puede eliminarse. Actualiza la información de tus usuarios para que no la usen, e inténtalo de nuevo. ',
     'assoc_assets'	 => 'La ubicación esta asociada con al menos un equipo, por lo que no puede eliminarse. Por favor actualiza la información de tus equipos para que no la usen, e inténtalo de nuevo. ',
     'assoc_child_loc'	 => 'La ubicación esta asociada con al menos una ubicación hija, por lo que no puede eliminarse. Actualiza la información de tus ubicaciones para desasociarlas, e inténtalo de nuevo. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Activos asignados',
+    'current_location' => 'Ubicación Actual',
 
 
     'create' => array(
diff --git a/resources/lang/es-CO/admin/manufacturers/message.php b/resources/lang/es-CO/admin/manufacturers/message.php
index 342dd1e565..f86e446410 100644
--- a/resources/lang/es-CO/admin/manufacturers/message.php
+++ b/resources/lang/es-CO/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'El fabricante no existe.',
     'assoc_users'	 => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado',
 
diff --git a/resources/lang/es-CO/admin/manufacturers/table.php b/resources/lang/es-CO/admin/manufacturers/table.php
index 972d33b71b..ed1956383c 100644
--- a/resources/lang/es-CO/admin/manufacturers/table.php
+++ b/resources/lang/es-CO/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email de soporte',
     'support_phone'   		=> 'Teléfono de soporte',
     'support_url'   		=> 'URL de soporte',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Actualizar Fabricante',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/es-CO/admin/models/general.php b/resources/lang/es-CO/admin/models/general.php
index 2750cbcd51..02a4b68d6a 100644
--- a/resources/lang/es-CO/admin/models/general.php
+++ b/resources/lang/es-CO/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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.',
-    'bulk_delete_warn'          => 'Estás a punto de eliminar: los modelos de activo model_count.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     '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',
diff --git a/resources/lang/es-CO/admin/models/message.php b/resources/lang/es-CO/admin/models/message.php
index bc244948d0..b38b9d1cf3 100644
--- a/resources/lang/es-CO/admin/models/message.php
+++ b/resources/lang/es-CO/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modelo inexistente.',
+    'no_association' => 'NINGUN MODELO ASOCIADO.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'El modelo no pudo ser actualizado, por favor inténtalo de nuevo',
-        'success' => 'El modelo fue actualizado exitosamente.'
+        'success' => 'El modelo fue actualizado exitosamente.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ningún campo ha cambiado, no hay nada que actualizar.',
-        'success' 		=> 'Los modelos fueron actualizados.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, no se eliminó nada.',
-        'success' 		    => '¡:success_count modelo(s) eliminado(s)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         '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.'
     ),
 
diff --git a/resources/lang/es-CO/admin/reports/general.php b/resources/lang/es-CO/admin/reports/general.php
index 19efc0b08a..55cc3c2853 100644
--- a/resources/lang/es-CO/admin/reports/general.php
+++ b/resources/lang/es-CO/admin/reports/general.php
@@ -2,9 +2,9 @@
 
 return [
     'info'   => 'Selecciona las opciones de tu informe de Equipos.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'deleted_user' => 'Usuario eliminado',
+    'send_reminder' => 'Enviar recordatorio',
+    'reminder_sent' => 'Recordatorio enviado',
+    'acceptance_deleted' => 'Solicitud de aceptación eliminada',
+    'acceptance_request' => 'Solicitud de aceptación'
 ];
\ No newline at end of file
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index ed9cc1ea55..416af4a84b 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -10,10 +10,10 @@ return [
     'admin_cc_email'            => 'Email CC',
     'admin_cc_email_help'       => 'Si deseas enviar una notificación por correo electrónico de las asignaciones de activos que se envían a los usuarios a una cuenta adicional, ingrésela aquí. De lo contrario, deja este campo en blanco.',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alerts'                	=> 'Alertas',
+    'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    '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',
@@ -21,20 +21,20 @@ return [
     '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',
     'audit_interval'            => 'Intervalo de auditoría',
-    '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'       => 'Si se le exige auditoría física regular de sus activos, ingrese 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 próxima fecha de auditoría.',
     'audit_warning_days'        => 'Umbral de advertencia de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación debemos advertirle cuándo se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generar etiquetas de activos autoincrementales',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Habilitar etiquetas de activos autoincrementales primero para establecer esto',
     'backups'					=> 'Copias de seguridad',
-    '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'              => 'Crear, descargar y restaurar copias de seguridad ',
+    'backups_restoring'         => 'Restaurar desde copia de seguridad',
+    'backups_upload'            => 'Cargar Copia de Seguridad',
+    'backups_path'              => 'Las copias de seguridad en el servidor se almacenan en <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'         => 'Todos los usuarios existentes, incluido usted, se cerrará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',
     '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.)',
@@ -57,7 +57,7 @@ return [
     '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. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Habilitado',
     'eula_settings'				=> 'Configuración EULA',
     'eula_markdown'				=> 'Este EULS permite <a href="https://help.github.com/articles/github-flavored-markdown/">makrdown estilo Github</a>.',
     'favicon'                   => 'Favicon',
@@ -66,8 +66,8 @@ return [
     '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' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_keywords' => 'soporte de la empresa, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, eula, tos, tablero, privacidad',
+    'general_settings_help'     => 'EULA por defecto y más',
     'generate_backup'			=> 'Generar Respaldo',
     'header_color'              => 'Color de encabezado',
     'info'                      => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.',
@@ -75,19 +75,22 @@ return [
     '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'        => '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.',
-    'ldap_help'                 => 'LDAP/Active Directory',
-    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    '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_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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_client_tls_key'       => 'Llave TLS del cliente LDAP',
+    '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'      => '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_manager'              => 'LDAP Manager',
+    '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',
@@ -111,20 +114,20 @@ return [
     'ldap_auth_filter_query'    => 'Consulta de autentificación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo 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'  => '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_emp_num'              => 'Número de empleado LDAP',
     'ldap_email'                => 'Email LDAP',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Probar LDAP',
+    'ldap_test_sync'            => 'Prueba de sincronización LDAP',
     'license'                   => 'Licencia de Software',
     'load_remote_text'          => 'Scripts remotos',
     'load_remote_help_text'		=> 'Esta instalación de Snipe-IT puede cargar scripts desde fuera.',
-    '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'                     => '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_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_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
@@ -145,19 +148,19 @@ return [
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por página',
     'php'                       => 'Versión de PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'Información PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
+    '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.',
     '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' => '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' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
+    'pwd_secure_complexity_letters' => 'Requiere al menos una letra',
+    '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_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
@@ -165,8 +168,8 @@ return [
     'qr_help'                   => 'Activa Códigos QR antes para poder ver esto',
     'qr_text'                   => 'Texto Código QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    '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 la entidad',
@@ -178,7 +181,7 @@ return [
     '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_forcelogin_label'     => 'SAML Force Login',
+    '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_slo_label'            => 'Cerrar sesión única SAML',
@@ -186,7 +189,7 @@ return [
     '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_download'             => 'Download Metadata',
+    'saml_download'             => 'Descargar metadatos',
     'setting'                   => 'Parámetro',
     'settings'                  => 'Configuración',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
@@ -197,16 +200,21 @@ return [
     '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.',
     'site_name'                 => 'Nombre del sitio',
+    'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Nombre de bot en Slack',
-    'slack_channel'             => 'Canal en Slack',
-    'slack_endpoint'            => 'Terminal en Slack',
-    'slack_integration'         => 'Configuración Slack',
-    'slack_integration_help'    => 'La integración con Slack es opcional, sin embargo el endpoint y el canal son requeridos si desea usarlo. Para configurar la integración de Slack, primero debe <a href=":slack_link" target="_new" rel="noopener">crear un webhook entrante</a> en su cuenta de Slack. Haga clic en el botón <strong>Probar Integración Slack</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'slack_integration_help_button'    => 'Una vez que haya guardado su información de Slack, aparecerá un botón de prueba.',
-    'slack_test_help'           => 'Pruebe si su integración de Slack está configurada correctamente. Debe Guardar Primero su configuracion Slack Actualizada.',
+    'general_webhook'           => 'Webhook general',
+    '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_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',
     'support_footer'            => 'Enlaces de Soporte de Pie de Página ',
     'support_footer_help'       => 'Especifica quien ve los enlaces de información de Soporte y Manual de Usuarios de Snipe-IT',
@@ -216,8 +224,8 @@ return [
     'update'                    => 'Actualizar Parámetros',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    '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.',
@@ -229,7 +237,7 @@ return [
     'privacy_policy'            => 'Política de Privacidad',
     'privacy_policy_link_help'  => 'Si incluye una URL aquí, un enlace a su Política de Privacidad será incluido al pie de la aplicación y en cualquier correo electrónico que envíe el sistema, de conformidad con la ley GDPR. ',
     'purge'                     => 'Purgar registros eliminados',
-    'purge_deleted'             => 'Purge Deleted ',
+    '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',
@@ -275,51 +283,56 @@ return [
     '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',
     'username_format_help'   => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.',
-    'oauth_title' => 'OAuth API Settings',
+    'oauth_title' => 'Configuración de la API de OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'oauth_help' => 'Configuración de Endpoint Oauth',
+    'asset_tag_title' => 'Actualizar ajustes de etiqueta de activos',
+    'barcode_title' => 'Actualizar ajustes de código de barras',
+    'barcodes' => 'Códigos de barras',
+    'barcodes_help_overview' => 'Ajustes de Código de barras &amp; QR',
+    'barcodes_help' => 'Esto intentará eliminar códigos de barras en caché. Esto normalmente sólo se usaría si la configuración del código de barras ha cambiado, o si la URL de Snipe-IT ha cambiado. Los códigos de barras se regenerarán cuando se acceda a continuación.',
+    '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',
+    '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',
+    'notifications' => 'Notificaciones',
+    'notifications_help' => 'Configuración de alertas por email y auditoría',
+    'asset_tags_help' => 'Incrementando y prefijos',
+    'labels' => 'Etiquetas',
+    'labels_title' => 'Actualizar ajustes de Etiquetas',
+    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
+    'purge' => 'Purgar',
+    'purge_keywords' => 'eliminar permanentemente',
+    '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',
-    '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',
+    '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!',
+    '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 de integración de <i class="fab fa-slack"></i>',
+    '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. ',
+
 ];
diff --git a/resources/lang/es-CO/admin/settings/message.php b/resources/lang/es-CO/admin/settings/message.php
index 89eb5b4553..c11560074e 100644
--- a/resources/lang/es-CO/admin/settings/message.php
+++ b/resources/lang/es-CO/admin/settings/message.php
@@ -11,8 +11,8 @@ return [
         '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.',
-        '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'       => '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?'
     ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
@@ -20,24 +20,25 @@ return [
         'success'               => 'Registros eliminados correctamente purgados.',
     ],
     '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' => 'Enviando correo electrónico...',
+        '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.'
     ],
     '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' => 'Probando conexión LDAP, Binding & Query ...',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros 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!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+    'webhook' => [
+        'sending' => 'Enviando mensaje de prueba de :app...',
+        'success_pt1' => '¡Éxito! Comprueba 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_misc' => 'Algo salió mal. :( ',
     ]
 ];
diff --git a/resources/lang/es-CO/admin/settings/table.php b/resources/lang/es-CO/admin/settings/table.php
index 22db5c84ed..f1fd5c550f 100644
--- a/resources/lang/es-CO/admin/settings/table.php
+++ b/resources/lang/es-CO/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Creado',
+    'size' => 'Tamaño',
 );
diff --git a/resources/lang/es-CO/admin/users/general.php b/resources/lang/es-CO/admin/users/general.php
index 8bf6e3b24e..8638775748 100644
--- a/resources/lang/es-CO/admin/users/general.php
+++ b/resources/lang/es-CO/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     '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.',
     'print_assigned'    => 'Imprimir todos los Asignados',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'Lista de Correos Asignados',
+    'user_notified'     => 'Se ha enviado un correo al usuario con sus artículos actualmente asignados.',
+    '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 enviarle credenciales. Únicamente pueden enviarse 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',
@@ -26,19 +28,27 @@ return [
     'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores.  ',
     'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
     'two_factor_active'   => '2FA activo ',
-    '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' => 'WARNING:',
-    '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',
+    'user_deactivated'  => 'Usuario no puede iniciar sesión',
+    'user_activated'  => '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ás a punto de disponibilizar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de Super Admintradores 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',
+    '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.',
+    'not_remote_label' => 'Este no es un usuario remoto',
+    'vip_label' => 'Usuario VIP',
+    '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' => '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',
+    'next_save_user' => 'Siguiente: Guardar usuario',
+    'all_assigned_list_generation' => 'Generado el:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/es-CO/admin/users/message.php b/resources/lang/es-CO/admin/users/message.php
index 4d533c9bb7..553636ace1 100644
--- a/resources/lang/es-CO/admin/users/message.php
+++ b/resources/lang/es-CO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Ha declinado con éxito este equipo.',
     'bulk_manager_warn'	        => 'Sus usuarios han sido correctamente actualizados, de todos modos la entrada de administrador no fue guardada porque el administrador seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propior administradores. Vuelva a seleccionar los usuarios, excluyendo al administrador.',
     'user_exists'               => 'El Usuario ya existe!',
-    'user_not_found'            => 'Usuario [:id] no existe.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'El campo Usuario es obligatorio',
     'user_password_required'    => 'El password es obligatorio.',
     'insufficient_permissions'  => 'No tiene permiso.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     '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'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
+    'user_has_no_assets_assigned'   => 'Este usuario no tiene ningún activo asignado',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Este usuario no tiene ningún correo electrónico.',
+        'success' => 'El usuario ha sido notificado sobre su inventario actual.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/es-CO/auth/general.php b/resources/lang/es-CO/auth/general.php
index a525440d17..dd8c671d6a 100644
--- a/resources/lang/es-CO/auth/general.php
+++ b/resources/lang/es-CO/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Recordarme',
     'username_help_top'                 => 'Ingresa tu <strong>nombre de usuario</strong> para enviar un enlace de restablecimiento de contraseña.',
     'username_help_bottom'          => 'Tu nombre de usuario y correo electrónico <em>pueden</em> ser el mismo, pero puede que no lo sean, dependiendo de tu configuración. Si no recuerdas tu nombre de usuario, ponte en contacto con el administrador. <br><br><strong>A los nombres de usuario que no tengan un correo electrónico asociado, no se les enviará link de cambio de contraseña.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/es-CO/button.php b/resources/lang/es-CO/button.php
index 3c47e5cda8..10cbfec787 100644
--- a/resources/lang/es-CO/button.php
+++ b/resources/lang/es-CO/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Acciones',
     'add'    	                => 'Agregar nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Checkin Todos / Eliminar Usuario',
     'delete'  	                => 'Borrar',
     'edit'    	                => 'Editar',
     'restore' 	                => 'Restaurar',
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 01e9106479..058f424e73 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
+    'accepted_date'         => 'Fecha aceptada',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Reporte de Accesorios',
     'action'                => 'Acción',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrador',
     'add_seats'             => 'Sitios añadidos',
-    'age'                   => "Age",
+    'age'                   => "Edad",
     'all_assets'			=> 'Todos los activos',
     'all'       			=> 'Todo',
     'archived'              => 'Archivado',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditoría',
     'audit_report'			=> 'Registro de auditoría',
     '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',
     'assigned_to'           => 'Asignado a :name',
+    'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Eliminar Avatar',
     'avatar_upload'         => 'Subir Avatar',
     'back'      			=> 'Atrás',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Edición masiva',
     'bulk_delete'           => 'Borrado masivo',
     'bulk_actions'          => 'Acciones masivas',
-    'bulk_checkin_delete'   => 'Registro de entrada masivo de activos de usuarios',
+    'bulk_checkin_delete'   => 'Checkin en masa / Eliminar usuarios',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Este dispositivo es propiedad del usuario',
     'bystatus'              => 'por Estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
@@ -79,10 +88,11 @@ return [
     'days'      			=> 'días',
     'days_to_next_audit'    => 'Días a la próxima auditoría',
     'date'					=> 'Fecha Compra',
-    'debug_warning'         => '¡Advertencia!',
+    'debug_warning'         => '¡Alerta!',
     '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>.',
-    'delete'  				=> 'Borrar',
+    'delete'  				=> 'Eliminar',
     'delete_confirm'  		=> '¿Estás seguro de eliminar :item?',
+    'delete_confirm_no_undo' => '¿Está seguro que desea eliminar :item? Esto no se puede deshacer.',
     'deleted'  				=> 'Borrado',
     'delete_seats'  		=> 'Asientos eliminados',
     'deletion_failed'       => 'Error al eliminar',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif y svg. 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 mimetype de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Mantenimientos de Equipo',
     'item'  				=> 'Item',
     'item_name'             => 'Nombre del ítem',
+    'import_file'  			=> 'importar archivo CSV',
+    'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
     'kits'       			=> 'Equipamiento predefinido',
     'language'				=> 'Lenguaje',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Activos solicitados',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
+    'select_var'            => 'Seleccionar :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'Se enviará un mensaje de slack',
-    'slack_test_msg'        => '¡Parece que tu integración de Slack con Snipe-IT está funcionando!',
+    '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',
     'state'  				=> 'Provincia',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '¿Está seguro que desea eliminar',
     'submit'				=> 'Enviar',
     'target'                => 'Objetivo',
-    'toggle_navigation'     => 'Alternar navegación',
     'time_and_date_display' => 'Hora y fecha',
     'total_assets'			=> 'Equipos',
     'total_licenses'		=> 'licencias totales',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Si',
     'zip'  					=> 'Códio Postal',
     'noimage'				=> 'Imagen no subida o imagen no encontrada.',
-    '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'   => 'El archivo solicitado no existe en el servidor.',
+    'file_upload_success'   => '¡Archivo cargado correctamente!',
+    'no_files_uploaded'     => '¡Archivo cargado correctamente!',
     'token_expired'         => 'Su sesión ha expirado, Intente otra ves.',
     'login_enabled'         => 'Inicio de sesión habilitado',
     'audit_due'             => 'Auditoría pendiente',
@@ -375,7 +388,8 @@ return [
     '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 Administrador.',
     '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 ',
+    'set_to_null'           => 'Eliminar valores para este activo|Eliminar valores para todos los :asset_count activos ',
+    '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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Fecha de inicio',
     'end_date'            => 'Fecha de fin',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
-    'placeholder_kit'       => 'Seleccione un kit'
+    'placeholder_kit'       => 'Seleccione un kit',
+    'file_not_found'        => 'No se encontró el archivo',
+    'preview_not_available' => '(sin vista previa)',
+    'setup'                 => 'Configuración',
+    'pre_flight'            => 'Preparación',
+    'skip_to_main_content'  => 'Saltar 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 en el que desea fusionar a los demás a continuación, y los activos asociados, licencias, etc se moverá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.',
+    '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',
+    'update_existing_values'    => '¿Actualizar valores existentes?',
+    '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'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
+    'back_before_importing'     => '¿Copia de seguridad antes de importar?',
+    'csv_header_field'          => 'Campo de cabecera CSV',
+    'import_field'              => 'Importar campo',
+    'sample_value'              => 'Valor de ejemplo',
+    'no_headers'                => 'No se encontraron columnas',
+    'error_in_import_file'      => 'Hubo un error leyendo el archivo CSV: :error',
+    'percent_complete'          => ':percent % Completado',
+    'errors_importing'          => 'Se han producido algunos errores al importar: ',
+    'warning'                   => 'ADVERTENCIA: :warning',
+    'success_redirecting'       => '"Éxito... Redirigiendo.',
+    'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Siguiente: Crear usuario',
+    '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' => 'Confirmar',
+    'autoassign_licenses' => 'Auto-Asignar licencias',
+    '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'      => '¿Estás seguro?',
+    'cannot_be_deleted'      => 'Este articulo no se puede eliminar',
+    'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es-CO/help.php b/resources/lang/es-CO/help.php
index 9c71dfef87..e083c23aa4 100644
--- a/resources/lang/es-CO/help.php
+++ b/resources/lang/es-CO/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Marcando esta casilla podrá editar el registro de activos reflejando su nueva ubicación. Dejándola sin marcar simplemente anotaremos la ubicación en el registro de auditoria.<br><br>Tenga en cuenta que si este activo ha si requerido, no se podrá cambiara la ubicación de la persona, Activo o ubicación en la que esta requerido.',
+    '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' => '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.',
 
diff --git a/resources/lang/es-CO/localizations.php b/resources/lang/es-CO/localizations.php
index be2c321861..63accfb143 100644
--- a/resources/lang/es-CO/localizations.php
+++ b/resources/lang/es-CO/localizations.php
@@ -2,314 +2,315 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Seleccione un idioma',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Inglés, EEUU',
+        'en-GB'=> 'Inglés, Reino Unido',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
+        'ar'=> 'Árabe',
+        'bg'=> 'Búlgaro',
+        'zh-CN'=> 'Chino simplificado',
+        'zh-TW'=> 'Chino tradicional',
+        'hr'=> 'Croata',
+        'cs'=> 'Checo',
+        'da'=> 'Danés',
+        'nl'=> 'Holandés',
+        'en-ID'=> 'inglés de Indonesia',
+        'et'=> 'Estonio',
         'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
-        'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'fi'=> 'Finlandés',
+        'fr'=> 'Francés',
+        'de'=> 'Alemán',
+        'de-i'=> 'Alemán (informal)',
+        'el'=> 'Griego',
+        'he'=> 'Hebreo',
+        'hu'=> 'Húngaro',
+        'is' => 'Islandés',
+        'id'=> 'Indonesio',
+        'ga-IE'=> 'Irlandés',
+        'it'=> 'Italiano',
+        'ja'=> 'Japonés',
+        'ko'=> 'Coreano',
+        'lv'=>'Letón',
+        'lt'=> 'Lituano',
+        'mk'=> 'Macedonio',
+        'ms'=> 'Malayo',
+        'mi'=> 'Maorí',
+        'mn'=> 'Mongol',
+        'no'=> 'Noruego',
+        'fa'=> 'Persa',
+        'pl'=> 'Polaco',
+        'pt-PT'=> 'Portugués',
+        'pt-BR'=> 'Portugués, Brasileño',
+        'ro'=> 'Rumano',
+        'ru'=> 'Ruso',
+        'sr-CS' => 'Serbio (Latino)',
+        'sl'=> 'Esloveno',
+        'es-ES'=> 'Español',
+        'es-CO'=> 'Español, Colombia',
+        'es-MX'=> 'Español, México',
+        'es-VE'=> 'Español, Venezuela',
+        'sv-SE'=> 'Sueco',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'th'=> 'Tailandés',
+        'tr'=> 'Turco',
+        'uk'=> 'Ucraniano',
+        'vi'=> 'Vietnamita',
+        'cy'=> 'Galés',
+        'zu'=> 'Zulú',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Seleccione un país',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Isla de Ascensión',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AE'=>'Emiratos Árabes Unidos',
+        'AF'=>'Afganistán',
+        'AG'=>'Antigua y Barbuda',
         'AI'=>'Anguilla',
         'AL'=>'Albania',
         'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AN'=>'Antillas Holandesas',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'La Antártida',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
+        'AS'=>'Samoa Americana',
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Azerbaiyán',
+        'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
+        'BE'=>'Bélgica',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BH'=>'Bahréin',
         'BI'=>'Burundi',
-        'BJ'=>'Benin',
+        'BJ'=>'Benín',
         'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Brunei',
         'BO'=>'Bolivia',
-        'BR'=>'Brazil',
+        'BR'=>'Brasil',
         'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BT'=>'Bután',
+        'BV'=>'Isla Bouvet',
         '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',
+        'BY'=>'Bielorrusia',
+        'BZ'=>'Belice',
+        'CA'=>'Canadá',
+        'CC'=>'Islas Cocos (Keeling)',
+        'CD'=>'Congo (República Democrática del)',
+        'CF'=>'República Centroafricana',
+        'CG'=>'Congo (República del)',
+        'CH'=>'Suiza',
+        'CI'=>'Costa de Marfil',
+        'CK'=>'Islas Cook',
         'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CM'=>'Camerún',
+        'CN'=>'República Popular 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',
+        'CV'=>'Cabo Verde',
+        'CX'=>'Isla de Navidad',
+        'CY'=>'Chipre',
+        'CZ'=>'República Checa',
+        'DE'=>'Alemania',
+        'DJ'=>'Yibuti',
+        'DK'=>'Dinamarca',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
+        'DO'=>'República Dominicana',
+        'DZ'=>'Argelia',
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EG'=>'Egipto',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
+        'ES'=>'España',
+        'ET'=>'Etiopía',
+        'EU'=>'Unión Europea',
+        'FI'=>'Finlandia',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
-        'GA'=>'Gabon',
-        'GD'=>'Grenada',
+        'FK'=>'Islas Malvinas (Falkland)',
+        'FM'=>'Estados Federados de la Micronesia',
+        'FO'=>'Islas Faroe',
+        'FR'=>'Francia',
+        'GA'=>'Gabón',
+        'GD'=>'Granada',
         'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GF'=>'Guayana Francesa',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GL'=>'Groenlandia',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GP'=>'Guadalupe',
+        'GQ'=>'Guinea Ecuatorial',
+        'GR'=>'Grecia',
+        'GS'=>'Islas Georgia del Sur y Sandwich del Sur',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Islas Heard y Mc Donald',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
-        'HT'=>'Haiti',
-        'HU'=>'Hungary',
+        'HR'=>'Croacia (nombre local: Hrvatska)',
+        'HT'=>'Haití',
+        'HU'=>'Hungría',
         'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'IE'=>'Irlanda',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'IM'=>'Isla de Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IO'=>'Territorio británico del océano Índico',
+        'IQ'=>'Irak',
+        'IR'=>'Irán, República Islámica Del',
+        'IS'=>'Islandia',
+        'IT'=>'Italia',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
+        'JO'=>'Jordania',
+        'JP'=>'Japón',
+        'KE'=>'Kenia',
         'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KH'=>'Camboya',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Islas Comoros',
+        'KN'=>'San Cristóbal y Nevis',
+        'KR'=>'Corea, República de',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
+        'KY'=>'Islas Caimán',
+        'KZ'=>'Kazajistán',
+        'LA'=>'República Democrática Popular de Laos',
+        'LB'=>'Líbano',
+        'LC'=>'Santa Lucía',
+        'LI'=>'Principado de 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',
+        'LS'=>'Lesoto',
+        'LT'=>'Lituania',
+        'LU'=>'Luxemburgo',
+        'LV'=>'Letonia',
+        'LY'=>'Libia',
+        'MA'=>'Marruecos',
+        'MC'=>'Mónaco',
+        'MD'=>'Moldova, República de',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
-        'ML'=>'Mali',
+        'MH'=>'Islas Marshall',
+        'MK'=>'Macedonia, Ex República Yugoslava de',
+        'ML'=>'Malí',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
+        'MO'=>'Macao',
+        'MP'=>'Islas Marianas del Norte',
+        'MQ'=>'Martinica',
         'MR'=>'Mauritania',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Mauricio',
+        'MV'=>'Maldivas',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
+        'MX'=>'México',
+        'MY'=>'Malasia',
         'MZ'=>'Mozambique',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NC'=>'Nueva Caledonia',
+        'NE'=>'Níger',
+        'NF'=>'Isla Norfolk',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Países Bajos',
+        'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Nueva Zelanda',
         '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',
+        'PE'=>'Perú',
+        'PF'=>'Polinesia Francesa',
+        'PG'=>'Papúa Nueva Guinea',
+        'PH'=>'Filipinas, República de las',
+        'PK'=>'Pakistán',
+        'PL'=>'Polonia',
+        'PM'=>'San Pedro y Miquelón',
         'PN'=>'Pitcairn',
         'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PS'=>'Palestina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
-        'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
+        'QA'=>'Catar',
+        'RE'=>'Reunión',
+        'RO'=>'Rumania',
         'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'RU'=>'Federación Rusa',
+        'RW'=>'Ruanda',
+        'SA'=>'Arabia Saudita',
+        'UK'=>'Escocia',
+        'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SS'=>'Sudán del Sur',
+        'SD'=>'Sudán',
+        'SE'=>'Suecia',
+        'SG'=>'Singapur',
         'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
+        'SI'=>'Eslovenia',
+        'SJ'=>'Islas Svalbard y Jan Mayen',
+        'SK'=>'Eslovaquia (República Eslovaca)',
+        'SL'=>'Sierra Leona',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'Santo Tomé y Príncipe',
+        'SU'=>'Unión Soviética',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'República Árabe Siria',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
+        'TC'=>'Islas Turcas y Caicos',
         'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TF'=>'Territorios Franceses del Sur',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
+        'TH'=>'Tailandia',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Timor Oriental',
         'TM'=>'Turkmenistan',
         'TN'=>'Tunisia',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Timor Oriental (código antiguo)',
+        'TR'=>'Turquía',
+        'TT'=>'Trinidad y Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TW'=>'Taiwán',
+        'TZ'=>'Tanzania, República Unida de',
+        'UA'=>'Ucrania',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'Reino Unido',
+        'US'=>'Estados Unidos',
+        'UM'=>'Islas Ultramarinas Menores de Estados Unidos',
         'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'UZ'=>'Uzbekistán',
+        'VA'=>'Estado de Vatican (Santa Sede)',
+        'VC'=>'San Vicente y las Granadinas',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Islas Vírgenes Británicas',
+        'VI'=>'Islas Vírgenes (EE. UU.)',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Sudáfrica',
         'ZM'=>'Zambia',
-        'ZW'=>'Zimbabwe',
+        'ZW'=>'Zimbabue',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/es-CO/mail.php b/resources/lang/es-CO/mail.php
index ebf86d5cce..7855099df4 100644
--- a/resources/lang/es-CO/mail.php
+++ b/resources/lang/es-CO/mail.php
@@ -2,7 +2,7 @@
 
 return [
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un artículo',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_declined' => 'Un usuario ha rechazado un artículo',
     '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',
     'accessory_name' => 'Nombre de accesorio:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT con las credenciales siguientes:',
     'login' => 'Entrar:',
     'Low_Inventory_Report' => 'Reporte de inventario bajo',
+    'inventory_report' => 'Informe de inventario',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo se ha extraído bajo su nombre, los detalles están a continuación.',
@@ -61,7 +62,7 @@ return [
     'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
     '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.',
-    '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' => '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.',
     '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.',
     'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
     'type' => 'Tipo',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Tus credenciales de Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accesorio devuelto',
     'Asset_Checkin_Notification' => 'Activo devuelto',
+    'Asset_Checkout_Notification' => 'Activo asignado',
     'License_Checkin_Notification' => 'Licencia devuelta',
     'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
     'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date',
     'your_assets' => 'Ver tus activos',
+    'rights_reserved' => 'Todos los derechos reservados.',
 ];
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index bc9d0b849d..46ae4dcdd8 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'El: atributo debe ser un archivo.',
     'filled'               => 'El campo: atributo debe tener un valor.',
     'image'                => ':attribute debe ser una imagen.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la empresa',
     'json'                 => 'El atributo: debe ser una cadena JSON válida.',
     'max'                  => [
         'numeric' => ':attribute no debe ser mayor que :max.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'El atributo: debe tener al menos: elementos min.',
     ],
     'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'El :attribute seleccionado no es correcto.',
     'numeric'              => ':attribute debe ser un número.',
     'present'              => 'El campo: atributo debe estar presente.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Tu 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.',
+
+        // 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'  =>  'El :attribute debe ser una fecha válida en formato AAAA-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',
+
     ],
 
     /*
diff --git a/resources/lang/es-ES/account/general.php b/resources/lang/es-ES/account/general.php
index 7fc060a849..27118e2f3a 100644
--- a/resources/lang/es-ES/account/general.php
+++ b/resources/lang/es-ES/account/general.php
@@ -1,12 +1,12 @@
 <?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' => 'Claves API personales',
+    'api_key_warning' => 'Al generar un token API, asegúrate de copiarlo inmediatamente ya que
+                    no será visible de nuevo.',
+    'api_base_url' => 'La url base de tu API es:',
     '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.',
+    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
+    'api_reference' => 'Por favor, revise la <a href="https://snipe-it.readme.io/reference" target="_blank">referencia API</a> para
+                    encontrar endpoints específicos de la API y documentación adicional de la API.',
 );
diff --git a/resources/lang/es-ES/admin/accessories/general.php b/resources/lang/es-ES/admin/accessories/general.php
index 3da0c9ac83..2e60bd2dd2 100644
--- a/resources/lang/es-ES/admin/accessories/general.php
+++ b/resources/lang/es-ES/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Actualizar Accesorio',
     'use_default_eula'					=> 'En su lugar, use el <a href="#" data-toggle="modal" data-target="#eulaModal">EULA por defecto</a>.',
     'use_default_eula_disabled'			=> '<del>En su lugar, use el EULA por defecto.</del> No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.',
+    'clone'                             => 'Clonar accesorio',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/es-ES/admin/accessories/message.php b/resources/lang/es-ES/admin/accessories/message.php
index 4fedcf1d3f..bab607c0b2 100644
--- a/resources/lang/es-ES/admin/accessories/message.php
+++ b/resources/lang/es-ES/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'El accesorio no fue retirado, por favor vuelva a intentarlo',
         'success' 		=> 'Accesorio retirado correctamente.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
     ),
 
diff --git a/resources/lang/es-ES/admin/asset_maintenances/form.php b/resources/lang/es-ES/admin/asset_maintenances/form.php
index 7d367a06e9..1318740d0f 100644
--- a/resources/lang/es-ES/admin/asset_maintenances/form.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/form.php
@@ -3,7 +3,7 @@
     return [
         'asset_maintenance_type' => 'Tipo de Mantenimiento de Equipo',
         'title'                  => 'Título',
-        'start_date'             => 'Fecha de Inicio',
+        'start_date'             => 'Fecha de inicio',
         'completion_date'        => 'Fecha de Terminación',
         'cost'                   => 'Costo',
         'is_warranty'            => 'Mejora de la Garantía',
diff --git a/resources/lang/es-ES/admin/categories/message.php b/resources/lang/es-ES/admin/categories/message.php
index 4878c7950d..633e43f626 100644
--- a/resources/lang/es-ES/admin/categories/message.php
+++ b/resources/lang/es-ES/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'La categoría no se ha actualizado, intentalo de nuevo.',
-        'success' => 'Categoría actualizada correctamente.'
+        'success' => 'Categoría actualizada correctamente.',
+        'cannot_change_category_type'   => 'No se puede cambiar el tipo de categoría una vez que se ha creado',
     ),
 
     'delete' => array(
diff --git a/resources/lang/es-ES/admin/components/general.php b/resources/lang/es-ES/admin/components/general.php
index 033bf16648..d715741aab 100644
--- a/resources/lang/es-ES/admin/components/general.php
+++ b/resources/lang/es-ES/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
     'update'                            => 'Actualizar Componente',
+    'checkin_limit'            => 'La cantidad de checkins 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 fb8de539ce..6522e84a33 100644
--- a/resources/lang/es-ES/admin/components/message.php
+++ b/resources/lang/es-ES/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-ES/admin/consumables/message.php b/resources/lang/es-ES/admin/consumables/message.php
index ad6c4421f9..fc09d1d879 100644
--- a/resources/lang/es-ES/admin/consumables/message.php
+++ b/resources/lang/es-ES/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Consumible no fue retirado, por favor, inténtelo de nuevo',
         'success' 		=> 'Consumible fue retirado satisfactoriamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-ES/admin/custom_fields/general.php b/resources/lang/es-ES/admin/custom_fields/general.php
index 5e4c580992..cb45efa4f7 100644
--- a/resources/lang/es-ES/admin/custom_fields/general.php
+++ b/resources/lang/es-ES/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Usado Por Modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
+    'update_fieldset'         => 'Actualizar grupo de campos',
+    'fieldset_does_not_exist'   => 'Grupo de campos :id no existe',
+    'fieldset_updated'         => 'Grupo de campos actualizado',
     'create_fieldset_title' => 'Crear nuevo grupo de campos',
     'create_field'            => 'Nuevo campo personalizado',
     'create_field_title' => 'Crear nuevo campo personalizado',
@@ -44,6 +47,8 @@ return [
     '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',
     'unique' => 'Único',
-    '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' => 'Permitir al usuario ver estos valores en su página Ver Recursos asignados',
+    'display_in_user_view_table' => 'Visible para el usuario',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/es-ES/admin/custom_fields/message.php b/resources/lang/es-ES/admin/custom_fields/message.php
index ff376e9dff..88cd7d74dc 100644
--- a/resources/lang/es-ES/admin/custom_fields/message.php
+++ b/resources/lang/es-ES/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Error al validar los valores por defecto 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 b28de02e9d..a8df5f74ab 100644
--- a/resources/lang/es-ES/admin/departments/message.php
+++ b/resources/lang/es-ES/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'El departamento no existe.',
-    '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' => 'Ya existe un departamento con ese nombre en la ubicación de la empresa. 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. ',
     'create' => array(
         'error'   => 'El departamento no fue creado, por favor intente de nuevo.',
diff --git a/resources/lang/es-ES/admin/groups/message.php b/resources/lang/es-ES/admin/groups/message.php
index 4b7f99ca54..42c2f3354d 100644
--- a/resources/lang/es-ES/admin/groups/message.php
+++ b/resources/lang/es-ES/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'El grupo ya existe!',
-    'group_not_found'     => 'El grupo [:id] no existe.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'El campo nombre es obligatorio',
 
     'success' => array(
diff --git a/resources/lang/es-ES/admin/hardware/form.php b/resources/lang/es-ES/admin/hardware/form.php
index 4d93c061a9..67ff33553e 100644
--- a/resources/lang/es-ES/admin/hardware/form.php
+++ b/resources/lang/es-ES/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirmar eliminación masiva de bienes',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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'	=> 'Está a punto de borrar :asset_count.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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 activo.|Está a punto de editar las propiedades de :asset_count activos.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_not_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
     'asset_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
-    'processing_spinner' => 'Procesando...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Información opcional',
     'order_details'   => 'Información relacionada con el pedido'
 ];
diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php
index 93d97c90d3..b26e13ade9 100644
--- a/resources/lang/es-ES/admin/hardware/general.php
+++ b/resources/lang/es-ES/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Este activo fue eliminado.',
     'edit'  					=> 'Editar Equipo',
     'model_deleted'  			=> 'Este Modelo de activo fue eliminado. Debes restaurar este modelo antes de poder restaurar el Activo.',
+    'model_invalid'             => 'El modelo de este activo no es válido.',
+    'model_invalid_fix'         => 'El Activo debe ser editado para corregir esto antes de intentar retirarlo o asignarlo.',
     'requestable'               => 'Requerible',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No solicitable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restaurar equipo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No desplegable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Ver Equipo',
     'csv_error' => 'Tiene un error en su archivo CSV:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     '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'
+    'custom_export' => 'Personalizar exportación',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de Garantía para :manufacturer',
 ];
diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php
index fb8895c3bf..ee067a0e17 100644
--- a/resources/lang/es-ES/admin/hardware/message.php
+++ b/resources/lang/es-ES/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'El equipo no fue restaurado, por favor intente nuevamente',
         'success' 		=> 'Equipo restaurado correctamente.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Tu archivo ha sido importado',
         'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
         'file_delete_error'      => 'No pudimos eliminar tu archivo',
+        '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',
     ],
 
 
diff --git a/resources/lang/es-ES/admin/hardware/table.php b/resources/lang/es-ES/admin/hardware/table.php
index 95e336ee5d..972f9f702d 100644
--- a/resources/lang/es-ES/admin/hardware/table.php
+++ b/resources/lang/es-ES/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Operación',
     'checkout_date' => 'Fecha de asignación',
     'checkoutto' 	=> 'Asignado',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Valor Actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
diff --git a/resources/lang/es-ES/admin/licenses/general.php b/resources/lang/es-ES/admin/licenses/general.php
index 8a5d6db90e..ed7d6408e3 100644
--- a/resources/lang/es-ES/admin/licenses/general.php
+++ b/resources/lang/es-ES/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licencias Software',
     'user'  					=> 'Usuario',
     'view'  					=> 'Ver Licencias',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/es-ES/admin/licenses/message.php b/resources/lang/es-ES/admin/licenses/message.php
index 182b6ce2e1..869a00dd84 100644
--- a/resources/lang/es-ES/admin/licenses/message.php
+++ b/resources/lang/es-ES/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
     'user_does_not_exist' => 'Usuario inexistente.',
     'asset_does_not_exist' 	=> 'El equipo que intentas asignar a esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El equipo al que estas intentando asignar esta licenciam, está asignado a un usuario diferente que el de la licencia.',
diff --git a/resources/lang/es-ES/admin/locations/message.php b/resources/lang/es-ES/admin/locations/message.php
index 50fa52a8d4..d9757b507d 100644
--- a/resources/lang/es-ES/admin/locations/message.php
+++ b/resources/lang/es-ES/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Esta localización está asignada al menos a un usuario y no puede ser eliminada. ',
     'assoc_assets'	 => 'Esta ubicacion se encuentra actualmente asociada con por lo menos un activo y no puede ser eliminada. Por favor, actualice sus activos para no referenciar esta ubicacion e intentelo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicacion actualmente esta asociada con al menos una ubicacion hija y no puede ser eliminada. Por favor, actualice sus ubicaciones para no referenciar esta ubicacion e intentelo de nuevo. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Activos asignados',
+    'current_location' => 'Ubicación Actual',
 
 
     'create' => array(
diff --git a/resources/lang/es-ES/admin/manufacturers/message.php b/resources/lang/es-ES/admin/manufacturers/message.php
index 4a78b56349..aafde6a6a7 100644
--- a/resources/lang/es-ES/admin/manufacturers/message.php
+++ b/resources/lang/es-ES/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Fabricante inexistente.',
     'assoc_users'	 => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado',
 
diff --git a/resources/lang/es-ES/admin/manufacturers/table.php b/resources/lang/es-ES/admin/manufacturers/table.php
index 972d33b71b..ed1956383c 100644
--- a/resources/lang/es-ES/admin/manufacturers/table.php
+++ b/resources/lang/es-ES/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email de soporte',
     'support_phone'   		=> 'Teléfono de soporte',
     'support_url'   		=> 'URL de soporte',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Actualizar Fabricante',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/es-ES/admin/models/general.php b/resources/lang/es-ES/admin/models/general.php
index 2750cbcd51..02a4b68d6a 100644
--- a/resources/lang/es-ES/admin/models/general.php
+++ b/resources/lang/es-ES/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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.',
-    'bulk_delete_warn'          => 'Estás a punto de eliminar: los modelos de activo model_count.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     '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',
diff --git a/resources/lang/es-ES/admin/models/message.php b/resources/lang/es-ES/admin/models/message.php
index 53bea1807a..bc0dee6e9f 100644
--- a/resources/lang/es-ES/admin/models/message.php
+++ b/resources/lang/es-ES/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modelo inexistente.',
+    'no_association' => 'NINGUN MODELO ASOCIADO.',
+    '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',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modelo no actualizado, Intentalo de nuevo',
-        'success' => 'Modelo actualizado.'
+        'success' => 'Modelo actualizado.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
-        'success' 		=> 'Modelos actualizados.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, así que nada fue eliminado.',
-        'success' 		    => '¡:success_count modelo(s) eliminado(s)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         '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.'
     ),
 
diff --git a/resources/lang/es-ES/admin/reports/general.php b/resources/lang/es-ES/admin/reports/general.php
index 19efc0b08a..55cc3c2853 100644
--- a/resources/lang/es-ES/admin/reports/general.php
+++ b/resources/lang/es-ES/admin/reports/general.php
@@ -2,9 +2,9 @@
 
 return [
     'info'   => 'Selecciona las opciones de tu informe de Equipos.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'deleted_user' => 'Usuario eliminado',
+    'send_reminder' => 'Enviar recordatorio',
+    'reminder_sent' => 'Recordatorio enviado',
+    'acceptance_deleted' => 'Solicitud de aceptación eliminada',
+    'acceptance_request' => 'Solicitud de aceptación'
 ];
\ No newline at end of file
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index ed9cc1ea55..416af4a84b 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -10,10 +10,10 @@ return [
     'admin_cc_email'            => 'Email CC',
     'admin_cc_email_help'       => 'Si deseas enviar una notificación por correo electrónico de las asignaciones de activos que se envían a los usuarios a una cuenta adicional, ingrésela aquí. De lo contrario, deja este campo en blanco.',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alerts'                	=> 'Alertas',
+    'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    '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',
@@ -21,20 +21,20 @@ return [
     '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',
     'audit_interval'            => 'Intervalo de auditoría',
-    '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'       => 'Si se le exige auditoría física regular de sus activos, ingrese 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 próxima fecha de auditoría.',
     'audit_warning_days'        => 'Umbral de advertencia de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación debemos advertirle cuándo se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generar etiquetas de activos autoincrementales',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Habilitar etiquetas de activos autoincrementales primero para establecer esto',
     'backups'					=> 'Copias de seguridad',
-    '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'              => 'Crear, descargar y restaurar copias de seguridad ',
+    'backups_restoring'         => 'Restaurar desde copia de seguridad',
+    'backups_upload'            => 'Cargar Copia de Seguridad',
+    'backups_path'              => 'Las copias de seguridad en el servidor se almacenan en <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'         => 'Todos los usuarios existentes, incluido usted, se cerrará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',
     '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.)',
@@ -57,7 +57,7 @@ return [
     '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. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Habilitado',
     'eula_settings'				=> 'Configuración EULA',
     'eula_markdown'				=> 'Este EULS permite <a href="https://help.github.com/articles/github-flavored-markdown/">makrdown estilo Github</a>.',
     'favicon'                   => 'Favicon',
@@ -66,8 +66,8 @@ return [
     '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' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_keywords' => 'soporte de la empresa, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, eula, tos, tablero, privacidad',
+    'general_settings_help'     => 'EULA por defecto y más',
     'generate_backup'			=> 'Generar Respaldo',
     'header_color'              => 'Color de encabezado',
     'info'                      => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.',
@@ -75,19 +75,22 @@ return [
     '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'        => '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.',
-    'ldap_help'                 => 'LDAP/Active Directory',
-    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    '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_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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_client_tls_key'       => 'Llave TLS del cliente LDAP',
+    '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'      => '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_manager'              => 'LDAP Manager',
+    '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',
@@ -111,20 +114,20 @@ return [
     'ldap_auth_filter_query'    => 'Consulta de autentificación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo 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'  => '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_emp_num'              => 'Número de empleado LDAP',
     'ldap_email'                => 'Email LDAP',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Probar LDAP',
+    'ldap_test_sync'            => 'Prueba de sincronización LDAP',
     'license'                   => 'Licencia de Software',
     'load_remote_text'          => 'Scripts remotos',
     'load_remote_help_text'		=> 'Esta instalación de Snipe-IT puede cargar scripts desde fuera.',
-    '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'                     => '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_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_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
@@ -145,19 +148,19 @@ return [
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por página',
     'php'                       => 'Versión de PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'Información PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
+    '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.',
     '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' => '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' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
+    'pwd_secure_complexity_letters' => 'Requiere al menos una letra',
+    '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_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
@@ -165,8 +168,8 @@ return [
     'qr_help'                   => 'Activa Códigos QR antes para poder ver esto',
     'qr_text'                   => 'Texto Código QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    '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 la entidad',
@@ -178,7 +181,7 @@ return [
     '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_forcelogin_label'     => 'SAML Force Login',
+    '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_slo_label'            => 'Cerrar sesión única SAML',
@@ -186,7 +189,7 @@ return [
     '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_download'             => 'Download Metadata',
+    'saml_download'             => 'Descargar metadatos',
     'setting'                   => 'Parámetro',
     'settings'                  => 'Configuración',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
@@ -197,16 +200,21 @@ return [
     '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.',
     'site_name'                 => 'Nombre del sitio',
+    'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Nombre de bot en Slack',
-    'slack_channel'             => 'Canal en Slack',
-    'slack_endpoint'            => 'Terminal en Slack',
-    'slack_integration'         => 'Configuración Slack',
-    'slack_integration_help'    => 'La integración con Slack es opcional, sin embargo el endpoint y el canal son requeridos si desea usarlo. Para configurar la integración de Slack, primero debe <a href=":slack_link" target="_new" rel="noopener">crear un webhook entrante</a> en su cuenta de Slack. Haga clic en el botón <strong>Probar Integración Slack</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'slack_integration_help_button'    => 'Una vez que haya guardado su información de Slack, aparecerá un botón de prueba.',
-    'slack_test_help'           => 'Pruebe si su integración de Slack está configurada correctamente. Debe Guardar Primero su configuracion Slack Actualizada.',
+    'general_webhook'           => 'Webhook general',
+    '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_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',
     'support_footer'            => 'Enlaces de Soporte de Pie de Página ',
     'support_footer_help'       => 'Especifica quien ve los enlaces de información de Soporte y Manual de Usuarios de Snipe-IT',
@@ -216,8 +224,8 @@ return [
     'update'                    => 'Actualizar Parámetros',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    '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.',
@@ -229,7 +237,7 @@ return [
     'privacy_policy'            => 'Política de Privacidad',
     'privacy_policy_link_help'  => 'Si incluye una URL aquí, un enlace a su Política de Privacidad será incluido al pie de la aplicación y en cualquier correo electrónico que envíe el sistema, de conformidad con la ley GDPR. ',
     'purge'                     => 'Purgar registros eliminados',
-    'purge_deleted'             => 'Purge Deleted ',
+    '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',
@@ -275,51 +283,56 @@ return [
     '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',
     'username_format_help'   => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.',
-    'oauth_title' => 'OAuth API Settings',
+    'oauth_title' => 'Configuración de la API de OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'oauth_help' => 'Configuración de Endpoint Oauth',
+    'asset_tag_title' => 'Actualizar ajustes de etiqueta de activos',
+    'barcode_title' => 'Actualizar ajustes de código de barras',
+    'barcodes' => 'Códigos de barras',
+    'barcodes_help_overview' => 'Ajustes de Código de barras &amp; QR',
+    'barcodes_help' => 'Esto intentará eliminar códigos de barras en caché. Esto normalmente sólo se usaría si la configuración del código de barras ha cambiado, o si la URL de Snipe-IT ha cambiado. Los códigos de barras se regenerarán cuando se acceda a continuación.',
+    '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',
+    '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',
+    'notifications' => 'Notificaciones',
+    'notifications_help' => 'Configuración de alertas por email y auditoría',
+    'asset_tags_help' => 'Incrementando y prefijos',
+    'labels' => 'Etiquetas',
+    'labels_title' => 'Actualizar ajustes de Etiquetas',
+    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
+    'purge' => 'Purgar',
+    'purge_keywords' => 'eliminar permanentemente',
+    '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',
-    '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',
+    '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!',
+    '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 de integración de <i class="fab fa-slack"></i>',
+    '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. ',
+
 ];
diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php
index 89eb5b4553..c11560074e 100644
--- a/resources/lang/es-ES/admin/settings/message.php
+++ b/resources/lang/es-ES/admin/settings/message.php
@@ -11,8 +11,8 @@ return [
         '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.',
-        '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'       => '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?'
     ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
@@ -20,24 +20,25 @@ return [
         'success'               => 'Registros eliminados correctamente purgados.',
     ],
     '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' => 'Enviando correo electrónico...',
+        '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.'
     ],
     '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' => 'Probando conexión LDAP, Binding & Query ...',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros 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!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+    'webhook' => [
+        'sending' => 'Enviando mensaje de prueba de :app...',
+        'success_pt1' => '¡Éxito! Comprueba 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_misc' => 'Algo salió mal. :( ',
     ]
 ];
diff --git a/resources/lang/es-ES/admin/settings/table.php b/resources/lang/es-ES/admin/settings/table.php
index 22db5c84ed..f1fd5c550f 100644
--- a/resources/lang/es-ES/admin/settings/table.php
+++ b/resources/lang/es-ES/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Creado',
+    'size' => 'Tamaño',
 );
diff --git a/resources/lang/es-ES/admin/users/general.php b/resources/lang/es-ES/admin/users/general.php
index 8bf6e3b24e..8638775748 100644
--- a/resources/lang/es-ES/admin/users/general.php
+++ b/resources/lang/es-ES/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     '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.',
     'print_assigned'    => 'Imprimir todos los Asignados',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'Lista de Correos Asignados',
+    'user_notified'     => 'Se ha enviado un correo al usuario con sus artículos actualmente asignados.',
+    '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 enviarle credenciales. Únicamente pueden enviarse 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',
@@ -26,19 +28,27 @@ return [
     'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores.  ',
     'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
     'two_factor_active'   => '2FA activo ',
-    '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' => 'WARNING:',
-    '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',
+    'user_deactivated'  => 'Usuario no puede iniciar sesión',
+    'user_activated'  => '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ás a punto de disponibilizar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de Super Admintradores 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',
+    '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.',
+    'not_remote_label' => 'Este no es un usuario remoto',
+    'vip_label' => 'Usuario VIP',
+    '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' => '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',
+    'next_save_user' => 'Siguiente: Guardar usuario',
+    'all_assigned_list_generation' => 'Generado el:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/es-ES/admin/users/message.php b/resources/lang/es-ES/admin/users/message.php
index 4d533c9bb7..553636ace1 100644
--- a/resources/lang/es-ES/admin/users/message.php
+++ b/resources/lang/es-ES/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Ha declinado con éxito este equipo.',
     'bulk_manager_warn'	        => 'Sus usuarios han sido correctamente actualizados, de todos modos la entrada de administrador no fue guardada porque el administrador seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propior administradores. Vuelva a seleccionar los usuarios, excluyendo al administrador.',
     'user_exists'               => 'El Usuario ya existe!',
-    'user_not_found'            => 'Usuario [:id] no existe.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'El campo Usuario es obligatorio',
     'user_password_required'    => 'El password es obligatorio.',
     'insufficient_permissions'  => 'No tiene permiso.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     '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'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
+    'user_has_no_assets_assigned'   => 'Este usuario no tiene ningún activo asignado',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Este usuario no tiene ningún correo electrónico.',
+        'success' => 'El usuario ha sido notificado sobre su inventario actual.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/es-ES/auth/general.php b/resources/lang/es-ES/auth/general.php
index cd608e5837..790a27e71e 100644
--- a/resources/lang/es-ES/auth/general.php
+++ b/resources/lang/es-ES/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Recordarme',
     'username_help_top'                 => 'Introduzca 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>A los usuarios sin una dirección de correo electrónico asociada no se enviará por correo electrónico un enlace de restablecimiento de contraseña.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/es-ES/button.php b/resources/lang/es-ES/button.php
index 3c47e5cda8..10cbfec787 100644
--- a/resources/lang/es-ES/button.php
+++ b/resources/lang/es-ES/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Acciones',
     'add'    	                => 'Agregar nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Checkin Todos / Eliminar Usuario',
     'delete'  	                => 'Borrar',
     'edit'    	                => 'Editar',
     'restore' 	                => 'Restaurar',
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index cdcbf47283..ac65f92b95 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
+    'accepted_date'         => 'Fecha aceptada',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Reporte de Accesorios',
     'action'                => 'Acción',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrador',
     'add_seats'             => 'Sitios añadidos',
-    'age'                   => "Age",
+    'age'                   => "Edad",
     'all_assets'			=> 'Todos los Equipos',
     'all'       			=> 'Todos los',
     'archived'              => 'Archivado',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditoría',
     'audit_report'			=> 'Registro de auditoría',
     'assets'				=> 'Equipos',
+    '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',
     'assigned_to'           => 'Asignado a :name',
+    'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Eliminar Avatar',
     'avatar_upload'         => 'Subir Avatar',
     'back'      			=> 'Atras',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Edición masiva',
     'bulk_delete'           => 'Borrado masivo',
     'bulk_actions'          => 'Acciones masivas',
-    'bulk_checkin_delete'   => 'Registro de entrada masivo de activos de usuarios',
+    'bulk_checkin_delete'   => 'Checkin en masa / Eliminar usuarios',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Este dispositivo es propiedad del usuario',
     'bystatus'              => 'por Estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
@@ -83,6 +92,7 @@ return [
     '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>.',
     'delete'  				=> 'Borrar',
     'delete_confirm'  		=> '¿Estás seguro de eliminar :item?',
+    'delete_confirm_no_undo' => '¿Está seguro que desea eliminar :item? Esto no se puede deshacer.',
     'deleted'  				=> 'Borrado',
     'delete_seats'  		=> 'Asientos eliminados',
     'deletion_failed'       => 'Error al eliminar',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif y svg. 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 mimetype de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Mantenimientos de Equipo',
     'item'  				=> 'Item',
     'item_name'             => 'Nombre del ítem',
+    'import_file'  			=> 'importar archivo CSV',
+    'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
     'kits'       			=> 'Equipamiento predefinido',
     'language'				=> 'Lenguaje',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Activos solicitados',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
+    'select_var'            => 'Seleccionar :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'Se enviará un mensaje de slack',
-    'slack_test_msg'        => '¡Parece que tu integración de Slack con Snipe-IT está funcionando!',
+    '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',
     'state'  				=> 'Provincia',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '¿Está seguro que desea eliminar',
     'submit'				=> 'Enviar',
     'target'                => 'Objetivo',
-    'toggle_navigation'     => 'Alternar navegación',
     'time_and_date_display' => 'Hora y fecha',
     'total_assets'			=> 'Equipos',
     'total_licenses'		=> 'licencias totales',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Si',
     'zip'  					=> 'Códio Postal',
     'noimage'				=> 'Imagen no subida o imagen no encontrada.',
-    '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'   => 'El archivo solicitado no existe en el servidor.',
+    'file_upload_success'   => '¡Archivo cargado correctamente!',
+    'no_files_uploaded'     => '¡Archivo cargado correctamente!',
     'token_expired'         => 'Su sesión ha expirado, Intente otra ves.',
     'login_enabled'         => 'Inicio de sesión habilitado',
     'audit_due'             => 'Auditoría pendiente',
@@ -375,7 +388,8 @@ return [
     '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 Administrador.',
     '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 ',
+    'set_to_null'           => 'Eliminar valores para este activo|Eliminar valores para todos los :asset_count activos ',
+    '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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Fecha de inicio',
     'end_date'            => 'Fecha de fin',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
-    'placeholder_kit'       => 'Seleccione un kit'
+    'placeholder_kit'       => 'Seleccione un kit',
+    'file_not_found'        => 'No se encontró el archivo',
+    'preview_not_available' => '(sin vista previa)',
+    'setup'                 => 'Configuración',
+    'pre_flight'            => 'Preparación',
+    'skip_to_main_content'  => 'Saltar 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 en el que desea fusionar a los demás a continuación, y los activos asociados, licencias, etc se moverá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.',
+    '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',
+    'update_existing_values'    => '¿Actualizar valores existentes?',
+    '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'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
+    'back_before_importing'     => '¿Copia de seguridad antes de importar?',
+    'csv_header_field'          => 'Campo de cabecera CSV',
+    'import_field'              => 'Importar campo',
+    'sample_value'              => 'Valor de ejemplo',
+    'no_headers'                => 'No se encontraron columnas',
+    'error_in_import_file'      => 'Hubo un error leyendo el archivo CSV: :error',
+    'percent_complete'          => ':percent % Completado',
+    'errors_importing'          => 'Se han producido algunos errores al importar: ',
+    'warning'                   => 'ADVERTENCIA: :warning',
+    'success_redirecting'       => '"Éxito... Redirigiendo.',
+    'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Siguiente: Crear usuario',
+    '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' => 'Confirmar',
+    'autoassign_licenses' => 'Auto-Asignar licencias',
+    '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'      => '¿Estás seguro?',
+    'cannot_be_deleted'      => 'Este articulo no se puede eliminar',
+    'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es-ES/help.php b/resources/lang/es-ES/help.php
index 9c71dfef87..e083c23aa4 100644
--- a/resources/lang/es-ES/help.php
+++ b/resources/lang/es-ES/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Marcando esta casilla podrá editar el registro de activos reflejando su nueva ubicación. Dejándola sin marcar simplemente anotaremos la ubicación en el registro de auditoria.<br><br>Tenga en cuenta que si este activo ha si requerido, no se podrá cambiara la ubicación de la persona, Activo o ubicación en la que esta requerido.',
+    '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' => '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.',
 
diff --git a/resources/lang/es-ES/localizations.php b/resources/lang/es-ES/localizations.php
index be2c321861..63accfb143 100644
--- a/resources/lang/es-ES/localizations.php
+++ b/resources/lang/es-ES/localizations.php
@@ -2,314 +2,315 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Seleccione un idioma',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Inglés, EEUU',
+        'en-GB'=> 'Inglés, Reino Unido',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
+        'ar'=> 'Árabe',
+        'bg'=> 'Búlgaro',
+        'zh-CN'=> 'Chino simplificado',
+        'zh-TW'=> 'Chino tradicional',
+        'hr'=> 'Croata',
+        'cs'=> 'Checo',
+        'da'=> 'Danés',
+        'nl'=> 'Holandés',
+        'en-ID'=> 'inglés de Indonesia',
+        'et'=> 'Estonio',
         'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
-        'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'fi'=> 'Finlandés',
+        'fr'=> 'Francés',
+        'de'=> 'Alemán',
+        'de-i'=> 'Alemán (informal)',
+        'el'=> 'Griego',
+        'he'=> 'Hebreo',
+        'hu'=> 'Húngaro',
+        'is' => 'Islandés',
+        'id'=> 'Indonesio',
+        'ga-IE'=> 'Irlandés',
+        'it'=> 'Italiano',
+        'ja'=> 'Japonés',
+        'ko'=> 'Coreano',
+        'lv'=>'Letón',
+        'lt'=> 'Lituano',
+        'mk'=> 'Macedonio',
+        'ms'=> 'Malayo',
+        'mi'=> 'Maorí',
+        'mn'=> 'Mongol',
+        'no'=> 'Noruego',
+        'fa'=> 'Persa',
+        'pl'=> 'Polaco',
+        'pt-PT'=> 'Portugués',
+        'pt-BR'=> 'Portugués, Brasileño',
+        'ro'=> 'Rumano',
+        'ru'=> 'Ruso',
+        'sr-CS' => 'Serbio (Latino)',
+        'sl'=> 'Esloveno',
+        'es-ES'=> 'Español',
+        'es-CO'=> 'Español, Colombia',
+        'es-MX'=> 'Español, México',
+        'es-VE'=> 'Español, Venezuela',
+        'sv-SE'=> 'Sueco',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'th'=> 'Tailandés',
+        'tr'=> 'Turco',
+        'uk'=> 'Ucraniano',
+        'vi'=> 'Vietnamita',
+        'cy'=> 'Galés',
+        'zu'=> 'Zulú',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Seleccione un país',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Isla de Ascensión',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AE'=>'Emiratos Árabes Unidos',
+        'AF'=>'Afganistán',
+        'AG'=>'Antigua y Barbuda',
         'AI'=>'Anguilla',
         'AL'=>'Albania',
         'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AN'=>'Antillas Holandesas',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'La Antártida',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
+        'AS'=>'Samoa Americana',
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Azerbaiyán',
+        'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
+        'BE'=>'Bélgica',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BH'=>'Bahréin',
         'BI'=>'Burundi',
-        'BJ'=>'Benin',
+        'BJ'=>'Benín',
         'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Brunei',
         'BO'=>'Bolivia',
-        'BR'=>'Brazil',
+        'BR'=>'Brasil',
         'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BT'=>'Bután',
+        'BV'=>'Isla Bouvet',
         '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',
+        'BY'=>'Bielorrusia',
+        'BZ'=>'Belice',
+        'CA'=>'Canadá',
+        'CC'=>'Islas Cocos (Keeling)',
+        'CD'=>'Congo (República Democrática del)',
+        'CF'=>'República Centroafricana',
+        'CG'=>'Congo (República del)',
+        'CH'=>'Suiza',
+        'CI'=>'Costa de Marfil',
+        'CK'=>'Islas Cook',
         'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CM'=>'Camerún',
+        'CN'=>'República Popular 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',
+        'CV'=>'Cabo Verde',
+        'CX'=>'Isla de Navidad',
+        'CY'=>'Chipre',
+        'CZ'=>'República Checa',
+        'DE'=>'Alemania',
+        'DJ'=>'Yibuti',
+        'DK'=>'Dinamarca',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
+        'DO'=>'República Dominicana',
+        'DZ'=>'Argelia',
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EG'=>'Egipto',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
+        'ES'=>'España',
+        'ET'=>'Etiopía',
+        'EU'=>'Unión Europea',
+        'FI'=>'Finlandia',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
-        'GA'=>'Gabon',
-        'GD'=>'Grenada',
+        'FK'=>'Islas Malvinas (Falkland)',
+        'FM'=>'Estados Federados de la Micronesia',
+        'FO'=>'Islas Faroe',
+        'FR'=>'Francia',
+        'GA'=>'Gabón',
+        'GD'=>'Granada',
         'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GF'=>'Guayana Francesa',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GL'=>'Groenlandia',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GP'=>'Guadalupe',
+        'GQ'=>'Guinea Ecuatorial',
+        'GR'=>'Grecia',
+        'GS'=>'Islas Georgia del Sur y Sandwich del Sur',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Islas Heard y Mc Donald',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
-        'HT'=>'Haiti',
-        'HU'=>'Hungary',
+        'HR'=>'Croacia (nombre local: Hrvatska)',
+        'HT'=>'Haití',
+        'HU'=>'Hungría',
         'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'IE'=>'Irlanda',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'IM'=>'Isla de Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IO'=>'Territorio británico del océano Índico',
+        'IQ'=>'Irak',
+        'IR'=>'Irán, República Islámica Del',
+        'IS'=>'Islandia',
+        'IT'=>'Italia',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
+        'JO'=>'Jordania',
+        'JP'=>'Japón',
+        'KE'=>'Kenia',
         'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KH'=>'Camboya',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Islas Comoros',
+        'KN'=>'San Cristóbal y Nevis',
+        'KR'=>'Corea, República de',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
+        'KY'=>'Islas Caimán',
+        'KZ'=>'Kazajistán',
+        'LA'=>'República Democrática Popular de Laos',
+        'LB'=>'Líbano',
+        'LC'=>'Santa Lucía',
+        'LI'=>'Principado de 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',
+        'LS'=>'Lesoto',
+        'LT'=>'Lituania',
+        'LU'=>'Luxemburgo',
+        'LV'=>'Letonia',
+        'LY'=>'Libia',
+        'MA'=>'Marruecos',
+        'MC'=>'Mónaco',
+        'MD'=>'Moldova, República de',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
-        'ML'=>'Mali',
+        'MH'=>'Islas Marshall',
+        'MK'=>'Macedonia, Ex República Yugoslava de',
+        'ML'=>'Malí',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
+        'MO'=>'Macao',
+        'MP'=>'Islas Marianas del Norte',
+        'MQ'=>'Martinica',
         'MR'=>'Mauritania',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Mauricio',
+        'MV'=>'Maldivas',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
+        'MX'=>'México',
+        'MY'=>'Malasia',
         'MZ'=>'Mozambique',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NC'=>'Nueva Caledonia',
+        'NE'=>'Níger',
+        'NF'=>'Isla Norfolk',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Países Bajos',
+        'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Nueva Zelanda',
         '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',
+        'PE'=>'Perú',
+        'PF'=>'Polinesia Francesa',
+        'PG'=>'Papúa Nueva Guinea',
+        'PH'=>'Filipinas, República de las',
+        'PK'=>'Pakistán',
+        'PL'=>'Polonia',
+        'PM'=>'San Pedro y Miquelón',
         'PN'=>'Pitcairn',
         'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PS'=>'Palestina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
-        'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
+        'QA'=>'Catar',
+        'RE'=>'Reunión',
+        'RO'=>'Rumania',
         'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'RU'=>'Federación Rusa',
+        'RW'=>'Ruanda',
+        'SA'=>'Arabia Saudita',
+        'UK'=>'Escocia',
+        'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SS'=>'Sudán del Sur',
+        'SD'=>'Sudán',
+        'SE'=>'Suecia',
+        'SG'=>'Singapur',
         'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
+        'SI'=>'Eslovenia',
+        'SJ'=>'Islas Svalbard y Jan Mayen',
+        'SK'=>'Eslovaquia (República Eslovaca)',
+        'SL'=>'Sierra Leona',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'Santo Tomé y Príncipe',
+        'SU'=>'Unión Soviética',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'República Árabe Siria',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
+        'TC'=>'Islas Turcas y Caicos',
         'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TF'=>'Territorios Franceses del Sur',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
+        'TH'=>'Tailandia',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Timor Oriental',
         'TM'=>'Turkmenistan',
         'TN'=>'Tunisia',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Timor Oriental (código antiguo)',
+        'TR'=>'Turquía',
+        'TT'=>'Trinidad y Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TW'=>'Taiwán',
+        'TZ'=>'Tanzania, República Unida de',
+        'UA'=>'Ucrania',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'Reino Unido',
+        'US'=>'Estados Unidos',
+        'UM'=>'Islas Ultramarinas Menores de Estados Unidos',
         'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'UZ'=>'Uzbekistán',
+        'VA'=>'Estado de Vatican (Santa Sede)',
+        'VC'=>'San Vicente y las Granadinas',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Islas Vírgenes Británicas',
+        'VI'=>'Islas Vírgenes (EE. UU.)',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Sudáfrica',
         'ZM'=>'Zambia',
-        'ZW'=>'Zimbabwe',
+        'ZW'=>'Zimbabue',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/es-ES/mail.php b/resources/lang/es-ES/mail.php
index ebf86d5cce..7855099df4 100644
--- a/resources/lang/es-ES/mail.php
+++ b/resources/lang/es-ES/mail.php
@@ -2,7 +2,7 @@
 
 return [
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un artículo',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_declined' => 'Un usuario ha rechazado un artículo',
     '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',
     'accessory_name' => 'Nombre de accesorio:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT con las credenciales siguientes:',
     'login' => 'Entrar:',
     'Low_Inventory_Report' => 'Reporte de inventario bajo',
+    'inventory_report' => 'Informe de inventario',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo se ha extraído bajo su nombre, los detalles están a continuación.',
@@ -61,7 +62,7 @@ return [
     'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
     '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.',
-    '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' => '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.',
     '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.',
     'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
     'type' => 'Tipo',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Tus credenciales de Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accesorio devuelto',
     'Asset_Checkin_Notification' => 'Activo devuelto',
+    'Asset_Checkout_Notification' => 'Activo asignado',
     'License_Checkin_Notification' => 'Licencia devuelta',
     'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
     'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date',
     'your_assets' => 'Ver tus activos',
+    'rights_reserved' => 'Todos los derechos reservados.',
 ];
diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php
index 7361de1914..d05d43d6ea 100644
--- a/resources/lang/es-ES/validation.php
+++ b/resources/lang/es-ES/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'El: atributo debe ser un archivo.',
     'filled'               => 'El campo: atributo debe tener un valor.',
     'image'                => ':attribute debe ser una imagen.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la empresa',
     'json'                 => 'El atributo: debe ser una cadena JSON válida.',
     'max'                  => [
         'numeric' => ':attribute no debe ser mayor que :max.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'El atributo: debe tener al menos: elementos min.',
     ],
     'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'El :attribute seleccionado no es correcto.',
     'numeric'              => ':attribute debe ser un número.',
     'present'              => 'El campo: atributo debe estar presente.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Tu 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.',
+
+        // 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'  =>  'El :attribute debe ser una fecha válida en formato AAAA-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',
+
     ],
 
     /*
diff --git a/resources/lang/es-MX/account/general.php b/resources/lang/es-MX/account/general.php
index 7fc060a849..d344a57a7b 100644
--- a/resources/lang/es-MX/account/general.php
+++ b/resources/lang/es-MX/account/general.php
@@ -1,12 +1,12 @@
 <?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' => 'Claves API personales',
+    'api_key_warning' => 'Al generar un token API, asegúrate de copiarlo inmediatamente ya que
+                    no será visible para ti de nuevo.',
+    'api_base_url' => 'La url base de tu API se encuentra en:',
     '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.',
+    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
+    'api_reference' => 'Por favor, revise la <a href="https://snipe-it.readme.io/reference" target="_blank">referencia API</a> para
+                    encontrar puntos finales específicos de la API y documentación adicional de la API.',
 );
diff --git a/resources/lang/es-MX/admin/accessories/general.php b/resources/lang/es-MX/admin/accessories/general.php
index 3da0c9ac83..db012f5c89 100644
--- a/resources/lang/es-MX/admin/accessories/general.php
+++ b/resources/lang/es-MX/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Actualizar Accesorio',
     'use_default_eula'					=> 'En su lugar, use el <a href="#" data-toggle="modal" data-target="#eulaModal">EULA por defecto</a>.',
     'use_default_eula_disabled'			=> '<del>En su lugar, use el EULA por defecto.</del> No esta configurado un EULA por defecto. 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.',
 
 );
diff --git a/resources/lang/es-MX/admin/accessories/message.php b/resources/lang/es-MX/admin/accessories/message.php
index 4fedcf1d3f..23bc05bffc 100644
--- a/resources/lang/es-MX/admin/accessories/message.php
+++ b/resources/lang/es-MX/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/es-MX/admin/asset_maintenances/form.php b/resources/lang/es-MX/admin/asset_maintenances/form.php
index 7d367a06e9..32a148765c 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 Equipo',
+        'asset_maintenance_type' => 'Tipo de Mantenimiento de Activo',
         'title'                  => 'Título',
-        'start_date'             => 'Fecha de Inicio',
-        'completion_date'        => 'Fecha de Terminación',
+        '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 Equipo (en días)',
+        'asset_maintenance_time' => 'Tiempo de Mantenimiento del Activo (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar Mantenimiento de Equipo',
-        'create'                 => 'Crear Mantenimiento de Equipo'
+        'update'                 => 'Actualizar Mantenimiento de Activo',
+        'create'                 => 'Crear Mantenimiento de Activo'
     ];
diff --git a/resources/lang/es-MX/admin/categories/message.php b/resources/lang/es-MX/admin/categories/message.php
index 4878c7950d..e9706fd72d 100644
--- a/resources/lang/es-MX/admin/categories/message.php
+++ b/resources/lang/es-MX/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'La categoría no se ha actualizado, intentalo de nuevo.',
-        'success' => 'Categoría actualizada correctamente.'
+        'success' => 'Categoría actualizada correctamente.',
+        'cannot_change_category_type'   => 'Una vez creado, no es posible cambiar el tipo de categoria',
     ),
 
     'delete' => array(
diff --git a/resources/lang/es-MX/admin/companies/general.php b/resources/lang/es-MX/admin/companies/general.php
index d6a87e1235..8462567916 100644
--- a/resources/lang/es-MX/admin/companies/general.php
+++ b/resources/lang/es-MX/admin/companies/general.php
@@ -3,5 +3,5 @@
 return [
     'select_company' => 'Seleccionar compañía',
     'about_companies' => 'Acerca de las empresas',
-    'about_companies_description' => '        Puede utilizar las empresas como un campo informativo simple, o puede utilizarlos para restringir la visibilidad de los activos y la disponibilidad a los usuarios con una empresa específica habilitando el soporte completo de la compañía en su Configuración de Administración.',
+    'about_companies_description' => '        Puedes utilizar empresas como un simple campo de información, o las puedes usar para restringir la visibilidad y disponibilidad de los activos a los usuarios que pertenezcan a una empresa en específico. Esto lo implementas habilitando la opción de Suporte Completo de Empresa en tu página de configuración de administrador.',
 ];
diff --git a/resources/lang/es-MX/admin/components/general.php b/resources/lang/es-MX/admin/components/general.php
index 033bf16648..760b4102a8 100644
--- a/resources/lang/es-MX/admin/components/general.php
+++ b/resources/lang/es-MX/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
     'update'                            => 'Actualizar Componente',
+    'checkin_limit'            => 'La cantidad introducida 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 fb8de539ce..4b4e33984d 100644
--- a/resources/lang/es-MX/admin/components/message.php
+++ b/resources/lang/es-MX/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.',
+        'unavailable'      => 'No quedan suficientes componentes: :remaining disponibles, :requested solicitados ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-MX/admin/consumables/message.php b/resources/lang/es-MX/admin/consumables/message.php
index ad6c4421f9..c037fbe1af 100644
--- a/resources/lang/es-MX/admin/consumables/message.php
+++ b/resources/lang/es-MX/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Consumible no fue retirado, por favor, inténtelo de nuevo',
         'success' 		=> 'Consumible fue retirado satisfactoriamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        '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. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-MX/admin/custom_fields/general.php b/resources/lang/es-MX/admin/custom_fields/general.php
index c06e892562..a3e74c69ea 100644
--- a/resources/lang/es-MX/admin/custom_fields/general.php
+++ b/resources/lang/es-MX/admin/custom_fields/general.php
@@ -2,10 +2,10 @@
 
 return [
     'custom_fields'		        => 'Campos personalizados',
-    'manage'                    => 'Administrar',
+    'manage'                    => 'Administra',
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Acerca de los campos personalizados',
-    'about_fieldsets_text'		=> 'Los grupos de campos personalizados te permiten agrupar campos personalizados que se reutilizan frecuentemente para determinados modelos de activos.',
+    'about_fieldsets_text'		=> 'Los conjuntos de campos permiten crear grupos de campos personalizados que son frecuentemente reutilizados para tipos específicos de 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.',
@@ -27,23 +27,28 @@ return [
     'used_by_models'   		    => 'Usado Por Modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
-    'create_fieldset_title' => 'Crear nuevo grupo de campos',
+    'update_fieldset'         => 'Actualizar Grupo de Campos Personalizados',
+    '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',
     'create_field'            => 'Nuevo campo personalizado',
-    'create_field_title' => 'Crear 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.',
     '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.',
+    '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',
-    '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',
+    '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',
     'reorder' => 'Reordenar',
-    'db_field' => 'Campo de BD',
-    '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',
+    'db_field' => 'Campo de 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',
     'unique' => 'Único',
-    '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' => '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',
 ];
diff --git a/resources/lang/es-MX/admin/custom_fields/message.php b/resources/lang/es-MX/admin/custom_fields/message.php
index ff376e9dff..d9b7dfd143 100644
--- a/resources/lang/es-MX/admin/custom_fields/message.php
+++ b/resources/lang/es-MX/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Error al validar los valores predeterminados del conjunto de campos.',
 
     ),
 
diff --git a/resources/lang/es-MX/admin/departments/message.php b/resources/lang/es-MX/admin/departments/message.php
index b28de02e9d..b7e4f1d857 100644
--- a/resources/lang/es-MX/admin/departments/message.php
+++ b/resources/lang/es-MX/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'El departamento no existe.',
-    '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' => 'Ya existe un departamento con ese nombre en la ubicación seleccionada de esta empresa. 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. ',
     'create' => array(
         'error'   => 'El departamento no fue creado, por favor intente de nuevo.',
diff --git a/resources/lang/es-MX/admin/depreciations/general.php b/resources/lang/es-MX/admin/depreciations/general.php
index 2c7ad8e147..675b042d6d 100644
--- a/resources/lang/es-MX/admin/depreciations/general.php
+++ b/resources/lang/es-MX/admin/depreciations/general.php
@@ -6,11 +6,11 @@ return [
     'asset_depreciations'  					=> 'Amortizaciones',
     'create'  					            => 'Crear Amortización',
     'depreciation_name'  					=> 'Nombre Amortización',
-    'depreciation_min'                      => 'Valor mínimo de amortización',
+    'depreciation_min'                      => 'Valor mínimo de depreciación',
     'number_of_months'  					=> 'Meses',
     'update'  					            => 'Actualizar Amortización',
     'depreciation_min'                      => 'Valor mínimo después de depreciado',
     '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 depreciación.',
 ];
diff --git a/resources/lang/es-MX/admin/groups/message.php b/resources/lang/es-MX/admin/groups/message.php
index 4b7f99ca54..d7cfbb1f18 100644
--- a/resources/lang/es-MX/admin/groups/message.php
+++ b/resources/lang/es-MX/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'El grupo ya existe!',
-    'group_not_found'     => 'El grupo [:id] no existe.',
+    'group_not_found'     => 'El ID de grupo :id no existe.',
     'group_name_required' => 'El campo nombre es obligatorio',
 
     'success' => array(
diff --git a/resources/lang/es-MX/admin/groups/titles.php b/resources/lang/es-MX/admin/groups/titles.php
index 7660a8055b..0b49feaa7a 100644
--- a/resources/lang/es-MX/admin/groups/titles.php
+++ b/resources/lang/es-MX/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> 'Admin Grupo',
     'allow' 	 			=> 'Permitir',
     'deny' 	 				=> 'Denegar',
-    'permission'            => 'Permisos',
+    'permission'            => 'Permiso',
     'grant'                 => 'Otorgar',
     'no_permissions'        => 'Este grupo no tiene permisos.'
 ];
diff --git a/resources/lang/es-MX/admin/hardware/form.php b/resources/lang/es-MX/admin/hardware/form.php
index ae90b73d82..038071cbfd 100644
--- a/resources/lang/es-MX/admin/hardware/form.php
+++ b/resources/lang/es-MX/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Confirmar eliminación masiva de bienes',
+    '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_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'	=> 'Está a punto de borrar :asset_count.',
+  '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 activo.|Está a punto de editar las propiedades de :asset_count activos.',
+    '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.',
     'checkedout_to'		=> 'Asignado a',
     'checkout_date'		=> 'Fecha de asignación',
     'checkin_date'		=> 'Fecha de devolución',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_not_deployable' => 'El activo no está listo para desplegar. Por lo que por el momento no puede ser asignado.',
     'asset_deployable' => 'El activo no está listo para desplegar. Por lo que, por el momento, no puede ser asignado.',
-    'processing_spinner' => 'Procesando...',
+    'processing_spinner' => 'Procesando... (Esto puede tomar un poco de tiempo en archivos grandes)',
     'optional_infos'  => 'Información opcional',
     'order_details'   => 'Información relacionada con el pedido'
 ];
diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php
index fea8987803..07cf834d3e 100644
--- a/resources/lang/es-MX/admin/hardware/general.php
+++ b/resources/lang/es-MX/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Este activo ha sido eliminado.',
     'edit'  					=> 'Editar Equipo',
     'model_deleted'  			=> 'Este modelo de equipo fue eliminado. Debes restaurar el moldelo antes de restaurar el activo.',
+    'model_invalid'             => 'El Modelo de este Activo no es válido.',
+    'model_invalid_fix'         => 'Es necesario corregir esto antes de realizar movimientos con este Activo.',
     'requestable'               => 'Requerible',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No solicitable',
@@ -21,24 +23,26 @@ return [
     'restore'  					=> 'Restaurar equipo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No desplegable',
+    'undeployable_tooltip'  	=> 'Este activo tiene una etiqueta de estado que no es desplegable y no puede ser asignado en este momento.',
     'view'  					=> 'Ver Equipo',
     'csv_error' => 'Hay un error en su archivo CSV:',
     'import_text' => '
     <p>
-    Sube un CSV que contenga historial de activos. Los activos y los usuarios DEBEN existir en el sistema, o se omitirán. Los activos coincidentes para importar el historial ocurren contra la etiqueta de activos. Intentaremos encontrar un usuario que coincida con el nombre del usuario que proporciones, y los criterios que seleccionas a continuación. Si no selecciona ningún criterio a continuación, simplemente tratará de coincidir con el formato de nombre de usuario que configuraste en el Administrador &gt; Configuración General.
+    Sube un CSV que contenga historial de activos. Los activos y los usuarios DEBEN existir en el sistema, o se omitirán. Los activos coincidentes para la importación del historial se buscan con la etiqueta de activos. Intentaremos encontrar un usuario que coincida con el nombre del usuario que proporcione y los criterios que seleccione a continuación. Si no selecciona ningún criterio a continuación, simplemente se intentará coincidir con el formato de nombre de usuario que configuraste en  Administrador &gt; Configuración General.
     </p>
 
     <p>Los campos incluidos en el CSV deben coincidir con los encabezados: <strong>Etiqueta de activos, Nombre, Fecha de salida, Fecha de comprobación</strong>. Cualquier campo adicional será ignorado. </p>
 
-    <p>Fecha de Checkin: las fechas de check-in en blanco o futuro comprobarán los elementos al usuario asociado. Excluyendo la columna Fecha de Checkin creará una fecha de check-in con la fecha de hoy.</p>
+    <p>Fecha de Registro: las fechas de registro en blanco o futuro comprobarán los elementos al usuario asociado. Excluyendo la columna Fecha de Registro creará una fecha de registro con la fecha de hoy.</p>
     ',
-    'csv_import_match_f-l' => 'Intentar coincidir con los usuarios por el formato firstname.lastname (jane.smith)',
-    'csv_import_match_initial_last' => 'Intentar coincidir los usuarios con el primer apellido inicial (jsmith) formato',
-    'csv_import_match_first' => 'Intentar coincidir con los usuarios por nombre de usuario (jane) formato',
+    'csv_import_match_f-l' => 'Intentar coincidir con los usuarios por el formato firstname.lastname (juan.perez)',
+    'csv_import_match_initial_last' => 'Intentar coincidir los usuarios con el formato inicial de nombre y primer apellido (jperez)',
+    'csv_import_match_first' => 'Intentar coincidir con los usuarios por el formato de nombre de usuario (juan)',
     'csv_import_match_email' => 'Intentar coincidir con los usuarios por correo electrónico como nombre de usuario',
-    'csv_import_match_username' => 'Intentar coincidir con los usuarios por correo electrónico como nombre de usuario',
+    'csv_import_match_username' => 'Intentar coincidir usuarios por nombre de usuario',
     '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'
+    'custom_export' => 'Exportación personalizada',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de Garantía para :manufacturer',
 ];
diff --git a/resources/lang/es-MX/admin/hardware/message.php b/resources/lang/es-MX/admin/hardware/message.php
index 314d726ec3..23add7a280 100644
--- a/resources/lang/es-MX/admin/hardware/message.php
+++ b/resources/lang/es-MX/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'El equipo no fue restaurado, por favor intente nuevamente',
         'success' 		=> 'Equipo restaurado correctamente.',
+        'bulk_success' 		=> 'Activo restaurado con éxito.',
+        'nothing_updated'   => 'No se seleccionaron activos, por lo que no se restauró nada.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Tu archivo ha sido importado',
         'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
         'file_delete_error'      => 'No pudimos eliminar tu archivo',
+        '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',
     ],
 
 
diff --git a/resources/lang/es-MX/admin/hardware/table.php b/resources/lang/es-MX/admin/hardware/table.php
index 9950a1b10f..477f517e9f 100644
--- a/resources/lang/es-MX/admin/hardware/table.php
+++ b/resources/lang/es-MX/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Operación',
     'checkout_date' => 'Fecha de asignación',
     'checkoutto' 	=> 'Asignado',
+    'components_cost' => 'Coste total de componentes',
     'current_value' => 'Valor Actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
diff --git a/resources/lang/es-MX/admin/kits/general.php b/resources/lang/es-MX/admin/kits/general.php
index 186bd7f0cb..c9d6a5e7b6 100644
--- a/resources/lang/es-MX/admin/kits/general.php
+++ b/resources/lang/es-MX/admin/kits/general.php
@@ -13,38 +13,38 @@ return [
     '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. ',
-    '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',
+    'append_accessory'                  => 'Añadir accesorio',
+    'update_appended_accessory'         => 'Actualizar accesorio adjunto',
+    'append_consumable'                 => 'Añadir consumible',
+    'update_appended_consumable'        => 'Actualizar consumible adjunto',
+    '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_added_success'             => 'Licencia añadida correctamente',
-    'license_updated'                   => 'Licencia actualizada correctamente',
+    'license_updated'                   => 'La licencia se ha actualizado 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_error'                  => 'Consumible ya vinculado al kit',
-    'consumable_deleted'                => 'Eliminado correctamente',
+    '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_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_created'                       => 'Kit creado correctamente',
-    'kit_updated'                       => 'Kit actualizado correctamente',
+    'kit_updated'                       => 'El kit se ha actualizado correctamente',
     'kit_not_found'                     => 'Kit no encontrado',
-    'kit_deleted'                       => 'Kit eliminado correctamente',
+    'kit_deleted'                       => 'El kit ha sido eliminado correctamente',
     'kit_model_updated'                 => 'Modelo actualizado correctamente',
     'kit_model_detached'                => 'Modelo desvinculado correctamente',
 ];
diff --git a/resources/lang/es-MX/admin/licenses/general.php b/resources/lang/es-MX/admin/licenses/general.php
index 8a5d6db90e..57433beb06 100644
--- a/resources/lang/es-MX/admin/licenses/general.php
+++ b/resources/lang/es-MX/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licencias Software',
     'user'  					=> 'Usuario',
     'view'  					=> 'Ver Licencias',
+    'delete_disabled'           => 'Esta licencia no se puede eliminar aún porque algunos asientos todavía están asignados.',
+    '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',
+                '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',
+            ],
+
+            '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.',
+                '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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/es-MX/admin/licenses/message.php b/resources/lang/es-MX/admin/licenses/message.php
index 182b6ce2e1..1538147423 100644
--- a/resources/lang/es-MX/admin/licenses/message.php
+++ b/resources/lang/es-MX/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'La licencia no existe o usted no tiene permiso para verla.',
     'user_does_not_exist' => 'Usuario inexistente.',
     'asset_does_not_exist' 	=> 'El equipo que intentas asignar a esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El equipo al que estas intentando asignar esta licenciam, está asignado a un usuario diferente que el de la licencia.',
diff --git a/resources/lang/es-MX/admin/locations/message.php b/resources/lang/es-MX/admin/locations/message.php
index 50fa52a8d4..d8be3030ae 100644
--- a/resources/lang/es-MX/admin/locations/message.php
+++ b/resources/lang/es-MX/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Esta localización está asignada al menos a un usuario y no puede ser eliminada. ',
     'assoc_assets'	 => 'Esta ubicacion se encuentra actualmente asociada con por lo menos un activo y no puede ser eliminada. Por favor, actualice sus activos para no referenciar esta ubicacion e intentelo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicacion actualmente esta asociada con al menos una ubicacion hija y no puede ser eliminada. Por favor, actualice sus ubicaciones para no referenciar esta ubicacion e intentelo de nuevo. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Recursos asignados',
+    'current_location' => 'Ubicación actual',
 
 
     'create' => array(
diff --git a/resources/lang/es-MX/admin/manufacturers/message.php b/resources/lang/es-MX/admin/manufacturers/message.php
index 4a78b56349..0078fc2999 100644
--- a/resources/lang/es-MX/admin/manufacturers/message.php
+++ b/resources/lang/es-MX/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Utilice <code>{LOCALE}</code> y <code>{SERIAL}</code> en su URL como variables para que estos valores se rellenen automáticamente al ver los activos.',
     'does_not_exist' => 'Fabricante inexistente.',
     'assoc_users'	 => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado',
 
diff --git a/resources/lang/es-MX/admin/manufacturers/table.php b/resources/lang/es-MX/admin/manufacturers/table.php
index 972d33b71b..9352654d18 100644
--- a/resources/lang/es-MX/admin/manufacturers/table.php
+++ b/resources/lang/es-MX/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email 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',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/es-MX/admin/models/general.php b/resources/lang/es-MX/admin/models/general.php
index 13bf779bad..23fa447905 100644
--- a/resources/lang/es-MX/admin/models/general.php
+++ b/resources/lang/es-MX/admin/models/general.php
@@ -3,10 +3,10 @@
 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.',
+    '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.',
-    'bulk_delete_warn'          => 'Estás a punto de eliminar: los modelos de activo model_count.',
+    '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 el campo de la dirección MAC en los equipos de este modelo',
diff --git a/resources/lang/es-MX/admin/models/message.php b/resources/lang/es-MX/admin/models/message.php
index 53bea1807a..dd60b79d74 100644
--- a/resources/lang/es-MX/admin/models/message.php
+++ b/resources/lang/es-MX/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modelo inexistente.',
+    'no_association' => 'NINGUN MODELO ASOCIADO.',
+    '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',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modelo no actualizado, Intentalo de nuevo',
-        'success' => 'Modelo actualizado.'
+        'success' => 'Modelo actualizado.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
-        'success' 		=> 'Modelos actualizados.'
+        '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:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, así que nada fue eliminado.',
-        'success' 		    => '¡:success_count modelo(s) eliminado(s)!',
+        '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.'
     ),
 
diff --git a/resources/lang/es-MX/admin/reports/general.php b/resources/lang/es-MX/admin/reports/general.php
index 19efc0b08a..55cc3c2853 100644
--- a/resources/lang/es-MX/admin/reports/general.php
+++ b/resources/lang/es-MX/admin/reports/general.php
@@ -2,9 +2,9 @@
 
 return [
     'info'   => 'Selecciona las opciones de tu informe de Equipos.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'deleted_user' => 'Usuario eliminado',
+    'send_reminder' => 'Enviar recordatorio',
+    'reminder_sent' => 'Recordatorio enviado',
+    'acceptance_deleted' => 'Solicitud de aceptación eliminada',
+    'acceptance_request' => 'Solicitud de aceptación'
 ];
\ No newline at end of file
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index 81e0ca4577..502c5f1b4e 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -11,9 +11,9 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
     'alerts'                	=> 'Alertas',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    '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',
@@ -21,20 +21,20 @@ return [
     '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',
     'audit_interval'            => 'Intervalo de auditoría',
-    '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'       => 'Si se le exige auditoría física regular de sus activos, ingrese 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 próxima fecha de auditoría.',
     'audit_warning_days'        => 'Umbral de advertencia de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación debemos advertirle cuándo se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generar etiquetas de activos que incrementan automáticamente',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Primero habilite etiquetas de activos auto-incrementantes para configurar esto',
     'backups'					=> 'Copias de seguridad',
-    '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'              => 'Crear, descargar y restaurar copias de seguridad ',
+    'backups_restoring'         => 'Restaurando desde la copia de seguridad',
+    'backups_upload'            => 'Subir 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_logged_out'         => 'Todos los usuarios existentes, incluido usted, cerrarán sesión automáticamente una vez que la restauración haya finalizado.',
+    'backups_large'             => 'Las copias de seguridad muy grandes pueden fallar por tiempo de espera excedido en el intento de restauración y pueden necesitar que se ejecuten nuevamente a través de la línea de comandos. ',
     'barcode_settings'			=> 'Configuración de 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.)',
@@ -57,7 +57,7 @@ return [
     '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. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Habilitado',
     'eula_settings'				=> 'Configuración EULA',
     'eula_markdown'				=> 'Este EULS permite <a href="https://help.github.com/articles/github-flavored-markdown/">makrdown estilo Github</a>.',
     'favicon'                   => 'Favicon',
@@ -66,8 +66,8 @@ return [
     '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' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_keywords' => 'soporte de la empresa, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, eula, tos, dashboard, privacidad',
+    'general_settings_help'     => 'EULA por defecto y más',
     'generate_backup'			=> 'Generar Respaldo',
     'header_color'              => 'Color de encabezado',
     'info'                      => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.',
@@ -75,19 +75,22 @@ return [
     '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'        => '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.',
-    'ldap_help'                 => 'LDAP/Active Directory',
-    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    '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_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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_client_tls_key'       => 'LDAP Clave TLS de cliente',
+    '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_manager'              => 'LDAP Manager',
+    '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',
@@ -111,20 +114,20 @@ return [
     'ldap_auth_filter_query'    => 'Consulta de autentificación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo 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'  => '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_emp_num'              => 'Número de empleado LDAP',
     'ldap_email'                => 'Email LDAP',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Probar LDAP',
+    'ldap_test_sync'            => 'Prueba de sincronización LDAP',
     'license'                   => 'Licencia de Software',
     'load_remote_text'          => 'Scripts remotos',
     'load_remote_help_text'		=> 'Esta instalación de Snipe-IT puede cargar scripts desde fuera.',
-    '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'                     => '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'          => '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_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
@@ -147,17 +150,17 @@ return [
     'php'                       => 'Versión de PHP',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
+    '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.',
     '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' => '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' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
+    'pwd_secure_complexity_letters' => 'Requiere al menos una letra',
+    '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_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
@@ -165,8 +168,8 @@ return [
     'qr_help'                   => 'Activa Códigos QR antes para poder ver esto',
     'qr_text'                   => 'Texto Código QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    '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 la entidad',
@@ -178,7 +181,7 @@ return [
     '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_forcelogin_label'     => 'SAML Force Login',
+    '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_slo_label'            => 'Cerrar sesión única SAML',
@@ -186,7 +189,7 @@ return [
     '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_download'             => 'Download Metadata',
+    'saml_download'             => 'Descargar metadatos',
     'setting'                   => 'Parámetro',
     'settings'                  => 'Configuración',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Nombre del sitio',
+    'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Nombre de bot en Slack',
-    'slack_channel'             => 'Canal en Slack',
-    'slack_endpoint'            => 'Terminal en Slack',
-    'slack_integration'         => 'Configuración Slack',
-    'slack_integration_help'    => 'La integración con Slack es opcional, sin embargo, la terminal y el canal son requeridos si desea usarlo. Para configurar la integración con Slack, debe primero <a href=":slack_link" target="_new">crear un webhook entrante</a> en su cuenta de Slack. Haga clic en el botón<strong>Probar la Integración con Slack</strong> para confirmar que su configuraci{on es correcta antes de guardarla. ',
-    'slack_integration_help_button'    => 'Una vez que haya guardado su información de Slack, aparecerá un botón de prueba.',
-    'slack_test_help'           => 'Pruebe si su integración de Slack está configurada correctamente. Debe Guardar Primero su configuracion Slack Actualizada.',
+    'general_webhook'           => 'Webhook general',
+    '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_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',
     'support_footer'            => 'Enlaces de Soporte de Pie de Página ',
     'support_footer_help'       => 'Especifica quien ve los enlaces de información de Soporte y Manual de Usuarios de Snipe-IT',
@@ -216,8 +224,8 @@ return [
     'update'                    => 'Actualizar Parámetros',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    '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.',
@@ -229,7 +237,7 @@ return [
     'privacy_policy'            => 'Política de Privacidad',
     'privacy_policy_link_help'  => 'Si se incluye una URL aquí, un enlace a tu Política de Privacidad se incluirá al pie de la aplicación y en cualquier correo electrónico que el sistema envíe, de conformidad con la ley GDPR. ',
     'purge'                     => 'Purgar registros eliminados',
-    'purge_deleted'             => 'Purge Deleted ',
+    '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',
@@ -275,51 +283,56 @@ return [
     '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',
     'username_format_help'   => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.',
-    'oauth_title' => 'OAuth API Settings',
+    'oauth_title' => 'Configuración de la API de OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'oauth_help' => 'Configuración de Endpoint para Oauth',
+    'asset_tag_title' => 'Actualizar ajustes de etiqueta de activos',
+    'barcode_title' => 'Actualizar ajustes de código 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 en caché. Esto normalmente sólo se usaría si la configuración del código de barras ha cambiado, o si la URL de Snipe-IT ha cambiado. Los códigos de barras se regenerarán cuando se acceda a continuación.',
+    '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',
+    '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' => 'Localizació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',
+    'notifications' => 'Notificaciones',
+    'notifications_help' => 'Alertas de Correo y Configuración de Auditoría',
+    'asset_tags_help' => 'Incrementales y prefijos',
+    'labels' => 'Etiquetas',
+    'labels_title' => 'Actualizar ajustes de etiqueta',
+    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
+    'purge' => 'Purgar',
+    'purge_keywords' => 'eliminar permanentemente',
+    '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',
-    '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',
+    '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!',
+    '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',
+    'google_callback_help' => 'Esto debería introducirse como la URL de devolución de llamada en la configuración de la aplicación de Google OAuth de la <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> de tu 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. ',
+
 ];
diff --git a/resources/lang/es-MX/admin/settings/message.php b/resources/lang/es-MX/admin/settings/message.php
index 265a90400c..043832ef47 100644
--- a/resources/lang/es-MX/admin/settings/message.php
+++ b/resources/lang/es-MX/admin/settings/message.php
@@ -11,8 +11,8 @@ return [
         '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.',
-        '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'       => '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?'
     ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
@@ -20,24 +20,25 @@ return [
         'success'               => 'Registros eliminados correctamente purgados.',
     ],
     'mail' => [
-        'sending' => 'Sending Test Email...',
+        'sending' => 'Enviando correo electrónico de prueba...',
         'success' => 'Correo enviado!',
         'error' => 'El correo no puede ser enviado.',
-        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+        'additional' => 'Ningún mensaje de error adicional proporcionado. Comprueba la configuración de tu correo y el registro de mensajes de tu aplicación.'
     ],
     'ldap' => [
-        'testing' => 'Testing LDAP Connection, Binding & Query ...',
-        '500' => '500 Server Error. Please check your server logs for more information.',
+        '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.',
         'error' => 'Algo salió mal :(',
-        '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' => '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!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Algo salió mal.',
+    'webhook' => [
+        'sending' => 'Enviando mensaje de prueba a :app...',
+        'success_pt1' => '¡Éxito! Comprueba 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_misc' => 'Algo salió mal. :( ',
     ]
 ];
diff --git a/resources/lang/es-MX/admin/settings/table.php b/resources/lang/es-MX/admin/settings/table.php
index 22db5c84ed..f1fd5c550f 100644
--- a/resources/lang/es-MX/admin/settings/table.php
+++ b/resources/lang/es-MX/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Creado',
+    'size' => 'Tamaño',
 );
diff --git a/resources/lang/es-MX/admin/users/general.php b/resources/lang/es-MX/admin/users/general.php
index c64e543b99..4883a1ff12 100644
--- a/resources/lang/es-MX/admin/users/general.php
+++ b/resources/lang/es-MX/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     '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.',
     'print_assigned'    => 'Imprimir todos los Asignados',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'Lista de correos de los asignados',
+    'user_notified'     => 'Se ha enviado al usuario un correo con la lista de sus articulos asignados.',
+    '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 que este usuario para enviar las credenciales. Las credenciales de correo electrónico sólo se pueden hacer en 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',
@@ -33,12 +35,20 @@ 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' => 'ADVERTENCIA:',
     'warning_deletion_information' => 'Estas a punto de reingresar los :count usuario(s) listados abajo. Los nombres de Super admins están resaltados en rojo.',
-    'update_user_assets_status' => 'Update all assets for these users to this status',
+    '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',
     'remote_label'   => 'Este es un usuario remoto',
     'remote'   => 'Remoto',
-    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
+    'remote_help' => 'Esto puede ser útil si necesita filtrar por usuarios remotos que nunca o raramente entran en sus ubicaciones físicas.',
     'not_remote_label' => 'Este no es un usuario remoto',
+    'vip_label' => 'Usuario VIP',
+    'vip_help' => 'Esto puede ser útil para marcar a personas importantes en su organización si desea manejarlas de maneras especiales.',
+    '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',
+    'next_save_user' => 'Siguiente: Guardar usuario',
+    'all_assigned_list_generation' => 'Generado el:',
+    'email_user_creds_on_create' => '¿Enviar a este usuario sus credenciales?',
 ];
diff --git a/resources/lang/es-MX/admin/users/message.php b/resources/lang/es-MX/admin/users/message.php
index f9778ff12e..89b803767c 100644
--- a/resources/lang/es-MX/admin/users/message.php
+++ b/resources/lang/es-MX/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Ha declinado con éxito este equipo.',
     'bulk_manager_warn'	        => 'Sus usuarios han sido correctamente actualizados, de todos modos la entrada de administrador no fue guardada porque el administrador seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propior administradores. Vuelva a seleccionar los usuarios, excluyendo al administrador.',
     'user_exists'               => 'El Usuario ya existe!',
-    'user_not_found'            => 'Usuario [:id] no existe.',
+    'user_not_found'            => 'El usuario no existe.',
     'user_login_required'       => 'El campo Usuario es obligatorio',
     'user_password_required'    => 'El password es obligatorio.',
     'insufficient_permissions'  => 'No tiene permiso.',
@@ -15,7 +15,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.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Este usuario no tiene ningún activo asignado',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Este usuario no tiene ningún correo electrónico.',
+        'success' => 'El usuario ha sido notificado sobre su inventario actual.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/es-MX/auth/general.php b/resources/lang/es-MX/auth/general.php
index d4c2a9d393..0168d1ac07 100644
--- a/resources/lang/es-MX/auth/general.php
+++ b/resources/lang/es-MX/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Recordarme',
     'username_help_top'                 => 'Introduzca 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 un correo electrónico asociado no recibirá un correo electrónico con un enlace de restablecimiento de contraseña.</strong> ',
-    ];
+    'google_login'                  => 'O inicia sesión con Google Workspace',
+    'google_login_failed'           => 'Error al iniciar sesión en Google. Vuelve a intentarlo.',
+
+];
 
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index fe00824631..4792b35f3b 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
+    'accepted_date'         => 'Fecha de aceptación',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Reporte de Accesorios',
     'action'                => 'Acción',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Sitios añadidos',
-    'age'                   => "Age",
+    'age'                   => "Edad",
     'all_assets'			=> 'Todos los Equipos',
     'all'       			=> 'Todos los',
     'archived'              => 'Archivado',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditoría',
     'audit_report'			=> 'Registro de auditoría',
     'assets'				=> 'Equipos',
+    'assets_audited'        => 'activos auditados',
+    'assets_checked_in_count'     => 'activos registrados',
+    'assets_checked_out_count'     => 'activos entregados',
+    'asset_deleted_warning'     => 'Este activo ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
+    'assigned_date'         => 'Fecha asignada',
     'assigned_to'           => 'Asignado a :name',
+    'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Eliminar Avatar',
     'avatar_upload'         => 'Subir Avatar',
     'back'      			=> 'Atras',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Editar en grupo',
     'bulk_delete'           => 'Eliminar en grupo',
     'bulk_actions'          => 'Acciones masivas',
-    'bulk_checkin_delete'   => 'Reingreso masivo de elementos desde Usuarios',
+    'bulk_checkin_delete'   => 'Hacer Checkin / Eliminar usuarios en masa',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Este equipo es propiedad del usuario',
     'bystatus'              => 'por Estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
@@ -83,6 +92,7 @@ return [
     '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>.',
     'delete'  				=> 'Borrar',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
+    'delete_confirm_no_undo' => '¿Estás seguro de que deseas eliminar este articulo? Esta acción no se puede revertir.',
     'deleted'  				=> 'Borrado',
     'delete_seats'  		=> 'Asientos eliminados',
     'deletion_failed'       => 'Error al eliminar',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif y svg. 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',
     '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>.',
@@ -147,7 +158,9 @@ return [
     'asset_maintenance_report' => 'Reporte de Mantenimiento de Equipo',
     'asset_maintenances'       => 'Mantenimientos de Equipo',
     'item'  				=> 'Item',
-    'item_name'             => 'Nombre del ítem',
+    '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',
@@ -168,7 +181,7 @@ return [
     'logout'				=> 'Desconexión',
     'lookup_by_tag'     => 'Buscar por etiqueta de activo',
     'maintenances'          => 'Mantenimientos',
-    'manage_api_keys'       => 'Administrar API Keys',
+    'manage_api_keys'       => 'Administrar claves 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>.',
@@ -201,7 +214,7 @@ return [
     'purchase_date'         => 'Fecha de compra',
     'qty'		            => 'Cant',
     'quantity'		        => 'Cantidad',
-    'quantity_minimum'      => 'Tienes :count elementos por debajo o casi por debajo de los niveles mínimos de cantidad',
+    'quantity_minimum'      => 'Tienes :count artículos por debajo o casi por debajo de los niveles mínimos de cantidad',
     'quickscan_checkin'  	=> 'Escaneo rápido de entrada',
     'quickscan_checkin_status'  	=> 'Estado de registro',
     'ready_to_deploy'		=> 'Disponibles',
@@ -213,11 +226,12 @@ return [
     'restore'				=> 'Restaurar',
     'requestable_models'    => 'Modelos disponibles para solicitar',
     'requested'				=> 'Solicitado',
-    'requested_date'        => 'Fecha de solicitud',
+    'requested_date'        => 'Fecha solicitada',
     'requested_assets'      => 'Activos solicitados',
     'requested_assets_menu' => 'Activos solicitados',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
+    'select_var'            => 'Seleccionar :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'Se enviará un mensaje de slack',
-    'slack_test_msg'        => '¡Oh mira! ¡Parece que tu integración de Slack con Snipe-IT está funcionando!',
+    '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',
     'state'  				=> 'Provincia',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '¿Está seguro que desea eliminar',
     'submit'				=> 'Enviar',
     'target'                => 'Objetivo',
-    'toggle_navigation'     => 'Alternar navegación',
     'time_and_date_display' => 'Hora y fecha',
     'total_assets'			=> 'Equipos',
     'total_licenses'		=> 'licencias totales',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Si',
     'zip'  					=> 'Códio Postal',
     'noimage'				=> 'Imagen no subida o imagen no encontrada.',
-    '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'   => 'El archivo solicitado no existe en el servidor.',
+    'file_upload_success'   => 'Archivo subido con éxito!',
+    'no_files_uploaded'     => 'Archivo subido con éxito!',
     'token_expired'         => 'Su sesión ha expirado, Intente otra ves.',
     'login_enabled'         => 'Inicio de sesión activado',
     'audit_due'             => 'Para Auditoria',
@@ -300,7 +313,7 @@ return [
     'hide_deleted'          => 'Ocultar eliminados',
     'email'                 => 'Email',
     'do_not_change'         => 'No cambiar',
-    'bug_report'            => 'Reportar un fallo',
+    'bug_report'            => 'Reportar un error',
     'user_manual'           => 'Manual del usuario',
     'setup_step_1'          => 'Paso 1',
     'setup_step_2'          => 'Paso 2',
@@ -309,19 +322,19 @@ return [
     'setup_config_check'    => 'Comprobar configuración',
     'setup_create_database' => 'Crear Tablas de Base de Datos',
     'setup_create_admin'    => 'Crear Usuario Admin',
-    'setup_done'            => '¡Terminado!',
+    'setup_done'            => '¡Finalizada!',
     'bulk_edit_about_to'    => 'Estás 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',
-    '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.',
+    '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.',
     '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>
-            <p>Si desea exportar sólo ciertos activos, utilice las siguientes opciones para afinar sus resultados.</p>',
+    'to'                    => 'Para',
+    '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>',
     'range'                 => 'Rango',
     'bom_remark'            => 'Añadir un BOM (signo de orden de byte) a este CSV',
     'improvements'          => 'Mejoras',
@@ -344,16 +357,16 @@ return [
     'new_consumable'        => 'Nuevo Consumible',
     '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_success'  => 'Éxito:',
     'notification_warning'   => 'Advertencia:',
-    'notification_info'      => 'Info:',
+    'notification_info'      => 'Información:',
     'asset_information'     => 'Información del activo',
     'model_name'            => 'Nombre del modelo:',
     'asset_name'            => 'Nombre del activo:',
@@ -364,29 +377,76 @@ return [
     'clone_item'            => 'Clonar objeto',
     'checkout_tooltip' => 'Registrar salida de este elemento',
     'checkin_tooltip' => 'Registrar entrada de este elemento',
-    'checkout_user_tooltip' => 'Registrar salida de este elemento para un usuario',
-    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido por actualizaciones del sistema. Por favor, vuelva más tarde.',
+    'checkout_user_tooltip' => 'Revisa este elemento a un usuario',
+    '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',
     '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 su aceptación de activos.',
+    'shitty_browser'        => 'No se ha detectado ninguna firma. Si está utilizando un navegador antiguo, por favor utilice un navegador más moderno para completar su aceptación de activos.',
     '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 Ajustes 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 todos los :asset_count activos ',
+    'set_to_null'           => 'Eliminar valores para este activo|Eliminar valores para los :asset_count activos ',
+    '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 del tablero',
+    'pie_chart_type'        => 'Tipo de gráfico circular del Tablero',
     'hello_name'            => '¡Hola, :name!',
     'unaccepted_profile_warning'   => 'Tienes :count elementos que requieren aceptación. Haz clic aquí para aceptarlos o rechazarlos',
     'start_date'            => 'Fecha de inicio',
     'end_date'            => 'Fecha de fin',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
-    'placeholder_kit'       => 'Seleccione un kit'
+    'placeholder_kit'       => 'Seleccione un kit',
+    'file_not_found'        => 'Archivo no encontrado',
+    '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',
+    'alerts'                => 'Alertas',
+    'tasks_view_all'        => 'Mostrar 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á 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.',
+    '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',
+    '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.',
+    'send_welcome_email_to_users'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
+    'back_before_importing'     => '¿Copia de seguridad antes de importar?',
+    'csv_header_field'          => 'Campo de cabecera CSV',
+    'import_field'              => 'Importar campo',
+    'sample_value'              => 'Valor de ejemplo',
+    'no_headers'                => 'No se encontraron columnas',
+    'error_in_import_file'      => 'Hubo un error leyendo el archivo CSV: :error',
+    'percent_complete'          => ':percent % Completado',
+    'errors_importing'          => 'Se han producido algunos errores al importar: ',
+    'warning'                   => 'ADVERTENCIA: :warning',
+    'success_redirecting'       => '"Éxito... Redirigiendo.',
+    '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',
+    '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.',
+    '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.',
+    'modal_confirm_generic'      => '¿Está seguro?',
+    'cannot_be_deleted'      => 'Este elemento no puede ser eliminado',
+    'undeployable_tooltip'      => 'Este elemento no puede ser asignado. Compruebe la cantidad restante.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es-MX/help.php b/resources/lang/es-MX/help.php
index 0b4fa13e5b..bdb0595b06 100644
--- a/resources/lang/es-MX/help.php
+++ b/resources/lang/es-MX/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Al marcar esta casilla se editará el activo para reflejar esta nueva ubicación. Dejarla desmarcada simplemente anotará la ubicación en la auditoría.<br><br>Tenga en cuenta que este activo está asignado, no se cambiará la ubicación de la persona, activo o ubicación de donde está asignado.',
+    '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.',
 
     '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.',
 
diff --git a/resources/lang/es-MX/localizations.php b/resources/lang/es-MX/localizations.php
index be2c321861..d160931cb3 100644
--- a/resources/lang/es-MX/localizations.php
+++ b/resources/lang/es-MX/localizations.php
@@ -2,313 +2,314 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Seleccione un idioma',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Inglés, EEUU',
+        'en-GB'=> 'Inglés, Reino Unido',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
+        'ar'=> 'Árabe',
+        'bg'=> 'Búlgaro',
+        'zh-CN'=> 'Chino simplificado',
+        'zh-TW'=> 'Chino tradicional',
+        'hr'=> 'Croata',
+        'cs'=> 'Checo',
+        'da'=> 'Danés',
+        'nl'=> 'Holandés',
+        'en-ID'=> 'Inglés, Indonesia',
+        'et'=> 'Estonio',
         'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
+        'fi'=> 'Finlandés',
+        'fr'=> 'Francés',
+        'de'=> 'Alemán',
+        'de-i'=> 'Alemán (informal)',
+        'el'=> 'Griego',
+        'he'=> 'Hebreo',
+        'hu'=> 'Húngaro',
         'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
+        'id'=> 'Indonesio/a',
+        'ga-IE'=> 'Irlandés',
+        'it'=> 'Italiano',
+        'ja'=> 'Japonés',
+        'ko'=> 'Coreano',
+        'lv'=>'Letón',
+        'lt'=> 'Lituano',
+        'mk'=> 'Macedonio',
+        'ms'=> 'Malayo',
         'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
+        'mn'=> 'Mongol',
+        'no'=> 'Noruego',
+        'fa'=> 'Persa',
+        'pl'=> 'Polaco',
+        'pt-PT'=> 'Portugués',
+        'pt-BR'=> 'Portugués, Brasileño',
+        'ro'=> 'Rumano',
+        'ru'=> 'Ruso',
         'sr-CS' => 'Serbian (Latin)',
         'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'es-ES'=> 'Español',
+        'es-CO'=> 'Español, Colombia',
+        'es-MX'=> 'Español, México',
+        'es-VE'=> 'Español, Venezuela',
+        'sv-SE'=> 'Sueco',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'th'=> 'Tailandés',
+        'tr'=> 'Turco',
+        'uk'=> 'Ucraniano',
+        'vi'=> 'Vietnamita',
+        'cy'=> 'Galés',
+        'zu'=> 'Zulú',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Seleccione un país',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Isla de Ascensión',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AE'=>'Emiratos Árabes Unidos',
+        'AF'=>'Afganistán',
+        'AG'=>'Antigua y Barbuda',
         'AI'=>'Anguilla',
         'AL'=>'Albania',
         'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AN'=>'Antillas Holandesas',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'La antártida',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
+        'AS'=>'Samoa Estadounidense',
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Islas Åland',
+        'AZ'=>'Azerbaiyán',
+        'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
+        'BE'=>'Bélgica',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BH'=>'Baréin',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Brunéi Darussalam',
         'BO'=>'Bolivia',
-        'BR'=>'Brazil',
+        'BR'=>'Brasil',
         'BS'=>'Bahamas',
         'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BV'=>'La Isla De Bouvet',
         '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',
+        'BY'=>'Bielorrusia',
+        'BZ'=>'Belice',
+        'CA'=>'Canadá',
+        'CC'=>'Islas Cocos (Keeling)',
+        'CD'=>'Congo (República Democrática)',
+        'CF'=>'República Centroafricana',
+        'CG'=>'Congo (República)',
+        'CH'=>'Suiza',
+        'CI'=>'Costa de Marfil',
+        'CK'=>'Islas Cook',
         'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CM'=>'Camerún',
+        'CN'=>'República Popular 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',
+        'CV'=>'Cabo Verde',
+        'CX'=>'Isla de Navidad',
+        'CY'=>'Chipre',
+        'CZ'=>'República Checa',
+        'DE'=>'Alemania',
+        'DJ'=>'Djibuti',
+        'DK'=>'Dinamarca',
+        'DM'=>'Domínica',
+        'DO'=>'República Dominicana',
+        'DZ'=>'Argelia',
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EG'=>'Egipto',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
+        'ES'=>'España',
+        'ET'=>'Etiopía',
+        'EU'=>'Unión Europea',
+        'FI'=>'Finlandia',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
+        'FK'=>'Islas Falkland (Malvinas)',
+        'FM'=>'Estados Federados de la Micronesia',
+        'FO'=>'Islas Faroe',
+        'FR'=>'Francia',
         'GA'=>'Gabon',
-        'GD'=>'Grenada',
+        'GD'=>'Granada',
         'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GF'=>'Guayana Francesa',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GL'=>'Groenlandia',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GP'=>'Guadalupe',
+        'GQ'=>'Guinea Ecuatorial',
+        'GR'=>'Grecia',
+        'GS'=>'Georgia del sur y las Islas Sandwich del Sur',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
-        'GW'=>'Guinea-Bissau',
+        'GW'=>'Guinea-Bisáu',
         'GY'=>'Guyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Islas Heard y Mc Donald',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
-        'HT'=>'Haiti',
-        'HU'=>'Hungary',
+        'HR'=>'Croacia (nombre local: Hrvatska)',
+        'HT'=>'Haití',
+        'HU'=>'Hungría',
         'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'IE'=>'Irlanda',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'IM'=>'Isla de Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IO'=>'Territorio Británico del Océano Índico',
+        'IQ'=>'Irak',
+        'IR'=>'Irán, República Islámica Del',
+        'IS'=>'Islandia',
+        'IT'=>'Italia',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
+        'JO'=>'Jordania',
+        'JP'=>'Japón',
+        'KE'=>'Kenia',
         'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KH'=>'Camboya',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Comoras',
+        'KN'=>'San Cristóbal y Nevis',
+        'KR'=>'Corea del Sur',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
+        'KY'=>'Islas Caimán',
+        'KZ'=>'Kazakan',
+        'LA'=>'República Democrática Popular Laos',
+        'LB'=>'Líbano',
+        'LC'=>'Santa Lucía',
         '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',
+        'LU'=>'Luxemburgo',
+        'LV'=>'Letonia',
+        'LY'=>'Jamahiriya Árabe Libia',
+        'MA'=>'Marruecos',
+        'MC'=>'Mónaco',
+        'MD'=>'Repúplica de Moldavia',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'MH'=>'Islas Marshall',
+        'MK'=>'Macedonia, Ex República Yugoslava de',
         'ML'=>'Mali',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
+        'MO'=>'Macao',
+        'MP'=>'Islas Mariana del Norte',
+        'MQ'=>'Martinica',
         'MR'=>'Mauritania',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Mauricio',
+        'MV'=>'Maldivas',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
+        'MX'=>'México',
+        'MY'=>'Malasia',
         'MZ'=>'Mozambique',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'NC'=>'Nueva Caledonia',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NF'=>'Isla Norfolk',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Países Bajos',
+        'NO'=>'Noruega',
         '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',
+        'NU'=>'Isla Niue',
+        'NZ'=>'Nueva Zelanda',
+        'OM'=>'Omán',
+        'PA'=>'Panamá',
+        'PE'=>'Perú',
+        'PF'=>'Polinesia Francesa',
+        'PG'=>'Papúa Nueva Guinea',
+        'PH'=>'Republica de Filipinas',
+        'PK'=>'Pakistán',
+        'PL'=>'Polonia',
+        'PM'=>'San Pedro y Miquelón',
+        'PN'=>'Islas Pitcairn',
         'PR'=>'Puerto Rico',
         'PS'=>'Palestine',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
         'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
+        'RE'=>'Reunión',
+        'RO'=>'Rumania',
         'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'RU'=>'Federación Rusa',
+        'RW'=>'Ruanda',
+        'SA'=>'Arabia Saudita',
+        'UK'=>'Escocia',
+        'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SS'=>'Sudán del Sur',
+        'SD'=>'Sudán',
+        'SE'=>'Suecia',
+        'SG'=>'Singapur',
         'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
+        'SI'=>'Eslovenia',
+        'SJ'=>'Islas Svalbard y Jan Mayen',
+        'SK'=>'Eslovaquia (República Eslovaca)',
+        'SL'=>'Sierra Leona',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
-        'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'SR'=>'Surinam',
+        'ST'=>'Sao Tomé y Príncipe',
+        'SU'=>'Unión Soviética',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'República Árabe Siria',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
+        'TC'=>'Islas Turcas y Caicos',
         'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TF'=>'Territorios franceses del sur',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
+        'TH'=>'Tailandia',
+        'TJ'=>'Tayikistán',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TI'=>'Timor Oriental',
+        'TM'=>'Turkmenistán',
+        'TN'=>'Túnez',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Timor Oriental (código antiguo)',
+        'TR'=>'Turquía',
+        'TT'=>'Trinidad y Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TW'=>'Taiwán',
+        'TZ'=>'Tanzania, República Unida de',
+        'UA'=>'Ucrania',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'Reino Unido',
+        'US'=>'Estados Unidos',
+        'UM'=>'Islas Menores de Estados Unidos',
         'UY'=>'Uruguay',
         'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'VA'=>'Estado del Vaticano (Santa Sede)',
+        'VC'=>'San Vicente y las Granadinas',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
+        'VG'=>'Islas Vírgenes Británicas',
+        'VI'=>'Islas Vírgenes de los Estados Unidos',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Sudáfrica',
         'ZM'=>'Zambia',
         'ZW'=>'Zimbabwe',
     ],
diff --git a/resources/lang/es-MX/mail.php b/resources/lang/es-MX/mail.php
index 217efad654..94054a8f0e 100644
--- a/resources/lang/es-MX/mail.php
+++ b/resources/lang/es-MX/mail.php
@@ -2,7 +2,7 @@
 
 return [
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un artículo',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_declined' => 'Un usuario ha rechazado un artículo',
     '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',
     'accessory_name' => 'Nombre de accesorio:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT con las credenciales siguientes:',
     'login' => 'Entrar:',
     'Low_Inventory_Report' => 'Reporte de inventario bajo',
+    'inventory_report' => 'Reporte de Inventario',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo se ha extraído bajo su nombre, los detalles están a continuación.',
@@ -61,7 +62,7 @@ return [
     'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
     '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.',
-    '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' => '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.',
     '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.',
     'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
     'type' => 'Tipo',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Tus credenciales de Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accesorio devuelto',
     'Asset_Checkin_Notification' => 'Activo devuelto',
+    'Asset_Checkout_Notification' => 'Activo asignado',
     'License_Checkin_Notification' => 'Licencia devuelta',
     'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
     'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date',
     'your_assets' => 'Ver tus activos',
+    'rights_reserved' => 'Todos los derechos reservados.',
 ];
diff --git a/resources/lang/es-MX/validation.php b/resources/lang/es-MX/validation.php
index 7361de1914..7be4c0ed9f 100644
--- a/resources/lang/es-MX/validation.php
+++ b/resources/lang/es-MX/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'El: atributo debe ser un archivo.',
     'filled'               => 'El campo: atributo debe tener un valor.',
     'image'                => ':attribute debe ser una imagen.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la empresa',
     'json'                 => 'El atributo: debe ser una cadena JSON válida.',
     'max'                  => [
         'numeric' => ':attribute no debe ser mayor que :max.',
@@ -66,7 +66,9 @@ return [
         'string'  => ':attribute debe contener como mínimo :min caracteres.',
         'array'   => 'El atributo: debe tener al menos: elementos min.',
     ],
-    'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
+    '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.',
+
     'not_in'               => 'El :attribute seleccionado no es correcto.',
     'numeric'              => ':attribute debe ser un número.',
     'present'              => 'El campo: atributo debe estar presente.',
@@ -93,7 +95,7 @@ return [
     'url'                  => ':attribute formato incorrecto.',
     'unique_undeleted'     => 'El :atrribute debe ser único.',
     'non_circular'         => ':attribute no debe crear una referencia circular.',
-    '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Tu 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.',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/es-VE/account/general.php b/resources/lang/es-VE/account/general.php
index 7fc060a849..27118e2f3a 100644
--- a/resources/lang/es-VE/account/general.php
+++ b/resources/lang/es-VE/account/general.php
@@ -1,12 +1,12 @@
 <?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' => 'Claves API personales',
+    'api_key_warning' => 'Al generar un token API, asegúrate de copiarlo inmediatamente ya que
+                    no será visible de nuevo.',
+    'api_base_url' => 'La url base de tu API es:',
     '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.',
+    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
+    'api_reference' => 'Por favor, revise la <a href="https://snipe-it.readme.io/reference" target="_blank">referencia API</a> para
+                    encontrar endpoints específicos de la API y documentación adicional de la API.',
 );
diff --git a/resources/lang/es-VE/admin/accessories/general.php b/resources/lang/es-VE/admin/accessories/general.php
index e972a7f8a7..ba25a641fe 100644
--- a/resources/lang/es-VE/admin/accessories/general.php
+++ b/resources/lang/es-VE/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Actualizar Accesorio',
     'use_default_eula'					=> 'Usa la <a href="#" data-toggle="modal" data-target="#eulaModal">licencia primaria por defecto</a> en su lugar.',
     'use_default_eula_disabled'			=> '<del>Usa la licencia primaria por defecto en su lugar.</del> No se ha establecido una licencia primaria por defecto. Por favor, añade una en las configuraciones.',
+    'clone'                             => 'Clonar accesorio',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/es-VE/admin/accessories/message.php b/resources/lang/es-VE/admin/accessories/message.php
index 508ec2255f..6f7b6d4277 100644
--- a/resources/lang/es-VE/admin/accessories/message.php
+++ b/resources/lang/es-VE/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Equipo no ha sido retirado, inténtalo de nuevo',
         'success' 		=> 'El accesorio se ha retirado exitosamente.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.'
     ),
 
diff --git a/resources/lang/es-VE/admin/asset_maintenances/form.php b/resources/lang/es-VE/admin/asset_maintenances/form.php
index d048dc08de..1318740d0f 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',
+        'asset_maintenance_type' => 'Tipo de Mantenimiento de Equipo',
         'title'                  => 'Título',
-        'start_date'             => 'Empezado',
-        'completion_date'        => 'Completado',
+        'start_date'             => 'Fecha de inicio',
+        'completion_date'        => 'Fecha de Terminación',
         'cost'                   => 'Costo',
         'is_warranty'            => 'Mejora de la Garantía',
-        'asset_maintenance_time' => 'Días',
+        'asset_maintenance_time' => 'Tiempo de Mantenimiento de Equipo (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar',
-        'create'                 => 'Crear'
+        'update'                 => 'Actualizar Mantenimiento de Equipo',
+        'create'                 => 'Crear Mantenimiento de Equipo'
     ];
diff --git a/resources/lang/es-VE/admin/categories/message.php b/resources/lang/es-VE/admin/categories/message.php
index 890dca5023..e4bc9b094f 100644
--- a/resources/lang/es-VE/admin/categories/message.php
+++ b/resources/lang/es-VE/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'La categoría no fue actualizada, por favor inténtalo de nuevo',
-        'success' => 'Categoría actualizada correctamente.'
+        'success' => 'Categoría actualizada correctamente.',
+        'cannot_change_category_type'   => 'No se puede cambiar el tipo de categoría una vez que se ha creado',
     ),
 
     'delete' => array(
diff --git a/resources/lang/es-VE/admin/components/general.php b/resources/lang/es-VE/admin/components/general.php
index 3340ee34e5..ffe27b2fcb 100644
--- a/resources/lang/es-VE/admin/components/general.php
+++ b/resources/lang/es-VE/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
     'update'                            => 'Actualizar Componente',
+    'checkin_limit'            => 'La cantidad de checkins 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 23407f80df..f25167c2e2 100644
--- a/resources/lang/es-VE/admin/components/message.php
+++ b/resources/lang/es-VE/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-VE/admin/consumables/message.php b/resources/lang/es-VE/admin/consumables/message.php
index 73a21639ec..487533853f 100644
--- a/resources/lang/es-VE/admin/consumables/message.php
+++ b/resources/lang/es-VE/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'El consumible no fue retirado, 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.'
+        'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/es-VE/admin/custom_fields/general.php b/resources/lang/es-VE/admin/custom_fields/general.php
index 2f8185f4d2..14384057ac 100644
--- a/resources/lang/es-VE/admin/custom_fields/general.php
+++ b/resources/lang/es-VE/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Usado por Modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo Fieldset',
+    'update_fieldset'         => 'Actualizar grupo de campos',
+    'fieldset_does_not_exist'   => 'Grupo de campos :id no existe',
+    'fieldset_updated'         => 'Grupo de campos actualizado',
     'create_fieldset_title' => 'Crear un nuevo conjunto de campos',
     'create_field'            => 'Nuevo Campo Personalizado',
     'create_field_title' => 'Crear un campo personalizado',
@@ -44,6 +47,8 @@ return [
     '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 unico en todos los activos',
     'unique' => 'Único',
-    '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' => 'Permitir al usuario ver estos valores en su página Ver Recursos asignados',
+    'display_in_user_view_table' => 'Visible para el usuario',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/es-VE/admin/custom_fields/message.php b/resources/lang/es-VE/admin/custom_fields/message.php
index 66cfdd5654..c04f50f292 100644
--- a/resources/lang/es-VE/admin/custom_fields/message.php
+++ b/resources/lang/es-VE/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Error al validar los valores por defecto 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 2f5aedc7b9..64669ac9e3 100644
--- a/resources/lang/es-VE/admin/departments/message.php
+++ b/resources/lang/es-VE/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'El departamento no existe.',
-    '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' => 'Ya existe un departamento con ese nombre en la ubicación de la empresa. 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. ',
     'create' => array(
         'error'   => 'El departamento no fue creado, por favor, inténtelo de nuevo.',
diff --git a/resources/lang/es-VE/admin/groups/message.php b/resources/lang/es-VE/admin/groups/message.php
index db8f2a14a1..e50c7bb643 100644
--- a/resources/lang/es-VE/admin/groups/message.php
+++ b/resources/lang/es-VE/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => '¡El grupo ya existe!',
-    'group_not_found'     => 'El grupo [:id] no existe.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'El nombre del campo es necesario',
 
     'success' => array(
diff --git a/resources/lang/es-VE/admin/hardware/form.php b/resources/lang/es-VE/admin/hardware/form.php
index 67e44fd3d9..973b6d7bf2 100644
--- a/resources/lang/es-VE/admin/hardware/form.php
+++ b/resources/lang/es-VE/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirmar Eliminación Masiva de Activos',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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'	=> 'Vas a eliminar :asset_count activos.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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 activo.|Está a punto de editar las propiedades de :asset_count activos.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_not_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
     'asset_deployable' => 'Ese estado es desplegable. Este activo puede ser revisado.',
-    'processing_spinner' => 'Procesando...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Información opcional',
     'order_details'   => 'Información relacionada con el pedido'
 ];
diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php
index 074574c709..bc0659e2fa 100644
--- a/resources/lang/es-VE/admin/hardware/general.php
+++ b/resources/lang/es-VE/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Este activo fue eliminado.',
     'edit'  					=> 'Editar Activo',
     'model_deleted'  			=> 'Este Modelo de activo fue eliminado. Debes restaurar este modelo antes de poder restaurar el Activo.',
+    'model_invalid'             => 'El modelo de este activo no es válido.',
+    'model_invalid_fix'         => 'El Activo debe ser editado para corregir esto antes de intentar retirarlo o asignarlo.',
     'requestable'               => 'Solicitable',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No solicitable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restaurar Activo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No enviable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Ver Activo',
     'csv_error' => 'Tiene un error en su archivo CSV:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     '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'
+    'custom_export' => 'Personalizar exportación',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de Garantía para :manufacturer',
 ];
diff --git a/resources/lang/es-VE/admin/hardware/message.php b/resources/lang/es-VE/admin/hardware/message.php
index 976d686d71..487a5896ee 100644
--- a/resources/lang/es-VE/admin/hardware/message.php
+++ b/resources/lang/es-VE/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'El activo no fue restaurado, por favor, inténtalo de nuevo',
         'success' 		=> 'Activo restaurado correctamente.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Tu archivo ha sido importado',
         'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
         'file_delete_error'      => 'El archivo no se pudo eliminar',
+        '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',
     ],
 
 
diff --git a/resources/lang/es-VE/admin/hardware/table.php b/resources/lang/es-VE/admin/hardware/table.php
index edb1e65cf8..b7d8b81bb1 100644
--- a/resources/lang/es-VE/admin/hardware/table.php
+++ b/resources/lang/es-VE/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Registrado / Asignado',
     'checkout_date' => 'Fecha de Asignación',
     'checkoutto' 	=> 'Asignado',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Valor actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
diff --git a/resources/lang/es-VE/admin/licenses/general.php b/resources/lang/es-VE/admin/licenses/general.php
index b6cacb89b1..75f70f598f 100644
--- a/resources/lang/es-VE/admin/licenses/general.php
+++ b/resources/lang/es-VE/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licencias de Software',
     'user'  					=> 'Usuario',
     'view'  					=> 'Ver Licencia',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/es-VE/admin/licenses/message.php b/resources/lang/es-VE/admin/licenses/message.php
index 89f39f1a51..f0d597e1b7 100644
--- a/resources/lang/es-VE/admin/licenses/message.php
+++ b/resources/lang/es-VE/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
     'user_does_not_exist' => 'El usuario no existe.',
     'asset_does_not_exist' 	=> 'El activo que intentas asociar con esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El activo al que estás intentando asociar con esta licencia está asignado a un usuario diferente al de la persona seleccionada para retirar.',
diff --git a/resources/lang/es-VE/admin/locations/message.php b/resources/lang/es-VE/admin/locations/message.php
index c750b0174d..66be948487 100644
--- a/resources/lang/es-VE/admin/locations/message.php
+++ b/resources/lang/es-VE/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Esta ubicación está actualmente asociada con al menos un usuario y no puede ser borrada. Por favor actualiza tus usuarios para no referenciar más 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 borrada. Por favor actualiza tus activos para no referenciar más esta ubicación e inténtalo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicación es actualmente padre al menos una ubicación hija y no puede ser borrada. Por favor actualiza tus ubicaciones para no referenciar más esta ubicación e inténtalo de nuevo. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Activos asignados',
+    'current_location' => 'Ubicación Actual',
 
 
     'create' => array(
diff --git a/resources/lang/es-VE/admin/manufacturers/message.php b/resources/lang/es-VE/admin/manufacturers/message.php
index 653e931eb3..c44721495e 100644
--- a/resources/lang/es-VE/admin/manufacturers/message.php
+++ b/resources/lang/es-VE/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/es-VE/admin/manufacturers/table.php b/resources/lang/es-VE/admin/manufacturers/table.php
index 05ad749aa8..1ee432462e 100644
--- a/resources/lang/es-VE/admin/manufacturers/table.php
+++ b/resources/lang/es-VE/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Correo de soporte',
     'support_phone'   		=> 'Teléfono de Soporte',
     'support_url'   		=> 'URL de Soporte',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Actualizar Fabricante',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/es-VE/admin/models/general.php b/resources/lang/es-VE/admin/models/general.php
index 5fd0a33c9a..89c8b316af 100644
--- a/resources/lang/es-VE/admin/models/general.php
+++ b/resources/lang/es-VE/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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.',
-    'bulk_delete_warn'          => 'Estás a punto de borrar :model_count modelos de activo.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Restaurar Modelo',
     'requestable'               => 'Los usuarios pueden solicitar este modelo',
 	'show_mac_address'			      => 'Mostrar campo de dirección MAC en activos en este modelo',
diff --git a/resources/lang/es-VE/admin/models/message.php b/resources/lang/es-VE/admin/models/message.php
index 45183d6621..d138cfe123 100644
--- a/resources/lang/es-VE/admin/models/message.php
+++ b/resources/lang/es-VE/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'El modelo no existe.',
+    'no_association' => 'NINGUN MODELO ASOCIADO.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'El modelo no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'Modelo actualizado con éxito.'
+        'success' => 'Modelo actualizado con éxito.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ningún cambio fue cambiado, así que nada se actualizó.',
-        'success' 		=> 'Modelos actualizados.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, así que nada fue eliminado.',
-        'success' 		    => '¡:success_count modelo(s) eliminado(s)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         '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.'
     ),
 
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index 6fe537f9f2..eca748b075 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -11,9 +11,9 @@ return [
     'admin_cc_email_help'       => 'Si deseas enviar una notificación por correo electrónico de las asignaciones de activos que se envían a los usuarios a una cuenta adicional, ingrésela aquí. De lo contrario, deja este campo en blanco.',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
     'alerts'                	=> 'Alertas',
-    'alert_title'               => 'Actualizar Configuración de Alertas',
+    'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    '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',
@@ -21,20 +21,20 @@ return [
     'allow_user_skin_help_text' => 'Marcar esta casilla permitirá al usuario reemplazar la apariencia de la interfaz con una diferente.',
     'asset_ids'					=> 'IDs de activos',
     'audit_interval'            => 'Intervalo de Auditoría',
-    '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'       => 'Si se le exige auditoría física regular de sus activos, ingrese 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 próxima fecha de auditoría.',
     'audit_warning_days'        => 'Umbral de Aviso de Auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación deberíamos advertirte que tus activos se deben auditar?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generar etiquetas de activos autoincrementales',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Habilitar etiquetas de activos autoincrementales primero para establecer esto',
     'backups'					=> 'Copias de Seguridad',
-    'backups_help'              => 'Create, download, and restore backups ',
+    'backups_help'              => 'Crear, descargar y restaurar copias de seguridad ',
     'backups_restoring'         => 'Restaurando desde la copia de seguridad',
     'backups_upload'            => 'Subir copia de seguridad',
-    '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_path'              => 'Las copias de seguridad en el servidor se almacenan en <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'         => 'Todos los usuarios existentes, incluido usted, se cerrará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',
     '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. (Se recomienda hacer una copia de seguridad previamente, para estar seguro.)',
@@ -66,8 +66,8 @@ return [
     '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' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_keywords' => 'soporte de la empresa, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, eula, tos, tablero, privacidad',
+    'general_settings_help'     => 'EULA por defecto y más',
     'generate_backup'			=> 'Generar Respaldo',
     'header_color'              => 'Color de Encabezado',
     'info'                      => 'Estos ajustes te dejan personalizar ciertos aspectos de tu instalación.',
@@ -75,19 +75,22 @@ return [
     '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'        => '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.',
+    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    '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'       => 'LDAP Client TLS Key',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_client_tls_key'       => 'Llave TLS del cliente LDAP',
+    'ldap_client_tls_cert'      => 'Certificado LDAP TLS del lado cliente',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Configuración 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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_client_tls_key'       => 'Llave TLS del cliente LDAP',
+    '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'      => '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_manager'              => 'LDAP Manager',
+    '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_cert'			=> 'Validación de certificado LDAP SSL',
@@ -111,20 +114,20 @@ return [
     'ldap_auth_filter_query'    => 'Solicitud de Autenticación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo 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'  => '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_emp_num'              => 'Número de Empleado LDAP',
     'ldap_email'                => 'Correo electrónico LDAP',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Probar LDAP',
+    'ldap_test_sync'            => 'Prueba de sincronización LDAP',
     'license'                   => 'Licencia de Software',
     'load_remote_text'          => 'Scripts remotos',
     'load_remote_help_text'		=> 'Esta instalación de Snipe-IT puede cargar scripts desde el mundo exterior.',
-    'login'                     => 'Login Attempts',
-    'login_attempt'             => 'Login Attempt',
+    'login'                     => 'Intentos de inicio de sesión',
+    'login_attempt'             => 'Intento de inicio de sesión',
     'login_ip'                  => 'Dirección IP',
-    'login_success'             => 'Success?',
-    'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
+    'login_success'             => '¿Éxito?',
+    'login_user_agent'          => 'Navegador',
+    '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',
@@ -145,19 +148,19 @@ return [
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por Página',
     'php'                       => 'Versión de PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'Información PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
+    '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, ve 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' => 'Selecciona las reglas de complejidad que quieras aplicar.',
-    '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' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
+    'pwd_secure_complexity_letters' => 'Requiere al menos una letra',
+    '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_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
@@ -165,8 +168,8 @@ return [
     'qr_help'                   => 'Activa Códigos QR primero para establecer esto',
     'qr_text'                   => 'Texto del Código QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    '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 la entidad',
@@ -178,7 +181,7 @@ return [
     '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_forcelogin_label'     => 'SAML Force Login',
+    '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_slo_label'            => 'Cerrar sesión única SAML',
@@ -186,7 +189,7 @@ return [
     '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_download'             => 'Download Metadata',
+    'saml_download'             => 'Descargar metadatos',
     'setting'                   => 'Configuración',
     'settings'                  => 'Configuraciones',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
@@ -197,16 +200,21 @@ return [
     '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.',
     'site_name'                 => 'Nombre del Sitio',
+    'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Nombre de bot en Slack',
-    'slack_channel'             => 'Canal en Slack',
-    'slack_endpoint'            => 'Terminal en Slack',
-    'slack_integration'         => 'Configuración Slack',
-    'slack_integration_help'    => 'La integración con Slack es opcional, sin embargo el endpoint y el canal son requeridos si desea usarlo. Para configurar la integración de Slack, primero debe <a href=":slack_link" target="_new" rel="noopener">crear un webhook entrante</a> en su cuenta de Slack. Haga clic en el botón <strong>Probar Integración Slack</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'slack_integration_help_button'    => 'Una vez que haya guardado su información de Slack, aparecerá un botón de prueba.',
-    'slack_test_help'           => 'Pruebe si su integración de Slack está configurada correctamente. Debe Guardar Primero su configuracion Slack Actualizada.',
+    'general_webhook'           => 'Webhook general',
+    '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_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',
     'support_footer'            => 'Enlaces de Soporte de 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',
@@ -216,8 +224,8 @@ return [
     'update'                    => 'Actualizar Configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    '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 las Configuraciones',
     'about_settings_text'       => 'Estas configuraciones te dejan personalizar ciertos aspectos de tu instalación.',
@@ -229,7 +237,7 @@ return [
     'privacy_policy'            => 'Política de Privacidad',
     'privacy_policy_link_help'  => 'Si incluye una URL aquí, un enlace a su Política de Privacidad será incluido al pie de la aplicación y en cualquier correo electrónico que envíe el sistema, de conformidad con la ley GDPR. ',
     'purge'                     => 'Purgar Registros Eliminados',
-    'purge_deleted'             => 'Purge Deleted ',
+    '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',
@@ -281,7 +289,7 @@ return [
     'asset_tag_title' => 'Actualizar ajustes de etiqueta de activos',
     'barcode_title' => 'Actualizar ajustes de código de barras',
     'barcodes' => 'Códigos de barras',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
+    'barcodes_help_overview' => 'Ajustes de Código de barras &amp; QR',
     'barcodes_help' => 'Esto intentará eliminar códigos de barras en caché. Esto normalmente sólo se usaría si la configuración del código de barras ha cambiado, o si la URL de Snipe-IT ha cambiado. Los códigos de barras se regenerarán cuando se acceda a continuación.',
     'barcodes_spinner' => 'Intentando eliminar archivos...',
     'barcode_delete_cache' => 'Borrar caché de código de barras',
@@ -292,24 +300,24 @@ return [
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
     'security_title' => 'Actualizar ajustes de seguridad',
-    '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',
+    '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' => 'Localización',
     'localization_title' => 'Actualizar ajustes de localización',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'localization_keywords' => 'ubicación, moneda, local, locale, zona horaria, zona horaria, internacional, internacionalización, idioma, idioma, traducción',
     'localization_help' => 'Idioma, fecha',
     'notifications' => 'Notificaciones',
-    'notifications_help' => 'Alertas de correo, configuración de auditoría',
-    'asset_tags_help' => 'Incrementing and prefixes',
+    'notifications_help' => 'Configuración de alertas por email y auditoría',
+    'asset_tags_help' => 'Incrementando y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar ajustes de etiqueta',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
+    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
+    'purge' => 'Purgar',
     'purge_keywords' => 'eliminar permanentemente',
     'purge_help' => 'Purgar registros eliminados',
-    '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' => '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',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
@@ -322,4 +330,9 @@ return [
     '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',
+    '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. ',
+
 ];
diff --git a/resources/lang/es-VE/admin/settings/message.php b/resources/lang/es-VE/admin/settings/message.php
index b056d0dfb9..1251ef0208 100644
--- a/resources/lang/es-VE/admin/settings/message.php
+++ b/resources/lang/es-VE/admin/settings/message.php
@@ -11,8 +11,8 @@ return [
         '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.',
-        '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'       => '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?'
     ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
@@ -20,24 +20,25 @@ return [
         'success'               => 'Registros de borrado purgados correctamente.',
     ],
     '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' => 'Enviando correo electrónico...',
+        '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.'
     ],
     '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' => 'Probando conexión LDAP, Binding & Query ...',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros 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!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+    'webhook' => [
+        'sending' => 'Enviando mensaje de prueba de :app...',
+        'success_pt1' => '¡Éxito! Comprueba 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_misc' => 'Algo salió mal. :( ',
     ]
 ];
diff --git a/resources/lang/es-VE/admin/settings/table.php b/resources/lang/es-VE/admin/settings/table.php
index 22db5c84ed..f1fd5c550f 100644
--- a/resources/lang/es-VE/admin/settings/table.php
+++ b/resources/lang/es-VE/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Creado',
+    'size' => 'Tamaño',
 );
diff --git a/resources/lang/es-VE/admin/users/general.php b/resources/lang/es-VE/admin/users/general.php
index 598fea9449..11f39bf489 100644
--- a/resources/lang/es-VE/admin/users/general.php
+++ b/resources/lang/es-VE/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     '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.',
     'print_assigned'    => 'Imprimir Todos los Asignados',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'Lista de Correos Asignados',
+    'user_notified'     => 'Se ha enviado un correo al usuario con sus artículos actualmente asignados.',
+    '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 enviarle credenciales. Únicamente pueden enviarse 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',
@@ -26,19 +28,27 @@ return [
     'two_factor_admin_optin_help' => 'Tus configuraciones de administrador actuales permiten cumplimiento selectivo de autenticación de dos factores.  ',
     'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
     'two_factor_active'   => '2FA activo ',
-    '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' => 'WARNING:',
-    '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',
+    'user_deactivated'  => 'Usuario no puede iniciar sesión',
+    'user_activated'  => '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ás a punto de disponibilizar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de Super Admintradores 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',
+    '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.',
+    'not_remote_label' => 'Este no es un usuario remoto',
+    'vip_label' => 'Usuario VIP',
+    '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' => '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',
+    'next_save_user' => 'Siguiente: Guardar usuario',
+    'all_assigned_list_generation' => 'Generado el:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/es-VE/admin/users/message.php b/resources/lang/es-VE/admin/users/message.php
index 5aab84320f..d1d6dcfa58 100644
--- a/resources/lang/es-VE/admin/users/message.php
+++ b/resources/lang/es-VE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Has rechazado este activo con éxito.',
     'bulk_manager_warn'	        => 'Tus usuarios han sido actualizados con éxito, sin embargo tu entrada de administrador no fue guardada debido que el administrador que seleccionaste también era un usuario de la lista que iba a ser editada, y los usuarios no pueden editar a su propio administrador. Por favor selecciona a tus usuarios de nuevo, excluyendo al administrador.',
     'user_exists'               => '¡El usuario ya existe!',
-    'user_not_found'            => 'El usuario [:id] no existe.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'El campo de usuario es obligatorio',
     'user_password_required'    => 'La contraseña es obligatoria.',
     'insufficient_permissions'  => 'Permisos insuficientes.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'La integración LDAP no ha sido configurada para esta instalación.',
     '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'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
+    'user_has_no_assets_assigned'   => 'Este usuario no tiene ningún activo asignado',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Este usuario no tiene ningún correo electrónico.',
+        'success' => 'El usuario ha sido notificado sobre su inventario actual.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/es-VE/auth/general.php b/resources/lang/es-VE/auth/general.php
index 5a06db35e5..5ba8745c56 100644
--- a/resources/lang/es-VE/auth/general.php
+++ b/resources/lang/es-VE/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Recuérdame',
     'username_help_top'                 => 'Introduzca 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>A los usuarios sin una dirección de correo electrónico asociada no se enviará por correo electrónico un enlace de restablecimiento de contraseña.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/es-VE/button.php b/resources/lang/es-VE/button.php
index e21d223ca8..9cb4b920cf 100644
--- a/resources/lang/es-VE/button.php
+++ b/resources/lang/es-VE/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Acciones',
     'add'    	                => 'Añadir Nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Checkin Todos / Eliminar Usuario',
     'delete'  	                => 'Borrar',
     'edit'    	                => 'Editar',
     'restore' 	                => 'Restaurar',
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index afb96505ea..e8fe838dde 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
+    'accepted_date'         => 'Fecha aceptada',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Reporte de Accesorio',
     'action'                => 'Acción',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrador',
     'add_seats'             => 'Puestos añadidos',
-    'age'                   => "Age",
+    'age'                   => "Edad",
     'all_assets'			=> 'Todos los Activos',
     'all'       			=> 'Todo',
     'archived'              => 'Archivado',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditar',
     'audit_report'			=> 'Registro de Auditoría',
     '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',
     'assigned_to'           => 'Asignado a :name',
+    'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Borrar Avatar',
     'avatar_upload'         => 'Cargar Avatar',
     'back'      			=> 'Atrás',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Edición masiva',
     'bulk_delete'           => 'Borrado masivo',
     'bulk_actions'          => 'Acciones masivas',
-    'bulk_checkin_delete'   => 'Registro de entrada masivo de activos de usuarios',
+    'bulk_checkin_delete'   => 'Checkin en masa / Eliminar usuarios',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Este dispositivo es propiedad del usuario',
     'bystatus'              => 'por Estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
@@ -83,6 +92,7 @@ return [
     '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>.',
     'delete'  				=> 'Borrar',
     'delete_confirm'  		=> '¿Estás seguro de eliminar :item?',
+    'delete_confirm_no_undo' => '¿Está seguro que desea eliminar :item? Esto no se puede deshacer.',
     'deleted'  				=> 'Borrado',
     'delete_seats'  		=> 'Puestos Borrados',
     'deletion_failed'       => 'Error al eliminar',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif y svg. 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 mimetype de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Mantenimientos de Activo',
     'item'  				=> 'Elemento',
     'item_name'             => 'Nombre del ítem',
+    'import_file'  			=> 'importar archivo CSV',
+    'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
     'kits'       			=> 'Equipamiento predefinido',
     'language'				=> 'Lenguaje',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Activos solicitados',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
+    'select_var'            => 'Seleccionar :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'Se enviará un mensaje de slack',
-    'slack_test_msg'        => '¡Parece que tu integración de Slack con Snipe-IT está funcionando!',
+    '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 DEMO: Algunas funciones están desactivadas para esta instalación.',
     'site_name'				=> 'Nombre del Sitio',
     'state'  				=> 'Estado',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '¿Está seguro que quieres borrar',
     'submit'				=> 'Enviar',
     'target'                => 'Objetivo',
-    'toggle_navigation'     => 'Alternar navegación',
     'time_and_date_display' => 'Visualización de Hora y Fecha',
     'total_assets'			=> 'total de activos',
     'total_licenses'		=> 'licencias totales',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Si',
     'zip'  					=> 'Códio Postal',
     'noimage'				=> 'No se subió la imagen o no fue encontrada.',
-    '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'   => 'El archivo solicitado no existe en el servidor.',
+    'file_upload_success'   => '¡Archivo cargado correctamente!',
+    'no_files_uploaded'     => '¡Archivo cargado correctamente!',
     'token_expired'         => 'Tu sesión ha expirado. Por favor inténtalo de nuevo.',
     'login_enabled'         => 'Inicio de sesión habilitado',
     'audit_due'             => 'Auditoría pendiente',
@@ -375,7 +388,8 @@ return [
     '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 Administrador.',
     '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 ',
+    'set_to_null'           => 'Eliminar valores para este activo|Eliminar valores para todos los :asset_count activos ',
+    '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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Fecha de inicio',
     'end_date'            => 'Fecha de fin',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
-    'placeholder_kit'       => 'Seleccione un kit'
+    'placeholder_kit'       => 'Seleccione un kit',
+    'file_not_found'        => 'No se encontró el archivo',
+    'preview_not_available' => '(sin vista previa)',
+    'setup'                 => 'Configuración',
+    'pre_flight'            => 'Preparación',
+    'skip_to_main_content'  => 'Saltar 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 en el que desea fusionar a los demás a continuación, y los activos asociados, licencias, etc se moverá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.',
+    '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',
+    'update_existing_values'    => '¿Actualizar valores existentes?',
+    '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'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
+    'back_before_importing'     => '¿Copia de seguridad antes de importar?',
+    'csv_header_field'          => 'Campo de cabecera CSV',
+    'import_field'              => 'Importar campo',
+    'sample_value'              => 'Valor de ejemplo',
+    'no_headers'                => 'No se encontraron columnas',
+    'error_in_import_file'      => 'Hubo un error leyendo el archivo CSV: :error',
+    'percent_complete'          => ':percent % Completado',
+    'errors_importing'          => 'Se han producido algunos errores al importar: ',
+    'warning'                   => 'ADVERTENCIA: :warning',
+    'success_redirecting'       => '"Éxito... Redirigiendo.',
+    'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Siguiente: Crear usuario',
+    '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' => 'Confirmar',
+    'autoassign_licenses' => 'Auto-Asignar licencias',
+    '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'      => '¿Estás seguro?',
+    'cannot_be_deleted'      => 'Este articulo no se puede eliminar',
+    'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es-VE/help.php b/resources/lang/es-VE/help.php
index 9c71dfef87..e083c23aa4 100644
--- a/resources/lang/es-VE/help.php
+++ b/resources/lang/es-VE/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Marcando esta casilla podrá editar el registro de activos reflejando su nueva ubicación. Dejándola sin marcar simplemente anotaremos la ubicación en el registro de auditoria.<br><br>Tenga en cuenta que si este activo ha si requerido, no se podrá cambiara la ubicación de la persona, Activo o ubicación en la que esta requerido.',
+    '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' => '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.',
 
diff --git a/resources/lang/es-VE/localizations.php b/resources/lang/es-VE/localizations.php
index be2c321861..63accfb143 100644
--- a/resources/lang/es-VE/localizations.php
+++ b/resources/lang/es-VE/localizations.php
@@ -2,314 +2,315 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Seleccione un idioma',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Inglés, EEUU',
+        'en-GB'=> 'Inglés, Reino Unido',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
+        'ar'=> 'Árabe',
+        'bg'=> 'Búlgaro',
+        'zh-CN'=> 'Chino simplificado',
+        'zh-TW'=> 'Chino tradicional',
+        'hr'=> 'Croata',
+        'cs'=> 'Checo',
+        'da'=> 'Danés',
+        'nl'=> 'Holandés',
+        'en-ID'=> 'inglés de Indonesia',
+        'et'=> 'Estonio',
         'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
-        'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'fi'=> 'Finlandés',
+        'fr'=> 'Francés',
+        'de'=> 'Alemán',
+        'de-i'=> 'Alemán (informal)',
+        'el'=> 'Griego',
+        'he'=> 'Hebreo',
+        'hu'=> 'Húngaro',
+        'is' => 'Islandés',
+        'id'=> 'Indonesio',
+        'ga-IE'=> 'Irlandés',
+        'it'=> 'Italiano',
+        'ja'=> 'Japonés',
+        'ko'=> 'Coreano',
+        'lv'=>'Letón',
+        'lt'=> 'Lituano',
+        'mk'=> 'Macedonio',
+        'ms'=> 'Malayo',
+        'mi'=> 'Maorí',
+        'mn'=> 'Mongol',
+        'no'=> 'Noruego',
+        'fa'=> 'Persa',
+        'pl'=> 'Polaco',
+        'pt-PT'=> 'Portugués',
+        'pt-BR'=> 'Portugués, Brasileño',
+        'ro'=> 'Rumano',
+        'ru'=> 'Ruso',
+        'sr-CS' => 'Serbio (Latino)',
+        'sl'=> 'Esloveno',
+        'es-ES'=> 'Español',
+        'es-CO'=> 'Español, Colombia',
+        'es-MX'=> 'Español, México',
+        'es-VE'=> 'Español, Venezuela',
+        'sv-SE'=> 'Sueco',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'th'=> 'Tailandés',
+        'tr'=> 'Turco',
+        'uk'=> 'Ucraniano',
+        'vi'=> 'Vietnamita',
+        'cy'=> 'Galés',
+        'zu'=> 'Zulú',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Seleccione un país',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Isla de Ascensión',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AE'=>'Emiratos Árabes Unidos',
+        'AF'=>'Afganistán',
+        'AG'=>'Antigua y Barbuda',
         'AI'=>'Anguilla',
         'AL'=>'Albania',
         'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AN'=>'Antillas Holandesas',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'La Antártida',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
+        'AS'=>'Samoa Americana',
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Azerbaiyán',
+        'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
+        'BE'=>'Bélgica',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BH'=>'Bahréin',
         'BI'=>'Burundi',
-        'BJ'=>'Benin',
+        'BJ'=>'Benín',
         'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Brunei',
         'BO'=>'Bolivia',
-        'BR'=>'Brazil',
+        'BR'=>'Brasil',
         'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BT'=>'Bután',
+        'BV'=>'Isla Bouvet',
         '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',
+        'BY'=>'Bielorrusia',
+        'BZ'=>'Belice',
+        'CA'=>'Canadá',
+        'CC'=>'Islas Cocos (Keeling)',
+        'CD'=>'Congo (República Democrática del)',
+        'CF'=>'República Centroafricana',
+        'CG'=>'Congo (República del)',
+        'CH'=>'Suiza',
+        'CI'=>'Costa de Marfil',
+        'CK'=>'Islas Cook',
         'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CM'=>'Camerún',
+        'CN'=>'República Popular 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',
+        'CV'=>'Cabo Verde',
+        'CX'=>'Isla de Navidad',
+        'CY'=>'Chipre',
+        'CZ'=>'República Checa',
+        'DE'=>'Alemania',
+        'DJ'=>'Yibuti',
+        'DK'=>'Dinamarca',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
+        'DO'=>'República Dominicana',
+        'DZ'=>'Argelia',
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EG'=>'Egipto',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
+        'ES'=>'España',
+        'ET'=>'Etiopía',
+        'EU'=>'Unión Europea',
+        'FI'=>'Finlandia',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
-        'GA'=>'Gabon',
-        'GD'=>'Grenada',
+        'FK'=>'Islas Malvinas (Falkland)',
+        'FM'=>'Estados Federados de la Micronesia',
+        'FO'=>'Islas Faroe',
+        'FR'=>'Francia',
+        'GA'=>'Gabón',
+        'GD'=>'Granada',
         'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GF'=>'Guayana Francesa',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GL'=>'Groenlandia',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GP'=>'Guadalupe',
+        'GQ'=>'Guinea Ecuatorial',
+        'GR'=>'Grecia',
+        'GS'=>'Islas Georgia del Sur y Sandwich del Sur',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Islas Heard y Mc Donald',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
-        'HT'=>'Haiti',
-        'HU'=>'Hungary',
+        'HR'=>'Croacia (nombre local: Hrvatska)',
+        'HT'=>'Haití',
+        'HU'=>'Hungría',
         'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'IE'=>'Irlanda',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'IM'=>'Isla de Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IO'=>'Territorio británico del océano Índico',
+        'IQ'=>'Irak',
+        'IR'=>'Irán, República Islámica Del',
+        'IS'=>'Islandia',
+        'IT'=>'Italia',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
+        'JO'=>'Jordania',
+        'JP'=>'Japón',
+        'KE'=>'Kenia',
         'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KH'=>'Camboya',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Islas Comoros',
+        'KN'=>'San Cristóbal y Nevis',
+        'KR'=>'Corea, República de',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
+        'KY'=>'Islas Caimán',
+        'KZ'=>'Kazajistán',
+        'LA'=>'República Democrática Popular de Laos',
+        'LB'=>'Líbano',
+        'LC'=>'Santa Lucía',
+        'LI'=>'Principado de 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',
+        'LS'=>'Lesoto',
+        'LT'=>'Lituania',
+        'LU'=>'Luxemburgo',
+        'LV'=>'Letonia',
+        'LY'=>'Libia',
+        'MA'=>'Marruecos',
+        'MC'=>'Mónaco',
+        'MD'=>'Moldova, República de',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
-        'ML'=>'Mali',
+        'MH'=>'Islas Marshall',
+        'MK'=>'Macedonia, Ex República Yugoslava de',
+        'ML'=>'Malí',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
+        'MO'=>'Macao',
+        'MP'=>'Islas Marianas del Norte',
+        'MQ'=>'Martinica',
         'MR'=>'Mauritania',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Mauricio',
+        'MV'=>'Maldivas',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
+        'MX'=>'México',
+        'MY'=>'Malasia',
         'MZ'=>'Mozambique',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NC'=>'Nueva Caledonia',
+        'NE'=>'Níger',
+        'NF'=>'Isla Norfolk',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Países Bajos',
+        'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Nueva Zelanda',
         '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',
+        'PE'=>'Perú',
+        'PF'=>'Polinesia Francesa',
+        'PG'=>'Papúa Nueva Guinea',
+        'PH'=>'Filipinas, República de las',
+        'PK'=>'Pakistán',
+        'PL'=>'Polonia',
+        'PM'=>'San Pedro y Miquelón',
         'PN'=>'Pitcairn',
         'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PS'=>'Palestina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
-        'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
+        'QA'=>'Catar',
+        'RE'=>'Reunión',
+        'RO'=>'Rumania',
         'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'RU'=>'Federación Rusa',
+        'RW'=>'Ruanda',
+        'SA'=>'Arabia Saudita',
+        'UK'=>'Escocia',
+        'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SS'=>'Sudán del Sur',
+        'SD'=>'Sudán',
+        'SE'=>'Suecia',
+        'SG'=>'Singapur',
         'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
+        'SI'=>'Eslovenia',
+        'SJ'=>'Islas Svalbard y Jan Mayen',
+        'SK'=>'Eslovaquia (República Eslovaca)',
+        'SL'=>'Sierra Leona',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'Santo Tomé y Príncipe',
+        'SU'=>'Unión Soviética',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'República Árabe Siria',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
+        'TC'=>'Islas Turcas y Caicos',
         'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TF'=>'Territorios Franceses del Sur',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
+        'TH'=>'Tailandia',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Timor Oriental',
         'TM'=>'Turkmenistan',
         'TN'=>'Tunisia',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Timor Oriental (código antiguo)',
+        'TR'=>'Turquía',
+        'TT'=>'Trinidad y Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TW'=>'Taiwán',
+        'TZ'=>'Tanzania, República Unida de',
+        'UA'=>'Ucrania',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'Reino Unido',
+        'US'=>'Estados Unidos',
+        'UM'=>'Islas Ultramarinas Menores de Estados Unidos',
         'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'UZ'=>'Uzbekistán',
+        'VA'=>'Estado de Vatican (Santa Sede)',
+        'VC'=>'San Vicente y las Granadinas',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Islas Vírgenes Británicas',
+        'VI'=>'Islas Vírgenes (EE. UU.)',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Sudáfrica',
         'ZM'=>'Zambia',
-        'ZW'=>'Zimbabwe',
+        'ZW'=>'Zimbabue',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/es-VE/mail.php b/resources/lang/es-VE/mail.php
index 1eebea3ebc..c71e5a6173 100644
--- a/resources/lang/es-VE/mail.php
+++ b/resources/lang/es-VE/mail.php
@@ -2,7 +2,7 @@
 
 return [
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un artículo',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_declined' => 'Un usuario ha rechazado un artículo',
     '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',
     'accessory_name' => 'Nombre del Accesorio:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Inicia sesión en tu nueva instalación de Snipe-IT usando las credenciales abajo:',
     'login' => 'Iniciar Sesión:',
     'Low_Inventory_Report' => 'Reporte de inventario bajo',
+    'inventory_report' => 'Informe de inventario',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo se ha retirado bajo tu nombre, los detalles están a continuación.',
@@ -61,7 +62,7 @@ return [
     'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
     '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.',
-    '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' => '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.',
     '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.',
     'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
     'type' => 'Tipo',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Tus credenciales de Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accesorio devuelto',
     'Asset_Checkin_Notification' => 'Activo devuelto',
+    'Asset_Checkout_Notification' => 'Activo asignado',
     'License_Checkin_Notification' => 'Licencia devuelta',
     'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
     'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date',
     'your_assets' => 'Ver tus activos',
+    'rights_reserved' => 'Todos los derechos reservados.',
 ];
diff --git a/resources/lang/es-VE/validation.php b/resources/lang/es-VE/validation.php
index c9341f401e..e05d3398aa 100644
--- a/resources/lang/es-VE/validation.php
+++ b/resources/lang/es-VE/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'Estte :attribute debe ser un archivo.',
     'filled'               => 'El campo :attribute debe tener un valor.',
     'image'                => 'El :attribute debe ser una imagen.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la empresa',
     'json'                 => 'El :atrribute debe ser una dirección IPv4 válida.',
     'max'                  => [
         'numeric' => 'El :attribute no debe ser mayor que :max kilobytes.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'El :attribute debe ser como mínimo de :min kilobytes.',
     ],
     'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Tu 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',
+
+        // 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'  =>  'El :attribute debe ser una fecha válida en formato AAAA-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',
+
     ],
 
     /*
diff --git a/resources/lang/et/admin/accessories/general.php b/resources/lang/et/admin/accessories/general.php
index 35358be164..bc14bd107b 100644
--- a/resources/lang/et/admin/accessories/general.php
+++ b/resources/lang/et/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Värskenda tarvikut',
     'use_default_eula'					=> 'Selle asemel kasutage <a href="#" data-toggle="modal" data-target="#eulaModal">primaarset EULA</a> vaikimisi.',
     'use_default_eula_disabled'			=> '<del>Võtke kasutusele esmane vaikimisi EULA-d.</del> Ükski esmane vaikimisi EULA ei ole määratud. Lisage see üksus valikut Seaded.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/et/admin/accessories/message.php b/resources/lang/et/admin/accessories/message.php
index ac6125c262..57641cf6d3 100644
--- a/resources/lang/et/admin/accessories/message.php
+++ b/resources/lang/et/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Lisatarvikut ei kontrollitud, palun proovige uuesti',
         'success' 		=> 'Lisaseade edukalt kontrollitud.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.'
     ),
 
diff --git a/resources/lang/et/admin/asset_maintenances/form.php b/resources/lang/et/admin/asset_maintenances/form.php
index 325db108db..735e7988db 100644
--- a/resources/lang/et/admin/asset_maintenances/form.php
+++ b/resources/lang/et/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Hooldustüüp',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Pealkiri',
-        'start_date'             => 'Alustatud',
-        'completion_date'        => 'Lõpetatud',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kulud',
         'is_warranty'            => 'Garantii paranemine',
-        'asset_maintenance_time' => 'Päevad',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Märkused',
-        'update'                 => 'Uuenda',
-        'create'                 => 'Loo'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/et/admin/categories/message.php b/resources/lang/et/admin/categories/message.php
index b4c15d7cfb..ca446a15a0 100644
--- a/resources/lang/et/admin/categories/message.php
+++ b/resources/lang/et/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategooriat ei uuendatud, proovige uuesti',
-        'success' => 'Kategooria uuendamine õnnestus.'
+        'success' => 'Kategooria uuendamine õnnestus.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/et/admin/components/general.php b/resources/lang/et/admin/components/general.php
index 9c4e3e4ca8..d8e2671f4f 100644
--- a/resources/lang/et/admin/components/general.php
+++ b/resources/lang/et/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Alles',
     'total' 			                 => 'Kokku',
     'update'                            => 'Muuda komponenti',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/et/admin/components/message.php b/resources/lang/et/admin/components/message.php
index 05d537d93f..bd5d9c316a 100644
--- a/resources/lang/et/admin/components/message.php
+++ b/resources/lang/et/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponenti ei kontrollitud, palun proovige uuesti',
         'success' 		=> 'Komponent on edukalt välja võetud.',
-        'user_does_not_exist' => 'Vale kasutaja. Palun proovi uuesti.'
+        'user_does_not_exist' => 'Vale kasutaja. Palun proovi uuesti.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/et/admin/consumables/message.php b/resources/lang/et/admin/consumables/message.php
index 9176787adb..811629f99b 100644
--- a/resources/lang/et/admin/consumables/message.php
+++ b/resources/lang/et/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Tarbitavat ei kontrollitud, proovige uuesti',
         'success' 		=> 'Tarbitav kontrollitud edukalt.',
-        'user_does_not_exist' => 'See kasutaja ei sobi. Palun proovi uuesti.'
+        'user_does_not_exist' => 'See kasutaja ei sobi. Palun proovi uuesti.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/et/admin/custom_fields/general.php b/resources/lang/et/admin/custom_fields/general.php
index 61fa110310..95dacafbc0 100644
--- a/resources/lang/et/admin/custom_fields/general.php
+++ b/resources/lang/et/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Kasutatud mudelite järgi',
     'order'   		            => 'Telli',
     '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'            => 'Uus kohandatud väli',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/et/admin/groups/message.php b/resources/lang/et/admin/groups/message.php
index 8336fed222..6664a2ba17 100644
--- a/resources/lang/et/admin/groups/message.php
+++ b/resources/lang/et/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grupp on juba olemas!',
-    'group_not_found'     => 'Rühma [: id] ei ole olemas.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Nimi on kohustuslik',
 
     'success' => array(
diff --git a/resources/lang/et/admin/hardware/form.php b/resources/lang/et/admin/hardware/form.php
index 3906c6acf8..0314f92dde 100644
--- a/resources/lang/et/admin/hardware/form.php
+++ b/resources/lang/et/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Kinnita kahendite hulgi kustutamine',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Kontrolli alltoodud vahendid hulgi kustutamiseks. Kui oled need kustutanud, võib neid veel taastada, kuid neid ei saa enam seostada kasutajatega, kellega nad hetkel seotud on.',
+  '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'	=> 'Sa hakkad kustsutama :asset_count vahendit.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Uuenduste hulgihaldus',
     'bulk_update_help'	=> 'See vorm võimaldab teil korraga mitme vara värskendada. Täitke ainult väljad, mida tuleb muuta. Kõik tühjad tühikud jäävad muutmata.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Uuenda ainult vaikimisi asukohta',
     'asset_not_deployable' => 'Selle vahendi olek ei luba seda väljastada.',
     'asset_deployable' => 'Selle vahendi olek lubab seda väljastada.',
-    'processing_spinner' => 'Töötlemine...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Valikuline teave',
     'order_details'   => 'Tellimusega seonduv teave'
 ];
diff --git a/resources/lang/et/admin/hardware/general.php b/resources/lang/et/admin/hardware/general.php
index 8a1cc6d24c..c3c429db61 100644
--- a/resources/lang/et/admin/hardware/general.php
+++ b/resources/lang/et/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'See vara on kustutatud.',
     'edit'  					=> 'Muuda vahendit',
     'model_deleted'  			=> 'See vara mudel on kustutatud. Enne vara taastamist peab taastama mudeli.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Taotletav',
     'requested'				    => 'Taotletud',
     'not_requestable'           => 'Mittetaotletav',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Taasta vara',
     'pending'  					=> 'Ootel',
     'undeployable'  			=> 'Kasutuselevõtmatu',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Tõrked:',
     'success_messages' => 'Õnnestumised:',
     'alert_details' => 'Palun vaata allolevaid üksikasju.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/et/admin/hardware/message.php b/resources/lang/et/admin/hardware/message.php
index 58c73d11c9..c8b21d4823 100644
--- a/resources/lang/et/admin/hardware/message.php
+++ b/resources/lang/et/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Vara ei taastatud, palun proovi uuesti',
         'success' 		=> 'Varad on edukalt taastatud.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Teie fail on imporditud',
         'file_delete_success'   => 'Teie fail on edukalt kustutatud',
         'file_delete_error'      => 'Faili ei saanud kustutada',
+        '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',
     ],
 
 
diff --git a/resources/lang/et/admin/hardware/table.php b/resources/lang/et/admin/hardware/table.php
index f75cb6fabc..1cf7230547 100644
--- a/resources/lang/et/admin/hardware/table.php
+++ b/resources/lang/et/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Sees väljas',
     'checkout_date' => 'Väljastamise kuupäev',
     'checkoutto' 	=> 'Väljastatud',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Hetkeväärtus',
     'diff' 			=> 'Diferentseeritud',
     'dl_csv' 		=> 'Laadige alla CSV',
diff --git a/resources/lang/et/admin/licenses/general.php b/resources/lang/et/admin/licenses/general.php
index c8322c5cbc..2a386bb6d9 100644
--- a/resources/lang/et/admin/licenses/general.php
+++ b/resources/lang/et/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Litsentside kohta',
-    'about_licenses'                  => 'Litsentse kasutatakse tarkvara jälgimiseks. Neil on kindlaksmääratud arv istekohti, mida saab üksikisikutele kontrollida',
+    'about_licenses_title'      => 'Litsentside kohta',
+    'about_licenses'            => 'Litsentse kasutatakse tarkvara jälgimiseks. Neil on kindlaksmääratud arv istekohti, mida saab üksikisikutele kontrollida',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Checkout ajalugu',
     'checkout'  				=> 'Checkout\'i litsentside asukoht',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Tarkvara litsentsid',
     'user'  					=> 'Kasutaja',
     'view'  					=> 'Vaadake litsentsi',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/et/admin/manufacturers/message.php b/resources/lang/et/admin/manufacturers/message.php
index 8a436d7bad..9475444a8a 100644
--- a/resources/lang/et/admin/manufacturers/message.php
+++ b/resources/lang/et/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Tootjat ei eksisteeri.',
     'assoc_users'	 => 'Selle tootjaga on seotud vähemalt üks mudel ja seda ei saa kustutada. Palun uuenda oma mudeleid, et need ei kasutaks seda tootjat ning seejärel proovi uuesti. ',
 
diff --git a/resources/lang/et/admin/manufacturers/table.php b/resources/lang/et/admin/manufacturers/table.php
index 6205b8cfd4..853129c522 100644
--- a/resources/lang/et/admin/manufacturers/table.php
+++ b/resources/lang/et/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Kasutajatoe E-mail',
     'support_phone'   		=> 'Kasutajatoe telefon',
     'support_url'   		=> 'Kasutajatoe URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Uuenda tootjat',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/et/admin/models/general.php b/resources/lang/et/admin/models/general.php
index 8757ce8007..b775f00f6a 100644
--- a/resources/lang/et/admin/models/general.php
+++ b/resources/lang/et/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Sa oled kustutamas :model_count vara mudelit.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Taasta mudel',
     'requestable'               => 'Kasutajad võivad seda mudelit tellida',
 	'show_mac_address'			      => 'Näita sellel mudelil MAC aadressi välja',
diff --git a/resources/lang/et/admin/models/message.php b/resources/lang/et/admin/models/message.php
index 114e9fcfe7..ff2af36395 100644
--- a/resources/lang/et/admin/models/message.php
+++ b/resources/lang/et/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Mudelit pole olemas.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Mudelit ei uuendatud, proovige uuesti',
-        'success' => 'Mudeli uuendamine õnnestus.'
+        'success' => 'Mudeli uuendamine õnnestus.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ühtegi välja ei muudetud, uuendusi ei tehtud',
-        'success' 		=> 'Mudelid on uuendatud.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Mudeleid ei valitud, nii et midagi ei kustutatud.',
-        'success' 		    => ':success_count mudel(it) kustutatud!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count mudel(it) kustutati, kuid :fail_count ei õnnestunud kustutada kuna nendega on ikka veel vara seotud.'
     ),
 
diff --git a/resources/lang/et/admin/settings/general.php b/resources/lang/et/admin/settings/general.php
index 9f98f97bf3..331b444d03 100644
--- a/resources/lang/et/admin/settings/general.php
+++ b/resources/lang/et/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'See on Active Directory server',
     'alerts'                	=> 'Märguanded',
-    'alert_title'               => 'Uuenda märguande seadeid',
+    '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',
     'alerts_enabled'			=> 'Hoiatused on lubatud',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP seaded',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Saidi nimi',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Vähene botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Lõpp-punkt',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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 versioon',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/et/admin/settings/message.php b/resources/lang/et/admin/settings/message.php
index d4810b55fd..6906690f41 100644
--- a/resources/lang/et/admin/settings/message.php
+++ b/resources/lang/et/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/et/admin/users/general.php b/resources/lang/et/admin/users/general.php
index d333f286be..35726a8eaf 100644
--- a/resources/lang/et/admin/users/general.php
+++ b/resources/lang/et/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Prindi kõik varad',
     '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',
     'software_user'     => 'Kasutaja :name valdusesse antud tarkvara',
     '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'         => 'Vaata kasutajat :name',
@@ -33,7 +35,6 @@ return [
     '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' => 'HOIATUS:',
     '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' => 'Uuenda kõik vahendid nendele kasutajatele sellesse olekusse',
     'checkin_user_properties' => 'Check in all properties associated with these users',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Remote',
     'remote_help' => 'See võib olla kasulik, kui vajad kaugkasutajate filtrit inimestest, kes käivad harva või ei käi üldse ettevõtte füüsilistes asukohtades.',
     'not_remote_label' => 'See ei ole kaugkasutaja',
+    '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/et/admin/users/message.php b/resources/lang/et/admin/users/message.php
index 2465e7247c..fa3d677aca 100644
--- a/resources/lang/et/admin/users/message.php
+++ b/resources/lang/et/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 [:id] ei ole olemas.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Login väli on kohustuslik',
     'user_password_required'    => 'Parooli väli on kohustuslik.',
     'insufficient_permissions'  => 'Ebapiisavad õigused.',
diff --git a/resources/lang/et/auth/general.php b/resources/lang/et/auth/general.php
index 6215da8476..04eec9ad25 100644
--- a/resources/lang/et/auth/general.php
+++ b/resources/lang/et/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Jäta mind meelde',
     'username_help_top'                 => 'Parooli lähtestamiseks sisesta oma <strong>kasutajanimi</strong>.',
     'username_help_bottom'          => 'Kasutajanimi ja e-posti aadress <em>võivad</em> olla samad, aga ei pruugi olla. Kui oled kasutajanime unustanud, võta ühendust oma süsteemiadministraatoriga. <br><br><strong>Kasutajatele ilma liidetud e-posti aadressita ei saa parooli lähtestamise linki saata.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php
index 7539783bb6..9a86937d7e 100644
--- a/resources/lang/et/general.php
+++ b/resources/lang/et/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Tarvikud',
     'activated'			    => 'Aktiveeritud',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Tarvik',
     'accessory_report'		=> 'Tarvikute aruanne',
     'action'                => 'Tegevus',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditeerimine',
     'audit_report'			=> 'Auditilogi',
     'assets'				=> 'Vahendid',
+    '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'           => 'Määratud kasutajale :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Kustuta profiilipilt',
     'avatar_upload'         => 'Lae profiilipilt',
     'back'      			=> 'Tagasi',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Hulgiredigeerimine',
     'bulk_delete'           => 'Hulgikustutamine',
     'bulk_actions'          => 'Hulgitoimingud',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'staatuse järgi',
     'cancel'  				=> 'Loobu',
     'categories'			=> 'Kategooriad',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Kustutatud',
     'delete_seats'  		=> 'Kustutatud istmed',
     'deletion_failed'       => 'Kustutamine ebaõnnestus',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Lubatud faililaiendid on jpg, png, gif ja svg. Suurim lubatud üleslaadimise maht on :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'         	    => 'Impordi',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Vara säilimine',
     'item'  				=> 'Kirje',
     'item_name'             => 'Üksuse nimi',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Ei ole piisavalt õigusi!',
     'kits'       			=> 'Eelnevalt määratud komplektid',
     'language'				=> 'Keel',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Vaadake taotletud vahendeid',
     'request_canceled'      => 'Taotlus tühistati',
     'save'  				=> 'Salvesta',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Vali',
     'select_all'            => 'Vali kõik',
     'search'				=> 'Otsi',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Allkiri',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Väljanägemine',
-    'slack_msg_note'        => 'Saadetakse Slacki sõnum',
-    'slack_test_msg'        => 'Juhhuu! Näib, et teie Slacki integratsioon Snipe-IT-ga töötab!',
+    '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' => 'DEMOVERSIOON: Selles installatsioonis mõned funktsioonid ei tööta.',
     'site_name'				=> 'Saidi nimi',
     'state'  				=> 'Maakond',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Kas olete kindel, et soovite kustutada',
     'submit'				=> 'Kinnita',
     'target'                => 'Sihtimine',
-    'toggle_navigation'     => 'Vaheta navigeerimisvaadet',
     'time_and_date_display' => 'Kellaaja ja kuupäeva kuvamine',
     'total_assets'			=> 'vahendeid kokku',
     'total_licenses'		=> 'litsentse kokku',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/et/help.php b/resources/lang/et/help.php
index 2bfd8af5d9..1f9e6fba3a 100644
--- a/resources/lang/et/help.php
+++ b/resources/lang/et/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Rohkem infot',
 
-    'audit_help' => 'Selle kasti valimine muudab vahendi teavet, et näidata selle uut asukohta. Kui seda ei valita, salvestatakse asukoht ainult logisse. <br><br> Pange tähele, et kui vahend on juba üle antud, siis see ei muuda selle isiku või vahendi asukohta, kellele see on üle antud.',
+    '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' => 'Vahendeid saab tuvastada ja jälgida seerianumbri või seadme identifikaatori abil. Tavaliselt määratletakse ja registreeritakse seerianumber või identifikaator väärtuslikele vahenditele, mille individuaalne tuvastamine on oluline.',
 
diff --git a/resources/lang/et/localizations.php b/resources/lang/et/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/et/localizations.php
+++ b/resources/lang/et/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/et/mail.php b/resources/lang/et/mail.php
index 97a7b83b8d..699ec3e6b6 100644
--- a/resources/lang/et/mail.php
+++ b/resources/lang/et/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Logige oma uude Snipe-IT-seadmesse sisse, kasutades allpool toodud mandaate.',
     'login' => 'Logi sisse:',
     'Low_Inventory_Report' => 'Madal inventuuriaruanne',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Nimi',
     'new_item_checked' => 'Uue elemendi on teie nime all kontrollitud, üksikasjad on allpool.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Sinu Snipe-IT rekvisiidid',
     'Accessory_Checkin_Notification' => 'Tarvikud sisse võetud',
     'Asset_Checkin_Notification' => 'Vara sissevõetud',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Litsents sisse võetud',
     'Expected_Checkin_Report' => 'Eeldatav vahendite tagastamise aruanne',
     'Expected_Checkin_Notification' => 'Meeldetuletus: :name tagastamise tähtaeg läheneb',
     'Expected_Checkin_Date' => 'Sulle väljastatud vahend tuleb tagastada :date',
     'your_assets' => 'Vaata oma varasi',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/et/validation.php b/resources/lang/et/validation.php
index 7864891729..d56039ad61 100644
--- a/resources/lang/et/validation.php
+++ b/resources/lang/et/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribuudil peab olema vähemalt: min kirjeid.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Valitud atribuut on kehtetu.',
     'numeric'              => 'Atribuut peab olema number.',
     'present'              => 'Atribuudiväli peab olema kohal.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Teie praegune parool on vale',
         'dumbpwd'          => 'See parool on liiga levinud.',
         'statuslabel_type' => 'Peate valima kehtiva olekutüübi tüübi',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/fa/admin/accessories/general.php b/resources/lang/fa/admin/accessories/general.php
index f03dcfe35b..2735702a1c 100644
--- a/resources/lang/fa/admin/accessories/general.php
+++ b/resources/lang/fa/admin/accessories/general.php
@@ -18,5 +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.',
 
 );
diff --git a/resources/lang/fa/admin/accessories/message.php b/resources/lang/fa/admin/accessories/message.php
index 3c398d05d4..9c8687d4cd 100644
--- a/resources/lang/fa/admin/accessories/message.php
+++ b/resources/lang/fa/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'وسیله چک نشده بود. لطفا دوباره امتحان کنید',
         'success' 		=> 'وسیله با موفقیت چک شد.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'کاربر نامعتبر است. لطفا دوباره امتحان کنید.'
     ),
 
diff --git a/resources/lang/fa/admin/asset_maintenances/form.php b/resources/lang/fa/admin/asset_maintenances/form.php
index 5bdd36be86..9d209d6ca5 100644
--- a/resources/lang/fa/admin/asset_maintenances/form.php
+++ b/resources/lang/fa/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'نوع نگهداری دارایی',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'عنوان',
-        'start_date'             => 'شروع شده',
-        'completion_date'        => 'تکمیل شده',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'هزینه',
         'is_warranty'            => 'بهبود ضمانت',
-        'asset_maintenance_time' => 'روزها',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'یادداشت ها',
-        'update'                 => 'بروزرسانی',
-        'create'                 => 'ایجاد'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/fa/admin/categories/message.php b/resources/lang/fa/admin/categories/message.php
index 212853273d..56f071e549 100644
--- a/resources/lang/fa/admin/categories/message.php
+++ b/resources/lang/fa/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'دسته بندی به روزرسانی نشد.لطفا دوباره تلاش کنید.',
-        'success' => 'دسته بندی با موفقیت به روزرسانی شد.'
+        'success' => 'دسته بندی با موفقیت به روزرسانی شد.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/fa/admin/components/general.php b/resources/lang/fa/admin/components/general.php
index ccb278cf62..dd2ffe7407 100644
--- a/resources/lang/fa/admin/components/general.php
+++ b/resources/lang/fa/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'یاقیمانده',
     'total' 			                 => 'مجموع',
     'update'                            => 'بروزرسانی کامپیوننت',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/fa/admin/components/message.php b/resources/lang/fa/admin/components/message.php
index 2b1763119a..48acad948f 100644
--- a/resources/lang/fa/admin/components/message.php
+++ b/resources/lang/fa/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'کامپیوننت پرداخت نشد ، دوباره سعی کنید.',
         'success' 		=> 'کامپیوننت پرداخت شد.',
-        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fa/admin/consumables/message.php b/resources/lang/fa/admin/consumables/message.php
index d7e2d482ef..dfdb68a17d 100644
--- a/resources/lang/fa/admin/consumables/message.php
+++ b/resources/lang/fa/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'مواد مصرفی بررسی نشد ، دوباره سعی کنید.',
         'success' 		=> 'مواد مصرفی بررسی شد.',
-        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fa/admin/custom_fields/general.php b/resources/lang/fa/admin/custom_fields/general.php
index 2c5da27dc6..8549129810 100644
--- a/resources/lang/fa/admin/custom_fields/general.php
+++ b/resources/lang/fa/admin/custom_fields/general.php
@@ -29,6 +29,9 @@ return [
     'used_by_models'   		    => 'استفاده شده توسط مدل ها',
     'order'   		            => 'سفارش',
     'create_fieldset'         => 'تنظیمات فیلد جدید',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'ایجاد یک عنصر جدید',
     'create_field'            => 'فیلد سفارشی جدید',
     'create_field_title' => 'یک فیلد سفارشی جدید ایجاد کنید
@@ -60,4 +63,6 @@ return [
 ',
     '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',
 ];
diff --git a/resources/lang/fa/admin/groups/message.php b/resources/lang/fa/admin/groups/message.php
index 54bbc8a9d7..469deaec7c 100644
--- a/resources/lang/fa/admin/groups/message.php
+++ b/resources/lang/fa/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'گروه در حال حاضر وجود دارد!',
-    'group_not_found'     => 'گروه [: شناسه] وجود ندارد.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'نام زمینه مورد نیاز است',
 
     'success' => array(
diff --git a/resources/lang/fa/admin/hardware/form.php b/resources/lang/fa/admin/hardware/form.php
index 334c88eef3..00b4b21c40 100644
--- a/resources/lang/fa/admin/hardware/form.php
+++ b/resources/lang/fa/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'تأیید دارایی های حذف فله',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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'	=> 'شما در حال حذف: دارایی های تعداد دارایی.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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.',
@@ -59,7 +62,7 @@ return [
     'asset_location_update_default' => 'فقط بروزرسانی مکان پیش‌فرض',
     'asset_not_deployable' => 'این وضعیت دارایی قابل استقرار نیست. این دارایی قابل پذیرش نیست.',
     'asset_deployable' => 'این وضعیت دارایی قابل استقرار است. این دارایی قابل پذیرش است.',
-    'processing_spinner' => 'در حال پردازش...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'اطلاعات دلخواه
 ',
     'order_details'   => 'اطلاعات مربوط به سفارش
diff --git a/resources/lang/fa/admin/hardware/general.php b/resources/lang/fa/admin/hardware/general.php
index dbfdcc4242..617db848d9 100644
--- a/resources/lang/fa/admin/hardware/general.php
+++ b/resources/lang/fa/admin/hardware/general.php
@@ -17,6 +17,8 @@ return [
     'edit'  					=> 'ویرایش دارایی',
     'model_deleted'  			=> 'این مدل دارایی حذف شده است. قبل از اینکه بتوانید Asset را بازیابی کنید، باید مدل را بازیابی کنید.
 ',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'در خواست شد',
     'requested'				    => 'درخواست شده',
     'not_requestable'           => 'غیر قابل درخواست
@@ -26,6 +28,7 @@ return [
     'restore'  					=> 'بازیابی دارایی',
     'pending'  					=> 'در انتظار',
     'undeployable'  			=> 'غیرقابل گسترش',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'نمایش دارایی ها
 ',
     'csv_error' => 'شما یک خطا در فایل CSV خود دارید:
@@ -53,5 +56,6 @@ return [
     'alert_details' => 'لطفا برای جزئیات زیر را ببینید.
 ',
     'custom_export' => 'صادرات سفارشی
-'
+',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/fa/admin/hardware/message.php b/resources/lang/fa/admin/hardware/message.php
index ef8cdd69ba..4fac182622 100644
--- a/resources/lang/fa/admin/hardware/message.php
+++ b/resources/lang/fa/admin/hardware/message.php
@@ -24,6 +24,8 @@ return [
     'restore' => [
         'error'   		=> 'دارایی بازیابی نشد، لطفا دوباره تلاش کنید',
         'success' 		=> 'دارایی با موفقیت بازیابی شد.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -50,6 +52,8 @@ return [
         'success'               => 'فایل شما وارد شده است',
         'file_delete_success'   => 'فایل شما با موفقیت حذف شده است',
         'file_delete_error'      => 'فایل قابل حذف نشد',
+        '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',
     ],
 
 
diff --git a/resources/lang/fa/admin/hardware/table.php b/resources/lang/fa/admin/hardware/table.php
index 3d6835cc7e..230151de9a 100644
--- a/resources/lang/fa/admin/hardware/table.php
+++ b/resources/lang/fa/admin/hardware/table.php
@@ -9,6 +9,7 @@ return [
     'change' 		=> '/ خارج',
     'checkout_date' => 'چک کردن تاریخ',
     'checkoutto' 	=> 'قفل شده',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'ارزش فعلی
 ',
     'diff' 			=> 'دیف',
diff --git a/resources/lang/fa/admin/licenses/general.php b/resources/lang/fa/admin/licenses/general.php
index d404a47f95..d046eb1681 100644
--- a/resources/lang/fa/admin/licenses/general.php
+++ b/resources/lang/fa/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'درباره مجوزها',
-    'about_licenses'                  => 'مجوز برای پیگیری نرم افزار استفاده می شود. آنها دارای تعداد مشخصی از صندلی هایی هستند که می توانند به افراد منتقل شوند',
+    'about_licenses_title'      => 'درباره مجوزها',
+    'about_licenses'            => 'مجوز برای پیگیری نرم افزار استفاده می شود. آنها دارای تعداد مشخصی از صندلی هایی هستند که می توانند به افراد منتقل شوند',
     'checkin'  					=> 'بررسی صندلی مجوز',
     'checkout_history'  		=> 'تاریخچه پرداخت',
     'checkout'  				=> 'صندلی مجوز پرداخت',
@@ -19,4 +19,30 @@ return array(
     'software_licenses'  		=> 'گواهی نامه های نرم افزاری',
     'user'  					=> 'کاربر',
     'view'  					=> 'مشاهده توافق‌نامه',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/fa/admin/manufacturers/message.php b/resources/lang/fa/admin/manufacturers/message.php
index b20fcc37d6..fe99beaea8 100644
--- a/resources/lang/fa/admin/manufacturers/message.php
+++ b/resources/lang/fa/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'تولید کننده وجود ندارد.',
     'assoc_users'	 => 'این تولید کننده در حال حاضر با حداقل یک مدل همراه است و نمی تواند حذف شود. لطفا مدل های خود را به دیگر مرجع این تولید کننده به روز رسانی کنید و دوباره امتحان کنید.',
 
diff --git a/resources/lang/fa/admin/manufacturers/table.php b/resources/lang/fa/admin/manufacturers/table.php
index 95874ad341..cffbfe2295 100644
--- a/resources/lang/fa/admin/manufacturers/table.php
+++ b/resources/lang/fa/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'ایمیل پشتیبانی',
     'support_phone'   		=> 'تلفن پشتیبانی',
     'support_url'   		=> 'URL پشتیبانی',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'به روز رسانی تولیدکننده',
     'url'   				=> 'نشانی اینترنتی',
 
diff --git a/resources/lang/fa/admin/models/general.php b/resources/lang/fa/admin/models/general.php
index d3addc2fee..0b70f9253f 100644
--- a/resources/lang/fa/admin/models/general.php
+++ b/resources/lang/fa/admin/models/general.php
@@ -7,8 +7,7 @@ return array(
     'bulk_delete'               => 'حذف دسته جمعی مدل های دارایی',
     'bulk_delete_help'               => 'برای تأیید حذف مدل‌های دارایی انتخاب شده از کادرهای تأیید زیر استفاده کنید. مدل‌های دارایی‌هایی که دارایی‌های مرتبط با آن‌ها هستند، تا زمانی که دارایی‌ها با مدل دیگری مرتبط نشوند، قابل حذف نیستند.
 ',
-    'bulk_delete_warn'          => 'شما در حال حذف مدل های دارایی :model_count هستید.
-',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'بازیابی مدل',
     'requestable'               => 'کاربران ممکن است از این مدل درخواست کنند',
 	'show_mac_address'			      => 'نمایش قسمت آدرس MAC در دارایی در این مدل',
diff --git a/resources/lang/fa/admin/models/message.php b/resources/lang/fa/admin/models/message.php
index c6c109fead..9d0826e422 100644
--- a/resources/lang/fa/admin/models/message.php
+++ b/resources/lang/fa/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'مدل موجود نیست.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'این مدل در حال حاضر همراه یک یا بیشتر از یک دارایی است و نمی تواند حذف شود. لطفا دارایی ها را حذف کنید و سپس برای حذف کردن مجددا تلاش کنید. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'مدل به روزرسانی نشده است، لطفا دوباره تلاش کنید',
-        'success' => 'مدل با موفقیت به روز رسانی شد.'
+        'success' => 'مدل با موفقیت به روز رسانی شد.',
     ),
 
     'delete' => array(
@@ -30,13 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'هیچ فیلدی تغییر نکرده بود، بنابراین چیزی به روز نشد.',
-        'success' 		=> 'مدل های به روز شده'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'هیچ مدلی انتخاب نشده بود، بنابراین هیچ چیز حذف نشد.',
-        'success' 		    => ':success_count مدل(های) حذف شد!
-',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> 'مدل(های) :success_count حذف شدند، اما :fail_count حذف نشدند زیرا هنوز دارایی های مرتبط با آنها هستند.
 '
     ),
diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php
index cd0c9817aa..b2a57ce72e 100644
--- a/resources/lang/fa/admin/settings/general.php
+++ b/resources/lang/fa/admin/settings/general.php
@@ -16,8 +16,7 @@ return [
 ',
     'is_ad'				        => 'این سرور Active Directory است',
     'alerts'                	=> 'هشدار',
-    'alert_title'               => 'تنظیمات هشدار را به روز کنید
-',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'ارسال هشدار به',
     'alert_email_help'    => 'آدرس‌های ایمیل یا لیست‌های توزیعی که می‌خواهید هشدارها به آنها ارسال شود، با کاما از هم جدا شده‌اند
 ',
@@ -45,8 +44,7 @@ return [
     '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'             => 'پشتیبان‌گیری‌های بسیار بزرگ ممکن است در تلاش بازیابی به پایان برسد و ممکن است همچنان نیاز باشد از طریق خط فرمان اجرا شوند.
@@ -109,6 +107,7 @@ return [
     '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_client_tls_key'       => 'کلید TLS مشتری LDAP
 ',
@@ -121,6 +120,8 @@ return [
 ',
      'ldap_client_tls_key'       => 'کلید TLS سمت مشتری LDAP
 ',
+    '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'      => 'یک نام کاربری و رمز عبور LDAP معتبر از DN پایه ای که در بالا مشخص کرده اید وارد کنید تا بررسی کنید که آیا ورود به سیستم LDAP شما به درستی پیکربندی شده است یا خیر. ابتدا باید تنظیمات LDAP به روز شده خود را ذخیره کنید.
 ',
     'ldap_login_sync_help'      => 'این فقط آزمایش می کند که LDAP می تواند به درستی همگام شود. اگر درخواست احراز هویت LDAP شما صحیح نباشد، کاربران ممکن است هنوز نتوانند وارد سیستم شوند. ابتدا باید تنظیمات LDAP به روز شده خود را ذخیره کنید.
@@ -295,20 +296,21 @@ return [
     'show_images_in_email_help'   => 'اگر نصب Snipe-IT شما پشت VPN یا شبکه بسته است و کاربران خارج از شبکه نمی توانند تصاویر ارائه شده از این نصب را در ایمیل های خود بارگیری کنند، علامت این کادر را بردارید.
 ',
     'site_name'                 => 'نام سایت',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'تنظیمات هشدار را به روز کنید
-',
-    'slack_help'                => 'تنظیمات Slack',
-    'slack_botname'             => 'پشت گوش فراخ Botname',
-    'slack_channel'             => 'اسلک کانال',
-    'slack_endpoint'            => 'نقطه پایان اسلک',
-    'slack_integration'         => 'تنظیمات اسلک',
-    'slack_integration_help'    => 'ادغام Slack اختیاری است، اما اگر می‌خواهید از آن استفاده کنید، نقطه پایانی و کانال مورد نیاز است. برای پیکربندی ادغام Slack، ابتدا باید <a href=":slack_link" target="_new" rel="noopener">یک وب هوک ورودی</a> در حساب Slack خود ایجاد کنید. روی دکمه <strong>Test Slack Integration</strong> کلیک کنید تا قبل از ذخیره کردن، صحت تنظیمات خود را تأیید کنید.
-',
-    'slack_integration_help_button'    => 'هنگامی که اطلاعات Slack خود را ذخیره کردید، یک دکمه تست ظاهر می شود.
-',
-    'slack_test_help'           => 'تست کنید که آیا ادغام Slack شما به درستی پیکربندی شده است یا خیر. ابتدا باید تنظیمات SLACK به روز شده خود را ذخیره کنید.
-',
+    'general_webhook'           => 'General Webhook',
+    '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',
     'support_footer'            => 'پشتیبانی از پیوندهای پاورقی
 ',
@@ -439,8 +441,7 @@ return [
     'localization_help' => 'زبان، نمایش تاریخ
 ',
     'notifications' => 'اعلان‌ ها',
-    'notifications_help' => 'هشدارهای ایمیل، تنظیمات ممیزی
-',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'افزایش و پیشوندها
 ',
     'labels' => 'برچسب ها',
@@ -478,4 +479,9 @@ return [
 ',
     'slack_test' => 'تست <i class="fab fa-slack"></i> یکپارچه سازی
 ',
+    '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. ',
+
 ];
diff --git a/resources/lang/fa/admin/settings/message.php b/resources/lang/fa/admin/settings/message.php
index 4cb2accd53..740f692b86 100644
--- a/resources/lang/fa/admin/settings/message.php
+++ b/resources/lang/fa/admin/settings/message.php
@@ -42,14 +42,12 @@ return [
         'authentication_success' => 'کاربر در برابر LDAP با موفقیت احراز هویت شد!
 '
     ],
-    'slack' => [
-        'sending' => 'ارسال پیام تست Slack...
-',
-        'success_pt1' => 'موفقیت! بررسی کنید
-',
-        'success_pt2' => 'برای پیام آزمایشی خود کانال را ارسال کنید و حتماً برای ذخیره تنظیمات خود روی ذخیره در زیر کلیک کنید.
-',
-        '500' => 'خطای سرور',
-        'error' => 'مشکلی پیش آمده.',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/fa/admin/users/general.php b/resources/lang/fa/admin/users/general.php
index b34e584011..abac35cc86 100644
--- a/resources/lang/fa/admin/users/general.php
+++ b/resources/lang/fa/admin/users/general.php
@@ -23,6 +23,8 @@ return [
 ',
     'user_notified'     => 'لیستی از موارد اختصاص داده شده فعلی به کاربر ایمیل شده است.
 ',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'برنامه چک شد برای:',
     'send_email_help'   => 'شما باید یک آدرس ایمیل برای این کاربر ارائه دهید تا اطلاعات کاربری خود را ارسال کند. ارسال اعتبار نامه ایمیل فقط با ایجاد کاربر امکان پذیر است. رمزهای عبور در یک هش یک طرفه ذخیره می شوند و پس از ذخیره نمی توان آنها را بازیابی کرد.
 ',
@@ -45,7 +47,6 @@ return [
 ',
     'remove_group_memberships' => 'حذف عضویت در گروه
 ',
-    'warning_deletion' => 'اخطار!',
     'warning_deletion_information' => 'شما در شرف بررسی همه موارد از کاربر(های) :count فهرست شده در زیر هستید. نام های فوق ادمین با رنگ قرمز مشخص شده اند.
 ',
     'update_user_assets_status' => 'همه دارایی های این کاربران را به این وضعیت به روز کنید
@@ -59,4 +60,13 @@ return [
 ',
     'not_remote_label' => 'این یک کاربر راه دور نیست
 ',
+    '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/fa/admin/users/message.php b/resources/lang/fa/admin/users/message.php
index 6237c0965a..84c019cbc0 100644
--- a/resources/lang/fa/admin/users/message.php
+++ b/resources/lang/fa/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'شما با موفقیت این دارایی را به کاهش دادید.',
     'bulk_manager_warn'	        => 'کاربران شما با موفقیت به روز شده اند، با این حال مدیر ورود شما ذخیره نشد زیرا مدیر شما انتخاب شده بود نیز در لیست کاربر برای ویرایش، و کاربران ممکن است مدیر خود نیست. لطفا کاربران خود را دوباره انتخاب کنید، به غیر از مدیر.',
     'user_exists'               => 'کاربر "{0}" در حال حاضر وجود دارد.',
-    'user_not_found'            => 'کاربر [:id] موجود نیست.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'فیلد ورود الزامی است.',
     'user_password_required'    => 'کلمه عبور ضروری است.',
     'insufficient_permissions'  => 'دسترسی محدود',
diff --git a/resources/lang/fa/auth/general.php b/resources/lang/fa/auth/general.php
index 3ca176e117..4af6cf6b58 100644
--- a/resources/lang/fa/auth/general.php
+++ b/resources/lang/fa/auth/general.php
@@ -15,5 +15,8 @@ return [
 ',
     'username_help_bottom'          => 'نام کاربری و آدرس ایمیل شما <em>ممکن است</em> یکسان باشد، اما ممکن است نباشد، بسته به پیکربندی شما. اگر نمی توانید نام کاربری خود را به خاطر بسپارید، با سرپرست خود تماس بگیرید. <br><br><strong>برای نام‌های کاربری بدون آدرس ایمیل مرتبط، پیوند بازنشانی رمز عبور ایمیل ارسال نمی‌شود.</strong>
 ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php
index 45afaf084a..535f5827da 100644
--- a/resources/lang/fa/general.php
+++ b/resources/lang/fa/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'تجهیزات جانبی',
     'activated'			    => 'فعال شد',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'لوازم جانبی',
     'accessory_report'		=> 'گزارش لوازم جانبی',
     'action'                => 'اقدام',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'حسابرسی',
     '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'           => 'اختصاص داده شده به :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'حذف آواتار',
     'avatar_upload'         => 'بارگذاری آواتار',
     'back'      			=> 'بازگشت',
@@ -41,8 +48,9 @@ return [
 
 ',
     'bulk_actions'          => 'اقدام دسته جمعی',
-    'bulk_checkin_delete'   => 'موارد اعلام حضور دسته جمعی از کاربران
-',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'به ترتیب وضعیت',
     'cancel'  				=> 'انصراف',
     'categories'			=> 'دسته‌بندی‌ها',
@@ -90,6 +98,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.',
     'deleted'  				=> 'حذف شد',
     'delete_seats'  		=> 'صندلی ها حذف شده
 ',
@@ -154,6 +163,7 @@ return [
     'filetypes_size_help'   => 'حداکثر اندازه مجاز بارگذاری: اندازه است.
 ',
     'image_filetypes_help'  => 'نوع فایل های قابل قبول: jpg, webp, png, gif, و svg. حداکثر سایز فایل :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'         	    => 'واردات',
     'importing'         	=> 'در حال وارد کردن',
     'importing_help'        => 'می‌توانید دارایی‌ها، لوازم جانبی، مجوزها، اجزا، مواد مصرفی و کاربران را از طریق فایل CSV وارد کنید. <br><br>CSV باید با کاما محدود شود و با سرصفحه‌هایی که در <a href="https://snipe-it.readme.io/docs/importing" target="_new"> مطابقت دارند قالب‌بندی شود. نمونه CSV در مستندات</a>.
@@ -164,6 +174,8 @@ return [
     'asset_maintenances'       => 'نگهداشت دارایی',
     'item'  				=> 'مورد',
     'item_name'             => 'نام کالا',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'دسترسی محدود!',
     'kits'       			=> 'مقادیر از پیش تعریف شده',
     'language'				=> 'زبان',
@@ -244,6 +256,7 @@ return [
 ',
     'request_canceled'      => 'درخواست لغو شد',
     'save'  				=> 'ذخیره کردن',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'انتخاب',
     'select_all'            => 'انتخاب همه',
     'search'				=> 'جستوجو',
@@ -268,10 +281,8 @@ return [
     'signed_off_by'         => 'امضا شده توسط
 ',
     'skin'       			=> 'پوسته',
-    'slack_msg_note'        => 'یک پیام  ارسال خواهد شد
-',
-    'slack_test_msg'        => 'اوه هی! به نظر می رسد ادغام Slack شما با Snipe-IT کار می کند!
-',
+    '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' => 'MODE DEMO: برخی از ویژگی ها برای این نصب غیر فعال هستند.',
     'site_name'				=> 'نام سایت',
     'state'  				=> 'وضعیت',
@@ -284,7 +295,6 @@ return [
     'sure_to_delete'    => 'مطمئنید که میخواهید حذف شود',
     'submit'				=> 'ارسال',
     'target'                => 'هدف',
-    'toggle_navigation'     => 'تغییر وضعیت ناوبری',
     'time_and_date_display' => 'نمایش زمان و تاریخ',
     'total_assets'			=> 'کل دارایی',
     'total_licenses'		=> 'کل مجوزهای',
@@ -467,7 +477,8 @@ 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 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',
@@ -477,8 +488,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/fa/help.php b/resources/lang/fa/help.php
index 211ab6b12d..ea6b9a86c6 100644
--- a/resources/lang/fa/help.php
+++ b/resources/lang/fa/help.php
@@ -15,8 +15,7 @@ return [
 
     'more_info_title' => 'اطلاعات بیشتر',
 
-    'audit_help' => 'با علامت زدن این کادر، سابقه دارایی برای منعکس کردن این مکان جدید ویرایش می شود. بدون علامت گذاشتن آن، به سادگی مکان در گزارش حسابرسی یادداشت می شود.<br><br>توجه داشته باشید که این دارایی بررسی شده است، مکان شخص، دارایی یا مکانی که در آن بررسی شده است را تغییر نمی دهد.
-',
+    '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' => 'دارایی ها مواردی هستند که توسط شماره سریال یا برچسب دارایی دنبال می شوند. آنها تمایل دارند که مقادیر ارزش بیشتری داشته باشند که در آن شناسایی یک مورد خاص موردنیاز باشد.',
 
diff --git a/resources/lang/fa/localizations.php b/resources/lang/fa/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/fa/localizations.php
+++ b/resources/lang/fa/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/fa/mail.php b/resources/lang/fa/mail.php
index ba6d684658..151d6e94a1 100644
--- a/resources/lang/fa/mail.php
+++ b/resources/lang/fa/mail.php
@@ -47,6 +47,7 @@ return [
     'login_first_admin' => 'با نصب مجدد Snipe-IT جدید خود به سیستم وارد شوید',
     'login' => 'ورود:',
     'Low_Inventory_Report' => 'گزارش موجودی کم',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'حداقل QTY',
     'name' => 'نام',
     'new_item_checked' => 'یک آیتم جدید تحت نام شما چک شده است، جزئیات زیر است.',
@@ -78,6 +79,7 @@ return [
     'Accessory_Checkin_Notification' => 'لوازم جانبی بررسی شد',
     'Asset_Checkin_Notification' => 'دارایی ثبت شد
 ',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'مجوز بررسی شد
 ',
     'Expected_Checkin_Report' => 'گزارش بررسی دارایی مورد انتظار
@@ -87,4 +89,5 @@ return [
     'Expected_Checkin_Date' => 'دارایی‌ای که برای شما بررسی شده است باید دوباره در تاریخ :date بررسی شود',
     'your_assets' => 'دارایی های خود را مشاهده کنید
 ',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/fa/validation.php b/resources/lang/fa/validation.php
index 30f447d956..a1cb78b89c 100644
--- a/resources/lang/fa/validation.php
+++ b/resources/lang/fa/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'ویژگی: باید دارای حداقل موارد: min باشد.',
     ],
     'starts_with'          => 'ویژگی : باید با یکی از موارد زیر شروع شود: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'ویژگی انتخاب شده نامعتبر است.',
     'numeric'              => 'ویژگی باید عدد باشد.',
     'present'              => 'فیلد attribute باید باشد.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'رمز عبور فعلی شما اشتباه است',
         'dumbpwd'          => 'این رمز عبور خیلی رایج است',
         'statuslabel_type' => 'شما باید نوع برچسب معتبر را انتخاب کنید',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/fi/admin/accessories/general.php b/resources/lang/fi/admin/accessories/general.php
index a5e7bdc7b6..d96405fc6c 100644
--- a/resources/lang/fi/admin/accessories/general.php
+++ b/resources/lang/fi/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Oheistarvikkeen päivittäminen',
     'use_default_eula'					=> 'Käytä <a href="#" data-toggle="modal" data-target="#eulaModal">yleisiä käyttöehtoja</a>.',
     'use_default_eula_disabled'			=> '<del>Käytä yleisiä käyttöehtoja.</del> Et ole vielä määritellyt yleisiä käyttöehtoja, voit lisätä ne asetuksista.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/fi/admin/accessories/message.php b/resources/lang/fi/admin/accessories/message.php
index 539b984b7c..bb315379d6 100644
--- a/resources/lang/fi/admin/accessories/message.php
+++ b/resources/lang/fi/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Oheistarviketta ei luovutettu, yritä uudelleen',
         'success' 		=> 'Oheistarvike luovutettiin onnistuneesti.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.'
     ),
 
diff --git a/resources/lang/fi/admin/asset_maintenances/form.php b/resources/lang/fi/admin/asset_maintenances/form.php
index 79c3999c1c..d000ce901d 100644
--- a/resources/lang/fi/admin/asset_maintenances/form.php
+++ b/resources/lang/fi/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Huollon tyyppi',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Otsikko',
-        'start_date'             => 'Aloituspäivä',
-        'completion_date'        => 'Valmis',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kustannus',
         'is_warranty'            => 'Takuun parannus',
-        'asset_maintenance_time' => 'Päivää',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Muistiinpanot',
-        'update'                 => 'Päivitä',
-        'create'                 => 'Luo'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/fi/admin/categories/message.php b/resources/lang/fi/admin/categories/message.php
index 81f9591d73..39e03f7c24 100644
--- a/resources/lang/fi/admin/categories/message.php
+++ b/resources/lang/fi/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategoriaa ei päivitetty, yritä uudelleen',
-        'success' => 'Kategoria päivitettiin onnistuneesti.'
+        'success' => 'Kategoria päivitettiin onnistuneesti.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/fi/admin/components/general.php b/resources/lang/fi/admin/components/general.php
index c99efc61eb..e13c4f5153 100644
--- a/resources/lang/fi/admin/components/general.php
+++ b/resources/lang/fi/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Jäljellä',
     'total' 			                 => 'Yhteensä',
     'update'                            => 'Päivitä komponentti',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/fi/admin/components/message.php b/resources/lang/fi/admin/components/message.php
index 3eb759fa0c..9795a338cd 100644
--- a/resources/lang/fi/admin/components/message.php
+++ b/resources/lang/fi/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponenttia ei luovutettu, yritä uudelleen',
         'success' 		=> 'Komponentin luovutus onnistui.',
-        'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.'
+        'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fi/admin/consumables/message.php b/resources/lang/fi/admin/consumables/message.php
index bb69e00a46..fa17aaf179 100644
--- a/resources/lang/fi/admin/consumables/message.php
+++ b/resources/lang/fi/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Kulutustarviketta ei luovutettu, yritä uudelleen',
         'success' 		=> 'Kulutustarvike luovutettiin.',
-        'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.'
+        'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fi/admin/custom_fields/general.php b/resources/lang/fi/admin/custom_fields/general.php
index 157e253601..fd65775e4e 100644
--- a/resources/lang/fi/admin/custom_fields/general.php
+++ b/resources/lang/fi/admin/custom_fields/general.php
@@ -2,7 +2,7 @@
 
 return [
     'custom_fields'		        => 'Mukautetut kentät',
-    'manage'                    => 'Manage',
+    'manage'                    => 'Hallitse',
     'field'		                => 'Kenttä',
     'about_fieldsets_title'		=> 'Tietoja kenttäsarjoista',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Käytetään malleissa',
     'order'   		            => 'Tilata',
     'create_fieldset'         => 'Uusi kenttäsarja',
+    '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'            => 'Uusi mukautettu kenttä',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/fi/admin/groups/message.php b/resources/lang/fi/admin/groups/message.php
index 1e2272b76d..41ba5fb9e7 100644
--- a/resources/lang/fi/admin/groups/message.php
+++ b/resources/lang/fi/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Ryhmä on jo olemassa!',
-    'group_not_found'     => 'Ryhmää [:id] ei löydy.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Nimi on pakollinen',
 
     'success' => array(
diff --git a/resources/lang/fi/admin/hardware/form.php b/resources/lang/fi/admin/hardware/form.php
index 1b7f3d8565..8bf4c21f3e 100644
--- a/resources/lang/fi/admin/hardware/form.php
+++ b/resources/lang/fi/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Vahvista laitteiden massapoisto',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Tarkasta alla olevat massapoistettavat laitteet. Kun nämä laitteet on poistettu, ne voidaan palauttaa, mutta niitä ei enää yhdistetä niihin käyttäjiin, joille ne on tällä hetkellä luovutettuna.',
+  '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'	=> 'Olet poistamassa :asset_count laitetta.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Massapäivitä laitteita',
     'bulk_update_help'	=> 'Tämän lomakkeen avulla voit päivittää useita laitteita kerralla. Täytä vain ne kentät joita haluat muuttaa. Tyhjäksi jätettyjä kenttiä ei päivitetä. ',
     'bulk_update_warn'	=> 'Olet muokkaamassa yhden laitteen ominaisuuksia.- Olet muokkaamassa :asset_count laitteen ominaisuuksia.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Päivitä vain oletussijainti',
     'asset_not_deployable' => 'Laite ei ole käyttöönotettavissa. Laitetta ei voida luovuttaa.',
     'asset_deployable' => 'Laite on käyttöönotettavissa. Laite voidaan luovuttaa.',
-    'processing_spinner' => 'Käsitellään...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Valinnaiset tiedot',
     'order_details'   => 'Tilaukseen liityvät tiedot'
 ];
diff --git a/resources/lang/fi/admin/hardware/general.php b/resources/lang/fi/admin/hardware/general.php
index 6180981fdf..f3c419afa8 100644
--- a/resources/lang/fi/admin/hardware/general.php
+++ b/resources/lang/fi/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Tämä laite on poistettu.',
     'edit'  					=> 'Muokkaa laitetta',
     'model_deleted'  			=> 'Laitemalli on poistettu. Voit palauttaa laitteen kun olet ensin palauttanut poistetun laitemallin.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Pyydettävissä',
     'requested'				    => 'Pyydetty',
     'not_requestable'           => 'Ei pyydettävissä',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Palauta laite',
     'pending'  					=> 'Odottaa',
     'undeployable'  			=> 'Ei käytettävissä',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Näytä laite',
     'csv_error' => 'Sinulla on virhe CSV tiedostossasi:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Virheilmoitukset:',
     'success_messages' => 'Onnistuneet:',
     'alert_details' => 'Tarkempia tietoja on alla.',
-    'custom_export' => 'Mukautettu vienti'
+    'custom_export' => 'Mukautettu vienti',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/fi/admin/hardware/message.php b/resources/lang/fi/admin/hardware/message.php
index 6ecc8bf815..f6eed3175b 100644
--- a/resources/lang/fi/admin/hardware/message.php
+++ b/resources/lang/fi/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Laitetta ei palautettu, ole hyvä ja yritä uudelleen',
         'success' 		=> 'Laite palautettiin onnistuneesti.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Tiedostosi on tuotu',
         'file_delete_success'   => 'Tiedosto on poistettu onnistuneesti',
         'file_delete_error'      => 'Tiedostoa ei voitu poistaa',
+        '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',
     ],
 
 
diff --git a/resources/lang/fi/admin/hardware/table.php b/resources/lang/fi/admin/hardware/table.php
index f0dd798767..fd4808c024 100644
--- a/resources/lang/fi/admin/hardware/table.php
+++ b/resources/lang/fi/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Toiminto',
     'checkout_date' => 'Luovutuspäivä',
     'checkoutto' 	=> 'Luovutettu',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Nykyinen arvo',
     'diff' 			=> 'Erotus',
     'dl_csv' 		=> 'Lataa CSV',
diff --git a/resources/lang/fi/admin/licenses/general.php b/resources/lang/fi/admin/licenses/general.php
index c6ade5fe44..4cda18c8f3 100644
--- a/resources/lang/fi/admin/licenses/general.php
+++ b/resources/lang/fi/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Tietoja lisensseistä',
-    'about_licenses'                  => 'Ohjelmistojen seurantaan käytetään lisenssejä. Lisenssejä on rajattu määrä asennettavaksi',
+    'about_licenses_title'      => 'Tietoja lisensseistä',
+    'about_licenses'            => 'Ohjelmistojen seurantaan käytetään lisenssejä. Lisenssejä on rajattu määrä asennettavaksi',
     'checkin'  					=> 'Palauta lisenssi',
     'checkout_history'  		=> 'Luovutushistoria',
     'checkout'  				=> 'Luovuta lisenssi',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Ohjelmistolisenssit',
     'user'  					=> 'Käyttäjä',
     'view'  					=> 'Näytä lisenssi',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/fi/admin/manufacturers/message.php b/resources/lang/fi/admin/manufacturers/message.php
index ab14fdaff2..23c1359710 100644
--- a/resources/lang/fi/admin/manufacturers/message.php
+++ b/resources/lang/fi/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Valmistajaa ei löydy.',
     'assoc_users'	 => 'Valmistaja on määritetty käyttöön yhdelle tai useammalle mallille joten sitä ei voida poistaa. Poista valmistaja käytöstä kaikilta malleilta ja yritä uudelleen. ',
 
diff --git a/resources/lang/fi/admin/manufacturers/table.php b/resources/lang/fi/admin/manufacturers/table.php
index ec3e0b8e0f..cce44f891a 100644
--- a/resources/lang/fi/admin/manufacturers/table.php
+++ b/resources/lang/fi/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Tuen sähköposti',
     'support_phone'   		=> 'Tuen puhelin',
     'support_url'   		=> 'Tuen URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Päivitä valmistaja',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/fi/admin/models/general.php b/resources/lang/fi/admin/models/general.php
index 3068e68dcd..fd5c212fcd 100644
--- a/resources/lang/fi/admin/models/general.php
+++ b/resources/lang/fi/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count laitemallia.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Palauta malli',
     'requestable'               => 'Käyttäjät voivat pyytää tätä mallia',
 	'show_mac_address'			      => 'Näytä MAC-osoitekenttä tämän mallin laitteille',
diff --git a/resources/lang/fi/admin/models/message.php b/resources/lang/fi/admin/models/message.php
index 4f1d10bbc8..8b894633cd 100644
--- a/resources/lang/fi/admin/models/message.php
+++ b/resources/lang/fi/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Malli ei löydy.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Mallia ei päivitetty, yritä uudelleen',
-        'success' => 'Malli päivitettiin onnistuneesti.'
+        'success' => 'Malli päivitettiin onnistuneesti.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Mitään kentistä ei ollut muutettu, joten mitään ei päivitetty.',
-        'success' 		=> 'Mallit päivitetty.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ei malleja valittuna, mitään ei poistettu.',
-        'success' 		    => ':success_count malli(a) poistettu!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count malli(a) poistettiin, mutta :fail_count ei voitu poistaa, koska niillä on vielä niihin liittyviä laitteita.'
     ),
 
diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php
index 9d13b9ab21..0c221bdd6e 100644
--- a/resources/lang/fi/admin/settings/general.php
+++ b/resources/lang/fi/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Käytössä on Active Directory -palvelin',
     'alerts'                	=> 'Hälytykset',
-    'alert_title'               => 'Päivitä hälytysasetukset',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Lähetä ilmoitukset',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Sähköposti hälytykset käytössä',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Palauta varmuuskopiosta',
     'backups_upload'            => 'Lataa varmuuskopio',
     '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'			=> 'Viivakoodi asetukset',
@@ -77,6 +77,7 @@ return [
     '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 Asiakaspuolen TLS varmenne',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP-asetukset',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Syötä toimiva LDAP-käyttäjätunnus ja salasana määrittelemästäsi base DN: stä testataksesi LDAP-kirjautumisen toimivuutta. SINUN TULEE TALLENTAA UUDET LDAP ASETUKSET ENSIN.',
     '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 Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Näytä kuvia sähköposteissa',
     'show_images_in_email_help'   => 'Poista tämä valinta, jos Snipe-IT asennus on toteutettu VPN: n avulla tai suljetussa verkossa, koska sähköposteissa käytetyt kuvat eivät voi latautua näkyviin sähköposteissa.',
     'site_name'                 => 'Sivuston nimi',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack-botin nimi',
-    'slack_channel'             => 'Slack-kanava',
-    'slack_endpoint'            => 'Slack-yhdyspiste',
-    'slack_integration'         => 'Slackin asetukset',
-    'slack_integration_help'    => 'Slack-integraatio on valinnainen, mutta päätepiste ja kanava vaaditaan, jos haluat käyttää sitä. Määrittääksesi Slack-integraation, sinun täytyy ensin <a href=":slack_link" target="_new" rel="noopener">luoda saapuva webhook</a> Slack-tilillesi. Klikkaa <strong>Testaa Slack Integraatio</strong> -painiketta varmistaaksesi, että asetuksesi ovat oikein ennen tallentamista. ',
-    'slack_integration_help_button'    => 'Kun olet tallentanut tiedot Slackista, testinappi ilmestyy.',
-    'slack_test_help'           => 'Testaa, onko integraatio Slackiin määritelty oikein. SINUN TULEE TALLENTAA UUDET ASETUKSET ENSIN.',
+    'general_webhook'           => 'General Webhook',
+    '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 versio',
     'support_footer'            => 'Tuki-alatunnisteen linkit ',
     'support_footer_help'       => 'Määrittele, kuka voi nähdä linkit Snipe-IT tukipalvelun tietoihin ja käyttöohjeeseen',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/fi/admin/settings/message.php b/resources/lang/fi/admin/settings/message.php
index 5d518ab4d3..40a8dc3977 100644
--- a/resources/lang/fi/admin/settings/message.php
+++ b/resources/lang/fi/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/fi/admin/users/general.php b/resources/lang/fi/admin/users/general.php
index f4e0bbe780..7d0d2709d3 100644
--- a/resources/lang/fi/admin/users/general.php
+++ b/resources/lang/fi/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Tulosta kaikki luovutetut',
     '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',
     'software_user'     => 'Käyttäjälle :name luovutetut ohjelmistot',
     'send_email_help'   => 'Käyttäjälle on määritettävä sähköpostiosoite lähettääksesi salasanan sähköpostitse. Salasanat voi lähettää sähköpostilla vain käyttäjän luonnin yhteydessä. Salasanat tallennetaan järjestelmään yksisuuntaisesti tiivistettyinä, eikä niitä voida lukea selväkielisenä tallennuksen jälkeen.',
     'view_user'         => 'Näytä käyttäjä :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/fi/admin/users/message.php b/resources/lang/fi/admin/users/message.php
index 0e4e127964..880bbbf0b0 100644
--- a/resources/lang/fi/admin/users/message.php
+++ b/resources/lang/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ää [:id] ei löydy.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Käyttäjätunnus vaaditaan',
     'user_password_required'    => 'Salasana vaaditaan.',
     'insufficient_permissions'  => 'Riittämättömät oikeudet.',
diff --git a/resources/lang/fi/auth/general.php b/resources/lang/fi/auth/general.php
index b7e93590a2..195981d13e 100644
--- a/resources/lang/fi/auth/general.php
+++ b/resources/lang/fi/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Muista minut',
     'username_help_top'                 => 'Palauttaaksesi salasanasi sähköpostilla, anna <strong> käyttäjätunnuksesi</strong>.',
     'username_help_bottom'          => 'Käyttäjätunnuksesi ja sähköpostiosoitteesi <em>voivat</em> olla samoja, mutta eivät välttämättä. Jos et muista käyttäjätunnustasi, ota yhteyttä järjestelmänvalvojaan. <br><br><strong>Käyttäjätunnuksille, joilla ei ole liitettyä sähköpostiosoitetta, ei voida lähettää sähköpostiin salasanan vaihtamislinkkiä.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php
index ecdded81d5..a18d0b3b72 100644
--- a/resources/lang/fi/general.php
+++ b/resources/lang/fi/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Oheistarvikkeet',
     'activated'			    => 'Aktivoitu',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Oheistarvike',
     'accessory_report'		=> 'Oheistarvikeraportti',
     'action'                => 'Toiminto',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Tarkasta',
     'audit_report'			=> 'Tarkastusloki',
     'assets'				=> 'Laitteet',
+    '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'           => 'Luovutettu käyttäjälle :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Poista käyttäjäkuva',
     'avatar_upload'         => 'Lähetä käyttäjäkuva',
     'back'      			=> 'Edellinen',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Massamuokkaus',
     'bulk_delete'           => 'Massapoista',
     'bulk_actions'          => 'Massatoimintoja',
-    'bulk_checkin_delete'   => 'Massapalauta laitteita käyttäjiltä',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'tilan mukaan',
     'cancel'  				=> 'Peruuta',
     'categories'			=> 'Kategoriat',
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Poistettu',
     'delete_seats'  		=> 'Poistettu käytöstä',
     'deletion_failed'       => 'Poisto epäonnistui',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Hyväksytyt tiedostotyyppejä ovat jpg, png, gif ja svg. Suurin sallittu lähetyskoko on :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'         	    => 'Tuo tiedot',
     'importing'         	=> 'Tuonti',
     'importing_help'        => 'Voit tuoda laitteita, oheistarvikkeita, lisenssejä, komponentteja, kulutustarvikkeita ja käyttäjiä CSV-tiedoston avulla. <br><br>CSV tulisi olla pilkulla rajattu ja sisältää otsikot, jotka vastaavat <a href="https://snipe-it.readme.io/docs/importing" target="_new"> CSV-otsikoita dokumentaatiossa</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Laitteiden huollot',
     'item'  				=> 'Nimike',
     'item_name'             => 'Kohteen nimi',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Riittämättömät käyttöoikeudet!',
     'kits'       			=> 'Sarjat',
     'language'				=> 'Kieli',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Pyydetyt laitteet',
     'request_canceled'      => 'Pyyntö peruutettu',
     'save'  				=> 'Tallenna',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Valitse',
     'select_all'            => 'Valitse kaikki',
     'search'				=> 'Etsi',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Allekirjoitus',
     'signed_off_by'         => 'Luovuttanut',
     'skin'       			=> 'Ulkoasu',
-    'slack_msg_note'        => 'Slack viesti lähetetään',
-    'slack_test_msg'        => 'Jestas! Näyttää siltä, että Slack integrointi Snipe-IT. n kanssa toimii!',
+    '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-TILA: Jotkin ominaisuudet eivät ole käytössä tässä asennuksessa.',
     'site_name'				=> 'Sivuston nimi',
     'state'  				=> 'Maakunta',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Haluatko varmasti poistaa',
     'submit'				=> 'Lähetä',
     'target'                => 'Kohde',
-    'toggle_navigation'     => 'Näytä/piilota navigointi',
     'time_and_date_display' => 'Ajan ja päivämäärän näyttö',
     'total_assets'			=> 'laitetta',
     'total_licenses'		=> 'lisenssejä',
@@ -375,7 +388,8 @@ 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'           => 'Poista tämän laitteen arvot|Poista arvot kaikille :asset_count laitteille ',
+    '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 - ostopäivää ei annettu',
     'assets_by_status'      => 'Laitteet tilan mukaan',
     'assets_by_status_type'      => 'Laitteet tilan tyypin mukaan',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Aloituspäivä',
     'end_date'            => 'Päättymispäivä',
     'alt_uploaded_image_thumbnail' => 'Ladattu pikkukuva',
-    'placeholder_kit'       => 'Valitse sarja'
+    'placeholder_kit'       => 'Valitse sarja',
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/fi/help.php b/resources/lang/fi/help.php
index a96523e577..4f0c7210e7 100644
--- a/resources/lang/fi/help.php
+++ b/resources/lang/fi/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Lisätietoa',
 
-    'audit_help' => 'Tämän valitseminen muuttaa laitetiedot vastaamaan uutta sijaintia. Jos sitä ei ole valittu, sijainti kirjataan vain lokiin.<br><br> Huomaa, että jos laite on jo luovutettuna, tämä ei muuta sen henkilön, tai laitteen sijaintia mihin se on luovutettuna.',
+    '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' => 'Laitteet ovat nimmeitä joita seurataan sarjanumeron tai laitetunnisteen avulla. Laitteiksi määritellään yleensä arvokkaampaa omaisuutta, joiden tunnistaminen  yksilöllisesti on tärkeää.',
 
diff --git a/resources/lang/fi/localizations.php b/resources/lang/fi/localizations.php
index eee5a3b4c2..d0c0c65626 100644
--- a/resources/lang/fi/localizations.php
+++ b/resources/lang/fi/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Skotlanti',
         'SB'=>'Salomonsaaret',
         'SC'=>'Seychellit',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Ruotsi',
         'SG'=>'Singapore',
diff --git a/resources/lang/fi/mail.php b/resources/lang/fi/mail.php
index 96f8f15a46..68432c6768 100644
--- a/resources/lang/fi/mail.php
+++ b/resources/lang/fi/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Kirjaudu sisään uuteen Snipe-IT asennukseen käyttäen alla olevia tunnistetietoja:',
     'login' => 'Kirjaudu sisään:',
     'Low_Inventory_Report' => 'Alhainen määrä raportti',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Minimi määrä',
     'name' => 'Nimi',
     'new_item_checked' => 'Uusi nimike on luovutettu sinulle, yksityiskohdat ovat alla.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Snipe-IT - kirjautumistietosi',
     'Accessory_Checkin_Notification' => 'Oheistarvike palautettu',
     'Asset_Checkin_Notification' => 'Laite palautettu',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Lisenssi palautettu',
     'Expected_Checkin_Report' => 'Odotettujen palautuspäivien raportti',
     'Expected_Checkin_Notification' => 'Muistutus: :name palautuspäivä lähestyy',
     'Expected_Checkin_Date' => 'Sinulle luovutettu laite on määrä palauttaa takaisin :date',
     'your_assets' => 'Omat laitteesi',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/fi/validation.php b/resources/lang/fi/validation.php
index fe5ecc2b27..62abf3228c 100644
--- a/resources/lang/fi/validation.php
+++ b/resources/lang/fi/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute on oltava vähintään :min nimikettä.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Valittu :attribute on virheellinen.',
     'numeric'              => ':attribute tulee olla numero.',
     'present'              => ':attribute kentän on oltava määritettynä.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Nykyinen salasanasi on virheellinen',
         'dumbpwd'          => 'Salasana on liian yleinen.',
         'statuslabel_type' => 'Sinun on valittava kelvollinen tilamerkintätyyppi',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/fil/admin/accessories/general.php b/resources/lang/fil/admin/accessories/general.php
index 7c353d3629..bae609b721 100644
--- a/resources/lang/fil/admin/accessories/general.php
+++ b/resources/lang/fil/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'I-update ang Aksesorya',
     'use_default_eula'					=> 'Sa halip ay gamitin ang <a href="#" data-toggle="modal" data-target="#eulaModal">ang pangunahing default ng EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Sa halip ay gumamit ng pangunahing default na EULA.</del> Walang pangunahing default na EULA na nai-set. Paki-dagdag ng isa sa mga setting.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/fil/admin/accessories/message.php b/resources/lang/fil/admin/accessories/message.php
index 4c25713a2f..3ebe9c58eb 100644
--- a/resources/lang/fil/admin/accessories/message.php
+++ b/resources/lang/fil/admin/accessories/message.php
@@ -24,6 +24,7 @@ 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.'
     ),
 
diff --git a/resources/lang/fil/admin/asset_maintenances/form.php b/resources/lang/fil/admin/asset_maintenances/form.php
index c800b1753b..1f62cb2d14 100644
--- a/resources/lang/fil/admin/asset_maintenances/form.php
+++ b/resources/lang/fil/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Ang Tipo ng Pagpapanatili',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Ang Pamagat',
-        'start_date'             => 'Nagsimula na',
-        'completion_date'        => 'Nakompleto na',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Gastos',
         'is_warranty'            => 'Ang Pagpapabuti ng Warantiya',
-        'asset_maintenance_time' => 'Mga Araw',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Mga Palatandaan',
-        'update'                 => 'I-update',
-        'create'                 => 'Magsagawa'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/fil/admin/categories/message.php b/resources/lang/fil/admin/categories/message.php
index 88f8534c82..d4115ac636 100644
--- a/resources/lang/fil/admin/categories/message.php
+++ b/resources/lang/fil/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Hindi na-update ang kategorya, mangyaring subukang muli',
-        'success' => 'Matagumpay na nai-update ang kategorya.'
+        'success' => 'Matagumpay na nai-update ang kategorya.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/fil/admin/components/general.php b/resources/lang/fil/admin/components/general.php
index b373aa38b5..528316539c 100644
--- a/resources/lang/fil/admin/components/general.php
+++ b/resources/lang/fil/admin/components/general.php
@@ -12,4 +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'
 );
diff --git a/resources/lang/fil/admin/components/message.php b/resources/lang/fil/admin/components/message.php
index 1d18089b96..73549b80e7 100644
--- a/resources/lang/fil/admin/components/message.php
+++ b/resources/lang/fil/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fil/admin/consumables/message.php b/resources/lang/fil/admin/consumables/message.php
index 6bfce0c757..21c2ff52ef 100644
--- a/resources/lang/fil/admin/consumables/message.php
+++ b/resources/lang/fil/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ang consumable ay hindi nai-check out, mangyaring subukang muli',
         'success' 		=> 'Ang consumable ay matagumpay na nai-check out.',
-        'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.'
+        'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fil/admin/custom_fields/general.php b/resources/lang/fil/admin/custom_fields/general.php
index 8a4e21ef83..3d7710cb7f 100644
--- a/resources/lang/fil/admin/custom_fields/general.php
+++ b/resources/lang/fil/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Ginagamit ng mga Modelo',
     'order'   		            => 'Ang Kaayusan',
     'create_fieldset'         => 'Ang Bagong 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'            => 'Ang Bagong Custom Field',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/fil/admin/groups/message.php b/resources/lang/fil/admin/groups/message.php
index 8ccbe709c0..9d0826c3ad 100644
--- a/resources/lang/fil/admin/groups/message.php
+++ b/resources/lang/fil/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Ang grupo ay umiiral na!',
-    'group_not_found'     => 'Ang grupo [:id] ay hindi umiiral.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Ang pangalan ng field ay kinakailangan',
 
     'success' => array(
diff --git a/resources/lang/fil/admin/hardware/form.php b/resources/lang/fil/admin/hardware/form.php
index d4c7835f0f..e12062e5e2 100644
--- a/resources/lang/fil/admin/hardware/form.php
+++ b/resources/lang/fil/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'I-kumperma ang Maramihang Pagdelete ng mga Assets',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Surrin ang mga asset para sa maramihing pagdelete sa ibaba. Kapag nai-delete na, ang mga asset na ito ay pwedeng maibalik sa dati, pero hindi na ito maiugnay sa kahit sinong user na nakatalaga nito.',
+  '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'	=> 'Ikaw ay mag-delete ng :asset_count na mga asset.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Ang Maramihang Asset na Nai-update',
     'bulk_update_help'	=> 'Ang form na ito ay nagbibigay sa iyo ng pahintulot para mag-update ng maramihang asset nang sabay-sabay. Lagyan lamang ang mga field na gusto mong baguhin. Anumang mga field na blangko ay mananatiling walang pagbabago. ',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/fil/admin/hardware/general.php b/resources/lang/fil/admin/hardware/general.php
index f9b84a1924..f1b1a6fe0a 100644
--- a/resources/lang/fil/admin/hardware/general.php
+++ b/resources/lang/fil/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'I-edit ang Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Pwedeng Ma-rekwest',
     'requested'				    => 'Ni-rekwest',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Ibalik sa dati ang Asset',
     'pending'  					=> 'Hindi pa nasimulan',
     'undeployable'  			=> 'Hindi pwedeng i-deploy',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/fil/admin/hardware/message.php b/resources/lang/fil/admin/hardware/message.php
index 432775e172..ebd3f2e700 100644
--- a/resources/lang/fil/admin/hardware/message.php
+++ b/resources/lang/fil/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Ang asset ay hindi naibalik sa dati, mangyaring subukang muli',
         'success' 		=> 'Ang asset ay matagumpay nang naibalik sa dati.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/fil/admin/hardware/table.php b/resources/lang/fil/admin/hardware/table.php
index a9ca24bb6a..8a35fdb77c 100644
--- a/resources/lang/fil/admin/hardware/table.php
+++ b/resources/lang/fil/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Papasok/Palabas',
     'checkout_date' => 'Ang Petsa ng Pagcheck-out',
     'checkoutto' 	=> 'Nai-check Out',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Ang Diff',
     'dl_csv' 		=> 'I-download ang CSV',
diff --git a/resources/lang/fil/admin/licenses/general.php b/resources/lang/fil/admin/licenses/general.php
index 866da0e8cd..ec321d5833 100644
--- a/resources/lang/fil/admin/licenses/general.php
+++ b/resources/lang/fil/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Ang Tungkol sa mga Lisensya',
-    'about_licenses'                  => 'Ang mga lisensya ay ay ginagamit para subaybayan ang software. Mayrron itong tuloy na mga numero ng seats na pwedeng i-check out sa mga indibidwal',
+    'about_licenses_title'      => 'Ang Tungkol sa mga Lisensya',
+    'about_licenses'            => 'Ang mga lisensya ay ay ginagamit para subaybayan ang software. Mayrron itong tuloy na mga numero ng seats na pwedeng i-check out sa mga indibidwal',
     'checkin'  					=> 'I-checkin ang Lisensya ng Seat',
     'checkout_history'  		=> 'I-checkout ang Kasaysayan',
     'checkout'  				=> 'I-checkout ang Lisensya ng Seat',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Ang mga Lisenysa ng Software',
     'user'  					=> 'Ang gumagamit',
     'view'  					=> 'Tingnan ang Lisensya',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/fil/admin/manufacturers/message.php b/resources/lang/fil/admin/manufacturers/message.php
index 4be4d7ae1e..f26b01f602 100644
--- a/resources/lang/fil/admin/manufacturers/message.php
+++ b/resources/lang/fil/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Ang Tagapagsagawa ay hindi umiiral.',
     'assoc_users'	 => 'Ang tagapagsagawa ay kasalukuyang naiugnay sa hindi bumaba sa isang modelo at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga modelo upang hindi na mag-reperens sa tagapagsagawang ito at paki-subokang muli. ',
 
diff --git a/resources/lang/fil/admin/manufacturers/table.php b/resources/lang/fil/admin/manufacturers/table.php
index 9ab1201c1a..d99a786e34 100644
--- a/resources/lang/fil/admin/manufacturers/table.php
+++ b/resources/lang/fil/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Ang Suportang Email',
     'support_phone'   		=> 'Ang Suporta sa Telepono',
     'support_url'   		=> 'Ang Suportang URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'I-update ang Tagapagsagawa',
     'url'   				=> 'Ang URL',
 
diff --git a/resources/lang/fil/admin/models/general.php b/resources/lang/fil/admin/models/general.php
index d511ca8ee5..ee943e0d60 100644
--- a/resources/lang/fil/admin/models/general.php
+++ b/resources/lang/fil/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     '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'          => 'Ikaw ay mag-delete ng :model_count mga modelo ng asset.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Ibalik sa dati ang Modelo',
     'requestable'               => 'Ang mga gumagamit ay pwedeng mag-rekwest ng modelong ito',
 	'show_mac_address'			      => 'Ipakita ang field MAC address sa mga asset ng modelong ito',
diff --git a/resources/lang/fil/admin/models/message.php b/resources/lang/fil/admin/models/message.php
index b5022bffde..5ec25d2566 100644
--- a/resources/lang/fil/admin/models/message.php
+++ b/resources/lang/fil/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Ang modelo ay hindi umiiral.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Ang modelo ay hindi nai-update, mangyaring subukang muli',
-        'success' => 'Ang modelo ay matagumpay na nai-update.'
+        'success' => 'Ang modelo ay matagumpay na nai-update.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Walang nabagong mga field, kaya walang nai-update.',
-        'success' 		=> 'Ang mga modelo ay naiupdate na.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Walang napiling mga model, kaya walang nai-delete.',
-        'success' 		    => ':success_count model(s) na-delete na!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count ang mga modelo ay na-delete na, gayunpaman ::success_count ang mga modelo ay hindi mai-delete dahil sa mayron pa silang asset na naiuugnay sa kanila.'
     ),
 
diff --git a/resources/lang/fil/admin/settings/general.php b/resources/lang/fil/admin/settings/general.php
index 2ab5d58fb2..f91d072c89 100644
--- a/resources/lang/fil/admin/settings/general.php
+++ b/resources/lang/fil/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Ito ay isang server ng Aktibong Direktorya',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Ang Email Alerts ay Pinagana',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Ang mga setting ng 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Mag-enter ng balidong LDAP username at password mula sa binatayang DN na iyong ibinatay sa itaas upang subukan kung ang iyong LDAP login ay maayos na nai-configure. DAPAT MO MUNANG I-SAVE ANG IYONG UPDATED NA MGA SETTING NG LDAP.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Ang Pangalan ng Site',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Ang Slack Botname',
-    'slack_channel'             => 'Ang Slack Channel',
-    'slack_endpoint'            => 'Ang Slack Endpoint',
-    'slack_integration'         => 'Ang mga Setting ng Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/fil/admin/settings/message.php b/resources/lang/fil/admin/settings/message.php
index 02d2db0035..8854d020fe 100644
--- a/resources/lang/fil/admin/settings/message.php
+++ b/resources/lang/fil/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/fil/admin/users/general.php b/resources/lang/fil/admin/users/general.php
index 4299d9f85c..916c934f87 100644
--- a/resources/lang/fil/admin/users/general.php
+++ b/resources/lang/fil/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.',
+    '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',
     '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'         => 'Tingnan ang User :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/fil/admin/users/message.php b/resources/lang/fil/admin/users/message.php
index d9a70cccc6..313add3f01 100644
--- a/resources/lang/fil/admin/users/message.php
+++ b/resources/lang/fil/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 User [:id] hindi umiiral.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Ang field ng login ay kinakailangan',
     'user_password_required'    => 'Ang password ay kinakailangan.',
     'insufficient_permissions'  => 'Hindi sapat na mga pahintulot.',
diff --git a/resources/lang/fil/auth/general.php b/resources/lang/fil/auth/general.php
index a2fe73d79c..51a3443326 100644
--- a/resources/lang/fil/auth/general.php
+++ b/resources/lang/fil/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/fil/general.php b/resources/lang/fil/general.php
index 45fa466fdf..b4c3403fc2 100644
--- a/resources/lang/fil/general.php
+++ b/resources/lang/fil/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Mga Aksesorya',
     'activated'			    => 'Pinagana',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Ang Aksesorya',
     'accessory_report'		=> 'Ang Ulat sa Aksesorya',
     'action'                => 'Aksyon',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Ang Audit',
     'audit_report'			=> 'Ang Log ng Audit',
     'assets'				=> 'Ang mga 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'         => 'I-delete ang Avatar',
     'avatar_upload'         => 'I-upload ang Avatar',
     'back'      			=> 'Bumalik',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'I-kansela',
     'categories'			=> 'Mga kategorya',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Nai-delete na',
     'delete_seats'  		=> 'Ang Nai-delete na mga Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'I-import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Ang mga Pagpapanatili sa Asset',
     'item'  				=> 'Aytem',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Hindi sapat na mha pahintulot!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Lengguwahe',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Ang mga Rekwest ay Nakansela',
     'save'  				=> 'I-save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Pumili',
     'select_all'            => 'Select All',
     'search'				=> 'Maghanap',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Ang Lagda',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Ang iilang mga katangian ay na-disable para sa pag-install na ito.',
     'site_name'				=> 'Ang Pangalan ng Site',
     'state'  				=> 'Ang Estado',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Sigurado kaba na gusto mong i-delete',
     'submit'				=> 'I-sumita',
     'target'                => 'Ang Punterya',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Ang Pagpapakita sa Oras at Petsa',
     'total_assets'			=> 'ang kabuuang mga asset',
     'total_licenses'		=> 'ang kabuuang mga lisensya',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/fil/help.php b/resources/lang/fil/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/fil/help.php
+++ b/resources/lang/fil/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/fil/localizations.php b/resources/lang/fil/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/fil/localizations.php
+++ b/resources/lang/fil/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/fil/mail.php b/resources/lang/fil/mail.php
index 15c5e3500e..288d3f61eb 100644
--- a/resources/lang/fil/mail.php
+++ b/resources/lang/fil/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Mag-login sa iyong bagong pag-install ng Snipe-IT gamit ang mga kredensyal sa ibaba:',
     'login' => 'Mag-login:',
     'Low_Inventory_Report' => 'Ang Mababang Report ng Imbentaryo',
+    'inventory_report' => 'Inventory Report',
     '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.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Ang iyong mga Kredensyal sa Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/fil/validation.php b/resources/lang/fil/validation.php
index 34fd95e35f..68d522a355 100644
--- a/resources/lang/fil/validation.php
+++ b/resources/lang/fil/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Ang :katangian ay dapat na magkaroon ng hindi bumaba sa :min na mga aytem.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/fr/admin/accessories/general.php b/resources/lang/fr/admin/accessories/general.php
index 5760313657..897c2d6c81 100644
--- a/resources/lang/fr/admin/accessories/general.php
+++ b/resources/lang/fr/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Mise à jour d\'accessoires',
     'use_default_eula'					=> 'Utiliser la <a href="#" data-toggle="modal" data-target="#eulaModal">license primaire par défaut </a> à la place.',
     'use_default_eula_disabled'			=> '<del>Utilisez la license par défaut à la place.</del> Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".',
+    'clone'                             => 'Dupliquer l\'accessoire',
+    'delete_disabled'                   => 'Cet accessoire ne peut pas encore être supprimé car certaines pièces sont encore attribuées.',
 
 );
diff --git a/resources/lang/fr/admin/accessories/message.php b/resources/lang/fr/admin/accessories/message.php
index 7091783f3c..ef09bceab7 100644
--- a/resources/lang/fr/admin/accessories/message.php
+++ b/resources/lang/fr/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/fr/admin/asset_maintenances/form.php b/resources/lang/fr/admin/asset_maintenances/form.php
index 374ae092e9..7bcd42751f 100644
--- a/resources/lang/fr/admin/asset_maintenances/form.php
+++ b/resources/lang/fr/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Type d\'entretien d\'actif',
+        'asset_maintenance_type' => 'Type de maintenance de la ressource',
         'title'                  => 'Titre',
         'start_date'             => 'Date de début',
         'completion_date'        => 'Date d\'achèvement',
         'cost'                   => 'Coût',
         'is_warranty'            => 'Garantie sur amélioration',
-        'asset_maintenance_time' => 'Durée de l\'entretien (en jours)',
+        'asset_maintenance_time' => 'Durée de la maintenance de la ressource (en jours)',
         'notes'                  => 'Notes',
-        'update'                 => 'Modification des types entretiens d\'actifs',
-        'create'                 => 'Création de type d\'entretien d\'actif'
+        'update'                 => 'Mettre à jour maintenance de la ressource',
+        'create'                 => 'Création de maintenance de la ressource'
     ];
diff --git a/resources/lang/fr/admin/categories/general.php b/resources/lang/fr/admin/categories/general.php
index 08e61e743c..0a094d0bb9 100644
--- a/resources/lang/fr/admin/categories/general.php
+++ b/resources/lang/fr/admin/categories/general.php
@@ -1,21 +1,21 @@
 <?php
 
 return array(
-    'asset_categories' 					=> 'Catégories',
-    'category_name'  					=> 'Catégorie',
-    'checkin_email'                     => 'Envoyer un courriel à l\'utilisateur lors de l\'association/dissociation.',
-    'checkin_email_notification'        => 'Un courriel sera envoyé à l\'utilisateur lors de l\'association/dissociation.',
+    'asset_categories' 					=> 'Catégories d\'actifs',
+    'category_name'  					=> 'Nom de la catégorie',
+    'checkin_email'                     => 'Envoyer un courriel à l\'utilisateur·trice lors de l\'association/dissociation.',
+    'checkin_email_notification'        => 'Un courriel sera envoyé à l\'utilisateur·trice lors de l\'association/dissociation.',
     'clone'                             => 'Cloner la catégorie',
-    'create'  							=> 'Créer Catégorie',
+    'create'  							=> 'Créer une catégorie',
     'edit'                              => 'Modifier la catégorie',
     'eula_text'							=> 'Catégorie de licence d\'utilisation',
-    'eula_text_help'					=> 'Ce champ vous permet de configurer vos licences d\'utilisation pour chaque type d\'items. Si vous avez seulement une licence pour tout vos items, vous pouvez cochez la case ci-dessous pour utiliser celle par défaut.',
+    'eula_text_help'					=> 'Ce champ vous permet de configurer vos licences d\'utilisation pour chaque type d\'actif. Si vous avez une seule licence pour tous vos actifs, vous pouvez cocher la case ci-dessous pour utiliser celle par défaut.',
     'name'                              => 'Nom de la catégorie',
-    'require_acceptance'				=> 'L\'utilisateur doit confirmer qu\'il accepte les actifs de cette catégorie.',
-    'required_acceptance'				=> 'L\'utilisateur recevra un courriel avec un lien de confirmation pour accepter ce produit.',
-    'required_eula'						=> 'Cet utilisateur recevra par courriel une copie de la licence d\'utilisation',
+    'require_acceptance'				=> 'L\'utilisateur·trice doit confirmer qu\'iel accepte les actifs de cette catégorie.',
+    'required_acceptance'				=> 'L\'utilisateur·trice recevra un courriel avec un lien d\'acceptation de cet article.',
+    'required_eula'						=> 'L\'utilisateur·trice recevra par courriel une copie de la licence d\'utilisation',
     'no_default_eula'					=> 'Il n\'y a pas de licence d\'utilisation par défaut. Veuillez en ajouter une dans Préférences.',
-    'update'  							=> 'Actualiser Catégorie',
+    'update'  							=> 'Mettre à jour la catégorie',
     'use_default_eula'					=> 'Utiliser la <a href="#" data-toggle="modal" data-target="#eulaModal">license primaire par défaut </a> à la place.',
     'use_default_eula_disabled'			=> '<del>Utilisez la licence par défaut à la place.</del> Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".',
     'use_default_eula_column'			=> 'Utilisez les CGU par défaut',
diff --git a/resources/lang/fr/admin/categories/message.php b/resources/lang/fr/admin/categories/message.php
index f3a543a181..0e281f9c5e 100644
--- a/resources/lang/fr/admin/categories/message.php
+++ b/resources/lang/fr/admin/categories/message.php
@@ -7,19 +7,20 @@ return array(
     'assoc_items'	 => 'Cette catégorie est actuellement associée à au moins un :asset_type et ne peut pas être supprimée. Merci de mettre à jour les :asset_type afin de ne plus référencer cette catégorie et essayez à nouveau. ',
 
     'create' => array(
-        'error'   => 'Cette catégorie n\'a pas été créée, veuillez réessayer.',
-        'success' => 'Catégorie créée correctement.'
+        'error'   => 'Cette catégorie n\'a pas été créée, merci de réessayer.',
+        'success' => 'Catégorie créée avec succès.'
     ),
 
     'update' => array(
-        'error'   => 'Catégorie n\'a pas été actualisée, veuillez réessayer',
-        'success' => 'Catégorie actualisée correctement.'
+        'error'   => 'La catégorie n\'a pas été mise à jour, merci de réessayer',
+        'success' => 'Catégorie mise à jour avec succès.',
+        'cannot_change_category_type'   => 'Vous ne pouvez pas modifier le type de catégorie une fois qu\'il a été créé',
     ),
 
     'delete' => array(
-        'confirm'   => 'Etes-vous sûr de vouloir supprimer cette catégorie?',
-        'error'   => 'Il y a eu un problème en supprimant cette catégorie. Veuillez réessayer.',
-        'success' => 'Cette catégorie a été supprimée correctement.'
+        'confirm'   => 'Êtes-vous sûr·e de vouloir supprimer cette catégorie ?',
+        'error'   => 'Il y a eu un problème lors de la suppression de cette catégorie. Merci de réessayer.',
+        'success' => 'Catégorie supprimée avec succès.'
     )
 
 );
diff --git a/resources/lang/fr/admin/categories/table.php b/resources/lang/fr/admin/categories/table.php
index 1cb48579e4..5e658d3783 100644
--- a/resources/lang/fr/admin/categories/table.php
+++ b/resources/lang/fr/admin/categories/table.php
@@ -1,10 +1,10 @@
 <?php
 
 return array(
-	'eula_text'      			=> 'Licence d\'utilisation',
+	'eula_text'      			=> 'CLUF',
     'id'      					=> 'ID',
     'parent'   					=> 'Parent',
     'require_acceptance'      	=> 'Acceptation',
-    'title'      				=> 'Nom de Catégorie',
+    'title'      				=> 'Nom de la catégorie d\'actif',
 
 );
diff --git a/resources/lang/fr/admin/components/general.php b/resources/lang/fr/admin/components/general.php
index dcea9b0d51..030dff22f4 100644
--- a/resources/lang/fr/admin/components/general.php
+++ b/resources/lang/fr/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restant',
     'total' 			                 => 'Total',
     'update'                            => 'Mettre à jour un composant',
+    'checkin_limit'            => 'Le montant enregistré doit être égal ou inférieur à :assigned_qty'
 );
diff --git a/resources/lang/fr/admin/components/message.php b/resources/lang/fr/admin/components/message.php
index 650626e937..973fbdcda6 100644
--- a/resources/lang/fr/admin/components/message.php
+++ b/resources/lang/fr/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Le composant n\'a pas été libéré, merci d\'essayer à nouveau',
         'success' 		=> 'Le composant a bien été libéré.',
-        'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.'
+        'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.',
+        'unavailable'      => 'Pas assez de composants restants : :remaining restant, :requested requis ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fr/admin/consumables/general.php b/resources/lang/fr/admin/consumables/general.php
index 5f53f1e473..a088799a9e 100644
--- a/resources/lang/fr/admin/consumables/general.php
+++ b/resources/lang/fr/admin/consumables/general.php
@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'checkout'                          => 'Attribuer une fourniture à un utilisateur',
-    'consumable_name'                   => 'Nom de la fourniture',
-    'create'                            => 'Créer une fourniture',
+    'checkout'                          => 'Attribuer un consommable à un·e utilisateur·trice',
+    'consumable_name'                   => 'Nom du consommable ',
+    'create'                            => 'Créer un consommable',
     'item_no'                           => 'Num. d\'élément',
-    'remaining' 			            => 'Quantité restante',
+    'remaining' 			            => 'Restant',
     'total' 			                => 'Total',
-    'update'                            => 'Actualiser la fourniture',
+    'update'                            => 'Mettre à jour le consommable',
 );
diff --git a/resources/lang/fr/admin/consumables/message.php b/resources/lang/fr/admin/consumables/message.php
index eb9412ff7f..2de8d5df22 100644
--- a/resources/lang/fr/admin/consumables/message.php
+++ b/resources/lang/fr/admin/consumables/message.php
@@ -2,34 +2,35 @@
 
 return array(
 
-    'does_not_exist' => 'Cette fourniture n\'existe pas.',
+    'does_not_exist' => 'Ce consommable n\'existe pas.',
 
     'create' => array(
-        'error'   => 'La fourniture n\'a pas été créé, veuillez réessayer.',
-        'success' => 'La fourniture a été créé correctement.'
+        'error'   => 'Le consommable n\'a pas été créé, merci de réessayer.',
+        'success' => 'Le consommable a été créé correctement.'
     ),
 
     'update' => array(
-        'error'   => 'La fourniture n\'a pas été actualisé, veuillez réessayer',
-        'success' => 'La fourniture a été actualisé correctement.'
+        'error'   => 'Le consommable n\'a pas été mis-à-jour, merci de réessayer',
+        'success' => 'Le consommable a été mis-à-jour.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Êtes-vous certain de vouloir détruire cette fourniture ?',
-        'error'   => 'Il y a eu un problème en détruisant la fourniture. Veuillez réessayer.',
-        'success' => 'La fourniture a été détruite correctement.'
+        'confirm'   => 'Êtes-vous certain·e de vouloir supprimer ce consommable ?',
+        'error'   => 'Il y a eu un problème lors de la suppression du consommable. Merci de réessayer.',
+        'success' => 'Le consommable a été supprimé correctement.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'La fourniture n\'a pas été attribué correctement, veuillez réessayer',
-        'success' 		=> 'La fourniture a été attribué correctement.',
-        'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.'
+        'error'   		=> 'Le consommable n\'a pas été attribué correctement, merci de réessayer',
+        'success' 		=> 'Le consommable a été attribué correctement.',
+        'user_does_not_exist' => 'Cet·te utilisateur·trice est invalide. Merci de réessayer.',
+         'unavailable'      => 'Il n\'y a pas assez de consommables pour cette attribution. Veuillez vérifier la quantité restante. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'La fourniture n\'a pas été dissocié correctement, veuillez réessayer',
-        'success' 		=> 'La fourniture à été dissocié correctement.',
-        'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.'
+        'error'   		=> 'Le consommable n\'a pas été dissocié correctement, merci de réessayer',
+        'success' 		=> 'Le consommable a été dissocié correctement.',
+        'user_does_not_exist' => 'Cet·te utilisateur·trice est invalide. Merci de réessayer.'
     )
 
 
diff --git a/resources/lang/fr/admin/consumables/table.php b/resources/lang/fr/admin/consumables/table.php
index c47cd0e7fa..fff24cb2c5 100644
--- a/resources/lang/fr/admin/consumables/table.php
+++ b/resources/lang/fr/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nom de la fourniture',
+    'title'      				=> 'Nom du consommable',
 );
diff --git a/resources/lang/fr/admin/custom_fields/general.php b/resources/lang/fr/admin/custom_fields/general.php
index b9d99afd9b..917e8b4353 100644
--- a/resources/lang/fr/admin/custom_fields/general.php
+++ b/resources/lang/fr/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Utilisé par les modèles',
     'order'   		            => 'Commande',
     'create_fieldset'         => 'Nouveau Fieldset',
+    'update_fieldset'         => 'Mettre à jour le Fieldset',
+    'fieldset_does_not_exist'   => 'Le Fieldset :id n\'existe pas',
+    'fieldset_updated'         => 'Fieldset mis à jour',
     'create_fieldset_title' => 'Créer un nouveau jeu de champs',
     'create_field'            => 'Nouveau champ personnalisé',
     'create_field_title' => 'Créer un champ personnalisé',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'ATTENTION. Ce champ est dans la table personnalisée en tant que <code>:db_column</code> mais devrait être <code>:expected</code>.',
     'is_unique' => 'Cette valeur doit être unique parmi tous les actifs',
     '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' => 'Permettre à l\'utilisateur de vérifier ces valeurs dans sa page Voir Ressources Affectées',
+    'display_in_user_view_table' => 'Visible par l\'utilisateur',
+    'auto_add_to_fieldsets' => 'Ajouter ceci automatiquement à tous les nouveaux fieldsets',
+    'add_to_preexisting_fieldsets' => 'Ajouter à tous les fieldsets existants',
 ];
diff --git a/resources/lang/fr/admin/departments/message.php b/resources/lang/fr/admin/departments/message.php
index 21ee531fa0..0cbb36a4a9 100644
--- a/resources/lang/fr/admin/departments/message.php
+++ b/resources/lang/fr/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Le département n\'existe pas.',
-    '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' => 'Un service portant ce nom existe déjà à cet emplacement de l\'entreprise. Ou choisissez un nom plus spécifique pour ce service. ',
     'assoc_users'	 => 'Ce service est actuellement associé à au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus référencer ce service et réessayer.',
     'create' => array(
         'error'   => 'Le département n\'a pas été créé. Veuillez réessayer.',
diff --git a/resources/lang/fr/admin/groups/message.php b/resources/lang/fr/admin/groups/message.php
index a374bf8c39..89092bba90 100644
--- a/resources/lang/fr/admin/groups/message.php
+++ b/resources/lang/fr/admin/groups/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'group_exists'        => 'Ce groupe existe déjà!',
-    'group_not_found'     => 'Ce groupe [:id] n\'existe pas.',
-    'group_name_required' => 'Le champ nom est obligatoire.',
+    'group_not_found'     => 'L\'identifiant de groupe :id n\'existe pas.',
+    'group_name_required' => 'Le champ "nom" est obligatoire',
 
     'success' => array(
         'create' => 'Ce groupe a été créé correctement.',
diff --git a/resources/lang/fr/admin/hardware/form.php b/resources/lang/fr/admin/hardware/form.php
index 28eba855cc..adc0f0333e 100644
--- a/resources/lang/fr/admin/hardware/form.php
+++ b/resources/lang/fr/admin/hardware/form.php
@@ -2,15 +2,18 @@
 
 return [
     'bulk_delete'		=> 'Confirmez la suppression du lot d\'objets',
+    'bulk_restore'      => 'Confirmer la restauration des actifs en bloc', 
   'bulk_delete_help'	=> 'Vérifiez les objets ci-dessous pour la suppression du lot. Une fois supprimés, ces objets peuvent être restaurés, mais ils ne seront plus associés avec les utilisateurs auxquels ils sont actuellement assignés.',
-  'bulk_delete_warn'	=> 'Vous allez supprimer :asset_count objets.',
-    'bulk_update'		=> 'Mise à jour en bloc d\'actifs',
-    'bulk_update_help'	=> 'Ce formulaire vous permet de mettre à jour plusieurs actifs à la fois. Seulement remplir les champs que vous devez modifier. Tous les champs laissés vides resteront inchangés. ',
+  'bulk_restore_help'	=> 'Examinez les actifs pour la restauration en masse ci-dessous. Une fois restaurés, ces actifs ne seront pas associés aux utilisateurs·trices auxquels ils ont été assignés précédemment.',
+  'bulk_delete_warn'	=> 'Vous êtes sur le point de supprimer :asset_count objets.',
+  'bulk_restore_warn'	=> 'Vous êtes sur le point de restaurer :asset_count actifs.',
+    'bulk_update'		=> 'Mise à jour en masse des actifs',
+    'bulk_update_help'	=> 'Ce formulaire vous permet de mettre à jour plusieurs actifs à la fois. Remplissez seulement les champs que vous devez modifier. Tous les champs laissés vides resteront inchangés. ',
     'bulk_update_warn'	=> 'Vous êtes sur le point de modifier les propriétés d\'un seul matériel.|Vous êtes sur le point de modifier les propriétés de :asset_count matériels.',
     'checkedout_to'		=> 'Extrait vers',
     'checkout_date'		=> 'Date d\'attribution',
     'checkin_date'		=> 'Date de dissociation',
-    'checkout_to'		=> 'Caisse à',
+    'checkout_to'		=> 'Attribuer à',
     'cost'				=> 'Coût d\'achat',
     'create'			=> 'Créer des actifs',
     'date'				=> 'Date d\'achat',
@@ -31,7 +34,7 @@ return [
     'notes'				=> 'Remarques',
     'order'				=> 'Numéro de Commande',
     'qr'				=> 'Code QR',
-    'requestable'		=> 'Les utilisateurs peuvent demander à cet actif',
+    'requestable'		=> 'Les utilisateurs·trices peuvent demander cet actif',
     'select_statustype'	=> 'Choisissez le type de statut',
     'serial'			=> 'Série ',
     'status'			=> 'Statut',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Mettre à jour uniquement l\'emplacement par défaut',
     '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é.',
-    'processing_spinner' => 'Traitement en cours...',
+    'processing_spinner' => 'Traitement... (Cela peut prendre un peu de temps sur les fichiers volumineux)',
     'optional_infos'  => 'Information facultative',
     'order_details'   => 'Information liée à l\'achat'
 ];
diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php
index a5bdaca974..27b8e61541 100644
--- a/resources/lang/fr/admin/hardware/general.php
+++ b/resources/lang/fr/admin/hardware/general.php
@@ -8,19 +8,22 @@ return [
     'bulk_checkout'             => 'Attribuer les actifs',
     'bulk_checkin'              => 'Restitution d\'actifs',
     'checkin'  					=> 'Retour des Biens',
-    'checkout'  				=> 'Commander l\'actif',
+    'checkout'  				=> 'Associer l\'actif',
     'clone'  					=> 'Cloner le Bien',
     'deployable'  				=> 'Déployable',
     'deleted'  					=> 'Cet actif a été supprimé.',
     '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.',
-    'requestable'               => 'Réquisitionnable',
+    'model_invalid'             => 'Le modèle de cette ressource n\'est pas valide.',
+    'model_invalid_fix'         => 'La ressource doit être éditée pour corriger cela avant d\'essayer de l\'enregistrer ou de l\'affecter.',
+    'requestable'               => 'Demandable',
     'requested'				    => 'Demandé',
-    'not_requestable'           => 'Non-réquisitionnable',
-    'requestable_status_warning' => 'Ne pas modifier le statut de demande',
+    'not_requestable'           => 'Non demandable',
+    'requestable_status_warning' => 'Ne pas modifier la demandabilité',
     'restore'  					=> 'Restaurer l\'actif',
     'pending'  					=> 'En attente',
     'undeployable'  			=> 'Non déployable',
+    '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' => '
@@ -28,7 +31,7 @@ return [
     Téléchargez un fichier CSV qui contient l\'historique des ressources. Les assets et les utilisateurs DOIVENT déjà exister dans le système, ou ils seront ignorés. La correspondance des assets pour l’importation de l’historique se produit avec le 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 les paramètres généraux de l\'Admin &gt; .
     </p>
 
-    <p>Les champs inclus dans le CSV doivent correspondre aux en-têtes : <strong>Étiquette d\'actif, Nom, date de paiement, date d\'enregistrement</strong>. Tous les champs supplémentaires seront ignorés. </p>
+    <p>Les champs inclus dans le CSV doivent correspondre aux en-têtes : <strong>Étiquette d\'actif, Nom, date d\'attribution, date de récupération</strong>. Tous les champs supplémentaires seront ignorés. </p>
 
     <p>Date de check-in : les dates de check-in vides ou futures seront utilisées par 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>
     ',
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Messages d\'erreur:',
     'success_messages' => 'Messages de succès:',
     'alert_details' => 'Voir ci-dessous pour plus de détails.',
-    'custom_export' => 'Exportation personnalisée'
+    'custom_export' => 'Exportation personnalisée',
+    'mfg_warranty_lookup' => 'Vérification de la garantie :manufacturer',
 ];
diff --git a/resources/lang/fr/admin/hardware/message.php b/resources/lang/fr/admin/hardware/message.php
index 6469c52e4a..a997967755 100644
--- a/resources/lang/fr/admin/hardware/message.php
+++ b/resources/lang/fr/admin/hardware/message.php
@@ -5,7 +5,7 @@ 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_or_not_requestable' => 'Cet actif n\'existe pas ou ne peut pas être réquisitionné.',
+    '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.',
 
     'create' => [
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'L\'actif n\'a pas été restauré, veuillez réessayer',
         'success' 		=> 'Actif restauré correctement.',
+        'bulk_success' 		=> 'Actif restauré avec succès.',
+        'nothing_updated'   => 'Aucun actif n\'a été sélectionné, donc rien n\'a été restauré.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         '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é',
+        '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',
     ],
 
 
@@ -76,9 +80,9 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Le bien n\'a pas été demandé, merci d\'essayer à nouveau',
-        'success' 		=> 'Le bien a été demandé correctement.',
-        'canceled'      => 'La demande de paiement a été annulée',
+        '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',
     ],
 
 ];
diff --git a/resources/lang/fr/admin/hardware/table.php b/resources/lang/fr/admin/hardware/table.php
index 146b4da82a..950863355f 100644
--- a/resources/lang/fr/admin/hardware/table.php
+++ b/resources/lang/fr/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Associer/Libérer',
     'checkout_date' => 'Date d\'association',
     'checkoutto' 	=> 'Date de libération',
+    'components_cost' => 'Coût total des composants',
     'current_value' => 'Valeur actuelle',
     'diff' 			=> 'Différence',
     'dl_csv' 		=> 'Télécharger en CSV',
@@ -23,8 +24,8 @@ return [
     'days_without_acceptance' => 'Jours sans acceptation',
     'monthly_depreciation' => 'Dépréciation mensuelle',
     'assigned_to'    => 'Affecté à',
-    'requesting_user' => 'Utilisateur requérant',
-    'requested_date' => 'Date de la requête',
+    'requesting_user' => 'Demandeur·euse',
+    'requested_date' => 'Date de la demande',
     'changed'       => 'Modifié',
     'icon' => 'Icône',
 ];
diff --git a/resources/lang/fr/admin/licenses/general.php b/resources/lang/fr/admin/licenses/general.php
index ed20681369..8d21062d89 100644
--- a/resources/lang/fr/admin/licenses/general.php
+++ b/resources/lang/fr/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'A propos des licences',
-    'about_licenses'                  => 'Les licences sont utilisées pour suivre les logiciels. Ils ont un certain nombre d\'attribution pouvant être associés individuellement',
+    'about_licenses_title'      => 'A propos des licences',
+    'about_licenses'            => 'Les licences sont utilisées pour suivre les logiciels. Ils ont un certain nombre d\'attribution pouvant être associés individuellement',
     'checkin'  					=> 'Libérer la licence multiposte',
     'checkout_history'  		=> 'Historique des associations',
     'checkout'  				=> 'Associer la licence multiposte',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licences de logiciel',
     'user'  					=> 'Utilisateur',
     'view'  					=> 'Voir la licence',
+    'delete_disabled'           => 'Cette licence ne peut pas encore être supprimée car certains sièges sont encore attribués.',
+    'bulk'                      =>
+        [
+            '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.',
+                '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é',
+                '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',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Associer tous les sièges',
+                'modal'                 => 'Cette action associera un siège au premier utilisateur disponible. | Cette action associera :available_seats_count sièges aux premiers utilisateurs disponibles. Un·e utilisateur·trice est considéré·e disponible pour un siège si iel n\'a pas déjà cette licence associée à son profil, et que l\'auto-association de licence est active sur son compte.',
+                'enabled_tooltip'   => 'Associer TOUS les sièges (ou autant que disponible) à TOUS les utilisateurs·trices',
+                'disabled_tooltip'  => 'Ceci est désactivé car il n\'y a pas de siège actuellement disponible',
+                'success'           => 'Licence associée avec succès ! | :count licences ont été associées avec succès !',
+                'error_no_seats'    => 'Il n\'y a plus de siège disponible pour cette licence.',
+                'warn_not_enough_seats'    => ':count utilisateurs·trices ont été assigné·es à cette licence, mais nous avons manqué de sièges disponibles.',
+                'warn_no_avail_users'    => 'Rien à faire. Il n\'y a pas d\'utilisateur·trice qui n\'ont pas encore cette licence attribuée.',
+                'log_msg'           => 'Attribué via l\'outil d\'attribution de licences en volume',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/fr/admin/locations/message.php b/resources/lang/fr/admin/locations/message.php
index b945813a19..249e8f228c 100644
--- a/resources/lang/fr/admin/locations/message.php
+++ b/resources/lang/fr/admin/locations/message.php
@@ -4,10 +4,10 @@ return array(
 
     'does_not_exist' => 'Le lieu n\'existe pas.',
     'assoc_users'	 => 'Ce lieu est actuellement associé avec au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus faire référence à ce lieu et essayez à nouveau. ',
-    'assoc_assets'	 => 'Cet emplacement est actuellement associé à au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus faire référence à cet emplacement et réessayez. ',
+    'assoc_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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Actifs assignés',
+    'current_location' => 'Emplacement actuel',
 
 
     'create' => array(
diff --git a/resources/lang/fr/admin/locations/table.php b/resources/lang/fr/admin/locations/table.php
index 7875a6f540..4ef467276a 100644
--- a/resources/lang/fr/admin/locations/table.php
+++ b/resources/lang/fr/admin/locations/table.php
@@ -3,8 +3,8 @@
 return [
     'about_locations_title'     => 'A propos des emplacements',
     'about_locations'           => 'Les lieux sont utilisés pour suivre les informations de localisation des utilisateurs, des actifs et d\'autres éléments',
-    'assets_rtd'                => 'Biens', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Biens assignés',
+    'assets_rtd'                => 'Actifs', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Actifs assignés',
     'id'                        => 'ID',
     'city'                      => 'Ville',
     'state'                     => 'État',
diff --git a/resources/lang/fr/admin/manufacturers/message.php b/resources/lang/fr/admin/manufacturers/message.php
index 5b0a9d3b61..a01615b5ea 100644
--- a/resources/lang/fr/admin/manufacturers/message.php
+++ b/resources/lang/fr/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Utilisez <code>{LOCALE}</code> et <code>{SERIAL}</code> comme variables dans votre URL pour que ces valeurs soient remplies automatiquement lors de la visualisation des actifs.',
     'does_not_exist' => 'Le fabricant n\'existe pas.',
     'assoc_users'	 => 'Ce fabricant est actuellement associé avec au moins un modèle et ne peut pas être supprimé. Veuillez mettre à jour les modèles pour ne plus référencer un fabricant et essayer à nouveau. ',
 
diff --git a/resources/lang/fr/admin/manufacturers/table.php b/resources/lang/fr/admin/manufacturers/table.php
index 64cc317101..6a6f0513e1 100644
--- a/resources/lang/fr/admin/manufacturers/table.php
+++ b/resources/lang/fr/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email du support',
     'support_phone'   		=> 'Téléphone du support',
     'support_url'   		=> 'URL du support',
+    'warranty_lookup_url'   => 'URL de vérification de la garantie',
     'update'				=> 'Mettre à jour le fabricant',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/fr/admin/models/general.php b/resources/lang/fr/admin/models/general.php
index 9a4444a9ed..59e01c50fe 100644
--- a/resources/lang/fr/admin/models/general.php
+++ b/resources/lang/fr/admin/models/general.php
@@ -6,9 +6,9 @@ return array(
     '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 points de suppimer :model_count modèles d\'actifs.',
+    '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.',
     'restore'                   => 'Restaurer le modèle',
-    'requestable'               => 'Les utilisateurs peuvent demander ce modèle',
+    'requestable'               => 'Les utilisateurs·trices peuvent demander ce modèle',
 	'show_mac_address'			      => 'Afficher le champ pour l\'adresse MAC pour ce modèle d\'actif',
     'view_deleted'              => 'Voir les modèles détruits',
     'view_models'               => 'Voir les différents modèles',
diff --git a/resources/lang/fr/admin/models/message.php b/resources/lang/fr/admin/models/message.php
index 28ac0152c4..01660ef782 100644
--- a/resources/lang/fr/admin/models/message.php
+++ b/resources/lang/fr/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Le modèle n\'existe pas.',
+    'no_association' => 'AUCUN MODELE ASSOCIÉ.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Le modèle n\'a pas été mis à jour, veuillez essayer à nouveau',
-        'success' => 'Le modèle a été mis à jour avec succès.'
+        'success' => 'Le modèle a été mis à jour avec succès.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Aucun champ n\'a été changé, donc rien n\'a été mis à jour.',
-        'success' 		=> 'Modèles mis à jour.'
+        'success' 		=> 'Modèle mis à jour avec succès. |:model_count modèles mis à jour avec succès.',
+        'warn'          => 'Vous êtes sur le point de mettre à jour les propriétés du modèle suivant : |Vous êtes sur le point de modifier les propriétés des :model_count modèles suivants :',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Aucun modèle n\'a été sélectionné, donc rien n\'a été supprimé.',
-        'success' 		    => ': modèle(s) succes_count supprimé(s) !',
+        'success' 		    => 'Modèle supprimé !|:success_count modèles supprimés !',
         'success_partial' 	=> ': les modèles success_count ont été supprimés, cependant : fail_count n\'a pas pu être supprimé car ils ont toujours des ressources associées.'
     ),
 
diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php
index 31d82d62fc..488343e4be 100644
--- a/resources/lang/fr/admin/settings/general.php
+++ b/resources/lang/fr/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'C\'est un serveur Active Directory',
     'alerts'                	=> 'Alertes',
-    'alert_title'               => 'Mettre à jour les paramètres des 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',
     'alerts_enabled'			=> 'Alertes activées',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Cocher cette case permettra à un utilisateur de remplacer le thème de l\'interface utilisateur par un autre.',
     'asset_ids'					=> 'ID de l\'actif',
     'audit_interval'            => 'Intervalle d\'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'       => 'Si vous devez régulièrement vérifier physiquement vos ressources, entrez l\'intervalle en mois entre deux vérifications. La mise à jour de cette valeur s\'appliquera à toutes les « prochaines dates de vérifications » pour les ressources avec une date de vérification dans le futur.',
     'audit_warning_days'        => 'Seuil d\'avertissement d\'audit',
     'audit_warning_days_help'   => 'Combien de jours à l\'avance devrions-nous vous avertir lorsque les actifs doivent être vérifiés?',
     'auto_increment_assets'		=> 'Générer des numéros d\'inventaire auto-incrémentés',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Restaurer à partir d\'une sauvegarde',
     'backups_upload'            => 'Téléverser la sauvegarde',
     'backups_path'              => 'Les sauvegardes sont stockées dans <code>:path</code> sur le serveur',
-    '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'   => '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_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',
@@ -66,7 +66,7 @@ return [
     '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.',
     'general_settings'			=> 'Configuration générale',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
+    'general_settings_keywords' => 'support de l\'entreprise, signature, acceptation, format de courriel, format de nom d\'utilisateur, images, par page, vignette, eula, tos, tableau de bord, confidentialité',
     'general_settings_help'     => 'CLUF par défaut et plus encore',
     'generate_backup'			=> 'Générer une sauvegarde',
     'header_color'              => 'Couleur de l\'en-tête',
@@ -75,8 +75,9 @@ return [
     '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',
-    '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.',
+    'ldap_default_group'        => 'Groupe de permissions par défaut',
+    'ldap_default_group_info'   => 'Sélectionner un groupe à assigner aux utilisateurs nouvellement synchronisés. N\'oubliez-pas que l\'utilisateur possèdera les droits de ce groupe.',
+    'no_default_group'          => 'Aucun groupe par défaut',
     'ldap_help'                 => 'Service d\'annuaire',
     'ldap_client_tls_key'       => 'Clé TLS du client LDAP',
     'ldap_client_tls_cert'      => 'Certificat TLS côté client pour LDAP',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Paramètres LDAP',
     'ldap_client_tls_cert_help' => 'Le certificat TLS côté client et la clé pour les connexions LDAP ne sont généralement utiles qu\'avec les configurations Google Workspace en mode "LDAP sécurisé". Les deux sont requis.',
      'ldap_client_tls_key'       => 'Clé TLS du client LDAP',
+    'ldap_location'             => 'LDAP Localisation',
+'ldap_location_help'             => 'Le champ "LDAP Localisation" ne doit être utilisé que si <strong>aucune OU n\'est définie dans le champ Bind de base DN</strong>. Laissez vide si une recherche par OU est utilisée.',
     'ldap_login_test_help'      => 'Entrez un nom d\'utilisateur et mot de passe LDAP valide depuis la base DN que vous avez spécifié ci-dessus afin de tester si votre configuration LDAP est correcte. VOUS DEVEZ D\'ABORD ENREGISTRER VOS PARAMÈTRES LDAP MIS À JOUR.',
     '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',
@@ -111,7 +114,7 @@ return [
     'ldap_auth_filter_query'    => 'Requête d\'authentification LDAP',
     'ldap_version'              => 'Version LDAP',
     'ldap_active_flag'          => 'Signal d\'activation 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'  => '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_emp_num'              => 'Numéro d\'employé LDAP',
     'ldap_email'                => 'E-mail LDAP',
     'ldap_test'                 => 'Tester LDAP',
@@ -178,7 +181,7 @@ return [
     'saml_idp_metadata_help'    => 'Vous pouvez spécifier les métadonnées IdP en utilisant une URL ou un fichier XML.',
     'saml_attr_mapping_username' => 'Mapping d\'attributs - Nom d\'utilisateur',
     'saml_attr_mapping_username_help' => 'NameID sera utilisé si le mapping des attributs n\'est pas spécifié ou est invalide.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin_label'     => 'Connexion SAML forcée',
     'saml_forcelogin'           => 'Faire de SAML la connexion principale',
     'saml_forcelogin_help'      => 'Vous pouvez utiliser \'/login?nosaml\' pour accéder à la page de connexion normale.',
     'saml_slo_label'            => 'Déconnexion unique SAML',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Afficher les images dans les courriels',
     'show_images_in_email_help'   => 'Décocher cette case si votre installation de Snipe-IT est derrière un VPN ou un réseau fermé et que les utilisateurs en dehors du réseau ne peuvent pas charger les images servies depuis cette installation dans leurs courriels.',
     'site_name'                 => 'Nom du site',
+    'integrations'               => 'Intégrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Mettre à jour les paramètres Slack',
-    'slack_help'                => 'Paramètres Slack',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Configuration "Slack"',
-    'slack_integration_help'    => 'L\'intégration de Slack est optionnelle, cependant le point de terminaison et le canal sont requis si vous souhaitez l\'utiliser. Pour configurer l\'intégration de Slack, vous devez d\'abord <a href=":slack_link" target="_new" rel="noopener">créer un webhook entrant</a> sur votre compte Slack. Cliquez sur le bouton <strong>Tester l\'intégration Slack</strong> pour confirmer que vos paramètres sont corrects avant d\'enregistrer. ',
-    'slack_integration_help_button'    => 'Une fois que vous avez enregistré vos informations Slack, un bouton de test apparaîtra.',
-    'slack_test_help'           => 'Testez si votre intégration Slack est correctement configurée. VOUS DEVEZ D\'ABORD ENREGISTRER LES PARAMÈTRES DE SLACK MIS À JOUR.',
+    'general_webhook'           => 'Webhook général',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Tester pour enregistrer',
+    'webhook_title'               => 'Mettre à jour les paramètres Webhook',
+    'webhook_help'                => 'Paramètres d\'intégration',
+    'webhook_botname'             => 'Nom du bot :app',
+    'webhook_channel'             => 'Canal :app',
+    'webhook_endpoint'            => 'Point d\'accès :app',
+    'webhook_integration'         => 'Paramètres :app',
+    'webhook_test'                 =>'Tester l\'intégration de :app',
+    '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.',
     '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',
@@ -216,7 +224,7 @@ return [
     'update'                    => 'Mettre à jour les paramètres',
     'value'                     => 'Valeur',
     'brand'                     => 'Marque',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
+    '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',
@@ -292,7 +300,7 @@ return [
     'filter_by_keyword' => 'Filtrer par mot clé',
     'security' => 'Sécurité',
     'security_title' => 'Gérer les paramètres de sécurité',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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' => 'Alertes par e-mail, paramètres d\'audit',
+    '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',
@@ -322,4 +330,9 @@ 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>',
+    '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.',
+    'google_login'      => 'Paramètres de connexion via Google Workspace',
+    'enable_google_login'  => 'Permettre aux utilisateurs·trices de se connecter avec Google Workspace',
+    'enable_google_login_help'  => 'Les utilisateurs·trices ne seront pas créé·es automatiquement. Iels doivent avoir un compte existant ici ET dans Google Workspace, et leur nom d\'utilisateur·trice doit correspondre à leur adresse e-mail Google Workspace. ',
+
 ];
diff --git a/resources/lang/fr/admin/settings/message.php b/resources/lang/fr/admin/settings/message.php
index c935b942e8..c0c14f3cdb 100644
--- a/resources/lang/fr/admin/settings/message.php
+++ b/resources/lang/fr/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Test de l\'authentification LDAP...',
         'authentication_success' => 'Utilisateur authentifié contre LDAP avec succès !'
     ],
-    'slack' => [
-        'sending' => 'Envoi du message de test Slack...',
+    'webhook' => [
+        'sending' => 'Envoi du message de test :app...',
         'success_pt1' => 'Succès ! Vérifiez le ',
-        'success_pt2' => ' canal pour votre message de test, soyez sûr de cliquer sur Enregistrer ci-dessous afin de sauvegarder vos réglages.',
+        'success_pt2' => ' canal pour votre message de test, et assurez-vous de cliquer sur ENREGISTRER ci-dessous afin de sauvegarder vos réglages.',
         '500' => '500 Erreur du serveur.',
-        'error' => 'Une erreur est survenue.',
+        'error' => 'Quelque chose s\'est mal passé. :app a répondu avec: :error_message',
+        'error_misc' => 'Une erreur est survenue. :( ',
     ]
 ];
diff --git a/resources/lang/fr/admin/users/general.php b/resources/lang/fr/admin/users/general.php
index 0598870090..38059c4997 100644
--- a/resources/lang/fr/admin/users/general.php
+++ b/resources/lang/fr/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     'last_login'        => 'Dernière connexion',
     'ldap_config_text'  => 'Les paramètres de configuration LDAP se trouvent sous Admin > Réglages. La localisation sélectionnée (optionnelle) sera définie pour tous les utilisateurs importés.',
     'print_assigned'    => 'Imprimer tout ceux assignés',
-    'email_assigned'    => 'Liste des emails de toutes les assignées',
+    '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é.',
+    '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',
     'send_email_help'   => 'Vous devez fournir une adresse e-mail pour que cet utilisateur puisse recevoir ses identifiants. Les envois d\'identifiants par email ne peuvent être faits que lors de la création de l\'utilisateur. Les mots de passe sont stockés dans un hachage à sens unique et ne peuvent pas être récupérés une fois enregistrés.',
     'view_user'         => 'Voir l\'utilisateur :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Seuls les super-administrateurs peuvent accorder un accès de super-administrateur à un utilisateur.',
     'admin_permission_warning' => 'Seuls les utilisateurs possédant des droits d\'administrateur ou mieux peuvent accorder un accès d\'administrateur à un utilisateur.',
     'remove_group_memberships' => 'Supprimer les appartenances de groupe',
-    'warning_deletion' => 'AVERTISSEMENT :',
     'warning_deletion_information' => 'Vous êtes sur le point d\'associer TOUS les articles des :count utilisateur(s) ci-dessous. Les noms des super-administrateurs sont indiqués en rouge.',
     'update_user_assets_status' => 'Appliquer ce status à tous les articles associés à ces utilisateurs',
     'checkin_user_properties' => 'Soumettre toutes les propriétés associées à ces utilisateurs',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Distant',
     'remote_help' => 'Cela peut être utile si vous avez besoin de filtrer les utilisateurs distants qui ne viennent pas ou peu dans vos locaux.',
     'not_remote_label' => 'Il ne s\'agit pas d\'un utilisateur distant',
+    'vip_label' => 'Utilisateur VIP',
+    'vip_help' => 'Cela peut être utile pour marquer des personnes importantes dans votre organisation si vous souhaitez les gérer de manière particulière.',
+    'create_user' => 'Créer un utilisateur',
+    'create_user_page_explanation' => 'Voici les informations de compte que vous utiliserez pour accéder au site la première fois.',
+    'email_credentials' => 'Identifiants de l\'e-mail',
+    'email_credentials_text' => 'Envoyer mes identifiants à l\'adresse e-mail ci-dessus',
+    'next_save_user' => 'Étape suivante : Enregistrer l\'utilisateur',
+    'all_assigned_list_generation' => 'Généré le :',
+    'email_user_creds_on_create' => 'Envoyer à cet·te utilisateur·trice ses informations d\'identification par e-mail ?',
 ];
diff --git a/resources/lang/fr/admin/users/message.php b/resources/lang/fr/admin/users/message.php
index f6ac8ff909..6ee8ab4719 100644
--- a/resources/lang/fr/admin/users/message.php
+++ b/resources/lang/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 [:id] n\'existe pas.',
+    'user_not_found'            => 'L\'utilisateur·trice n\'existe pas.',
     'user_login_required'       => 'Le champ identifiant est obligatoire',
     'user_password_required'    => 'Le mot de passe est obligatoire.',
     'insufficient_permissions'  => 'Droits insuffisants.',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => 'Les utilisateurs sélectionnés qui sont activés et ont une adresse e-mail valide ont reçu un lien de réinitialisation du mot de passe.',
     'password_reset_sent'       => 'Un lien de réinitialisation du mot de passe a été envoyé à :email!',
     'user_has_no_email'         => 'Cet utilisateur n\'a pas renseigné d\'adresse e-mail dans son profil.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Cet utilisateur n\'a aucune ressource affectée',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Cet utilisateur n\'a pas d\'e-mail défini.',
+        'success' => 'L\'utilisateur a été informé de son inventaire actuel.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/fr/auth/general.php b/resources/lang/fr/auth/general.php
index e56d1de9f8..ff2c91921d 100644
--- a/resources/lang/fr/auth/general.php
+++ b/resources/lang/fr/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Rappelez-vous de moi',
     'username_help_top'                 => 'Entrez votre <strong>nom d\'utilisateur</strong> pour recevoir un lien de réinitialisation du mot de passe.',
     'username_help_bottom'          => 'Votre nom d\'utilisateur et votre adresse e-mail <em>peuvent être</em> les mêmes, mais peuvent ne pas l\'être, selon votre configuration. Si vous ne pouvez pas vous souvenir de votre nom d\'utilisateur, contactez votre administrateur. <br><br><strong>Les noms d\'utilisateur sans adresse e-mail associée ne seront pas envoyés par e-mail un lien de réinitialisation du mot de passe.</strong> ',
-    ];
+    'google_login'                  => 'Ou se connecter via Google Workspace',
+    'google_login_failed'           => 'La connexion via Google a échoué, merci de réessayer.',
+
+];
 
diff --git a/resources/lang/fr/button.php b/resources/lang/fr/button.php
index 1234aab9e4..eff38f20de 100644
--- a/resources/lang/fr/button.php
+++ b/resources/lang/fr/button.php
@@ -9,7 +9,7 @@ return [
     'edit'    	                => 'Éditer',
     'restore' 	                => 'Restaurer',
     'remove'                    => 'Supprimer',
-    'request'                   => 'Requête ',
+    'request'                   => 'Demander',
     'submit'  	                => 'Soumettre',
     'upload'                    => 'Uploader',
     'select_file'				=> 'Sélectionner un fichier...',
diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php
index 5a18d66a0b..485eadeac5 100644
--- a/resources/lang/fr/general.php
+++ b/resources/lang/fr/general.php
@@ -3,23 +3,24 @@
 return [
     'accessories'			=> 'Accessoires',
     'activated'			    => 'Activé',
+    'accepted_date'         => 'Date d\'acceptation',
     'accessory'				=> 'Accessoire',
     'accessory_report'		=> 'Rapport sur les accessoires',
     'action'                => 'Action',
     'activity_report'		=> 'Rapport d\'activité',
     'address'				=> 'Adresse',
     'admin'					=> 'Admin',
-    'administrator'			=> 'Administrateur',
+    'administrator'			=> 'Administrateur·trice',
     'add_seats'             => 'Places ajoutées',
-    'age'                   => "Age",
+    'age'                   => "Âge",
     'all_assets'			=> 'Tous les actifs',
     'all'       			=> 'Tous',
-    'archived'              => 'Retiré',
+    'archived'              => 'Archivé',
     'asset_models'			=> 'Modèles d\'actif',
-    'asset_model'			=> 'maquette',
+    'asset_model'			=> 'Modèle',
     'asset'					=> 'Actif',
     'asset_report'          => 'Rapport d\'actif',
-    'asset_tag'				=> 'Étiquette de l\'actif',
+    'asset_tag'				=> 'Numéro d\'inventaire',
     'asset_tags'            => 'Numéros d\'inventaire',
     'assets_available'		=> 'Actifs disponibles',
     'accept_assets'         => 'Accepter les actifs :name',
@@ -27,18 +28,26 @@ return [
     'audit'				    => 'Audit',
     'audit_report'			=> 'Journal d\'audit',
     'assets'				=> 'Actifs',
+    'assets_audited'        => 'actifs audités',
+    'assets_checked_in_count'     => 'actifs récupérés',
+    'assets_checked_out_count'     => 'actifs affectés',
+    'asset_deleted_warning'     => 'Cet actif a été supprimé. Vous devez le restaurer avant de pouvoir l\'associer à quelqu\'un.',
+    'assigned_date'         => 'Date d\'attribution',
     'assigned_to'           => 'Assigné à :name',
-    'avatar_delete'         => 'Supprimer l\'Avatar',
-    'avatar_upload'         => 'Charger un Avatar',
+    'assignee'              => 'Assigné à',
+    'avatar_delete'         => 'Supprimer l\'avatar',
+    'avatar_upload'         => 'Charger un avatar',
     'back'      			=> 'Retour',
     'bad_data'      		=> 'Aucun résultat, les données sont peut-être erronées?',
-    'bulkaudit'             => 'Vérification en bloc',
-    'bulkaudit_status'      => 'État de la vérification',
+    'bulkaudit'             => 'Audit par lot',
+    'bulkaudit_status'      => 'Statut de l\'audit',
     'bulk_checkout'  		=> 'Attribution par lot',
     'bulk_edit'             => 'Modifier en masse',
     'bulk_delete'           => 'Supprimer en masse',
     'bulk_actions'          => 'Actions de masse',
-    'bulk_checkin_delete'   => 'Associer de nombreux articles à l\'utilisateur',
+    'bulk_checkin_delete'   => 'Enregistrement de matériel & Suppression d\'utilisateurs en bloc',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Cet appareil appartient à l\'utilisateur·trice',
     'bystatus'              => 'par statut',
     'cancel'  				=> 'Annuler',
     'categories'			=> 'Catégories',
@@ -60,8 +69,8 @@ return [
     'component'			    => 'Composant',
     'components'			=> 'Composants',
     'complete'				=> 'Terminé',
-    'consumable'			=> 'Fourniture',
-    'consumables'			=> 'Fournitures',
+    'consumable'			=> 'Consommable',
+    'consumables'			=> 'Consommables',
     'country'  				=> 'Pays',
     'create'				=> 'Créer',
     'created'               => 'Élément créé',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Supprimé',
     'delete_seats'  		=> 'Places supprimées',
     'deletion_failed'       => 'Échec de la suppression',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Les types de fichiers acceptés sont jpg, webp, png, gif et svg. Taille maximale est de: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',
     'importing'         	=> 'Importation en cours',
     'importing_help'        => 'Vous pouvez importer des matériels, accessoires, licences, composants, consommables et utilisateurs via un fichier CSV. <br><br>Le CSV doit être délimité par des virgules et formaté avec des en-têtes qui correspondent à ceux des <a href="https://snipe-it.readme.io/docs/importing" target="_new">exemples de CSV présents dans la documentation</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Entretien d\'actifs',
     'item'  				=> 'Item',
     'item_name'             => 'Nom de l\'élément',
+    'import_file'  			=> 'Importer un fichier CSV',
+    'import_type'  			=> 'Importation en CSV',
     'insufficient_permissions' => 'Autorisations insuffisantes !',
     'kits'       			=> 'Kits prédéfinis',
     'language'				=> 'Langue',
@@ -211,13 +224,14 @@ return [
     'reports'				=> 'Rapports',
     'restored'				=> 'restauré',
     'restore'				=> 'Restaurer',
-    'requestable_models'    => 'Modèles demandés',
+    'requestable_models'    => 'Modèles demandables',
     'requested'				=> 'Demandé',
     'requested_date'        => 'Date de la demande',
     'requested_assets'      => 'Actifs demandés',
     'requested_assets_menu' => 'Actifs demandés',
     'request_canceled'      => 'Demande annulée',
     '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',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Déconnecté par',
     'skin'       			=> 'Habillage',
-    'slack_msg_note'        => 'Un message Slack sera envoyé',
-    'slack_test_msg'        => 'Woohoo ! On dirait que votre intégration Slack -> Snipe-IT fonctionne !',
+    '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 !',
     'some_features_disabled' => 'MODE DEMO: Certaines fonctionnalités sont désactivées pour cette installation.',
     'site_name'				=> 'Nom du Site',
     'state'  				=> 'État',
@@ -253,12 +267,11 @@ return [
     'sure_to_delete'    => 'Êtes-vous sûr de vouloir supprimer ?',
     'submit'				=> 'Soumettre',
     'target'                => 'Cible',
-    'toggle_navigation'     => 'Basculer la navigation',
     'time_and_date_display' => 'Affichage de l\'heure et de la date',
     'total_assets'			=> 'actifs au total',
     'total_licenses'		=> 'licences au total',
     'total_accessories'		=> 'accessoires au total',
-    'total_consumables'		=> 'fournitures au total',
+    'total_consumables'		=> 'consommables totaux',
     'type'  				=> 'Type ',
     'undeployable'			=> 'Non déployable',
     'unknown_admin'			=> 'Admin inconnu',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Oui',
     'zip'  					=> 'Code postal',
     'noimage'				=> 'Aucune image envoyée ou aucune image trouvée.',
-    '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'   => 'Le fichier demandé n\'existe pas sur le serveur.',
+    'file_upload_success'   => 'Fichier téléversé avec succès !',
+    'no_files_uploaded'     => 'Fichier téléversé avec succès !',
     'token_expired'         => 'La session de votre formulaire a expiré. Merci d\'essayer à nouveau.',
     'login_enabled'         => 'Connexion activée',
     'audit_due'             => 'Dû pour l\'audit',
@@ -317,7 +330,7 @@ return [
     'last_checkout'         => 'Dernière affectation',
     'due_to_checkin'        => 'Les :count éléments suivants doivent bientôt être restitués:',
     'expected_checkin'      => 'Date de restitution prévue',
-    'reminder_checked_out_items' => 'Ceci est un rappel des éléments associés à votre compte. Si vous pensez que cette liste est erronée (un article est manquant, ou quelque chose apparaît que vous n\'avez jamais eu), merci d\'adresser un courriel à :reply_to_name à l\'adresse :reply_to_adress.',
+    'reminder_checked_out_items' => 'Ceci est un rappel des éléments associés à votre compte. Si vous pensez que cette liste est erronée (un article est manquant, ou quelque chose apparaît que vous n\'avez jamais eu), merci d\'adresser un courriel à :reply_to_name à l\'adresse :reply_to_address.',
     'changed'               => 'Modifié',
     'to'                    => 'À',
     'report_fields_info'    => '<p>Merci de sélectionner les champs que vous souhaitez inclure dans votre rapport personnalisé, puis cliquez sur Générer. Le fichier (custom-asset-report-AAAA-MM-JJ.csv) sera télécharger automatiquement, et vous pourrrez l\'ouvrir dans Excel.</p>
@@ -375,18 +388,65 @@ 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 des valeurs pour ce matériel|Supprimer des valeurs pour :asset_count matériels ',
+    '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',
-    'start_date'            => 'Start Date',
-    'end_date'            => 'End Date',
-    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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é',
+    'preview_not_available' => '(aucun aperçu)',
+    'setup'                 => 'Configuration',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Passer au contenu principal',
+    'toggle_navigation'     => 'Activer/Désactiver la navigation',
+    'alerts'                => 'Alertes',
+    'tasks_view_all'        => 'Afficher toutes les tâches',
+    'true'                  => 'Vrai',
+    'false'                 => 'Faux',
+    'integration_option'    => 'Option d\'intégration',
+    'log_does_not_exist'    => 'Aucun enregistrement de log correspondant.',
+    'merge_users'           => 'Fusionner les utilisateurs',
+    'merge_information' =>  'Cela fusionnera les :count utilisateurs en un seul utilisateur. Sélectionnez ci-dessous l\'utilisateur dans lequel vous souhaitez fusionner les autres. Les ressources, licences associées, etc seront déplacées vers l\'utilisateur sélectionné et les autres utilisateurs seront marqués comme supprimés.',
+    'warning_merge_information' => 'Cette action NE PEUT PAS être annulée et ne devrait être utilisée que lorsque vous devez fusionner des utilisateurs à cause d\'une mauvaise importation ou d\'une mauvaise synchronisation. Assurez-vous d\'effectuer une sauvegarde d\'abord.',
+    'no_users_selected'     => 'Aucun utilisateur sélectionné',
+    'not_enough_users_selected'     => 'Au moins :count utilisateurs doivent être sélectionnés',
+    'merge_success'         => ':count utilisateurs fusionnés avec succès dans :into_username !',
+    'merged'                => 'fusionné',
+    'merged_log_this_user_into' => 'Utilisateur fusionné (ID :to_id - :to_username) dans l\'ID de l\'utilisateur :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Identifiant utilisateur fusionné :from_id (:from_username) dans cet utilisateur (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Effacer et enregistrer',
+    'update_existing_values'    => 'Mettre à jour les valeurs existantes ?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'La génération de numéros d\'inventaire autoincrémentés est désactivée, toutes les lignes doivent donc avoir la colonne "Numéro d\'inventaire" renseignée.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note : La génération de numéros d\'inventaire autoincrémentés est activée, de sorte que les actifs seront créés pour les lignes qui n\'ont pas de numéro d\'inventaire renseigné. Les lignes qui comprennent un numéro d\'inventaire seront mises à jour avec les informations fournies.',
+    'send_welcome_email_to_users'   => ' Envoyer un e-mail de bienvenue aux nouveaux·elles utilisateurs·trices ?',
+    'back_before_importing'     => 'Sauvegarder avant d\'importer ?',
+    'csv_header_field'          => 'Champ d\'en-tête CSV',
+    'import_field'              => 'Importer le champ',
+    'sample_value'              => 'Exemple de valeur',
+    'no_headers'                => 'Aucune colonne trouvée',
+    'error_in_import_file'      => 'Une erreur s\'est produite lors de la lecture du fichier CSV : :error',
+    'percent_complete'          => ':percent % achevé',
+    'errors_importing'          => 'Des erreurs se sont produites lors de l\'importation : ',
+    'warning'                   => 'ATTENTION : :warning',
+    'success_redirecting'       => '"Succès... Redirection.',
+    'setup_successful_migrations' => 'Vos tables de base de données ont été créées',
+    'setup_migration_output' => 'Sortie de migration :',
+    'setup_migration_create_user' => 'Étape suivante : créer un·e utilisateur·trice',
+    'importer_generic_error'    => 'L\'importation de votre fichier est terminée, mais nous avons reçu une erreur. Cela est généralement dû à la limitation d\'une API tierce à partir d\'un webhook de notification (tel que Slack) et n\'aurait pas interféré avec l\'importation elle-même, mais vous devez le confirmer.',
+    'confirm' => 'Valider',
+    'autoassign_licenses' => 'Attribuer les licences automatiquement',
+    'autoassign_licenses_help' => 'Autoriser l\'utilisateur·trice à se voir attribuer des licences via l\'outil d\'attribution de licence en volume ou bien via l\'outil CLI.',
+    'autoassign_licenses_help_long' => 'Cela permet à un·e utilisateur·trice de se voir attribuer des licences via l\'interface utilisateur de licence d\'attribution en masse ou les outils CLI. (Par exemple, vous ne souhaitez peut-être pas que les sous-traitants se voient attribuer automatiquement une licence que vous fourniriez uniquement aux membres du personnel. Vous pouvez toujours attribuer des licences individuellement à ces utilisateurs·trices, mais iels ne seront pas inclus·es dans les fonctions d\'attribution de licence à tous·tes les utilisateurs·trices.)',
+    'no_autoassign_licenses_help' => 'Ne pas inclure l\'utilisateur·trice dans l\'attribution groupée via l\'interface utilisateur de licence ou les outils CLI.',
+    'modal_confirm_generic'      => 'Êtes-vous sûr·e ?',
+    'cannot_be_deleted'      => 'Cet élément ne peut pas être supprimé',
+    'undeployable_tooltip'      => 'Cet élément ne peut pas être attribué. Vérifiez la quantité restante.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/fr/help.php b/resources/lang/fr/help.php
index 3a5abaf9ae..63c564be44 100644
--- a/resources/lang/fr/help.php
+++ b/resources/lang/fr/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Plus d\'info',
 
-    'audit_help' => 'Cocher cette case va modifier l\'enregistrement de la ressource pour refléter ce nouvel emplacement. Laisser décoché notera simplement l\'emplacement dans le journal d\'audit.<br><br>Notez que cette ressource est vérifiée, elle ne changera pas l\'emplacement de la personne, de la ressource ou de l\'emplacement où elle est vérifiée.',
+    'audit_help' => 'Cocher cette case va modifier l\'enregistrement de l\'actif pour refléter ce nouvel emplacement. Laisser décoché notera simplement l\'emplacement dans le journal d\'audit.<br><br>Notez que si cette ressource est affectée, cela ne changera pas l\'emplacement de la personne, de la ressource ou de l\'emplacement auquel elle est affectée.',
 
     'assets' => 'Les actifs sont des éléments suivis par le numéro de série ou la balise d\'actif. Ils ont tendance à être des éléments de valeur plus élevée lorsque l\'identification d\'un élément spécifique importe.',
 
diff --git a/resources/lang/fr/localizations.php b/resources/lang/fr/localizations.php
index 2de098b770..a58c7aaabd 100644
--- a/resources/lang/fr/localizations.php
+++ b/resources/lang/fr/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Écosse',
         'SB'=>'Îles Salomon',
         'SC'=>'Seychelles',
+        'SS'=>'Soudan du Sud',
         'SD'=>'Soudan',
         'SE'=>'Suède',
         'SG'=>'Singapour',
diff --git a/resources/lang/fr/mail.php b/resources/lang/fr/mail.php
index 5e6e606841..0d74de3464 100644
--- a/resources/lang/fr/mail.php
+++ b/resources/lang/fr/mail.php
@@ -3,8 +3,8 @@
 return [
     'acceptance_asset_accepted' => 'Un utilisateur a accepté un article',
     'acceptance_asset_declined' => 'Un utilisateur a refusé un article',
-    'a_user_canceled' => 'Un utilisateur a annulé une commande d’article sur le site Web',
-    'a_user_requested' => 'Un utilisateur a commandé un article sur le site Web',
+    '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',
     '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.',
@@ -38,11 +38,12 @@ return [
     'i_have_read' => 'J\'ai bien lu et approuvé les conditions d\'utilisation, et reçu cet objet.',
     'item' => 'Article :',
     'Item_Request_Canceled' => 'Demande d\'article annulée',
-    'Item_Requested' => 'Demande d\'article',
+    'Item_Requested' => 'Article demandé',
     'link_to_update_password' => 'Veuillez cliquer sur le lien suivant pour confirmer votre :web account:',
     'login_first_admin' => 'Connectez-vous à votre nouvelle installation Snipe-IT en utilisant les informations d\'identification ci-dessous :',
     'login' => 'Nom d\'utilisateur:',
     'Low_Inventory_Report' => 'Rapport d’inventaire bas',
+    'inventory_report' => 'Rapport d\'inventaire',
     '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.',
@@ -51,7 +52,7 @@ return [
 
     'read_the_terms' => 'Merci de lire les conditions d\'utilisation ci-dessous.',
     'read_the_terms_and_click' => 'Merci de lire les conditions d\'utilisation ci-dessous, et cliquer sur le lien ci-dessous pour confirmer que vous avez lu                         et accepté les conditions d\'utilisation et reçu l\'équipement.',
-    '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:',
     'serial' => 'N° de série ',
@@ -72,10 +73,12 @@ return [
     'welcome_to' => 'Bienvenue sur :web!',
     'your_credentials' => 'Vos identifiants Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessoire enregistré',
-    'Asset_Checkin_Notification' => 'Matériel enregistré',
+    'Asset_Checkin_Notification' => 'Actif restitué',
+    'Asset_Checkout_Notification' => 'Actif affecté',
     'License_Checkin_Notification' => 'Licence enregistrée',
     'Expected_Checkin_Report' => 'Rapport de vérification de matériel attendu',
     'Expected_Checkin_Notification' => 'Rappel : la date limite de vérification de :name approche',
     'Expected_Checkin_Date' => 'Un matériel que vous avez emprunté doit être vérifié à nouveau le :date',
     'your_assets' => 'Voir vos matériels',
+    'rights_reserved' => 'Tous droits réservés.',
 ];
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 01b3c6a93c..0ed774f9ca 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'L\'attribut: doit être un fichier.',
     'filled'               => 'Le champ d\'attribut: doit avoir une valeur.',
     'image'                => 'L\'attribut ":attribute" doit être une image.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'L\'attribut: doit avoir au moins: éléments min.',
     ],
     '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.',
+
     'not_in'               => 'L\'attribut ":attribute" est invalide.',
     'numeric'              => 'L\'attribut ":attribute" doit être un nombre.',
     'present'              => 'Le champ d\'attribut: doit être présent.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute doit être une date valide au format AAAA-MM-JJ',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/ga-IE/admin/accessories/general.php b/resources/lang/ga-IE/admin/accessories/general.php
index 1d72028720..caf32b034d 100644
--- a/resources/lang/ga-IE/admin/accessories/general.php
+++ b/resources/lang/ga-IE/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Nuashonraigh Cúlpháirtí',
     'use_default_eula'					=> 'Bain úsáid as an réamhshocraithe <a href="#" data-toggle="modal" data-target="#eulaModal"> réamhshocrú EULA</a> ina ionad.',
     'use_default_eula_disabled'			=> '<del>Cuir an príomh-réamhshocraithe EULA in ionad.</del> Níl aon réamhshocraithe EULA leagtha síos. Cuir ceann amháin i Socruithe le do thoil.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ga-IE/admin/accessories/message.php b/resources/lang/ga-IE/admin/accessories/message.php
index d7f58c60c7..d13a2b3963 100644
--- a/resources/lang/ga-IE/admin/accessories/message.php
+++ b/resources/lang/ga-IE/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/ga-IE/admin/asset_maintenances/form.php b/resources/lang/ga-IE/admin/asset_maintenances/form.php
index 8eae40a843..4eb9902e91 100644
--- a/resources/lang/ga-IE/admin/asset_maintenances/form.php
+++ b/resources/lang/ga-IE/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Cineál Cothabhála',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Teideal',
-        'start_date'             => 'Tosaithe',
-        'completion_date'        => 'Críochnaithe',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Costas',
         'is_warranty'            => 'Feabhas ar bharántas',
-        'asset_maintenance_time' => 'Laethanta',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Nótaí',
-        'update'                 => 'Nuashonrú',
-        'create'                 => 'Cruthaigh'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ga-IE/admin/categories/message.php b/resources/lang/ga-IE/admin/categories/message.php
index 374feec79e..4edc669d7c 100644
--- a/resources/lang/ga-IE/admin/categories/message.php
+++ b/resources/lang/ga-IE/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Níor nuashonraíodh an chatagóir, déan iarracht arís',
-        'success' => 'Catagóir nuashonraithe go rathúil.'
+        'success' => 'Catagóir nuashonraithe go rathúil.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ga-IE/admin/components/general.php b/resources/lang/ga-IE/admin/components/general.php
index 83e3f4e358..2ca4888906 100644
--- a/resources/lang/ga-IE/admin/components/general.php
+++ b/resources/lang/ga-IE/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Ag fágáil',
     'total' 			                 => 'Iomlán',
     'update'                            => 'Comhpháirt Nuashonraithe',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/ga-IE/admin/components/message.php b/resources/lang/ga-IE/admin/components/message.php
index c84b014629..644075c5a7 100644
--- a/resources/lang/ga-IE/admin/components/message.php
+++ b/resources/lang/ga-IE/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Níor sheiceáil amach an comhpháirt, déan iarracht arís',
         'success' 		=> 'Seiceáil amach an comhpháirt go rathúil.',
-        '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.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ga-IE/admin/consumables/message.php b/resources/lang/ga-IE/admin/consumables/message.php
index b6add857ad..785258fb7b 100644
--- a/resources/lang/ga-IE/admin/consumables/message.php
+++ b/resources/lang/ga-IE/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Níor sheiceáil amach an méid inmhuirearaithe, déan iarracht arís',
         'success' 		=> 'Seiceáil inbhuanaithe go rathúil.',
-        '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.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ga-IE/admin/custom_fields/general.php b/resources/lang/ga-IE/admin/custom_fields/general.php
index 18eb8caec1..4fb5a4ab89 100644
--- a/resources/lang/ga-IE/admin/custom_fields/general.php
+++ b/resources/lang/ga-IE/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Úsáidte trí Mhúnlaí',
     'order'   		            => 'Ordú',
     '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'            => 'Réimse Nua Chustaim',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ga-IE/admin/groups/message.php b/resources/lang/ga-IE/admin/groups/message.php
index 1589ad531f..036a3f1e9e 100644
--- a/resources/lang/ga-IE/admin/groups/message.php
+++ b/resources/lang/ga-IE/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Tá grúpa ann cheana!',
-    'group_not_found'     => 'Níl grúpa [: id] ann.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Tá an réimse ainmnithe ag teastáil',
 
     'success' => array(
diff --git a/resources/lang/ga-IE/admin/hardware/form.php b/resources/lang/ga-IE/admin/hardware/form.php
index 711e3042a7..dbfde2c976 100644
--- a/resources/lang/ga-IE/admin/hardware/form.php
+++ b/resources/lang/ga-IE/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Dearbhaigh Bulk Sócmhainní a Scriosadh',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Athbhreithniú a dhéanamh ar na sócmhainní le haghaidh scriosadh mórchóir thíos. Nuair a bheidh sé scriosta, is féidir na sócmhainní seo a chur ar ais, ach ní bheidh baint acu le haon úsáideoirí a bhfuil siad á sannadh faoi láthair.',
+  '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'	=> 'Tá tú ar tí a scriosadh: sócmhainní asset_count.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Sócmhainní Nuashonraithe Bulc',
     'bulk_update_help'	=> 'Ceadaíonn an fhoirm seo duit il-sócmhainní a thabhairt cothrom le dáta ag an am céanna. Líon isteach na réimsí is gá duit a athrú ach amháin. Ní dhéanfar aon réimsí fágtha gan athrú.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ga-IE/admin/hardware/general.php b/resources/lang/ga-IE/admin/hardware/general.php
index 8d3df87687..9e3bb863a4 100644
--- a/resources/lang/ga-IE/admin/hardware/general.php
+++ b/resources/lang/ga-IE/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Athraigh Sócmhainn',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Inrianaithe',
     'requested'				    => 'Iarrtar',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Athchóirigh Sócmhainn',
     'pending'  					=> 'Ar feitheamh',
     'undeployable'  			=> 'Neamhfhostaithe',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ga-IE/admin/hardware/message.php b/resources/lang/ga-IE/admin/hardware/message.php
index eb5f910dde..10d999e6bf 100644
--- a/resources/lang/ga-IE/admin/hardware/message.php
+++ b/resources/lang/ga-IE/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Níor cuireadh an tsócmhainn ar ais, déan iarracht arís',
         'success' 		=> 'Aisghabháil sócmhainne go rathúil.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/ga-IE/admin/hardware/table.php b/resources/lang/ga-IE/admin/hardware/table.php
index 9cad6351a6..88851460a3 100644
--- a/resources/lang/ga-IE/admin/hardware/table.php
+++ b/resources/lang/ga-IE/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In / Amach',
     'checkout_date' => 'Dáta Seiceáil',
     'checkoutto' 	=> 'Seiceáil Amach',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Íoslódáil CSV',
diff --git a/resources/lang/ga-IE/admin/licenses/general.php b/resources/lang/ga-IE/admin/licenses/general.php
index b67eda5593..6e20c5baa4 100644
--- a/resources/lang/ga-IE/admin/licenses/general.php
+++ b/resources/lang/ga-IE/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Maidir Ceadúnais',
-    'about_licenses'                  => 'Úsáidtear ceadúnais chun bogearraí a rianú. Tá líon áirithe suíochán acu ar féidir iad a sheiceáil amach do dhaoine aonair',
+    'about_licenses_title'      => 'Maidir Ceadúnais',
+    'about_licenses'            => 'Úsáidtear ceadúnais chun bogearraí a rianú. Tá líon áirithe suíochán acu ar féidir iad a sheiceáil amach do dhaoine aonair',
     'checkin'  					=> 'Suíochán Ceadúnas Checkin',
     'checkout_history'  		=> 'Stair Seiceáil',
     'checkout'  				=> 'Seiceáil Ceadúnas Seiceáil',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Ceadúnais Bogearraí',
     'user'  					=> 'Úsáideoir',
     'view'  					=> 'Féach ar an gCeadúnas',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ga-IE/admin/manufacturers/message.php b/resources/lang/ga-IE/admin/manufacturers/message.php
index e861d4b6de..bdadbf22ef 100644
--- a/resources/lang/ga-IE/admin/manufacturers/message.php
+++ b/resources/lang/ga-IE/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Níl an monaróir ann.',
     'assoc_users'	 => 'Tá baint ag an monaróir seo faoi láthair le múnla amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh do chuid samhlacha le do thoil gan tagairt a dhéanamh don monaróir seo agus déan iarracht arís.',
 
diff --git a/resources/lang/ga-IE/admin/manufacturers/table.php b/resources/lang/ga-IE/admin/manufacturers/table.php
index 612719dc26..3ec0352d76 100644
--- a/resources/lang/ga-IE/admin/manufacturers/table.php
+++ b/resources/lang/ga-IE/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Ríomhphost Tacaíochta',
     'support_phone'   		=> 'Fón Tacaíochta',
     'support_url'   		=> 'URL Tacaíochta',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Déantóir Nuashonraithe',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ga-IE/admin/models/general.php b/resources/lang/ga-IE/admin/models/general.php
index 34b59aafea..7e677eccb2 100644
--- a/resources/lang/ga-IE/admin/models/general.php
+++ b/resources/lang/ga-IE/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Múnla Athchóirigh',
     'requestable'               => 'Féadfaidh úsáideoirí an tsamhail seo a iarraidh',
 	'show_mac_address'			      => 'Taispeáin réimse seoladh MAC i sócmhainní sa mhúnla seo',
diff --git a/resources/lang/ga-IE/admin/models/message.php b/resources/lang/ga-IE/admin/models/message.php
index 2162bd5166..9e64f76d02 100644
--- a/resources/lang/ga-IE/admin/models/message.php
+++ b/resources/lang/ga-IE/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Níl múnla ann.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Níor nuashonraíodh an tsamhail, déan iarracht arís',
-        'success' => 'Modúl nuashonraithe go rathúil'
+        'success' => 'Modúl nuashonraithe go rathúil',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Níor athraíodh aon réimsí, mar sin níor nuashonraíodh aon rud.',
-        'success' 		=> 'Modhanna nuashonraithe.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index e5ddd84ad9..b30d883413 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Is freastalaí Gníomhach Eolaire é seo',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Cumarsáid Cumarsáide',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Socruithe 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Ainm an tSuímh',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Botharc Slack',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Dúnadh Deiridh',
-    'slack_integration'         => 'Socruithe Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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 leagan',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ga-IE/admin/settings/message.php b/resources/lang/ga-IE/admin/settings/message.php
index 7f8f1d7a45..54934d1929 100644
--- a/resources/lang/ga-IE/admin/settings/message.php
+++ b/resources/lang/ga-IE/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ga-IE/admin/users/general.php b/resources/lang/ga-IE/admin/users/general.php
index 68bf55a48e..f566e2405b 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.',
+    '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',
     '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'         => 'Féach Úsáideoir: ainm',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ga-IE/admin/users/message.php b/resources/lang/ga-IE/admin/users/message.php
index 5ad9e10de7..54db6b157e 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í Úsáideoir [: id] ann.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Is gá an réimse logála isteach',
     'user_password_required'    => 'Tá an focal faire ag teastáil.',
     'insufficient_permissions'  => 'Ceadanna Easpa.',
diff --git a/resources/lang/ga-IE/auth/general.php b/resources/lang/ga-IE/auth/general.php
index e13eb8826f..f4eef4a6af 100644
--- a/resources/lang/ga-IE/auth/general.php
+++ b/resources/lang/ga-IE/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Cuimhnigh orm',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index 8088e7f9b0..edf2be1d7b 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Gníomhachtaithe',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Cúlpháirtí',
     'accessory_report'		=> 'Tuarascáil Cúlpháirtí',
     'action'                => 'Gníomh',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Iniúchadh',
     'audit_report'			=> 'Logáil Iniúchta',
     'assets'				=> 'Sócmhainní',
+    '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'         => 'Scrios Avatar',
     'avatar_upload'         => 'Upload Upload',
     'back'      			=> 'Ar ais',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Cealaigh',
     'categories'			=> 'Catagóirí',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Scriosta',
     'delete_seats'  		=> 'Suíocháin Scriosta',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Iompórtáil',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Feabhsúcháin Sócmhainní',
     'item'  				=> 'Mír',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Ceadanna leordhóthanach!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Teanga',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Iarratas Ar Ceal',
     'save'  				=> 'Sábháil',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Roghnaigh',
     'select_all'            => 'Select All',
     'search'				=> 'Cuardaigh',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Síniú',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => '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',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'An bhfuil tú cinnte gur mian leat a scriosadh',
     'submit'				=> 'Cuir isteach',
     'target'                => 'Sprioc',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Taispeáin Am agus Dáta',
     'total_assets'			=> 'sócmhainní iomlána',
     'total_licenses'		=> 'ceadúnais iomlána',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ga-IE/help.php b/resources/lang/ga-IE/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ga-IE/help.php
+++ b/resources/lang/ga-IE/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ga-IE/localizations.php b/resources/lang/ga-IE/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ga-IE/localizations.php
+++ b/resources/lang/ga-IE/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ga-IE/mail.php b/resources/lang/ga-IE/mail.php
index 69273e2d86..d8721864a8 100644
--- a/resources/lang/ga-IE/mail.php
+++ b/resources/lang/ga-IE/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Logáil isteach i do shuiteáil Snipe-IT nua ag baint úsáide as na dintiúir thíos:',
     'login' => 'Logáil isteach:',
     'Low_Inventory_Report' => 'Tuarascáil Fardal Íseal',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Ainm',
     'new_item_checked' => 'Rinneadh mír nua a sheiceáil faoi d\'ainm, tá na sonraí thíos.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Do dhintiúir Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ga-IE/validation.php b/resources/lang/ga-IE/validation.php
index 6769e03cdb..478b5a0f15 100644
--- a/resources/lang/ga-IE/validation.php
+++ b/resources/lang/ga-IE/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Ní mór go mbeadh míreanna min ar a laghad ag an tréith.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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ú',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/he/account/general.php b/resources/lang/he/account/general.php
index 7fc060a849..71d48b14b5 100644
--- a/resources/lang/he/account/general.php
+++ b/resources/lang/he/account/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'personal_api_keys' => 'Personal API Keys',
+    '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.',
     'api_base_url' => 'Your API base url is located at:',
diff --git a/resources/lang/he/admin/accessories/general.php b/resources/lang/he/admin/accessories/general.php
index a546cb5c22..e5ae4ead90 100644
--- a/resources/lang/he/admin/accessories/general.php
+++ b/resources/lang/he/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'עידכון אביזר',
     'use_default_eula'					=> 'במקום זאת, השתמש ב- <a href="#" data-toggle="modal" data-target="#eulaModal"> ברירת המחדל הראשית EULA</a>.',
     'use_default_eula_disabled'			=> '<del> השתמש ב- EULA ברירת המחדל הראשוני במקום. </del> לא נקבעה ברירת המחדל הראשית של הסכם הרישיון למשתמש קצה. הוסף אחד בהגדרות.',
+    'clone'                             => 'שכפול אביזר',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/he/admin/accessories/message.php b/resources/lang/he/admin/accessories/message.php
index 7b3c5281ea..aa3ae924bf 100644
--- a/resources/lang/he/admin/accessories/message.php
+++ b/resources/lang/he/admin/accessories/message.php
@@ -25,6 +25,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'האבזר לא הונפק, אנא נסה שנית',
         'success' 		=> 'האבזר הונפק בהצלחה.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.'
     ),
 
diff --git a/resources/lang/he/admin/asset_maintenances/form.php b/resources/lang/he/admin/asset_maintenances/form.php
index deb1b77821..7b1c46f221 100644
--- a/resources/lang/he/admin/asset_maintenances/form.php
+++ b/resources/lang/he/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'סוג תחזוקה',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'כותרת',
-        'start_date'             => 'התחיל',
-        'completion_date'        => 'הושלם',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'מחיר',
         'is_warranty'            => 'שיפור באחריות',
-        'asset_maintenance_time' => 'ימים',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'הערות',
-        'update'                 => 'עדכון',
-        'create'                 => 'לִיצוֹר'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/he/admin/categories/message.php b/resources/lang/he/admin/categories/message.php
index 0508d5310b..c973ab1a59 100644
--- a/resources/lang/he/admin/categories/message.php
+++ b/resources/lang/he/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'הקטגוריה לא עודכנה, נסה שוב',
-        'success' => 'קטגוריה עודכנה בהצלחה.'
+        'success' => 'קטגוריה עודכנה בהצלחה.',
+        'cannot_change_category_type'   => 'אי אפשר לשנות את סוג הקטגוריה לאחר יצירתה',
     ),
 
     'delete' => array(
diff --git a/resources/lang/he/admin/components/general.php b/resources/lang/he/admin/components/general.php
index d7a924e490..49188b15e2 100644
--- a/resources/lang/he/admin/components/general.php
+++ b/resources/lang/he/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'נוֹתָר',
     'total' 			                 => 'סה"כ',
     'update'                            => 'עדכון רכיב',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/he/admin/components/message.php b/resources/lang/he/admin/components/message.php
index 32cb4c4fec..60f4805c1e 100644
--- a/resources/lang/he/admin/components/message.php
+++ b/resources/lang/he/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'הרכיב לא נבדק, נסה שוב',
         'success' 		=> 'רכיב הוצא בהצלחה.',
-        'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.'
+        'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/he/admin/consumables/message.php b/resources/lang/he/admin/consumables/message.php
index d4c2a78cf1..ccc2d23884 100644
--- a/resources/lang/he/admin/consumables/message.php
+++ b/resources/lang/he/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'הצריכה לא נבדקה, נסה שוב',
         'success' 		=> 'הצריכה נשללה בהצלחה.',
-        'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.'
+        'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/he/admin/custom_fields/general.php b/resources/lang/he/admin/custom_fields/general.php
index b6464ceaf8..2b3aa49cb5 100644
--- a/resources/lang/he/admin/custom_fields/general.php
+++ b/resources/lang/he/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'דגמים משומשים',
     'order'   		            => 'להזמין',
     'create_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'            => 'שדה מותאם אישית חדש',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/he/admin/groups/message.php b/resources/lang/he/admin/groups/message.php
index 949d1754a6..aa57f7b8b2 100644
--- a/resources/lang/he/admin/groups/message.php
+++ b/resources/lang/he/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'הקבוצה כבר קיימת!',
-    'group_not_found'     => 'קבוצה [: id] לא קיימת.',
+    'group_not_found'     => 'מזהה הקבוצה :id לא קיים.',
     'group_name_required' => 'שדה השדה נדרש',
 
     'success' => array(
diff --git a/resources/lang/he/admin/hardware/form.php b/resources/lang/he/admin/hardware/form.php
index 4e9828a4e3..ca18936f94 100644
--- a/resources/lang/he/admin/hardware/form.php
+++ b/resources/lang/he/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'אשר מחיקה גורפת של נכסים',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'עדכן מיקום ברירת מחדל',
     'asset_not_deployable' => 'הנכס הזה לא זמין. לא ניתן לספק ללקוח.',
     'asset_deployable' => 'הנכס זמין. ניתן לשייך למיקום.',
-    'processing_spinner' => 'מעבד...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/he/admin/hardware/general.php b/resources/lang/he/admin/hardware/general.php
index ab45bd1b85..0e144efcc7 100644
--- a/resources/lang/he/admin/hardware/general.php
+++ b/resources/lang/he/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'הנכס הזה נמחק.',
     'edit'  					=> 'ערוך נכס',
     'model_deleted'  			=> 'המודל של הנכס נמחק. יש לשחזר את המודל לפני שניתן לשחזר את הנכס.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'ניתן לבקש',
     'requested'				    => 'מבוקש',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'שחזור נכס',
     'pending'  					=> 'ממתין ל',
     'undeployable'  			=> 'לא ניתן לפריסה',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'שגיאות:',
     'success_messages' => 'אישור:',
     'alert_details' => 'נא ראה הסבר בהמשך.',
-    'custom_export' => 'יבוא מותאם'
+    'custom_export' => 'יבוא מותאם',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/he/admin/hardware/message.php b/resources/lang/he/admin/hardware/message.php
index 95e9d96981..5259805458 100644
--- a/resources/lang/he/admin/hardware/message.php
+++ b/resources/lang/he/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'הנכס לא שוחזר, נסה שוב',
         'success' 		=> 'הנכס שוחזר בהצלחה.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'הקובץ שלך יובא',
         'file_delete_success'   => 'הקובץ שלך נמחק בהצלחה',
         'file_delete_error'      => 'לא ניתן היה למחוק את הקובץ',
+        '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',
     ],
 
 
diff --git a/resources/lang/he/admin/hardware/table.php b/resources/lang/he/admin/hardware/table.php
index 9312732ffd..f2dbbd63b9 100644
--- a/resources/lang/he/admin/hardware/table.php
+++ b/resources/lang/he/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'בפנים בחוץ',
     'checkout_date' => 'תבדוק את התאריך',
     'checkoutto' 	=> 'נבדק',
+    'components_cost' => 'עלות הרכיבים הכוללת',
     'current_value' => 'הערך הנוכחי',
     'diff' 			=> 'דיף',
     'dl_csv' 		=> 'הורד CSV',
diff --git a/resources/lang/he/admin/licenses/general.php b/resources/lang/he/admin/licenses/general.php
index 7e968671ab..c9093c7e45 100644
--- a/resources/lang/he/admin/licenses/general.php
+++ b/resources/lang/he/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'על רישיונות',
-    'about_licenses'                  => 'רשיונות משמשים למעקב אחר תוכנה. יש להם מספר מסוים של מושבים כי ניתן לבדוק את הפרטים',
+    'about_licenses_title'      => 'על רישיונות',
+    'about_licenses'            => 'רשיונות משמשים למעקב אחר תוכנה. יש להם מספר מסוים של מושבים כי ניתן לבדוק את הפרטים',
     'checkin'  					=> 'רישיון רישיון',
     'checkout_history'  		=> 'היסטוריית Checkout',
     'checkout'  				=> 'רישיון',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'רשיונות תוכנה',
     'user'  					=> 'מִשׁתַמֵשׁ',
     'view'  					=> 'הצג רישיון',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/he/admin/locations/message.php b/resources/lang/he/admin/locations/message.php
index 305ecad24f..e748eedc18 100644
--- a/resources/lang/he/admin/locations/message.php
+++ b/resources/lang/he/admin/locations/message.php
@@ -7,7 +7,7 @@ return array(
     'assoc_assets'	 => 'המיקום משויך לפחות לפריט אחד ולכן לא ניתן למחוק אותו. אנא עדכן את הפריטים כך שלא יהיה אף פריט משויך למיקום זה ונסה שנית. ',
     'assoc_child_loc'	 => 'למיקום זה מוגדרים תתי-מיקומים ולכן לא ניתן למחוק אותו. אנא עדכן את המיקומים כך שלא שמיקום זה לא יכיל תתי מיקומים ונסה שנית. ',
     'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'current_location' => 'מיקום נוכחי',
 
 
     'create' => array(
diff --git a/resources/lang/he/admin/manufacturers/message.php b/resources/lang/he/admin/manufacturers/message.php
index 200f079ccd..0d534fb249 100644
--- a/resources/lang/he/admin/manufacturers/message.php
+++ b/resources/lang/he/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'היצרן אינו קיים.',
     'assoc_users'	 => 'יצרן זה משויך כרגע עם דגם אחד לפחות ולא ניתן למחוק אותו. אנא עדכן את הדגמים שלך כדי לא להתייחס עוד ליצרן זה ונסה שוב.',
 
diff --git a/resources/lang/he/admin/manufacturers/table.php b/resources/lang/he/admin/manufacturers/table.php
index d788333f4e..97907a4d25 100644
--- a/resources/lang/he/admin/manufacturers/table.php
+++ b/resources/lang/he/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'דוא"ל תמיכה',
     'support_phone'   		=> 'טלפון תמיכה',
     'support_url'   		=> 'כתובת אתר לתמיכה',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'עדכון היצרן',
     'url'   				=> 'כתובת אתר',
 
diff --git a/resources/lang/he/admin/models/general.php b/resources/lang/he/admin/models/general.php
index cbb6dd4e58..4b710b7799 100644
--- a/resources/lang/he/admin/models/general.php
+++ b/resources/lang/he/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'שחזור מודל',
     'requestable'               => 'משתמשים רשאים לבקש מודל זה',
 	'show_mac_address'			      => 'הצג שדה כתובת MAC בנכסים במודל זה',
diff --git a/resources/lang/he/admin/models/message.php b/resources/lang/he/admin/models/message.php
index 227ba73f87..2de9f5f37d 100644
--- a/resources/lang/he/admin/models/message.php
+++ b/resources/lang/he/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'המודל אינו קיים.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'מודל זה משויך כרגע לנכס אחד או יותר ולא ניתן למחוק אותו. מחק את הנכסים ולאחר מכן נסה למחוק שוב.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'המודל לא עודכן, נסה שוב',
-        'success' => 'המודל עודכן בהצלחה.'
+        'success' => 'המודל עודכן בהצלחה.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'לא השתנו שדות, ולכן שום דבר לא עודכן.',
-        'success' 		=> 'המודלים עודכנו.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'לא נבחרו מודלים, לכן לא נמחק שום דבר.',
-        'success' 		    => ':success_count מודלים נמחקו!',
+        '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/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php
index 48a31b0bd1..19e4f739a8 100644
--- a/resources/lang/he/admin/settings/general.php
+++ b/resources/lang/he/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'זהו שרת Active Directory',
     'alerts'                	=> 'התראות',
-    'alert_title'               => 'עדכן הגדרות התראה',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'שלח התראות אל',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'התראות מופעלות',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'משחזר מגיבוי',
     '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'			=> 'הגדרות ברקוד',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'שם אתר',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'שם בוטני',
-    'slack_channel'             => 'ערוץ רפה',
-    'slack_endpoint'            => 'נקודת הקצה המרוחקת',
-    'slack_integration'         => 'הגדרות רפוי',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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 גירסה',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/he/admin/settings/message.php b/resources/lang/he/admin/settings/message.php
index e5531735ab..e7bf4d8a20 100644
--- a/resources/lang/he/admin/settings/message.php
+++ b/resources/lang/he/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'בודק אימות מול שרת LDAP...',
         'authentication_success' => 'התחברות לשרת LDAפ עברה בהצלחה!'
     ],
-    'slack' => [
-        'sending' => 'שולח הודעת Slack לבדיקה...',
-        'success_pt1' => 'הבדיקה עברה בהצלחה! בדוק את ',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 שגיאת שרת.',
-        'error' => 'משהו השתבש אופסי פופסי.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/he/admin/users/general.php b/resources/lang/he/admin/users/general.php
index dff4d63267..59633cc37a 100644
--- a/resources/lang/he/admin/users/general.php
+++ b/resources/lang/he/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.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'התוכנה נבדקה אל: שם',
     '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'         => 'הצג משתמש: שם',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'אזהרה:',
     'warning_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',
@@ -41,4 +42,13 @@ 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_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/he/admin/users/message.php b/resources/lang/he/admin/users/message.php
index 7bb42a1898..3bfad2d61b 100644
--- a/resources/lang/he/admin/users/message.php
+++ b/resources/lang/he/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'דחיית את הנכס הזה בהצלחה.',
     'bulk_manager_warn'	        => 'המשתמשים שלך עודכנו בהצלחה, אך רשומת המנהל שלך לא נשמרה מפני שהמנהל שבחרת נבחר גם ברשימת המשתמשים כדי לערוך, והמשתמשים לא יכולים להיות המנהל שלהם. בחר שוב את המשתמשים שלך, למעט המנהל.',
     'user_exists'               => 'משתמש כבר קיים!',
-    'user_not_found'            => 'משתמש [: id] אינו קיים.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'יש להזין את שדה הכניסה',
     'user_password_required'    => 'נדרשת הסיסמה.',
     'insufficient_permissions'  => 'הרשאות לא מספיקות.',
diff --git a/resources/lang/he/auth/general.php b/resources/lang/he/auth/general.php
index 9f1612ffce..5ca1457b3a 100644
--- a/resources/lang/he/auth/general.php
+++ b/resources/lang/he/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'זכור אותי',
     'username_help_top'                 => 'נא למלא את <strong>שם המשתמש</strong> לשליחת הודעת דוא״ל עם קישור לאיפוס ססמה.',
     'username_help_bottom'          => 'שם המשתמש וכתובת הדוא״ל שלך <em>עשויים</em> להיות זהים, אך גם עשויים שלא, תלוי בהגדרות שלך. אם לא הצלחת להיזכר בשם המשתמש שלך, מוטב ליצור קשר עם הנהלת המערכת. <br><br><strong>שמות משתמשים שלא שויכה להם כתובת דוא״ל לא יקבלו הודעות עם קישור לאיפוס ססמה.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php
index 2f4dbec371..bf87b166f3 100644
--- a/resources/lang/he/general.php
+++ b/resources/lang/he/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'אביזרים',
     'activated'			    => 'מוּפעָל',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'אבזר',
     'accessory_report'		=> 'דוח אביזר',
     'action'                => 'פעולה',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'בְּדִיקָה',
     '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'           => 'הוקצה לטובת :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'מחק את אווטר',
     'avatar_upload'         => 'העלה את הסמל',
     'back'      			=> 'חזור',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'עריכה גורפת',
     'bulk_delete'           => 'מחיקה גורפת',
     'bulk_actions'          => 'פעולות גורפות',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'לפי סטאטוס',
     'cancel'  				=> 'לְבַטֵל',
     'categories'			=> 'קטגוריות',
@@ -83,6 +92,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.',
     'deleted'  				=> 'נמחק',
     'delete_seats'  		=> 'מושבים שנמחקו',
     'deletion_failed'       => 'המחיקה נכשלה',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => 'סוגי קובץ אפשריים הם :types. גודל קובץ אפשרי מקסימלי:size.',
     'filetypes_size_help'   => 'גודל קובץ מותר הוא :size.',
     'image_filetypes_help'  => 'סוגי הקבצים המותרים הם jpg,‏ webp,‏ png,‏ gif ו־svg. גודל ההעלאה המרבי המותר הוא :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'         	    => 'יְבוּא',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'אחזקת נכסים',
     'item'  				=> 'פריט',
     'item_name'             => 'שם פריט',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'הרשאות לא מספיקות!',
     'kits'       			=> 'ערכות מוגדרות מראש',
     'language'				=> 'שפה',
@@ -168,7 +181,7 @@ return [
     '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>.',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'נכסים שנדרשו',
     'request_canceled'      => 'הבקשה בוטלה',
     'save'  				=> 'להציל',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'בחר',
     'select_all'            => 'בחר הכל',
     'search'				=> 'חפש',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'חֲתִימָה',
     'signed_off_by'         => 'אושר על ידי',
     'skin'       			=> 'ערכת עיצוב',
-    'slack_msg_note'        => 'הודעת סלאק תישלח',
-    'slack_test_msg'        => 'יאי! נראה שהשילוב של Slack עם Snipe-IT עובד!',
+    'webhook_msg_note'        => 'תישלח התראה דרך התליית רשת',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: תכונות מסוימות מושבתות עבור התקנה זו.',
     'site_name'				=> 'שם אתר',
     'state'  				=> 'מדינה',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'האם אתה בטוח שברצונך למחוק',
     'submit'				=> 'שלח',
     'target'                => 'יַעַד',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'תצוגת זמן ותאריך',
     'total_assets'			=> 'סך נכסים',
     'total_licenses'		=> 'סך כל הרישיונות',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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' =>  'פעולה זו תמזג :count משתמשים למשתמש אחד. נא לבחור את המשתמש אליו ימוזגו הבאים, והנכסים המשויכים, הרישיונות ועוד יועברו למשתמש הנבחר והמשתמשים האחרים יסומנו כמחוקים.',
+    '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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'setup_successful_migrations' => 'טבלאות מסד הנתונים שלך נוצרו',
+    'setup_migration_output' => 'פלט ההגירה:',
+    'setup_migration_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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/he/help.php b/resources/lang/he/help.php
index 8908f1962f..7c21474d3a 100644
--- a/resources/lang/he/help.php
+++ b/resources/lang/he/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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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' => 'נכסים הם פריטים במעקב לפי מספר סידורי או תג נכס. הם נוטים להיות פריטים בעלי ערך גבוה יותר במקרים בהם זיהוי של פריט מסוים חשוב.',
 
diff --git a/resources/lang/he/localizations.php b/resources/lang/he/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/he/localizations.php
+++ b/resources/lang/he/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/he/mail.php b/resources/lang/he/mail.php
index 705403bc6e..850e1016c3 100644
--- a/resources/lang/he/mail.php
+++ b/resources/lang/he/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'היכנס למערכת ההתקנה החדשה של Snipe-IT באמצעות פרטי הכניסה הבאים:',
     'login' => 'התחברות:',
     'Low_Inventory_Report' => 'דו"ח מלאי נמוך',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'מינימום QTY',
     'name' => 'שֵׁם',
     'new_item_checked' => 'פריט חדש נבדק תחת שמך, הפרטים להלן.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'שלך Snipe- IT אישורים',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/he/validation.php b/resources/lang/he/validation.php
index f3814ae162..22aa9ec6c5 100644
--- a/resources/lang/he/validation.php
+++ b/resources/lang/he/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'התכונה: חייבת לכלול לפחות פריטים מינימליים.',
     ],
     'starts_with'          => 'השדה חייב להכיל לפחות אחד מהערכים הבאים.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'התכונה שנבחרה: אינה חוקית.',
     'numeric'              => 'התכונה: חייבת להיות מספר.',
     'present'              => 'שדה התכונה: חייב להיות נוכח.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'הסיסמה הנוכחית שלך שגויה',
         'dumbpwd'          => 'סיסמה זו נפוצה מדי.',
         'statuslabel_type' => 'עליך לבחור סוג תווית סטטוס חוקי',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/hr/admin/accessories/general.php b/resources/lang/hr/admin/accessories/general.php
index cb409fd1ed..2a2d151ac4 100644
--- a/resources/lang/hr/admin/accessories/general.php
+++ b/resources/lang/hr/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Ažuriranje dodatne opreme',
     'use_default_eula'					=> 'Umjesto toga upotrijebite <a href="#" data-toggle="modal" data-target="#eulaModal">primarnu postavku EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Uporedi primarnu zadanu EULA.</del> Nije postavljena primarna zadana EULA. Dodajte jednu u Postavke.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/hr/admin/accessories/message.php b/resources/lang/hr/admin/accessories/message.php
index 58418733c0..efc94ec6d3 100644
--- a/resources/lang/hr/admin/accessories/message.php
+++ b/resources/lang/hr/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Dodatna oprema [:id] ne postoji.',
     'assoc_users'	 => 'Ovaj pribor trenutačno ima: brojčanu stavku označenu korisnicima. Provjerite pribor i pokušajte ponovo.',
 
     'create' => array(
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/hr/admin/asset_maintenances/form.php b/resources/lang/hr/admin/asset_maintenances/form.php
index 8e8ad59200..cce4685514 100644
--- a/resources/lang/hr/admin/asset_maintenances/form.php
+++ b/resources/lang/hr/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Vrsta održavanja',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titula',
-        'start_date'             => 'počeo',
-        'completion_date'        => 'dovršen',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'cijena',
         'is_warranty'            => 'Poboljšanje jamstva',
-        'asset_maintenance_time' => 'dana',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Bilješke',
-        'update'                 => 'Ažuriraj',
-        'create'                 => 'Stvoriti'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/hr/admin/categories/message.php b/resources/lang/hr/admin/categories/message.php
index ec51a8307c..81af0f28e5 100644
--- a/resources/lang/hr/admin/categories/message.php
+++ b/resources/lang/hr/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorija nije ažurirana, pokušajte ponovo',
-        'success' => 'Kategorija je uspješno ažurirana.'
+        'success' => 'Kategorija je uspješno ažurirana.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/hr/admin/components/general.php b/resources/lang/hr/admin/components/general.php
index ddcfa760f5..5d273b7f62 100644
--- a/resources/lang/hr/admin/components/general.php
+++ b/resources/lang/hr/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'ostali',
     'total' 			                 => 'ukupno',
     'update'                            => 'Ažuriraj komponentu',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/hr/admin/components/message.php b/resources/lang/hr/admin/components/message.php
index a687bec21b..61dea43341 100644
--- a/resources/lang/hr/admin/components/message.php
+++ b/resources/lang/hr/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponenta nije provjerena, pokušajte ponovo',
         'success' 		=> 'Komponenta je uspješno provjerena.',
-        '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.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/hr/admin/consumables/message.php b/resources/lang/hr/admin/consumables/message.php
index a0420ff270..85ac9b6a63 100644
--- a/resources/lang/hr/admin/consumables/message.php
+++ b/resources/lang/hr/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Potrošnja nije provjerena, pokušajte ponovo',
         'success' 		=> 'Isporuka potrošnog materijala uspješno je provjerena.',
-        '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.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/hr/admin/custom_fields/general.php b/resources/lang/hr/admin/custom_fields/general.php
index c559379b4a..fe15457cfe 100644
--- a/resources/lang/hr/admin/custom_fields/general.php
+++ b/resources/lang/hr/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Koristi se po modelu',
     'order'   		            => 'Narudžba',
     'create_fieldset'         => 'Novi 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'            => 'Novi prilagođeni polje',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/hr/admin/groups/message.php b/resources/lang/hr/admin/groups/message.php
index a4ada9dcf0..87d4fb75a0 100644
--- a/resources/lang/hr/admin/groups/message.php
+++ b/resources/lang/hr/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grupa već postoji!',
-    'group_not_found'     => 'Grupa [: id] ne postoji.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Polje naziva je obavezno',
 
     'success' => array(
diff --git a/resources/lang/hr/admin/hardware/form.php b/resources/lang/hr/admin/hardware/form.php
index b55200ddbc..dd755b0df8 100644
--- a/resources/lang/hr/admin/hardware/form.php
+++ b/resources/lang/hr/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Potvrda opcije brisanja brisanja',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'U nastavku pregledajte materijale za skupnu brisanje. Nakon što se izbrisati, ta se sredstva mogu vratiti, ali više neće biti povezana s korisnicima kojima su trenutačno dodijeljeni.',
+  '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'	=> 'Izbrisat ćete: asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Skupna aktivacija ažuriranja',
     'bulk_update_help'	=> 'Ovaj vam obrazac omogućuje ažuriranje više imovine odjednom. Popunite polja koja su vam potrebna za promjenu. Sva polja koja su ostala prazna ostat će nepromijenjena.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/hr/admin/hardware/general.php b/resources/lang/hr/admin/hardware/general.php
index 10a2e708cc..82dd7c87a0 100644
--- a/resources/lang/hr/admin/hardware/general.php
+++ b/resources/lang/hr/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Uređivanje imovine',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Traženi',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Vraćanje imovine',
     'pending'  					=> 'U tijeku',
     'undeployable'  			=> 'Undeployable',
+    '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' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/hr/admin/hardware/message.php b/resources/lang/hr/admin/hardware/message.php
index d5fd4d0e64..3a9196ae14 100644
--- a/resources/lang/hr/admin/hardware/message.php
+++ b/resources/lang/hr/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Imovina nije obnovljena, pokušajte ponovo',
         'success' 		=> 'Imovina je uspješno obnovljena.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Vaša je datoteka uvezena',
         'file_delete_success'   => 'Vaša je datoteka uspješno izbrisana',
         'file_delete_error'      => 'Datoteka nije mogla biti izbrisana',
+        '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',
     ],
 
 
diff --git a/resources/lang/hr/admin/hardware/table.php b/resources/lang/hr/admin/hardware/table.php
index 127294c7a4..9011dd5a56 100644
--- a/resources/lang/hr/admin/hardware/table.php
+++ b/resources/lang/hr/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In / Out',
     'checkout_date' => 'Datum kupnje',
     'checkoutto' 	=> 'Odjavio',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'diff',
     'dl_csv' 		=> 'Preuzmite CSV',
diff --git a/resources/lang/hr/admin/licenses/general.php b/resources/lang/hr/admin/licenses/general.php
index b7f844a7eb..948ea6a3c9 100644
--- a/resources/lang/hr/admin/licenses/general.php
+++ b/resources/lang/hr/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'O licencama',
-    'about_licenses'                  => 'Licence se koriste za praćenje softvera. Imaju određeni broj mjesta koja se mogu provjeriti pojedincima',
+    'about_licenses_title'      => 'O licencama',
+    'about_licenses'            => 'Licence se koriste za praćenje softvera. Imaju određeni broj mjesta koja se mogu provjeriti pojedincima',
     'checkin'  					=> 'Provjerite mjesto licence',
     'checkout_history'  		=> 'Povijest kupovine',
     'checkout'  				=> 'Mjesto licence za provjeru',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licence za softver',
     'user'  					=> 'Korisnik',
     'view'  					=> 'Pogledajte licencu',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/hr/admin/manufacturers/message.php b/resources/lang/hr/admin/manufacturers/message.php
index 5ea24c9ce3..a29f359e3f 100644
--- a/resources/lang/hr/admin/manufacturers/message.php
+++ b/resources/lang/hr/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Proizvođač ne postoji.',
     'assoc_users'	 => 'Ovaj je proizvođač trenutno povezan s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da više ne referiraju ovog proizvođača i pokušajte ponovno.',
 
diff --git a/resources/lang/hr/admin/manufacturers/table.php b/resources/lang/hr/admin/manufacturers/table.php
index b9041bd74c..c7b9e26a2f 100644
--- a/resources/lang/hr/admin/manufacturers/table.php
+++ b/resources/lang/hr/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Podrška e-poštom',
     'support_phone'   		=> 'Podrška telefonu',
     'support_url'   		=> 'Podrška URL-a',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Ažuriraj proizvođača',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/hr/admin/models/general.php b/resources/lang/hr/admin/models/general.php
index d90867dc0b..1a78e9bd9b 100644
--- a/resources/lang/hr/admin/models/general.php
+++ b/resources/lang/hr/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Izbrisati ćete :model_count model(a) imovine.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Vraćanje modela',
     'requestable'               => 'Korisnici mogu zatražiti ovaj model',
 	'show_mac_address'			      => 'Prikaži polje MAC adrese u imovini ovog modela',
diff --git a/resources/lang/hr/admin/models/message.php b/resources/lang/hr/admin/models/message.php
index 6e3a15a2be..2b46720e74 100644
--- a/resources/lang/hr/admin/models/message.php
+++ b/resources/lang/hr/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model ne postoji.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model nije ažuriran, pokušajte ponovo',
-        'success' => 'Model je uspješno ažuriran.'
+        'success' => 'Model je uspješno ažuriran.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nijedna polja nisu promijenjena, tako da ništa nije ažurirano.',
-        'success' 		=> 'Modeli su ažurirani.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nijedan model nije odabran, tako da ništa nije izbrisano.',
-        'success' 		    => ':success_count model(a) izbrisan(o)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(a) je izbrisano, no :fail_count nije bilo moguće izbrisati jer još uvijek imaju imovinu povezanu s njima.'
     ),
 
diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php
index 4a707bea02..c756517efc 100644
--- a/resources/lang/hr/admin/settings/general.php
+++ b/resources/lang/hr/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Ovo je poslužitelj Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Upozorenja su omogućena',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP postavke',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Unesite valjano korisničko ime i lozinku LDAP-a iz osnovnog DN-a koji ste prethodno naveli da biste provjerili je li vaša LDAP prijava ispravno konfigurirana. MORATE NAJPRIJE SPREMITI SVOJE AŽURIRANE LDAP POSTAVKE.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Prikaži slike u e-porukama',
     'show_images_in_email_help'   => 'Isključite ovaj okvir ako je vaša Snipe-IT instalacija iza VPN ili zatvorene mreže, a korisnici izvan mreže neće moći učitati slike poslužene s ove instalacije u njihovu e-poštu.',
     'site_name'                 => 'Ime stranice',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Zatezanje postavki',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Nakon što spremite svoje Slack podatke, pojavit će se gumb za testiranje.',
-    'slack_test_help'           => 'Provjerite je li vaša Slack integracija pravilno konfigurirana. NAJPRIJE MORATE POHRANITI SVOJE AŽURIRANE SLACK POSTAVKE.',
+    'general_webhook'           => 'General Webhook',
+    '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 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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/hr/admin/settings/message.php b/resources/lang/hr/admin/settings/message.php
index fbab6d2dd5..d6681abe9f 100644
--- a/resources/lang/hr/admin/settings/message.php
+++ b/resources/lang/hr/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/hr/admin/users/general.php b/resources/lang/hr/admin/users/general.php
index aef3f687d7..0a08f92a49 100644
--- a/resources/lang/hr/admin/users/general.php
+++ b/resources/lang/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.',
+    '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',
     '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'         => 'Prikaži korisnika: ime',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/hr/admin/users/message.php b/resources/lang/hr/admin/users/message.php
index e5565b79bf..1bb48e25d1 100644
--- a/resources/lang/hr/admin/users/message.php
+++ b/resources/lang/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 [: id] ne postoji.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Potrebno je polje za prijavu',
     'user_password_required'    => 'Zaporka je potrebna.',
     'insufficient_permissions'  => 'Nedovoljna dozvola.',
diff --git a/resources/lang/hr/auth.php b/resources/lang/hr/auth.php
index db310aa1bb..9a6752e139 100644
--- a/resources/lang/hr/auth.php
+++ b/resources/lang/hr/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' => 'Vjerodajnice ne odgovaraju.',
+    'password' => 'Upisana lozinka je pogrešna.',
+    'throttle' => 'Previše neuspješnih pokušaja prijave. Pokušajte ponovno za :sekunda sekunda.',
 
 );
diff --git a/resources/lang/hr/auth/general.php b/resources/lang/hr/auth/general.php
index 3d322bafda..8f567b22b5 100644
--- a/resources/lang/hr/auth/general.php
+++ b/resources/lang/hr/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Zapamti 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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/hr/button.php b/resources/lang/hr/button.php
index c6bdbdfe3f..cc44b0fb9f 100644
--- a/resources/lang/hr/button.php
+++ b/resources/lang/hr/button.php
@@ -4,21 +4,21 @@ return [
     'actions' 	                => 'akcije',
     'add'    	                => 'Dodaj novi',
     'cancel'                    => 'Otkazati',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Dodijeli sve / Izbriši korisnika',
     'delete'  	                => 'Izbrisati',
     'edit'    	                => 'Uredi',
     'restore' 	                => 'Vratiti',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Izbriši',
     'request'                   => 'Zahtjev',
     'submit'  	                => 'podnijeti',
     'upload'                    => 'Postavi',
     'select_file'				=> 'Odaberite datoteku ...',
     'select_files'				=> 'Odaberite datoteke...',
-    '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',
+    'generate_labels'           => '{1} Kreiraj barkod|[2,*] Kreiraj barkod',
+    'send_password_link'        => 'Pošalji link za ponovno postavljanje lozinke',
+    'go'                        => 'Ići',
+    'bulk_actions'              => 'Masovne radnje',
+    'add_maintenance'           => 'Dodati održavanje',
+    'append'                    => 'Prikačiti',
+    'new'                       => 'Novi',
 ];
diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php
index 54141ff74b..47fbf82e28 100644
--- a/resources/lang/hr/general.php
+++ b/resources/lang/hr/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Pribor',
     'activated'			    => 'aktiviran',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Oprema',
     'accessory_report'		=> 'Izvješće o dodatku',
     'action'                => 'Akcijski',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Revizija',
     'audit_report'			=> 'Zapisnik revizije',
     'assets'				=> 'Imovina',
+    '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'         => 'Obriši avatar',
     'avatar_upload'         => 'Učitaj avatar',
     'back'      			=> 'Nazad',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Otkazati',
     'categories'			=> 'Kategorije',
@@ -83,6 +92,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.',
     'deleted'  				=> 'izbrisana',
     'delete_seats'  		=> 'Izbrisana mjesta',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Uvoz',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Upravljanje imovinom',
     'item'  				=> 'Artikal',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nedovoljna dozvola!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Jezik',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Zahtjev je otkazan',
     'save'  				=> 'Uštedjeti',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Izaberi',
     'select_all'            => 'Select All',
     'search'				=> 'traži',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Potpis',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Neke su značajke onemogućene za ovu instalaciju.',
     'site_name'				=> 'Ime stranice',
     'state'  				=> 'država',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Jeste li sigurni da želite izbrisati',
     'submit'				=> 'podnijeti',
     'target'                => 'Cilj',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Prikaz vremena i datuma',
     'total_assets'			=> 'Ukupna imovina',
     'total_licenses'		=> 'ukupne licence',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/hr/help.php b/resources/lang/hr/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/hr/help.php
+++ b/resources/lang/hr/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/hr/localizations.php b/resources/lang/hr/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/hr/localizations.php
+++ b/resources/lang/hr/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/hr/mail.php b/resources/lang/hr/mail.php
index 13d0deaa07..aa54e50cf3 100644
--- a/resources/lang/hr/mail.php
+++ b/resources/lang/hr/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Prijavite se na svoju novu Snipe-IT instalaciju pomoću vjerodajnica u nastavku:',
     'login' => 'Prijaviti se:',
     'Low_Inventory_Report' => 'Izvješće o niskom oglasnom prostoru',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Ime',
     'new_item_checked' => 'Nova stavka je provjerena pod vašim imenom, detalji su u nastavku.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Vaše vjerodajnice za Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/hr/passwords.php b/resources/lang/hr/passwords.php
index 25633b4581..8de23ff3e7 100644
--- a/resources/lang/hr/passwords.php
+++ b/resources/lang/hr/passwords.php
@@ -1,8 +1,8 @@
 <?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!',
+    'sent'	        => 'Ako odgovarajući korisnik s valjanom adresom e-pošte postoji u sustavu, poslan je email za oporavak lozinke.',
+    'user'			=> 'Ako odgovarajući korisnik s valjanom adresom e-pošte postoji u sustavu, poslan je email za oporavak lozinke.',
+    'token'         => 'Token za poništavanje zaporke nije valjan, istekao je ili ne odgovara navedenom korisničkom računu.',
+    'reset'         => 'Vaša lozinka je resetirana!',
 ];
diff --git a/resources/lang/hr/validation.php b/resources/lang/hr/validation.php
index 0efbe998e4..02fd59eefa 100644
--- a/resources/lang/hr/validation.php
+++ b/resources/lang/hr/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribut mora imati barem: min stavke.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Odabrani: atribut nije važeći.',
     'numeric'              => 'Atribut mora biti broj.',
     'present'              => 'Polje atributa mora biti prisutno.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Vaša trenutačna zaporka nije točna',
         'dumbpwd'          => 'Ta je lozinka prečestna.',
         'statuslabel_type' => 'Morate odabrati valjanu vrstu oznake statusa',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/hu/admin/accessories/general.php b/resources/lang/hu/admin/accessories/general.php
index 9b4e1888bf..c24182271c 100644
--- a/resources/lang/hu/admin/accessories/general.php
+++ b/resources/lang/hu/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Tartozék frissítése',
     'use_default_eula'					=> 'Használja inkább az <a href="#" data-toggle="modal" data-target="#eulaModal">alapértelmezett EULA</a>-t.',
     'use_default_eula_disabled'			=> '<del>Használja inkább az alapértelmezett EULA-t.</del> Nincs alapértelmezett EULA beállítva. Kérem adjon hozzá egyet a Beállításokban!',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'A tartozék még nem törölhető, mert még néhány belőle ki van adva.',
 
 );
diff --git a/resources/lang/hu/admin/accessories/message.php b/resources/lang/hu/admin/accessories/message.php
index 0795e5dfa9..05683581aa 100644
--- a/resources/lang/hu/admin/accessories/message.php
+++ b/resources/lang/hu/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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!'
     ),
 
diff --git a/resources/lang/hu/admin/asset_maintenances/form.php b/resources/lang/hu/admin/asset_maintenances/form.php
index 991c1c3a30..7f7b45952f 100644
--- a/resources/lang/hu/admin/asset_maintenances/form.php
+++ b/resources/lang/hu/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Karbantartás típusa',
+        'asset_maintenance_type' => 'Eszköz karbantartásának típusa',
         'title'                  => 'Elnevezés',
-        'start_date'             => 'Kezdés',
-        'completion_date'        => 'Befejezés',
+        'start_date'             => 'Kezdő dátum',
+        'completion_date'        => 'Befejezés dátuma',
         'cost'                   => 'Költség',
         'is_warranty'            => 'Garanciális javítás',
-        'asset_maintenance_time' => 'Napok',
+        'asset_maintenance_time' => 'Eszköz karbantartásának ideje (napokban)',
         'notes'                  => 'Megjegyzések',
-        'update'                 => 'Frissít',
-        'create'                 => 'Létrehoz'
+        'update'                 => 'Eszköz karbantartás szerkesztése',
+        'create'                 => 'Eszköz karbantartás létrehozása'
     ];
diff --git a/resources/lang/hu/admin/categories/message.php b/resources/lang/hu/admin/categories/message.php
index dd5774709d..e51e8b91e3 100644
--- a/resources/lang/hu/admin/categories/message.php
+++ b/resources/lang/hu/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Nem sikerült a kategória módosítása, kérjük, próbálja újra',
-        'success' => 'Sikeresen módosította a kategóriát.'
+        'success' => 'Sikeresen módosította a kategóriát.',
+        'cannot_change_category_type'   => 'Létrehozás után nem tudod megváltoztatni a kategória tipusát',
     ),
 
     'delete' => array(
diff --git a/resources/lang/hu/admin/components/general.php b/resources/lang/hu/admin/components/general.php
index 0719ca75e3..62e01dbe95 100644
--- a/resources/lang/hu/admin/components/general.php
+++ b/resources/lang/hu/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Fennmaradó',
     'total' 			                 => 'Összesen',
     'update'                            => 'Alkatrész frissítés',
+    'checkin_limit'            => 'A visszavett mennyiségnek egyenlőnek, vagy kisebbnek kell lennie, mint: :assigned_qty'
 );
diff --git a/resources/lang/hu/admin/components/message.php b/resources/lang/hu/admin/components/message.php
index 87dfdfb4fe..2a8435b9f2 100644
--- a/resources/lang/hu/admin/components/message.php
+++ b/resources/lang/hu/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Az alkatrész nem lett kiadva, próbálkozz újra',
         'success' 		=> 'Az alkatrész sikeresen kiadva.',
-        '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.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/hu/admin/consumables/message.php b/resources/lang/hu/admin/consumables/message.php
index 366b413f46..1677ee6f50 100644
--- a/resources/lang/hu/admin/consumables/message.php
+++ b/resources/lang/hu/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'A kellék nem lett kiadva, próbálkozz újra',
         'success' 		=> 'A kellék sikeresen kiadva.',
-        '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.',
+         'unavailable'      => 'Nincs elegendő fogyóeszköz amit ki lehetne adni. Ellenőrizd a kiadható mennyiséget. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/hu/admin/custom_fields/general.php b/resources/lang/hu/admin/custom_fields/general.php
index cd42fb7573..7718185bfb 100644
--- a/resources/lang/hu/admin/custom_fields/general.php
+++ b/resources/lang/hu/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Modellek szerint ',
     'order'   		            => 'Rendelés',
     'create_fieldset'         => 'Új mezőcsoportok',
+    'update_fieldset'         => 'Mezőkészlet frissítése',
+    'fieldset_does_not_exist'   => 'A(z) :id nevű egyéni mező nem létezik',
+    'fieldset_updated'         => 'Mezőkészlet frissítve',
     'create_fieldset_title' => 'Új mezőkészlet létrehozása',
     'create_field'            => 'Új egyéni mező',
     'create_field_title' => 'Új egyéni mező létrehozása',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'FIGYELMEZTETÉS. Ez a mező az egyéni mezők táblában <code>:db_column</code> néven szerepel, de <code>:expected</code>-nek kellene lennie.',
     'is_unique' => 'Ennek az értéknek minden eszköz esetében egyedinek kell lennie',
     'unique' => 'Egyedi',
-    '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' => 'A hozzárendelt felhasználó megtekintheti ezeket az értékeket a "Hozzárendelt Eszközök Megtekintése" oldalon',
+    'display_in_user_view_table' => 'Látható a felhasználó számára',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/hu/admin/departments/message.php b/resources/lang/hu/admin/departments/message.php
index 9c5bbf6aa3..7ed55dd934 100644
--- a/resources/lang/hu/admin/departments/message.php
+++ b/resources/lang/hu/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'A tanszék nem létezik.',
-    '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' => 'Már létezik egy részleg ezzel a névvel ezen a helyen. Válasszon egy másik nevet ehhez a részleghez. ',
     'assoc_users'	 => 'Ez a részleg jelenleg társított legalább egy felhasználót, és nem lehet törölni. Kérjük, frissítse a felhasználókat, hogy ne hivatkozzanak az osztályon, és próbálja újra.',
     'create' => array(
         'error'   => 'Osztály nem jött létre, próbálkozzon újra.',
diff --git a/resources/lang/hu/admin/groups/message.php b/resources/lang/hu/admin/groups/message.php
index b5feb9a9fa..25a3591999 100644
--- a/resources/lang/hu/admin/groups/message.php
+++ b/resources/lang/hu/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'A csoport már létezik!',
-    'group_not_found'     => '[:id] csoport nem létezik.',
+    'group_not_found'     => 'A :id csoportazonosító nem létezik.',
     'group_name_required' => 'A név mező kötelező',
 
     'success' => array(
diff --git a/resources/lang/hu/admin/hardware/form.php b/resources/lang/hu/admin/hardware/form.php
index 2885296d15..711655ba88 100644
--- a/resources/lang/hu/admin/hardware/form.php
+++ b/resources/lang/hu/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'A tömeges törlési eszközök megerősítése',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Tömeges törléshez tekintse át az eszközöket. Ha törli az eszközöket, azok visszaállíthatók, de többé nem lesznek hozzárendelve a korábban hozzárendelt felhasználókhoz.',
+  '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'	=> 'Le akarod törölni a :asset_count eszközt.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Tömeges eszköz frissítés',
     'bulk_update_help'	=> 'Ez az űrlap segít frissíteni több eszközt egyszerre. Csak töltsd ki a változtatni kívánt mezőket. Mindent amit üresen hagysz az változatlan marad. ',
     'bulk_update_warn'	=> 'Egyetlen eszköz tulajdonságait kívánja szerkeszteni.|:asset_count eszköz tulajdonságait kívánja szerkeszteni.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Csak az alapértelmezett 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ó.',
-    'processing_spinner' => 'Feldolgozás...',
+    'processing_spinner' => 'Feldolgozás folyamatban... (Nagyméretű fájlok esetében ez eltarthat egy darabig)',
     'optional_infos'  => 'Nem kötelező információk',
     'order_details'   => 'Megrendeléssel kapcsolatos információk'
 ];
diff --git a/resources/lang/hu/admin/hardware/general.php b/resources/lang/hu/admin/hardware/general.php
index 474a8d72cb..f03ba0520a 100644
--- a/resources/lang/hu/admin/hardware/general.php
+++ b/resources/lang/hu/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Az eszköz törölve lett.',
     'edit'  					=> 'Eszköz módosítása',
     'model_deleted'  			=> 'Ennek az eszköznek a modellje törölve lett. Elösszőr a modellt vissza kell állítani, utánna lehet csak az eszközt visszaállítani.',
+    'model_invalid'             => 'Ennek az eszköznek a modellje érvénytelen.',
+    'model_invalid_fix'         => 'Az eszközt módosítani kell a javításához, mielőtt megkísérli a kiadását vagy visszavételét.',
     'requestable'               => 'lehívási',
     'requested'				    => 'Kérve',
     'not_requestable'           => 'Nem kérhető',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Visszaállítás eszköz',
     'pending'  					=> 'Függőben',
     'undeployable'  			=> 'Nem telepíthető',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Hibaüzenetek:',
     'success_messages' => 'Sikeres üzenetek:',
     'alert_details' => 'A részleteket lásd alább.',
-    'custom_export' => 'Egyéni export'
+    'custom_export' => 'Egyéni export',
+    'mfg_warranty_lookup' => ':manufacturer jótállási információk ellenőrzése',
 ];
diff --git a/resources/lang/hu/admin/hardware/message.php b/resources/lang/hu/admin/hardware/message.php
index 549d3ef5df..76f6f34fe3 100644
--- a/resources/lang/hu/admin/hardware/message.php
+++ b/resources/lang/hu/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Az eszköz nem állt helyre, kérjük, próbálkozzon újra',
         'success' 		=> 'Az eszköz sikeresen visszaállítva.',
+        'bulk_success' 		=> 'Az eszköz sikeresen visszaállítva.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/hu/admin/hardware/table.php b/resources/lang/hu/admin/hardware/table.php
index 9c4f7f4e7e..87e7be0d5e 100644
--- a/resources/lang/hu/admin/hardware/table.php
+++ b/resources/lang/hu/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Be/ki',
     'checkout_date' => 'Kiadási dátum',
     'checkoutto' 	=> 'Kiadva',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Jelenlegi érték',
     'diff' 			=> 'Eltérés',
     'dl_csv' 		=> 'Cvs letöltése',
diff --git a/resources/lang/hu/admin/licenses/general.php b/resources/lang/hu/admin/licenses/general.php
index 8949db33c5..5a59442116 100644
--- a/resources/lang/hu/admin/licenses/general.php
+++ b/resources/lang/hu/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'A licencekről',
-    'about_licenses'                  => 'Az engedélyeket a szoftverek nyomon követésére használják. Meghatározott számú ülőhellyel rendelkeznek, melyeket az egyéneknek lehet ellenőrizni',
+    'about_licenses_title'      => 'A licencekről',
+    'about_licenses'            => 'Az engedélyeket a szoftverek nyomon követésére használják. Meghatározott számú ülőhellyel rendelkeznek, melyeket az egyéneknek lehet ellenőrizni',
     'checkin'  					=> 'Bevét engedély Seat',
     'checkout_history'  		=> 'Visszavét előzmények',
     'checkout'  				=> 'Kiadás Licence ülés/kérelem',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Szoftverlicencek',
     'user'  					=> 'használó',
     'view'  					=> 'Licenc megtekintése',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/hu/admin/locations/message.php b/resources/lang/hu/admin/locations/message.php
index 85afa80ba4..5973b60035 100644
--- a/resources/lang/hu/admin/locations/message.php
+++ b/resources/lang/hu/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Ehhez a helyhez jelenleg hozzá van rendelve legalább egy felhasználó és nem törölhető. Kérjük, frissítse a felhasználót aki hozzá volt rendelve ehhez a helyhez, és próbálja meg újra. ',
     '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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Hozzárendelt eszközök',
+    'current_location' => 'Jelenlegi hely',
 
 
     'create' => array(
diff --git a/resources/lang/hu/admin/manufacturers/message.php b/resources/lang/hu/admin/manufacturers/message.php
index 121ccb262b..d3e415bcf7 100644
--- a/resources/lang/hu/admin/manufacturers/message.php
+++ b/resources/lang/hu/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Gyártó nem létezik.',
     'assoc_users'	 => 'Ez a gyártó jelenleg legalább egy modellel társítva van, így nem lehet törölni. Kérjük, frissítse a modellt úgy, hogy ne hivatkozzon erre a gyártóra, és próbálkozzon újra. ',
 
diff --git a/resources/lang/hu/admin/manufacturers/table.php b/resources/lang/hu/admin/manufacturers/table.php
index bc3fc9f868..02f2ca0870 100644
--- a/resources/lang/hu/admin/manufacturers/table.php
+++ b/resources/lang/hu/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Az e-mail támogatása',
     'support_phone'   		=> 'Telefon támogatás',
     'support_url'   		=> 'Támogatási URL',
+    'warranty_lookup_url'   => 'Jótállást ellenőrző link',
     'update'				=> 'Gyártó frissítése',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/hu/admin/models/general.php b/resources/lang/hu/admin/models/general.php
index d9607a70e5..d77212773c 100644
--- a/resources/lang/hu/admin/models/general.php
+++ b/resources/lang/hu/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Törlődni fog :model_count eszköz modell.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Modell Visszaállítása',
     'requestable'               => 'A felhasználók kérhetik ezt a modellt',
 	'show_mac_address'			      => 'Mutasd a MAC cím mezőt ennél az eszköznél',
diff --git a/resources/lang/hu/admin/models/message.php b/resources/lang/hu/admin/models/message.php
index 49d772f620..ed5593df7f 100644
--- a/resources/lang/hu/admin/models/message.php
+++ b/resources/lang/hu/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modell nem létezik.',
+    'no_association' => 'Nincs modell hozzárendelve.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'A modell nem frissült, próbálkozzon újra',
-        'success' => 'A modell sikeresen frissült.'
+        'success' => 'A modell sikeresen frissült.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nincsenek mezők megváltoztak, így semmi sem frissült.',
-        'success' 		=> 'Modellek frissítve.'
+        'success' 		=> 'Eszköz modell sikeresen frissítve. Összesen |:model_count eszköz frissítve.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nem voltak eszközök kiválasztva, így semmi sem lett törölve.',
-        'success' 		    => ':success_count eszköz(ök) törölve!',
+        'success' 		    => 'Eszköz modell törölve! Összesen |:success_count eszköz törölve!',
         'success_partial' 	=> ': success_count modell(ek) törlésre kerültek, azonban ennyit nem sikerült törölni: a fail_count , mert még hozzárendelt eszközökkel rendelkeznek.'
     ),
 
diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php
index 2235039c12..efb738ec05 100644
--- a/resources/lang/hu/admin/settings/general.php
+++ b/resources/lang/hu/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Ez egy Active Directory szerver',
     'alerts'                	=> 'Riasztások',
-    'alert_title'               => 'Riasztási beállítások frissítése',
+    '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',
     'alerts_enabled'			=> 'Riasztás engedélyezve',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Pipáld be ezt a dobozt ha szeretnéd, hogy a felhasználok felülírhassák az alap oldal kinézetét egy másikkal.',
     'asset_ids'					=> 'Eszköz ID',
     'audit_interval'            => 'Audit időtartam',
-    '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'       => 'Ha rendszeresen fizikailag is ellenőrizni kell az eszközeit, adja meg az Ön által használt intervallumot hónapokban kifejezve. Ha frissíti ezt az értéket, a közelgő ellenőrzési dátummal rendelkező eszközök összes "következő ellenőrzési dátuma" megjelenik.',
     'audit_warning_days'        => 'Ellenőrzési figyelmeztető küszöbérték',
     'audit_warning_days_help'   => 'Hány nappal előre figyelmeztetni kell Önt arra, hogy az eszközöknek az ellenőrzésre van szükségük?',
     'auto_increment_assets'		=> 'Automatikusan növekvő eszközazonosítók generálása',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Visszaállítás biztonsági másolatból',
     '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'   => 'Használja a visszaállítás gombot<span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small>egy korábbi biztonsági mentésből történő visszaállításhoz. (Ez jelenleg nem működik S3 fájltárolóval vagy Dockerrel.<br><br>A <strong>teljes :app_name adatbázisod és minden feltöltött fájlod teljesen lecserélődik</strong> arra, ami a mentési fájlban van.  ',
+    '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',
@@ -75,8 +75,9 @@ return [
     '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',
-    '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.',
+    'ldap_default_group'        => 'Alapértelmezett engedélyek csoport',
+    'ldap_default_group_info'   => 'Válasszon ki egy csoportot az újonan szinkronizált felhasználókhoz. Ne felejtse el, hogy a felhasználó átveszi a hozzárendelt csoport engedélyeit.',
+    'no_default_group'          => 'Nincs alapértelmezett csoport',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP ügyfél TLS-kulcsa',
     'ldap_client_tls_cert'      => 'LDAP ügyféloldali TLS tanúsítvány',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP beállítások',
     'ldap_client_tls_cert_help' => 'Az LDAP-kapcsolatok ügyféloldali TLS-tanúsítványa és kulcsa általában csak a "Biztonságos LDAP" Google Workspace-konfigurációkban hasznos. Mindkettőre szükség van.',
      'ldap_client_tls_key'       => 'LDAP ügyféloldali TLS kulcs',
+    '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'      => 'Adjon meg egy érvényes LDAP felhasználónevet és jelszót a fenti alapszintű DN-ből, hogy ellenőrizze, hogy az LDAP-bejelentkezés megfelelően van-e beállítva. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
     '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ő',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Képek használata az email-ekben',
     'show_images_in_email_help'   => 'Vegye ki a jelölést innen, ha az Ön Snipe-IT alkalmazása VPN mögött, vagy zárt hálózaton található, és a felhasználók a hálózaton kívül nem tudják az emailekben megjeleníteni az alkalmazás által szolgáltatott képeket.',
     'site_name'                 => 'Webhely neve',
+    'integrations'               => 'Integrációk',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Slack beállítások frissítése',
-    'slack_help'                => 'Slack beállítások',
-    'slack_botname'             => 'Laza botneve',
-    'slack_channel'             => 'Laza csatorna',
-    'slack_endpoint'            => 'Laza végpont',
-    'slack_integration'         => 'Laza beállítások',
-    'slack_integration_help'    => 'A Slack integráció opcionális, azonban a végpont és a csatorna szükséges, ha használni kívánja. A Slack integráció konfigurálásához először a következőket kell tennie<a href=":slack_link" target="_new" rel="noopener">egy bejövő webhook létrehozása</a> a Slack-fiókodon. Kattintson a <strong>Slack integráció tesztelése</strong> gombra, hogy a mentés előtt megerősítse a beállítások helyességét. ',
-    'slack_integration_help_button'    => 'Miután mentette a Slack információkat, egy teszt gomb jelenik meg.',
-    'slack_test_help'           => 'Annak tesztelése megfelelő -e a Slack integráció beállítása. ELŐSZÖR EL KELL MENTENI A FRISSÍTETT SLACK BEÁLLÍTÁSOKAT.',
+    'general_webhook'           => 'General Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test to Save',
+    'webhook_title'               => 'Update Webhook Settings',
+    'webhook_help'                => 'Integrációs beállítások',
+    '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 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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Inkrementálás és előtagok',
     'labels' => 'Címkék',
     'labels_title' => 'Címke beállítások frissítése',
@@ -322,4 +330,9 @@ 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ó',
+    '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. ',
+
 ];
diff --git a/resources/lang/hu/admin/settings/message.php b/resources/lang/hu/admin/settings/message.php
index f3b919c17d..f274e444d1 100644
--- a/resources/lang/hu/admin/settings/message.php
+++ b/resources/lang/hu/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP-hitelesítés tesztelése...',
         'authentication_success' => 'A felhasználó sikeresen hitelesített az LDAP-nál!'
     ],
-    'slack' => [
-        'sending' => 'Slack tesztüzenet küldése...',
+    'webhook' => [
+        'sending' => ':app tesztüzenet küldése...',
         'success_pt1' => 'Siker! Ellenőrizze a ',
         'success_pt2' => ' csatornát a tesztüzenethez, és ne felejtsen el a MENTÉS gombra kattintani a beállítások tárolásához.',
         '500' => '500 Szerverhiba.',
-        'error' => 'Valami hiba történt.',
+        'error' => 'Valami hiba történt. A Slack a következő üzenettel válaszolt: :error_message',
+        'error_misc' => 'Valami hiba történt :( ',
     ]
 ];
diff --git a/resources/lang/hu/admin/users/general.php b/resources/lang/hu/admin/users/general.php
index 304243dd07..b8ee236fa4 100644
--- a/resources/lang/hu/admin/users/general.php
+++ b/resources/lang/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.',
+    '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',
     'send_email_help'   => 'Meg kell adnod egy email címet ehhez a felhasználóhoz, hogy a hitelesítő adatok elküldve legyenek számára. Hitelesítő adatok csak a felhasználó készítésekor kerülnek elküldésre. A jelszavak hashelve kerülnek mentésre így nem lehet őket megszerezni miután elmentödtek.',
     'view_user'         => 'Felhasználó megtekintése: név',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Csak a szuperadminok adhatnak egy felhasználónak szuperadmin hozzáférést.',
     'admin_permission_warning' => 'Csak admin vagy annál nagyobb jogokkal rendelkező felhasználók adhatnak admin hozzáférést egy felhasználónak.',
     'remove_group_memberships' => 'Csoporttagságok eltávolítása',
-    'warning_deletion' => 'FIGYELMEZTETÉS:',
     'warning_deletion_information' => 'Ön az alábbiakban felsorolt :count felhasználó(k) MINDEN tételét be fogja jelenteni. A szuper admin nevek pirossal vannak kiemelve.',
     'update_user_assets_status' => 'Frissítse ezen felhasználók összes eszközét erre az állapotra',
     'checkin_user_properties' => 'Ellenőrizze a felhasználókhoz kapcsolódó összes tulajdonságot',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Távoli',
     'remote_help' => 'Ez akkor lehet hasznos, ha olyan távoli felhasználókra kell szűrnie, akik soha vagy ritkán járnak be a fizikai helyszínekre.',
     'not_remote_label' => 'Ez nem egy távoli felhasználó',
+    'vip_label' => 'VIP felhasználó',
+    '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' => 'Felhasználó létrehozása',
+    'create_user_page_explanation' => 'Ezeket a fiókadatokat fogja tudni használni az oldal első alkalommal történő eléréséhez.',
+    'email_credentials' => 'Hitelesítő adatok elküldése',
+    'email_credentials_text' => 'Hitelesítő adatok elküldése a fenti címre',
+    'next_save_user' => 'Következő: Felhasználó mentése',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/hu/admin/users/message.php b/resources/lang/hu/admin/users/message.php
index 450ac6e67d..312757299e 100644
--- a/resources/lang/hu/admin/users/message.php
+++ b/resources/lang/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'            => 'A felhasználó [: id] nem létezik.',
+    'user_not_found'            => 'Felhasználó nem létezik.',
     'user_login_required'       => 'A bejelentkezési mező kötelező',
     'user_password_required'    => 'A jelszó szükséges.',
     'insufficient_permissions'  => 'Nem megfelelő engedélyek.',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => 'A kiválasztott felhasználók számára, akik aktívak és van nekik érvényes email cím, elküldésre került egy jelszó visszaállítási link.',
     'password_reset_sent'       => 'A jelszó visszaállítási link elküldésre került a :email címre!',
     'user_has_no_email'         => 'Ez a felhasználó nem rendelkezik e-mail címmel a profiljában.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Ehhez a felhasználóhoz nincsenek eszközök rendelve',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'A felhasználóhoz nincs email cím beállítva.',
+        'success' => 'A felhasználót értesítettük a hozzárendelt eszközökről.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/hu/auth/general.php b/resources/lang/hu/auth/general.php
index 861bc11478..ed2b431229 100644
--- a/resources/lang/hu/auth/general.php
+++ b/resources/lang/hu/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Emlékezzen rám',
     'username_help_top'                 => 'Írd be a te <strong>felhasználónevedet</strong>, hogy a jelszó visszaállítási link elküldésre kerüljön az email címedre.',
     'username_help_bottom'          => 'A felhasználóneved és az email címed <em>talán</em> azonos, talán nem, ez függ a beállításoktól. Ha nem emlékszel a felhasználónevedre, vedd fel a kapcsolatot az adminiszrátorral. <br><br><strong>Email nélküli felhasználónevek nem fognak jelszó visszaállítási linket kapni.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php
index b745e19fe9..a589967a1f 100644
--- a/resources/lang/hu/general.php
+++ b/resources/lang/hu/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Tartozékok',
     'activated'			    => 'Aktivált',
+    'accepted_date'         => 'Visszaigazolás dátuma',
     'accessory'				=> 'Tartozék',
     'accessory_report'		=> 'Tartozék riport',
     'action'                => 'Művelet',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Adminisztrátor',
     'add_seats'             => 'Hozzáadott ülések',
-    'age'                   => "Age",
+    'age'                   => "Életkor",
     'all_assets'			=> 'Összes eszköz',
     'all'       			=> 'Mind',
     'archived'              => 'Archivált',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Könyvvizsgálat',
     'audit_report'			=> 'Audit napló',
     'assets'				=> 'Eszközök',
+    'assets_audited'        => 'eszközök auditálva',
+    'assets_checked_in_count'     => 'eszközök visszavéve',
+    'assets_checked_out_count'     => 'eszközök kiadva',
+    'asset_deleted_warning'     => 'Ez az eszköz törölve lett. Először vissza kell állítani, mielőtt valakihez hozzárendelhető lesz.',
+    'assigned_date'         => 'Hozzárendelés dátuma',
     'assigned_to'           => 'Hozzárendelve a következőhöz: :name',
+    'assignee'              => 'Hozzárendelve',
     'avatar_delete'         => 'Avatar törlése',
     'avatar_upload'         => 'Avatar frissítése',
     'back'      			=> 'Vissza',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Tömeges szerkesztés',
     'bulk_delete'           => 'Tömeges törlés',
     'bulk_actions'          => 'Tömeges műveletek',
-    'bulk_checkin_delete'   => 'Tömeges visszavétel felhasználóktól',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Ez az eszköz a felhasználó tulajdona',
     'bystatus'              => 'státusz szerint',
     'cancel'  				=> 'Mégse',
     'categories'			=> 'Kategóriák',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Törölve',
     'delete_seats'  		=> 'Törölt elemek',
     'deletion_failed'       => 'A törlés nem sikerült',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Az elfogadott fájltípusok jpg, webp, png, gif és svg. A maximális feltöltési méret a következő: 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',
     'importing'         	=> 'Importálás',
     'importing_help'        => 'Eszközöket, tartozékokat, szoftverlicenceket, alkatrészeket, fogyóeszközöket és felhasználókat importálhat CSV fájl segítségével. <br><br>A CSV-ben az értékeket kettőspontal kell elválasztani és minden fejlécnévnek meg kell egyeznie az <a href="https://snipe-it.readme.io/docs/importing" target="_new">alap CSV dokumentációban szereplőkkel.</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Eszköz karbantartások',
     'item'  				=> 'Tétel',
     'item_name'             => 'Eszköz neve',
+    'import_file'  			=> 'CSV fájl importálása',
+    'import_type'  			=> 'CSV importálás típusa',
     'insufficient_permissions' => 'Elégtelen engedély!',
     'kits'       			=> 'Előre definiált csomagok',
     'language'				=> 'Nyelv',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Kért eszközök',
     'request_canceled'      => 'A kérelem törölve',
     'save'  				=> 'Mentés',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Választ',
     'select_all'            => 'Összes kijelölése',
     'search'				=> 'Keresés',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Aláírás',
     'signed_off_by'         => 'Aláírta',
     'skin'       			=> 'Kinézet',
-    'slack_msg_note'        => 'A slack üzenet el lesz küldve',
-    'slack_test_msg'        => 'Oh szia! Úgy látszik a te Slack integrálásod a Snipe-IT el sikeres volt!',
+    'webhook_msg_note'        => 'A notification will be sent via webhook',
+    'webhook_test_msg'        => 'Oh szia! Úgy látszik a te :app integrálásod a Snipe-IT-val sikeres volt!',
     'some_features_disabled' => 'DEMO MODE: Néhány funkció le van tiltva a telepítéshez.',
     'site_name'				=> 'Hely neve',
     'state'  				=> 'Megye',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Biztosan törölni kíván',
     'submit'				=> 'beküldése',
     'target'                => 'Cél',
-    'toggle_navigation'     => 'Navigáció összecsukása/kinyitása',
     'time_and_date_display' => 'Idő és dátum megjelenítése',
     'total_assets'			=> 'eszköz összesen',
     'total_licenses'		=> 'licensz összesen',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Igen',
     'zip'  					=> 'Irányítószám',
     'noimage'				=> 'Nincs kép feltöltve vagy a kép nem található.',
-    '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'   => 'A keresett fájl nem található a szerveren.',
+    'file_upload_success'   => 'A fájl feltöltése sikeres!',
+    'no_files_uploaded'     => 'A fájl feltöltése sikeres!',
     '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',
@@ -375,7 +388,8 @@ 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'           => 'Az eszköz értékeinek törlése|Az összes :asset_count eszköz értékeinek törlése ',
+    '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 - 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',
@@ -385,8 +399,54 @@ return [
     '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'
+    'placeholder_kit'       => 'Készlet kiválasztása',
+    'file_not_found'        => 'A fájl nem található',
+    'preview_not_available' => '(nincs előnézet)',
+    'setup'                 => 'Beállítás',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Ugrás a fő tartalomra',
+    'toggle_navigation'     => 'Navigáció váltása',
+    'alerts'                => 'Riasztások',
+    'tasks_view_all'        => 'Összes feladat megtekintése',
+    'true'                  => 'Igaz',
+    'false'                 => 'Hamis',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Felhasználó azonosítók egyesítése',
+    '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, licences, 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'     => 'Nincsenek kiválasztva felhasználók',
+    'not_enough_users_selected'     => 'Legalább :count felhasználót kell kijelölni',
+    'merge_success'         => ':count felhasználó sikeresen egyesítve a(z) :into_username felhasználóhoz!',
+    'merged'                => 'egyesítve',
+    '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'            => 'Törlés és mentés',
+    'update_existing_values'    => 'Frissíti a jelenlegi adatokat?',
+    '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'   => ' Email küldése az új felhasználóknak?',
+    'back_before_importing'     => 'Biztonsági mentés importálás előtt?',
+    'csv_header_field'          => 'CSV fejléc mező',
+    'import_field'              => 'Mező importálása',
+    'sample_value'              => 'Minta érték',
+    'no_headers'                => 'No Columns Found',
+    'error_in_import_file'      => 'HIba lépett fel a CSV fájl olvasásakor: :error',
+    'percent_complete'          => ':percent % elkészült',
+    'errors_importing'          => 'Hiba lépett fel az importálás közben: ',
+    'warning'                   => 'FIGYELMEZTETÉS: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Következő: Felhasználó mentése',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/hu/help.php b/resources/lang/hu/help.php
index e063d31a81..897057c00a 100644
--- a/resources/lang/hu/help.php
+++ b/resources/lang/hu/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Több információ',
 
-    'audit_help' => 'Ha bejelöli ezt a négyzetet, az eszközrekordot úgy szerkeszti, hogy az tükrözze az új helyet. A jelölőnégyzet kipipálásának kihagyásával a hely egyszerűen felkerül az ellenőrzési naplóba.<br><br>Vegye figyelembe, hogy ha ez az eszköz ki van jelölve, akkor az nem változtatja meg a személy, az eszköz vagy a helyszín helyét, ahová ki van jelölve.',
+    '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' => 'Az eszközök sorozatszám vagy eszközcímke alapján nyomon követhető tételek.  Ezek általában nagyobb értékű tételek, ahol egy adott tétel azonosítása fontos.',
 
diff --git a/resources/lang/hu/localizations.php b/resources/lang/hu/localizations.php
index 136733f921..8dd36f0358 100644
--- a/resources/lang/hu/localizations.php
+++ b/resources/lang/hu/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Skócia',
         'SB'=>'Salamon-szigetek',
         'SC'=>'Seychelle Köztársaság',
+        'SS'=>'Dél-Szudán',
         'SD'=>'Szudáni Köztársaság',
         'SE'=>'Svédország',
         'SG'=>'Szingapúr',
diff --git a/resources/lang/hu/mail.php b/resources/lang/hu/mail.php
index a542127964..82ec8659c8 100644
--- a/resources/lang/hu/mail.php
+++ b/resources/lang/hu/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Jelentkezzen be az új Snipe-IT telepítésébe az alábbi hitelesítő adatok alapján:',
     'login' => 'Belépés:',
     'Low_Inventory_Report' => 'Alacsony készletjelentés',
+    'inventory_report' => 'Készlet Jelentés',
     '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.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'A Snipe-IT hitelesítő adatai',
     'Accessory_Checkin_Notification' => 'Tartozék kiadva',
     'Asset_Checkin_Notification' => 'Eszköz kiadva',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Licensz kiadva',
     'Expected_Checkin_Report' => 'Várható eszköz kiadásának jelentése',
     'Expected_Checkin_Notification' => 'Emlékeztető: :name kiadásának idejéhez közelít',
     'Expected_Checkin_Date' => 'Az eszközt amelyet kiadtak neked, hamarosan visszavételre kerül a :date napon',
     'your_assets' => 'Eszközeidnek megtekíntése',
+    'rights_reserved' => 'Minden jog fenntartva.',
 ];
diff --git a/resources/lang/hu/validation.php b/resources/lang/hu/validation.php
index bd28094ea8..bd735a415f 100644
--- a/resources/lang/hu/validation.php
+++ b/resources/lang/hu/validation.php
@@ -43,14 +43,14 @@ return [
     '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.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'A: attribútumnak rendelkeznie kell legalább: min elemekkel.',
     ],
     'starts_with'          => 'A(z) :attribute a következővel kell kezdődnie: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'A kiválasztott :attribute étvénytelen.',
     'numeric'              => 'A :attribute csak szám lehet.',
     'present'              => 'A: attribútum mezőnek jelen kell lennie.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD formátumban',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/id/admin/accessories/general.php b/resources/lang/id/admin/accessories/general.php
index 5e632c899e..15aee538a4 100644
--- a/resources/lang/id/admin/accessories/general.php
+++ b/resources/lang/id/admin/accessories/general.php
@@ -16,5 +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.',
 
 );
diff --git a/resources/lang/id/admin/accessories/message.php b/resources/lang/id/admin/accessories/message.php
index fd4385d5c4..6c2cd67c1f 100644
--- a/resources/lang/id/admin/accessories/message.php
+++ b/resources/lang/id/admin/accessories/message.php
@@ -24,6 +24,7 @@ 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.'
     ),
 
diff --git a/resources/lang/id/admin/asset_maintenances/form.php b/resources/lang/id/admin/asset_maintenances/form.php
index 3f02d3db06..d6074dd9fd 100644
--- a/resources/lang/id/admin/asset_maintenances/form.php
+++ b/resources/lang/id/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Pemeliharan Jenis Aset',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Judul',
-        'start_date'             => 'Tanggal Mulai',
-        'completion_date'        => 'Tanggal Penyelesaian',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Biaya',
         'is_warranty'            => 'Pengembangan Garansi',
-        'asset_maintenance_time' => 'Waktu Pemeliharaan Aset (dalam hari)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Catatan',
-        'update'                 => 'Pembaharuan Pemeliharan Aset',
-        'create'                 => 'Membuat Pemeliharan Aset'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/id/admin/categories/message.php b/resources/lang/id/admin/categories/message.php
index cfb4dc39b1..1e492cec5f 100644
--- a/resources/lang/id/admin/categories/message.php
+++ b/resources/lang/id/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Pembaharuan kategori tidak berhasil, silahkan coba kembali',
-        'success' => 'Pembaharuan kategori berhasil.'
+        'success' => 'Pembaharuan kategori berhasil.',
+        'cannot_change_category_type'   => 'Anda tidak dapat mengubah jenis kategori setelah dibuat',
     ),
 
     'delete' => array(
diff --git a/resources/lang/id/admin/components/general.php b/resources/lang/id/admin/components/general.php
index cc582283b7..5944273436 100644
--- a/resources/lang/id/admin/components/general.php
+++ b/resources/lang/id/admin/components/general.php
@@ -12,4 +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'
 );
diff --git a/resources/lang/id/admin/components/message.php b/resources/lang/id/admin/components/message.php
index 4adaea082d..3f2d52bf21 100644
--- a/resources/lang/id/admin/components/message.php
+++ b/resources/lang/id/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponen belum tertanda keluar, silahkan mencoba lagi',
         'success' 		=> 'Komponen telah sukses tertanda keluar.',
-        'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.'
+        'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/id/admin/consumables/message.php b/resources/lang/id/admin/consumables/message.php
index 8826d6700d..87117018ca 100644
--- a/resources/lang/id/admin/consumables/message.php
+++ b/resources/lang/id/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => 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.'
+        'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/id/admin/custom_fields/general.php b/resources/lang/id/admin/custom_fields/general.php
index 5c2593d3ac..f272be044b 100644
--- a/resources/lang/id/admin/custom_fields/general.php
+++ b/resources/lang/id/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ 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',
     'create_fieldset_title' => 'Buat fieldset baru',
     'create_field'            => 'Tambah Kolom Ubahan',
     'create_field_title' => 'Buat field kustom',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/id/admin/groups/message.php b/resources/lang/id/admin/groups/message.php
index a07902428f..e812bde5eb 100644
--- a/resources/lang/id/admin/groups/message.php
+++ b/resources/lang/id/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Kelompok sudah ada!',
-    'group_not_found'     => 'Kelompok [:id] tidak ada.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Field nama di perlukan',
 
     'success' => array(
diff --git a/resources/lang/id/admin/hardware/form.php b/resources/lang/id/admin/hardware/form.php
index 98b74467ab..d4583d0ce9 100644
--- a/resources/lang/id/admin/hardware/form.php
+++ b/resources/lang/id/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Konfirmasi Penghapusan Aset dalam Jumlah Besar',
+    'bulk_restore'      => 'Konfirmasi Pemulihan Aset Secara Massal', 
   'bulk_delete_help'	=> 'Meninjau aset untuk penghapusan massal di bawah ini. Setelah dihapus, aset-aset ini dapat dipulihkan, tetapi mereka tidak lagi akan dikaitkan dengan setiap pengguna yang mereka saat ini digunakan.',
+  'bulk_restore_help'	=> 'Tinjau aset untuk pemulihan massal di bawah. Setelah dipulihkan, aset ini tidak akan dikaitkan dengan pengguna mana pun yang sebelumnya ditetapkan untuknya.',
   'bulk_delete_warn'	=> 'Anda akan menghapus :asset_count aset.',
+  'bulk_restore_warn'	=> 'Anda akan memulihkan :asset_count aset.',
     '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'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
+    'bulk_update_warn'	=> 'Anda akan mengedit properti dari satu aset.|Anda akan mengedit properti dari :asset_count aset.',
     'checkedout_to'		=> 'Diberikan kepada',
     'checkout_date'		=> 'Tanggal Pemberian',
     'checkin_date'		=> 'Tanggal Pengembalian',
@@ -40,12 +43,12 @@ return [
     'warranty'			=> 'Garansi',
         'warranty_expires'		=> 'Garansi Berakhir',
     'years'				=> 'tahun',
-    'asset_location' => 'Update Asset Location',
-    'asset_location_update_default_current' => 'Update default location AND actual location',
-    'asset_location_update_default' => 'Update only default location',
-    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    '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_not_deployable' => 'Status aset tersebut tidak dapat ditetapkan. Aset ini tidak dapat digunakan.',
+    'asset_deployable' => 'Status aset dapat ditetapkan. Aset ini dapat digunakan.',
+    'processing_spinner' => 'Memproses... (Mungkin memerlukan sedikit waktu untuk file besar)',
+    'optional_infos'  => 'Informasi Tambahan',
+    'order_details'   => 'Informasi Pesanan'
 ];
diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php
index 6f0ebf6572..0d14a627ca 100644
--- a/resources/lang/id/admin/hardware/general.php
+++ b/resources/lang/id/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Aset ini telah dihapus.',
     'edit'  					=> 'Sunting Aset',
     'model_deleted'  			=> 'Model Aset ini telah dihapus. Anda harus memulihkan model aset tersebut sebelum Anda dapat memulihkan Aset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Dapat diminta',
     'requested'				    => 'Telah diminta',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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.',
     'view'  					=> 'Tampilkan aset',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/id/admin/hardware/message.php b/resources/lang/id/admin/hardware/message.php
index d8eb81255b..c8adce9a9e 100644
--- a/resources/lang/id/admin/hardware/message.php
+++ b/resources/lang/id/admin/hardware/message.php
@@ -5,7 +5,7 @@ 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_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    '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. ',
 
     'create' => [
@@ -17,12 +17,14 @@ return [
         'error'   			=> 'Gagal perbarui aset, silahkan coba kembali',
         'success' 			=> 'Sukses perbarui aset.',
         'nothing_updated'	=>  'Tidak ada kolom yang dipilih, jadi tidak ada yang diperbaharui.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'Tidak ada aset yang dipilih, jadi tidak ada yang diperbarui.',
     ],
 
     'restore' => [
         'error'   		=> 'Aset gagal dikembalikan, silahkan coba lagi',
         'success' 		=> 'Aset berhasil dikembalikan.',
+        'bulk_success' 		=> 'Aset berhasil dikembalikan.',
+        'nothing_updated'   => 'Tidak ada aset yang dipilih, jadi tidak ada yang dipulihkan.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Berkas Anda berhasil terimpor',
         'file_delete_success'   => 'File anda telah berhasil dihapus',
         'file_delete_error'      => 'File tidak bisa dihapus',
+        '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',
     ],
 
 
diff --git a/resources/lang/id/admin/hardware/table.php b/resources/lang/id/admin/hardware/table.php
index 2e26b4271d..ed8027f76d 100644
--- a/resources/lang/id/admin/hardware/table.php
+++ b/resources/lang/id/admin/hardware/table.php
@@ -4,11 +4,12 @@ return [
 
     'asset_tag'   	=> 'Tag Aset',
     'asset_model'       => 'Model',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Nilai sekarang',
     'change' 		=> 'Masuk/Keluar',
     'checkout_date' => 'Tanggal Pemberian',
     'checkoutto' 	=> 'Diberikan',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Total Biaya Komponen',
+    'current_value' => 'Nilai Sekarang',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Unduh CSV',
     'eol' 			=> 'MHP',
@@ -22,9 +23,9 @@ return [
     'image'		    => 'Gambar Perangkat',
     'days_without_acceptance' => 'Tanda Terima',
     'monthly_depreciation' => 'Penyusutan Bulanan',
-    'assigned_to'    => 'Assigned To',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'assigned_to'    => 'Diberikan kepada',
+    'requesting_user' => 'Meminta Pengguna',
+    'requested_date' => 'Tanggal yang diminta',
+    'changed'       => 'Diubah',
+    'icon' => 'Ikon',
 ];
diff --git a/resources/lang/id/admin/licenses/general.php b/resources/lang/id/admin/licenses/general.php
index 22290291bc..9dad58dfb2 100644
--- a/resources/lang/id/admin/licenses/general.php
+++ b/resources/lang/id/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Tentang Lisensi',
-    'about_licenses'                  => 'Lisensi digunakan untuk melacak perangkat lunak. Mereka memiliki sejumlah kursi yang bisa diperiksa ke individu',
+    'about_licenses_title'      => 'Tentang Lisensi',
+    'about_licenses'            => 'Lisensi digunakan untuk melacak perangkat lunak. Mereka memiliki sejumlah kursi yang bisa diperiksa ke individu',
     'checkin'  					=> 'Pemberian kapasitas lisensi',
     'checkout_history'  		=> 'Riwayat Pemberian',
     'checkout'  				=> 'Pemberian kapasitas lisensi',
@@ -18,4 +18,30 @@ return array(
     '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.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/id/admin/locations/message.php b/resources/lang/id/admin/locations/message.php
index 61dc8dcf69..096352d62a 100644
--- a/resources/lang/id/admin/locations/message.php
+++ b/resources/lang/id/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Lokasi saat ini dikaitkan dengan setidaknya oleh satu pengguna dan tidak dapat dihapus. Perbarui pengguna Anda yang tidak ada referensi dari 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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Aset yang Ditetapkan',
+    'current_location' => 'Lokasi Saat Ini',
 
 
     'create' => array(
diff --git a/resources/lang/id/admin/locations/table.php b/resources/lang/id/admin/locations/table.php
index 18c9ef34fb..5c1310a0fc 100644
--- a/resources/lang/id/admin/locations/table.php
+++ b/resources/lang/id/admin/locations/table.php
@@ -20,21 +20,21 @@ return [
     'parent'                    => 'Induk',
     'currency'                  => 'Lokasi Mata Uang',
     'ldap_ou'                   => 'LDAP Cari OU',
-    'user_name'                 => 'User Name',
-    'department'                => 'Department',
-    'location'                  => 'Location',
-    'asset_tag'                 => 'Assets Tag',
-    'asset_name'                => 'Name',
-    'asset_category'            => 'Category',
-    'asset_manufacturer'        => 'Manufacturer',
+    'user_name'                 => 'Nama Pengguna',
+    'department'                => 'Departemen',
+    'location'                  => 'Lokasi',
+    'asset_tag'                 => 'Kode Aset',
+    'asset_name'                => 'Nama',
+    'asset_category'            => 'Kategori',
+    'asset_manufacturer'        => 'Pabrikan',
     'asset_model'               => 'Model',
     'asset_serial'              => 'Serial',
-    'asset_location'            => 'Location',
-    'asset_checked_out'         => 'Checked Out',
-    'asset_expected_checkin'    => 'Expected Checkin',
-    'date'                      => 'Date:',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'asset_location'            => 'Lokasi',
+    'asset_checked_out'         => 'Dipakai',
+    'asset_expected_checkin'    => 'Tanggal Pengembalian',
+    'date'                      => 'Tanggal:',
+    '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:',
 ];
diff --git a/resources/lang/id/admin/manufacturers/message.php b/resources/lang/id/admin/manufacturers/message.php
index 6e58440395..320b52e555 100644
--- a/resources/lang/id/admin/manufacturers/message.php
+++ b/resources/lang/id/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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/admin/manufacturers/table.php b/resources/lang/id/admin/manufacturers/table.php
index 7d79e858c1..d2a7a62bab 100644
--- a/resources/lang/id/admin/manufacturers/table.php
+++ b/resources/lang/id/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Dukungan Email',
     'support_phone'   		=> 'Dukungan Telp',
     'support_url'   		=> 'URL Dukungan',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Perbarui Merek',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/id/admin/models/general.php b/resources/lang/id/admin/models/general.php
index 9ada8e9043..9f27718302 100644
--- a/resources/lang/id/admin/models/general.php
+++ b/resources/lang/id/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Anda akan menghapus :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     '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/admin/models/message.php b/resources/lang/id/admin/models/message.php
index 1e5e0fb672..aae859777c 100644
--- a/resources/lang/id/admin/models/message.php
+++ b/resources/lang/id/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model tidak ada.',
+    'no_association' => 'TIDAK ADA MODEL TERKAIT.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model gagal diperbarui, silahkan coba kembali',
-        'success' => 'Sukses memperbarui Model.'
+        'success' => 'Sukses memperbarui Model.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Tidak ada bidang yang berubah, jadi tidak ada yang diperbarui.',
-        'success' 		=> 'Model diperbarui'
+        'success' 		=> 'Model berhasil diperbarui. |:model_count model berhasil diperbarui.',
+        'warn'          => 'Anda akan memperbarui properti dari model berikut: |Anda akan mengedit properti dari :model_count model berikut:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Tidak ada model yang dipilih, jadi tidak ada yang dihapus.',
-        'success' 		    => ':success_count model dihapus!',
+        'success' 		    => 'Model dihapus!|:success_count model dihapus!',
         'success_partial' 	=> ':success_count model telah dihapus, tetapi :fail_count tidak dapat dihapus karena masih memiliki aset yang terkait dengannya.'
     ),
 
diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php
index 578aca206f..c902839d87 100644
--- a/resources/lang/id/admin/settings/general.php
+++ b/resources/lang/id/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Ini adalah server Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Kirim pemberitahuan kepada',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Aktifkan pemberitahuan',
@@ -32,7 +32,7 @@ return [
     '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_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 barcode',
@@ -77,6 +77,7 @@ return [
     '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'       => 'Kunci TLS Client-Side LDAP',
     'ldap_client_tls_cert'      => 'Sertifikat TLS Client-Side LDAP',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => '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',
@@ -197,16 +200,21 @@ 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',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Pengaturan Slack',
-    'slack_integration_help'    => 'Integrasi Slack adalah opsional, namun titik akhir dan saluran diperlukan jika Anda ingin menggunakannya. Untuk mengonfigurasi integrasi Slack, Anda harus terlebih dahulu <a href=":slack_link" target="_new" rel="noopener">membuat webhook masuk</a> di akun Slack Anda. Klik tombol <strong>Uji Integrasi Slack</strong> untuk mengonfirmasi bahwa setelan Anda sudah benar sebelum menyimpan. ',
-    'slack_integration_help_button'    => 'Setelah Anda menyimpan informasi Slack Anda, tombol tes akan muncul.',
-    'slack_test_help'           => 'Uji apakah integrasi Slack Anda dikonfigurasi dengan benar. ANDA HARUS MENYIMPAN SETELAN PENGATURAN KESELAMATAN ANDA PERTAMA.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> 'Versi Snipe-IT',
     'support_footer'            => 'Mendukung Footer Links ',
     'support_footer_help'       => 'Tentukan siapa yang melihat tautan ke info Dukungan Snipe-IT dan Panduan Pengguna',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/id/admin/settings/message.php b/resources/lang/id/admin/settings/message.php
index 632694e033..08a79fe26d 100644
--- a/resources/lang/id/admin/settings/message.php
+++ b/resources/lang/id/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/id/admin/statuslabels/message.php b/resources/lang/id/admin/statuslabels/message.php
index 26c0229a8f..72facaeb85 100644
--- a/resources/lang/id/admin/statuslabels/message.php
+++ b/resources/lang/id/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
 
     'help' => [
         'undeployable'   => 'Aset ini tidak dapat diberikan kepada siapapun.',
-        '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>.',
+        'deployable'   => 'Aset ini dapat dipakai. Setelah ditetapkan, simbol status akan berubah menjadi <i class="fas fa-circle text-blue"></i> <strong>Dipakai</strong>.',
         'archived'   => 'Aset ini tidak dapat diperiksa, dan hanya akan muncul di tampilan Arsip. Ini berguna untuk menyimpan informasi tentang aset untuk tujuan anggaran / sejarah namun menjauhkan mereka dari daftar aset sehari-hari.',
         'pending'   => 'Aset ini belum bisa diberikan kepada siapapun, sering digunakan untuk barang yang sedang diperbaiki, namun diperkirakan akan kembali beredar.',
     ],
diff --git a/resources/lang/id/admin/users/general.php b/resources/lang/id/admin/users/general.php
index f146ece75e..9ffbe16c6f 100644
--- a/resources/lang/id/admin/users/general.php
+++ b/resources/lang/id/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     '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',
     '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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' => 'Dihasilkan pada:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/id/admin/users/message.php b/resources/lang/id/admin/users/message.php
index 03423274ec..0bcc7f836a 100644
--- a/resources/lang/id/admin/users/message.php
+++ b/resources/lang/id/admin/users/message.php
@@ -6,7 +6,7 @@ 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 [:id] tidak terdaftar.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Kolom login wajib di-isi',
     'user_password_required'    => 'Kata sandi wajib di-isi.',
     'insufficient_permissions'  => 'Tidak ada hak akses.',
diff --git a/resources/lang/id/auth/general.php b/resources/lang/id/auth/general.php
index bc11c40d15..49c0e3c8e3 100644
--- a/resources/lang/id/auth/general.php
+++ b/resources/lang/id/auth/general.php
@@ -12,5 +12,8 @@ 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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php
index 3c47ac5a09..82434a46be 100644
--- a/resources/lang/id/general.php
+++ b/resources/lang/id/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Aksesoris',
     'activated'			    => 'Diaktifkan',
+    'accepted_date'         => 'Tanggal Diterima',
     'accessory'				=> 'Aksesori',
     'accessory_report'		=> 'Laporan aksesori',
     'action'                => 'Tindakan',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Tambahan hak',
-    'age'                   => "Age",
+    'age'                   => "Usia",
     'all_assets'			=> 'Semua aset',
     'all'       			=> 'Semua',
     'archived'              => 'Diarsipkan',
@@ -20,14 +21,20 @@ return [
     'asset'					=> 'Aset',
     'asset_report'          => 'Laporan aset',
     'asset_tag'				=> 'Tag Aset',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'Tag Aset',
+    'assets_available'		=> 'Aset yang tersedia',
+    'accept_assets'         => 'Terima aset :nama',
+    'accept_assets_menu'    => 'Terima Aset',
     'audit'				    => 'Audit',
     'audit_report'			=> 'Log Audit',
     'assets'				=> 'Aset',
-    'assigned_to'           => 'Assigned to :name',
+    'assets_audited'        => 'aset yang diaudit',
+    'assets_checked_in_count'     => 'aset yang diperiksa masuk',
+    'assets_checked_out_count'     => 'aset yang diperiksa keluar',
+    'asset_deleted_warning'     => 'Aset ini telah dihapus. Kamu harus memulihkannya sebelum dapat menugaskannya kepada seseorang.',
+    'assigned_date'         => 'Tanggal Ditugaskan',
+    'assigned_to'           => 'Ditugaskan kepada :nama',
+    'assignee'              => 'Ditugaskan kepada',
     'avatar_delete'         => 'Hapus avatar',
     'avatar_upload'         => 'Unggah avatar',
     'back'      			=> 'Kembali',
@@ -35,10 +42,12 @@ return [
     'bulkaudit'             => 'Audit Massal',
     'bulkaudit_status'      => 'Status Audit',
     'bulk_checkout'  		=> 'check-out masal',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_edit'             => 'Edit Massal',
+    'bulk_delete'           => 'Hapus Massal',
+    'bulk_actions'          => 'Aksi Massal',
+    'bulk_checkin_delete'   => 'Masuk / Hapus Banyak Pengguna',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Device ini dimiliki oleh pengguna',
     'bystatus'              => 'berdasarkan Status',
     'cancel'  				=> 'Batalkan',
     'categories'			=> 'Kategori',
@@ -66,14 +75,14 @@ return [
     'create'				=> 'Buat baru',
     'created'               => 'Item dibuat',
     'created_asset'			=> 'Buat aset',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Dibuat pada',
+    'created_by'            => 'Dibuat oleh',
     'record_created' 		=> 'Rekam Dibuat',
     'updated_at' 			=> 'Diperbarui pada',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Saat ini',
-    'current_password'      => 'Current Password',
-    'customize_report'      => 'Customize Report',
+    'current_password'      => 'Kata Sandi Saat Ini',
+    'customize_report'      => 'Sesuaikan Laporan',
     'custom_report'         => 'Laporan kustom aset',
     'dashboard'				=> 'Dashboard',
     'days'      			=> 'hari',
@@ -83,14 +92,15 @@ 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.',
     'deleted'  				=> 'Dihapus',
     'delete_seats'  		=> 'Lisensi di hapus',
-    'deletion_failed'       => 'Deletion failed',
+    'deletion_failed'       => 'Penghapusan gagal',
     'departments'           => 'Departemen',
     'department'            => 'Departemen',
     'deployed'				=> 'Dijalankan',
     'depreciation'			=> 'Penyusutan',
-    'depreciations'         => 'Depreciations',
+    'depreciations'         => 'Penyusutan',
     'depreciation_report'	=> 'Laporan penyusutan',
     'details'               => 'Rincian',
     'download'				=> 'Download',
@@ -99,12 +109,12 @@ return [
     'eol'					=> 'MHP',
     'email_domain'			=> 'Domain email',
     'email_format'			=> 'Format email',
-    'employee_number'       => 'Employee Number',
+    'employee_number'       => 'Nomor Karyawan',
     'email_domain_help'		=> 'Ini digunakan untuk untuk membuat email ketika melakukan proses import',
-    'error'				    => 'Error',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    '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)',
@@ -120,25 +130,26 @@ return [
     'files'                 => 'File',
     'file_name'				=> 'Berkas',
     'file_type'             => 'Tipe Berkas',
-    'filesize'              => 'File Size',
+    'filesize'              => 'Ukuran file',
     'file_uploads'			=> 'Unggah Berkas',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'Unggah Berkas',
     'generate'				=> 'Generate',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'Buat Label',
     'github_markdown'      => 'Kolom ini mengizinkan <a href="https://help.github.com/articles/github-flavored-markdown/">markup rasa Github</a>.',
     'groups'				=> 'Kelompok',
     'gravatar_email'        => 'Alamat Gravatar Email',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Ubah avatar Anda di Gravatar.com</small></a>.',
     'history'  			    => 'Riwayat',
     'history_for'  			=> 'Riwayat untuk',
     'id'  					=> 'ID',
     'image'                 => 'Gambar',
     'image_delete'         	=> 'Menghapus gambar',
-    'include_deleted'       => 'Include Deleted Assets',
+    'include_deleted'       => 'Sertakan Aset yang Dihapus',
     '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.',
+    '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'  => 'Jenis file yang diterima adalah jpg, webp, png, gif, dan svg. Ukuran unggahan 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',
     '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>.',
@@ -147,7 +158,9 @@ return [
     'asset_maintenance_report' => 'Laporan Pemeliharaan Aset',
     'asset_maintenances'       => 'Pemeliharaan Aset',
     'item'  				=> 'Item',
-    'item_name'             => 'Item Name',
+    'item_name'             => 'Nama Item',
+    'import_file'  			=> 'impor dari file CSV',
+    'import_type'  			=> 'Jenis impor file CSV',
     'insufficient_permissions' => 'Tidak ada hak akses!',
     'kits'       			=> 'Kit yang telah ditentukan sebelumnya',
     'language'				=> 'Bahasa',
@@ -159,7 +172,7 @@ return [
     'licenses_available'	=> 'lisensi yang tersedia',
     'licenses'				=> 'Lisensi',
     'list_all'				=> 'Tampilkan semua',
-    'loading'				=> 'Loading... please wait....',
+    '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',
@@ -168,17 +181,17 @@ return [
     'logout'				=> 'Keluar',
     'lookup_by_tag'     => 'Mencari berdasarkan tag aset',
     'maintenances'          => 'Pemeliharaan',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Mengelola Kunci API',
     'manufacturer'			=> 'Produsen',
     'manufacturers'			=> 'Produsen',
     'markdown'				=> 'Field ini mengizinkan <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'min_amt'				=> 'Jml Min.',
-    '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'          => 'Jumlah minimum barang yang harus tersedia sebelum peringatan terpicu. Biarkan Min. JUMLAH kosong jika Anda tidak ingin menerima peringatan untuk persediaan yang rendah.',
     'model_no'				=> 'No. Model',
     'months'				=> 'bulan',
     'moreinfo'				=> 'Lebih Lanjut',
     'name'					=> 'Nama',
-    'new_password'          => 'New Password',
+    'new_password'          => 'Kata Sandi Baru',
     'next'					=> 'Berikutnya',
     'next_audit_date'		=> 'Tanggal Audit berikutnya',
     'last_audit'		    => 'Audit terakhir',
@@ -188,7 +201,7 @@ return [
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
     'order_number'          => 'Jumlah order',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Hanya Aset yang Dihapus',
     'page_menu'				=> 'Menampilkan item _MENU_',
     'pagination_info'		=> 'Menampilkan hal_START_ to _END_ of _TOTAL_',
     'pending'				=> 'Ditunda',
@@ -201,25 +214,26 @@ return [
     'purchase_date'         => 'Tanggal Pembelian',
     'qty'		            => 'JML',
     'quantity'		        => 'Jumlah',
-    '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'      => 'Anda memiliki :count item di bawah atau hampir mencapai jumlah minimum yang diizinkan',
+    'quickscan_checkin'  	=> 'Pengecekan Masuk Cepat dengan Pemindaian Barcode',
+    'quickscan_checkin_status'  	=> 'Status Checkin',
     'ready_to_deploy'		=> 'Siap digunakan',
     'recent_activity'		=> 'Aktivitas Terakhir',
-    'remaining'             => 'Remaining',
+    'remaining'             => 'Sisa',
     'remove_company'        => 'Hapus Asosiasi Perusahaan',
     'reports'				=> 'Laporan',
     'restored'				=> 'kembalikan',
     'restore'				=> 'Pulihkan',
-    'requestable_models'    => 'Requestable Models',
+    'requestable_models'    => 'Model yang Dapat Diminta',
     'requested'				=> 'Diminta',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Tanggal Permintaan',
+    'requested_assets'      => 'Aset yang Diminta',
+    'requested_assets_menu' => 'Aset yang Diminta',
     'request_canceled'      => 'Permintaan Dibatalkan',
     'save'  				=> 'Simpan',
+    'select_var'            => 'Pilih :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Pilih',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Pilih Semua',
     'search'				=> 'Cari',
     'select_category'       => 'Memilih Kategori',
     'select_department'     => 'Pilih Departemen',
@@ -238,22 +252,21 @@ return [
     'show_current'  		=> 'Tampilkan Saat Ini',
     'sign_in'				=> 'Masuk',
     'signature'             => 'Tanda tangan',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Ditandatangani Oleh',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Hai! Sepertinya integrasi Slack Anda dengan Snipe-IT berfungsi!',
+    'webhook_msg_note'        => 'Pemberitahuan akan dikirim melalui webhook',
+    'webhook_test_msg'        => 'Oh hai! Sepertinya integrasi :app Anda dengan Snipe-IT berfungsi dengan baik!',
     'some_features_disabled' => 'DEMO: Beberapa fitur tidak aktif.',
     'site_name'				=> 'Nama Situs',
     'state'  				=> 'Provinsi',
     'status_labels'			=> 'Status label',
     'status'    			=> 'Status',
-    'accept_eula'           => 'Acceptance Agreement',
+    'accept_eula'           => 'Perjanjian Penerimaan',
     'supplier'              => 'Pemasok',
     'suppliers'  			=> 'Pemasok',
     'sure_to_delete'    => 'Yakin ingin menghapusnya',
     'submit'				=> 'Menyerahkan',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Tampilan Waktu dan Tanggal',
     'total_assets'			=> 'total aset',
     'total_licenses'		=> 'total lisensi',
@@ -263,7 +276,7 @@ return [
     'undeployable'			=> 'Belum siap digunakan',
     'unknown_admin'			=> 'Admin tidak diketahui',
     'username_format'		=> 'Format pengguna',
-    'username'              => 'Username',
+    'username'              => 'Nama Pengguna',
     'update'                => 'Memperbarui',
     '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',
@@ -274,16 +287,16 @@ return [
     'users'                 => 'Pengguna',
     'viewall'				=> 'Lihat Semua',
     'viewassets'  			=> 'Tampilkan aset',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => 'Lihat Aset untuk :name',
     'website'               => 'Situs Web',
     'welcome'				=> 'Selamat datang, :name',
     'years'					=> 'tahun',
     'yes' 					=> 'Ya',
     'zip'  					=> 'Kode Pos',
     'noimage'				=> 'Gambar tidak di temukan atau gambar tidak ter-unggah.',
-    '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 yang diminta tidak ada di server.',
+    'file_upload_success'   => 'Pengunggahan berkas berhasil!',
+    'no_files_uploaded'     => 'Pengunggahan berkas berhasil!',
     'token_expired'         => 'Sesi login Anda telah kadaluarsa. Silakan login lagi.',
     'login_enabled'         => 'Login Diaktifkan',
     'audit_due'             => 'Jatuh Tempo untuk Audit',
@@ -291,60 +304,60 @@ return [
     'accept'                => 'Terima :asset',
     'i_accept'              => 'Saya Setuju',
     'i_decline'             => 'Saya Tidak Setuju',
-    'accept_decline'        => 'Accept/Decline',
+    'accept_decline'        => 'Terima/Tolak',
     'sign_tos'              => 'Tanda tangani di bawah ini untuk menunjukkan bahwa Anda menyetujui persyaratan layanan:',
     'clear_signature'       => 'Hapus Tanda Tangan',
     'show_help'             => 'Tampilkan Bantuan',
     'hide_help'             => 'Sembunyikan Bantuan',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
+    'view_all'              => 'lihat semua',
+    'hide_deleted'          => 'Sembunyikan yang Dihapus',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Checked out to',
-    'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
-    'changed'               => 'Changed',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
-            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
-    'information'           => 'Information',
-    'permissions'           => 'Permissions',
-    'managed_ldap'          => '(Managed via LDAP)',
-    'export'                => 'Export',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
+    'do_not_change'         => 'Jangan Ubah',
+    '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_done'            => 'Selesai!',
+    'bulk_edit_about_to'    => 'Anda akan mengubah hal berikut ini: ',
+    'checked_out'           => 'Diberikan',
+    'checked_out_to'        => 'Diberikan kepada',
+    'fields'                => 'Kolom',
+    'last_checkout'         => 'Pemberian Terakhir',
+    'due_to_checkin'        => 'Item berikut :count akan segera diperiksa:',
+    'expected_checkin'      => 'Tanggal Pengembalian',
+    'reminder_checked_out_items' => 'Ini adalah pengingat barang yang saat ini diperiksa untuk Anda. Jika Anda merasa daftar ini tidak akurat (ada yang hilang, atau ada yang muncul di sini yang menurut Anda tidak pernah Anda terima), silakan kirim email :reply_to_name di :reply_to_address.',
+    'changed'               => 'Diubah',
+    'to'                    => 'Ke',
+    'report_fields_info'    => '<p>Pilih bidang yang ingin Anda sertakan dalam laporan khusus Anda, dan klik Buat. File (custom-asset-report-YYYY-mm-dd.csv) akan diunduh secara otomatis, dan Anda dapat membukanya di Excel.</p>
+             <p>Jika Anda hanya ingin mengekspor aset tertentu, gunakan opsi di bawah untuk menyempurnakan hasil Anda.</p>',
+    'range'                 => 'Rentang',
+    'bom_remark'            => 'Tambahkan BOM (byte-order mark) ke CSV ini',
+    'improvements'          => 'Penyempurnaan',
+    'information'           => 'Informasi',
+    'permissions'           => 'Hak akses',
+    'managed_ldap'          => '(Dikelola melalui LDAP)',
+    'export'                => 'Ekspor',
+    'ldap_sync'             => 'Sinkronisasi LDAP',
+    'ldap_user_sync'        => 'Sinkronisasi Pengguna LDAP',
+    'synchronize'           => 'Sinkronisasi',
+    'sync_results'          => 'Hasil Sinkronisasi',
     'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid category',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you 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',
+    'invalid_category'      => 'Kategori tidak valid',
+    '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!',
+    'new_asset'             => 'Aset Baru',
+    'new_license'           => 'Lisensi Baru',
+    'new_accessory'         => 'Aksesori Baru',
+    'new_consumable'        => 'Barang Habis Pakai Baru',
+    'collapse'              => 'Ciutkan',
+    'assigned'              => 'Diberikan',
+    'asset_count'           => 'Total Aset',
     'accessories_count'     => 'Accessories Count',
     'consumables_count'     => 'Consumables Count',
     'components_count'      => 'Components Count',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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'                  => 'Benar',
+    'false'                 => 'Salah',
+    'integration_option'    => 'Opsi integrasi',
+    'log_does_not_exist'    => 'Tidak ada catatan log yang cocok.',
+    'merge_users'           => 'Gabungkan Pengguna',
+    'merge_information' =>  'Ini akan menggabungkan :count pengguna menjadi satu pengguna. Pilih pengguna yang ingin Anda gabungkan dengan yang lain di bawah, dan aset terkait, lisensi, dll. akan dipindahkan ke pengguna yang dipilih dan pengguna lain 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',
+    'merge_success'         => ':count pengguna berhasil digabungkan menjadi :into_username!',
+    'merged'                => 'bergabung',
+    'merged_log_this_user_into' => 'Menggabungkan pengguna ini (ID :to_id - :to_username) menjadi ID pengguna :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'ID pengguna yang digabungkan :from_id (:from_username) ke pengguna ini (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Hapus & Simpan',
+    'update_existing_values'    => 'Perbarui Data yang Ada?',
+    '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?',
+    'back_before_importing'     => 'Cadangkan sebelum mengimpor?',
+    'csv_header_field'          => 'Kolom Tajuk CSV',
+    'import_field'              => 'Impor Kolom',
+    'sample_value'              => 'Data Contoh',
+    'no_headers'                => 'Tidak ada kolom ditemukan',
+    'error_in_import_file'      => 'Terjadi kesalahan saat membaca file CSV: :error',
+    'percent_complete'          => ':percent % Selesai',
+    'errors_importing'          => 'Beberapa Kesalahan terjadi saat mengimpor: ',
+    'warning'                   => 'PERINGATAN: :warning',
+    'success_redirecting'       => '"Berhasil... Mengalihkan.',
+    'setup_successful_migrations' => 'Tabel database Anda telah dibuat',
+    'setup_migration_output' => 'Keluaran migrasi:',
+    'setup_migration_create_user' => 'Selanjutnya: Buat Pengguna',
+    'importer_generic_error'    => 'Impor file Anda selesai, tetapi kami menerima kesalahan. Hal ini biasanya disebabkan oleh pelambatan API pihak ketiga dari webhook notifikasi (seperti Slack) dan tidak akan mengganggu impor itu sendiri, tetapi Anda harus mengonfirmasi hal ini.',
+    'confirm' => 'Konfirmasi',
+    'autoassign_licenses' => 'Penetapan Lisensi Secara Otomatis',
+    'autoassign_licenses_help' => 'Izinkan pengguna ini untuk menetapkan lisensi melalui alat cli atau UI penetapan lisensi massal.',
+    'autoassign_licenses_help_long' => 'Hal ini memungkinkan pengguna untuk ditetapkan lisensinya melalui alat cli atau UI lisensi penetapan massal. (Misalnya, Anda mungkin tidak ingin kontraktor diberi lisensi secara otomatis yang akan Anda berikan hanya kepada anggota staf. Anda masih dapat menetapkan lisensi secara individual kepada pengguna tersebut, tetapi mereka tidak akan disertakan dalam fungsi Lisensi Checkout untuk Semua Pengguna.)',
+    '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',
+    'undeployable_tooltip'      => 'Item ini tidak dapat diperiksa. Periksa kuantitas yang tersisa.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/id/help.php b/resources/lang/id/help.php
index 37a4dc2b49..17317574a9 100644
--- a/resources/lang/id/help.php
+++ b/resources/lang/id/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Lebih Lanjut',
 
-    'audit_help' => 'Mencentang kotak ini akan mengedit catatan aset untuk mencerminkan lokasi baru ini. Membiarkannya tidak dicentang hanya akan mencatat lokasi di log audit.<br><br>Perhatikan bahwa aset ini diperiksa, itu tidak akan mengubah lokasi orang, aset, atau lokasi yang diperiksa.',
+    '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' => 'Aset adalah barang yang dilacak dengan nomor seri atau tanda aset. Cenderung menjadi barang dengan nilai lebih tinggi dimana identifikasi barang secara spesifik berpengaruh.',
 
diff --git a/resources/lang/id/localizations.php b/resources/lang/id/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/id/localizations.php
+++ b/resources/lang/id/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/id/mail.php b/resources/lang/id/mail.php
index e8351975ab..412af2c3d0 100644
--- a/resources/lang/id/mail.php
+++ b/resources/lang/id/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login ke instalasi Snipe-IT baru Anda dengan menggunakan kredensial di bawah ini:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Laporan Inventaris Rendah',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Nama',
     'new_item_checked' => 'Item baru telah diperiksa berdasarkan nama Anda, rinciannya ada di bawah.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Kredensial Snipe-IT Anda',
     'Accessory_Checkin_Notification' => 'Aksesoris Kembali',
     'Asset_Checkin_Notification' => 'Aset Kembali',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Lisensi Kembali',
     'Expected_Checkin_Report' => 'Laporan check-in aset yang diharapkan',
     'Expected_Checkin_Notification' => 'Pengingat: :name mendekati batas waktu check-in [Dikembalikan]',
     'Expected_Checkin_Date' => 'Aset yang check out untuk Anda akan check in kembali pada :date',
     'your_assets' => 'Lihat Aset Anda',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php
index 4d316e69ec..5521ddee56 100644
--- a/resources/lang/id/validation.php
+++ b/resources/lang/id/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribut: setidaknya harus memiliki: item min.',
     ],
     'starts_with'          => ':attribute harus dimulai dengan salah satu dari berikut ini: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => ':attribute yang di pilih tidak benar.',
     'numeric'              => ':attribute harus dalam angka.',
     'present'              => 'Bidang atribut: harus ada.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Kata sandi Anda saat ini salah',
         'dumbpwd'          => 'Password itu terlalu umum',
         'statuslabel_type' => 'Anda harus memilih jenis label status yang valid',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/is/admin/accessories/general.php b/resources/lang/is/admin/accessories/general.php
index 779e74ebf8..21f857444c 100644
--- a/resources/lang/is/admin/accessories/general.php
+++ b/resources/lang/is/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Uppfæra endabúnað',
     'use_default_eula'					=> 'Notaðu frekar <a href="#" data-toggle="modal" data-target="#eulaModal">',
     'use_default_eula_disabled'			=> '<del>Notaðu frekar sjálfgefna notendaskilmálana.</del>Sjálfgefnu notendaskilmálarnir eru ekki í notkun. Vinsamlegast bættu einhverjum notendaskilmálum við í undir "Stillingar"',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/is/admin/accessories/message.php b/resources/lang/is/admin/accessories/message.php
index a1e033f55e..713a0b44b3 100644
--- a/resources/lang/is/admin/accessories/message.php
+++ b/resources/lang/is/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/is/admin/asset_maintenances/form.php b/resources/lang/is/admin/asset_maintenances/form.php
index 232017aead..b8d7dd7117 100644
--- a/resources/lang/is/admin/asset_maintenances/form.php
+++ b/resources/lang/is/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Viðhaldgerð',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titill',
-        'start_date'             => 'Hafið',
-        'completion_date'        => 'Lokið',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kostnaður',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Dagar',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Athugasemdir',
-        'update'                 => 'Uppfæra',
-        'create'                 => 'Búa til'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/is/admin/categories/message.php b/resources/lang/is/admin/categories/message.php
index 2a6b45b89f..b773cb6566 100644
--- a/resources/lang/is/admin/categories/message.php
+++ b/resources/lang/is/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Vöruflokkur var ekki uppfærður, vinsamlegast reyndu aftur',
-        'success' => 'Vöruflokkur var uppfærður.'
+        'success' => 'Vöruflokkur var uppfærður.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/is/admin/components/general.php b/resources/lang/is/admin/components/general.php
index acfb2b34dc..6c31e3177c 100644
--- a/resources/lang/is/admin/components/general.php
+++ b/resources/lang/is/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Remaining',
     'total' 			                 => 'Total',
     'update'                            => 'Uppfæra íhlut',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/is/admin/components/message.php b/resources/lang/is/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/is/admin/components/message.php
+++ b/resources/lang/is/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/is/admin/consumables/message.php b/resources/lang/is/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/is/admin/consumables/message.php
+++ b/resources/lang/is/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/is/admin/custom_fields/general.php b/resources/lang/is/admin/custom_fields/general.php
index 4cc79d678b..9413002d0f 100644
--- a/resources/lang/is/admin/custom_fields/general.php
+++ b/resources/lang/is/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Notað af Tegundum (Models)',
     'order'   		            => 'Röð',
     'create_fieldset'         => 'Nýtt Reitasett',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Útbúa nýtt Reitasett (Nafn)',
     'create_field'            => 'Nýr sérsniðinn reitur',
     'create_field_title' => 'Útbúa nýtt sérsniðinn reit',
@@ -44,6 +47,8 @@ return [
     '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' => 'Einstakt',
-    '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' => 'Leyfa útskráðum notanda að skoða þessi gildi á síðunni Skoða úthlutaðar eignir',
+    'display_in_user_view_table' => 'Sýnileg notenda',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/is/admin/groups/message.php b/resources/lang/is/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/is/admin/groups/message.php
+++ b/resources/lang/is/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/is/admin/hardware/form.php b/resources/lang/is/admin/hardware/form.php
index 15d7f38f82..61e0ca88b6 100644
--- a/resources/lang/is/admin/hardware/form.php
+++ b/resources/lang/is/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Vinnsla...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Viðbótarupplýsingar',
     'order_details'   => 'Innkaupaupplýsingar'
 ];
diff --git a/resources/lang/is/admin/hardware/general.php b/resources/lang/is/admin/hardware/general.php
index 1f017d87f8..af6d44a79e 100644
--- a/resources/lang/is/admin/hardware/general.php
+++ b/resources/lang/is/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Þessari eign hefur verið eytt',
     'edit'  					=> 'Breyta eign',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Lausar',
     'requested'				    => 'óskað eftir',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Á bið',
     'undeployable'  			=> 'Ónothæfar',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/is/admin/hardware/message.php b/resources/lang/is/admin/hardware/message.php
index 8850d17553..44809f93d0 100644
--- a/resources/lang/is/admin/hardware/message.php
+++ b/resources/lang/is/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/is/admin/hardware/table.php b/resources/lang/is/admin/hardware/table.php
index aadfee59a7..5e99674d83 100644
--- a/resources/lang/is/admin/hardware/table.php
+++ b/resources/lang/is/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Inn/Út',
     'checkout_date' => 'Ráðstöfunardagsetning',
     'checkoutto' 	=> 'Ráðstafað',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Núvirði',
     'diff' 			=> 'Mismunur',
     'dl_csv' 		=> 'Hlaða niður CSV',
diff --git a/resources/lang/is/admin/licenses/general.php b/resources/lang/is/admin/licenses/general.php
index 3b0ad387a3..ba440fff03 100644
--- a/resources/lang/is/admin/licenses/general.php
+++ b/resources/lang/is/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Um leyfi',
-    'about_licenses'                  => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
+    'about_licenses_title'      => 'Um leyfi',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Hugbúnaðarleyfi',
     'user'  					=> 'Notandi',
     'view'  					=> 'Skoða leyfi',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/is/admin/locations/message.php b/resources/lang/is/admin/locations/message.php
index d179b25762..bcdf2258ce 100644
--- a/resources/lang/is/admin/locations/message.php
+++ b/resources/lang/is/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users 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',
+    'assigned_assets' => 'Skráðar eignir',
+    'current_location' => 'Núverandi staðsetning',
 
 
     'create' => array(
diff --git a/resources/lang/is/admin/manufacturers/message.php b/resources/lang/is/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/is/admin/manufacturers/message.php
+++ b/resources/lang/is/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/is/admin/manufacturers/table.php b/resources/lang/is/admin/manufacturers/table.php
index b40b6ca4bf..a6341eef46 100644
--- a/resources/lang/is/admin/manufacturers/table.php
+++ b/resources/lang/is/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/is/admin/models/general.php b/resources/lang/is/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/is/admin/models/general.php
+++ b/resources/lang/is/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/is/admin/models/message.php b/resources/lang/is/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/is/admin/models/message.php
+++ b/resources/lang/is/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/is/admin/settings/general.php b/resources/lang/is/admin/settings/general.php
index ca0c77d377..13ba361f7a 100644
--- a/resources/lang/is/admin/settings/general.php
+++ b/resources/lang/is/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Þetta er Active Directory þjónn',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Email Alerts Enabled',
@@ -21,7 +21,7 @@ return [
     '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'            => 'Tími milli úttekta',
-    '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'       => 'Ef þú þarft reglulega að endurskoða eignir þínar, sláðu inn tímabilið í mánuðum sem þú notar. Ef þú uppfærir þetta gildi, verða allar "næstu endurskoðunardagsetningar" fyrir eignir með komandi endurskoðunardagsetningu uppfærðar.',
     'audit_warning_days'        => 'Audit Warning Threshold',
     'audit_warning_days_help'   => 'Með hversu margra daga fyrirvara eigum við að vara þig við því að komið sé að því að framkvæma úttektir á eignum?',
     'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -75,8 +75,9 @@ return [
     '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.',
+    'ldap_default_group'        => 'Sjálfgefinn heimildahópur',
+    'ldap_default_group_info'   => 'Veldu hóp til að úthluta nýlega samstilltum notendum. Mundu að notandi tekur á sig heimildir hópsins sem honum er úthlutað.',
+    '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP stillingar',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/is/admin/settings/message.php b/resources/lang/is/admin/settings/message.php
index de74432a5b..230b67815d 100644
--- a/resources/lang/is/admin/settings/message.php
+++ b/resources/lang/is/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Prófa LDAP auðkenningu...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Eitthvað fór úrskeiðis.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/is/admin/users/general.php b/resources/lang/is/admin/users/general.php
index b2ceadd98e..44ecfe8f02 100644
--- a/resources/lang/is/admin/users/general.php
+++ b/resources/lang/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.',
+    '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'         => 'Skoða notanda :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'Þú ert að fara skrá ALLA hluti inn frá :count user(s) hér að neðan. Nöfn kerfisstjórar eru uppljómuð með rauðu.',
     'update_user_assets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
@@ -41,4 +42,13 @@ 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_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/is/admin/users/message.php b/resources/lang/is/admin/users/message.php
index 6234764b85..c771289c55 100644
--- a/resources/lang/is/admin/users/message.php
+++ b/resources/lang/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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
@@ -15,7 +15,7 @@ return array(
     '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'         => 'Þessi notandi er ekki með skráð netfang á prófílnum sínum.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Þessi notandi er ekki með búnað skráðan á sig',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Þessi notandi er ekki með netfang skilgreint.',
+        'success' => 'Búið að tilkynna notenda um núverandi birgðastöðu.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/is/auth/general.php b/resources/lang/is/auth/general.php
index a4df7f1b90..aa00e8eecf 100644
--- a/resources/lang/is/auth/general.php
+++ b/resources/lang/is/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Muna eftir mér',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/is/general.php b/resources/lang/is/general.php
index 7ea2c68098..b85623db75 100644
--- a/resources/lang/is/general.php
+++ b/resources/lang/is/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Aukahlutir',
     'activated'			    => 'Virkjað',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Aukahlutur',
     'accessory_report'		=> 'Aukahlutaskýrsla',
     'action'                => 'Aðgerð',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Kerfisstjóri',
     'administrator'			=> 'Kerfisstjóri',
     'add_seats'             => 'Viðbætt leyfi',
-    'age'                   => "Age",
+    'age'                   => "Aldur",
     'all_assets'			=> 'Allar eignir',
     'all'       			=> 'Allt',
     'archived'              => 'Geymt',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Úttekt',
     'audit_report'			=> 'Úttektarsaga',
     'assets'				=> 'Eignir',
+    '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'           => 'Skráð á',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Delete Avatar',
     'avatar_upload'         => 'Upload Avatar',
     'back'      			=> 'Til baka',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Fjölda innskráing á hlutum frá notendum',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'eftir stöðu',
     'cancel'  				=> 'Hætta við',
     'categories'			=> 'Vöruflokkar',
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Eytt',
     'delete_seats'  		=> 'Eydd leyfi',
     'deletion_failed'       => 'Eyðing mistókst',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Flytja inn',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Viðhaldssaga eignar',
     'item'  				=> 'Item:',
     'item_name'             => 'Nafn hlutar',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Ónægar aðgangsheimildir!',
     'kits'       			=> 'Útbúnaðarlistar',
     'language'				=> 'Tungumál',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Beiðni endurkölluð',
     'save'  				=> 'Vista',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Veldu',
     'select_all'            => 'Veldu alla',
     'search'				=> 'Leita',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Undirskrift',
     'signed_off_by'         => 'Undirritað af',
     'skin'       			=> 'Útlit',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Nafn vefsins',
     'state'  				=> 'Ríki',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Ertu viss um að þú viljir eyða',
     'submit'				=> 'Staðfesta',
     'target'                => 'Merking',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Birta tíma og dagsetningu',
     'total_assets'			=> 'skráðar eignir',
     'total_licenses'		=> 'total licenses',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Já',
     'zip'  					=> 'Póstnúmer',
     '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!',
+    'file_does_not_exist'   => 'Umbeðin skrá er ekki til á þjóninum.',
+    'file_upload_success'   => 'Upphleðsla skráa tókst!',
+    'no_files_uploaded'     => 'Upphleðsla skráa tókst!',
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Innskráning virkjuð',
     'audit_due'             => 'Komið að úttekt',
@@ -375,7 +388,8 @@ 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 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 - Vantar kaupdagssetningu',
     'assets_by_status'      => 'Eignir(búnaður) eftir stöðu',
     'assets_by_status_type'      => 'Eignir(búnaður) eftir Tegund',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Upphafsdagsetning',
     'end_date'            => 'Lokadagsetning',
     'alt_uploaded_image_thumbnail' => 'Hlaða upp smámynd',
-    'placeholder_kit'       => 'Velja sett'
+    'placeholder_kit'       => 'Velja sett',
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/is/help.php b/resources/lang/is/help.php
index 4a7510911f..cfbbaee9b8 100644
--- a/resources/lang/is/help.php
+++ b/resources/lang/is/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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' => '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 á.',
 
diff --git a/resources/lang/is/localizations.php b/resources/lang/is/localizations.php
index 83e845c3ac..af772ea828 100644
--- a/resources/lang/is/localizations.php
+++ b/resources/lang/is/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'United Kingdom',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/is/mail.php b/resources/lang/is/mail.php
index edbc777cdb..16b5ef9259 100644
--- a/resources/lang/is/mail.php
+++ b/resources/lang/is/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Skýrsla um lága birgðastöðu',
+    'inventory_report' => 'Inventory Report',
     '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.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'Skoða þínar eignir',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/is/validation.php b/resources/lang/is/validation.php
index cd405f629a..277f0335ea 100644
--- a/resources/lang/is/validation.php
+++ b/resources/lang/is/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute verður að vera skrá.',
     'filled'               => 'The :attribute field must have a value.',
     'image'                => ':attribute verður að vera mynd.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => ':attribute verður að vera tala.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'Þetta lykilorð er of algengt.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/it/admin/accessories/general.php b/resources/lang/it/admin/accessories/general.php
index b992c48aa5..9d7cd21dc4 100644
--- a/resources/lang/it/admin/accessories/general.php
+++ b/resources/lang/it/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Aggiorna Accessorio',
     '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.',
+    'clone'                             => 'Clona Accessorio',
+    'delete_disabled'                   => 'Questo accessorio non può essere cancellato perché alcuni elementi sono ancora assegnati.',
 
 );
diff --git a/resources/lang/it/admin/accessories/message.php b/resources/lang/it/admin/accessories/message.php
index bc912dca1f..1d8dcd9721 100644
--- a/resources/lang/it/admin/accessories/message.php
+++ b/resources/lang/it/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'L\'accessorio non è stato estratto, si prega di riprovare',
         'success' 		=> 'Accessorio estratto con successo.',
+        'unavailable'   => 'Accessorio non disponibile per il check-out. Controlla la quantità disponibile',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
     ),
 
diff --git a/resources/lang/it/admin/asset_maintenances/form.php b/resources/lang/it/admin/asset_maintenances/form.php
index 42db094a07..c8e2ef9d7e 100644
--- a/resources/lang/it/admin/asset_maintenances/form.php
+++ b/resources/lang/it/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tipo Manutenzione Prodotto',
+        'asset_maintenance_type' => 'Tipo Di Manutenzione al Bene',
         'title'                  => 'Titolo',
         'start_date'             => 'Data Inizio',
         'completion_date'        => 'Data Completamento',
         'cost'                   => 'Costo',
         'is_warranty'            => 'Aumento Garanzia',
-        'asset_maintenance_time' => 'Tempo Manutenzione Prodotto (in giorni)',
+        'asset_maintenance_time' => 'Tempo manutenzione beni (giorni)',
         'notes'                  => 'Note',
-        'update'                 => 'Aggiorna Manutenzione Prodotto',
-        'create'                 => 'Crea Manutenzione Prodotto'
+        'update'                 => 'Aggiorna Manutenzione Bene',
+        'create'                 => 'Crea Manutenzione Bene'
     ];
diff --git a/resources/lang/it/admin/categories/message.php b/resources/lang/it/admin/categories/message.php
index b7328ef6e2..e999e3297a 100644
--- a/resources/lang/it/admin/categories/message.php
+++ b/resources/lang/it/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'La categoria non è stata aggiornata, si prega di riprovare',
-        'success' => 'Categoria aggiornata con successo.'
+        'success' => 'Categoria aggiornata con successo.',
+        'cannot_change_category_type'   => 'Non puoi cambiare il tipo di categoria una volta creata',
     ),
 
     'delete' => array(
diff --git a/resources/lang/it/admin/components/general.php b/resources/lang/it/admin/components/general.php
index 9d6b4ddd89..d484343515 100644
--- a/resources/lang/it/admin/components/general.php
+++ b/resources/lang/it/admin/components/general.php
@@ -12,4 +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'
 );
diff --git a/resources/lang/it/admin/components/message.php b/resources/lang/it/admin/components/message.php
index c7b42859e5..03b9fabd29 100644
--- a/resources/lang/it/admin/components/message.php
+++ b/resources/lang/it/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Il Componente non è stato controllato, si prega di riprovare',
         'success' 		=> 'Componente controllato con successo.',
-        'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
+        'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
+        'unavailable'      => 'Non ci sono abbastanza componenti: rimangono :remaining , servono :requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/it/admin/consumables/message.php b/resources/lang/it/admin/consumables/message.php
index 977dc0d151..4421da54a0 100644
--- a/resources/lang/it/admin/consumables/message.php
+++ b/resources/lang/it/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Il consumabile non è stato controllato, prova di nuovo',
         'success' 		=> 'Il consumabile è stato controllato con successo.',
-        'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
+        'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
+         'unavailable'      => 'Non ci sono abbastanza consumabili per questo check-out. Controlla la quantità rimasta. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/it/admin/custom_fields/general.php b/resources/lang/it/admin/custom_fields/general.php
index f02dc14e80..2968f1c35f 100644
--- a/resources/lang/it/admin/custom_fields/general.php
+++ b/resources/lang/it/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Usato dai Modelli',
     'order'   		            => 'Ordine',
     'create_fieldset'         => 'Nuovo Campo',
+    'update_fieldset'         => 'Aggiorna Fieldset',
+    'fieldset_does_not_exist'   => 'Il fieldset :id non esiste',
+    'fieldset_updated'         => 'Fieldset aggiornato',
     'create_fieldset_title' => 'Crea un nuovo campo',
     'create_field'            => 'Nuovo campo personalizzato',
     'create_field_title' => 'Crea un nuovo campo personalizzato',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'AVVERTIMENTO. Questo campo è nella tabella dei campi personalizzati come <code>:db_column</code> ma dovrebbe essere <code>:expected</code>.',
     'is_unique' => 'Questo valore deve essere univoco per tutti i beni',
     'unique' => 'Univoco',
-    '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' => 'Permetti all\'utente di visualizzare questi valori nella pagina Visualizza Beni Assegnati',
+    'display_in_user_view_table' => 'Visibile all\'utente',
+    'auto_add_to_fieldsets' => 'Aggiungi automaticamente a ogni nuovo campo',
+    'add_to_preexisting_fieldsets' => 'Aggiungi a tutti i campi esistenti',
 ];
diff --git a/resources/lang/it/admin/departments/message.php b/resources/lang/it/admin/departments/message.php
index deb1874182..81d1a84b45 100644
--- a/resources/lang/it/admin/departments/message.php
+++ b/resources/lang/it/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Il dipartimento non esiste.',
-    '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' => 'Esiste già un dipartimento con quel nome in questa sede aziendale. Oppure, 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/admin/groups/message.php b/resources/lang/it/admin/groups/message.php
index 290b4bc2db..ac598c1241 100644
--- a/resources/lang/it/admin/groups/message.php
+++ b/resources/lang/it/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Il gruppo esiste già!',
-    'group_not_found'     => 'Il Gruppo [:id] non esiste.',
+    'group_not_found'     => 'Il Gruppo :id non esiste.',
     'group_name_required' => 'E\' richiesto il Nome del campo',
 
     'success' => array(
diff --git a/resources/lang/it/admin/hardware/form.php b/resources/lang/it/admin/hardware/form.php
index 3ff294699f..c92f4a2f30 100644
--- a/resources/lang/it/admin/hardware/form.php
+++ b/resources/lang/it/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Aggiorna solo la posizione predefinita',
     '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.',
-    'processing_spinner' => 'Elaborazione...',
+    'processing_spinner' => 'Elaborazione... (Può volerci un po\' su file di grandi dimensioni)',
     'optional_infos'  => 'Informazioni Opzionali',
     'order_details'   => 'Informazioni relative all\'ordine'
 ];
diff --git a/resources/lang/it/admin/hardware/general.php b/resources/lang/it/admin/hardware/general.php
index ec517080cb..b1f12c4be7 100644
--- a/resources/lang/it/admin/hardware/general.php
+++ b/resources/lang/it/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Questo bene è stato eliminato.',
     'edit'  					=> 'Modifica Asset',
     'model_deleted'  			=> 'Questo modello di asset è stato eliminato. Devi ripristinare il modello prima di poter ripristinare il bene.',
+    'model_invalid'             => 'Il modello di questo bene non è valido.',
+    'model_invalid_fix'         => 'Il bene deve essere modificato per correggerlo prima di farne il check in o il check out.',
     'requestable'               => 'Disponibile',
     'requested'				    => 'richiesto',
     'not_requestable'           => 'Non Richiedibili',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Ripristina Asset',
     'pending'  					=> 'In attesa',
     'undeployable'  			=> 'Non Distribuilbile',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Messaggi di errore:',
     'success_messages' => 'Messaggi di successo:',
     'alert_details' => 'Leggere sotto per maggiori dettagli.',
-    'custom_export' => 'Esportazione Personalizzata'
+    'custom_export' => 'Esportazione Personalizzata',
+    'mfg_warranty_lookup' => ':manufacturer Cerca Stato Garanzia',
 ];
diff --git a/resources/lang/it/admin/hardware/message.php b/resources/lang/it/admin/hardware/message.php
index bf85f11e09..5a5ca4259d 100644
--- a/resources/lang/it/admin/hardware/message.php
+++ b/resources/lang/it/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Il bene non è stato ripristinato, riprova',
         'success' 		=> 'Bene ripristinato con successo.',
+        'bulk_success' 		=> 'Bene ripristinato con successo.',
+        'nothing_updated'   => 'Nessun bene selezionato, non è stato ripristinato nulla.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Il file è stato importato con successo',
         'file_delete_success'   => 'Il file è stato cancellato con successo',
         'file_delete_error'      => 'Impossibile eliminare il file',
+        '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',
     ],
 
 
diff --git a/resources/lang/it/admin/hardware/table.php b/resources/lang/it/admin/hardware/table.php
index 67b102ace2..02b3e4fb57 100644
--- a/resources/lang/it/admin/hardware/table.php
+++ b/resources/lang/it/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Dentro/Fuori',
     'checkout_date' => 'Data di estrazione',
     'checkoutto' 	=> 'Estratto',
+    'components_cost' => 'Costo Totale Componenti',
     'current_value' => 'Valore Attuale',
     'diff' 			=> 'Differenza',
     'dl_csv' 		=> 'Scarica CSV',
diff --git a/resources/lang/it/admin/licenses/general.php b/resources/lang/it/admin/licenses/general.php
index cb1ef8b0e3..581d250639 100644
--- a/resources/lang/it/admin/licenses/general.php
+++ b/resources/lang/it/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licenze Software',
     'user'  					=> 'Utente',
     'view'  					=> 'Mostra Licenza',
+    'delete_disabled'           => 'Questa licenza non può essere cancellata perché ci sono delle postazioni assegnate.',
+    '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',
+                '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',
+            ],
+
+            '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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/it/admin/locations/message.php b/resources/lang/it/admin/locations/message.php
index 0d90671b8d..7fa6a234ee 100644
--- a/resources/lang/it/admin/locations/message.php
+++ b/resources/lang/it/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Questa posizione è associata ad almeno un utente e non può essere cancellata. Si prega di aggiornare i vostri utenti di riferimento 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. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Beni Assegnati',
+    'current_location' => 'Posizione attuale',
 
 
     'create' => array(
diff --git a/resources/lang/it/admin/manufacturers/message.php b/resources/lang/it/admin/manufacturers/message.php
index 316e202e87..c75c157aad 100644
--- a/resources/lang/it/admin/manufacturers/message.php
+++ b/resources/lang/it/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Usa <code>{LOCALE}</code> e <code>{SERIAL}</code> nell\'URL come variabili per avere i valori riempiti automaticamente durante la visualizzazione dei beni.',
     'does_not_exist' => 'Il produttore non esiste.',
     'assoc_users'	 => 'Questo produttore è attualmente associato con almeno un modello e non può essere eliminato. Si prega di aggiornare i modelli di riferimento e riprovare. ',
 
diff --git a/resources/lang/it/admin/manufacturers/table.php b/resources/lang/it/admin/manufacturers/table.php
index 484469cdcd..3ec4745b8d 100644
--- a/resources/lang/it/admin/manufacturers/table.php
+++ b/resources/lang/it/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'E-mail di supporto',
     'support_phone'   		=> 'Telefono di sostegno',
     'support_url'   		=> 'URL di supporto',
+    'warranty_lookup_url'   => 'URL Stato Garanzia',
     'update'				=> 'Aggiorna Produttore',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/it/admin/models/general.php b/resources/lang/it/admin/models/general.php
index 1a756a96d8..7763bd1863 100644
--- a/resources/lang/it/admin/models/general.php
+++ b/resources/lang/it/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :asset_count assets.',
+    'bulk_delete_warn'          => 'Stai per cancellare un modello di bene.|Stai per cancellare :model_count modelli di bene.',
     'restore'                   => 'Ripristinare il modello',
     'requestable'               => 'Gli utenti possono richiedere questo modello',
 	'show_mac_address'			      => 'Mostra MAC Address dei beni in questo modello',
diff --git a/resources/lang/it/admin/models/message.php b/resources/lang/it/admin/models/message.php
index 45fd0b3f42..028660345a 100644
--- a/resources/lang/it/admin/models/message.php
+++ b/resources/lang/it/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Il modello non esiste.',
+    'no_association' => 'NESSUN MODELLO ASSOCIATO.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Il modello non è stato aggiornato, si prega di riprovare',
-        'success' => 'Modello aggiornato con successo.'
+        'success' => 'Modello aggiornato con successo.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nessun campo è stato modificato, quindi niente è stato aggiornato.',
-        'success' 		=> 'Modelli aggiornati.'
+        'success' 		=> 'Modello aggiornato. |:model_count modelli aggiornati con successo.',
+        'warn'          => 'Stai per aggiornare le proprietà di questo modello: |Stai per modificare le proprietà di questi :model_count modelli:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Non sono stati selezionati modelli, quindi non è stato eliminato nulla.',
-        'success' 		    => ':success_count modelli eliminati!',
+        'success' 		    => 'Modello cancellato!|:success_count modelli cancellati!',
         'success_partial' 	=> ':success_count modelli sono stati eliminati, tuttavia non è stato possibile eliminare :fail_count modelli perché dispongono ancora di risorse associate.'
     ),
 
diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php
index 4d7b6afe57..ebb28a9814 100644
--- a/resources/lang/it/admin/settings/general.php
+++ b/resources/lang/it/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Si tratta di un server Active Directory',
     'alerts'                	=> 'Avvisi',
-    'alert_title'               => 'Aggiorna Impostazioni Avviso',
+    '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',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Selezionando questa casella, l\'utente potrà sovrascrivere il tema dell\'interfaccia utente con uno diverso.',
     'asset_ids'					=> 'ID Bene',
     'audit_interval'            => 'Intervallo di controllo',
-    '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'       => '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?',
     'auto_increment_assets'		=> 'Genera tag beni ad incremento automatico',
@@ -75,8 +75,9 @@ return [
     'label_logo_size'           => 'I loghi quadrati hanno un aspetto migliore - verranno visualizzati in alto a destra di ogni etichetta dell\'asset. ',
     '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.',
+    '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.',
+    'no_default_group'          => 'Nessun Gruppo Predefinito',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'Chiave TLS client LDAP',
     'ldap_client_tls_cert'      => 'Certificato TLS Client LDAP',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Impostazioni LDAP',
     'ldap_client_tls_cert_help' => 'Il Certificato e la Chiave TLS Client per le connessioni LDAP sono di solito richieste solo nelle configurazioni di Google Workspace con "Secure LDAP".',
      'ldap_client_tls_key'       => 'Chiave TLS client LDAP',
+    'ldap_location'             => 'Posizione LDAP',
+'ldap_location_help'             => 'Il campo Posizione LDAP deve essere usato se <strong>una OU non viene utilizzata nella Base Bind DN</strong> Lascia vuoto se viene usata la ricerca OU.',
     'ldap_login_test_help'      => 'Immettere un nome utente e una password LDAP validi dal DN di base specificato in precedenza per verificare se il login LDAP è configurato correttamente. DEVI SALVARE LE IMPOSTAZIONI LDAP AGGIORNATE PRIMA.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Mostra le immagini nelle e-mail',
     'show_images_in_email_help'   => 'Deseleziona questa casella se l\'installazione di Snipe-IT si trova dietro una rete VPN o chiusa e gli utenti esterni alla rete non saranno in grado di caricare le immagini fornite da questa installazione nelle loro e-mail.',
     'site_name'                 => 'Nome sito',
+    'integrations'               => 'Integrazioni',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Aggiorna Impostazioni Slack',
-    'slack_help'                => 'Impostazioni Slack',
-    'slack_botname'             => 'Botname Slack',
-    'slack_channel'             => 'Canale Slack',
-    'slack_endpoint'            => 'Finale Slack',
-    'slack_integration'         => 'Impostazioni Slack',
-    'slack_integration_help'    => 'L\'integrazione di Slack è facoltativa, tuttavia l\'endpoint e il canale sono necessari se si desidera utilizzarla. Per configurare l\'integrazione di Slack devi prima <a href=":slack_link" target="_new" rel="noopener">creare un webhook in arrivo</a> sul tuo account Slack. Clicca sul pulsante <strong>Verifica integrazione Slack</strong> per effettuare un test e confermare che le impostazioni sono corrette, prima di salvare. ',
-    'slack_integration_help_button'    => 'Dopo aver salvato le informazioni Slack, apparirà un pulsante di test.',
-    'slack_test_help'           => 'Verifica se l\'integrazione Slack è configurata correttamente. PRIMA È NECESSARIO SALVARE LE IMPOSTAZIONI SLACK AGGIORNATE.',
+    'general_webhook'           => 'Webhook Generale',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test da Salvare',
+    'webhook_title'               => 'Aggiorna Impostazioni Webhook',
+    'webhook_help'                => 'Impostazioni integrazione',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Canale',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app Impostazioni',
+    'webhook_test'                 =>'Prova integrazione :app',
+    '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.',
     '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',
@@ -301,7 +309,7 @@ return [
     'localization_keywords' => 'localizzazione, valuta, locale, locali fuso orario, orario, internazionale, internazionalizzazione, lingua, lingue, traduzione',
     'localization_help' => 'Lingua, formato data',
     'notifications' => 'Notifiche',
-    'notifications_help' => 'Avvisi via email, impostazioni sui controlli',
+    'notifications_help' => 'Impostazioni Avvisi E Email Controlli',
     'asset_tags_help' => 'Incrementi e prefissi',
     'labels' => 'Etichette',
     'labels_title' => 'Aggiorna Impostazioni Etichette',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Successivo: Crea Utente',
     'ldap_settings_link' => 'Impostazioni LDAP',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integrazione',
+    '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.',
+    'google_login'      => 'Impostazioni Accesso Google Workspace',
+    'enable_google_login'  => 'Consenti agli utenti di accedere con Google Workspace',
+    'enable_google_login_help'  => 'Gli utenti non verranno creati automaticamente. Devono avere SIA un account qui CHE in Google Workspace e il loro nome utente qui deve corrispondere al loro indirizzo email di Google Workspace. ',
+
 ];
diff --git a/resources/lang/it/admin/settings/message.php b/resources/lang/it/admin/settings/message.php
index 53907bb5ba..71ecbb9ea2 100644
--- a/resources/lang/it/admin/settings/message.php
+++ b/resources/lang/it/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testo l\'Autenticazione LDAP...',
         'authentication_success' => 'Utente autenticato correttamente con LDAP!'
     ],
-    'slack' => [
-        'sending' => 'Invio messaggio di test su Slack...',
-        'success_pt1' => 'Successo! Controlla il ',
-        'success_pt2' => ' canale del messaggio di prova, e assicurati di fare clic su SALVA qui sotto per memorizzare le impostazioni.',
+    'webhook' => [
+        'sending' => 'Invio a :app un messaggio di prova...',
+        'success_pt1' => 'Successo! Controlla il canale ',
+        'success_pt2' => ' con il messaggio di prova, e assicurati di fare clic su SALVA qui sotto per memorizzare le impostazioni.',
         '500' => 'Errore del server 500.',
-        'error' => 'Qualcosa è andato storto.',
+        'error' => 'Qualcosa è andato storto. :app ha risposto con: :error_message',
+        'error_misc' => 'Qualcosa è andato storto. :( ',
     ]
 ];
diff --git a/resources/lang/it/admin/users/general.php b/resources/lang/it/admin/users/general.php
index 3a9d59c9db..c97a4eb4e0 100644
--- a/resources/lang/it/admin/users/general.php
+++ b/resources/lang/it/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     '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.',
+    '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',
@@ -33,12 +35,20 @@ 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' => 'ATTENZIONE:',
-    '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' => 'Stai per effettuare il Checkin di TUTTI gli elementi degli utenti :count 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',
     '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.',
     '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.',
+    'create_user' => 'Crea utente',
+    'create_user_page_explanation' => 'Queste sono le informazioni dell\'account che utilizzerai per accedere al sito per la prima volta.',
+    'email_credentials' => 'Credenziali email',
+    'email_credentials_text' => 'Invia le mie credenziali all\'indirizzo email qui sopra',
+    'next_save_user' => 'Successivo: Salva Utente',
+    'all_assigned_list_generation' => 'Generato il:',
+    'email_user_creds_on_create' => 'Mandare le credenziali all\'utente?',
 ];
diff --git a/resources/lang/it/admin/users/message.php b/resources/lang/it/admin/users/message.php
index 6859ed25f3..5883571e9f 100644
--- a/resources/lang/it/admin/users/message.php
+++ b/resources/lang/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 [:id] non esite.',
+    'user_not_found'            => 'L\'utente non esiste.',
     'user_login_required'       => 'È necessario il campo login',
     'user_password_required'    => 'È richiesta la password.',
     'insufficient_permissions'  => 'Permessi Insufficienti.',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => 'È stato inviato un link agli utenti selezionati che sono attivati e hanno un indirizzo email valido, per reimpostare la password.',
     'password_reset_sent'       => 'Un link per reimpostare la password è stato inviato a :email!',
     'user_has_no_email'         => 'Questo utente non ha un indirizzo email nel suo profilo.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Questo utente non ha nessun bene assegnato',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Questo utente non ha una email.',
+        'success' => 'L\'utente è stato informato del suo inventario corrente.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/it/auth/general.php b/resources/lang/it/auth/general.php
index d4d75d8750..41d8dc220f 100644
--- a/resources/lang/it/auth/general.php
+++ b/resources/lang/it/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Ricordami',
     'username_help_top'                 => 'Inserisci il tuo <strong>nome utente</strong> per ricevere via email il link per reimpostare la password.',
     'username_help_bottom'          => 'Il tuo nome utente e indirizzo email <em>possono</em> essere gli stessi, ma potrebbe non essere così a seconda della tua configurazione. Se non riesci a ricordare il tuo nome utente, contatta l\'amministratore. <br><br><strong>I nomi utente senza un indirizzo email associato non potranno ricevere via email il link di reimpostazione della password.</strong> ',
-    ];
+    'google_login'                  => 'O accedi con Google Workspace',
+    'google_login_failed'           => 'Accesso con Google non riuscito, riprova.',
+
+];
 
diff --git a/resources/lang/it/button.php b/resources/lang/it/button.php
index b741e87562..59c755e916 100644
--- a/resources/lang/it/button.php
+++ b/resources/lang/it/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Azioni',
     'add'    	                => 'Aggiungi Nuovo',
     'cancel'                    => 'Annulla',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Checkin di tutto / Elimina utente',
     'delete'  	                => 'Cancella',
     'edit'    	                => 'Modifica',
     'restore' 	                => 'Ripristina',
diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php
index a0cb3ac4ca..d5fc154ca6 100644
--- a/resources/lang/it/general.php
+++ b/resources/lang/it/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessori',
     'activated'			    => 'Attivato',
+    'accepted_date'         => 'Accettato Il',
     'accessory'				=> 'Accessorio',
     'accessory_report'		=> 'Rapporto sugli Accessori',
     'action'                => 'Azione',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Amministratore',
     'administrator'			=> 'Amministratore',
     'add_seats'             => 'Aggiunti posti',
-    'age'                   => "Age",
+    'age'                   => "Età",
     'all_assets'			=> 'tutti i beni',
     'all'       			=> 'Tutti i',
     'archived'              => 'Archiviato',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'revisione',
     'audit_report'			=> 'Registro di controllo',
     'assets'				=> 'Beni',
+    'assets_audited'        => 'beni controllati',
+    'assets_checked_in_count'     => 'beni con check in',
+    'assets_checked_out_count'     => 'beni con check out',
+    'asset_deleted_warning'     => 'Questo bene è stato eliminato. Devi ripristinarlo prima di poterlo assegnare a qualcuno.',
+    'assigned_date'         => 'Assegnato Il',
     'assigned_to'           => 'Assegnato a :name',
+    'assignee'              => 'Assegnato a',
     'avatar_delete'         => 'Cancella Avatar',
     'avatar_upload'         => 'Carica Avatar',
     'back'      			=> 'Indietro',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Modifica in blocco',
     'bulk_delete'           => 'Elimina quantità',
     'bulk_actions'          => 'Gruppo di azioni',
-    'bulk_checkin_delete'   => 'Check-in massivo di oggetti dagli Utenti',
+    'bulk_checkin_delete'   => 'Registra / Cancella Utenti',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Questo dispositivo è di proprietà dell\'utente',
     'bystatus'              => 'in base allo stato',
     'cancel'  				=> 'annulla',
     'categories'			=> 'Categorie',
@@ -83,6 +92,7 @@ return [
     'debug_warning_text'    => 'Questa applicazione è in esecuzione in modalità di produzione con il debug abilitato. Questo può esporre dati sensibili se l\'applicazione è accessibile al mondo esterno. Disabilitare la modalità di debug impostando il valore <code>APP_DEBUG</code> nel file <code>.env</code> a <code>false</code>.',
     'delete'  				=> 'elimina',
     'delete_confirm'  		=> 'Sei sicuro di voler eliminare :item?',
+    'delete_confirm_no_undo' => 'Sei sicuro di voler cancellare :item? Questa azione non può essere annullata.',
     'deleted'  				=> 'Eliminata',
     'delete_seats'  		=> 'Posti Cancellati',
     'deletion_failed'       => 'Eliminazione fallita',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => 'Tipo di file accettato: :types. Dimensione massima di caricamento per un file: :size.|Tipi di file accettati: :types. Dimensione massima di caricamento per un file: :size.',
     'filetypes_size_help'   => 'Dimensione massima di caricamento per un file: :size.',
     'image_filetypes_help'  => 'I tipi di file accettati sono jpg, webp, png, gif e svg. La dimensione massima consentita per il caricamento è :size.',
+    'unaccepted_image_type'  => 'Questo file non è leggibile. I tipi di file accettati sono jpg, webp, png, gif e svg. Il tipo di questo file è :mimetype.',
     'import'         	    => 'Importa',
     'importing'         	=> 'Importare',
     'importing_help'        => 'È possibile importare risorse, accessori, licenze, componenti, materiali di consumo e utenti utilizzando file CSV. <br><br>Il CSV dovrebbe essere delimitato e formattato con elementi che corrispondano a quelle della seguente documentazione <a href="https://snipe-it.readme.io/docs/importing" target="_new"> esempio CSV </a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Manutenzione Prodotto',
     'item'  				=> 'Articolo',
     'item_name'             => 'Nome elemento',
+    'import_file'  			=> 'importa file CSV',
+    'import_type'  			=> 'tipo importazione CSV',
     'insufficient_permissions' => 'Permessi Insufficienti!',
     'kits'       			=> 'Kit Predefiniti',
     'language'				=> 'Lingua',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Risorse richieste',
     'request_canceled'      => 'Richiesta annullata',
     'save'  				=> 'Salva',
+    'select_var'            => 'Seleziona :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Seleziona',
     'select_all'            => 'Seleziona tutto',
     'search'				=> 'Cerca',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmato Da',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'Verrà inviato un messaggio slack',
-    'slack_test_msg'        => 'Oh hai! Sembra che la tua integrazione Slack con Snipe-IT funziona!',
+    'webhook_msg_note'        => 'Una notifica verrà inviata tramite webhook',
+    'webhook_test_msg'        => 'Ciao! Sembra che l\'integrazione di :app su Snipe-IT funzioni!',
     'some_features_disabled' => 'DEMO: Alcune caratteristiche sono disabilitate in questa modalità.',
     'site_name'				=> 'Nome sito',
     'state'  				=> 'Stato',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Sei sicuro di voler eliminare',
     'submit'				=> 'Invia',
     'target'                => 'Assegnatario',
-    'toggle_navigation'     => 'Attiva/disattiva barra di navigazione',
     'time_and_date_display' => 'Visualizzazione del tempo e del tempo',
     'total_assets'			=> 'Assets totali',
     'total_licenses'		=> 'Totale licenze',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'SÌ',
     'zip'  					=> 'Zip',
     'noimage'				=> 'Nessuna immagine caricata o immagine non trovata.',
-    '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'   => 'Il file richiesto non esiste sul server.',
+    'file_upload_success'   => 'Caricamento file riuscito!',
+    'no_files_uploaded'     => 'Caricamento file riuscito!',
     'token_expired'         => 'La sessione di modulo è scaduta. Riprova.',
     'login_enabled'         => 'Login Abilitato',
     'audit_due'             => 'In scadenza per l\'audit',
@@ -375,7 +388,8 @@ 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 ed è stato effettuato il check-in degli oggetti loro assegnati.',
     'bulk_checkin_success' => 'Il check-in degli oggetti per gli utenti selezionati è stato completato.',
-    'set_to_null' => 'Elimina i valori per questo asset|Elimina i valori per :asset_count asset ',
+    'set_to_null'           => 'Elimina i valori per questo asset|Elimina i valori per :asset_count asset ',
+    '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/A - Nessuna data di acquisto',
     'assets_by_status'      => 'Asset per Stato',
     'assets_by_status_type'      => 'Asset per Tipo di Stato',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Data Inizio',
     'end_date'            => 'Data Fine',
     'alt_uploaded_image_thumbnail' => 'Miniatura caricata',
-    'placeholder_kit'       => 'Seleziona un kit'
+    'placeholder_kit'       => 'Seleziona un kit',
+    'file_not_found'        => 'File non trovato',
+    'preview_not_available' => '(nessuna anteprima)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Prova',
+    'skip_to_main_content'  => 'Vai al contenuto',
+    'toggle_navigation'     => 'Modalità di navigazione',
+    'alerts'                => 'Avvisi',
+    'tasks_view_all'        => 'Mostra tutti i task',
+    'true'                  => 'Vero',
+    'false'                 => 'Falso',
+    'integration_option'    => 'Opzioni d\'integrazione',
+    'log_does_not_exist'    => 'Nessuna corrispondenza nel log.',
+    'merge_users'           => 'Unisci Utenti',
+    'merge_information' =>  ':count utenti verranno uniti in un singolo utente. Seleziona l\'utente destinazione dell\'unione, e tutti i beni, licenze, etc verranno spostato all\'utente selezionato, mentre gli altri utenti saranno contrassegnati come eliminati.',
+    'warning_merge_information' => 'Questa azione NON PUÒ essere annullata e dovrebbe essere usata SOLO quando è necessario unire utenti a causa di una errata importazione o sincronizzazione. Esegui prima un backup.',
+    'no_users_selected'     => 'Nessun utente selezionato',
+    'not_enough_users_selected'     => 'Devi selezionare almeno :count utenti',
+    'merge_success'         => ':count utenti uniti con successo in :into_username!',
+    'merged'                => 'uniti',
+    'merged_log_this_user_into' => 'Utente (ID :to_id - :to_username) unito in :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'ID Utente :from_id (:from_username) unito in (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Pulisci & Salva',
+    'update_existing_values'    => 'Aggiornare i Valori Esistenti?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'La generazione incrementale dei tag dei beni è disattivata: Tutte le righe devono avere una voce in "Tag Bene".',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: la generazione automatica dei tag per gli assets è attiva, quindi il tag verrà creato per ogni asset che non avesse il campo tag popolato. Gli elementi già provvisti di Tag saranno aggiornati con le informazioni fornite.',
+    'send_welcome_email_to_users'   => ' Inviare Mail di Benvenuto ai nuovi utenti?',
+    'back_before_importing'     => 'Backup prima di importare?',
+    'csv_header_field'          => 'Campo Intestazione Csv',
+    'import_field'              => 'Importa Campo',
+    'sample_value'              => 'Valore di Esempio',
+    'no_headers'                => 'Nessuna Colonne Trovata',
+    'error_in_import_file'      => 'Errore durante la lettura del file CSV: :error',
+    'percent_complete'          => ':percent % Completato',
+    'errors_importing'          => 'Errori durante l\'importazione: ',
+    'warning'                   => 'ATTENZIONE: :warning',
+    'success_redirecting'       => '"Successo... Reindirizzamento.',
+    'setup_successful_migrations' => 'Le tabelle del database sono state create',
+    'setup_migration_output' => 'Output migrazione:',
+    'setup_migration_create_user' => 'Successivo: Crea Utente',
+    'importer_generic_error'    => 'Importazione completata, ma nel mentre è stato ricevuto un errore. Questo di solito è causato da API di terze parti in throttling, come quelle delle notifiche in webhook (come Slack), che non dovrebbero interferire con l\'importazione, ma è meglio controllare.',
+    'confirm' => 'Conferma',
+    'autoassign_licenses' => 'Auto-Assegna Licenze',
+    'autoassign_licenses_help' => 'Permetti a questo utente di avere licenze assegnate tramite la GUI per l\'assegnazione massiva delle licenze o con gli strumenti cli.',
+    'autoassign_licenses_help_long' => 'Ciò permette a un utente di farsi assegnare licenze tramite la GUI di assegnazione massiva di licenze o con gli strumenti cli. (Per esempio, potresti non volere che degli appaltatori ricevano automaticamente una licenza che forniresti solo al personale. Puoi ancora assegnare individualmente le licenze a questi utenti, ma non verranno inclusi nella funziona "Assegna a tutti gli utenti".)',
+    'no_autoassign_licenses_help' => 'Non includere l\'utente nelle assegnazioni massive tramite la GUI o gli strumenti cli.',
+    'modal_confirm_generic'      => 'Si è sicuri?',
+    'cannot_be_deleted'      => 'Questo elemento non può essere eliminato',
+    'undeployable_tooltip'      => 'Non puoi fare il check out di questo oggetto. Controlla la quantità rimanente.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/it/help.php b/resources/lang/it/help.php
index ba8d357293..38f1b9f909 100644
--- a/resources/lang/it/help.php
+++ b/resources/lang/it/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Ulteriori Informazioni',
 
-    'audit_help' => 'Selezionando questa casella verrà modificato l\'asset per riflettere la nuova località, altrimenti verrà semplicemente menzionato nel registro di audit.<br><br>Se l\'asset è già assegnato, non cambierà la località dell\'utente, dell\'asset o la località a cui è assegnato.',
+    'audit_help' => 'Selezionando questa casella verranno modificati le posizioni dei beni. Non selezionandola, il luogo verrà semplicemente annotato nel log di controllo.<br><br>Nota che se questo bene è assegnato, non modificherà la posizione della persona, bene o posizione a cui è assegnato.',
 
     'assets' => 'Assets sono elementi tracciati con il numero di serie o il tag. Tendono ad essere elementi di valore più elevato, ove è importante identificare un elemento specifico.',
 
diff --git a/resources/lang/it/localizations.php b/resources/lang/it/localizations.php
index bef2c52931..47a2612ca6 100644
--- a/resources/lang/it/localizations.php
+++ b/resources/lang/it/localizations.php
@@ -92,38 +92,38 @@ return [
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Sultanato del Brunei',
         'BO'=>'Bolivia',
         'BR'=>'Brasile',
         'BS'=>'Bahamas',
         'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BV'=>'Isola di Bouvet',
         'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BY'=>'Bielorussia',
         'BZ'=>'Belize',
         'CA'=>'Canada',
-        'CC'=>'Cocos (Keeling) Islands',
-        'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
-        'CG'=>'Congo (Republic)',
+        'CC'=>'Isole Cocos (Keeling)',
+        'CD'=>'Congo (Repubblica Democratica)',
+        'CF'=>'Repubblica Centrafricana',
+        'CG'=>'Congo (Repubblica)',
         'CH'=>'Svizzera',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
-        'CL'=>'Chile',
+        'CI'=>'Costa d’Avorio',
+        'CK'=>'Isole Cook',
+        'CL'=>'Cile',
         'CM'=>'Camerun',
         'CN'=>'Repubblica popolare cinese',
         'CO'=>'Colombia',
         'CR'=>'Costa Rica',
         'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
+        'CV'=>'Capo Verde',
+        'CX'=>'Isola Di Natale',
+        'CY'=>'Cipro',
+        'CZ'=>'Repubblica Ceca',
         'DE'=>'Germania',
-        'DJ'=>'Djibouti',
+        'DJ'=>'Gibuti',
         'DK'=>'Danimarca',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
+        'DO'=>'Repubblica Dominicana',
         'DZ'=>'Algeria',
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
@@ -134,177 +134,178 @@ return [
         'EU'=>'Unione Europea',
         'FI'=>'Finlandia',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
+        'FK'=>'Isole Falkland (Malvina)',
+        'FM'=>'Stati Federati della Micronesia',
+        'FO'=>'Isole Færøer',
         'FR'=>'Francia',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
         'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GF'=>'Guyana Francese',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
-        'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GI'=>'Gibilterra',
+        'GL'=>'Groenlandia',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GP'=>'Guadaupe',
+        'GQ'=>'Guinea Equatoriale',
+        'GR'=>'Grecia',
+        'GS'=>'Georgia Del Sud E Isole Sandwich Del Sud',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Isole Heard E Mc Donald',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Croazia (nome locale: Hrvatska)',
         'HT'=>'Haiti',
-        'HU'=>'Hungary',
+        'HU'=>'Ungheria',
         'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'IE'=>'Irlanda',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'IM'=>'Isola di Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
+        'IO'=>'Territorio Britannico Dell\'Oceano Indiano',
         'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
+        'IR'=>'Iran',
+        'IS'=>'Islanda',
         'IT'=>'Italia',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
+        'JO'=>'Giordania',
+        'JP'=>'Giappone',
+        'KE'=>'Kenia',
         'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KH'=>'Cambogia',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Comore',
+        'KN'=>'Saint Kitts E Nevis',
+        'KR'=>'Corea, Repubblica Di',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
+        'KY'=>'Isole Cayman',
+        'KZ'=>'Kazakistan',
+        'LA'=>'Repubblica Democratica Popolare Del Laos',
+        'LB'=>'Libano',
+        'LC'=>'Santa Lucia',
         'LI'=>'Liechtenstein',
         'LK'=>'Sri Lanka',
         'LR'=>'Liberia',
-        'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
+        'LS'=>'Lesoto',
+        'LT'=>'Lituania',
+        'LU'=>'Lussemburgo',
+        'LV'=>'Lettonia',
         'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
+        'MA'=>'Marocco',
         'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
+        'MD'=>'Moldavia, Repubblica di',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'MH'=>'Isole Marshall',
+        'MK'=>'Macedonia, Repubblica Ex Jugoslava di',
         'ML'=>'Mali',
-        'MM'=>'Myanmar',
+        'MM'=>'Myanmar/Birmania',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
+        'MO'=>'Macao',
+        'MP'=>'Isole Marianne Settentrionali',
+        'MQ'=>'Martinica',
         'MR'=>'Mauritania',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
         'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MV'=>'Maldive',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
+        'MX'=>'Messico',
         'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
+        'MZ'=>'Mozambico',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'NC'=>'Nuova Caledonia',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NF'=>'Isola Norfolk',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Paesi Bassi',
+        'NO'=>'Norvegia',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Nuova Zelanda',
         'OM'=>'Oman',
         'PA'=>'Panama',
         'PE'=>'Peru',
-        'PF'=>'French Polynesia',
+        'PF'=>'Polinesia Francese',
         'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PH'=>'Filippine, Repubblica del',
         'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
+        'PL'=>'Polonia',
+        'PM'=>'St. Pierre E Miquelon',
         'PN'=>'Pitcairn',
         'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
-        'PT'=>'Portugal',
+        'PS'=>'Palestina',
+        'PT'=>'Portogallo',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
         'QA'=>'Qatar',
-        'RE'=>'Reunion',
+        'RE'=>'Riunione',
         'RO'=>'Romania',
         'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
+        'RU'=>'Federazione Russa',
         'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'SA'=>'Arabia Saudita',
+        'UK'=>'Scozia',
+        'SB'=>'Isole Salomone',
         'SC'=>'Seychelles',
+        'SS'=>'Sudan Sud',
         'SD'=>'Sudan',
-        'SE'=>'Sweden',
+        'SE'=>'Regno di Svezia',
         'SG'=>'Singapore',
         'SH'=>'St. Helena',
         'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SJ'=>'Isole Svalbard e Jan Mayen',
+        'SK'=>'Slovacchia (Repubblica Slovacca)',
         'SL'=>'Sierra Leone',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'São Tomé e Príncipe',
+        'SU'=>'Unione Sovietica',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'Repubblica Araba Siriana',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
+        'TC'=>'Isole Turks e Caicos',
         'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TF'=>'Territori australi francesi',
         'TG'=>'Togo',
         'TH'=>'Thailand',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Timor Est',
         'TM'=>'Turkmenistan',
         'TN'=>'Tunisia',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
+        'TP'=>'Timor orientale (vecchio codice)',
         'TR'=>'Turchia',
-        'TT'=>'Trinidad And Tobago',
+        'TT'=>'Trinidad E Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
+        'TZ'=>'Tanzania, Repubblica Unita di',
         'UA'=>'Ucraina',
         'UG'=>'Uganda',
         'UK'=>'Regno Unito',
         'US'=>'Stati Uniti',
-        'UM'=>'United States Minor Outlying Islands',
+        'UM'=>'Isole Minori Esterne Degli Stati Uniti',
         'UY'=>'Uruguay',
         'UZ'=>'Uzbekistan',
         'VA'=>'Città Del Vaticano (Santa Sede)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'VC'=>'Saint Vincent e Grenadines',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Isole Vergini (British)',
+        'VI'=>'Isole Vergini (British.)',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Isole di Wallis e Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
         'YT'=>'Mayotte',
diff --git a/resources/lang/it/mail.php b/resources/lang/it/mail.php
index ff96097e0d..ad883e281c 100644
--- a/resources/lang/it/mail.php
+++ b/resources/lang/it/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Accedi alla nuova installazione di Snipe-IT utilizzando le seguenti credenziali:',
     'login' => 'Accesso:',
     'Low_Inventory_Report' => 'Rapporto di inventario basso',
+    'inventory_report' => 'Rapporto Inventario',
     'min_QTY' => 'Min QTY',
     'name' => 'Nome',
     'new_item_checked' => 'Un nuovo elemento è stato controllato sotto il tuo nome, i dettagli sono sotto.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Le tue credenziali Snipe-IT',
     'Accessory_Checkin_Notification' => 'Checkin accessorio avvenuto',
     'Asset_Checkin_Notification' => 'Checkin asset avvenuto',
+    'Asset_Checkout_Notification' => 'Check-out del bene avvenuto',
     'License_Checkin_Notification' => 'Checkin licenza avvenuto',
     'Expected_Checkin_Report' => 'Rapporto restituzione attesa del bene',
     'Expected_Checkin_Notification' => 'Promemoria: scadenza riconsegna :name in avvicinamento',
     'Expected_Checkin_Date' => 'Un asset assegnato a te deve essere ricontrollato il :date',
     'your_assets' => 'Visualizza i tuoi assets',
+    'rights_reserved' => 'Tutti i diritti riservati.',
 ];
diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php
index 36086a1766..96140887da 100644
--- a/resources/lang/it/validation.php
+++ b/resources/lang/it/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'L\'attributo: deve essere un file.',
     'filled'               => 'Il campo: attributo deve avere un valore.',
     'image'                => 'il :attribute deve essere un immagine.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    'import_field_empty'    => 'Il valore per :fieldname non può essere vuoto.',
     'in'                   => 'Il selezionato :attribute è invalido.',
     'in_array'             => 'Il campo attributo non esiste in: altro.',
     'integer'              => 'L\' :attribute deve essere un numero intero.',
     'ip'                   => 'L\' :attribute deve essere un indirizzo IP valido.',
     'ipv4'                 => 'L\'attributo: deve essere un indirizzo IPv4 valido.',
     'ipv6'                 => 'L\'attributo: deve essere un indirizzo IPv6 valido.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => 'Questo :attribute deve essere univoco per questa posizione',
     'json'                 => 'L\'attributo: deve essere una stringa JSON valida.',
     'max'                  => [
         'numeric' => 'L\' :attribute non può essere superiore di :max.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'L\'attributo deve avere almeno: elementi min.',
     ],
     'starts_with'          => 'Attributo :attribute deve iniziare con uno dei seguenti: :values.',
+    'ends_with'            => 'Attributo :attribute deve finire con uno dei seguenti: :values.',
+
     'not_in'               => 'L\' :attribute selezionato è invalido.',
     'numeric'              => 'L\' :attribute deve essere un numero.',
     'present'              => 'Il campo attributo deve essere presente.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'La tua password corrente non è corretta',
         'dumbpwd'          => 'Quella password è troppo comune.',
         'statuslabel_type' => 'È necessario selezionare un tipo di etichetta di stato valido',
+
+        // 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'     => 'La :attribute deve essere in formato AAAA-MM-GG',
+        'last_audit_date.date_format'   =>  'La :attribute deve essere in formato AAAA-MM-GG hh:mm:ss',
+        'expiration_date.date_format'   =>  'La :attribute deve essere in formato AAAA-MM-GG',
+        'termination_date.date_format'  =>  'La :attribute deve essere in formato AAAA-MM-GG',
+        'expected_checkin.date_format'  =>  'La :attribute deve essere in formato AAAA-MM-GG',
+        'start_date.date_format'        =>  'La :attribute deve essere in formato AAAA-MM-GG',
+        'end_date.date_format'          =>  'La :attribute deve essere in formato AAAA-MM-GG',
+
     ],
 
     /*
diff --git a/resources/lang/iu/admin/accessories/general.php b/resources/lang/iu/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/iu/admin/accessories/general.php
+++ b/resources/lang/iu/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/iu/admin/accessories/message.php b/resources/lang/iu/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/iu/admin/accessories/message.php
+++ b/resources/lang/iu/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/iu/admin/asset_maintenances/form.php b/resources/lang/iu/admin/asset_maintenances/form.php
index 2aa005c45f..785d06b08f 100644
--- a/resources/lang/iu/admin/asset_maintenances/form.php
+++ b/resources/lang/iu/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'Completed',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/iu/admin/categories/message.php b/resources/lang/iu/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/iu/admin/categories/message.php
+++ b/resources/lang/iu/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/iu/admin/components/general.php b/resources/lang/iu/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/iu/admin/components/general.php
+++ b/resources/lang/iu/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/iu/admin/components/message.php b/resources/lang/iu/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/iu/admin/components/message.php
+++ b/resources/lang/iu/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/iu/admin/consumables/message.php b/resources/lang/iu/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/iu/admin/consumables/message.php
+++ b/resources/lang/iu/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/iu/admin/custom_fields/general.php b/resources/lang/iu/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/iu/admin/custom_fields/general.php
+++ b/resources/lang/iu/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/iu/admin/groups/message.php b/resources/lang/iu/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/iu/admin/groups/message.php
+++ b/resources/lang/iu/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/iu/admin/hardware/form.php b/resources/lang/iu/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/iu/admin/hardware/form.php
+++ b/resources/lang/iu/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/iu/admin/hardware/general.php b/resources/lang/iu/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/iu/admin/hardware/general.php
+++ b/resources/lang/iu/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/iu/admin/hardware/message.php b/resources/lang/iu/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/iu/admin/hardware/message.php
+++ b/resources/lang/iu/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/iu/admin/hardware/table.php b/resources/lang/iu/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/iu/admin/hardware/table.php
+++ b/resources/lang/iu/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/iu/admin/licenses/general.php b/resources/lang/iu/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/iu/admin/licenses/general.php
+++ b/resources/lang/iu/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/iu/admin/manufacturers/message.php b/resources/lang/iu/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/iu/admin/manufacturers/message.php
+++ b/resources/lang/iu/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/iu/admin/manufacturers/table.php b/resources/lang/iu/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/iu/admin/manufacturers/table.php
+++ b/resources/lang/iu/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/iu/admin/models/general.php b/resources/lang/iu/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/iu/admin/models/general.php
+++ b/resources/lang/iu/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/iu/admin/models/message.php b/resources/lang/iu/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/iu/admin/models/message.php
+++ b/resources/lang/iu/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/iu/admin/settings/general.php b/resources/lang/iu/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/iu/admin/settings/general.php
+++ b/resources/lang/iu/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/iu/admin/settings/message.php b/resources/lang/iu/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/iu/admin/settings/message.php
+++ b/resources/lang/iu/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/iu/admin/users/general.php b/resources/lang/iu/admin/users/general.php
index daa568e8bf..b097ccec69 100644
--- a/resources/lang/iu/admin/users/general.php
+++ b/resources/lang/iu/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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/iu/admin/users/message.php b/resources/lang/iu/admin/users/message.php
index 247a1b321e..adf26b3229 100644
--- a/resources/lang/iu/admin/users/message.php
+++ b/resources/lang/iu/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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/iu/auth/general.php b/resources/lang/iu/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/iu/auth/general.php
+++ b/resources/lang/iu/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/iu/general.php b/resources/lang/iu/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/iu/general.php
+++ b/resources/lang/iu/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/iu/help.php b/resources/lang/iu/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/iu/help.php
+++ b/resources/lang/iu/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/iu/localizations.php b/resources/lang/iu/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/iu/localizations.php
+++ b/resources/lang/iu/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/iu/mail.php b/resources/lang/iu/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/iu/mail.php
+++ b/resources/lang/iu/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/iu/validation.php b/resources/lang/iu/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/iu/validation.php
+++ b/resources/lang/iu/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ja/admin/accessories/general.php b/resources/lang/ja/admin/accessories/general.php
index cea8180d26..2efcf70890 100644
--- a/resources/lang/ja/admin/accessories/general.php
+++ b/resources/lang/ja/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ja/admin/accessories/message.php b/resources/lang/ja/admin/accessories/message.php
index c9c5702e30..1b645b0694 100644
--- a/resources/lang/ja/admin/accessories/message.php
+++ b/resources/lang/ja/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> '付属品がチェックされませんでした。もう一度、やり直して下さい。',
         'success' 		=> '付属品のチェックが終了しました。',
+        'unavailable'   => '付属品はチェックアウト中のため利用できません。',
         'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。'
     ),
 
diff --git a/resources/lang/ja/admin/categories/message.php b/resources/lang/ja/admin/categories/message.php
index 758e9afb36..e20d105b9d 100644
--- a/resources/lang/ja/admin/categories/message.php
+++ b/resources/lang/ja/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'カテゴリーは更新されませんでした。再度実行してください。',
-        'success' => 'カテゴリーの更新に成功しました。'
+        'success' => 'カテゴリーの更新に成功しました。',
+        'cannot_change_category_type'   => '一度作成されたカテゴリタイプを変更することはできません',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ja/admin/components/general.php b/resources/lang/ja/admin/components/general.php
index d8955450de..12cd617f2a 100644
--- a/resources/lang/ja/admin/components/general.php
+++ b/resources/lang/ja/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => '残数',
     'total' 			                 => '合計',
     'update'                            => '構成部品の更新',
+    'checkin_limit'            => 'チェックイン金額は :assigned_qty 以下にして下さい'
 );
diff --git a/resources/lang/ja/admin/components/message.php b/resources/lang/ja/admin/components/message.php
index 06beea39e3..29fd4d21ed 100644
--- a/resources/lang/ja/admin/components/message.php
+++ b/resources/lang/ja/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '構成部品はチェックアウトされませんでした。もう一度、やり直して下さい。',
         'success' 		=> '構成部品は正常にチェックアウトされました。',
-        'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。'
+        'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ja/admin/consumables/message.php b/resources/lang/ja/admin/consumables/message.php
index 3fe47177b9..7f27ded3e5 100644
--- a/resources/lang/ja/admin/consumables/message.php
+++ b/resources/lang/ja/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '消耗品はチェックアウトできませんでした。もう一度試して下さい。',
         'success' 		=> '消耗品はチェックアウトに成功しました。',
-        'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。'
+        'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ja/admin/custom_fields/general.php b/resources/lang/ja/admin/custom_fields/general.php
index 17cb9a8706..857268086a 100644
--- a/resources/lang/ja/admin/custom_fields/general.php
+++ b/resources/lang/ja/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => '型番で使用',
     'order'   		            => '順番',
     'create_fieldset'         => '新しいフィールドセット',
+    'update_fieldset'         => 'フィールドセットを更新',
+    'fieldset_does_not_exist'   => 'フィールドセット:idが存在しません',
+    'fieldset_updated'         => 'フィールドセットが更新されました',
     'create_fieldset_title' => '新しいフィールドセットを作成',
     'create_field'            => '新しいユーザー設定フィールド',
     'create_field_title' => '新しいカスタムフィールドを作成',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => '警告。このフィールドは <code>:db_column</code> としてカスタムフィールドテーブルにありますが、 <code>:expected</code> でなければなりません。',
     'is_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' => 'チェックアウトされたユーザーが割り当てられたアセットを表示ページでこれらの値を表示できるようにします',
+    'display_in_user_view_table' => 'ユーザーに表示',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/ja/admin/departments/message.php b/resources/lang/ja/admin/departments/message.php
index fd22cd1e84..1a455aef16 100644
--- a/resources/lang/ja/admin/departments/message.php
+++ b/resources/lang/ja/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'	 => 'この部署は1人以上の利用者に関連付けされているため、削除できません。部署の関連付けを削除してから、もう一度試して下さい。 ',
     'create' => array(
         'error'   => '部署が作成できませんでした。もう一度やり直して下さい。',
diff --git a/resources/lang/ja/admin/groups/message.php b/resources/lang/ja/admin/groups/message.php
index a8e8dd6a98..60f667f259 100644
--- a/resources/lang/ja/admin/groups/message.php
+++ b/resources/lang/ja/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'グループは既に存在しています！',
-    'group_not_found'     => 'グループ [:id] は、存在していません。',
+    'group_not_found'     => 'グループID :id は、存在していません。',
     'group_name_required' => '名前フィールドは必須です。',
 
     'success' => array(
diff --git a/resources/lang/ja/admin/hardware/form.php b/resources/lang/ja/admin/hardware/form.php
index ad03c1321e..129be86d22 100644
--- a/resources/lang/ja/admin/hardware/form.php
+++ b/resources/lang/ja/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> '資産の一括削除',
+    'bulk_restore'      => '資産一括リストアの確認', 
   'bulk_delete_help'	=> '以下の資産が一括削除されます。削除後のデータは戻すことができませ',
+  'bulk_restore_help'	=> '以下の一括リストアのために資産を確認してください。復元されると、これらの資産は以前に割り当てられたユーザーに関連付けられることはありません。',
   'bulk_delete_warn'	=> ':asset_cont 件の資産を削除しました',
+  'bulk_restore_warn'	=> ':asset_count資産を復元しようとしています。',
     'bulk_update'		=> '資産を一括更新',
     'bulk_update_help'	=> 'このフォームは一度に複数の資産を更新することが可能です。変更が必要なフィールドにのみ入力をして下さい。ブランクのフィールドは変更されません。 ',
     'bulk_update_warn'	=> '単一資産のプロパティを編集しようとしています。|:asset_count 件のプロパティを編集しようとしています。',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'デフォルトの場所のみ更新',
     'asset_not_deployable' => 'その資産ステータスは配備可能ではありません。この資産はチェックアウトできません。',
     'asset_deployable' => 'その資産ステータスは配備可能です。この資産はチェックアウトできます。',
-    'processing_spinner' => '処理中…',
+    'processing_spinner' => '処理中です... (これは大きなファイルで少し時間がかかる可能性があります)',
     'optional_infos'  => 'オプション情報',
     'order_details'   => 'オーダー関連情報'
 ];
diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php
index 92334c2fd6..ca02dd461c 100644
--- a/resources/lang/ja/admin/hardware/general.php
+++ b/resources/lang/ja/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'この資産は削除されました。',
     'edit'  					=> '資産を編集',
     'model_deleted'  			=> 'この資産モデルは削除されました。資産を復元する前に、モデルを復元する必要があります。',
+    'model_invalid'             => 'この資産のモデルは無効です。',
+    'model_invalid_fix'         => 'チェックインまたはチェックアウトを試みる前に、資産を編集して修正する必要があります。',
     'requestable'               => '要求可能',
     'requested'				    => '要求済',
     'not_requestable'           => '要求可能ではありません',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> '資産を復元',
     'pending'  					=> 'ペンディング',
     'undeployable'  			=> '配備不可',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'エラーメッセージ:',
     'success_messages' => '成功メッセージ:',
     'alert_details' => '詳細は以下を確認してください。',
-    'custom_export' => 'カスタムエクスポート'
+    'custom_export' => 'カスタムエクスポート',
+    'mfg_warranty_lookup' => ':manufacturer 保証書の発行状況を検索',
 ];
diff --git a/resources/lang/ja/admin/hardware/message.php b/resources/lang/ja/admin/hardware/message.php
index 01ce687d3d..f09b722e77 100644
--- a/resources/lang/ja/admin/hardware/message.php
+++ b/resources/lang/ja/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> '資産は復元されませんでした。もう一度、やり直して下さい。',
         'success' 		=> '資産は正常に復元されました。',
+        'bulk_success' 		=> '資産は正常に復元されました。',
+        'nothing_updated'   => '資産が選択されていないため、何も復元されませんでした。', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'ファイルはインポートされました。',
         'file_delete_success'   => 'ファイルを削除しました。',
         'file_delete_error'      => 'ファイルが削除出来ませんでした。',
+        'header_row_has_malformed_characters' => 'ヘッダー行の1つ以上の属性に不正な形式のUTF-8文字が含まれています',
+        'content_row_has_malformed_characters' => 'コンテンツの最初の行の1つまたは複数の属性に不正な形式のUTF-8文字が含まれています',
     ],
 
 
diff --git a/resources/lang/ja/admin/hardware/table.php b/resources/lang/ja/admin/hardware/table.php
index 43e8636fdf..feb87f06ce 100644
--- a/resources/lang/ja/admin/hardware/table.php
+++ b/resources/lang/ja/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In/Out',
     'checkout_date' => '検査日',
     'checkoutto' 	=> '検査済',
+    'components_cost' => 'Total Components Cost',
     'current_value' => '現在の値',
     'diff' 			=> '差分',
     'dl_csv' 		=> 'CSVダウンロード',
diff --git a/resources/lang/ja/admin/licenses/general.php b/resources/lang/ja/admin/licenses/general.php
index bfe6aa199f..0cb05c1251 100644
--- a/resources/lang/ja/admin/licenses/general.php
+++ b/resources/lang/ja/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'ライセンスについて',
-    'about_licenses'                  => 'ライセンスはソフトウェアの追跡に使用されます。指定した数を個人にチェックアウトすることができます。',
+    'about_licenses_title'      => 'ライセンスについて',
+    'about_licenses'            => 'ライセンスはソフトウェアの追跡に使用されます。指定した数を個人にチェックアウトすることができます。',
     'checkin'  					=> 'ライセンスシートをチェックイン',
     'checkout_history'  		=> '履歴をチェックアウト',
     'checkout'  				=> 'ライセンスシートをチェックアウト',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'ソフトウェア・ライセンス',
     'user'  					=> '利用者',
     'view'  					=> 'ライセンスを表示',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ja/admin/locations/message.php b/resources/lang/ja/admin/locations/message.php
index e521e4d76e..d7d0501ea2 100644
--- a/resources/lang/ja/admin/locations/message.php
+++ b/resources/lang/ja/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'ロケーションは少なくとも一つの利用者に関連付けされているため、削除できません。ローケーションの関連付けを削除し、もう一度試して下さい。 ',
     'assoc_assets'	 => 'この設置場所は1人以上の利用者に関連付けされているため、削除できません。設置場所の関連付けを削除し、もう一度試して下さい。 ',
     'assoc_child_loc'	 => 'この設置場所は、少なくとも一つの配下の設置場所があります。この設置場所を参照しないよう更新して下さい。 ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => '割り当て済みアセット',
+    'current_location' => '現在の場所',
 
 
     'create' => array(
diff --git a/resources/lang/ja/admin/manufacturers/message.php b/resources/lang/ja/admin/manufacturers/message.php
index 52a07d4236..cc801de1b7 100644
--- a/resources/lang/ja/admin/manufacturers/message.php
+++ b/resources/lang/ja/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => '製造元が存在しません。',
     'assoc_users'	 => 'この製造元は一つ以上の型番に関連付けられているため、削除できません。この製造元の関連付けを削除後、もう一度試して下さい。 ',
 
diff --git a/resources/lang/ja/admin/manufacturers/table.php b/resources/lang/ja/admin/manufacturers/table.php
index d2fdf133c7..299c8bcbe0 100644
--- a/resources/lang/ja/admin/manufacturers/table.php
+++ b/resources/lang/ja/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'サポート Eメール',
     'support_phone'   		=> 'サポート 電話番号',
     'support_url'   		=> 'サポート URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> '製造業者を更新',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ja/admin/models/general.php b/resources/lang/ja/admin/models/general.php
index f4f173e277..14b9facd26 100644
--- a/resources/lang/ja/admin/models/general.php
+++ b/resources/lang/ja/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'モデルは削除されました。',
     'bulk_delete'               => '資産モデルの一括削除',
     'bulk_delete_help'               => '下のチェックボックスを使用して、選択した資産モデルの削除を確認します。資産が関連付けられている資産モデルは、資産が別のモデルに関連付けられるまで削除できません。',
-    'bulk_delete_warn'          => ':model_count 件の資産モデルを削除しようとしています。',
+    'bulk_delete_warn'          => '1つの資産モデルを削除しようとしています。|:model_count 資産モデルを削除しようとしています。',
     'restore'                   => '型番を復元',
     'requestable'               => 'ユーザーはこのモデルをリクエスト出来ます',
 	'show_mac_address'			      => 'このモデルの資産にMACアドレスフィールドを表示する',
diff --git a/resources/lang/ja/admin/models/message.php b/resources/lang/ja/admin/models/message.php
index 472f6b19ae..26aa1731e0 100644
--- a/resources/lang/ja/admin/models/message.php
+++ b/resources/lang/ja/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => '型番が存在しません。',
+    'no_association' => '関連するモデルはありません。',
+    'no_association_fix' => 'モデルを割り当てるために今すぐこの資産を編集してください。',
     'assoc_users'	 => 'この減価償却は複数のモデルに関係付けられているため削除することができません。モデルを削除してから再度実行してください。 ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => '型番が更新できませんでした。もう一度やり直して下さい。',
-        'success' => '型番が更新されました。'
+        'success' => '型番が更新されました。',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'フィールドが選択されていないため、更新されませんでした。',
-        'success' 		=> '型番を更新しました。'
+        'success' 		=> 'モデルが正常に更新されました。|:model_count モデルが正常に更新されました。',
+        'warn'          => '次のモデルのプロパティを更新しようとしています: |次のモデルのプロパティを編集しようとしています :model_count モデル:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'モデルが選択されていないため、何も削除されませんでした。',
-        'success' 		    => ':success_count モデルが削除されました！',
+        'success' 		    => ':success_count モデルを削除しました!',
         'success_partial' 	=> ':success_count モデルが削除されましたが、:fail_count 個はアセットが関連付けられているため、削除できませんでした。'
     ),
 
diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php
index a21ce8bac0..9197c642f1 100644
--- a/resources/lang/ja/admin/settings/general.php
+++ b/resources/lang/ja/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'ユーザーに送信されたチェックイン/チェックアウト　メールのコピーを追加の電子メールアカウントに送信する場合は、ここにメールアドレスを入力します。必要が無ければ、このフィールドを空白にします',
     'is_ad'				        => 'Active Directory サーバー',
     'alerts'                	=> 'アラート',
-    'alert_title'               => 'アラート設定を更新',
+    'alert_title'               => '通知設定を更新',
     'alert_email'				=> 'アラートの送信先',
     'alert_email_help'    => 'アラートの送信先となるメールアドレス(カンマ区切り)。',
     'alerts_enabled'			=> 'アラートを有効化',
@@ -21,7 +21,7 @@ return [
     '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_interval_help'       => '定期的に資産を監査する必要がある場合は、使用する間隔を数ヶ月で入力します。 この値を更新すると、今後の監査日付を持つアセットの「次の監査日」のすべてが更新されます。',
     'audit_warning_days'        => '監査警告しきい値',
     'audit_warning_days_help'   => '資産の監査期限は何日前に警告する必要がありますか？',
     'auto_increment_assets'		=> '資産タグを自動採番で生成',
@@ -32,9 +32,7 @@ return [
     'backups_restoring'         => 'バックアップから復元中',
     'backups_upload'            => 'バックアップをアップロード',
     'backups_path'              => 'サーバー上のバックアップは <code>:path</code> に保存されています',
-    'backups_restore_warning'   => '以前のバックアップから復元する場合は、復元ボタン <i class="text-white fas fa-retweet" aria-hidden="true"> を使用します。(S3ファイルストレージやDockerでは、現在動作しません。)
-
-<strong>:app_name データベース全体とアップロードされたファイルは、バックアップファイルの内容と完全に置き換わります。 </strong>  ',
+    '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_logged_out'         => 'あなたを含むすべての既存のユーザーは、復元が完了するとログアウトされます。',
     'backups_large'             => '非常に大きなバックアップは、復元時にタイムアウトする可能性があり、コマンドラインを介して実行する必要があります。 ',
     'barcode_settings'			=> 'バーコード設定',
@@ -77,8 +75,9 @@ return [
     '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.',
+    'ldap_default_group'        => 'デフォルトの権限グループ',
+    'ldap_default_group_info'   => '新しく同期したユーザーに割り当てるグループを選択します。ユーザーは、割り当てられたグループの権限を引き継ぐことを忘れないでください。',
+    'no_default_group'          => '標準グループがありません',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAPクライアントTLSキー',
     'ldap_client_tls_cert'      => 'LDAPクライアントサイドTLS証明書',
@@ -87,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP 設定',
     'ldap_client_tls_cert_help' => 'クライアント側のTLS証明書とLDAP接続用のキーは、通常 "Secure LDAP" を搭載したGoogle Workspaceでのみ有効です。',
      'ldap_client_tls_key'       => 'LDAPクライアントTLSキー',
+    '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'      => 'LDAPログインが正しく構成されているかどうかをテストするために、上で指定したベースDNから有効なLDAPユーザー名とパスワードを入力して下さい。その前に必ず更新後のLDAP設定を保存しておいてください。',
     'ldap_login_sync_help'      => 'これは、LDAPが正しく同期できることをテストするだけです。 LDAP認証クエリが正しくない場合、ユーザーはまだログインできない場合があります。その前に必ず更新後のLDAP設定を保存しておいてください。',
     'ldap_manager'              => 'LDAPマネージャー',
@@ -113,7 +114,9 @@ return [
     'ldap_auth_filter_query'    => 'LDAP 認証クエリ',
     '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_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_emp_num'              => 'LDAP 社員番号',
     'ldap_email'                => 'LDAP メール',
     'ldap_test'                 => 'LDAPをテスト',
@@ -181,7 +184,7 @@ return [
     'saml_idp_metadata_help'    => 'URL または XML ファイルを使用して IdP メタデータを指定できます。',
     'saml_attr_mapping_username' => '属性マッピング - ユーザー名',
     'saml_attr_mapping_username_help' => '属性マッピングが指定されていない、または無効な場合 NameID が使用されます。',
-    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin_label'     => 'SAML 強制ログイン',
     'saml_forcelogin'           => 'SAMLをプライマリログインにする',
     'saml_forcelogin_help'      => '通常のログインページに移動するには、\'/login?nosaml\' を使用できます。',
     'saml_slo_label'            => 'SAML シングルログアウト',
@@ -200,16 +203,21 @@ return [
     'show_images_in_email'     => 'メールで画像を表示する',
     'show_images_in_email_help'   => 'Snipe-ITが閉鎖されたネットワーク内にある場合や、アクセスするためにVPNの利用が必要な場合はこのボックスのチェックを外してください。ネットワーク外のユーザは、配信されたメールにある画像を読み込むことはできません。',
     'site_name'                 => 'サイト名',
+    'integrations'               => 'サービス連携',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Slackの設定を更新',
-    'slack_help'                => 'Slackの設定',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slackとの連携は任意ですが、利用する場合はエンドポイントとチャンネルが必要です。Slackとの連携を設定するには、まず、Slackに<a href=":slack_link" target="_new" rel="noopener">Incoming Webhookを作成</a>する必要があります。<strong>Slack統合テスト</strong> ボタンをクリックし、設定が正しいことを確認してから保存してください。 ',
-    'slack_integration_help_button'    => 'Slack設定を保存すると、テストボタンが表示されます。',
-    'slack_test_help'           => 'Slackが正しく設定されているかどうかをテストします。先にSlackの設定を最初に保存しなければなりません。',
+    'general_webhook'           => '一般的な Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => '保存のテスト',
+    'webhook_title'               => 'Webhook設定を更新',
+    'webhook_help'                => '連携サービス設定',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Channel',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app の設定',
+    'webhook_test'                 =>':app との連携テスト',
+    '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 の設定を最初に保存しなければなりません。',
     'snipe_version'  			=> 'Snipe-IT バージョン',
     'support_footer'            => 'フッターのリンクをサポートします。 ',
     'support_footer_help'       => 'Snipe-ITサポート情報とユーザーマニュアルへのリンクを確認する',
@@ -304,7 +312,7 @@ return [
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => '言語, 日付表示',
     'notifications' => '通知',
-    'notifications_help' => 'メールアラート, 監査設定',
+    'notifications_help' => 'メールアラートと監査設定',
     'asset_tags_help' => '増分とプレフィクス',
     'labels' => 'ラベル',
     'labels_title' => 'ラベル設定を更新',
@@ -325,4 +333,9 @@ return [
     'setup_migration_create_user' => '次へ: ユーザーの作成',
     'ldap_settings_link' => 'LDAP設定ページ',
     'slack_test' => '<i class="fab fa-slack"></i> 統合テスト',
+    '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. ',
+
 ];
diff --git a/resources/lang/ja/admin/settings/message.php b/resources/lang/ja/admin/settings/message.php
index 0a6be5f81c..0df8084ce5 100644
--- a/resources/lang/ja/admin/settings/message.php
+++ b/resources/lang/ja/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP認証のテスト中...',
         'authentication_success' => 'LDAPによるユーザー認証に成功しました！'
     ],
-    'slack' => [
-        'sending' => 'Slackのテストメッセージを送信しています...',
+    'webhook' => [
+        'sending' => ':app テストメッセージを送信しています...',
         'success_pt1' => 'チェックに成功 ',
-        'success_pt2' => ' テストメッセージのチャンネルで、設定を保存するには以下の「保存」をクリックしてください。',
+        'success_pt2' => ' テストメッセージのチャンネルで、設定を保存するには以下の「SAVE」をクリックしてください。',
         '500' => '500 Server Error.',
-        'error' => '問題が発生しました。',
+        'error' => '問題が発生しました。:app 応答: :error_message',
+        'error_misc' => '問題が発生しました。:( ',
     ]
 ];
diff --git a/resources/lang/ja/admin/users/general.php b/resources/lang/ja/admin/users/general.php
index e876db28d9..77dc64cf6a 100644
--- a/resources/lang/ja/admin/users/general.php
+++ b/resources/lang/ja/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => '割り当て先をすべて印刷',
     'email_assigned'    => '割り当てられたすべてのメール一覧',
     'user_notified'     => 'ユーザーは現在割り当てられているアイテムのリストを電子メールで送信しました。',
+    'auto_assign_label' => '該当するライセンスを自動で割り当てる場合の、このユーザーを含める',
+    'auto_assign_help'  => 'このユーザーのライセンスの自動割り当てをスキップ',
     'software_user'     => 'ソフトウェアは :name にチェックアウトしました。',
     'send_email_help'   => '資格情報を送信するには、このユーザーのメールアドレスを入力する必要があります。メール送信資格情報は、ユーザー作成時にのみ行うことができます。 パスワードは一方向のハッシュに保存され、保存されると取得できません。',
     'view_user'         => '利用者 :name を表示',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'スーパー管理者のみがユーザーにスーパー管理者権限を付与できます。',
     'admin_permission_warning' => '管理者権限以上のユーザーのみがユーザーの管理者権限を付与できます。',
     'remove_group_memberships' => 'グループメンバーシップを削除',
-    'warning_deletion' => '警告:',
     'warning_deletion_information' => '以下の :count ユーザーからのすべてのアイテムをチェックインしようとしています。スーパー管理者名は赤でハイライトされます。',
     'update_user_assets_status' => 'これらのユーザーのすべてのアセットをこのステータスに更新します',
     'checkin_user_properties' => 'これらのユーザーに関連付けられているすべてのプロパティをチェック',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'リモート',
     'remote_help' => 'これは、物理的な場所に来たことがない、またはほとんど来なかったリモートユーザーによってフィルタリングする必要がある場合に便利です。',
     'not_remote_label' => 'これはリモートユーザーではありません',
+    'vip_label' => 'VIP ユーザー',
+    '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_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/ja/admin/users/message.php b/resources/lang/ja/admin/users/message.php
index 90fe43295f..09ea8e1070 100644
--- a/resources/lang/ja/admin/users/message.php
+++ b/resources/lang/ja/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'この資産を却下しました。',
     'bulk_manager_warn'	        => 'あなたの利用者は正常に更新されました。しかしながら、あなたの管理者エントリーは保存されませんでした。あなたが選択した管理者が、編集対象の利用者一覧に選択されていたため更新されませんでした。および利用者は彼ら自身の管理者でない場合があります。再度、管理者を除いた上で、あなたの利用者を選択してください。',
     'user_exists'               => '利用者が既に存在しています!',
-    'user_not_found'            => '利用者 [:id] は、存在していません。',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'ログインフィールドが必要です。',
     'user_password_required'    => 'パスワードが必要です。',
     'insufficient_permissions'  => '権限が不足しています。',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => '有効なメールアドレスを持っている選択されたユーザーにパスワードリセットのリンクが送信されました。',
     'password_reset_sent'       => 'パスワードリセットのURLが:emailに送信されました。',
     'user_has_no_email'         => 'このユーザーのプロフィールにはメールアドレスがありません。',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'このユーザーにはアセットが割り当てられていません',
 
 
     'success' => array(
@@ -61,7 +61,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/ja/auth/general.php b/resources/lang/ja/auth/general.php
index eba3dd865e..dd7618b39d 100644
--- a/resources/lang/ja/auth/general.php
+++ b/resources/lang/ja/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'ログイン状態を維持する',
     'username_help_top'                 => 'パスワードリセットリンクを送信する対象の <strong>ユーザー名</strong> を入力してください。',
     'username_help_bottom'          => 'ユーザー名とメールアドレスは、設定によって同じ場合もありますが、<em>そうでない場合もあります</em>。ユーザー名を思い出せない場合は、管理者にお問い合わせください。<br><br><strong>メールアドレスが関連付けられていないユーザー名には、パスワードリセットのリンクがメールで送信されません。</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php
index 114166eb45..88223ea085 100644
--- a/resources/lang/ja/general.php
+++ b/resources/lang/ja/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> '付属品',
     'activated'			    => 'アクティベート',
+    'accepted_date'         => '受理日',
     'accessory'				=> '付属品',
     'accessory_report'		=> '付属品レポート',
     'action'                => '操作',
@@ -11,7 +12,7 @@ return [
     'admin'					=> '管理',
     'administrator'			=> '管理者',
     'add_seats'             => 'シートを追加',
-    'age'                   => "Age",
+    'age'                   => "経過",
     'all_assets'			=> '全ての資産',
     'all'       			=> 'All',
     'archived'              => 'アーカイブ',
@@ -27,7 +28,13 @@ return [
     'audit'				    => '監査',
     'audit_report'			=> '監査ログ',
     'assets'				=> '資産数',
+    'assets_audited'        => '監査済み資産',
+    'assets_checked_in_count'     => '資産をチェックインしました',
+    'assets_checked_out_count'     => '資産をチェックインしました',
+    'asset_deleted_warning'     => 'この資産は削除されました。割り当てるには、復元する必要があります。',
+    'assigned_date'         => '割り当てられた日付',
     'assigned_to'           => ':name に割り当て',
+    'assignee'              => '割り当て先',
     'avatar_delete'         => 'アバターを削除',
     'avatar_upload'         => 'アバターをアップロード',
     'back'      			=> '戻る',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => '一括編集',
     'bulk_delete'           => '一括削除',
     'bulk_actions'          => '一括操作',
-    'bulk_checkin_delete'   => 'ユーザーからの一括チェックイン',
+    'bulk_checkin_delete'   => '一括チェックイン/ユーザーの削除',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'このデバイスはユーザーが所有しています',
     'bystatus'              => 'ステータス別',
     'cancel'  				=> 'キャンセル',
     'categories'			=> 'カテゴリー',
@@ -83,6 +92,7 @@ return [
     'debug_warning_text'    => 'このアプリケーションはデバッグモードがONのままプロダクションモードで実行されています。もしアプリケーションが外部からアクセス可能な場合、機密データが抜き取られる可能性があります。<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.',
     'deleted'  				=> '削除しました。',
     'delete_seats'  		=> 'ライセンスを削除',
     'deletion_failed'       => '削除に失敗しました',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => 'アップロード可能なファイル形式は :types です。アップロード可能な最大サイズは :size です。|アップロード可能なファイル形式は :types です。アップロード可能な最大サイズは :size です。',
     'filetypes_size_help'   => '許可されている最大アップロードサイズは :size です。',
     'image_filetypes_help'  => '使用できるファイルはjpg、png、gif、svgです。許可される最大ファイルサイズは:size です。',
+    'unaccepted_image_type'  => 'この画像ファイルは読み取れませんでした。受け入れられるファイルタイプはjpg、webp、png、gif、svgです。このファイルのmimetypeは:mimetypeです。',
     'import'         	    => 'インポート',
     'importing'         	=> 'インポートしています',
     'importing_help'        => 'アセット、アクセサリ、ライセンス、コンポーネント、消耗品、およびユーザーをCSVファイルからインポートできます。 <br><br>CSVは、ドキュメント <a href="https://snipe-it.readme.io/docs/importing" target="_new"></a> のサンプルCSVに一致するヘッダーでカンマ区切りでフォーマットする必要があります。',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => '資産管理',
     'item'  				=> 'アイテム',
     'item_name'             => 'アイテム名',
+    'import_file'  			=> 'CSVファイルをインポート',
+    'import_type'  			=> 'CSVインポートの種類',
     'insufficient_permissions' => '権限が不足しています。',
     'kits'       			=> '製品セット',
     'language'				=> '言語',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => '要求された資産',
     'request_canceled'      => 'リクエストキャンセル',
     'save'  				=> '保存',
+    'select_var'            => ':thingを選択してください。 ', // this will eventually replace all of our other selects
     'select'				=> '選択',
     'select_all'            => 'すべて選択',
     'search'				=> '検索',
@@ -240,8 +254,8 @@ return [
     'signature'             => '署名',
     'signed_off_by'         => '署名された',
     'skin'       			=> 'スキン',
-    'slack_msg_note'        => 'Slackメッセージが送信されます',
-    'slack_test_msg'        => 'こんにちは！SlackとSnipe-ITの連携がうまくいっているようです！',
+    'webhook_msg_note'        => 'Webhook経由で通知が送信されます',
+    'webhook_test_msg'        => ':app とSnipe-ITの連携がうまくいっているようです！',
     'some_features_disabled' => 'デモモード ： いくつかの機能はこのインストールでは無効化されます',
     'site_name'				=> 'サイト名',
     'state'  				=> '都道府県',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '削除してもよろしいですか?',
     'submit'				=> '送信',
     'target'                => '対象',
-    'toggle_navigation'     => 'トグルナビゲーション',
     'time_and_date_display' => '時間と日付を表示',
     'total_assets'			=> '資産の合計',
     'total_licenses'		=> 'ライセンスの合計',
@@ -281,9 +294,9 @@ 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'             => '監査期日',
@@ -375,18 +388,65 @@ return [
     'bulk_soft_delete'      =>'また、これらのユーザーを論理削除します。管理設定で削除したレコードを削除するまで、資産履歴はそのまま残ります。',
     'bulk_checkin_delete_success' => '選択したユーザーが削除され、項目がチェックインされました。',
     'bulk_checkin_success' => '選択したユーザーの項目がチェックインされています。',
-    'set_to_null' => 'このアセットの値を削除|全:asset_count個の資産を削除する ',
+    'set_to_null'           => 'このアセットの値を削除|全:asset_count個の資産を削除する ',
+    '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個のアイテムがあります。受け入れるか拒否するにはここをクリックしてください',
-    'start_date'            => 'Start Date',
-    'end_date'            => 'End Date',
-    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    'start_date'            => '開始日',
+    'end_date'            => '終了日',
+    'alt_uploaded_image_thumbnail' => 'サムネイルのアップロード',
+    'placeholder_kit'       => 'キットを選択',
+    'file_not_found'        => 'ファイルが見つかりません',
+    'preview_not_available' => '(プレビューなし)',
+    'setup'                 => 'セットアップ',
+    'pre_flight'            => 'プレ・フライト',
+    'skip_to_main_content'  => 'メインコンテンツにスキップ',
+    'toggle_navigation'     => 'ナビゲーションの表示/非表示',
+    'alerts'                => 'アラート',
+    'tasks_view_all'        => 'すべてのタスクを表示',
+    'true'                  => 'True',
+    'false'                 => 'False',
+    'integration_option'    => '連携オプション',
+    'log_does_not_exist'    => '一致するログが存在しません。',
+    'merge_users'           => 'ユーザーをマージ',
+    'merge_information' =>  ':count ユーザーを 1 つのユーザーにマージします。 以下にマージしたいユーザーと関連する資産、ライセンスを選択してください などは選択したユーザーに移動され、他のユーザーは削除としてマークされます。',
+    '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'   => ' 新規ユーザーにウェルカムメールを送信しますか？',
+    'back_before_importing'     => 'インポートする前にバックアップしますか？',
+    'csv_header_field'          => 'CSV ヘッダーフィールド',
+    'import_field'              => 'インポートフィールド',
+    'sample_value'              => 'サンプル値',
+    'no_headers'                => '列が見つかりませんでした',
+    'error_in_import_file'      => 'CSV ファイルの読み込み中にエラーが発生しました: :error',
+    'percent_complete'          => ':percent % 完了',
+    'errors_importing'          => 'インポート中に一部のエラーが発生しました: ',
+    'warning'                   => '警告: :warning',
+    'success_redirecting'       => '"成功... リダイレクト中です。',
+    'setup_successful_migrations' => 'データベーステーブルが作成されました',
+    'setup_migration_output' => 'マイグレーション出力:',
+    'setup_migration_create_user' => '次へ: ユーザーの作成',
+    'importer_generic_error'    => 'ファイルのインポートが完了しましたが、エラーが発生しました。 これは通常、サードパーティのAPIによる通知Webhook(Slackなど)からの制限によって引き起こされ、インポート自体に干渉しません。 しかしながら、念の為確認してください。',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ja/help.php b/resources/lang/ja/help.php
index ad2ed6e323..80f242e7aa 100644
--- a/resources/lang/ja/help.php
+++ b/resources/lang/ja/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => '詳細',
 
-    'audit_help' => 'このボックスにチェックを入れると、この新しいロケーションを反映する資産レコードが編集されます。チェックを外すと、監査ログ内のロケーションが表示されます。<br><br>この資産はチェックアウトされていることに注意してください。 人物の場所や場所を変えることはありません。',
+    'audit_help' => 'このボックスにチェックを入れると、この新しいロケーションを反映するアセットレコードが編集されます。チェックを外すと、監査ログ内のロケーションが表示されます。<br><br>この資産がチェックアウトされている場合に注意してください。 人物の場所や場所を変えることはありません',
 
     'assets' => '資産はシリアル番号または資産タグで追跡されるアイテムです。特定のアイテムを識別することが重要なより高い価値のアイテムである傾向があります。',
 
diff --git a/resources/lang/ja/localizations.php b/resources/lang/ja/localizations.php
index 88b3e8a450..4e71aaa2b8 100644
--- a/resources/lang/ja/localizations.php
+++ b/resources/lang/ja/localizations.php
@@ -2,26 +2,26 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => '言語を選択',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> '英語 (アメリカ)',
+        'en-GB'=> '英語 (イギリス)',
         'af'=> 'Afrikaans',
         'ar'=> 'Arabic',
         'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
+        'zh-CN'=> '中国語 (簡体字)',
+        'zh-TW'=> '中国語(繁体字)',
         'hr'=> 'Croatian',
         'cs'=> 'Czech',
         'da'=> 'Danish',
         'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
+        'en-ID'=> '英語(インドネシア)',
         'et'=> 'Estonian',
         'fil'=> 'Filipino',
         'fi'=> 'Finnish',
         'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
+        'de'=> 'ドイツ語',
+        'de-i'=> 'ドイツ語 (非公式)',
         'el'=> 'Greek',
         'he'=> 'Hebrew',
         'hu'=> 'Hungarian',
@@ -30,7 +30,7 @@ return [
         'ga-IE'=> 'Irish',
         'it'=> 'Italian',
         'ja'=> '日本語',
-        'ko'=> 'Korean',
+        'ko'=> '韓国語',
         'lv'=>'Latvian',
         'lt'=> 'Lithuanian',
         'mk'=> 'Macedonian',
@@ -61,12 +61,12 @@ return [
         'zu'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => '国を選択',
     
     'countries' => [
         'AC'=>'Ascension Island',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
+        'AE'=>'アラブ首長国連邦',
         'AF'=>'Afghanistan',
         'AG'=>'Antigua And Barbuda',
         'AI'=>'Anguilla',
@@ -77,8 +77,8 @@ return [
         'AQ'=>'Antarctica',
         'AR'=>'Argentina',
         'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AT'=>'オーストリア',
+        'AU'=>'オーストラリア',
         'AW'=>'Aruba',
         'AX'=>'Ã…land',
         'AZ'=>'Azerbaijan',
@@ -101,7 +101,7 @@ return [
         'BW'=>'Botswana',
         'BY'=>'Belarus',
         'BZ'=>'Belize',
-        'CA'=>'Canada',
+        'CA'=>'カナダ',
         'CC'=>'Cocos (Keeling) Islands',
         'CD'=>'Congo (Democratic Republic)',
         'CF'=>'Central African Republic',
@@ -156,7 +156,7 @@ return [
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
-        'HK'=>'Hong Kong',
+        'HK'=>'香港',
         'HM'=>'Heard And Mc Donald Islands',
         'HN'=>'Honduras',
         'HR'=>'Croatia (local name: Hrvatska)',
@@ -164,9 +164,9 @@ return [
         'HU'=>'Hungary',
         'ID'=>'Indonesia',
         'IE'=>'Ireland',
-        'IL'=>'Israel',
+        'IL'=>'イスラエル',
         'IM'=>'Isle of Man',
-        'IN'=>'India',
+        'IN'=>'インド',
         'IO'=>'British Indian Ocean Territory',
         'IQ'=>'Iraq',
         'IR'=>'Iran, Islamic Republic Of',
@@ -175,18 +175,18 @@ return [
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
         'JO'=>'Jordan',
-        'JP'=>'Japan',
+        'JP'=>'日本',
         'KE'=>'Kenya',
         'KG'=>'Kyrgyzstan',
         'KH'=>'Cambodia',
         'KI'=>'Kiribati',
         'KM'=>'Comoros',
         'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KR'=>'韓国',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
+        'KY'=>'ケイマン諸島',
         'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
+        'LA'=>'ラオス人民民主共和国',
         'LB'=>'Lebanon',
         'LC'=>'Saint Lucia',
         'LI'=>'Liechtenstein',
@@ -207,7 +207,7 @@ return [
         'ML'=>'Mali',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
+        'MO'=>'マカオ',
         'MP'=>'Northern Mariana Islands',
         'MQ'=>'Martinique',
         'MR'=>'Mauritania',
@@ -256,9 +256,10 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'南スーダン',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SG'=>'シンガポール',
         'SH'=>'St. Helena',
         'SI'=>'Slovenia',
         'SJ'=>'Svalbard And Jan Mayen Islands',
@@ -288,12 +289,12 @@ return [
         'TR'=>'Turkey',
         'TT'=>'Trinidad And Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
+        'TW'=>'台湾',
         'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'UA'=>'ウクライナ',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
+        'UK'=>'イギリス',
+        'US'=>'アメリカ',
         'UM'=>'United States Minor Outlying Islands',
         'UY'=>'Uruguay',
         'UZ'=>'Uzbekistan',
diff --git a/resources/lang/ja/mail.php b/resources/lang/ja/mail.php
index 786f95f1f6..d5bf0bfb55 100644
--- a/resources/lang/ja/mail.php
+++ b/resources/lang/ja/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => '以下の新しいログイン情報を使用して、Snipe-ITにログインします。',
     'login' => 'ログイン:',
     'Low_Inventory_Report' => '在庫減レポート',
+    'inventory_report' => 'インベントリレポート',
     'min_QTY' => '分数',
     'name' => '名前',
     'new_item_checked' => 'あなたの名前で新しいアイテムがチェックアウトされました。詳細は以下の通りです。',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Snipe-IT クレデンシャル',
     'Accessory_Checkin_Notification' => '付属品をチェックインしました',
     'Asset_Checkin_Notification' => '資産をチェックインしました',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'ライセンスをチェックインしました',
     'Expected_Checkin_Report' => '予想される資産チェックインレポート',
     'Expected_Checkin_Notification' => 'リマインダー: :name のチェックイン期限が近づいています',
     'Expected_Checkin_Date' => 'チェックアウトされた資産は:date にチェックインされる予定です',
     'your_assets' => 'あなたの資産を表示',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ja/validation.php b/resources/lang/ja/validation.php
index 4f7638ac0b..c442a85aa8 100644
--- a/resources/lang/ja/validation.php
+++ b/resources/lang/ja/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute はファイルにして下さい。',
     'filled'               => ':attribute フィールドは空に出来ません。',
     'image'                => ':attribute は画像にして下さい。',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => ':attribute は、この会社の場所に一意である必要があります。',
     'json'                 => ':attribute は有効なJSON文字列にして下さい。',
     'max'                  => [
         'numeric' => ':attribute は :max 以上にして下さい。',
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute は少なくとも :min 以上にして下さい。',
     ],
     'starts_with'          => ':attribute は、いずれかの値で始まる必要があります: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => '選択された :attribute は不正です。',
     'numeric'              => ':attribute は数字にして下さい。',
     'present'              => ':attribute フィールドは必須です。',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => '現在のパスワードが正しくありません。',
         'dumbpwd'          => 'そのパスワードはあまりにも脆弱です。',
         'statuslabel_type' => '有効なステータスラベルの種類を選択する必要があります。',
+
+        // 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 は 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 形式の有効な日付にして下さい',
+
     ],
 
     /*
diff --git a/resources/lang/ko/admin/accessories/general.php b/resources/lang/ko/admin/accessories/general.php
index 806be16f01..2a50e01294 100644
--- a/resources/lang/ko/admin/accessories/general.php
+++ b/resources/lang/ko/admin/accessories/general.php
@@ -16,5 +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.',
 
 );
diff --git a/resources/lang/ko/admin/accessories/message.php b/resources/lang/ko/admin/accessories/message.php
index ea655a0fe5..5e979e924e 100644
--- a/resources/lang/ko/admin/accessories/message.php
+++ b/resources/lang/ko/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> '부속품이 반출되지 않았습니다. 다시 시도해 주세요.',
         'success' 		=> '부속품이 반출 되었습니다.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.'
     ),
 
diff --git a/resources/lang/ko/admin/asset_maintenances/form.php b/resources/lang/ko/admin/asset_maintenances/form.php
index 1125bdb66c..530694df5b 100644
--- a/resources/lang/ko/admin/asset_maintenances/form.php
+++ b/resources/lang/ko/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => '자산 관리 유형',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => '제목',
-        'start_date'             => '시작일',
-        'completion_date'        => '완료일',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => '비용',
         'is_warranty'            => '보증 개선',
-        'asset_maintenance_time' => '자산 관리 기간(일 단위)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => '주석',
-        'update'                 => '자산 관리 갱신',
-        'create'                 => '자산 관리 생성'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ko/admin/categories/message.php b/resources/lang/ko/admin/categories/message.php
index bf542b9832..ad9829f82d 100644
--- a/resources/lang/ko/admin/categories/message.php
+++ b/resources/lang/ko/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => '분류가 갱신되지 않았습니다. 다시 시도해 주세요',
-        'success' => '분류가 갱신되었습니다.'
+        'success' => '분류가 갱신되었습니다.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ko/admin/components/general.php b/resources/lang/ko/admin/components/general.php
index 59acbf311b..25e3a4cd09 100644
--- a/resources/lang/ko/admin/components/general.php
+++ b/resources/lang/ko/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => '잔여수량',
     'total' 			                 => '총계',
     'update'                            => '부품 갱신',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/ko/admin/components/message.php b/resources/lang/ko/admin/components/message.php
index 88e14ae3bb..84b0cd2148 100644
--- a/resources/lang/ko/admin/components/message.php
+++ b/resources/lang/ko/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '부품이 반출되지 않았습니다. 다시 시도해 주세요.',
         'success' 		=> '부품이 반출 되었습니다.',
-        'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.'
+        'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ko/admin/consumables/message.php b/resources/lang/ko/admin/consumables/message.php
index 2044042eae..69257d8e83 100644
--- a/resources/lang/ko/admin/consumables/message.php
+++ b/resources/lang/ko/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '소모품이 반출되지 않았습니다. 다시 시도해 주세요.',
         'success' 		=> '소모품이 반출 되었습니다.',
-        'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.'
+        'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ko/admin/custom_fields/general.php b/resources/lang/ko/admin/custom_fields/general.php
index dd745b6e14..e1faa252a9 100644
--- a/resources/lang/ko/admin/custom_fields/general.php
+++ b/resources/lang/ko/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => '적용 모델',
     'order'   		            => '순서',
     'create_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'            => '신규 사용자 항목',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ko/admin/groups/message.php b/resources/lang/ko/admin/groups/message.php
index 3a4221dd15..bd36bb5f5b 100644
--- a/resources/lang/ko/admin/groups/message.php
+++ b/resources/lang/ko/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => '그룹이 이미 존재합니다!',
-    'group_not_found'     => '그룹 [:id]는 존재하지 않습니다.',
+    'group_not_found'     => '그룹 ID :id가 존재하지 않습니다.',
     'group_name_required' => '이름 항목을 입력해주세요.',
 
     'success' => array(
diff --git a/resources/lang/ko/admin/hardware/form.php b/resources/lang/ko/admin/hardware/form.php
index 4f3732ea78..a8b756b18f 100644
--- a/resources/lang/ko/admin/hardware/form.php
+++ b/resources/lang/ko/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> '대량 자산 삭제 승인',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ko/admin/hardware/general.php b/resources/lang/ko/admin/hardware/general.php
index 75007708e6..b5fa22bd7c 100644
--- a/resources/lang/ko/admin/hardware/general.php
+++ b/resources/lang/ko/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> '자산이 삭제되었습니다.',
     'edit'  					=> '자산 수정',
     'model_deleted'  			=> '모델이 삭제되었습니다. 자산을 복원하기 전에 모델을 복원해야 합니다.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => '요청가능',
     'requested'				    => '요청됨',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> '자산 복원',
     'pending'  					=> '대기중',
     'undeployable'  			=> '사용불가',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ko/admin/hardware/message.php b/resources/lang/ko/admin/hardware/message.php
index 16366211ab..865e756f33 100644
--- a/resources/lang/ko/admin/hardware/message.php
+++ b/resources/lang/ko/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> '자산이 복원되지 않았습니다. 다시 시도해 주세요.',
         'success' 		=> '자산이 복원되었습니다.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => '파일에서 읽어오기가 완료되었습니다',
         'file_delete_success'   => '파일 삭제가 완료되었습니다',
         'file_delete_error'      => '파일을 삭제할 수 없습니다',
+        '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',
     ],
 
 
diff --git a/resources/lang/ko/admin/hardware/table.php b/resources/lang/ko/admin/hardware/table.php
index 0d73632b54..27933a569d 100644
--- a/resources/lang/ko/admin/hardware/table.php
+++ b/resources/lang/ko/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> '입/출',
     'checkout_date' => '반출 일자',
     'checkoutto' 	=> '반출 확인',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> '차액',
     'dl_csv' 		=> 'CSV로 내려받기',
diff --git a/resources/lang/ko/admin/licenses/general.php b/resources/lang/ko/admin/licenses/general.php
index b1b7f34cce..28eda52644 100644
--- a/resources/lang/ko/admin/licenses/general.php
+++ b/resources/lang/ko/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => '라이선스 란',
-    'about_licenses'                  => '라이선스는 소프트웨어를 추적하는데 사용됩니다. 개인에게 반출 할 수 있는 수량이 정의되어 있습니다',
+    'about_licenses_title'      => '라이선스 란',
+    'about_licenses'            => '라이선스는 소프트웨어를 추적하는데 사용됩니다. 개인에게 반출 할 수 있는 수량이 정의되어 있습니다',
     'checkin'  					=> '라이선스 Seat 확인',
     'checkout_history'  		=> '반출 이력',
     'checkout'  				=> '반출 라이선스 Seat',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> '소프트웨어 라이선스',
     'user'  					=> '사용자',
     'view'  					=> '라이선스 보기',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ko/admin/manufacturers/message.php b/resources/lang/ko/admin/manufacturers/message.php
index dcfc3918c5..861692b8c0 100644
--- a/resources/lang/ko/admin/manufacturers/message.php
+++ b/resources/lang/ko/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => '제조업체가 존재하지 않습니다.',
     'assoc_users'	 => '이 제조업체는 현재 적어도 하나의 모델에 연결되어 있기에 삭제 할 수 없습니다. 이 제조업체가 모델을 참조 하지 않게 수정하고 다시 시도 해 보세요. ',
 
diff --git a/resources/lang/ko/admin/manufacturers/table.php b/resources/lang/ko/admin/manufacturers/table.php
index 84e08c54e2..7424b4708e 100644
--- a/resources/lang/ko/admin/manufacturers/table.php
+++ b/resources/lang/ko/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> '지원 이메일',
     'support_phone'   		=> '지원 전화',
     'support_url'   		=> '지원 URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> '제조업체 갱신',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ko/admin/models/general.php b/resources/lang/ko/admin/models/general.php
index bc10d14034..26b65ba871 100644
--- a/resources/lang/ko/admin/models/general.php
+++ b/resources/lang/ko/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => '모델이 삭제되었습니다.',
     'bulk_delete'               => '자산 모델 대량 삭제',
     'bulk_delete_help'               => '선택한 자산 모델의 삭제를 확인하려면 아래 체크박스를 사용하십시오. 자산에 연결된 자산 모델은 자산이 다른 모델과 연결될 때까지 삭제할 수 없습니다.',
-    'bulk_delete_warn'          => '다음을 삭제하려 합니다:model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => '모델 복원',
     'requestable'               => '사용자가 이 모델을 요청하실 수 있습니다',
 	'show_mac_address'			      => '이 모델의 자산에서 MAC 어드레스 항목 보기',
diff --git a/resources/lang/ko/admin/models/message.php b/resources/lang/ko/admin/models/message.php
index 3d34950de6..eb60f1da72 100644
--- a/resources/lang/ko/admin/models/message.php
+++ b/resources/lang/ko/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => '모델이 존재하지 않습니다.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => '이 모델은 현재 하나 이상의 자산들과 연결되어 있기에 삭제 할 수 없습니다. 자산들을 삭제하고 다시 삭제하길 시도하세요. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => '모델이 갱신되지 않았습니다. 다시 시도하세요.',
-        'success' => '모델이 갱신되었습니다.'
+        'success' => '모델이 갱신되었습니다.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> '변경된 항목이 없어서, 갱신되지 않습니다.',
-        'success' 		=> '모델 갱신됨.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => '선택된 모델이 없기에, 삭제되지 않습니다.',
-        'success' 		    => ': success_count 모델이 삭제되었습니다!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ': success_count개의 모델이 삭제되었지만, fail_count 개는 관련된 자산이 있기에 삭제할 수 없습니다.'
     ),
 
diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php
index a12bdd5651..6bb1fea515 100644
--- a/resources/lang/ko/admin/settings/general.php
+++ b/resources/lang/ko/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => '사용자에게 보낸 반입/반출 이메일 사본을 추가 이메일 계정으로 보내려면, 여기에 입력하세요. 그렇지 않으면 이 필드를 비워 두세요.',
     'is_ad'				        => '이것은 액티브 디렉토리 서버입니다.',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> '알림 전송',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> '알림 사용',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> '바코드 설정',
@@ -77,6 +77,7 @@ return [
     '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 사용자 키',
     'ldap_client_tls_cert'      => 'LDAP 사용자 인증서',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP 설정',
     'ldap_client_tls_cert_help' => '클라이언트 측 TLS 인증서 및 LDAP 연결용 키는 일반적으로 \'보안 LDAP\'가 포함된 Google Workspace 구성에서만 유용합니다.',
      'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => '위에서 지정한 기본 DN의 유효한 LDAP 사용자 이름 및 비밀번호를 입력하여 LDAP 로그인이 올바르게 구성되었는지 테스트하십시오. 반드시 업데이트 된 LDAP 설정을 먼저 저장해야합니다.',
     'ldap_login_sync_help'      => '이것은 LDAP가 올바르게 동기화 될 수 있는지 테스트합니다. LDAP 인증 질의어가 올바르지 않으면 사용자가 여전히 로그인하지 못할 수 있습니다. 반드시 업데이트 된 LDAP 설정을 먼저 저장해야합니다.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => '이메일에 이미지 표시',
     'show_images_in_email_help'   => 'Snipe-IT 설치가 VPN 또는 폐쇄 형 네트워크 하에 있고 네트워크 외부 사용자가 이 설치에서 제공된 이미지를 이메일에 불러올수 없는 경우 이 상자의 선택을 해제하세요.',
     'site_name'                 => '사이트 명',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Bot 명',
-    'slack_channel'             => 'Slack 채널',
-    'slack_endpoint'            => 'Slack 종료점',
-    'slack_integration'         => 'Slack 설정',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => '슬랙 정보를 저장하면, 테스트 버튼이 나타납니다.',
-    'slack_test_help'           => '슬랙 통합이 올바르게 구성되었는지 테스트하십시오. 반드시 먼저 갱신된 지연 슬랙 설정을 저장해야합니다.',
+    'general_webhook'           => 'General Webhook',
+    '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 버전',
     'support_footer'            => '꼬리말 링크 지원',
     'support_footer_help'       => 'Snipe-IT 지원 정보 및 사용자 매뉴얼 보기 권한 설정',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ko/admin/settings/message.php b/resources/lang/ko/admin/settings/message.php
index b17365c1de..a433e2b23e 100644
--- a/resources/lang/ko/admin/settings/message.php
+++ b/resources/lang/ko/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ko/admin/users/general.php b/resources/lang/ko/admin/users/general.php
index c83acf2dbe..df681ceab4 100644
--- a/resources/lang/ko/admin/users/general.php
+++ b/resources/lang/ko/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.',
+    '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',
     'send_email_help'   => '이 사용자에게 자격 증명을 보내려면 이메일 주소를 입력해야 합니다. 자격 증명을 이메일로 보내는 것은 사용자 생성 시에만 수행할 수 있습니다. 암호는 단방향 해시에 저장되며 한 번 저장하면 재열람 할 수 없습니다.',
     'view_user'         => '사용자 보기 :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ko/admin/users/message.php b/resources/lang/ko/admin/users/message.php
index e1ef42f0db..373a6bd307 100644
--- a/resources/lang/ko/admin/users/message.php
+++ b/resources/lang/ko/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => '이 자산이 거부되었습니다.',
     'bulk_manager_warn'	        => '사용자가 성공적으로 갱신되었지만, 선택한 관리자가 편집할 사용자 목록에도 있었고, 사용자가 자신의 관리자가 아니 어서 관리자 항목이 저장되지 않았습니다. 관리자를 제외한 사용자를 다시 선택하십시오.',
     'user_exists'               => '사용자가 이미 존재합니다!',
-    'user_not_found'            => '사용자 [:id]는 존재하지 않습니다.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => '로그인 항목을 입력해 주세요.',
     'user_password_required'    => '비밀번호를 입력해 주세요.',
     'insufficient_permissions'  => '승인 불충분.',
diff --git a/resources/lang/ko/auth/general.php b/resources/lang/ko/auth/general.php
index b040aa8b4a..4882e606e4 100644
--- a/resources/lang/ko/auth/general.php
+++ b/resources/lang/ko/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => '자동 로그인',
     'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
     'username_help_bottom'          => '사용자 계정과  이메일 주소는 구성에 따라 동일할 수 있지만 동일하지 않을 수 있습니다. 사용자 계정을 기억할 수 없는 경우 관리자에게 문의하십시오. 연결된 이메일 주소가 없는 사용자 계정은 암호 재설정 링크가 이메일로 전송되지 않습니다.',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php
index 665d7cbd44..c1d4287259 100644
--- a/resources/lang/ko/general.php
+++ b/resources/lang/ko/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> '부속품들',
     'activated'			    => '활성화',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> '부속품',
     'accessory_report'		=> '부속품 보고서',
     'action'                => '작업',
@@ -23,11 +24,17 @@ return [
     'asset_tags'            => '자산 태그',
     'assets_available'		=> '사용 가능한 자산',
     'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'accept_assets_menu'    => '승인된 자산',
     'audit'				    => '감사',
     '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',
     'avatar_delete'         => '아바타 삭제',
     'avatar_upload'         => '아바타 올리기',
     'back'      			=> '이전',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => '상태별',
     'cancel'  				=> '취소',
     'categories'			=> '분류',
@@ -83,6 +92,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.',
     'deleted'  				=> '삭제됨',
     'delete_seats'  		=> '삭제한 Seat',
     'deletion_failed'       => '삭제 실패',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => '불러오기',
     '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>.',
@@ -147,7 +158,9 @@ return [
     'asset_maintenance_report' => '자산 관리 보고서',
     'asset_maintenances'       => '자산 관리',
     'item'  				=> '항목',
-    'item_name'             => 'Item Name',
+    'item_name'             => '항목 이름',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => '권한 없음',
     'kits'       			=> '사전 정의된 키트',
     'language'				=> '언어',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => '요청 취소',
     'save'  				=> '저장',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> '선택',
     'select_all'            => '모두 선택',
     'search'				=> '찾기',
@@ -240,8 +254,8 @@ return [
     'signature'             => '서명',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> '스킨',
-    'slack_msg_note'        => '슬랙으로 메세지 보내기',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => '데모 모드: 설치 시 일부 기능은 사용할 수 없습니다.',
     'site_name'				=> '사이트 명',
     'state'  				=> '주',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '정말로 삭제 하시겠습니까',
     'submit'				=> '제출',
     'target'                => '대상',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => '시간과 날짜 표시',
     'total_assets'			=> '총 자산',
     'total_licenses'		=> '총 라이선스',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ko/help.php b/resources/lang/ko/help.php
index a866ab0a78..55e54f0947 100644
--- a/resources/lang/ko/help.php
+++ b/resources/lang/ko/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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ko/localizations.php b/resources/lang/ko/localizations.php
index be2c321861..1488e66e3b 100644
--- a/resources/lang/ko/localizations.php
+++ b/resources/lang/ko/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'남수단',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ko/mail.php b/resources/lang/ko/mail.php
index 55ccb2fc8e..fc90ca8c77 100644
--- a/resources/lang/ko/mail.php
+++ b/resources/lang/ko/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => '아래의 자격 증명을 사용하여 새 Snipe-IT 설치본에 로그인 하세요:',
     'login' => '로그인:',
     'Low_Inventory_Report' => '재고 부족 보고서',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => '최소 수량',
     'name' => '이름',
     'new_item_checked' => '당신의 이름으로 새 품목이 반출 되었습니다, 이하는 상세입니다.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => '당신의 Snipe-IT 인증들',
     'Accessory_Checkin_Notification' => '부속품 반입 됨',
     'Asset_Checkin_Notification' => '자산 반입 됨',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => '라이센스 확인 됨.',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => '자산 확인',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ko/validation.php b/resources/lang/ko/validation.php
index cdd1b160ab..6f760934e2 100644
--- a/resources/lang/ko/validation.php
+++ b/resources/lang/ko/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute는 최소 :min 항목이어야 합니다.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => '선택한 :attribute 가 부정확 합니다.',
     'numeric'              => ':attribute 는 숫자만 가능합니다.',
     'present'              => ':attribute 항목이 있어야 합니다.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => '현재 비밀번호가 잘못되었습니다.',
         'dumbpwd'          => '그 비밀번호는 너무 일반적입니다.',
         'statuslabel_type' => '유효한 상태 라벨 형식을 선택해 주셔야 합니다',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/lt/admin/accessories/general.php b/resources/lang/lt/admin/accessories/general.php
index 20ebfcadf6..f222d352f9 100644
--- a/resources/lang/lt/admin/accessories/general.php
+++ b/resources/lang/lt/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Atnaujinti įrangą',
     'use_default_eula'					=> 'Naudoti  <a href="#" data-toggle="modal" data-target="#eulaModal"> pirminę EULA </a>  vietoje to.',
     'use_default_eula_disabled'			=> '<del>Naudoti pirminę numatytąją EULA.</del> Nėra nustatytos pirminės numatytosios EULA. Prašome pridėkite ją nustatymuose.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/lt/admin/accessories/message.php b/resources/lang/lt/admin/accessories/message.php
index ae1570c571..7ee6fb25e3 100644
--- a/resources/lang/lt/admin/accessories/message.php
+++ b/resources/lang/lt/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Priedo nepavyko išduoti, pabandykite dar kartą',
         'success' 		=> 'Įranga sėkmingai išimta.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.'
     ),
 
diff --git a/resources/lang/lt/admin/asset_maintenances/form.php b/resources/lang/lt/admin/asset_maintenances/form.php
index ae5d2beef6..fa9c312c9f 100644
--- a/resources/lang/lt/admin/asset_maintenances/form.php
+++ b/resources/lang/lt/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Įrangos priežiūros tipas',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Antraštė',
-        'start_date'             => 'Pradžios data',
-        'completion_date'        => 'Pabaigos data',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kaina',
         'is_warranty'            => 'Garantinis taisymas',
-        'asset_maintenance_time' => 'Įrangos naudojimas (dienomis)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Pastabos',
-        'update'                 => 'Atnaujint įrangos preižiūrą',
-        'create'                 => 'Sukurti įrangos priežiūrą'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/lt/admin/categories/message.php b/resources/lang/lt/admin/categories/message.php
index f05e4d5e3f..5662b6af37 100644
--- a/resources/lang/lt/admin/categories/message.php
+++ b/resources/lang/lt/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorija neatnaujinta, prašome pabandykite dar kartą',
-        'success' => 'Kategorijos atnaujinimas sėkmingas.'
+        'success' => 'Kategorijos atnaujinimas sėkmingas.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/lt/admin/components/general.php b/resources/lang/lt/admin/components/general.php
index 04149fbb2b..388efb77a0 100644
--- a/resources/lang/lt/admin/components/general.php
+++ b/resources/lang/lt/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Likutis',
     'total' 			                 => 'Iš viso',
     'update'                            => 'Atnaujinti komponentą',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/lt/admin/components/message.php b/resources/lang/lt/admin/components/message.php
index 513f46be18..4af53883c5 100644
--- a/resources/lang/lt/admin/components/message.php
+++ b/resources/lang/lt/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponentas nebuvo išregistruotas, bandykite dar kartą',
         'success' 		=> 'Komponentas sėkmingai patikrintas.',
-        'user_does_not_exist' => 'Šis naudotojas neteisingas. Prašome bandykite dar kartą.'
+        'user_does_not_exist' => 'Šis naudotojas neteisingas. Prašome bandykite dar kartą.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/lt/admin/consumables/message.php b/resources/lang/lt/admin/consumables/message.php
index 8fc47a10d5..de1df11c58 100644
--- a/resources/lang/lt/admin/consumables/message.php
+++ b/resources/lang/lt/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ši suvartojama įranga nebuvo išimta, prašome bandykite dar kartą',
         'success' 		=> 'Suvartojam įranga sėkminga išimta.',
-        'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.'
+        'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/lt/admin/custom_fields/general.php b/resources/lang/lt/admin/custom_fields/general.php
index eb551a0534..a0e431e649 100644
--- a/resources/lang/lt/admin/custom_fields/general.php
+++ b/resources/lang/lt/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Naudojama modelių',
     'order'   		            => 'Užsakymas',
     'create_fieldset'         => 'Nauja laukų grupė',
+    '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'            => 'Naujas pritaikomas laukelis',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/lt/admin/groups/message.php b/resources/lang/lt/admin/groups/message.php
index 0655ca13da..8d0220b6d0 100644
--- a/resources/lang/lt/admin/groups/message.php
+++ b/resources/lang/lt/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Gruoė jau sukurta!',
-    'group_not_found'     => 'Tokios [:id] grupės nėra.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Laukelio pavadinimas privalomas',
 
     'success' => array(
diff --git a/resources/lang/lt/admin/hardware/form.php b/resources/lang/lt/admin/hardware/form.php
index 1de4ae6ece..aa34831296 100644
--- a/resources/lang/lt/admin/hardware/form.php
+++ b/resources/lang/lt/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Patvirtinkite masinio ištrynimo turinį',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Peržiūrėkite įrangos ištrinimą žemiau. Ištrinus, įranga galima atstatyti, tačiau daugiau nebus priskirta jokiam vartotojam.',
+  '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'	=> 'Jūs norite ištrinti :asset_count įranga.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Visa atnaujinama įranga',
     'bulk_update_help'	=> 'Ši forma leidžia jums atnaujinti kelias įrangas vienu metu. Prašome užpildykite laukelius, kuriuos reikia keisti. Visi laukeliai, kuriuos paliksite tuščius liks nepakeisti. ',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'Ši įranga negali būti išduodama.',
     'asset_deployable' => 'Ši įranga gali būti išduodama.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/lt/admin/hardware/general.php b/resources/lang/lt/admin/hardware/general.php
index 6de53c8880..449c42f7e4 100644
--- a/resources/lang/lt/admin/hardware/general.php
+++ b/resources/lang/lt/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Keisti įrangą',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Reiklaujamas',
     'requested'				    => 'Užklausta',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Atkurti įrangą',
     'pending'  					=> 'Vykdoma',
     'undeployable'  			=> 'Negalimas naudoti',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Peržiūrėti įrangą',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/lt/admin/hardware/message.php b/resources/lang/lt/admin/hardware/message.php
index e7f3ba745f..a7b41c8963 100644
--- a/resources/lang/lt/admin/hardware/message.php
+++ b/resources/lang/lt/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Įranga nebuvo atkurta, prašome bandykite dar kartą',
         'success' 		=> 'Įranga atkurta sėkmingai.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Jūsų failas importuotas',
         'file_delete_success'   => 'Jūsų failas buvo sėkmingai ištrintas',
         'file_delete_error'      => 'Nepavyko ištrinti failo',
+        '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',
     ],
 
 
diff --git a/resources/lang/lt/admin/hardware/table.php b/resources/lang/lt/admin/hardware/table.php
index e895b09c8a..f07bc661d8 100644
--- a/resources/lang/lt/admin/hardware/table.php
+++ b/resources/lang/lt/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Priimta/Išduota',
     'checkout_date' => 'Išdavimo data',
     'checkoutto' 	=> 'Išduota',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Skirtumas',
     'dl_csv' 		=> 'Atsisiųti CSV fromatu',
diff --git a/resources/lang/lt/admin/licenses/general.php b/resources/lang/lt/admin/licenses/general.php
index 05375b7352..cbcdafec7e 100644
--- a/resources/lang/lt/admin/licenses/general.php
+++ b/resources/lang/lt/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Apie licencijas',
-    'about_licenses'                  => 'Licencijos naudojamos programinei įrangai stebėti. Jie turi tam tikrą skaičių vietų, kurias galima patikrinti asmenims',
+    'about_licenses_title'      => 'Apie licencijas',
+    'about_licenses'            => 'Licencijos naudojamos programinei įrangai stebėti. Jie turi tam tikrą skaičių vietų, kurias galima patikrinti asmenims',
     'checkin'  					=> 'Išduoti licenzijos prieigą',
     'checkout_history'  		=> 'Išdavimo istorija',
     'checkout'  				=> 'Išduotas licenzijų kiekis',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Programinės įrangos licenzijos',
     'user'  					=> 'Naudotojas',
     'view'  					=> 'Peržiūrėti licenziją',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/lt/admin/manufacturers/message.php b/resources/lang/lt/admin/manufacturers/message.php
index f3d4432c84..e91c7d0ee5 100644
--- a/resources/lang/lt/admin/manufacturers/message.php
+++ b/resources/lang/lt/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Tokio gamintojo nėra.',
     'assoc_users'	 => 'Šis gamintojas šiuo metu susietas su daugaiau nei vienu modeliu ir negali būti ištrintas. Prašome atnaujinkite savo modelius, kad nesisietų su šiuo gamintoju ir bandykite iš naujo. ',
 
diff --git a/resources/lang/lt/admin/manufacturers/table.php b/resources/lang/lt/admin/manufacturers/table.php
index 842badf06d..a7b417f772 100644
--- a/resources/lang/lt/admin/manufacturers/table.php
+++ b/resources/lang/lt/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Palaikymas el. Paštu',
     'support_phone'   		=> 'Palaikymas telefonu',
     'support_url'   		=> 'Palaikymo URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Atnaujinti gamintoją',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/lt/admin/models/general.php b/resources/lang/lt/admin/models/general.php
index 503ec780d3..12e3fe26dd 100644
--- a/resources/lang/lt/admin/models/general.php
+++ b/resources/lang/lt/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Ištrinti pažymėtus turto modelius',
     'bulk_delete_help'               => '„Pažymėkite žemiau esantį langelį, kad patvirtintumėte pasirinktų turto modelių ištrynimą. Turto modeliai, kuriuose yra su jais susijęs turtas, negali būti ištrinti, išskyrus tuos atvejus, kai tas turtas yra susietas su kitu modeliu.“.',
-    'bulk_delete_warn'          => 'Ketinate ištrinti :model_count turto modelius.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Atkurti modelį',
     'requestable'               => 'Naudotojai gali užklausi šį modelį',
 	'show_mac_address'			      => 'Rodykite MAC adreso laukelį įrangoje šiam modeliui',
diff --git a/resources/lang/lt/admin/models/message.php b/resources/lang/lt/admin/models/message.php
index ff7495b781..2d28522996 100644
--- a/resources/lang/lt/admin/models/message.php
+++ b/resources/lang/lt/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Tokio modelio nėra.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Šis modelis šiuo metu susietas su daugiau nei vienu įrangos vientu ir negali būti ištrintas. Prašome ištrinkite įrangą ir tuomet bandykite trinti iš naujo. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modelis nebuvo atnaujintas, prašome bandykite iš naujo',
-        'success' => 'Modelis sėkmingai atnaujintas.'
+        'success' => 'Modelis sėkmingai atnaujintas.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nebuvo pakeista jokių laukų, todėl niekas nebuvo atnaujintas.',
-        'success' 		=> 'Modeliai atnaujinti.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nepasirinktas modelis, nėra ką ištrinti.',
-        'success' 		    => ':success_count model(s) ištrinti!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(s) buvo ištrinti, bet :fail_count negalima ištrinti todėl, kad turtas vis dar susietas.'
     ),
 
diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php
index ddd092ab7f..9e16358539 100644
--- a/resources/lang/lt/admin/settings/general.php
+++ b/resources/lang/lt/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'Jeigu Jūs norite siųsti išduoto/neišduoto turto sąrašo kopiją, įveskite čia el. pašto adresą. Kitu atveju palikite laukelį tuščią.',
     'is_ad'				        => 'Tai yra "Active Directory" serveris',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Siūsti įspėjimus',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Perspėjimai įjungti',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Prekės kodo nustatymai',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP nustatymai',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Prašome įvesti tinkamą LDAP vartotojo vardą ir slaptažodį iš bazės DN. Jūs privalote patikrinti ar LDAP prisijungimas sukonfigūruotas tinkamai. PIRMIAUSIA JŪS PRIVALOTE IŠSAUGOTI LDAP NUSTATYMUS.',
     'ldap_login_sync_help'      => 'Tai patikrina ar LDAP sinchronizacija teisinga. Jeigu Jūsų LADAP autentifikacijos užkalusa nėra teisinga, vartotojai gali negalėti prisijungti. PIRMIAUSIA JŪS PRIVALOTE IŠSAUGOTI LDAP NUSTATYMUS.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Rodyti nuotraukas el. pašte',
     'show_images_in_email_help'   => 'Nuimkite žymelę jeigu jūsų Snipe-IT instaliacija yra VPN arba uždarame tinkle ir vartotojai esantys už tinklo negalės įkrauti paveikslėlių jų el. paštuose.',
     'site_name'                 => 'Interneto puslapio pavadinimas',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack\'o boto vardas',
-    'slack_channel'             => 'Slack\'o kanalas',
-    'slack_endpoint'            => 'Slack\'o galutinis taškas',
-    'slack_integration'         => 'Slack\'o nustatymai',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Jeigu jūs išsaugosite informaciją, testavimo mygtukas bus rodomas.',
-    'slack_test_help'           => 'Patikrinkite, ar tinkamai atlikta „Slack“ konfigūracija. Jūs privalote išsaugoti savo "SLACK" nustatymus pirmiausia.',
+    'general_webhook'           => 'General Webhook',
+    '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 versija',
     'support_footer'            => 'Palaikomos poraštė nuorodos ',
     'support_footer_help'       => 'Nurodykite, kas matys nuorodas į „Snipe-IT“ palaikymo informacijos ir naudotojo vadovą',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/lt/admin/settings/message.php b/resources/lang/lt/admin/settings/message.php
index e770636c44..f820fd12f5 100644
--- a/resources/lang/lt/admin/settings/message.php
+++ b/resources/lang/lt/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/lt/admin/users/general.php b/resources/lang/lt/admin/users/general.php
index ead49e5cda..cfba5a87ae 100644
--- a/resources/lang/lt/admin/users/general.php
+++ b/resources/lang/lt/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Spausdinti visą turtą',
     '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',
     'software_user'     => ':name išduota įranga',
     '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'         => 'Peržiūrėti :name vartotoją',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/lt/admin/users/message.php b/resources/lang/lt/admin/users/message.php
index b215bf03ec..d21739b2c1 100644
--- a/resources/lang/lt/admin/users/message.php
+++ b/resources/lang/lt/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Jūs sėkmingai atšaukėte šią įrangą.',
     'bulk_manager_warn'	        => 'Jūsų vartotojai buvo sėkmingai atnaujinti, tačiau jūsų valdytojo įrašas nebuvo išsaugotas, nes pasirinktas valdytojas taip pat buvo naudotojo sąraše, kurį reikia redaguoti, o vartotojai gali būti ne jų valdytojai. Prašome vėl pasirinkti naudotojus, išskyrus valdytoją.',
     'user_exists'               => 'Naudotojas jau yra!',
-    'user_not_found'            => 'Naudotojas [:id] neegzistuoja.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Prisijungimo laukelis privalomas',
     'user_password_required'    => 'Slaptažodis būtinas.',
     'insufficient_permissions'  => 'Nepakankamos teisės.',
diff --git a/resources/lang/lt/auth/general.php b/resources/lang/lt/auth/general.php
index ad4c9f350f..03b6b55b22 100644
--- a/resources/lang/lt/auth/general.php
+++ b/resources/lang/lt/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Prisiminti mane',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php
index dcbe38dea4..58888b1f38 100644
--- a/resources/lang/lt/general.php
+++ b/resources/lang/lt/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Įrangos',
     'activated'			    => 'Aktyvuota',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Įranga',
     'accessory_report'		=> 'Įrangos ataskaita',
     'action'                => 'Veiksmas',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Administratorius',
     'administrator'			=> 'Administratorius',
     'add_seats'             => 'Prideta licenzijų',
-    'age'                   => "Age",
+    'age'                   => "Amžius",
     'all_assets'			=> 'Visa įranga',
     'all'       			=> 'Viskas',
     'archived'              => 'Archyvuota',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditas',
     'audit_report'			=> 'Audito žurnalas',
     'assets'				=> 'Įranga',
+    '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'         => 'Ištrinti ikoną',
     'avatar_upload'         => 'Įkelti ikoną',
     'back'      			=> 'Grįžti',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Atšaukti',
     'categories'			=> 'Kategorijos',
@@ -83,6 +92,7 @@ return [
     'debug_warning_text'    => 'Ši programa veikia gamybos režimu, įjungus derinimą. Tai gali atskleisti slaptus duomenis, jei jūsų programa yra prieinama išoriniam pasauliui. Išjunkite derinimo režimą nustatydami <code>APP_DEBUG</code> reikšmę savo <code>.env</code> byloje <code>false</code>.',
     'delete'  				=> 'Ištrinti',
     'delete_confirm'  		=> 'Ar jūs norite tikrai ištrinti?',
+    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Ištrinta',
     'delete_seats'  		=> 'Ištrintos licenzijos',
     'deletion_failed'       => 'Deletion failed',
@@ -101,7 +111,7 @@ return [
     'email_format'			=> 'El. pašto formatas',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Tai naudojama importuojant importuojamus el. Pašto adresus',
-    'error'				    => 'Error',
+    'error'				    => 'Klaida',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Įkelti',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Įrangos priežiūros',
     'item'  				=> 'Įranga',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nepakankamos teisės!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Kalba',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Prašymas atšauktas',
     'save'  				=> 'Išsaugoti',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Pasirinkite',
     'select_all'            => 'Select All',
     'search'				=> 'Ieškoti',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Parašas',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Išvaizda',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: kai kurios funkcijos yra išjungtos šio diegimo metu.',
     'site_name'				=> 'Interneto puslapio pavadinimas',
     'state'  				=> 'Rajonas',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Ar tikrai norite ištrinti',
     'submit'				=> 'Pateikti',
     'target'                => 'Tikslinė',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Laiko ir datos rodymas',
     'total_assets'			=> 'įrangos iš viso',
     'total_licenses'		=> 'iš viso licenzijų',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/lt/help.php b/resources/lang/lt/help.php
index 46bb92d68f..32a687fb47 100644
--- a/resources/lang/lt/help.php
+++ b/resources/lang/lt/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Detaliau',
 
-    '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/lt/localizations.php b/resources/lang/lt/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/lt/localizations.php
+++ b/resources/lang/lt/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/lt/mail.php b/resources/lang/lt/mail.php
index c4fafb1394..8e4624ca1a 100644
--- a/resources/lang/lt/mail.php
+++ b/resources/lang/lt/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Prisijunkite prie savo naujojo "Snipe-IT" diegimo naudodami toliau nurodytus įgaliojimus:',
     'login' => 'Prisijungti:',
     'Low_Inventory_Report' => 'Mažos inventorizacijos ataskaita',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min Kiekis',
     'name' => 'Pavadinimas',
     'new_item_checked' => 'Naujas objektas buvo patikrintas pagal jūsų vardą, išsami informacija pateikiama žemiau.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Jūsų Snipe-IT įgaliojimai',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/lt/validation.php b/resources/lang/lt/validation.php
index 6b4f3bd71e..ce09423ab0 100644
--- a/resources/lang/lt/validation.php
+++ b/resources/lang/lt/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atributui turi būti bent: min elementai.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Pasirinktas :attribute neteisingas.',
     'numeric'              => ':attribute privalo būti skaičius.',
     'present'              => 'Atributo laukas turi būti.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Jūsų dabartinis slaptažodis yra neteisingas',
         'dumbpwd'          => 'Šis slaptažodis yra per dažnas.',
         'statuslabel_type' => 'Turite pasirinkti tinkamą statuso etiketės tipą',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/lv/admin/accessories/general.php b/resources/lang/lv/admin/accessories/general.php
index 3e31a24455..a44297ff9d 100644
--- a/resources/lang/lv/admin/accessories/general.php
+++ b/resources/lang/lv/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Atjaunināt piederumu',
     'use_default_eula'					=> 'Tā vietā izmantojiet <a href="#" data-toggle="modal" data-target="#eulaModal">pirmo noklusējuma EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Izmantojiet galveno noklusējuma EULA</del>. Netiek iestatīta galvenā noklusējuma EULA. Lūdzu, pievienojiet vienu pakalpojumā Iestatījumi.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/lv/admin/accessories/message.php b/resources/lang/lv/admin/accessories/message.php
index 5c2378c61d..3def29f3e7 100644
--- a/resources/lang/lv/admin/accessories/message.php
+++ b/resources/lang/lv/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/lv/admin/asset_maintenances/form.php b/resources/lang/lv/admin/asset_maintenances/form.php
index dcfae943e8..9941f26ea0 100644
--- a/resources/lang/lv/admin/asset_maintenances/form.php
+++ b/resources/lang/lv/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Apkopes veids',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Nosaukums',
-        'start_date'             => 'Sākusies',
-        'completion_date'        => 'Pabeigts',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Izmaksas',
         'is_warranty'            => 'Garantijas uzlabošana',
-        'asset_maintenance_time' => 'Dienas',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Piezīmes',
-        'update'                 => 'Atjaunināt',
-        'create'                 => 'Izveidot'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/lv/admin/categories/message.php b/resources/lang/lv/admin/categories/message.php
index 7493e5f5c4..35a275ec41 100644
--- a/resources/lang/lv/admin/categories/message.php
+++ b/resources/lang/lv/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorija nav atjaunināta, lūdzu, mēģiniet vēlreiz',
-        'success' => 'Kategorija ir veiksmīgi atjaunināta.'
+        'success' => 'Kategorija ir veiksmīgi atjaunināta.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/lv/admin/components/general.php b/resources/lang/lv/admin/components/general.php
index ccc013d148..9862b12095 100644
--- a/resources/lang/lv/admin/components/general.php
+++ b/resources/lang/lv/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Atlikušais',
     'total' 			                 => 'Kopā',
     'update'                            => 'Atjaunināt komponents',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/lv/admin/components/message.php b/resources/lang/lv/admin/components/message.php
index 89c12a2f55..2bc43c7b49 100644
--- a/resources/lang/lv/admin/components/message.php
+++ b/resources/lang/lv/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponents netika pārbaudīts, lūdzu, mēģiniet vēlreiz',
         'success' 		=> 'Komponents veiksmīgi pārbaudīts.',
-        '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.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/lv/admin/consumables/message.php b/resources/lang/lv/admin/consumables/message.php
index 9e0202739b..3a675b7f5c 100644
--- a/resources/lang/lv/admin/consumables/message.php
+++ b/resources/lang/lv/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Neizdevās izņemt patēriņu, lūdzu, mēģiniet vēlreiz',
         'success' 		=> 'Izlietojamie izrakstīti veiksmīgi.',
-        '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.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/lv/admin/custom_fields/general.php b/resources/lang/lv/admin/custom_fields/general.php
index b204c08ff1..d846c5ce91 100644
--- a/resources/lang/lv/admin/custom_fields/general.php
+++ b/resources/lang/lv/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Izmantoti modeļi',
     'order'   		            => 'Pasūtījums',
     'create_fieldset'         => 'Jauns lauka laukums',
+    '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'            => 'Jauna pielāgota lauks',
     'create_field_title' => 'Izveidot jaunu pielāgoto lauku',
@@ -46,4 +49,6 @@ return [
     'unique' => 'Unikāls',
     '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',
 ];
diff --git a/resources/lang/lv/admin/groups/message.php b/resources/lang/lv/admin/groups/message.php
index c49d274624..82985471fe 100644
--- a/resources/lang/lv/admin/groups/message.php
+++ b/resources/lang/lv/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grupa jau pastāv!',
-    'group_not_found'     => 'Grupa [: id] nepastāv.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Nosaukuma lauks ir nepieciešams',
 
     'success' => array(
diff --git a/resources/lang/lv/admin/hardware/form.php b/resources/lang/lv/admin/hardware/form.php
index 7bf5cfa768..2e2bbe8066 100644
--- a/resources/lang/lv/admin/hardware/form.php
+++ b/resources/lang/lv/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Apstiprināt lielapjoma aktīvu dzēšanu',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Pārskatīt aktīvu lielapjoma dzēšanu zemāk. Dzēstos aktīvus var atjaunot, bet tie vairs nebūs saistīti ar šībrīža lietotāju.',
+  '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'	=> 'Jūs gatavojaties dzēst: asset_count aktīvi.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Lielapjoma atjaunināšanas līdzekļi',
     'bulk_update_help'	=> 'Šī veidlapa ļauj vienlaikus atjaunināt vairākus aktīvus. Aizpildiet tikai nepieciešamos laukus. Jebkurš tukšs laukums paliek nemainīgs.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Atjaunināt tikai noklusēja atrašanās vietu',
     '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.',
-    'processing_spinner' => 'Apstrādā...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Neobligātā informācija',
     'order_details'   => 'Pasūtījuma informācija'
 ];
diff --git a/resources/lang/lv/admin/hardware/general.php b/resources/lang/lv/admin/hardware/general.php
index 8088caf0e0..580a5b403a 100644
--- a/resources/lang/lv/admin/hardware/general.php
+++ b/resources/lang/lv/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Šis pamatlīdzeklis ir izdzēsts.',
     'edit'  					=> 'Rediģēt īpašumu',
     'model_deleted'  			=> 'Šis pamatlīdzekļu modelis ir dzēsts. Jums ir jāatjauno modelis pirms drīkstiet atjaunot pamatlīdzekli.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Pieļaujams',
     'requested'				    => 'Pieprasīts',
     'not_requestable'           => 'Nav pieprasāms',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Atjaunot aktīvus',
     'pending'  					=> 'Gaida',
     'undeployable'  			=> 'Nodarbināms',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Lūdzu skatiet zemāk.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/lv/admin/hardware/message.php b/resources/lang/lv/admin/hardware/message.php
index 8d20f69494..9f6e61fde0 100644
--- a/resources/lang/lv/admin/hardware/message.php
+++ b/resources/lang/lv/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Īpašums netika atjaunots, lūdzu, mēģiniet vēlreiz',
         'success' 		=> 'Aktīvs veiksmīgi atjaunots.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/lv/admin/hardware/table.php b/resources/lang/lv/admin/hardware/table.php
index 81087175ed..53becf7cb6 100644
--- a/resources/lang/lv/admin/hardware/table.php
+++ b/resources/lang/lv/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Iekšā ārā',
     'checkout_date' => 'Izrakstīšanās datums',
     'checkoutto' 	=> 'Izrakstīts',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Atšķirība',
     'dl_csv' 		=> 'Lejupielādējiet CSV',
diff --git a/resources/lang/lv/admin/licenses/general.php b/resources/lang/lv/admin/licenses/general.php
index d09ff39167..d328f3f2ce 100644
--- a/resources/lang/lv/admin/licenses/general.php
+++ b/resources/lang/lv/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Par licencēm',
-    'about_licenses'                  => 'Licences izmanto, lai izsekotu programmatūru. Viņiem ir noteikts skaits sēdvietu, kurus var pārbaudīt personām',
+    'about_licenses_title'      => 'Par licencēm',
+    'about_licenses'            => 'Licences izmanto, lai izsekotu programmatūru. Viņiem ir noteikts skaits sēdvietu, kurus var pārbaudīt personām',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Checkout vēsture',
     'checkout'  				=> 'Checkout licences sēdeklis',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Programmatūras licences',
     'user'  					=> 'Lietotājs',
     'view'  					=> 'Skatīt licenci',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/lv/admin/manufacturers/message.php b/resources/lang/lv/admin/manufacturers/message.php
index 33477efd09..d2d9434b3f 100644
--- a/resources/lang/lv/admin/manufacturers/message.php
+++ b/resources/lang/lv/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Ražotājs neeksistē.',
     'assoc_users'	 => 'Šis ražotājs pašlaik ir saistīts ar vismaz vienu modeli, un to nevar izdzēst. Lūdzu, atjauniniet savus modeļus, lai vairs nerādītu šo ražotāju, un mēģiniet vēlreiz.',
 
diff --git a/resources/lang/lv/admin/manufacturers/table.php b/resources/lang/lv/admin/manufacturers/table.php
index 2c5d637a1b..e4a5db2f3a 100644
--- a/resources/lang/lv/admin/manufacturers/table.php
+++ b/resources/lang/lv/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Atbalsta e-pastu',
     'support_phone'   		=> 'Atbalsta tālruni',
     'support_url'   		=> 'Atbalsta URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Atjaunināt ražotāju',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/lv/admin/models/general.php b/resources/lang/lv/admin/models/general.php
index 9a336e7c4c..b91edffb3a 100644
--- a/resources/lang/lv/admin/models/general.php
+++ b/resources/lang/lv/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Tiks dzēsti :model_count līdzekļu modeļi.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Atjaunot modeli',
     'requestable'               => 'Lietotāji var pieprasīt šo modeli',
 	'show_mac_address'			      => 'Parādiet MAC adreses lauku šī modeļa aktīvos',
diff --git a/resources/lang/lv/admin/models/message.php b/resources/lang/lv/admin/models/message.php
index 0b8092057e..4cbfa719e3 100644
--- a/resources/lang/lv/admin/models/message.php
+++ b/resources/lang/lv/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modelis nepastāv.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modelis nav atjaunināts, lūdzu, mēģiniet vēlreiz',
-        'success' => 'Modelis tika veiksmīgi atjaunināts.'
+        'success' => 'Modelis tika veiksmīgi atjaunināts.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Neviens laukums netika mainīts, tāpēc nekas netika atjaunināts.',
-        'success' 		=> 'Modeļi ir atjaunināti.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nav atlasītu modeļu, tāpēc nekas netika izdzēsts.',
-        'success' 		    => '{1} :success_count modelis dzēsts!|[2,*] :success_count modeļi dzēsti!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count modeļi dzēsti, tomēr :fail_count nevarēja tik dzēsti, jo tiem ir piesaistītas aparatūras.'
     ),
 
diff --git a/resources/lang/lv/admin/settings/general.php b/resources/lang/lv/admin/settings/general.php
index dbe4a3a5d1..bbc7c0fa73 100644
--- a/resources/lang/lv/admin/settings/general.php
+++ b/resources/lang/lv/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Tas ir Active Directory serveris',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Brīdinājumi ir iespējoti',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP iestatījumi',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Ievadiet derīgu LDAP lietotājvārdu un paroli no iepriekš norādītā pamata DN, lai pārbaudītu, vai LDAP lietotājvārds ir konfigurēts pareizi. VISPIRMS SAGLABĀJIET ATJAUNINĀTOS LDAP IESTATĪJUMUS.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Rādīt attēlus e-pastā',
     'show_images_in_email_help'   => 'Noņemiet atzīmi no šīs izvēles rūtiņas, ja jūsu Snipe-IT instalācija atrodas aiz VPN vai slēgta tīkla un lietotāji ārpus tīkla savā e-pasta ziņojumā nevarēs ielādēt attēlus, kas tiek rādīti no šīs instalācijas.',
     'site_name'                 => 'Vietnes nosaukums',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Vāja Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Pārbaudes poga parādīsies, tiklīdz būs saglabāta Slack informācija.',
-    'slack_test_help'           => 'Pārbaudīt, vai Slack iekļaušana ir uzstādīta pareizi. ATJAUNINĀTAJIEM SLACK UZSTĀDĪJUMIEM PIRMS TAM IR JĀBŪT SAGLABĀTIEM.',
+    'general_webhook'           => 'General Webhook',
+    '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 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.',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/lv/admin/settings/message.php b/resources/lang/lv/admin/settings/message.php
index a77ac637fb..fe733d7ad6 100644
--- a/resources/lang/lv/admin/settings/message.php
+++ b/resources/lang/lv/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/lv/admin/users/general.php b/resources/lang/lv/admin/users/general.php
index d224c7dc64..f026da2828 100644
--- a/resources/lang/lv/admin/users/general.php
+++ b/resources/lang/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.',
+    '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',
     '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'         => 'Apskatīt Lietotāju: vārds',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/lv/admin/users/message.php b/resources/lang/lv/admin/users/message.php
index b6f166027d..6cfcb9c306 100644
--- a/resources/lang/lv/admin/users/message.php
+++ b/resources/lang/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 [: id] nepastāv.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Ievades lauks ir nepieciešams',
     'user_password_required'    => 'Parole ir nepieciešama.',
     'insufficient_permissions'  => 'Nepietiekamas atļaujas.',
diff --git a/resources/lang/lv/auth/general.php b/resources/lang/lv/auth/general.php
index 5413b2b409..a311b184d1 100644
--- a/resources/lang/lv/auth/general.php
+++ b/resources/lang/lv/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Atceries mani',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php
index dce81d478a..c5adf55438 100644
--- a/resources/lang/lv/general.php
+++ b/resources/lang/lv/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Aksesuāri',
     'activated'			    => 'Aktivizēts',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Piederums',
     'accessory_report'		=> 'Piederumu pārskats',
     'action'                => 'Darbība',
@@ -27,7 +28,13 @@ return [
     'audit'				    => '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',
     'avatar_delete'         => 'Izdzēst Avatar',
     'avatar_upload'         => 'Augšupielādēt Avatar',
     'back'      			=> 'Atpakaļ',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Lielapjoma rediģēšana',
     'bulk_delete'           => 'Lielapjoma dzēšana',
     'bulk_actions'          => 'Lielapjoma darbības',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'pēc statusa',
     'cancel'  				=> 'Atcelt',
     'categories'			=> 'Kategorijas',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Svītrots',
     'delete_seats'  		=> 'Izdzēstās vietas',
     'deletion_failed'       => 'Dzēšana neizdevās',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Atļautie failu tipi ir jpg, webp, png, gif, and svg. Maksimālais augšuplādējamais faila izmērs ir :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ēt',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Aktīvu uzturēšana',
     'item'  				=> 'Vienums',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nepietiekamas atļaujas!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Valoda',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Pieprasījums atcelts',
     'save'  				=> 'Saglabājiet',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Izvēlieties',
     'select_all'            => 'Select All',
     'search'				=> 'Meklēt',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Paraksts',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Dizains',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: dažas instalācijas funkcijas ir atspējotas.',
     'site_name'				=> 'Vietnes nosaukums',
     'state'  				=> 'Valsts',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Vai tiešām vēlaties dzēst',
     'submit'				=> 'Iesniegt',
     'target'                => 'Mērķis',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Laika un datuma displejs',
     'total_assets'			=> 'kopējie aktīvi',
     'total_licenses'		=> 'kopējās licences',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/lv/help.php b/resources/lang/lv/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/lv/help.php
+++ b/resources/lang/lv/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/lv/localizations.php b/resources/lang/lv/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/lv/localizations.php
+++ b/resources/lang/lv/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/lv/mail.php b/resources/lang/lv/mail.php
index ec6dfa8067..e506a4a995 100644
--- a/resources/lang/lv/mail.php
+++ b/resources/lang/lv/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Piesakieties savā jaunajā Snipe-IT instalācijā, izmantojot tālāk minētos akreditācijas datus.',
     'login' => 'Pieslēgties:',
     'Low_Inventory_Report' => 'Zema inventarizācijas atskaite',
+    'inventory_report' => 'Inventory Report',
     '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.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Jūsu Snipe-IT akreditācijas dati',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/lv/validation.php b/resources/lang/lv/validation.php
index e6b66f5266..d1af5afe35 100644
--- a/resources/lang/lv/validation.php
+++ b/resources/lang/lv/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribūtam jābūt vismaz: min vienumiem.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/mi/admin/accessories/general.php b/resources/lang/mi/admin/accessories/general.php
index 523ea15e8e..5db9daed54 100644
--- a/resources/lang/mi/admin/accessories/general.php
+++ b/resources/lang/mi/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Whakahōuhia te Uru',
     'use_default_eula'					=> 'Whakamahia te taunoa 123_57__321primary taunoa EULA</a> hei utu mo tenei.',
     'use_default_eula_disabled'			=> '<del>Me te taunoa tuatahi o te EULA instead.</del> Karekau he tautuhinga taunoa EULA. Tēnā tāpirihia tētahi i Ngā Tautuhinga.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/mi/admin/accessories/message.php b/resources/lang/mi/admin/accessories/message.php
index 9ecd7416da..4c8ddb4aa7 100644
--- a/resources/lang/mi/admin/accessories/message.php
+++ b/resources/lang/mi/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/mi/admin/asset_maintenances/form.php b/resources/lang/mi/admin/asset_maintenances/form.php
index 3ebd1d2e8f..283f2e8edd 100644
--- a/resources/lang/mi/admin/asset_maintenances/form.php
+++ b/resources/lang/mi/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tae Whakahaere',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Taitara',
-        'start_date'             => 'Kua tīmata',
-        'completion_date'        => 'Kua oti',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Te utu',
         'is_warranty'            => 'Whakapai Whaimana',
-        'asset_maintenance_time' => 'Nga ra',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Tuhipoka',
-        'update'                 => 'Whakahou',
-        'create'                 => 'Waihanga'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/mi/admin/categories/message.php b/resources/lang/mi/admin/categories/message.php
index c0f90c92df..e312d80927 100644
--- a/resources/lang/mi/admin/categories/message.php
+++ b/resources/lang/mi/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kāhore i whakahoutia te kāwai, tēnā whakamātau anō',
-        'success' => 'Kua pai te whakahoutanga o te momo.'
+        'success' => 'Kua pai te whakahoutanga o te momo.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/mi/admin/components/general.php b/resources/lang/mi/admin/components/general.php
index 7eb5aecf6c..23ebf308b4 100644
--- a/resources/lang/mi/admin/components/general.php
+++ b/resources/lang/mi/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Te noho',
     'total' 			                 => 'Te tapeke',
     'update'                            => 'Whakahōuhia te Wae',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/mi/admin/components/message.php b/resources/lang/mi/admin/components/message.php
index f23dfab83d..3b893db5cf 100644
--- a/resources/lang/mi/admin/components/message.php
+++ b/resources/lang/mi/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Kāore i tutakina te wāhanga, tēnā whakamātau anō',
         'success' 		=> 'Kua tohua te Waeine.',
-        'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.'
+        'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mi/admin/consumables/message.php b/resources/lang/mi/admin/consumables/message.php
index 621c0b12af..593d59bc76 100644
--- a/resources/lang/mi/admin/consumables/message.php
+++ b/resources/lang/mi/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Kāore i whakamahia te whakamahinga, tēnā whakamātau anō',
         'success' 		=> 'He pai te tirotiro i te whakamahinga.',
-        'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.'
+        'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mi/admin/custom_fields/general.php b/resources/lang/mi/admin/custom_fields/general.php
index d8adee0bfa..139d982ad8 100644
--- a/resources/lang/mi/admin/custom_fields/general.php
+++ b/resources/lang/mi/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Kua Whakamahia Ma Nga Tauira',
     'order'   		            => 'Whakatau',
     'create_fieldset'         => 'Nga Pakanga Hou',
+    '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'            => 'Rawa Ritenga Hou',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/mi/admin/groups/message.php b/resources/lang/mi/admin/groups/message.php
index c2b4b288b5..a99f5b835e 100644
--- a/resources/lang/mi/admin/groups/message.php
+++ b/resources/lang/mi/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Kua oti te roopu!',
-    'group_not_found'     => 'Kāore te rōpū [: id] i te tīariari.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Kei te hiahiatia te mara ingoa',
 
     'success' => array(
diff --git a/resources/lang/mi/admin/hardware/form.php b/resources/lang/mi/admin/hardware/form.php
index bc5a4cc575..6d3392720f 100644
--- a/resources/lang/mi/admin/hardware/form.php
+++ b/resources/lang/mi/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Whakaaetia te Puku Whakamuri Taonga',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Arotakehia nga rawa mo te whakakore nui i raro. Kia mukua, ka taea te whakahoki mai i enei taonga, engari kaore i te hono atu ki nga kaiwhakamahi e tukuna ana ki a raatau.',
+  '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'	=> 'Kei te tata koe ki te muku: te hua moni rawa.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Kaupapa Whakatairanga Nui',
     'bulk_update_help'	=> 'Ko tenei puka ka taea e koe te whakahou i nga hua maha i te wa kotahi. Whakakiia nga mara e hiahia ana koe ki te huri. Ko nga mara katoa e mahue ana ka noho tonu.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/mi/admin/hardware/general.php b/resources/lang/mi/admin/hardware/general.php
index 54e87ab6da..28a9fc76e8 100644
--- a/resources/lang/mi/admin/hardware/general.php
+++ b/resources/lang/mi/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Whakatikahia te Ahua',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Ka taea te tuku',
     'requested'				    => 'I tonohia',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Whakaorangia te Ahua',
     'pending'  					=> 'Kei te tatari',
     'undeployable'  			=> 'Kaore e taea',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/mi/admin/hardware/message.php b/resources/lang/mi/admin/hardware/message.php
index 0dae27873c..da810f9401 100644
--- a/resources/lang/mi/admin/hardware/message.php
+++ b/resources/lang/mi/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Kaore i whakahokia mai te tahua, tena koa ngana ano',
         'success' 		=> 'Kua hokihia te tahua.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/mi/admin/hardware/table.php b/resources/lang/mi/admin/hardware/table.php
index bc2547cab2..2d14e3a67c 100644
--- a/resources/lang/mi/admin/hardware/table.php
+++ b/resources/lang/mi/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In / Out',
     'checkout_date' => 'Rā Rārangi',
     'checkoutto' 	=> 'Kua Mataarahia',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Tuhinga o mua',
     'dl_csv' 		=> 'Tikiake CSV',
diff --git a/resources/lang/mi/admin/licenses/general.php b/resources/lang/mi/admin/licenses/general.php
index 92d4f3c2d8..eec2918f44 100644
--- a/resources/lang/mi/admin/licenses/general.php
+++ b/resources/lang/mi/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Mō Ngā Raihana',
-    'about_licenses'                  => 'Ka whakamahia nga raihana ki te aroturuki i te rorohiko. Kei a raua he maha o nga nohoanga e taea ana te tirotiro ki nga takitahi',
+    'about_licenses_title'      => 'Mō Ngā Raihana',
+    'about_licenses'            => 'Ka whakamahia nga raihana ki te aroturuki i te rorohiko. Kei a raua he maha o nga nohoanga e taea ana te tirotiro ki nga takitahi',
     'checkin'  					=> 'Waitohu Tika Tono',
     'checkout_history'  		=> 'Tari Hoko',
     'checkout'  				=> 'Whakaritea te Tiwhikete Raihana',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Raihana Pūmanawa',
     'user'  					=> 'Kaiwhakamahi',
     'view'  					=> 'Tirohia Raihana',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/mi/admin/manufacturers/message.php b/resources/lang/mi/admin/manufacturers/message.php
index cb6e56c109..209e3e35b2 100644
--- a/resources/lang/mi/admin/manufacturers/message.php
+++ b/resources/lang/mi/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Kaore te kaihoko i te tīariari.',
     'assoc_users'	 => 'Ko tenei kaiwhakanao e whai ana ki tetahi tauira kotahi, kaore e taea te muku. Whakaorangia nga tauira kia kore koe e tohu i tenei kaihanga me te ngana ano.',
 
diff --git a/resources/lang/mi/admin/manufacturers/table.php b/resources/lang/mi/admin/manufacturers/table.php
index 9c47aa3288..7aa9afd16c 100644
--- a/resources/lang/mi/admin/manufacturers/table.php
+++ b/resources/lang/mi/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Tautoko Īmēra',
     'support_phone'   		=> 'Tautoko Waea',
     'support_url'   		=> 'Tautoko URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Whakahōu Kaihanga',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/mi/admin/models/general.php b/resources/lang/mi/admin/models/general.php
index 5ed50c881b..b5e42a5290 100644
--- a/resources/lang/mi/admin/models/general.php
+++ b/resources/lang/mi/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Whakahoki Tauira',
     'requestable'               => 'Ka taea e nga kaiwhakamahi te tono i tenei tauira',
 	'show_mac_address'			      => 'Whakaatuhia te maraataka MAC mo nga taonga i tenei tauira',
diff --git a/resources/lang/mi/admin/models/message.php b/resources/lang/mi/admin/models/message.php
index 1e372cf64b..271bca3bd5 100644
--- a/resources/lang/mi/admin/models/message.php
+++ b/resources/lang/mi/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Kāore te tauira i te tīariari.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Kāore i te whakahouhia te tauira, na me ngana ano',
-        'success' => 'He pai te whakahoutanga o te tauira.'
+        'success' => 'He pai te whakahoutanga o te tauira.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Kaore i whakarereke nga mara, naore i whakahoutia.',
-        'success' 		=> 'Kua whakahoutia nga tauira.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/mi/admin/settings/general.php b/resources/lang/mi/admin/settings/general.php
index bd31cdb8d1..4fbc513d76 100644
--- a/resources/lang/mi/admin/settings/general.php
+++ b/resources/lang/mi/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'He raupapa Active Directory tēnei',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Kua Whakahohea nga Aler',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Tautuhinga 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Ingoa Pae',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Ngā Tautuhinga Hati',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/mi/admin/settings/message.php b/resources/lang/mi/admin/settings/message.php
index f46179aeb8..73fe2fe8f3 100644
--- a/resources/lang/mi/admin/settings/message.php
+++ b/resources/lang/mi/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/mi/admin/users/general.php b/resources/lang/mi/admin/users/general.php
index 5802c303bb..6e788e182e 100644
--- a/resources/lang/mi/admin/users/general.php
+++ b/resources/lang/mi/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.',
+    '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',
     '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'         => 'Tirohia te Kaiwhakamahi: ingoa',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/mi/admin/users/message.php b/resources/lang/mi/admin/users/message.php
index 24d7ce46e2..4360ccf470 100644
--- a/resources/lang/mi/admin/users/message.php
+++ b/resources/lang/mi/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 [: id] i te tīariari.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Kei te hiahiatia te mara takiuru',
     'user_password_required'    => 'Kei te hiahiatia te kupuhipa.',
     'insufficient_permissions'  => 'Nga Whakaae Korero.',
diff --git a/resources/lang/mi/auth/general.php b/resources/lang/mi/auth/general.php
index 73638318c6..fb99c53edf 100644
--- a/resources/lang/mi/auth/general.php
+++ b/resources/lang/mi/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Kia mahara ki ahau',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/mi/general.php b/resources/lang/mi/general.php
index 9e2e9ee150..8daf216bd8 100644
--- a/resources/lang/mi/general.php
+++ b/resources/lang/mi/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Tuhinga',
     'activated'			    => 'Kua whakahohe',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Waea Uru',
     'accessory_report'		=> 'Pūrongo Whaiaro',
     'action'                => 'Mahi',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Arotake',
     'audit_report'			=> 'Manatoko Whakamuri',
     'assets'				=> 'Ngā taonga',
+    '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'         => 'Mukua te Avatar',
     'avatar_upload'         => 'Tukuake Avatar',
     'back'      			=> 'Hoki',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Whakakore',
     'categories'			=> 'Ngā Kāwai',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Kua mukua',
     'delete_seats'  		=> 'Kua mukua nga Maatai',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Kawemai',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Mahinga Tahua',
     'item'  				=> 'Tuhinga',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'He whakaaetanga kore!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Reo',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Tono Whakamutua',
     'save'  				=> 'Tiaki',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Tīpako',
     'select_all'            => 'Select All',
     'search'				=> 'Rapua',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Waitohu',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => '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',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Kei te hiahia koe kia mukua',
     'submit'				=> 'Tukuna',
     'target'                => 'Kua arotahi',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Te Whakaatu me te Whakaaturanga',
     'total_assets'			=> 'te katoa o nga rawa',
     'total_licenses'		=> 'katoa raihana',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/mi/help.php b/resources/lang/mi/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/mi/help.php
+++ b/resources/lang/mi/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/mi/localizations.php b/resources/lang/mi/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/mi/localizations.php
+++ b/resources/lang/mi/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/mi/mail.php b/resources/lang/mi/mail.php
index 17dfd555c5..a26811f6f7 100644
--- a/resources/lang/mi/mail.php
+++ b/resources/lang/mi/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Whakauru ki to taahiranga hou Snipe-IT ma te whakamahi i nga taipitopito kei raro nei:',
     'login' => 'Whakauru:',
     'Low_Inventory_Report' => 'Pūrongo Inventory Low',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Ingoa',
     'new_item_checked' => 'Kua tohua tetahi mea hou i raro i to ingoa, kei raro iho nga korero.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Nga tohu tohu Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/mi/validation.php b/resources/lang/mi/validation.php
index 6732b4ad57..00c19c54cf 100644
--- a/resources/lang/mi/validation.php
+++ b/resources/lang/mi/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Ko te: me whai i te huanga: iti rawa nga taonga.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/mk/admin/accessories/general.php b/resources/lang/mk/admin/accessories/general.php
index 0d97956c28..1303eeeedb 100644
--- a/resources/lang/mk/admin/accessories/general.php
+++ b/resources/lang/mk/admin/accessories/general.php
@@ -16,5 +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.',
 
 );
diff --git a/resources/lang/mk/admin/accessories/message.php b/resources/lang/mk/admin/accessories/message.php
index be80ec9e8d..1e2ad31d3b 100644
--- a/resources/lang/mk/admin/accessories/message.php
+++ b/resources/lang/mk/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Додатокот не беше задолжен, обидете се повторно',
         'success' 		=> 'Додатокот е задолжен.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.'
     ),
 
diff --git a/resources/lang/mk/admin/asset_maintenances/form.php b/resources/lang/mk/admin/asset_maintenances/form.php
index ec848c9b8b..eacd6cada3 100644
--- a/resources/lang/mk/admin/asset_maintenances/form.php
+++ b/resources/lang/mk/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Тип на одржување',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Наслов',
-        'start_date'             => 'Почнато',
-        'completion_date'        => 'Завршено',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Цена',
         'is_warranty'            => 'Подобрување на гаранцијата',
-        'asset_maintenance_time' => 'Денови',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Забелешки',
-        'update'                 => 'Ажурирање',
-        'create'                 => 'Креирај'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/mk/admin/categories/message.php b/resources/lang/mk/admin/categories/message.php
index fc33d12c77..13578118e7 100644
--- a/resources/lang/mk/admin/categories/message.php
+++ b/resources/lang/mk/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Категоријата не беше ажурирана, обидете се повторно',
-        'success' => 'Категоријата е успешно ажурирана.'
+        'success' => 'Категоријата е успешно ажурирана.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/mk/admin/components/general.php b/resources/lang/mk/admin/components/general.php
index cdb005bd6e..cf94d5cd0b 100644
--- a/resources/lang/mk/admin/components/general.php
+++ b/resources/lang/mk/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Останува',
     'total' 			                 => 'Вкупно',
     'update'                            => 'Уреди компонента',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/mk/admin/components/message.php b/resources/lang/mk/admin/components/message.php
index a204fa9a4b..3d957da9a0 100644
--- a/resources/lang/mk/admin/components/message.php
+++ b/resources/lang/mk/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Компонентата не беше задолжена, обидете се повторно',
         'success' 		=> 'Компонентата е задолжена.',
-        'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.'
+        'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mk/admin/consumables/message.php b/resources/lang/mk/admin/consumables/message.php
index 59222f117f..1a827fc97b 100644
--- a/resources/lang/mk/admin/consumables/message.php
+++ b/resources/lang/mk/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Потрошниот материјал не е задолжен, обидете се повторно',
         'success' 		=> 'Потрошниот материјал е успешно задолжен.',
-        'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.'
+        'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mk/admin/custom_fields/general.php b/resources/lang/mk/admin/custom_fields/general.php
index c254578674..51feeee001 100644
--- a/resources/lang/mk/admin/custom_fields/general.php
+++ b/resources/lang/mk/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ 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',
     'create_field'            => 'Ново прилагодено поле',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/mk/admin/groups/message.php b/resources/lang/mk/admin/groups/message.php
index 3df582a471..20f674c111 100644
--- a/resources/lang/mk/admin/groups/message.php
+++ b/resources/lang/mk/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Групата веќе постои!',
-    'group_not_found'     => 'Групата [:id] не постои.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Полето за име е задолжително',
 
     'success' => array(
diff --git a/resources/lang/mk/admin/hardware/form.php b/resources/lang/mk/admin/hardware/form.php
index 07bb03b2ff..3b05ad5330 100644
--- a/resources/lang/mk/admin/hardware/form.php
+++ b/resources/lang/mk/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Потврди масовно бришење на основни средства',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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'	=> 'Ќе избришете :assets_count основни средства.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/mk/admin/hardware/general.php b/resources/lang/mk/admin/hardware/general.php
index 581c6ec990..3598697000 100644
--- a/resources/lang/mk/admin/hardware/general.php
+++ b/resources/lang/mk/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Уредување на основно средство',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Може да се побара',
     'requested'				    => 'Побарано',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Врати основно средство',
     'pending'  					=> 'Во чекање',
     'undeployable'  			=> 'Нераспоредливи',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/mk/admin/hardware/message.php b/resources/lang/mk/admin/hardware/message.php
index 27d634019b..1e0ff90b79 100644
--- a/resources/lang/mk/admin/hardware/message.php
+++ b/resources/lang/mk/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Основното средство не е вратено, обидете се повторно',
         'success' 		=> 'Основното средство е успешно вратено.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Вашата датотека е увезена',
         'file_delete_success'   => 'Вашата датотека е избришана',
         'file_delete_error'      => 'Датотеката не можеше да се избрише',
+        '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',
     ],
 
 
diff --git a/resources/lang/mk/admin/hardware/table.php b/resources/lang/mk/admin/hardware/table.php
index f305323802..8ac4cf4f15 100644
--- a/resources/lang/mk/admin/hardware/table.php
+++ b/resources/lang/mk/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Раздолжи/Задолжи',
     'checkout_date' => 'Датум на задолжување',
     'checkoutto' 	=> 'Задолжен на',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Разлика',
     'dl_csv' 		=> 'Преземи CSV',
diff --git a/resources/lang/mk/admin/licenses/general.php b/resources/lang/mk/admin/licenses/general.php
index 3628ebda93..097bd610a7 100644
--- a/resources/lang/mk/admin/licenses/general.php
+++ b/resources/lang/mk/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'За лиценците',
-    'about_licenses'                  => 'Лиценците се користат за следење на софтверот. Тие имаат одреден број места кои можат да се задолжат на поединци',
+    'about_licenses_title'      => 'За лиценците',
+    'about_licenses'            => 'Лиценците се користат за следење на софтверот. Тие имаат одреден број места кои можат да се задолжат на поединци',
     'checkin'  					=> 'Раздолжи лиценца за место',
     'checkout_history'  		=> 'Историја на задолжувања',
     'checkout'  				=> 'Задолжи лиценца за место',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Лиценци за софтвер',
     'user'  					=> 'Корисник',
     'view'  					=> 'Погледнете лиценца',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/mk/admin/manufacturers/message.php b/resources/lang/mk/admin/manufacturers/message.php
index 20ab33ae2a..54014bb98f 100644
--- a/resources/lang/mk/admin/manufacturers/message.php
+++ b/resources/lang/mk/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Производителот не постои.',
     'assoc_users'	 => 'Овој производител моментално е поврзан со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате моделите за да не го користат овој производител и обидете се повторно. ',
 
diff --git a/resources/lang/mk/admin/manufacturers/table.php b/resources/lang/mk/admin/manufacturers/table.php
index 1546f66f1e..9463a237b2 100644
--- a/resources/lang/mk/admin/manufacturers/table.php
+++ b/resources/lang/mk/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Е-пошта за поддршка',
     'support_phone'   		=> 'Телефон за поддршка',
     'support_url'   		=> 'Врска за поддршка',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Ажурирај го производителот',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/mk/admin/models/general.php b/resources/lang/mk/admin/models/general.php
index fa8700dd4e..d3f624d3cd 100644
--- a/resources/lang/mk/admin/models/general.php
+++ b/resources/lang/mk/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Масовно бришење на модели',
     'bulk_delete_help'               => 'Користете ги полињата подолу за да го потврдите бришењето на избраните модели. Моделите кои имаат основни средства поврзани со нив не може да се избришат додека средствата не се поврзанат со друг модел.',
-    'bulk_delete_warn'          => 'Ќе избришете :model_count модели.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Врати модел',
     'requestable'               => 'Корисниците може да го побараат овој модел',
 	'show_mac_address'			      => 'Покажи поле за MAC адреса во основните средства од овој модел',
diff --git a/resources/lang/mk/admin/models/message.php b/resources/lang/mk/admin/models/message.php
index 2c421ba394..081bf30b59 100644
--- a/resources/lang/mk/admin/models/message.php
+++ b/resources/lang/mk/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Моделот не постои.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Моделот во моментов е поврзан со едно или повеќе основни средства и не може да се избрише. Ве молиме избришете ги основните средствата, а потоа пробајте повторно да го избришете. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Моделот не е ажуриран, обидете се повторно',
-        'success' => 'Моделот е ажуриран.'
+        'success' => 'Моделот е ажуриран.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Не беа сменети полиња, затоа ништо не беше ажурирано.',
-        'success' 		=> 'Моделите се ажурирани.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Не беа избрани модели, затоа ништо не беше избришано.',
-        'success' 		    => ':success_count модел(и) се избришани!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count модел (и) се избришани, меѓутоа :fail_count не може да се избришат, бидејќи тие сè уште имаат средства поврзани со нив.'
     ),
 
diff --git a/resources/lang/mk/admin/settings/general.php b/resources/lang/mk/admin/settings/general.php
index 57ddad6c80..6264dd573d 100644
--- a/resources/lang/mk/admin/settings/general.php
+++ b/resources/lang/mk/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Ова е сервер на Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Испрати аларм до',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Овозможени аларми по е-пошта',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Поставки за баркод',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Внесете важечко 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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/mk/admin/settings/message.php b/resources/lang/mk/admin/settings/message.php
index ded8eb2216..a5179bed7a 100644
--- a/resources/lang/mk/admin/settings/message.php
+++ b/resources/lang/mk/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/mk/admin/users/general.php b/resources/lang/mk/admin/users/general.php
index d9f404a24a..99624d8568 100644
--- a/resources/lang/mk/admin/users/general.php
+++ b/resources/lang/mk/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.',
+    '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',
     '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'         => 'Погледнете го/ја :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/mk/admin/users/message.php b/resources/lang/mk/admin/users/message.php
index b678c49ded..d71d982b8d 100644
--- a/resources/lang/mk/admin/users/message.php
+++ b/resources/lang/mk/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Го одбивте основното средство.',
     'bulk_manager_warn'	        => 'Вашите корисници се ажурирани, но записот за менаџерот не е зачуван, бидејќи менаџерот што го избравте беше во листата на корисници што се ажурираа. Корисниците не може да бидат свој сопствен менаџер. Изберете ги корисниците повторно, со исклучок на менаџерот и пробајте пак.',
     'user_exists'               => 'Корисникот веќе постои!',
-    'user_not_found'            => 'Корисникот [:id] не постои.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Полето за корисничко име е задолжително',
     'user_password_required'    => 'Потребна е лозинка.',
     'insufficient_permissions'  => 'Недоволни дозволи.',
diff --git a/resources/lang/mk/auth/general.php b/resources/lang/mk/auth/general.php
index 00703529fd..995baf215a 100644
--- a/resources/lang/mk/auth/general.php
+++ b/resources/lang/mk/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/mk/general.php b/resources/lang/mk/general.php
index 2c0aaf870e..108058852e 100644
--- a/resources/lang/mk/general.php
+++ b/resources/lang/mk/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Додатоци',
     'activated'			    => 'Активиран',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Додаток',
     'accessory_report'		=> 'Извештај за додаток',
     'action'                => 'Акција',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Ревизија',
     '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',
     'avatar_delete'         => 'Избриши аватар',
     'avatar_upload'         => 'Прикачи аватар',
     'back'      			=> 'Назад',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Откажи',
     'categories'			=> 'Категории',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Избришани',
     'delete_seats'  		=> 'Избришани места',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Увоз',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Одржувања на основни средства',
     'item'  				=> 'Ставка',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Недоволни дозволи!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Јазик',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Барањето е откажано',
     'save'  				=> 'Зачувај',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Избери',
     'select_all'            => 'Select All',
     'search'				=> 'Пребарај',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Потпис',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Кожа',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Некои функции се оневозможени за оваа инсталација.',
     'site_name'				=> 'Име на сајтот',
     'state'  				=> 'Состојба',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Дали сте сигурни дека сакате да ја избришете',
     'submit'				=> 'Поднеси',
     'target'                => 'Цел',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Приказ на време и датум',
     'total_assets'			=> 'вкупно основни средства',
     'total_licenses'		=> 'вкупно лиценци',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/mk/help.php b/resources/lang/mk/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/mk/help.php
+++ b/resources/lang/mk/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/mk/localizations.php b/resources/lang/mk/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/mk/localizations.php
+++ b/resources/lang/mk/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/mk/mail.php b/resources/lang/mk/mail.php
index d070699564..30dc7c7cd5 100644
--- a/resources/lang/mk/mail.php
+++ b/resources/lang/mk/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Влезете во новата инсталација на Snipe-IT користејќи ги ингеренциите подолу:',
     'login' => 'Најава:',
     'Low_Inventory_Report' => 'Извештај за низок инвентар',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Минимална количина',
     'name' => 'Име',
     'new_item_checked' => 'Ново основно средство е задолжено на Ваше име, деталите се подолу.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Вашите корисничко име и лозинка',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/mk/validation.php b/resources/lang/mk/validation.php
index 3ba8f0ff50..15a90ef098 100644
--- a/resources/lang/mk/validation.php
+++ b/resources/lang/mk/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute мора да содржи најмалку :min ставки.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Избраниот :attribute не е валиден.',
     'numeric'              => ':attribute мора да биде број.',
     'present'              => 'Полето :attribute е задолжително.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Вашата тековна лозинка е неточна',
         'dumbpwd'          => 'Таа лозинка е премногу честа.',
         'statuslabel_type' => 'Мора да изберете валидна етикета за статус',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ml-IN/admin/accessories/general.php b/resources/lang/ml-IN/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/ml-IN/admin/accessories/general.php
+++ b/resources/lang/ml-IN/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/ml-IN/admin/accessories/message.php b/resources/lang/ml-IN/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/ml-IN/admin/accessories/message.php
+++ b/resources/lang/ml-IN/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/ml-IN/admin/asset_maintenances/form.php b/resources/lang/ml-IN/admin/asset_maintenances/form.php
index 2aa005c45f..785d06b08f 100644
--- a/resources/lang/ml-IN/admin/asset_maintenances/form.php
+++ b/resources/lang/ml-IN/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'Completed',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ml-IN/admin/categories/message.php b/resources/lang/ml-IN/admin/categories/message.php
index b5d21a7691..bea4f1a87a 100644
--- a/resources/lang/ml-IN/admin/categories/message.php
+++ b/resources/lang/ml-IN/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ml-IN/admin/components/general.php b/resources/lang/ml-IN/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/ml-IN/admin/components/general.php
+++ b/resources/lang/ml-IN/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/ml-IN/admin/components/message.php b/resources/lang/ml-IN/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/ml-IN/admin/components/message.php
+++ b/resources/lang/ml-IN/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ml-IN/admin/consumables/message.php b/resources/lang/ml-IN/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/ml-IN/admin/consumables/message.php
+++ b/resources/lang/ml-IN/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/ml-IN/admin/custom_fields/general.php b/resources/lang/ml-IN/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/ml-IN/admin/custom_fields/general.php
+++ b/resources/lang/ml-IN/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ml-IN/admin/groups/message.php b/resources/lang/ml-IN/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/ml-IN/admin/groups/message.php
+++ b/resources/lang/ml-IN/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/ml-IN/admin/hardware/form.php b/resources/lang/ml-IN/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/ml-IN/admin/hardware/form.php
+++ b/resources/lang/ml-IN/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ml-IN/admin/hardware/general.php b/resources/lang/ml-IN/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/ml-IN/admin/hardware/general.php
+++ b/resources/lang/ml-IN/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ml-IN/admin/hardware/message.php b/resources/lang/ml-IN/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/ml-IN/admin/hardware/message.php
+++ b/resources/lang/ml-IN/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/ml-IN/admin/hardware/table.php b/resources/lang/ml-IN/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/ml-IN/admin/hardware/table.php
+++ b/resources/lang/ml-IN/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/ml-IN/admin/licenses/general.php b/resources/lang/ml-IN/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/ml-IN/admin/licenses/general.php
+++ b/resources/lang/ml-IN/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ml-IN/admin/manufacturers/message.php b/resources/lang/ml-IN/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/ml-IN/admin/manufacturers/message.php
+++ b/resources/lang/ml-IN/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/ml-IN/admin/manufacturers/table.php b/resources/lang/ml-IN/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/ml-IN/admin/manufacturers/table.php
+++ b/resources/lang/ml-IN/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ml-IN/admin/models/general.php b/resources/lang/ml-IN/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/ml-IN/admin/models/general.php
+++ b/resources/lang/ml-IN/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/ml-IN/admin/models/message.php b/resources/lang/ml-IN/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/ml-IN/admin/models/message.php
+++ b/resources/lang/ml-IN/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ml-IN/admin/settings/message.php b/resources/lang/ml-IN/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/ml-IN/admin/settings/message.php
+++ b/resources/lang/ml-IN/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ml-IN/admin/users/general.php b/resources/lang/ml-IN/admin/users/general.php
index daa568e8bf..b097ccec69 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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ml-IN/admin/users/message.php b/resources/lang/ml-IN/admin/users/message.php
index 247a1b321e..adf26b3229 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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/ml-IN/auth/general.php b/resources/lang/ml-IN/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/ml-IN/auth/general.php
+++ b/resources/lang/ml-IN/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ml-IN/help.php b/resources/lang/ml-IN/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ml-IN/help.php
+++ b/resources/lang/ml-IN/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ml-IN/localizations.php b/resources/lang/ml-IN/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ml-IN/localizations.php
+++ b/resources/lang/ml-IN/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ml-IN/mail.php b/resources/lang/ml-IN/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/ml-IN/mail.php
+++ b/resources/lang/ml-IN/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ml-IN/validation.php b/resources/lang/ml-IN/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/ml-IN/validation.php
+++ b/resources/lang/ml-IN/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/mn/admin/accessories/general.php b/resources/lang/mn/admin/accessories/general.php
index 507ae7daed..e5c7edf8f1 100644
--- a/resources/lang/mn/admin/accessories/general.php
+++ b/resources/lang/mn/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Дагалдах хэрэгслийг шинэчлэх',
     'use_default_eula'					=> 'Оронд нь <a href="#" data-toggle="modal" data-target="#eulaModal">програмын үндсэн EULA</a>-г ашиглаарай.',
     'use_default_eula_disabled'			=> '<del> оронд үндсэн анхдагч EULA ашигла.</del> Үндсэн анхдагч EULA тохируулагдаагүй байна. Тохиргоо дотроос нэгийг нэмж оруулна уу.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/mn/admin/accessories/message.php b/resources/lang/mn/admin/accessories/message.php
index 073437e0cb..6dee24eab9 100644
--- a/resources/lang/mn/admin/accessories/message.php
+++ b/resources/lang/mn/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Дагалдах хэрэгсэл шалгагдаагүй байна, дахин оролдоно уу',
         'success' 		=> 'Дагалдах хэрэгсэл амжилттай шалгасан.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.'
     ),
 
diff --git a/resources/lang/mn/admin/asset_maintenances/form.php b/resources/lang/mn/admin/asset_maintenances/form.php
index 749714cde3..c57d378850 100644
--- a/resources/lang/mn/admin/asset_maintenances/form.php
+++ b/resources/lang/mn/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Засвар үйлчилгээний төрөл',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Гарчиг',
-        'start_date'             => 'Эхэлсэн',
-        'completion_date'        => 'Дууссан',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Өртөг',
         'is_warranty'            => 'Нэмэлт баталгаа',
-        'asset_maintenance_time' => 'Хоног',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Тэмдэглэл',
-        'update'                 => 'Шинэчлэх',
-        'create'                 => 'Үүсгэх'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/mn/admin/categories/message.php b/resources/lang/mn/admin/categories/message.php
index d03ecaecf0..40a0f58bb2 100644
--- a/resources/lang/mn/admin/categories/message.php
+++ b/resources/lang/mn/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Ангилал шинэчлэгдсэнгүй, дахин оролдоно уу',
-        'success' => 'Ангилал амжилттай шинэчлэгдсэн.'
+        'success' => 'Ангилал амжилттай шинэчлэгдсэн.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/mn/admin/components/general.php b/resources/lang/mn/admin/components/general.php
index 1c90756a82..c6ac1ee0eb 100644
--- a/resources/lang/mn/admin/components/general.php
+++ b/resources/lang/mn/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Үлдсэн',
     'total' 			                 => 'Нийт',
     'update'                            => 'Бүрэлдэхүүн хэсэг шинэчлэх',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/mn/admin/components/message.php b/resources/lang/mn/admin/components/message.php
index 1adaea3e11..fb2aeff6bd 100644
--- a/resources/lang/mn/admin/components/message.php
+++ b/resources/lang/mn/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Бүрэлдэхүүнийг шалгаагүй байна, дахин оролдоно уу',
         'success' 		=> 'Бүрэлдэхүүн хэсэг амжилттай шалгагдсан.',
-        'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.'
+        'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mn/admin/consumables/message.php b/resources/lang/mn/admin/consumables/message.php
index 1bc8297097..ae87d63f92 100644
--- a/resources/lang/mn/admin/consumables/message.php
+++ b/resources/lang/mn/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Боломжийн талаар шалгаагүй байна, дахин оролдоно уу',
         'success' 		=> 'Боломжийн талаар амжилттай шалгасан.',
-        'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.'
+        'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mn/admin/custom_fields/general.php b/resources/lang/mn/admin/custom_fields/general.php
index 33ce73d993..b456338c63 100644
--- a/resources/lang/mn/admin/custom_fields/general.php
+++ b/resources/lang/mn/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Загвар ашиглана',
     'order'   		            => 'Захиалга',
     'create_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'            => 'Шинэ Гаалийн талбар',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/mn/admin/groups/message.php b/resources/lang/mn/admin/groups/message.php
index 6ee7aef5c6..e4b5bb20ac 100644
--- a/resources/lang/mn/admin/groups/message.php
+++ b/resources/lang/mn/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Групп аль хэдийн байна!',
-    'group_not_found'     => 'Групп [: id] байхгүй байна.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Нэрийн талбар шаардлагатай',
 
     'success' => array(
diff --git a/resources/lang/mn/admin/hardware/form.php b/resources/lang/mn/admin/hardware/form.php
index 3c5d373039..33bda63e04 100644
--- a/resources/lang/mn/admin/hardware/form.php
+++ b/resources/lang/mn/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Бөөнөөр устгах активыг баталгаажуулна уу',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/mn/admin/hardware/general.php b/resources/lang/mn/admin/hardware/general.php
index f5fa31dce4..b9ebc31dbf 100644
--- a/resources/lang/mn/admin/hardware/general.php
+++ b/resources/lang/mn/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Хөрөнгийг засварлах',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Уучлаарай',
     'requested'				    => 'Хүсэлт гаргасан',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Хөрөнгийг дахин сэргээх',
     'pending'  					=> 'Хүлээгдэж байна',
     'undeployable'  			=> 'Undeployable',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/mn/admin/hardware/message.php b/resources/lang/mn/admin/hardware/message.php
index 2812b73430..bfa381eb6d 100644
--- a/resources/lang/mn/admin/hardware/message.php
+++ b/resources/lang/mn/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Хөрөнгө сэргээгээгүй байна, дахин оролдоно уу',
         'success' 		=> 'Хөрөнгийн амжилттай сэргээгдэв.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Таны файл импортлогдсон байна',
         'file_delete_success'   => 'Таны файл амжилттай болсон байна',
         'file_delete_error'      => 'Файл устгагдах боломжгүй байна',
+        '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',
     ],
 
 
diff --git a/resources/lang/mn/admin/hardware/table.php b/resources/lang/mn/admin/hardware/table.php
index 88b1a8708d..1c1d1161b5 100644
--- a/resources/lang/mn/admin/hardware/table.php
+++ b/resources/lang/mn/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Гадуур нь',
     'checkout_date' => 'Тооцоо хийх өдөр',
     'checkoutto' 	=> 'Нь шалгаж',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'CSV татаж авах',
diff --git a/resources/lang/mn/admin/licenses/general.php b/resources/lang/mn/admin/licenses/general.php
index 27cb9e1af2..2c30303a76 100644
--- a/resources/lang/mn/admin/licenses/general.php
+++ b/resources/lang/mn/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Лицензийн тухай',
-    'about_licenses'                  => 'Програмыг хянах лицензийг ашигладаг. Тэдгээр нь тодорхой тооны суудалтай байдаг',
+    'about_licenses_title'      => 'Лицензийн тухай',
+    'about_licenses'            => 'Програмыг хянах лицензийг ашигладаг. Тэдгээр нь тодорхой тооны суудалтай байдаг',
     'checkin'  					=> 'Checkin лицензийн суудал',
     'checkout_history'  		=> 'Тооцоо хийх түүх',
     'checkout'  				=> 'Төлбөрийн лицензийн суудал',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Програм хангамжийн лиценз',
     'user'  					=> 'Хэрэглэгч',
     'view'  					=> 'Лицензийг харах',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/mn/admin/manufacturers/message.php b/resources/lang/mn/admin/manufacturers/message.php
index e16ce77102..bd5db446da 100644
--- a/resources/lang/mn/admin/manufacturers/message.php
+++ b/resources/lang/mn/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Үйлдвэрлэгч байхгүй байна.',
     'assoc_users'	 => 'Энэ үйлдвэр нь одоогоор хамгийн багадаа нэг загвартай холбоотой бөгөөд устгах боломжгүй. Энэ загварыг дахин үйлдвэрлэхээ больсон загвараа шинэчлээд дахин оролдоно уу.',
 
diff --git a/resources/lang/mn/admin/manufacturers/table.php b/resources/lang/mn/admin/manufacturers/table.php
index 6f000c3fd5..b18e18e0ed 100644
--- a/resources/lang/mn/admin/manufacturers/table.php
+++ b/resources/lang/mn/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Дэмжлэг Имэйл',
     'support_phone'   		=> 'Утасны дэмжлэг',
     'support_url'   		=> 'Дэмжих URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Үйлдвэрлэгчийг шинэчлэх',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/mn/admin/models/general.php b/resources/lang/mn/admin/models/general.php
index c9c4cb2fd0..84fb665155 100644
--- a/resources/lang/mn/admin/models/general.php
+++ b/resources/lang/mn/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Бөөнөөр хөрөнгийн загварыг устгах',
     'bulk_delete_help'               => 'Сонгосон хөрөнгийн загварыг устгахыг баталгаажуулж доорх хайрцгийг ашиглана уу. Хөрөнгөтэй холбоотой хөрөнгийн загварыг өөр загвартай холбох хүртэл устгах боломжгүй.',
-    'bulk_delete_warn'          => 'Та :asset_count ширхэг хөрөнгийн загвар устгах гэж байна.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Загварыг сэргээх',
     'requestable'               => 'Хэрэглэгчид энэ загварыг хүсч болно',
 	'show_mac_address'			      => 'Энэ загварт буй MAC хаягийн талбарыг харуулах',
diff --git a/resources/lang/mn/admin/models/message.php b/resources/lang/mn/admin/models/message.php
index c028a34760..cfa12ca4ea 100644
--- a/resources/lang/mn/admin/models/message.php
+++ b/resources/lang/mn/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Загвар байхгүй байна.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Энэ загвар одоогоор нэг буюу хэд хэдэн хөрөнгөтэй холбоотой бөгөөд устгаж болохгүй. Хөрөнгө устгаж, дараа нь устгахыг оролдоно уу.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Загвар шинэчлэгдсэнгүй, дахин оролдоно уу',
-        'success' => 'Загвар амжилттай болсон.'
+        'success' => 'Загвар амжилттай болсон.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ямар ч талбар өөрчлөгдсөнгүй тул шинэчлэгдээгүй байна.',
-        'success' 		=> 'Загвар шинэчилсэн.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ямар ч загвар сонгогдоогүй тул юу ч устаагүй.',
-        'success' 		    => ':success_count ширхэг загвар устсан!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count ширхэг загвар устсан ба :fail_count ширхэг загвар одоо хүртэл хөрөнгөтэй холбоотой байгаа тул устаагүй.'
     ),
 
diff --git a/resources/lang/mn/admin/settings/general.php b/resources/lang/mn/admin/settings/general.php
index 3db0c837f8..2d92e42d96 100644
--- a/resources/lang/mn/admin/settings/general.php
+++ b/resources/lang/mn/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'Хэрэв та хэрэглэгчдэд илгээсэн хүлээн авах/олгох имэйлийн хуулбарыг нэмэлт имэйл үрүү илгээхийг хүсвэл энд оруулна уу. Үгүй бол энэ талбарыг хоосон орхино уу.',
     'is_ad'				        => 'Энэ бол Active Directory Server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Анхааруулга илгээх',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Идэвхжүүлсэн дохиог',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Бар кодын тохиргоо',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Таны LDAP нэвтрэлтийг зөв тохируулсан эсэхийг шалгахын тулд дээр дурдсан үндсэн DN-ээс хүчинтэй LDAP хэрэглэгчийн нэр, нууц үгээ оруулна уу. ТА ЭХЛЭЭД ШИНЭЧЛЭГДСЭН LDAP ТОХИРГООГОО ХАДГАЛАХ ЁСТОЙ.',
     'ldap_login_sync_help'      => 'Энэ нь зөвхөн LDAP-ийг зөв синхрончлох боломжтой эсэхийг шалгадаг. Хэрэв таны LDAP баталгаажуулалтын асуулга буруу байвал хэрэглэгчид нэвтрэх боломжгүй хэвээр байх магадлалтай. ТА ЭХЛЭЭД ШИНЭЧЛЭГДСЭН LDAP ТОХИРГООГОО ХАДГАЛАХ ЁСТОЙ.',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Имэйл дотор зураг харуулах',
     'show_images_in_email_help'   => 'Хэрэв таны Snipe-IT суулгац VPN эсвэл хаалттай сүлжээний ард байгаа бол сүлжээнээс гадуурх хэрэглэгчид энэ суулгацаас авсан зургийг имэйлдээ ачаалах боломжгүй бол энэ хайрцгийг арилгана уу.',
     'site_name'                 => 'Сайтын нэр',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack суваг',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack тохиргоо',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Slack мэдээллээ хадгалсны дараа туршилтын товчлуур гарч ирнэ.',
-    'slack_test_help'           => 'Та Slack интеграцийг зөв тохируулсан эсэхээ шалгана уу. ТА ЭХЛЭЭД ШИНЭЧЛЭГДСЭН SLACK ТОХИРГООГОО ХАДГАЛАХ ЁСТОЙ.',
+    'general_webhook'           => 'General Webhook',
+    '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 хувилбар',
     'support_footer'            => 'Хөл хэсэг дэх холбоосууд ',
     'support_footer_help'       => 'Snipe-IT Support мэдээлэл ба хэрэглэгчийн гарын авлагын холбоосыг хэн харж болохыг заах өгөх',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/mn/admin/settings/message.php b/resources/lang/mn/admin/settings/message.php
index cee440f164..7a213c8344 100644
--- a/resources/lang/mn/admin/settings/message.php
+++ b/resources/lang/mn/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/mn/admin/users/general.php b/resources/lang/mn/admin/users/general.php
index 3ff9e48147..c198ce40c9 100644
--- a/resources/lang/mn/admin/users/general.php
+++ b/resources/lang/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.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Програм хангамж: нэр',
     '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'         => 'Хэрэглэгч: нэрийг харах',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/mn/admin/users/message.php b/resources/lang/mn/admin/users/message.php
index 57385976eb..a761240c07 100644
--- a/resources/lang/mn/admin/users/message.php
+++ b/resources/lang/mn/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Та энэ хөрөнгийг амжилттай татгалзсан.',
     'bulk_manager_warn'	        => 'Таны хэрэглэгчид амжилттай шинэчлэгдсэн хэдий ч таны менежерийн оруулгыг хадгалсангүй, учир нь таны сонгосон менежер засварлах хэрэглэгчийн жагсаалт мөн хэрэглэгчид магадгүй өөрийн менежер биш байж болно. Менежерийг оруулалгүйгээр хэрэглэгчдийг дахин сонгоно уу.',
     'user_exists'               => 'Хэрэглэгч бүртгэгдсэн байна!',
-    'user_not_found'            => 'Хэрэглэгч [: id] байхгүй байна.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Нэвтрэх талбар шаардлагатай байна',
     'user_password_required'    => 'Нууц үг шаардагдана.',
     'insufficient_permissions'  => 'Зөвшөөрөлгүй байна.',
diff --git a/resources/lang/mn/auth/general.php b/resources/lang/mn/auth/general.php
index a58bb78492..cff0656da8 100644
--- a/resources/lang/mn/auth/general.php
+++ b/resources/lang/mn/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php
index 115be5ab42..3c6430853a 100644
--- a/resources/lang/mn/general.php
+++ b/resources/lang/mn/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Дагалдах хэрэгсэл',
     'activated'			    => 'Идэвхжүүлсэн',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Дагалдах хэрэгсэл',
     'accessory_report'		=> 'Дагалдах хэрэгслийн тайлан',
     'action'                => 'Үйлдэл',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Аудит',
     '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',
     'avatar_delete'         => 'Хөрөг устгах',
     'avatar_upload'         => 'Хөрөгийг байршуулах',
     'back'      			=> 'Буцах',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Болих',
     'categories'			=> 'Категориуд',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Устгагдсан',
     'delete_seats'  		=> 'Устгагдсан суудал',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Импорт',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Хөрөнгийн бирж',
     'item'  				=> 'Зүйл',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Зөвшөөрөлгүй!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Хэл',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Хүсэлтийг цуцалсан',
     'save'  				=> 'Хадгалах',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Сонгох',
     'select_all'            => 'Select All',
     'search'				=> 'Хайлт',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Гарын үсэг',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Гадарга',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: Энэ суулгацад зарим функцууд хаагдсан байна.',
     'site_name'				=> 'Сайтын нэр',
     'state'  				=> 'Улс',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Та устгахыг хүсч байгаадаа итгэлтэй байна уу',
     'submit'				=> 'Илгээх',
     'target'                => 'Зорилтот түвшин',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Цагийн хуваарь',
     'total_assets'			=> 'Нийт хөрөнгө',
     'total_licenses'		=> 'нийт лиценз',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/mn/help.php b/resources/lang/mn/help.php
index c07ddcb7de..8f69128432 100644
--- a/resources/lang/mn/help.php
+++ b/resources/lang/mn/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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/mn/localizations.php b/resources/lang/mn/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/mn/localizations.php
+++ b/resources/lang/mn/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/mn/mail.php b/resources/lang/mn/mail.php
index e7a6a7d1b5..cf7b1f7c4b 100644
--- a/resources/lang/mn/mail.php
+++ b/resources/lang/mn/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Слайд-IT-г суулгахын тулд доорх итгэмжлэлүүдийг ашиглана уу:',
     'login' => 'Нэвтрэх:',
     'Low_Inventory_Report' => 'Бага нөөцийн тайлан',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Нэр',
     'new_item_checked' => 'Таны нэрээр шинэ зүйл шалгасан бөгөөд дэлгэрэнгүй мэдээлэл доор байна.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Таны Snipe-IT итгэмжлэлүүд',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/mn/validation.php b/resources/lang/mn/validation.php
index ee6bda05e6..db826b8589 100644
--- a/resources/lang/mn/validation.php
+++ b/resources/lang/mn/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Үүнд: атрибут дор хаяж дараах зүйлсийг агуулсан байх ёстой.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Сонгосон: шинж чанар буруу байна.',
     'numeric'              => 'Үүнд: атрибут нь тоо байх ёстой.',
     'present'              => 'Үүнд: атрибутын талбар байх ёстой.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Таны одоогийн нууц үг буруу байна',
         'dumbpwd'          => 'Энэ нууц үг хэтэрхий нийтлэг байна.',
         'statuslabel_type' => 'Та зөв статустай шошгын төрлийг сонгох ёстой',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ms/admin/accessories/general.php b/resources/lang/ms/admin/accessories/general.php
index 376ff26261..47d11270e4 100644
--- a/resources/lang/ms/admin/accessories/general.php
+++ b/resources/lang/ms/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Kemaskini Aksesori',
     '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.',
 
 );
diff --git a/resources/lang/ms/admin/accessories/message.php b/resources/lang/ms/admin/accessories/message.php
index 9e1a62636d..9428e91246 100644
--- a/resources/lang/ms/admin/accessories/message.php
+++ b/resources/lang/ms/admin/accessories/message.php
@@ -24,6 +24,7 @@ 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.'
     ),
 
diff --git a/resources/lang/ms/admin/asset_maintenances/form.php b/resources/lang/ms/admin/asset_maintenances/form.php
index 750fbbb532..01af667367 100644
--- a/resources/lang/ms/admin/asset_maintenances/form.php
+++ b/resources/lang/ms/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Jenis Penyelenggaraan',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Tajuk',
-        'start_date'             => 'Mula',
-        'completion_date'        => 'Siap',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kos',
         'is_warranty'            => 'Penambahbaikan Waranti',
-        'asset_maintenance_time' => 'Hari',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Nota',
-        'update'                 => 'Kemaskini',
-        'create'                 => 'Cipta'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ms/admin/categories/message.php b/resources/lang/ms/admin/categories/message.php
index 4024fc75a3..1dbfd82071 100644
--- a/resources/lang/ms/admin/categories/message.php
+++ b/resources/lang/ms/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategori tidak dapat dikemaskini, sila cuba lagi.',
-        'success' => 'Kategori berjaya dikemaskini.'
+        'success' => 'Kategori berjaya dikemaskini.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ms/admin/components/general.php b/resources/lang/ms/admin/components/general.php
index b3be56b83c..9de64c3d59 100644
--- a/resources/lang/ms/admin/components/general.php
+++ b/resources/lang/ms/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Baki',
     'total' 			                 => 'Jumlah',
     'update'                            => 'Komponen Kemas Kini',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/ms/admin/components/message.php b/resources/lang/ms/admin/components/message.php
index a2fd31d7a5..68ba7deb7c 100644
--- a/resources/lang/ms/admin/components/message.php
+++ b/resources/lang/ms/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponen tidak diperiksa, sila cuba lagi',
         'success' 		=> 'Komponen diperiksa dengan jayanya.',
-        'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.'
+        'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ms/admin/consumables/message.php b/resources/lang/ms/admin/consumables/message.php
index 6fd51bcc2c..1a70fa1443 100644
--- a/resources/lang/ms/admin/consumables/message.php
+++ b/resources/lang/ms/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Makanan tidak diperiksa, sila cuba lagi',
         'success' 		=> 'Berguna diperiksa dengan jayanya.',
-        'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.'
+        'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ms/admin/custom_fields/general.php b/resources/lang/ms/admin/custom_fields/general.php
index fd537efa92..0f617e0a20 100644
--- a/resources/lang/ms/admin/custom_fields/general.php
+++ b/resources/lang/ms/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Digunakan Oleh Model',
     'order'   		            => 'Perintah',
     'create_fieldset'         => 'Fieldset baru',
+    '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'            => 'Padang Tersuai Baru',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ms/admin/groups/message.php b/resources/lang/ms/admin/groups/message.php
index a86a0f46fe..adf88943d0 100644
--- a/resources/lang/ms/admin/groups/message.php
+++ b/resources/lang/ms/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Kumpulan sudah wujud!',
-    'group_not_found'     => 'Kumpulan [:id] tidah wujud.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Ruangan nama adalah perlu',
 
     'success' => array(
diff --git a/resources/lang/ms/admin/hardware/form.php b/resources/lang/ms/admin/hardware/form.php
index 191029114e..32b7b37d5d 100644
--- a/resources/lang/ms/admin/hardware/form.php
+++ b/resources/lang/ms/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Sahkan Pemutihan Aset Pukal',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Semak aset untuk penghapusan pukal di bawah. Sebaik sahaja dipadam, aset ini dapat dipulihkan, tetapi mereka tidak lagi akan dikaitkan dengan mana-mana pengguna yang mereka buat sekarang.',
+  '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'	=> 'Anda akan hapus: asset_count aset.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Aset Kemas Kini Pukal',
     'bulk_update_help'	=> 'Borang ini membolehkan anda mengemas kini berbilang aset sekaligus. Hanya isikan medan yang perlu anda ubah. Mana-mana medan yang dibiarkan kosong akan kekal tidak berubah.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ms/admin/hardware/general.php b/resources/lang/ms/admin/hardware/general.php
index 0e28ead96e..265ef5720c 100644
--- a/resources/lang/ms/admin/hardware/general.php
+++ b/resources/lang/ms/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Aset ini telah dipadamkan.',
     'edit'  					=> 'Kemaskini Harta',
     'model_deleted'  			=> 'Model Aset ini telah dipadamkan. Anda mesti kembalikan model sebelum anda boleh kembalikan Aset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Diminta',
     'requested'				    => 'Diminta',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Pulihkan Asset',
     'pending'  					=> 'Menunggu',
     'undeployable'  			=> 'Tidak dapat dipisahkan',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ms/admin/hardware/message.php b/resources/lang/ms/admin/hardware/message.php
index de55ca0a03..2f3fa4d77c 100644
--- a/resources/lang/ms/admin/hardware/message.php
+++ b/resources/lang/ms/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Aset tidak dipulihkan, sila cuba lagi',
         'success' 		=> 'Aset dipulihkan dengan jayanya.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Fail anda telah diimport',
         'file_delete_success'   => 'Fail anda telah berjaya dihapuskan',
         'file_delete_error'      => 'Fail tidak dapat dipadamkan',
+        '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',
     ],
 
 
diff --git a/resources/lang/ms/admin/hardware/table.php b/resources/lang/ms/admin/hardware/table.php
index d9d91e8b77..467eee4a91 100644
--- a/resources/lang/ms/admin/hardware/table.php
+++ b/resources/lang/ms/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Masuk/Keluar',
     'checkout_date' => 'Tarikh Agihan',
     'checkoutto' 	=> 'Agihan',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Beza',
     'dl_csv' 		=> 'Muat Turun CSV',
diff --git a/resources/lang/ms/admin/licenses/general.php b/resources/lang/ms/admin/licenses/general.php
index 65ca4c94c1..6dfc8e95e4 100644
--- a/resources/lang/ms/admin/licenses/general.php
+++ b/resources/lang/ms/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Mengenai Lesen',
-    'about_licenses'                  => 'Lesen digunakan untuk mengesan perisian. Mereka mempunyai bilangan tempat duduk tertentu yang boleh diperiksa kepada individu',
+    'about_licenses_title'      => 'Mengenai Lesen',
+    'about_licenses'            => 'Lesen digunakan untuk mengesan perisian. Mereka mempunyai bilangan tempat duduk tertentu yang boleh diperiksa kepada individu',
     'checkin'  					=> 'Terima Kekosongan Lesen',
     'checkout_history'  		=> 'Sejarah Agihan',
     'checkout'  				=> 'Agihkan Kekosongan Lesen',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Lesen Perisian',
     'user'  					=> 'Pengguna',
     'view'  					=> 'Papar Lesen',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ms/admin/manufacturers/message.php b/resources/lang/ms/admin/manufacturers/message.php
index ee468483ba..b4f2e9b9c7 100644
--- a/resources/lang/ms/admin/manufacturers/message.php
+++ b/resources/lang/ms/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Pengeluar tidak wujud.',
     'assoc_users'	 => 'Pengeluar ini sekarang disekutukan dengan sekurang2nya satu model dan tidak boleh dihapuskan. Sila kemaskini model supaya tidak lagi merujuk kepada pengeluar ini dan cuba lagi. ',
 
diff --git a/resources/lang/ms/admin/manufacturers/table.php b/resources/lang/ms/admin/manufacturers/table.php
index 22b77407bc..a5568083bf 100644
--- a/resources/lang/ms/admin/manufacturers/table.php
+++ b/resources/lang/ms/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Sokongan E-mel',
     'support_phone'   		=> 'Sokongan Telefon',
     'support_url'   		=> 'Sokongan URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Kemaskini Pengeluar',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ms/admin/models/general.php b/resources/lang/ms/admin/models/general.php
index d0814712b1..9961221f47 100644
--- a/resources/lang/ms/admin/models/general.php
+++ b/resources/lang/ms/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Anda akan hapus :model_count model aset.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Pulihkan Model',
     'requestable'               => 'Pengguna boleh meminta model ini',
 	'show_mac_address'			      => 'Tunjukkan medan alamat MAC dalam aset dalam model ini',
diff --git a/resources/lang/ms/admin/models/message.php b/resources/lang/ms/admin/models/message.php
index 9e2a1dd13d..39a9684163 100644
--- a/resources/lang/ms/admin/models/message.php
+++ b/resources/lang/ms/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model tidak wujud.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model gagal dikemaskin, sila cuba lagi',
-        'success' => 'Model berjaya dikemaskini.'
+        'success' => 'Model berjaya dikemaskini.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Tiada medan berubah, jadi tiada apa yang dikemas kini.',
-        'success' 		=> 'Model dikemas kini.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Tiada model dipilih, jadi tiada apa yang dipadamkan.',
-        'success' 		    => ':success_count model(s) dipadamkan!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(s) telah dipadamkan, namun :fail_count tidak dapat dipadamkan kerana mereka masih mempunyai aset yang dikaitkan dengannya.'
     ),
 
diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php
index c32b8962ce..73b60742e1 100644
--- a/resources/lang/ms/admin/settings/general.php
+++ b/resources/lang/ms/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Ini adalah pelayan Direktori Aktif',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Isyarat Dihidupkan',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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'      => 'Sijil TLS Bahagian Pelanggan LDAP',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Tetapan 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Masukkan nama pengguna dan kata laluan LDAP yang sah dari pangkalan DN yang anda tentukan di atas untuk menguji sama ada log masuk LDAP anda dikonfigurasi dengan betul. ANDA MESTI SIMPAN KONFIGURASI LDAP TERKINI DAHULU.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Nama Sesawang',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Botak Botak',
-    'slack_channel'             => 'Saluran Slack',
-    'slack_endpoint'            => 'Endpoint Slack',
-    'slack_integration'         => 'Tetapan Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ms/admin/settings/message.php b/resources/lang/ms/admin/settings/message.php
index 6e18c3214a..590a825824 100644
--- a/resources/lang/ms/admin/settings/message.php
+++ b/resources/lang/ms/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ms/admin/users/general.php b/resources/lang/ms/admin/users/general.php
index 7c70faadc0..94f5930d5b 100644
--- a/resources/lang/ms/admin/users/general.php
+++ b/resources/lang/ms/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.',
+    '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',
     'send_email_help'   => 'Anda mesti memberikan alamat e-mel untuk pengguna ini menghantar bukti kelayakan kepada mereka. Bukti kelayakan e-mel hanya boleh dilakukan pada penciptaan pengguna. Kata laluan disimpan dalam cincang sehala dan tidak boleh diambil semula setelah disimpan.',
     'view_user'         => 'Papar Pengguna :nama',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ms/admin/users/message.php b/resources/lang/ms/admin/users/message.php
index 70941adb30..aa8f17e03d 100644
--- a/resources/lang/ms/admin/users/message.php
+++ b/resources/lang/ms/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 [:id] tidak wujud.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Ruangan log masuk diperlukan',
     'user_password_required'    => 'Ruangan kata kunci diperlukan.',
     'insufficient_permissions'  => 'Tidak cukup kuasa.',
diff --git a/resources/lang/ms/auth/general.php b/resources/lang/ms/auth/general.php
index c344377fb3..fd8da93f55 100644
--- a/resources/lang/ms/auth/general.php
+++ b/resources/lang/ms/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Ingat saya',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php
index 86920966ab..b2c97f6c06 100644
--- a/resources/lang/ms/general.php
+++ b/resources/lang/ms/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Aksesori',
     'activated'			    => 'Diaktifkan',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Aksesori',
     'accessory_report'		=> 'Laporan Aksesori',
     'action'                => 'Tindakan',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     'audit_report'			=> 'Log Audit',
     'assets'				=> 'Harta',
+    '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'         => 'Hapuskan Avatar',
     'avatar_upload'         => 'Muat naik Avatar',
     'back'      			=> 'Belakang',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Batalkan',
     'categories'			=> 'Kategori',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Dihapuskan',
     'delete_seats'  		=> 'Kerusi dipadamkan',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Pembaikan Aset',
     'item'  				=> 'Perkara',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Kebenaran yang tidak mencukupi!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Bahasa',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Permintaan Dibatalkan',
     'save'  				=> 'Simpan',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Pilih',
     'select_all'            => 'Select All',
     'search'				=> 'Carian',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Tandatangan',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Kulit',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => 'MODEM DEMO: Sesetengah ciri dilumpuhkan untuk pemasangan ini.',
     'site_name'				=> 'Nama Sesawang',
     'state'  				=> 'Negeri',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Adakah anda pasti ingin memadamkannya',
     'submit'				=> 'Hantar',
     'target'                => 'Sasaran',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Paparan Masa dan Tarikh',
     'total_assets'			=> 'jumlah harta',
     'total_licenses'		=> 'jumlah lesen',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ms/help.php b/resources/lang/ms/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ms/help.php
+++ b/resources/lang/ms/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ms/localizations.php b/resources/lang/ms/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ms/localizations.php
+++ b/resources/lang/ms/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ms/mail.php b/resources/lang/ms/mail.php
index 63b70370cf..dfcfe5a2ec 100644
--- a/resources/lang/ms/mail.php
+++ b/resources/lang/ms/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Masuk ke pemasangan Snipe-IT baru anda menggunakan kelayakan di bawah ini:',
     'login' => 'Log masuk:',
     'Low_Inventory_Report' => 'Laporan Inventori Rendah',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'QTY min',
     'name' => 'Nama',
     'new_item_checked' => 'Item baru telah diperiksa di bawah nama anda, butiran di bawah.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Kredensial Snipe-IT anda',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ms/validation.php b/resources/lang/ms/validation.php
index 31e0649b08..2924a7f29c 100644
--- a/resources/lang/ms/validation.php
+++ b/resources/lang/ms/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The: atribut mesti mempunyai sekurang-kurangnya: item min.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Piliah :attribute tidak sah.',
     'numeric'              => ':attribute mesti nombor.',
     'present'              => 'Yang: bidang atribut mesti ada.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Kata laluan semasa anda tidak betul',
         'dumbpwd'          => 'Kata laluan itu terlalu umum.',
         'statuslabel_type' => 'Anda mesti memilih jenis label status yang sah',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/nl/admin/accessories/general.php b/resources/lang/nl/admin/accessories/general.php
index 098a67a353..8bc3b71272 100644
--- a/resources/lang/nl/admin/accessories/general.php
+++ b/resources/lang/nl/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Accessoire bijwerken',
     'use_default_eula'					=> 'Gebruik de <a href="#" data-toggle="modal" data-target="#eulaModal"> standaard gebruikersovereenkomst</a>.',
     'use_default_eula_disabled'			=> '<del>Gebruik de standaard gebruikersovereenkomst.</del> Geen standaard gebruikersovereenkomst ingesteld. Ga naar Instellingen en voeg er één toe.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/nl/admin/accessories/message.php b/resources/lang/nl/admin/accessories/message.php
index 5190674f1d..ef835a6ca6 100644
--- a/resources/lang/nl/admin/accessories/message.php
+++ b/resources/lang/nl/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Het accessoire is niet uitgecheckt. Probeer het opnieuw.',
         'success' 		=> 'Het accessoire is uitgecheckt.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.'
     ),
 
diff --git a/resources/lang/nl/admin/asset_maintenances/form.php b/resources/lang/nl/admin/asset_maintenances/form.php
index a356b2c896..e370c73df8 100644
--- a/resources/lang/nl/admin/asset_maintenances/form.php
+++ b/resources/lang/nl/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Onderhoudstype',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titel',
-        'start_date'             => 'Gestart',
-        'completion_date'        => 'Voltooid',
+        'start_date'             => 'Begindatum',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kostprijs',
         'is_warranty'            => 'Garantieverbetering',
-        'asset_maintenance_time' => 'Dagen',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notities',
-        'update'                 => 'Bijwerken',
-        'create'                 => 'Aanmaken'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/nl/admin/categories/message.php b/resources/lang/nl/admin/categories/message.php
index b5f24be0bb..f1ef40a8b6 100644
--- a/resources/lang/nl/admin/categories/message.php
+++ b/resources/lang/nl/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Categorie is niet aangepast. Probeer het opnieuw.',
-        'success' => 'Categorie is aangepast.'
+        'success' => 'Categorie is aangepast.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/nl/admin/components/general.php b/resources/lang/nl/admin/components/general.php
index 75ee081372..4f1694ff57 100644
--- a/resources/lang/nl/admin/components/general.php
+++ b/resources/lang/nl/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Resterend',
     'total' 			                 => 'Totaal',
     'update'                            => 'Component bijwerken',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/nl/admin/components/message.php b/resources/lang/nl/admin/components/message.php
index 5e4a3fe566..5b4900ba6c 100644
--- a/resources/lang/nl/admin/components/message.php
+++ b/resources/lang/nl/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Component is niet uitgecheckt, probeer het nogmaals',
         'success' 		=> 'Component succesvol uitgecheckt.',
-        'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.'
+        'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/nl/admin/consumables/message.php b/resources/lang/nl/admin/consumables/message.php
index cffe71acbf..8c0a42d37d 100644
--- a/resources/lang/nl/admin/consumables/message.php
+++ b/resources/lang/nl/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Verbruiksartikel is niet uitgecheckt, probeer het opnieuw',
         'success' 		=> 'Verbruiksartikel is met succes uitgecheckt.',
-        'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.'
+        'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/nl/admin/custom_fields/general.php b/resources/lang/nl/admin/custom_fields/general.php
index 251ad34681..0c32949e5b 100644
--- a/resources/lang/nl/admin/custom_fields/general.php
+++ b/resources/lang/nl/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Gebruikt door modellen',
     'order'   		            => 'Bestelling',
     'create_fieldset'         => 'Nieuwe veldset',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Maak een nieuwe veldset aan',
     'create_field'            => 'Nieuw aangepast veld',
     'create_field_title' => 'Maak een nieuw aangepast veld',
@@ -41,9 +44,11 @@ return [
     'make_required' => 'Optioneel - klik om vereist te maken',
     'reorder' => 'Herordenen',
     'db_field' => 'DB-veld',
-    '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' => 'WAARSCHUWING. Dit veld staat in de tabel met aangepaste velden als <code> :db_column </code> maar moet :expected </code> zijn.',
     'is_unique' => 'Deze waarde moet uniek zijn voor alle assets',
     'unique' => 'Uniek',
-    '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' => 'Laat de uitgecheckte gebruiker deze waarden zien in de weergave van toegewezen bezittingen pagina',
+    'display_in_user_view_table' => 'Zichtbaar voor gebruiker',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/nl/admin/custom_fields/message.php b/resources/lang/nl/admin/custom_fields/message.php
index c05e051215..64945a6124 100644
--- a/resources/lang/nl/admin/custom_fields/message.php
+++ b/resources/lang/nl/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Fout bij het valideren van standaard veldset waarden.',
 
     ),
 
diff --git a/resources/lang/nl/admin/departments/message.php b/resources/lang/nl/admin/departments/message.php
index 87961db7b6..780832f4bf 100644
--- a/resources/lang/nl/admin/departments/message.php
+++ b/resources/lang/nl/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Afdeling bestaat niet.',
-    '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' => 'Er bestaat al een afdeling met die naam op deze bedrijfslocatie. Of kies een meer specifieke naam voor deze afdeling. ',
     'assoc_users'	 => 'Deze afdeling is op dit moment gekoppeld aan minstens één gebruiker en kan daardoor niet verwijderd worden. Zorg ervoor dat er geen gebruikers meer aan deze afdeling gekoppeld zijn en probeer het opnieuw. ',
     'create' => array(
         'error'   => 'Afdeling is niet aangemaakt, probeer het nogmaals.',
diff --git a/resources/lang/nl/admin/groups/message.php b/resources/lang/nl/admin/groups/message.php
index d5e1ff813d..784f2e274c 100644
--- a/resources/lang/nl/admin/groups/message.php
+++ b/resources/lang/nl/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Groep bestaat al!',
-    'group_not_found'     => 'Groep [:id] bestaat niet.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Het veld \'naam\' is verplicht.',
 
     'success' => array(
diff --git a/resources/lang/nl/admin/hardware/form.php b/resources/lang/nl/admin/hardware/form.php
index 3a9fe6a93f..0ef3465835 100644
--- a/resources/lang/nl/admin/hardware/form.php
+++ b/resources/lang/nl/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Bevestig bulk verwijdering van assets',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Bekijk de assets voor bulkverwijdering hieronder. Eenmaal verwijderd, kunnen deze assets worden hersteld, maar ze zullen niet langer geassocieerd worden met gebruikers waaraan ze momenteel zijn toegewezen.',
+  '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'	=> 'Je staat op het punt om :asset_count assets te verwijderen.',
-    'bulk_update'		=> 'Assets in bulk bijwerken',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+    'bulk_update'		=> 'Meerdere activa bijwerken',
     'bulk_update_help'	=> 'Met dit formulier kun je meerdere assets tegelijk bijwerken. Vul alleen de velden in die je moet wijzigen. Alle lege velden blijven ongewijzigd. ',
-    '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_warn'	=> 'Je staat op het punt om de eigenschappen van één bezitting te bewerken. Je staat op het punt om de eigenschappen van :asset_count bezittingen te bewerken.',
     'checkedout_to'		=> 'Uitgecheckt aan',
     'checkout_date'		=> 'Uitgecheckt datum',
     'checkin_date'		=> 'Ingecheckt datum',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update alleen standaard locatie',
     '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.',
-    'processing_spinner' => 'Verwerken...',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'optional_infos'  => 'Optionele informatie',
+    'order_details'   => 'Bestelling Gerelateerde Informatie'
 ];
diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php
index ffe543e2ff..77c29d4ea0 100644
--- a/resources/lang/nl/admin/hardware/general.php
+++ b/resources/lang/nl/admin/hardware/general.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    'about_assets_title'           => 'Over assets',
+    'about_assets_title'           => 'Over activa',
     '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'             => 'Asset uitchecken',
-    'bulk_checkin'              => 'Assets inchecken',
+    'bulk_checkout'             => 'Activa uitgeven',
+    'bulk_checkin'              => 'Activa innemen',
     'checkin'  					=> 'Asset inchecken',
     'checkout'  				=> 'Asset uitchecken',
     'clone'  					=> 'Dupliceer Asset',
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Deze asset is verwijderd.',
     'edit'  					=> 'Asset bewerken',
     'model_deleted'  			=> 'Dit Assets model is verwijderd. U moet het model herstellen voordat u het Asset kunt herstellen.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Aanvraagbaar',
     'requested'				    => 'Aangevraagd',
     'not_requestable'           => 'Niet aanvraagbaar',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Herstel Asset',
     'pending'  					=> 'In behandeling',
     'undeployable'  			=> 'Niet uitgeefbaar',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Bekijk Asset',
     'csv_error' => 'Je hebt een fout in je CSV-bestand:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Foutmeldingen:',
     'success_messages' => 'Succesvolle berichten:',
     'alert_details' => 'Zie hieronder voor details.',
-    'custom_export' => 'Aangepaste export'
+    'custom_export' => 'Aangepaste export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/nl/admin/hardware/message.php b/resources/lang/nl/admin/hardware/message.php
index 27b19e78da..25b6c38187 100644
--- a/resources/lang/nl/admin/hardware/message.php
+++ b/resources/lang/nl/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Asset is niet hersteld, probeer het opnieuw',
         'success' 		=> 'Asset is succesvol hersteld.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Je bestand is geïmporteerd',
         'file_delete_success'   => 'Je bestand is succesvol verwijderd',
         'file_delete_error'      => 'Het bestand kon niet worden verwijderd',
+        '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',
     ],
 
 
diff --git a/resources/lang/nl/admin/hardware/table.php b/resources/lang/nl/admin/hardware/table.php
index eb772f3bc4..7200ee7ce3 100644
--- a/resources/lang/nl/admin/hardware/table.php
+++ b/resources/lang/nl/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In/Uit',
     'checkout_date' => 'Uitcheck datum',
     'checkoutto' 	=> 'Uitgecheckt',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Huidige Waarde',
     'diff' 			=> 'Verschil',
     'dl_csv' 		=> 'CSV downloaden',
diff --git a/resources/lang/nl/admin/licenses/general.php b/resources/lang/nl/admin/licenses/general.php
index a9fb0ef8cc..68c503c6f9 100644
--- a/resources/lang/nl/admin/licenses/general.php
+++ b/resources/lang/nl/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Over licenties',
-    'about_licenses'                  => 'Licenties worden gebruikt om software te beheren. Deze hebben een maximum aantal wat aan gebruikers uitgeleverd kan worden',
+    'about_licenses_title'      => 'Over licenties',
+    'about_licenses'            => 'Licenties worden gebruikt om software te beheren. Deze hebben een maximum aantal wat aan gebruikers uitgeleverd kan worden',
     'checkin'  					=> 'Check werkplek licentie in',
     'checkout_history'  		=> 'Checkout historie',
     'checkout'  				=> 'Check werkplek licentie uit',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Applicatie Licenties',
     'user'  					=> 'Gebruiker',
     'view'  					=> 'Bekijk licentie',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/nl/admin/licenses/message.php b/resources/lang/nl/admin/licenses/message.php
index ee72662166..66bc29b8c9 100644
--- a/resources/lang/nl/admin/licenses/message.php
+++ b/resources/lang/nl/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Licentie bestaat niet of je hebt geen toestemming om het te bekijken.',
     'user_does_not_exist' => 'Gebruiker bestaat niet.',
     'asset_does_not_exist' 	=> 'Het asset dat je probeert te koppelen aan deze licentie bestaat niet.',
     'owner_doesnt_match_asset' => 'Het asset dat je probeert te koppelen aan deze licentie is eigendom van iemand anders dan de persoon die is geselecteerd in de toegewezen aan de dropdown.',
diff --git a/resources/lang/nl/admin/locations/message.php b/resources/lang/nl/admin/locations/message.php
index e9e6b82815..0a0596dbd5 100644
--- a/resources/lang/nl/admin/locations/message.php
+++ b/resources/lang/nl/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Deze locatie is momenteel gekoppeld met tenminste één persoon en kan hierdoor niet worden verwijderd. Update je gebruikers die niet meer bij deze locatie horen 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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Toegewezen activa',
+    'current_location' => 'Huidige locatie',
 
 
     'create' => array(
diff --git a/resources/lang/nl/admin/locations/table.php b/resources/lang/nl/admin/locations/table.php
index 01e8639bb9..59973ab94f 100644
--- a/resources/lang/nl/admin/locations/table.php
+++ b/resources/lang/nl/admin/locations/table.php
@@ -3,8 +3,8 @@
 return [
     'about_locations_title'     => 'Over locaties',
     'about_locations'           => 'Locaties worden gebruikt om de locatie van gebruikers, materiaal en overige items bij te houden',
-    'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Toegewezen assets',
+    'assets_rtd'                => 'Activa', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Toegewezen activa',
     'id'                        => 'ID',
     'city'                      => 'Stad',
     'state'                     => 'Staat/provincie',
@@ -23,7 +23,7 @@ return [
     'user_name'                 => 'Gebruiksnaam',
     'department'                => 'Afdeling',
     'location'                  => 'Locatie',
-    'asset_tag'                 => 'Assets Tag',
+    'asset_tag'                 => 'Activalabel',
     'asset_name'                => 'Naam',
     'asset_category'            => 'Categorie',
     'asset_manufacturer'        => 'Fabrikant',
diff --git a/resources/lang/nl/admin/manufacturers/message.php b/resources/lang/nl/admin/manufacturers/message.php
index 0db1822e91..6264a0385c 100644
--- a/resources/lang/nl/admin/manufacturers/message.php
+++ b/resources/lang/nl/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Fabrikant bestaat niet.',
     'assoc_users'	 => 'Deze fabrikant is verbonden met 1 of meerdere modellen en kan hierdoor niet verwijderd worden. Controleer de modellen zodat er geen verbinding meer is met deze fabrikant en probeer opnieuw. ',
 
diff --git a/resources/lang/nl/admin/manufacturers/table.php b/resources/lang/nl/admin/manufacturers/table.php
index 02b3bb9cdb..e240552603 100644
--- a/resources/lang/nl/admin/manufacturers/table.php
+++ b/resources/lang/nl/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Ondersteuning E-mail',
     'support_phone'   		=> 'Ondersteuning telefoonnummer',
     'support_url'   		=> 'Ondersteuning URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Wijzig Fabrikant',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/nl/admin/models/general.php b/resources/lang/nl/admin/models/general.php
index bdc6d86fc7..fe0e74be90 100644
--- a/resources/lang/nl/admin/models/general.php
+++ b/resources/lang/nl/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 om :model_count assetmodellen te verwijderen.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Herstel model',
     'requestable'               => 'Gebruikers mogen dit model aanvragen',
 	'show_mac_address'			      => 'Toon MAC-adresveld in de assets van dit model',
diff --git a/resources/lang/nl/admin/models/message.php b/resources/lang/nl/admin/models/message.php
index 89df316480..033638481a 100644
--- a/resources/lang/nl/admin/models/message.php
+++ b/resources/lang/nl/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model bestaat niet.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Dit model is momenteel gekoppeld met één of meer assets en kan niet worden verwijderd. Verwijder de assets en probeer het opnieuw. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model is niet gewijzigd, probeer het opnieuw',
-        'success' => 'Model met succes gewijzigd.'
+        'success' => 'Model met succes gewijzigd.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Er was geen veld geselecteerd dus is er niks gewijzigd.',
-        'success' 		=> 'Modellen bijgewerkt.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Er waren geen modellen geselecteerd, er is dus niets verwijderd.',
-        'success' 		    => ':success_count model(s) verwijderd!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(len) werden verwijderd, maar : fail_count konden niet worden verwijderd omdat er nog steeds assets aan gekoppeld zijn.'
     ),
 
diff --git a/resources/lang/nl/admin/models/table.php b/resources/lang/nl/admin/models/table.php
index bbb11f1325..e4cf9156f8 100644
--- a/resources/lang/nl/admin/models/table.php
+++ b/resources/lang/nl/admin/models/table.php
@@ -7,7 +7,7 @@ return array(
     'eol'	 				=> 'EOL',
     'modelnumber'   		=> 'Model Nr.',
     'name'      			=> 'Asset model naam',
-    'numassets' 			=> 'Assets',
+    'numassets' 			=> 'Activa',
     'title'					=> 'Asset modellen',
     'update'				=> 'Wijzig asset model',
     'view'					=> 'Bekijk asset model',
diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php
index 4cf3373550..abc2b158d3 100644
--- a/resources/lang/nl/admin/settings/general.php
+++ b/resources/lang/nl/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Dit is een Active Directory server',
     'alerts'                	=> 'Waarschuwingen',
-    'alert_title'               => 'Update waarschuwingsinstellingen',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Verstuur meldingen naar',
     'alert_email_help'    => 'E-mailadressen of distributielijsten waar je meldingen naar wilt verzenden, door komma\'s gescheiden',
     'alerts_enabled'			=> 'Meldingen ingeschakeld',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Door dit selectievakje aan te vinken, kan een gebruiker de skin van de gebruikersinterface met een andere overschrijven.',
     'asset_ids'					=> 'Asset IDs',
     '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'       => 'Als je verplicht bent regelmatig fysiek je bezitting te controleren, kies dan een interval in maanden. Als je deze interval bijwerkt worden alle "volgende controle datums" aangepast.',
     'audit_warning_days'        => 'Audit waarschuwingsdrempel',
     'audit_warning_days_help'   => 'Hoeveel dagen op voorhand moeten we je waarschuwen wanneer assets gecontroleerd moeten worden?',
     'auto_increment_assets'		=> 'Genereer automatisch verhogen van asset Id\'s',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Herstellen vanuit back-up',
     '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</strong> volledig vervangen worden 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',
@@ -75,8 +75,9 @@ return [
     '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',
-    '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.',
+    'ldap_default_group'        => 'Standaard Permissies Groep',
+    'ldap_default_group_info'   => 'Selecteer een groep om toe te wijzen aan nieuwe gesynchroniseerde gebruikers. Vergeet niet dat een gebruiker de rechten van de toegekende groep aanneemt.',
+    'no_default_group'          => 'Geen Standaard Groep',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP Client-Side TLS-sleutel',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS-certificaat',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP instellingen',
     'ldap_client_tls_cert_help' => 'Client-Side TLS-certificaat en sleutel voor LDAP verbindingen zijn meestal alleen nuttig in Google Workspace configuraties met "Secure LDAP." Beide zijn vereist.',
      'ldap_client_tls_key'       => 'LDAP Client-Side TLS-sleutel',
+    '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'      => 'Voer een geldig LDAP gebruikersnaam en paswoord in van de base DN die u hierboven heeft bepaald. Dit om te testen of uw LDAP login correct is geconfigureerd. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
     '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',
@@ -111,7 +114,7 @@ return [
     'ldap_auth_filter_query'    => 'LDAP verficatie query',
     'ldap_version'              => 'LDAP versie',
     'ldap_active_flag'          => 'LDAP actief 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_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_emp_num'              => 'LDAP personeelsnummer',
     'ldap_email'                => 'LDAP E-mail',
     'ldap_test'                 => 'LDAP testen',
@@ -137,7 +140,7 @@ return [
     'login_remote_user_header_name_text' => 'Aangepaste header gebruikersnaam,',
     'login_remote_user_header_name_help' => 'Gebruik een specifieke header in plaats van REMOTE_USER',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Gebruikt bij afdrukken',
+    'logo_print_assets'         => 'Gebruiken bij afdrukken',
     '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',
@@ -178,7 +181,7 @@ return [
     'saml_idp_metadata_help'    => 'U kunt de IdP metadata opgeven met behulp van een URL of XML bestand.',
     'saml_attr_mapping_username' => 'Attribuuttoewijzing - Gebruikersnaam',
     'saml_attr_mapping_username_help' => 'Naam-Id zal worden gebruikt als attribuuttoewijzing niet gespecificeerd of ongeldig is.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin_label'     => 'SAML Geforceerd Inloggen',
     'saml_forcelogin'           => 'Maak SAML de primaire login',
     'saml_forcelogin_help'      => 'U kunt \'/login?nosaml\' gebruiken om naar de normale inlogpagina te gaan.',
     'saml_slo_label'            => 'SAML enkel uitloggen',
@@ -190,23 +193,28 @@ return [
     'setting'                   => 'Instelling',
     'settings'                  => 'Instellingen',
     'show_alerts_in_menu'       => 'Waarschuwingen weergeven in hoofdmenu',
-    'show_archived_in_list'     => 'Gearchiveerde Assets',
+    'show_archived_in_list'     => 'Gearchiveerde activa',
     'show_archived_in_list_text'     => 'Toon gearchiveerde items in de lijst "alle items"',
     'show_assigned_assets'      => 'Toon assets die zijn toegewezen aan assets',
     'show_assigned_assets_help' => 'Geef assets weer die zijn toegewezen aan de andere assets in Bekijk Gebruiker -> Assets, Bekijk Gebruiker -> Info -> Print Alles Toegewezen en in Account -> Bekijk Toegewezen Assets.',
     'show_images_in_email'     => 'Afbeeldingen weergeven in e-mails',
     'show_images_in_email_help'   => 'Schakel dit selectievakje uit als uw Snipe-IT-installatie zich achter een VPN of gesloten netwerk bevindt en gebruikers buiten het netwerk geen afbeeldingen vanuit Snipe-IT in hun e-mails kunnen laten zien.',
     'site_name'                 => 'Site naam',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Slack instellingen bijwerken',
-    'slack_help'                => 'Slack instellingen',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack kanaal',
-    'slack_endpoint'            => 'Slack eindpunt',
-    'slack_integration'         => 'Slack instellingen',
-    'slack_integration_help'    => 'Slack integratie is optioneel, maar het eindpunt en kanaal zijn vereist als je het wilt gebruiken. Om Slack-integratie te configureren, moet u eerst <a href=":slack_link" target="_new" rel="noopener">een inkomende webhook</a> aanmaken op uw Slack-account. Klik op de <strong>Test Slack Integratie</strong> knop om te bevestigen dat uw instellingen correct zijn voordat u opslaat. ',
-    'slack_integration_help_button'    => 'Nadat u uw Slack-informatie hebt opgeslagen, verschijnt een testknop.',
-    'slack_test_help'           => 'Test of uw Slack-integratie correct is geconfigureerd. JE MOET EERST JE GEUPDATETE SLACK-INSTELLINGEN OPSLAAN.',
+    'general_webhook'           => 'General Webhook',
+    '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 Versie',
     'support_footer'            => 'Ondersteuningsvoettekst links ',
     'support_footer_help'       => 'Geef aan wie de links naar de Snipe-IT-ondersteuningsinformatie en gebruikershandleiding ziet',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Verhogen en voorvoegsels',
     'labels' => 'Labels',
     'labels_title' => 'Labelinstellingen bijwerken',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Volgende: Gebruiker aanmaken',
     'ldap_settings_link' => 'LDAP instellingen pagina',
     'slack_test' => 'Test <i class="fab fa-slack"></i> integratie',
+    '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. ',
+
 ];
diff --git a/resources/lang/nl/admin/settings/message.php b/resources/lang/nl/admin/settings/message.php
index 31d344a6d1..a1692ced8e 100644
--- a/resources/lang/nl/admin/settings/message.php
+++ b/resources/lang/nl/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP-authenticatie testen...',
         'authentication_success' => 'Gebruiker met succes geverifieerd met LDAP!'
     ],
-    'slack' => [
-        'sending' => 'Slack testbericht wordt verzonden...',
-        'success_pt1' => 'Gelukt! Controleer de ',
-        'success_pt2' => ' kanaal voor je testbericht, klik op OPSLAAN om je instellingen op te slaan.',
-        '500' => '500 serverfout.',
-        'error' => 'Er ging iets mis.',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/nl/admin/suppliers/table.php b/resources/lang/nl/admin/suppliers/table.php
index f26481e53d..577812ea6a 100644
--- a/resources/lang/nl/admin/suppliers/table.php
+++ b/resources/lang/nl/admin/suppliers/table.php
@@ -4,7 +4,7 @@ return array(
     'about_suppliers_title' => 'Over leveranciers',
     'about_suppliers_text'  => 'Leveranciers worden gebruikt om de afkomst van items bij te houden',
     'address'               => 'Leverancier adres',
-    'assets'                => 'Assets',
+    'assets'                => 'Activa',
     'city'                  => 'Stad',
     'contact'               => 'Contact naam',
     'country'               => 'Land',
@@ -21,7 +21,7 @@ return array(
     'update'                => 'Wijzig leverancier',
     'url'                   => 'URL',
     'view'                  => 'Bekijk leverancier',
-    'view_assets_for'       => 'Bekijk assets voor',
+    'view_assets_for'       => 'Activa bekijken',
     'zip'                   => 'Postcode',
 
 );
diff --git a/resources/lang/nl/admin/users/general.php b/resources/lang/nl/admin/users/general.php
index b8aa79d4fc..e38ab5ab41 100644
--- a/resources/lang/nl/admin/users/general.php
+++ b/resources/lang/nl/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     'last_login'        => 'Laatst aangemeld',
     'ldap_config_text'  => 'LDAP configuratie kan worden gevonden in Admin > Instellingen. De (optioneel) geselecteerde locatie zal voor alle geimporteerde gebruikers ingesteld worden.',
     'print_assigned'    => 'Print alles wat toegewezen is',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'E-maillijst met alle toegewezen artikelen',
+    'user_notified'     => 'Gebruiker is een lijst van de momenteel toegewezen artikelen gemaild.',
+    '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 is uitgecheckt aan :name',
     'send_email_help'   => 'U moet een e-mailadres opgeven voor deze gebruiker om hen inloggegevens te sturen. E-mailen van inloggegevens kan alleen worden gedaan bij het maken van gebruikers. Wachtwoorden worden in eenrichtingshash opgeslagen en kunnen niet worden opgehaald zodra ze zijn opgeslagen.',
     'view_user'         => 'Bekijk gebruiker :name',
@@ -33,12 +35,20 @@ return [
     'superadmin_permission_warning' => 'Alleen superbeheerders mogen superadmin toegang verlenen aan een gebruiker.',
     'admin_permission_warning' => 'Alleen gebruikers met beheerdersrechten of hogere rechten mogen een gebruiker admin toegang verlenen.',
     'remove_group_memberships' => 'Groep lidmaatschappen verwijderen',
-    'warning_deletion' => 'WAARSCHUWING:',
-    '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',
+    'warning_deletion_information' => 'U staat op het punt ALLE items in te checken van de :count gebruiker(s) hieronder vermeld. Superadmin namen worden rood gemarkeerd.',
+    'update_user_assets_status' => 'Alle bezittingen voor deze gebruikers naar deze status bijwerken',
     'checkin_user_properties' => 'Check-in alle eigendommen gekoppeld aan deze gebruikers',
     'remote_label'   => 'Dit is een externe gebruiker',
     'remote'   => 'Extern',
     'remote_help' => 'Dit kan handig zijn als je moet filteren op externe gebruikers die nooit of zelden op je fysieke locatie komen.',
     'not_remote_label' => 'Dit is geen externe gebruiker',
+    '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/nl/admin/users/message.php b/resources/lang/nl/admin/users/message.php
index 8d84bc63fc..e130128b46 100644
--- a/resources/lang/nl/admin/users/message.php
+++ b/resources/lang/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 [:id] bestaat niet.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Het veld gebruikersnaam is verplicht.',
     'user_password_required'    => 'Het veld wachtwoord is verplicht.',
     'insufficient_permissions'  => 'Onvoldoende rechten.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'LDAP integratie is niet geconfigureerd voor deze installatie.',
     'password_resets_sent'      => 'De geselecteerde gebruikers die zijn geactiveerd en die een geldig e-mailadres hebben, hebben een wachtwoord reset link ontvangen.',
     'password_reset_sent'       => 'Een link om het wachtwoord te resetten is verstuurd naar :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'Deze gebruiker heeft geen e-mailadres in zijn profiel.',
+    'user_has_no_assets_assigned'   => 'Deze gebruiker heeft geen bezittingen toegewezen',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Deze gebruiker heeft geen e-mailadres ingesteld.',
+        'success' => 'De gebruiker is op de hoogte gebracht van zijn huidige voorraad.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/nl/admin/users/table.php b/resources/lang/nl/admin/users/table.php
index 7f0dfbd46a..343dba698a 100644
--- a/resources/lang/nl/admin/users/table.php
+++ b/resources/lang/nl/admin/users/table.php
@@ -3,7 +3,7 @@
 return array(
     'activated'  			=> 'Actief',
     'allow'  				=> 'Toestaan',
-    'checkedout'  			=> 'Assets',
+    'checkedout'  			=> 'Activa',
     'created_at' 			=> 'Aangemaakt',
     'createuser' 			=> 'Gebruiker aanmaken',
     'deny'  				=> 'Weigeren',
diff --git a/resources/lang/nl/auth/general.php b/resources/lang/nl/auth/general.php
index 75158573a7..04db299e90 100644
--- a/resources/lang/nl/auth/general.php
+++ b/resources/lang/nl/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Onthoud mij',
     'username_help_top'                 => 'Voer je <strong>gebruikersnaam</strong> in om een wachtwoord reset link te mailen.',
     'username_help_bottom'          => 'Je gebruikersnaam en e-mailadres <em>kunnen</em> hetzelfde zijn, maar kan ook niet zo zijn, afhankelijk van je configuratie. Als je je gebruikersnaam niet meer weet, neem dan contact op met je beheerder. <br><br><strong>Gebruikersnamen zonder een bijbehorende e-mailadres zullen geen wachtwoord reset link toegestuurd krijgen.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/nl/button.php b/resources/lang/nl/button.php
index d65ce4d264..2756069bcc 100644
--- a/resources/lang/nl/button.php
+++ b/resources/lang/nl/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Acties',
     'add'    	                => 'Toevoegen',
     'cancel'                    => 'Annuleren',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Check Alles In / Verwijder Gebruiker',
     'delete'  	                => 'Verwijder',
     'edit'    	                => 'Bewerk',
     'restore' 	                => 'Herstel',
diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php
index 01abc519bb..327332b36f 100644
--- a/resources/lang/nl/general.php
+++ b/resources/lang/nl/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessoires',
     'activated'			    => 'Geactiveerd',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessoire',
     'accessory_report'		=> 'Accessoire Rapport',
     'action'                => 'Actie',
@@ -11,8 +12,8 @@ return [
     'admin'					=> 'Beheerder',
     'administrator'			=> 'Beheerder',
     'add_seats'             => 'Toegevoegde plekken',
-    'age'                   => "Age",
-    'all_assets'			=> 'Alle Assets',
+    'age'                   => "Leeftijd",
+    'all_assets'			=> 'Alle activa',
     'all'       			=> 'Alle',
     'archived'              => 'Gearchiveerd',
     'asset_models'			=> 'Asset modellen',
@@ -21,13 +22,19 @@ return [
     'asset_report'          => 'Asset Rapport',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Beschikbare assets',
-    'accept_assets'         => 'Accepteer Assets :name',
-    'accept_assets_menu'    => 'Accepteer assets',
+    'assets_available'		=> 'Beschikbare activa',
+    'accept_assets'         => 'Accepteer activa :name',
+    'accept_assets_menu'    => 'Activa accepteren',
     'audit'				    => 'Audit',
     'audit_report'			=> 'Auditlogboek',
-    'assets'				=> 'Assets',
+    'assets'				=> 'Activa',
+    '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'           => 'Toegewezen aan :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Verwijder profielafbeelding',
     'avatar_upload'         => 'Upload profielafbeelding',
     'back'      			=> 'Terug',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk bewerken',
     'bulk_delete'           => 'Bulk verwijderen',
     'bulk_actions'          => 'Bulk acties',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'op Status',
     'cancel'  				=> 'Annuleren',
     'categories'			=> 'Categorieën',
@@ -66,8 +75,8 @@ return [
     'create'				=> 'Nieuwe aanmaken',
     'created'               => 'Item aangemaakt',
     'created_asset'			=> 'aangemaakt asset',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Gemaakt op',
+    'created_by'            => 'Gemaakt door',
     'record_created' 		=> 'Record gemaakt',
     'updated_at' 			=> 'Bijgewerkt op',
     'currency'  			=> '$', // this is deprecated
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Verwijderd',
     'delete_seats'  		=> 'Verwijderde plekken',
     'deletion_failed'       => 'Verwijderen mislukt',
@@ -97,14 +107,14 @@ return [
     'download_all'		    => 'Alles downloaden',
     'editprofile'  			=> 'Bewerk jouw profiel',
     'eol'					=> 'EOL',
-    'email_domain'			=> 'E-mail domein',
-    'email_format'			=> 'E-mail indeling',
+    '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'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    '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)',
@@ -120,7 +130,7 @@ return [
     'files'                 => 'Bestanden',
     'file_name'				=> 'Bestand',
     'file_type'             => 'Bestandstype',
-    'filesize'              => 'Bestands grootte',
+    'filesize'              => 'Bestandsgrootte',
     'file_uploads'			=> 'Bestand uploaden',
     'file_upload'           => 'Bestand uploaden',
     'generate'				=> 'Genereer',
@@ -134,11 +144,12 @@ return [
     'id'  					=> 'ID',
     'image'                 => 'Afbeelding',
     'image_delete'         	=> 'Afbeelding verwijderen',
-    'include_deleted'       => 'Include Deleted Assets',
+    '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'  => 'Geaccepteerde bestandstypen zijn jpg, webp, png, gif en svg. Maximale toegestane bestandsgrootte 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'         	    => 'Importeer',
     'importing'         	=> 'Importeren',
     'importing_help'        => 'U kunt assets, accessoires, licenties, componenten, verbruiksartikelen en gebruikers importeren via het CSV-bestand. <br><br>De CSV moet door komma\'s worden gescheiden en met koppen die overeenkomen met de koppen in de <a href="https://snipe-it.readme.io/docs/importing" target="_new">voorbeeld CSV\'s in de documentatie</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Asset onderhoud',
     'item'  				=> 'Item',
     'item_name'             => 'Item Naam',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Onvoldoende rechten!',
     'kits'       			=> 'Vooraf gedefinieerde Kits',
     'language'				=> 'Taal',
@@ -185,10 +198,10 @@ return [
     'new'					=> 'nieuw!',
     'no_depreciation'		=> 'Geen afschrijving',
     'no_results'			=> 'Geen resultaten.',
-    'no'  					=> 'Neen',
+    'no'  					=> 'Nee',
     'notes'  				=> 'Notities',
-    'order_number'          => 'Ordernummer',
-    'only_deleted'          => 'Only Deleted Assets',
+    'order_number'          => 'Bestelnummer',
+    'only_deleted'          => 'Alleen verwijderde activa',
     'page_menu'				=> '_MENU_ items worden weergegeven',
     'pagination_info'		=> 'Getoond _START_ tot _END_ van _TOTAL_ items',
     'pending'				=> 'In afwachting',
@@ -214,10 +227,11 @@ return [
     'requestable_models'    => 'Aanvraagbare modellen',
     'requested'				=> 'Aangevraagd',
     'requested_date'        => 'Aangevraagde datum',
-    'requested_assets'      => 'Gevraagde Assets',
-    'requested_assets_menu' => 'Gevraagde Assets',
+    'requested_assets'      => 'Aangevraagd activa',
+    'requested_assets_menu' => 'Aangevraagde activa',
     'request_canceled'      => 'Aanvraag geannuleerd',
     'save'  				=> 'Opslaan',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Selecteer',
     'select_all'            => 'Alles selecteren',
     'search'				=> 'Zoeken',
@@ -239,9 +253,9 @@ return [
     'sign_in'				=> 'Aanmelden',
     'signature'             => 'Handtekening',
     'signed_off_by'         => 'Afgetekend door',
-    'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'Er wordt een slack bericht verzonden',
-    'slack_test_msg'        => 'Oh hai! Het lijkt erop dat uw Slack integratie met Snipe-IT werkt!',
+    'skin'       			=> 'Thema',
+    '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 MODUS: Sommige functies zijn uitgeschakeld voor deze installatie.',
     'site_name'				=> 'Sitenaam',
     'state'  				=> 'Status',
@@ -253,9 +267,8 @@ return [
     'sure_to_delete'    => 'Weet u zeker dat u wilt verwijderen',
     'submit'				=> 'Verzenden',
     'target'                => 'Doel',
-    'toggle_navigation'     => 'Wissel navigatie',
     'time_and_date_display' => 'Tijd en Datum Weergave',
-    'total_assets'			=> 'totaal assets',
+    'total_assets'			=> 'aantal objecten',
     'total_licenses'		=> 'totaal licenties',
     'total_accessories'		=> 'totaal accessoires',
     'total_consumables'		=> 'totaal verbruiksartikelen',
@@ -263,34 +276,34 @@ return [
     'undeployable'			=> 'Niet-uitgeefbaar',
     'unknown_admin'			=> 'Onbekende Beheerder',
     'username_format'		=> 'Gebruikersnaam indeling',
-    'username'              => 'Username',
+    'username'              => 'Gebruikersnaam',
     'update'                => 'Bijwerken',
     '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',
-    'unaccepted_asset_report' => 'Niet-geaccepteerde assets',
+    'unaccepted_asset_report' => 'Niet-geaccepteerde activa',
     'users'                 => 'Gebruikers',
     'viewall'				=> 'Toon alles',
-    'viewassets'  			=> 'Bekijk toegewezen assets',
-    'viewassetsfor'         => 'Bekijk assets voor :name',
+    'viewassets'  			=> 'Toegewezen activa tonen',
+    'viewassetsfor'         => 'Activa voor :name bekijken',
     'website'               => 'Website',
     'welcome'				=> 'Welkom :name',
     'years'					=> 'jaren',
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postcode',
     'noimage'				=> 'Geen afbeelding geüpload of geen afbeelding gevonden.',
-    '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'   => 'Het opgevraagde bestand bestaat niet op de server.',
+    'file_upload_success'   => 'Bestand uploaden gelukt!',
+    'no_files_uploaded'     => 'Bestand uploaden gelukt!',
     'token_expired'         => 'Je sessie is verlopen. Probeer het nogmaals.',
     'login_enabled'         => 'Login ingeschakeld',
     'audit_due'             => 'Klaar voor audit',
     'audit_overdue'         => 'Over tijd voor audit',
     'accept'                => 'Accepteer :asset',
     'i_accept'              => 'Ik accepteer',
-    'i_decline'             => 'Ik wijs af',
+    'i_decline'             => 'Ik ga niet akkoord',
     'accept_decline'        => 'Accepteren/weigeren',
     'sign_tos'              => 'Teken hieronder om aan te geven dat je akkoord gaat met de servicevoorwaarden:',
     'clear_signature'       => 'Verwijder handtekening',
@@ -337,7 +350,7 @@ return [
     'invalid_category'      => 'Ongeldige categorie',
     'dashboard_info'        => 'Dit is je dashboard. Er zijn er velen maar deze is van jou.',
     '60_percent_warning'    => '60% compleet (waarschuwing)',
-    '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'       => 'Het lijkt erop dat je nog niets hebt toegevoegd, dus we hebben niets fantastisch om weer te geven. Begin met het toevoegen van enkele bezittingen, accessoires, verbruiksartikelen of licenties!',
     'new_asset'             => 'Nieuwe Asset',
     'new_license'           => 'Nieuwe licentie',
     'new_accessory'         => 'Nieuwe accessoire',
@@ -368,25 +381,72 @@ return [
     '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.)',
-    '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 ',
-    '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'
+    'purge_not_allowed'     => 'Verwijderen van verwijderde gegevens is uitgeschakeld in het .env-bestand. Neem contact op met ondersteuning of uw systeembeheerder.',
+    'backup_delete_not_allowed'     => 'Back-ups verwijderen is uitgeschakeld in het .env-bestand. Neem contact op met ondersteuning of uw systeembeheerder.',
+    'additional_files'           => 'Extra bestanden',
+    'shitty_browser'        => 'Geen handtekening gedetecteerd. Als je een oudere browser gebruikt, gebruik dan een modernere browser om de acceptatie van je bezitting te voltooien.',
+    '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_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    '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',
+    'start_date'            => 'Begindatum',
+    'end_date'            => 'Einddatum',
+    'alt_uploaded_image_thumbnail' => 'Upload mini-afbeelding',
+    'placeholder_kit'       => 'Selecteer een set',
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/nl/help.php b/resources/lang/nl/help.php
index 5cca451e48..7d90b6238d 100644
--- a/resources/lang/nl/help.php
+++ b/resources/lang/nl/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Meer Info',
 
-    'audit_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.<br><br>Let op dat als dit asset is uitgecheckt, dan zal de locatie van de persoon, product of locatie waar het uitgecheckt is niet veranderen.',
+    '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 bestaan uit items die met een serienummer of identificatiesticker geregistreerd zijn. Dit zijn over het algemeen de objecten met een hogere waarde waarbij identificatie belangrijk is.',
 
diff --git a/resources/lang/nl/localizations.php b/resources/lang/nl/localizations.php
index be2c321861..f22557738e 100644
--- a/resources/lang/nl/localizations.php
+++ b/resources/lang/nl/localizations.php
@@ -2,313 +2,314 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Kies een taal',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Engels, VS',
+        'en-GB'=> 'Engels, VK',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
-        'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
+        'ar'=> 'Arabisch',
+        'bg'=> 'Bulgaars',
+        'zh-CN'=> 'Chinees, vereenvoudigd',
+        'zh-TW'=> 'Chinese, traditioneel',
+        'hr'=> 'Kroatisch',
+        'cs'=> 'Tsjechisch',
+        'da'=> 'Deens',
+        'nl'=> 'Nederlands',
+        'en-ID'=> 'Engels (Indonesië)',
+        'et'=> 'Estlands',
+        'fil'=> 'Filipijns',
+        'fi'=> 'Fins',
+        'fr'=> 'Frans',
+        'de'=> 'Duits',
+        'de-i'=> 'Duits (Informeel)',
+        'el'=> 'Grieks',
+        'he'=> 'Hebreeuws',
+        'hu'=> 'Hongaars',
+        'is' => 'IJslands',
+        'id'=> 'Indonesisch',
+        'ga-IE'=> 'Iers',
+        'it'=> 'Italiaans',
+        'ja'=> 'Japans',
+        'ko'=> 'Koreaans',
+        'lv'=>'Lets',
+        'lt'=> 'Litouws',
+        'mk'=> 'Macedonisch',
+        'ms'=> 'Maleis',
         'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'mn'=> 'Mongools',
+        'no'=> 'Noors',
+        'fa'=> 'Perzisch',
+        'pl'=> 'Pools',
+        'pt-PT'=> 'Portugees',
+        'pt-BR'=> 'Portugees (Braziliaans)',
+        'ro'=> 'Roemeens',
+        'ru'=> 'Russisch',
+        'sr-CS' => 'Servisch (latijns)',
+        'sl'=> 'Sloveens',
+        'es-ES'=> 'Spaans',
+        'es-CO'=> 'Spaans (Colombia)',
+        'es-MX'=> 'Spaans (Mexico)',
+        'es-VE'=> 'Spaans (Venezuela)',
+        'sv-SE'=> 'Zweeds',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
+        'th'=> 'Thais',
+        'tr'=> 'Turks',
+        'uk'=> 'Oekraïens',
+        'vi'=> 'Vietnamees',
         'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'zu'=> 'Zoeloe',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Selecteer een land',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Ascensie Eiland',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
+        'AE'=>'Verenigde Arabische Emiraten',
         'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AG'=>'Antigua en Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albanië',
+        'AM'=>'Armenië',
+        'AN'=>'Nederlandse Antillen',
         'AO'=>'Angola',
         'AQ'=>'Antarctica',
-        'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AR'=>'Argentinië',
+        'AS'=>'Amerikaans-Samoa',
+        'AT'=>'Oostenrijk',
+        'AU'=>'Australië',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'AŞ/UZET land',
+        'AZ'=>'Azerbeidzjan',
+        'BA'=>'Bosnië en Herzegowina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
+        'BE'=>'België',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
-        'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
-        'BI'=>'Burundi',
+        'BG'=>'Bulgarije',
+        'BH'=>'Bahrein',
+        'BI'=>'Boeroendi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
         'BN'=>'Brunei Darussalam',
-        'BO'=>'Bolivia',
-        'BR'=>'Brazil',
-        'BS'=>'Bahamas',
+        'BO'=>'Bolivië',
+        'BR'=>'Brazilië',
+        'BS'=>'Bahama’s',
         'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BV'=>'Bouveteiland',
         'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BY'=>'Wit-Rusland',
         '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',
+        'CC'=>'Cocoseilanden (Keelingeilanden)',
+        'CD'=>'Congo, Democratische Republiek',
+        'CF'=>'Centraal-Afrikaanse Republiek',
+        'CG'=>'Congo (Republiek)',
+        'CH'=>'Zwitserland',
+        'CI'=>'Ivoorkust',
+        'CK'=>'Cook Eilanden',
+        'CL'=>'Chili',
+        'CM'=>'Kameroen',
+        'CN'=>'Volksrepubliek China',
         'CO'=>'Colombia',
         'CR'=>'Costa Rica',
         'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
+        'CV'=>'Kaapverdië',
+        'CX'=>'Kersteiland',
         'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
+        'CZ'=>'Tsjechische Republiek',
+        'DE'=>'Duitsland',
         'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
+        'DK'=>'Denemarken',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
+        'DO'=>'Dominicaanse Republiek',
+        'DZ'=>'Algerije',
         'EC'=>'Ecuador',
-        'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EE'=>'Estland',
+        'EG'=>'Egypte',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
+        'ES'=>'Spanje',
+        'ET'=>'Ethiopië',
+        'EU'=>'Europese Unie',
         'FI'=>'Finland',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
+        'FK'=>'Falklandeilanden (Malvinas)',
+        'FM'=>'Micronesië, Gefedereerde Staten van',
+        'FO'=>'Faroe Eilanden',
+        'FR'=>'Frankrijk',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GE'=>'Georgië',
+        'GF'=>'Frans-Guyana',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GL'=>'Groenland',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GQ'=>'Equatoriaal-Guinea',
+        'GR'=>'Griekenland',
+        'GS'=>'Zuid-Georgia en de Zuidelijke Sandwicheilanden',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
-        'GY'=>'Guyana',
+        'GY'=>'Gyana',
         'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Gehoord en McDonaldeilanden',
         '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',
+        'HR'=>'Kroatië (lokale naam: Hrvatska)',
+        'HT'=>'Haïti',
+        'HU'=>'Hongarije',
+        'ID'=>'Indonesië',
+        'IE'=>'Ierland',
+        'IL'=>'Israël',
+        'IM'=>'Eiland van Man',
+        'IN'=>'Indië',
+        'IO'=>'Brits Indische Oceaanterritorium',
+        'IQ'=>'Irak',
+        'IR'=>'Iran, Islamitische Republiek Van',
+        'IS'=>'Ijsland',
+        'IT'=>'Italië',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
-        'JO'=>'Jordan',
+        'JO'=>'Jordanië',
         'JP'=>'Japan',
-        'KE'=>'Kenya',
-        'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KE'=>'Kenia',
+        'KG'=>'Kirgizië',
+        'KH'=>'Cambodja',
         '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',
+        'KM'=>'Comoren',
+        'KN'=>'Saint Kitts en Nevis',
+        'KR'=>'Zuid-Korea',
+        'KW'=>'Koeweit',
+        'KY'=>'Kaaiman Eilanden',
+        'KZ'=>'Kazachstan',
+        'LA'=>'Lao Democratische Volksrepubliek',
+        'LB'=>'Libanon',
+        'LC'=>'Sint-Lucia',
         'LI'=>'Liechtenstein',
         'LK'=>'Sri Lanka',
-        'LR'=>'Liberia',
+        'LR'=>'Liberië',
         'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
-        'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
+        'LT'=>'Litouwen',
+        'LU'=>'Luxemburg',
+        'LV'=>'Letland',
+        'LY'=>'Libië',
+        'MA'=>'Marokko',
         'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
+        'MD'=>'Moldavië, Republiek van',
         'ME'=>'Montenegro',
         'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'MH'=>'Marshall Eilanden',
+        'MK'=>'Macedonië, De Voormalige Joegoslavische Republiek van',
         'ML'=>'Mali',
         'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
+        'MN'=>'Mongolië',
         'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
+        'MP'=>'Noordelijke Marianen eilanden',
         'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
+        'MR'=>'Mauritanië',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
         'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MV'=>'Malediven',
         'MW'=>'Malawi',
         'MX'=>'Mexico',
-        'MY'=>'Malaysia',
+        'MY'=>'Maleisië',
         'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'NA'=>'Namibië',
+        'NC'=>'Nieuw Caledonië',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NF'=>'Norfolk eiland',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NL'=>'Nederland',
+        'NO'=>'Noorwegen',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Niew Zeeland',
         'OM'=>'Oman',
         'PA'=>'Panama',
         'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PF'=>'Frans-Polynesië',
+        'PG'=>'Papua Nieuw-Guinea',
+        'PH'=>'Filippijnen, Republiek van de',
         'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
+        'PL'=>'Polen',
+        'PM'=>'Saint-Pierre en Miquelon',
         'PN'=>'Pitcairn',
         'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PS'=>'Palestina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
         'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
+        'RE'=>'Reünie',
+        'RO'=>'Roemenië',
+        'RS'=>'Servië',
+        'RU'=>'Rusland',
         'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
-        'SC'=>'Seychelles',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
-        'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SA'=>'Saoedi-Arabië',
+        'UK'=>'Schotland',
+        'SB'=>'Solomon eilanden',
+        'SC'=>'Seychellen',
+        'SS'=>'South Sudan',
+        'SD'=>'Soedan',
+        'SE'=>'Zweden',
+        'SG'=>'Singapour',
+        'SH'=>'Sint-Helena',
+        'SI'=>'Slovenië',
+        'SJ'=>'Svalbard en Jan Mayen Eilanden',
+        'SK'=>'Slowakije (Slovaakse Republiek)',
         'SL'=>'Sierra Leone',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
-        'SO'=>'Somalia',
+        'SO'=>'Somalië',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'Sao Tomé en Principe',
+        'SU'=>'Sovjet-Unie',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'Syrische Arabische Republiek',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TC'=>'Turks- en Caicoseilanden',
+        'TD'=>'Tsjaad',
+        'TF'=>'Franse Zuidelijke Gebieden',
         'TG'=>'Togo',
         'TH'=>'Thailand',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Oost-Timor',
         'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TN'=>'Tunesië',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Oost-Timor (oude code)',
+        'TR'=>'Turkije',
+        'TT'=>'Trinidad en 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',
+        'TZ'=>'Tanzania, Verenigde Republiek van',
+        'UA'=>'Oekraïne',
+        'UG'=>'Oeganda',
+        'UK'=>'Verenigd Koninkrijk',
+        'US'=>'Verenigde Staten',
+        'UM'=>'Amerikaanse Kleinere Afgelegen Eilanden',
         'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'UZ'=>'Oezbekistan',
+        'VA'=>'Vaticaanstad (Heilige Zie)',
+        'VC'=>'Saint Vincent en de Grenadines',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Britse Maagdeneilanden',
+        'VI'=>'Amerikaanse Maagdeneilanden',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Wallis en Futuna eilanden',
         'WS'=>'Samoa',
-        'YE'=>'Yemen',
+        'YE'=>'Jemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Zuid-Afrika',
         'ZM'=>'Zambia',
         'ZW'=>'Zimbabwe',
     ],
diff --git a/resources/lang/nl/mail.php b/resources/lang/nl/mail.php
index 3f67140e03..05e6d6cd05 100644
--- a/resources/lang/nl/mail.php
+++ b/resources/lang/nl/mail.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'acceptance_asset_accepted' => 'A user has accepted an item',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_accepted' => 'Een gebruiker heeft een artikel geaccepteerd',
+    'acceptance_asset_declined' => 'Een gebruiker heeft een artikel geweigerd',
     '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',
     'accessory_name' => 'Accessoire Naam:',
@@ -31,7 +31,7 @@ return [
     'days' => 'Dagen',
     'expecting_checkin_date' => 'Verwachte incheck datum:',
     'expires' => 'Verloopt',
-    'Expiring_Assets_Report' => 'Rapportage verlopende assets.',
+    'Expiring_Assets_Report' => 'Rapport van verlopen activa',
     'Expiring_Licenses_Report' => 'Rapportage verlopende licenties.',
     'hello' => 'Hallo',
     'hi' => 'Hoi',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Meld u aan op uw nieuwe Snipe-IT installatie met onderstaande inloggegevens:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Lage inventarisrapport',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Minimale hoeveelheid',
     'name' => 'Naam',
     'new_item_checked' => 'Een nieuw item is onder uw naam uitgecheckt, details staan hieronder.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Je Snipe-IT inloggegevens',
     'Accessory_Checkin_Notification' => 'Accessoire ingecheckt',
     'Asset_Checkin_Notification' => 'Asset ingecheckt',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Licentie ingecheckt',
     'Expected_Checkin_Report' => 'Verwachte asset check in rapport',
     'Expected_Checkin_Notification' => 'Herinnering: :name check in deadline nadert',
     'Expected_Checkin_Date' => 'Een asset uitgecheckt aan jou moet worden ingecheckt op :date',
-    'your_assets' => 'Bekijk je assets',
+    'your_assets' => 'Bekijk je activa',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/nl/reminders.php b/resources/lang/nl/reminders.php
index ae11fdaa14..720e21ad6c 100644
--- a/resources/lang/nl/reminders.php
+++ b/resources/lang/nl/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Paswoorden moeten 6 karakters lang zijn en gelijk zijn in beide paswoordvelden.",
     "user"     => "Gebruikersnaam of e-mailadres is niet correct",
-    "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"    => 'Dit wachtwoord-hersteltoken is ongeldig of verlopen, of komt niet overeen met de opgegeven gebruikersnaam.',
+    'sent'	   => 'Als er een gebruiker met een geldig e-mailadres in ons systeem bestaat, dan is er een wachtwoordherstel-e-mail verzonden.',
 
 );
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index 2663765058..84ccbd79f4 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute moet een bestand zijn.',
     'filled'               => ':attribute veld moet een waarde hebben.',
     'image'                => ':attribute moet een afbeelding zijn.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute moet minimaal :min items bevatten.',
     ],
     'starts_with'          => ':attribute moet met één van de volgende waarden eindigen: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Het geselecteerde kenmerk :attribute is ongeldig.',
     'numeric'              => ':attribute moet een getal zijn.',
     'present'              => ':attribute veld moet aanwezig zijn.',
@@ -93,27 +95,16 @@ return [
     'url'                  => 'Het formaat van :attribute is ongeldig.',
     'unique_undeleted'     => 'De :attribute moet uniek zijn. ',
     'non_circular'         => ':attribute mag geen circulaire referentie aanmaken.',
-    '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.',
+    'disallow_same_pwd_as_user_fields' => 'Wachtwoord kan niet hetzelfde zijn als de gebruikersnaam.',
+    'letters'              => 'Wachtwoord moet ten minste één letter bevatten.',
+    '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'
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Je huidige wachtwoord is incorrect',
         'dumbpwd'          => 'Dat wachtwoord is te veelvoorkomend.',
         'statuslabel_type' => 'Selecteer een valide status label',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/no/admin/accessories/general.php b/resources/lang/no/admin/accessories/general.php
index bc05b71977..5b6a44c265 100644
--- a/resources/lang/no/admin/accessories/general.php
+++ b/resources/lang/no/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/no/admin/accessories/message.php b/resources/lang/no/admin/accessories/message.php
index ea2bfbcac1..b80a493093 100644
--- a/resources/lang/no/admin/accessories/message.php
+++ b/resources/lang/no/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Tilbehør ble ikke sjekket ut. Prøv igjen',
         'success' 		=> 'Vellykket utsjekking av tilbehør.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
     ),
 
diff --git a/resources/lang/no/admin/asset_maintenances/form.php b/resources/lang/no/admin/asset_maintenances/form.php
index a83b80eb77..887dab7662 100644
--- a/resources/lang/no/admin/asset_maintenances/form.php
+++ b/resources/lang/no/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Type Vedlikehold',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Tittel',
-        'start_date'             => 'Startdato',
-        'completion_date'        => 'Fullført dato',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Kostnad',
         'is_warranty'            => 'Uthevet garanti',
-        'asset_maintenance_time' => 'Tid brukt på vedlikehold (i dager)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notater',
-        'update'                 => 'Oppdater Vedlikehold',
-        'create'                 => 'Legg til Vedlikehold'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/no/admin/categories/message.php b/resources/lang/no/admin/categories/message.php
index 06e38e5304..ae2b70a826 100644
--- a/resources/lang/no/admin/categories/message.php
+++ b/resources/lang/no/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorien ble ikke opprettet, vennligst prøv igjen',
-        'success' => 'Kategorien ble oppdatert.'
+        'success' => 'Kategorien ble oppdatert.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/no/admin/components/general.php b/resources/lang/no/admin/components/general.php
index d49358e401..fcf9946b45 100644
--- a/resources/lang/no/admin/components/general.php
+++ b/resources/lang/no/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Gjenstår',
     'total' 			                 => 'Total',
     'update'                            => 'Oppdater komponent',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/no/admin/components/message.php b/resources/lang/no/admin/components/message.php
index be71a737ee..8c5375f601 100644
--- a/resources/lang/no/admin/components/message.php
+++ b/resources/lang/no/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/no/admin/consumables/message.php b/resources/lang/no/admin/consumables/message.php
index 32570c169e..f56cce749d 100644
--- a/resources/lang/no/admin/consumables/message.php
+++ b/resources/lang/no/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/no/admin/custom_fields/general.php b/resources/lang/no/admin/custom_fields/general.php
index 4072f0559f..f77265bc9a 100644
--- a/resources/lang/no/admin/custom_fields/general.php
+++ b/resources/lang/no/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Brukes av modeller',
     'order'   		            => 'Bestill',
     'create_fieldset'         => 'Nytt Feltsett',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Opprett et nytt feltsett',
     'create_field'            => 'Nytt Egendefinert Felt',
     'create_field_title' => 'Opprett nytt egendefinert felt',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/no/admin/groups/message.php b/resources/lang/no/admin/groups/message.php
index 0c59b78aa3..1053f2c438 100644
--- a/resources/lang/no/admin/groups/message.php
+++ b/resources/lang/no/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Gruppen eksisterer allerede!',
-    'group_not_found'     => 'Gruppen [:id] eksisterer ikke.',
+    'group_not_found'     => 'Gruppe-ID :id finnes ikke.',
     'group_name_required' => 'Navnefeltet er påkrevd',
 
     'success' => array(
diff --git a/resources/lang/no/admin/hardware/form.php b/resources/lang/no/admin/hardware/form.php
index 32a0d4e0fe..ea8bd18ad3 100644
--- a/resources/lang/no/admin/hardware/form.php
+++ b/resources/lang/no/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Bekreft sletting av flere enheter',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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'	=> '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'	=> 'Du er i ferd med å slette :asset_count enheter.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Oppdater bare standardlokasjon',
     '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.',
-    'processing_spinner' => 'Behandler...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php
index 4914d52ae9..9b7d8fb463 100644
--- a/resources/lang/no/admin/hardware/general.php
+++ b/resources/lang/no/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Denne eiendelen har blitt slettet.',
     'edit'  					=> 'Rediger eiendel',
     'model_deleted'  			=> 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Forespørrbar',
     'requested'				    => 'Forespurt',
     'not_requestable'           => 'Ikke mulig å spørre etter',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Gjenopprett eiendel',
     'pending'  					=> 'Under arbeid',
     'undeployable'  			=> 'Ikke utleverbar',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Vis eiendel',
     'csv_error' => 'Du har en feil i din CSV-fil:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Feilmeldinger:',
     'success_messages' => 'Suksessmeldinger:',
     'alert_details' => 'Vennligst se nedenfor for detaljer.',
-    'custom_export' => 'Egendefinert eksport'
+    'custom_export' => 'Egendefinert eksport',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/no/admin/hardware/message.php b/resources/lang/no/admin/hardware/message.php
index c8ecde79d8..d8d76ced5f 100644
--- a/resources/lang/no/admin/hardware/message.php
+++ b/resources/lang/no/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Eiendel ble ikke gjenopprettet. Prøv igjen',
         'success' 		=> 'Vellykket gjenoppretting av eiendel.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Filen har blitt importert',
         'file_delete_success'   => 'Filen har blitt slettet',
         'file_delete_error'      => 'Filen kunne ikke bli slettet',
+        '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',
     ],
 
 
diff --git a/resources/lang/no/admin/hardware/table.php b/resources/lang/no/admin/hardware/table.php
index 16c3f8a723..de96c848cb 100644
--- a/resources/lang/no/admin/hardware/table.php
+++ b/resources/lang/no/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Inne/ute',
     'checkout_date' => 'Utsjekkdato',
     'checkoutto' 	=> 'Utsjekket',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Gjeldende verdi',
     'diff' 			=> 'Forskjell',
     'dl_csv' 		=> 'Last ned CSV',
diff --git a/resources/lang/no/admin/licenses/general.php b/resources/lang/no/admin/licenses/general.php
index e220af4c5f..baba13676b 100644
--- a/resources/lang/no/admin/licenses/general.php
+++ b/resources/lang/no/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Programvarelisenser',
     'user'  					=> 'Bruker',
     'view'  					=> 'Vis lisens',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/no/admin/manufacturers/message.php b/resources/lang/no/admin/manufacturers/message.php
index 936c63e353..ed6ec2a8df 100644
--- a/resources/lang/no/admin/manufacturers/message.php
+++ b/resources/lang/no/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/no/admin/manufacturers/table.php b/resources/lang/no/admin/manufacturers/table.php
index 0b4e7b91cf..3df3256340 100644
--- a/resources/lang/no/admin/manufacturers/table.php
+++ b/resources/lang/no/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Støtte epost',
     'support_phone'   		=> 'Støttetelefon',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Endre produsent',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/no/admin/models/general.php b/resources/lang/no/admin/models/general.php
index e6a284f9ad..153931cf50 100644
--- a/resources/lang/no/admin/models/general.php
+++ b/resources/lang/no/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count modeller.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Gjenopprett modell',
     'requestable'               => 'Brukere kan be om denne modellen',
 	'show_mac_address'			      => 'Vis felt for MAC-adresse for denne modellen',
diff --git a/resources/lang/no/admin/models/message.php b/resources/lang/no/admin/models/message.php
index e4dcacfb4a..c38233238e 100644
--- a/resources/lang/no/admin/models/message.php
+++ b/resources/lang/no/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modell eksisterer ikke.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modell ble ikke oppdatert. Prøv igjen',
-        'success' => 'Oppdatering av modell vellykket.'
+        'success' => 'Oppdatering av modell vellykket.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Ingen felt ble endret, så ingenting ble oppdatert.',
-        'success' 		=> 'Modeller oppdatert.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ingen modeller ble valgt, så ingenting ble slettet.',
-        'success' 		    => ': success_count modell(er) slettet!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         '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/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php
index 32708228d5..591f25b7d1 100644
--- a/resources/lang/no/admin/settings/general.php
+++ b/resources/lang/no/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Dette er en Active Directory server',
     'alerts'                	=> 'Varsler',
-    'alert_title'               => 'Oppdater varslingsinnstillinger',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send varslinger til',
     'alert_email_help'    => 'E-postadresser eller distribusjonslister som du ønsker varsler skal sendes til, kommaseparert',
     'alerts_enabled'			=> 'Varslinger aktivert',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Gjenoppretting fra sikkerhetskopi',
     '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'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Veldig store sikkerhetskopier kan få tidsavbrudd under gjenopprettingsforsøket og må fortsatt kjøres via kommandolinjen. ',
     'barcode_settings'			=> 'Strekkodeinnstillinger',
@@ -78,6 +78,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     '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-klient TLS-nøkkel',
     'ldap_client_tls_cert'      => 'LDAP TLS klient-sertifikat',
@@ -86,6 +87,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     '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_client_tls_key'       => 'LDAP Klient-Side TLS-nøkkel',
+    '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'      => '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 Manager',
@@ -198,16 +201,21 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     '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'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Oppdater Slack-innstillinger',
-    'slack_help'                => 'Slack-innstillinger',
-    'slack_botname'             => 'Slack botnavn',
-    'slack_channel'             => 'Slack-kanal',
-    'slack_endpoint'            => 'Slack endepunkt',
-    'slack_integration'         => 'Slack-innstillinger',
-    'slack_integration_help'    => 'Slack-integrasjon er valgfritt, men endepunktet og kanalen er påkrevd hvis du ønsker å bruke den. For å konfigurere Slack integrering, må du <a href=":slack_link" target="_new" rel="noopener">først opprette en innkommende webhook</a> på Slack-kontoen din. Klikk på knappen <strong>Test Slack Integrasjon</strong> for å bekrefte at innstillingene er riktige før du lagrer. ',
-    'slack_integration_help_button'    => 'Du vil se en testknapp etter at du lagrer Slack-informasjonen.',
-    'slack_test_help'           => 'Test om Slack-integrasjonen din er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE SLACK-INNSTILLINGER FØRST.',
+    'general_webhook'           => 'General Webhook',
+    '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-versjon',
     'support_footer'            => 'Støtte Footer Lenker ',
     'support_footer_help'       => 'Angi hvem som kan se lenker til Snipe-IT supportinformasjon og brukermanual',
@@ -302,7 +310,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Språk, datoformat',
     'notifications' => 'Varslinger',
-    'notifications_help' => 'E-postvarsler, revisjonsinnstillinger',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Økninger og prefikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Oppdater etikettinnstillinger',
@@ -323,4 +331,9 @@ 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',
+    '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. ',
+
 ];
diff --git a/resources/lang/no/admin/settings/message.php b/resources/lang/no/admin/settings/message.php
index 3cae0f7a00..f7ea278bb4 100644
--- a/resources/lang/no/admin/settings/message.php
+++ b/resources/lang/no/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Tester LDAP-autentisering...',
         'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
     ],
-    'slack' => [
-        'sending' => 'Sender testmelding på Slack...',
-        'success_pt1' => 'Suksess! Se etter meldingen i kanalen ',
-        'success_pt2' => ' , og sørg for å klikke på LAGRE nedenfor for å lagre innstillingene.',
-        '500' => '500 Tjenerfeil.',
-        'error' => 'Noe gikk galt.',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/no/admin/users/general.php b/resources/lang/no/admin/users/general.php
index ef0955b909..d14a2ef9f0 100644
--- a/resources/lang/no/admin/users/general.php
+++ b/resources/lang/no/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Skriv ut alt tilordnet',
     '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',
     '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',
@@ -33,7 +35,6 @@ return [
     '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' => 'ADVARSEL:',
     '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' => 'Sjekk inn alt tilbehør koblet til disse brukerne',
@@ -41,4 +42,13 @@ 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_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/no/admin/users/message.php b/resources/lang/no/admin/users/message.php
index 0f90a6e8b0..1721468044 100644
--- a/resources/lang/no/admin/users/message.php
+++ b/resources/lang/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'            => 'Bruker [:id] finnes ikke.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Login-feltet er påkrevd',
     'user_password_required'    => 'Passord er påkrevd.',
     'insufficient_permissions'  => 'Utilstrekkelige rettigheter.',
diff --git a/resources/lang/no/auth/general.php b/resources/lang/no/auth/general.php
index ceb82328ad..1f6f0e20b3 100644
--- a/resources/lang/no/auth/general.php
+++ b/resources/lang/no/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php
index 4782c23fa4..ebb9fa710f 100644
--- a/resources/lang/no/general.php
+++ b/resources/lang/no/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Tilbehør',
     'activated'			    => 'Aktivert',
+    'accepted_date'         => 'Akseptdato',
     'accessory'				=> 'Tilbehør',
     'accessory_report'		=> 'Rapport over tilbehør',
     'action'                => 'Handlinger',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Setelisenser lagt til',
-    'age'                   => "Age",
+    'age'                   => "Alder",
     'all_assets'			=> 'Alle eiendeler',
     'all'       			=> 'Alle',
     'archived'              => 'Arkivert',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Revisjon',
     'audit_report'			=> 'Overvåkingslogg',
     'assets'				=> 'Eiendeler',
-    'assigned_to'           => 'Assigned to :name',
+    '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Masseredigering',
     'bulk_delete'           => 'Massesletting',
     'bulk_actions'          => 'Massehandlinger',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Masseinnsjekk/Slett brukere',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Denne enheten er eid av brukeren',
     'bystatus'              => 'etter Status',
     'cancel'  				=> 'Avbryt',
     'categories'			=> 'Kategorier',
@@ -66,8 +75,8 @@ return [
     'create'				=> 'Opprett ny',
     'created'               => 'Enhet opprettet',
     'created_asset'			=> 'eiendel opprettet',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Opprettet',
+    'created_by'            => 'Opprettet av',
     'record_created' 		=> 'Post opprettet',
     'updated_at' 			=> 'Oppdatert',
     'currency'  			=> '$', // this is deprecated
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Slettede setelisenser',
     'deletion_failed'       => 'Sletting mislyktes',
@@ -99,12 +109,12 @@ return [
     'eol'					=> 'Livstid',
     'email_domain'			=> 'E-postdomene',
     'email_format'			=> 'E-postformat',
-    'employee_number'       => 'Employee Number',
+    'employee_number'       => 'Ansattnummer',
     'email_domain_help'		=> 'Brukes til å generere e-postadresser ved import',
     'error'				    => 'Feil',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    '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)',
@@ -120,7 +130,7 @@ return [
     'files'                 => 'Filer',
     'file_name'				=> 'Fil',
     'file_type'             => 'Filtype',
-    'filesize'              => 'File Size',
+    'filesize'              => 'Filstørrelse',
     'file_uploads'			=> 'Filopplastinger',
     'file_upload'           => 'Filopplastning',
     'generate'				=> 'Generer',
@@ -134,11 +144,12 @@ return [
     'id'  					=> 'ID',
     'image'                 => 'Bilde',
     'image_delete'         	=> 'Slett bilde',
-    'include_deleted'       => 'Include Deleted Assets',
+    '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'  => 'Tillatte filtyper er jpg, webp, png, gif, og svg. Maks filstørrelse er :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',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -188,7 +201,7 @@ return [
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
     'order_number'          => 'Ordreummer',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Kun slettede ressurser',
     'page_menu'				=> 'Viser _MENU_ enheter',
     'pagination_info'		=> 'Viser _START_ til _END_ av _TOTAL_ enheter',
     'pending'				=> 'Under arbeid',
@@ -202,8 +215,8 @@ return [
     'qty'		            => 'Antall',
     'quantity'		        => 'Antall',
     'quantity_minimum'      => 'Du har :count enheter under eller nesten under minimum antall',
-    'quickscan_checkin'  	=> 'Quick Scan Checkin',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'quickscan_checkin'  	=> 'Hurtiginnsjekk ved skanning',
+    'quickscan_checkin_status'  	=> 'Innsjekkingsstatus',
     'ready_to_deploy'		=> 'Klar for utlevering',
     'recent_activity'		=> 'Nylig aktivitet',
     'remaining'             => 'Gjenstår',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Forespurte eiendeler',
     'request_canceled'      => 'Forespørsel avbrutt',
     'save'  				=> 'Lagre',
+    'select_var'            => 'Velg :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Velg',
     'select_all'            => 'Velg alle',
     'search'				=> 'Søk',
@@ -238,22 +252,21 @@ return [
     'show_current'  		=> 'Vis gjeldende',
     'sign_in'				=> 'Logg inn',
     'signature'             => 'Signatur',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Godkjent av',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'En slack-melding vil bli sendt',
-    'slack_test_msg'        => 'Hei-hå! Ser som din Slack-integrasjon med Snipe-IT fungerer!',
+    'webhook_msg_note'        => 'En varsling vil bli sendt via webhook',
+    'webhook_test_msg'        => 'Hei-hå! Ser som din Slack-integrasjon med Snipe-IT fungerer!',
     'some_features_disabled' => 'DEMO MODUS: Noe funksjonalitet er skrudd av i denne installasjonen.',
     'site_name'				=> 'Nettstedsnavn',
     'state'  				=> 'Stat',
     'status_labels'			=> 'Statusmerker',
     'status'    			=> 'Status',
-    'accept_eula'           => 'Acceptance Agreement',
+    'accept_eula'           => 'Akseptavtale',
     'supplier'              => 'Leverandør',
     'suppliers'  			=> 'Leverandører',
     'sure_to_delete'    => 'Er du sikker på at du vil slette',
     'submit'				=> 'Send',
     'target'                => 'Mål',
-    'toggle_navigation'     => 'Navigasjon av/på',
     'time_and_date_display' => 'Tid og Datovisning',
     'total_assets'			=> 'eiendeler totalt',
     'total_licenses'		=> 'lisener totalt',
@@ -263,7 +276,7 @@ return [
     'undeployable'			=> 'Ikke utleverbar',
     'unknown_admin'			=> 'Ukjent admin',
     'username_format'		=> 'Format brukernavn',
-    'username'              => 'Username',
+    'username'              => 'Brukernavn',
     'update'                => 'Oppdater',
     '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',
@@ -281,8 +294,8 @@ return [
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postnummer',
     'noimage'				=> 'Bilde er ikke lastet opp eller finner ikke bilde.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
+    'file_does_not_exist'   => 'Den forespurte filen finnes ikke på serveren.',
+    'file_upload_success'   => 'Filopplasting vellykket!',
     'no_files_uploaded'     => 'File upload success!',
     'token_expired'         => 'Din sesjon har utløpt. Prøv igjen.',
     'login_enabled'         => 'Innlogging aktiv',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/no/help.php b/resources/lang/no/help.php
index eb20af8c07..12274fef1f 100644
--- a/resources/lang/no/help.php
+++ b/resources/lang/no/help.php
@@ -15,7 +15,7 @@ return [
 
     '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, eiendelen eller lokasjonen den er sjekket ut til.',
+    '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' => 'Eiendeler er enheter som spores på serienummer eller annen merking. Typisk er dette kostbare enheter der det gir mening å spore enkeltenheter.',
 
diff --git a/resources/lang/no/localizations.php b/resources/lang/no/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/no/localizations.php
+++ b/resources/lang/no/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/no/mail.php b/resources/lang/no/mail.php
index 2ddf0e2e53..55e045ae29 100644
--- a/resources/lang/no/mail.php
+++ b/resources/lang/no/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Logg inn på din nye Snipe-IT-installasjon ved å bruke kontoen nedenfor:',
     'login' => 'Logg inn:',
     'Low_Inventory_Report' => 'Rapport lav lagerbeholdning',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min. antall',
     'name' => 'Navn',
     'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Din Snipe-IT konto',
     'Accessory_Checkin_Notification' => 'Tilbehør sjekket inn',
     'Asset_Checkin_Notification' => 'Eiendel sjekket inn',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Lisens sjekket inn',
     'Expected_Checkin_Report' => 'Rapport over forventet innsjekking av eiendeler',
     'Expected_Checkin_Notification' => 'Påminnelse: Innsjekkingsfrist for :name nærmer seg',
     'Expected_Checkin_Date' => 'En enhet som er sjekket ut til deg skal leveres tilbake den :date',
     'your_assets' => 'Vis dine eiendeler',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/no/validation.php b/resources/lang/no/validation.php
index 9993ae483e..322d3c83bc 100644
--- a/resources/lang/no/validation.php
+++ b/resources/lang/no/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Attributtet må ha minst: min elementer.',
     ],
     'starts_with'          => ':attribute må starte med en av følgende: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Attributtet :attribute er ugyldig.',
     'numeric'              => 'Attributtet :attribute må være et nummer.',
     'present'              => 'Atributtfeltet :attribute må ha en verdi.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Gjeldende passord er feil',
         'dumbpwd'          => 'Passordet er for vanlig.',
         'statuslabel_type' => 'Du må velge en gyldig statusetikett-type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/pl/admin/accessories/general.php b/resources/lang/pl/admin/accessories/general.php
index e3f516d50c..143b53ffc4 100644
--- a/resources/lang/pl/admin/accessories/general.php
+++ b/resources/lang/pl/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Uaktualnij akcesorium',
     'use_default_eula'					=> 'Użyj <a href="#" data-toggle="modal" data-target="#eulaModal"> domyślnej EULA</a> zamiast tego.',
     'use_default_eula_disabled'			=> '<del>Użyj zamiast domyślnego EULA.</del> Brak domyślnego EULA. Proszę dodaj jakieś w opcjach.',
+    'clone'                             => 'Klonuj Akcesoria',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/pl/admin/accessories/message.php b/resources/lang/pl/admin/accessories/message.php
index 34cc7f658b..8762a2bd4c 100644
--- a/resources/lang/pl/admin/accessories/message.php
+++ b/resources/lang/pl/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Akcesoria nie zostały przypisane, spróbuj ponownie',
         'success' 		=> 'Akcesoria przypisany pomyślnie.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.'
     ),
 
diff --git a/resources/lang/pl/admin/asset_maintenances/form.php b/resources/lang/pl/admin/asset_maintenances/form.php
index 7b8bd52613..50f215fe89 100644
--- a/resources/lang/pl/admin/asset_maintenances/form.php
+++ b/resources/lang/pl/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Typ',
+        'asset_maintenance_type' => 'Rodzaj konserwacji aktywów',
         'title'                  => 'Tytuł',
         'start_date'             => 'Data rozpoczęcia',
-        'completion_date'        => 'Ukończone',
+        'completion_date'        => 'Data zakończenia',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Wydłużenie gwarancji',
-        'asset_maintenance_time' => 'Dni',
+        'asset_maintenance_time' => 'Czas konserwacji aktywów (w dniach)',
         'notes'                  => 'Notatki',
-        'update'                 => 'Uaktualnij',
-        'create'                 => 'Utwórz'
+        'update'                 => 'Aktualizuj konserwację aktywów',
+        'create'                 => 'Utwórz konserwację aktywów'
     ];
diff --git a/resources/lang/pl/admin/asset_maintenances/general.php b/resources/lang/pl/admin/asset_maintenances/general.php
index 9eca9f8b95..a4a28f7a3f 100644
--- a/resources/lang/pl/admin/asset_maintenances/general.php
+++ b/resources/lang/pl/admin/asset_maintenances/general.php
@@ -12,5 +12,5 @@
         'software_support'   => 'Wsparcie oprogramowania',
         'hardware_support'   => 'Wsparcie sprzętowe',
         'configuration_change'   => 'Zmiana konfiguracji',
-        'pat_test'           => 'PAT Test',
+        'pat_test'           => 'Pomiary przenośnych urządzeń elektrycznych',
     ];
diff --git a/resources/lang/pl/admin/categories/message.php b/resources/lang/pl/admin/categories/message.php
index dcfc786526..6e7627591e 100644
--- a/resources/lang/pl/admin/categories/message.php
+++ b/resources/lang/pl/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategoria nie została zaktualizowana, spróbuj ponownie',
-        'success' => 'Kategoria zaktualizowana.'
+        'success' => 'Kategoria zaktualizowana.',
+        'cannot_change_category_type'   => 'Nie można zmienić typu kategorii po jej utworzeniu',
     ),
 
     'delete' => array(
diff --git a/resources/lang/pl/admin/components/general.php b/resources/lang/pl/admin/components/general.php
index fc0878cb4f..ec7b4e0a43 100644
--- a/resources/lang/pl/admin/components/general.php
+++ b/resources/lang/pl/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Pozostało',
     'total' 			                 => 'Suma',
     'update'                            => 'Aktualizacja składnika',
+    'checkin_limit'            => 'Ilość przyjęta musi być równa lub mniejsza niż :assigned_qty'
 );
diff --git a/resources/lang/pl/admin/components/message.php b/resources/lang/pl/admin/components/message.php
index afc4868e71..e0e40b35fa 100644
--- a/resources/lang/pl/admin/components/message.php
+++ b/resources/lang/pl/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Składnik nie został wydany, spróbuj ponownie',
         'success' 		=> 'Składnik został wydany pomyślnie.',
-        'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.'
+        'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pl/admin/consumables/message.php b/resources/lang/pl/admin/consumables/message.php
index b1209eabed..febec430c2 100644
--- a/resources/lang/pl/admin/consumables/message.php
+++ b/resources/lang/pl/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Materiał eksploatacyjny nie został wydany, spróbuj ponownie',
         'success' 		=> 'Materiał eksploatacyjny został wydany pomyślnie.',
-        'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.'
+        'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pl/admin/custom_fields/general.php b/resources/lang/pl/admin/custom_fields/general.php
index 622420630d..0d9981d815 100644
--- a/resources/lang/pl/admin/custom_fields/general.php
+++ b/resources/lang/pl/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Używane przez modele',
     'order'   		            => 'Kolejność',
     'create_fieldset'         => 'Nowy zestaw pól',
+    'update_fieldset'         => 'Aktualizuj zestaw pól',
+    'fieldset_does_not_exist'   => 'Zestaw pól :id nie istnieje',
+    'fieldset_updated'         => 'Zestaw pól zaktualizowany',
     'create_fieldset_title' => 'Utwórz nową listę',
     'create_field'            => 'Nowe pole niestandardowe',
     'create_field_title' => 'Utwórz pole niestandardowe',
@@ -44,6 +47,8 @@ return [
     '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' => 'Ta wartość musi być unikalna dla wszystkich aktywów',
     'unique' => 'Unikalny',
-    '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' => 'Zezwalaj zaznaczonemu użytkownikowi na wyświetlanie tych wartości na stronie Widok Przypisanych Zasobów',
+    'display_in_user_view_table' => 'Widoczne dla użytkownika',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/pl/admin/departments/message.php b/resources/lang/pl/admin/departments/message.php
index 07de1a2075..56fd1eebbe 100644
--- a/resources/lang/pl/admin/departments/message.php
+++ b/resources/lang/pl/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Wydział nie istnieje.',
-    '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' => 'W tej lokalizacji firmy istnieje już dział o tej nazwie. Możesz też wybrać bardziej szczegółową nazwę dla tego działu. ',
     'assoc_users'	 => 'Ten wydział obecnie jest skojarzony z co najmniej jednym użytkownikiem i nie może zostać usunięty. Uaktualnij użytkowników tak, aby nie było relacji z tym wydziałem i spróbuj ponownie. ',
     'create' => array(
         'error'   => 'Wydział nie został utworzony. Spróbuj ponownie.',
diff --git a/resources/lang/pl/admin/groups/message.php b/resources/lang/pl/admin/groups/message.php
index 4cee54d4d8..55de7ce678 100644
--- a/resources/lang/pl/admin/groups/message.php
+++ b/resources/lang/pl/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Taka grupa już istnieje!',
-    'group_not_found'     => 'Grupa [:id] nie istnieje.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Nazwa jest polem obowiązkowym',
 
     'success' => array(
diff --git a/resources/lang/pl/admin/hardware/form.php b/resources/lang/pl/admin/hardware/form.php
index 4362d43d53..a9e268bc0e 100644
--- a/resources/lang/pl/admin/hardware/form.php
+++ b/resources/lang/pl/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Potwierdź zbiorcze usuwanie aktywów',
+    'bulk_restore'      => 'Potwierdzenie masowego przywracania zasobów', 
   'bulk_delete_help'	=> 'Przejrzyj usuwanie zbiorcze aktywów poniżej. Po usunięciu tych aktywów będą one mogły zostać przywrócone, ale nie będą one skojarzone z żadnym z użytkowników, do których są aktualnie przypisane.',
+  'bulk_restore_help'	=> 'Przejrzyj poniższą listę zasobów masowego przywracania. Po przywrócenie zasoby nie będą powiązane z użytkownikami, do których były wcześniej przypisane.',
   'bulk_delete_warn'	=> 'Zamierzasz usunąć :asset_count aktywów.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Zbiorcza aktualizacja aktywów',
     'bulk_update_help'	=> 'Ten formularz umożliwia zbiorczą aktualizację wielu aktywów na raz. Wypełnij tylko te pola, które chcesz zmienić. Puste pola pozostaną niezmienione. ',
     'bulk_update_warn'	=> 'Zamierzasz edytować właściwości pojedynczego zasobu.|Zamierzasz edytować właściwości :asset_count zasobów.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Zaktualizuj tylko domyślną 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.',
-    'processing_spinner' => 'Przetwarzanie...',
+    'processing_spinner' => 'Przetwarzanie... (To może zająć trochę czasu dla dużych plików)',
     'optional_infos'  => 'Informacje opcjonalne',
     'order_details'   => 'Informacje związane z zamówieniem'
 ];
diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php
index 747e6e5d11..833dc1abf3 100644
--- a/resources/lang/pl/admin/hardware/general.php
+++ b/resources/lang/pl/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
     'archived'  				=> 'Zarchiwizowane',
     'asset'  					=> 'Nabytek',
     'bulk_checkout'             => 'Przypisz aktywa',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkin'              => 'Przyjmij aktywa',
     'checkin'  					=> 'Potwierdzanie zasobu/aktywa',
     'checkout'  				=> 'Przypisz zasób',
     'clone'  					=> 'Klonuj zasób',
@@ -14,31 +14,34 @@ return [
     'deleted'  					=> 'Ten zasób został usunięty.',
     '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'             => 'Model tego zasobu jest nieprawidłowy.',
+    'model_invalid_fix'         => 'Zasób powinien być edytowany w celu poprawienia tego przed próbą przyjęcia go lub wydania.',
     'requestable'               => 'Żądane',
     'requested'				    => 'Zamówione',
-    'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change  requestable status',
+    'not_requestable'           => 'Brak możliwości zarządzania',
+    'requestable_status_warning' => 'Nie zmieniaj statusu możliwości zarządzania',
     'restore'  					=> 'Przywróć aktywa',
     'pending'  					=> 'Oczekuje',
     'undeployable'  			=> 'Niemożliwe do wdrożenia',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Wyświetl nabytki',
     'csv_error' => 'Wystąpił błąd w twoim pliku 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 Admin &gt; General Settings.
-    </p>
+<p>
+     Prześlij plik CSV zawierający historię zasobów. Zasoby i użytkownicy MUSZĄ już istnieć w systemie, w przeciwnym razie zostaną pominięci. Dopasowanie zasobów do importu historii odbywa się na podstawie tagu zasobu. Spróbujemy znaleźć pasującego użytkownika na podstawie podanej przez Ciebie nazwy użytkownika i kryteriów wybranych poniżej. Jeśli nie wybierzesz żadnych kryteriów poniżej, po prostu spróbuje dopasować format nazwy użytkownika skonfigurowany na stronie Administrator &gt; Ustawienia główne.
+     </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>Pola zawarte w pliku CSV muszą być zgodne z nagłówkami: <strong>Etykieta zasobu, Nazwa, Data wymeldowania, Data zameldowania</strong>. Wszelkie dodatkowe pola będą ignorowane. </p>
 
-    <p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format',
-    'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format',
-    'csv_import_match_first' => 'Try to match users by first name (jane) format',
+     <p>Data zaewidencjonowania: puste lub przyszłe daty zaewidencjonowania spowodują wyewidencjonowanie przedmiotów dla powiązanego użytkownika. Wykluczenie kolumny Data zameldowania spowoduje utworzenie daty zameldowania z dzisiejszą datą.</p>    ',
+    'csv_import_match_f-l' => 'Spróbuj dopasować użytkowników przez imię.nazwisko (jan.kowalski)',
+    'csv_import_match_initial_last' => 'Spróbuj dopasować użytkowników przez pierwszą literę imienia i nazwisko (jkowalski)',
+    'csv_import_match_first' => 'Spróbuj dopasować użytkowników według formatu imienia (jane)',
     'csv_import_match_email' => 'Spróbuj dopasować użytkowników po adresie e-mail',
     'csv_import_match_username' => 'Spróbuj dopasować użytkowników po nazwie użytkownika',
     'error_messages' => 'Komunikat błędu:',
-    'success_messages' => 'Success messages:',
+    'success_messages' => 'Wiadomości o powodzeniu:',
     'alert_details' => 'Więcej szczegółów znajduje się poniżej.',
-    'custom_export' => 'Eksport niestandardowy'
+    'custom_export' => 'Eksport niestandardowy',
+    'mfg_warranty_lookup' => ':Producent Wyszukiwarka Statusu Gwarancji',
 ];
diff --git a/resources/lang/pl/admin/hardware/message.php b/resources/lang/pl/admin/hardware/message.php
index 43a307aa3d..8947456df4 100644
--- a/resources/lang/pl/admin/hardware/message.php
+++ b/resources/lang/pl/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Aktywo nie został przywrócony, spróbuj ponownie.',
         'success' 		=> 'Aktywo zostało przywrócone.',
+        'bulk_success' 		=> 'Aktywo zostało pomyślnie przywrócone.',
+        'nothing_updated'   => 'Żadne aktywa nie zostały wybrane, więc nic nie zostało przywrócone.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/pl/admin/hardware/table.php b/resources/lang/pl/admin/hardware/table.php
index f256f07c59..fcd3686065 100644
--- a/resources/lang/pl/admin/hardware/table.php
+++ b/resources/lang/pl/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In/Out',
     'checkout_date' => 'Data przypisania',
     'checkoutto' 	=> 'Data wypisania',
+    'components_cost' => 'Całkowity koszt składników',
     'current_value' => 'Aktualna Wartość',
     'diff' 			=> 'Różnica',
     'dl_csv' 		=> 'Pobierz CSV',
diff --git a/resources/lang/pl/admin/licenses/general.php b/resources/lang/pl/admin/licenses/general.php
index 9f408adb32..302d2d60ae 100644
--- a/resources/lang/pl/admin/licenses/general.php
+++ b/resources/lang/pl/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'O Licencjach',
-    'about_licenses'                  => 'Licencje są używane do śledzenia oprogramowania.  Posiadają określoną liczbę stanowisk, które mogą być przypisane do osób fizycznych.',
+    'about_licenses_title'      => 'O Licencjach',
+    'about_licenses'            => 'Licencje są używane do śledzenia oprogramowania.  Posiadają określoną liczbę stanowisk, które mogą być przypisane do osób fizycznych.',
     'checkin'  					=> 'Sprawdź płatność',
     'checkout_history'  		=> 'Historia płatności',
     'checkout'  				=> 'Sprawdź płatność',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licencje oprogramowania',
     'user'  					=> 'Użytkownik',
     'view'  					=> 'Podgląd licencji',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/pl/admin/licenses/message.php b/resources/lang/pl/admin/licenses/message.php
index cfde52815f..bbec80149a 100644
--- a/resources/lang/pl/admin/licenses/message.php
+++ b/resources/lang/pl/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Licencja nie istnieje lub nie masz uprawnień do jej przeglądania.',
     'user_does_not_exist' => 'Użytkownik nie istnieje.',
     'asset_does_not_exist' 	=> 'Aktywa, które chcesz skojarzyć z licencją nie istnieją.',
     'owner_doesnt_match_asset' => 'Aktywa, które chcesz skojarzyć z tą licencją są własnością kogoś innego niż osoba wskazana z rozwijanej listy.',
diff --git a/resources/lang/pl/admin/locations/message.php b/resources/lang/pl/admin/locations/message.php
index df1be89e8f..8d5f050983 100644
--- a/resources/lang/pl/admin/locations/message.php
+++ b/resources/lang/pl/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Lokalizacja obecnie jest skojarzona z minimum jednym użytkownikiem i nie może zostać usunięta. Uaktualnij właściwości użytkownika tak aby nie było relacji z tą lokalizacją 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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Przypisane aktywa',
+    'current_location' => 'Bieżąca lokalizacja',
 
 
     'create' => array(
diff --git a/resources/lang/pl/admin/locations/table.php b/resources/lang/pl/admin/locations/table.php
index cd1f3cab52..31966bb434 100644
--- a/resources/lang/pl/admin/locations/table.php
+++ b/resources/lang/pl/admin/locations/table.php
@@ -30,7 +30,7 @@ return [
     'asset_model'               => 'Model',
     'asset_serial'              => 'Nr seryjny',
     'asset_location'            => 'Lokalizacja',
-    'asset_checked_out'         => 'Checked Out',
+    'asset_checked_out'         => 'Wydane',
     'asset_expected_checkin'    => 'Przewidywana data zwrotu',
     'date'                      => 'Data:',
     'signed_by_asset_auditor'   => 'Podpisane przez (Audytor aktywów):',
diff --git a/resources/lang/pl/admin/manufacturers/message.php b/resources/lang/pl/admin/manufacturers/message.php
index 7d703fd2e0..fd3d707583 100644
--- a/resources/lang/pl/admin/manufacturers/message.php
+++ b/resources/lang/pl/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Producent nie istnieje.',
     'assoc_users'	 => 'Wybrany producent jest obecnie skojarzony z minimum jednym modelem i nie może zostać usunięty. Uaktualnij swoją listę modeli urządzeń by nie zawierała tego producenta, a następnie spróbuj ponownie. ',
 
diff --git a/resources/lang/pl/admin/manufacturers/table.php b/resources/lang/pl/admin/manufacturers/table.php
index 103add8620..f07e8c02ad 100644
--- a/resources/lang/pl/admin/manufacturers/table.php
+++ b/resources/lang/pl/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email wsparcia technicznego',
     'support_phone'   		=> 'Telefon wsparcia technicznego',
     'support_url'   		=> 'Adres WWW wsparcia technicznego',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Zaktualizuj Producenta',
     'url'   				=> 'Adres WWW',
 
diff --git a/resources/lang/pl/admin/models/general.php b/resources/lang/pl/admin/models/general.php
index 2ed25ae151..b01daa05f7 100644
--- a/resources/lang/pl/admin/models/general.php
+++ b/resources/lang/pl/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Zamierzasz usunąć :model_count modeli aktywów.',
+    'bulk_delete_warn'          => 'Usuniesz model zasobu.|Usuniesz :model_count modele/modeli zasobów.',
     'restore'                   => 'Przywróć Model',
     'requestable'               => 'Użytkownicy mogą zażądać tego modelu',
 	'show_mac_address'			      => 'Pokaż pole MAC adresu tego modelu w aktywach',
diff --git a/resources/lang/pl/admin/models/message.php b/resources/lang/pl/admin/models/message.php
index 368fc49153..b3ee1db364 100644
--- a/resources/lang/pl/admin/models/message.php
+++ b/resources/lang/pl/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model nie istnieje.',
+    'no_association' => 'Żaden nie został przypisany.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model nie został zaktualizowany, spróbuj ponownie',
-        'success' => 'Model zaktualizowany pomyślnie.'
+        'success' => 'Model zaktualizowany pomyślnie.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Żadne pole nie zostało zmodyfikowane, więc nic nie zostało zaktualizowane.',
-        'success' 		=> 'Modele zostały uaktualnione.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nie wybrano modeli, więc nic nie zostało usunięte.',
-        'success' 		    => 'Zostało usunięte :success_count model(i)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(i) zostało usuniętych, jednakże :fail_count nie udało się usunąć, ponieważ wciąż są powiązane z nimi zasoby.'
     ),
 
diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php
index ee8234f4e7..87c08031a9 100644
--- a/resources/lang/pl/admin/settings/general.php
+++ b/resources/lang/pl/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'To jest serwer Active Directory',
     'alerts'                	=> 'Powiadomienia',
-    'alert_title'               => 'Zaktualizuj ustawienia powiadomień',
+    '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',
     'alerts_enabled'			=> 'Alarmy włączone',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Zaznaczenie tego pola pozwoli użytkownikowi zastąpić skórkę interfejsu użytkownika na inną.',
     'asset_ids'					=> 'ID Aktywa',
     'audit_interval'            => 'Interwał audytu',
-    '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'       => 'Jeśli jesteś zobowiązany do regularnego fizycznego audytu swoich aktywów, wprowadź interwał w miesiącach, który stosujesz. Jeśli zaktualizujesz tę wartość, wszystkie "daty następnego audytu" dla aktywów z nadchodzącą datą audytu zostaną zaktualizowane.',
     'audit_warning_days'        => 'Próg ostrzegania przed audytem',
     'audit_warning_days_help'   => 'Ile dni wcześniej powinniśmy ostrzec Cię, gdy majątek ma zostać poddany audytowi?',
     'auto_increment_assets'		=> 'Generuj automatycznie zwiększanjące się tagi zasobów',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Przywróć z kopii zapasowej',
     'backups_upload'            => 'Prześlij kopię zapasową',
     'backups_path'              => 'Kopie zapasowe na serwerze są przechowywane w <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'         => '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',
@@ -57,7 +57,7 @@ return [
     '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'                   => 'Enabled',
+    '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>.',
     'favicon'                   => 'Ikona ulubionych',
@@ -75,8 +75,9 @@ return [
     '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',
-    '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.',
+    'ldap_default_group'        => 'Domyślną Grupa Uprawnień',
+    'ldap_default_group_info'   => 'Wybierz grupę, którą chcesz przypisać do nowo zsynchronizowanych użytkowników. Pamiętaj, że użytkownik przejmuje uprawnienia grupy, do której został przypisany.',
+    'no_default_group'          => 'Brak Grupy Domyślnej',
     'ldap_help'                 => 'Usługa katalogowa Active Directory',
     'ldap_client_tls_key'       => 'Klucz TLS klienta LDAP',
     'ldap_client_tls_cert'      => 'Ceryfikat TLS klienta LDAP',
@@ -84,7 +85,9 @@ return [
     'ldap_integration'          => 'Integracja z LDAP',
     'ldap_settings'             => 'Ustawienia LDAP',
     'ldap_client_tls_cert_help' => 'Certyfikat TLS klienta i klucz dla połączeń LDAP są zwykle użyteczne tylko w konfiguracjach Google Workspace z "Secure LDAP". Wymagane są oba.',
-     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
+     'ldap_client_tls_key'       => 'Klucz TLS klienta LDAP',
+    'ldap_location'             => 'Lokalizacja LDAP',
+'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'      => 'Wprowadź poprawną nazwę użytkownika i hasło w podstawowej domenie, którą wprowadziłeś wyżej. W ten sposób przetestujesz czy logowanie LDAP jest poprawnie skonfigurowane. KONIECZNIE ZAPISZ WCZEŚNIEJ SWOJE USTAWIENIA LDAP.',
     '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',
@@ -111,7 +114,7 @@ return [
     'ldap_auth_filter_query'    => 'Autoryzacja LDAP',
     'ldap_version'              => 'Wersja LDAP',
     'ldap_active_flag'          => 'Aktywna flaga 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'  => '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_emp_num'              => 'Nr pracownika LDAP',
     'ldap_email'                => 'E-mail pracownika LDAP',
     'ldap_test'                 => 'Test LDAP',
@@ -122,8 +125,8 @@ return [
     'login'                     => 'Próby logowania',
     'login_attempt'             => 'Próba logowania',
     'login_ip'                  => 'Adres IP',
-    'login_success'             => 'Success?',
-    'login_user_agent'          => 'User Agent',
+    'login_success'             => 'Sukces?',
+    'login_user_agent'          => 'Agent użytkownika',
     'login_help'                => 'Lista prób logowania',
     'login_note'                => 'Noty logowania',
     '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>',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Pokaż obrazki w wiadomościach e-mail.',
     'show_images_in_email_help'   => 'Odznacz to pole, jeśli twoja instalacja Snipe-IT znajduje się za siecią VPN lub siecią zamkniętą, a użytkownicy spoza sieci nie będą mogli załadować obrazów obsługiwanych przez tę instalację w swoich wiadomościach e-mail.',
     'site_name'                 => 'Nazwa Witryny',
+    'integrations'               => 'Integracje',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Aktualizuj ustawienia Slack',
-    'slack_help'                => 'Ustawienia Slack',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Kanał Slack',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Ustawienia Slack',
-    'slack_integration_help'    => 'Integracja ze Slack jest opcjonalna, jednak endpoint i kanał są wymagane, jeżeli chcesz jej używać. Aby skonfigurować integrację ze Slack, musisz najpierw <a href=":slack_link" target="_new" rel="noopener">utworzyć Incoming Webhook</a> na swoim koncie Slack. Kliknij przycisk <strong>Test Slack Integration</strong>, aby zweryfikować poprawność swoich ustawień przed zapisaniem.',
-    'slack_integration_help_button'    => 'Po zapisaniu ustawień Slack, pojawi się przycisk testu.',
-    'slack_test_help'           => 'Sprawdź, czy integracja Slack jest poprawnie skonfigurowana. NAJPIERW ZAPISZ ZAKTUALIZOWANE USTAWIENIA SLACK.',
+    'general_webhook'           => 'Ogólny Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Przetestuj, aby zapisać',
+    'webhook_title'               => 'Aktualizuj ustawienia webhooka',
+    'webhook_help'                => 'Ustawienia integracji',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Kanał',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => 'Ustawienia :app',
+    'webhook_test'                 =>'Testuj integrację z :app ',
+    '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.',
     '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',
@@ -283,26 +291,26 @@ return [
     'barcodes' => 'Kody kreskowe',
     'barcodes_help_overview' => 'Kod kreskowy &amp; Ustawienia QR',
     'barcodes_help' => 'Spowoduje to próbę usunięcia kodów kreskowych z pamięci podręcznej. Jest to zwykle używane tylko wtedy, gdy zmieniły się ustawienia kodu kreskowego lub jeśli zmienił się adres URL Snipe-IT. Kody kreskowe zostaną wygenerowane ponownie przy następnym dostępie.',
-    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcodes_spinner' => 'Próba usunięcia plików...',
     'barcode_delete_cache' => 'Usuń pamięć podręczną kodu kreskowego',
     'branding_title' => 'Aktualizuj ustawienia wyglądu',
     'general_title' => 'Aktualizuj ustawienia ogólne',
     'mail_test' => 'Wyślij wiadomość testową',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
+    'mail_test_help' => 'Spowoduje to próbę wysłania wiadomości testowej do :replyto.',
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Bezpieczeństwo',
     'security_title' => 'Aktualizuj ustawienia zabezpieczeń',
     'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Weryfikacja dwuetapowa, wymagania haseł',
-    'groups_keywords' => 'permissions, permission groups, authorization',
+    'groups_keywords' => 'uprawnienia, grupy uprawnień, autoryzacje',
     'groups_help' => 'Grupy uprawnień',
     'localization' => 'Lokalizacja',
     'localization_title' => 'Aktualizuj ustawienia lokalizacji',
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Język, wyświetlanie daty',
     'notifications' => 'Powiadomienia',
-    'notifications_help' => 'Email alerts, audit settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
+    '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',
@@ -314,7 +322,7 @@ return [
     'employee_number' => 'Numer pracownika',
     'create_admin_user' => 'Dodaj użytkownika ::',
     'create_admin_success' => 'Sukces! Twój użytkownik administratracyjny został dodany!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
+    'create_admin_redirect' => 'Kliknij tutaj, aby przejść do logowania aplikacji!',
     'setup_migrations' => 'Migracje bazy danych ::',
     'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
     'setup_successful_migrations' => 'Twoje tabele bazy danych zostały utworzone',
@@ -322,4 +330,9 @@ 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>',
+    '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>.',
+    'google_login'      => 'Ustawienia logowania Google Workspace',
+    'enable_google_login'  => 'Włącz logowanie przez Google Workspace',
+    'enable_google_login_help'  => 'Użytkownicy nie będą automatycznie tworzeni. Muszą mieć istniejące konto tutaj i w Google Workspace, a ich nazwa użytkownika musi pasować do ich adresu e-mail w obszarze roboczym Google. ',
+
 ];
diff --git a/resources/lang/pl/admin/settings/message.php b/resources/lang/pl/admin/settings/message.php
index d9950da4c6..6269e62da1 100644
--- a/resources/lang/pl/admin/settings/message.php
+++ b/resources/lang/pl/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testowanie uwierzytelniania LDAP...',
         'authentication_success' => 'Użytkownik uwierzytelniony z LDAP pomyślnie!'
     ],
-    'slack' => [
-        'sending' => 'Wysyłanie wiadomości testowej Slack...',
+    'webhook' => [
+        'sending' => 'Wysyłanie wiadomości testowej :app...',
         'success_pt1' => 'Sukces! Sprawdź ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        'success_pt2' => ' kanał wiadomości testowej i pamiętaj, aby kliknąć ZAPISZ poniżej, aby zapisać ustawienia.',
         '500' => 'Błąd 500 serwera.',
-        'error' => 'Coś poszło nie tak.',
+        'error' => 'Coś poszło nie tak. :app odpowiedział: :error_message',
+        'error_misc' => 'Coś poszło nie tak. :( ',
     ]
 ];
diff --git a/resources/lang/pl/admin/statuslabels/message.php b/resources/lang/pl/admin/statuslabels/message.php
index 832ce037fd..44e54c4dc6 100644
--- a/resources/lang/pl/admin/statuslabels/message.php
+++ b/resources/lang/pl/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
 
     'help' => [
         'undeployable'   => 'Te aktywa nie mogą być przypisane do nikogo.',
-        '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>.',
+        'deployable'   => 'Te aktywa można sprawdzić. Gdy zostaną przypisane, przyjmą stan meta w postaci <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
         'archived'   => 'Te zasoby nie mogą zostać sprawdzone i będą wyświetlane tylko w Archiwizowanym widoku. Jest to użyteczne przy przechowywaniu informacji o zasobach w celach budżetowych / historycznych, ale nie na bieżąco z listy aktywów.',
         'pending'   => 'Te aktywa nie mogą być jeszcze przydzielone nikomu, często używane do przedmiotów przeznaczonych do naprawy, ale oczekują, że powrócą do obiegu.',
     ],
diff --git a/resources/lang/pl/admin/users/general.php b/resources/lang/pl/admin/users/general.php
index c4439aecea..5837085648 100644
--- a/resources/lang/pl/admin/users/general.php
+++ b/resources/lang/pl/admin/users/general.php
@@ -17,8 +17,10 @@ return [
     'last_login'        => 'Ostatnie logowanie',
     'ldap_config_text'  => 'Ustawienia konfiguracji LDAP mogą być znalezione w Administracja -> Ustawienia. Opcjonalnie wybierz lokalizacje, która będzie ustawiona dla zaimportowanych użytkowników.',
     'print_assigned'    => 'Drukuj wszystko przypisane',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'Wyślij mailem wszystkie przypisane',
+    'user_notified'     => 'Wysłano do użytkowania listę przypisanych zasobów.',
+    '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',
     'send_email_help'   => 'Musisz podać adres e-mail dla tego użytkownika, aby wysłać mu poświadczenia. Wysłanie danych logowania jest możliwe tylko w czasie tworzenia użytkownika. Hasła są zaszyfrowane i nie można ich odzyskać po zapisaniu.',
     'view_user'         => 'Zobacz Użytkownika :name',
@@ -31,14 +33,22 @@ return [
     'activation_status_warning' => 'Nie zmieniaj statusu aktywacji',
     'group_memberships_helpblock' => 'Tylko administratorzy mogą edytować członkostwo w grupie.',
     'superadmin_permission_warning' => 'Tylko superadministratorzy mogą udzielić użytkownikowi dostęp do superadmina.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
-    'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'OSTRZEŻENIE:',
+    'admin_permission_warning' => 'Tylko użytkownicy z uprawnieniami administratora lub większymi mogą udzielić dostępu administratorowi.',
+    'remove_group_memberships' => 'Usuń członkostwo grupy',
     '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',
+    'update_user_assets_status' => 'Zaktualizuj wszystkie zasoby dla tych użytkowników do tego statusu',
     'checkin_user_properties' => 'Check in all properties associated with these users',
     'remote_label'   => 'To jest zdalny użytkownik',
     'remote'   => 'Zdalny',
     'remote_help' => 'Może być przydatne, jeśli chciałbyś filtrować po użytkownikach zdalnych, którzy nigdy lub rzadko są fizycznie w twojej lokalizacji.',
     'not_remote_label' => 'To nie jest zdalny użytkownik',
+    'vip_label' => 'Użytkownik VIP',
+    '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' => 'Utwórz użytkownika',
+    'create_user_page_explanation' => 'To są informacje o koncie, których użyjesz, aby uzyskać dostęp do strony po raz pierwszy.',
+    'email_credentials' => 'Dane uwierzytelniające e-mail',
+    'email_credentials_text' => 'Wyślij moje poświadczenia na powyższy adres e-mail',
+    'next_save_user' => 'Następnie: Zapisz użytkownika',
+    'all_assigned_list_generation' => 'Data wygenerowania:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/pl/admin/users/message.php b/resources/lang/pl/admin/users/message.php
index 345b3c3d84..798b7438e6 100644
--- a/resources/lang/pl/admin/users/message.php
+++ b/resources/lang/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'            => 'User [:id] nie istnieje.',
+    'user_not_found'            => 'Użytkownik nie istnieje.',
     'user_login_required'       => 'Pole login jest wymagane',
     'user_password_required'    => 'Pole hasło jest wymagane.',
     'insufficient_permissions'  => 'Brak uprawnień.',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => 'Wybrani użytkownicy, którzy są aktywni i mają prawidłowe adresy e-mail, otrzymali link do resetowania hasła.',
     'password_reset_sent'       => 'Link umożliwiający zresetowanie hasła został wysłany na :email!',
     'user_has_no_email'         => 'Ten użytkownik nie ma adresu e-mail w swoim profilu.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Ten użytkownik nie ma żadnych przypisanych aktywów',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Ten użytkownik nie ma ustawionego adresu e-mail.',
+        'success' => 'Użytkownik został powiadomiony o swoich aktualnych zasobach.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/pl/auth/general.php b/resources/lang/pl/auth/general.php
index b456f09dd7..55477fc1c5 100644
--- a/resources/lang/pl/auth/general.php
+++ b/resources/lang/pl/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Zapamiętaj mnie',
     'username_help_top'                 => 'Wprowadź swoją <strong>nazwę użytkownika</strong> , aby otrzymać wiadomość e-mail z linkiem do resetowania hasła.',
     'username_help_bottom'          => 'Twoja nazwa użytkownika i adres e-mail <em>mogą być</em> takie same, ale mogą nie być zależne od konfiguracji. Jeśli nie pamiętasz nazwy użytkownika, skontaktuj się z administratorem. <br><br><strong>Nazwy użytkowników bez powiązanego adresu e-mail nie będą otrzymywać powiadomień na adres e-mail z linkiem do resetowania hasła.</strong> ',
-    ];
+    'google_login'                  => 'Lub zaloguj się przez Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php
index 5cf5a3f1bc..10b9216cd2 100644
--- a/resources/lang/pl/general.php
+++ b/resources/lang/pl/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Akcesoria',
     'activated'			    => 'Aktywowana',
+    'accepted_date'         => 'Data akceptacji',
     'accessory'				=> 'Akcesorium',
     'accessory_report'		=> 'Raporty Akcesoriów',
     'action'                => 'Edycja',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Dodano miejsca',
-    'age'                   => "Age",
+    'age'                   => "Wiek",
     'all_assets'			=> 'Wszystkie aktywa',
     'all'       			=> 'Wszystko',
     'archived'              => 'Archiwum',
@@ -22,12 +23,18 @@ return [
     'asset_tag'				=> 'Krótka nazwa',
     'asset_tags'            => 'Tagi zasobu',
     'assets_available'		=> 'Dostępne zasoby',
-    'accept_assets'         => 'Accept Assets :name',
+    'accept_assets'         => 'Akceptuje zasoby',
     'accept_assets_menu'    => 'Zaakceptuj zasoby',
     'audit'				    => 'Audyt',
     'audit_report'			=> 'Dziennik zdarzeń',
-    'assets'				=> 'Aktywa',
+    'assets'				=> 'Zasoby',
+    'assets_audited'        => 'aktywa poddane audytowi',
+    'assets_checked_in_count'     => 'zwrócone aktywa',
+    'assets_checked_out_count'     => 'wydane aktywa',
+    'asset_deleted_warning'     => 'Ten zasób został usunięty. Musisz go przywrócić, zanim będziesz mógł go komuś przypisać.',
+    'assigned_date'         => 'Data przypisania',
     'assigned_to'           => 'Przypisany do :name',
+    'assignee'              => 'Przypisany do',
     'avatar_delete'         => 'Skasuj Avatara',
     'avatar_upload'         => 'Wgraj Avatara',
     'back'      			=> 'Powrót',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Zbiorcza Edycja',
     'bulk_delete'           => 'Zbiorcze Usuwanie',
     'bulk_actions'          => 'Masowe przetwarzanie',
-    'bulk_checkin_delete'   => 'Zbiorowo odbierz zasoby od użytkowników',
+    'bulk_checkin_delete'   => 'Masowe przyjęcie / usuwanie użytkowników',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'To urządzenie jest własnością użytkownika',
     'bystatus'              => 'wg statusu',
     'cancel'  				=> 'Anuluj',
     'categories'			=> 'Kategorie',
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Usunięte',
     'delete_seats'  		=> 'Usunięte miejsca',
     'deletion_failed'       => 'Usunięcie nieudane',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Akceptowane typy plików to jpg, webp, png, gif i svg. Maksymalny dozwolony rozmiar to :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'         	    => 'Zaimportuj',
     'importing'         	=> 'Importowanie',
     'importing_help'        => 'Możesz importować aktywa, akcesoria, licencje, komponenty, materiały eksploatacyjne i użytkowników za pomocą pliku CSV. <br><br>CSV powinien być rozdzielony przecinkami i sformatowany z nagłówkami, które pasują do tych w <a href="https://snipe-it.readme.io/docs/importing" target="_new">przykładowych CSV w dokumentacji</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Utrzymanie aktywów',
     'item'  				=> 'Przedmiot',
     'item_name'             => 'Nazwa elementu',
+    'import_file'  			=> 'importuj plik CSV',
+    'import_type'  			=> 'Typ importu CSV',
     'insufficient_permissions' => 'Brak uprawnień!',
     'kits'       			=> 'Predefiniowane zestawy',
     'language'				=> 'Język',
@@ -173,7 +186,7 @@ return [
     'manufacturers'			=> 'Producenci',
     'markdown'				=> 'To pole pozwala na użycie <a href="https://help.github.com/articles/github-flavored-markdown/">GFM (Github flavored markdown)</a>.',
     'min_amt'				=> 'Minimalna ilość',
-    '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'          => 'Minimalna liczba elementów, które powinny być dostępne przed wyzwoleniem alertu. Pozostaw Min. Ilość pusta, jeśli nie chcesz otrzymywać powiadomień o niskim ekwipunku.',
     'model_no'				=> 'Model nr.',
     'months'				=> 'miesięcy',
     'moreinfo'				=> 'Więcej informacji',
@@ -201,9 +214,9 @@ return [
     'purchase_date'         => 'Data zakupu',
     'qty'		            => 'Ilość',
     'quantity'		        => 'Ilość',
-    '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'      => 'Masz :count przedmiotów poniżej lub prawie poniżej minimalnych poziomów ilości',
+    'quickscan_checkin'  	=> 'Szybkie skanowanie',
+    'quickscan_checkin_status'  	=> 'Status przypisania',
     'ready_to_deploy'		=> 'Gotowe do wdrożenia',
     'recent_activity'		=> 'Ostatnia aktywność',
     'remaining'             => 'Pozostało',
@@ -211,13 +224,14 @@ return [
     'reports'				=> 'Raporty',
     'restored'				=> 'przywrócone',
     'restore'				=> 'Przywróć',
-    'requestable_models'    => 'Requestable Models',
+    'requestable_models'    => 'Żądane modele',
     'requested'				=> 'Wymagane',
     'requested_date'        => 'Data złożenia zapotrzebowania',
     'requested_assets'      => 'Żądane zasoby',
     'requested_assets_menu' => 'Żądane zasoby',
     'request_canceled'      => 'Żądanie anulowane',
     'save'  				=> 'Zapisz',
+    'select_var'            => 'Wybierz :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Wybierz',
     'select_all'            => 'Zaznacz wszystko',
     'search'				=> 'Wyszukaj',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Podpis',
     'signed_off_by'         => 'Podpisano przez',
     'skin'       			=> 'Motyw',
-    'slack_msg_note'        => 'Wiadomość Slack zostanie wysłana',
-    'slack_test_msg'        => 'Super! Wygląda na to, że Twoja integracja Slack z Snipe-IT działa!',
+    '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!',
     'some_features_disabled' => 'Wersja demonstracyjna: Pewne funkcje zostały wyłączone w tej instalacji.',
     'site_name'				=> 'Nazwa Witryny',
     'state'  				=> 'Województwo',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Czy na pewno chcesz usunąć',
     'submit'				=> 'Zatwierdź',
     'target'                => 'Cel',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Wyświetlanie daty i czasu',
     'total_assets'			=> 'Ogółem aktywów',
     'total_licenses'		=> 'Ogółem licencji',
@@ -274,16 +287,16 @@ return [
     'users'                 => 'Użytkownicy',
     'viewall'				=> 'Pokaż wszystko',
     'viewassets'  			=> 'Zobacz przypisane aktywa',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => 'Zobacz przypisane do :name',
     'website'               => 'Adres witryny',
     'welcome'				=> 'Witaj, :name',
     'years'					=> 'Lata',
     'yes' 					=> 'Tak',
     'zip'  					=> 'Kod pocztowy',
     'noimage'				=> 'Brak obrazu lub obraz nieodnaleziony.',
-    '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'   => 'Żądany plik nie istnieje na serwerze.',
+    'file_upload_success'   => 'Przesyłanie pliku powiodło się!',
+    'no_files_uploaded'     => 'Przesyłanie pliku powiodło się!',
     'token_expired'         => 'Czas trwania sesji upłynął. Spróbuj ponownie.',
     'login_enabled'         => 'Logowanie włączone',
     'audit_due'             => 'Termin przeprowadzenia audytu',
@@ -307,12 +320,12 @@ return [
     'setup_step_3'          => 'Krok 3',
     'setup_step_4'          => 'Krok 4',
     'setup_config_check'    => 'Sprawdzanie konfiguracji',
-    'setup_create_database' => 'Create Database Tables',
+    'setup_create_database' => 'Utwórz tabelę w bazie danych',
     'setup_create_admin'    => 'Utwórz konto administratora',
     'setup_done'            => 'Zakończono!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Checked out to',
+    'bulk_edit_about_to'    => 'Zamierzasz edytować: ',
+    'checked_out'           => 'Wydane',
+    'checked_out_to'        => 'Wypożyczony do',
     'fields'                => 'Pola',
     'last_checkout'         => 'Last Checkout',
     'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
@@ -324,7 +337,7 @@ return [
             <p>Jeśli chcesz wyeksportować tylko określone zasoby, skorzystaj z poniższych opcji, aby dostosować wyniki.</p>',
     'range'                 => 'Zakres',
     'bom_remark'            => 'Dodaj BOM (znacznik kolejności bajtów) do tego pliku CSV',
-    'improvements'          => 'Improvements',
+    'improvements'          => 'Ulepszenia',
     'information'           => 'Informacja',
     'permissions'           => 'Uprawnienia',
     'managed_ldap'          => '(Zarządzane przez LDAP)',
@@ -332,29 +345,29 @@ return [
     'ldap_sync'             => 'Synchronizacja LDAP',
     'ldap_user_sync'        => 'Synchronizacja użytkownika LDAP',
     'synchronize'           => 'Synchronizuj',
-    'sync_results'          => 'Synchronization Results',
+    'sync_results'          => 'Wyniki Synchronizacji',
     'license_serial'        => 'Klucz seryjny/produktu',
     'invalid_category'      => 'Błędna kategoria',
     'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
+    '60_percent_warning'    => 'Ukończono w 60% (ostrzeżenie)',
     'dashboard_empty'       => 'Wygląda na to, że nie dodałeś jeszcze nic, więc nie mamy nic niesamowitego do wyświetlenia. Zacznij od dodania niektórych zasobów, akcesoriów, materiałów eksploatacyjnych lub licencji!',
     'new_asset'             => 'Nowy środek trwały',
     'new_license'           => 'Nowa licencja',
     'new_accessory'         => 'Nowe akcesorium',
     'new_consumable'        => 'Nowy materiał eksploatacyjny',
     'collapse'              => 'Zwiń',
-    'assigned'              => 'Assigned',
+    'assigned'              => 'Przypisane',
     'asset_count'           => 'Liczba aktywów',
     'accessories_count'     => 'Liczba akcesoriów',
     'consumables_count'     => 'Liczba materiałów eksploatacyjnych',
     'components_count'      => 'Liczba komponentów',
     'licenses_count'        => 'Liczba licencji',
     'notification_error'    => 'Błąd:',
-    'notification_error_hint' => 'Please check the form below for errors',
+    'notification_error_hint' => 'Proszę sprawdzić poniższy formularz pod kątem błędów',
     'notification_success'  => 'Sukces:',
     'notification_warning'   => 'Uwaga:',
     'notification_info'      => 'Informacja:',
-    'asset_information'     => 'Asset Information',
+    'asset_information'     => 'Informacje o aktywach',
     'model_name'            => 'Nazwa modelu:',
     'asset_name'            => 'Nazwa aktywu:',
     'consumable_information' => 'Consumable Information:',
@@ -362,31 +375,78 @@ return [
     'accessory_information' => 'Accessory Information:',
     'accessory_name'       => 'Nazwa akcesorium:',
     'clone_item'            => 'Klonuj obiekt',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in',
-    'checkout_user_tooltip' => 'Check this item out to a user',
+    'checkout_tooltip' => 'Sprawdź ten element',
+    'checkin_tooltip' => 'Sprawdź ten element w',
+    'checkout_user_tooltip' => 'Sprawdź ten element do użytkownika',
     '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)',
     'purge_not_allowed'     => 'Usuwanie usuniętych danych zostało wyłączone w pliku .env. Skontaktuj się z pomocą techniczną lub administratorem systemu.',
     'backup_delete_not_allowed'     => 'Usuwanie kopii zapasowych zostało wyłączone w pliku .env. Skontaktuj się z pomocą techniczną lub administratorem systemu.',
     'additional_files'           => 'Dodatkowe pliki',
-    '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.',
+    'shitty_browser'        => 'Nie wykryto podpisu. Jeśli używasz starszej przeglądarki, użyj bardziej nowoczesnej przeglądarki, aby dokończyć akceptację aktywów.',
+    'bulk_soft_delete'      =>'Również miękkie usuwanie tych użytkowników. Ich historia zasobów pozostanie nieuszkodzona/dopóki nie usuniesz usuniętych rekordów w ustawieniach administratora.',
     'bulk_checkin_delete_success' => 'Wybrani użytkownicy zostali usunięci i ich zasoby zostały odebrane.',
     'bulk_checkin_success' => 'Elementy dla wybranych użytkowników zostały odebrane.',
-    'set_to_null' => 'Usuń wartości dla tego zasobu|Usuń wartości dla wszystkich :asset_count aktywów ',
+    'set_to_null'           => 'Usuń wartości dla tego zasobu|Usuń wartości dla wszystkich :asset_count aktywów ',
+    'set_users_field_to_null'  => 'Usuń :field wartości dla tego użytkownika|Usuń :field wartości dla wszystkich użytkowników :user_count ',
     'na_no_purchase_date'   => 'N/A - Nie podano daty zakupu',
     'assets_by_status'      => 'Zasoby wg statusu',
     'assets_by_status_type'      => 'Zasoby według typu statusu',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
+    '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ć',
     'start_date'            => 'Data rozpoczęcia',
     'end_date'            => 'Data zakończenia',
     'alt_uploaded_image_thumbnail' => 'Przesłano miniaturę',
-    'placeholder_kit'       => 'Wybierz zestaw'
+    'placeholder_kit'       => 'Wybierz zestaw',
+    'file_not_found'        => 'Nie odnaleziono pliku',
+    'preview_not_available' => '(brak podglądu)',
+    'setup'                 => 'Ustawienia',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Przejdź do treści głównej',
+    'toggle_navigation'     => 'Przełącz nawigację',
+    'alerts'                => 'Alerty',
+    'tasks_view_all'        => 'Wyświetl wszystkie zadania',
+    'true'                  => 'Prawda',
+    'false'                 => 'Fałsz',
+    'integration_option'    => 'Opcja integracji',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Scal użytkowników',
+    'merge_information' =>  'Spowoduje to połączenie :count użytkowników do pojedynczego użytkownika. Wybierz użytkownika, do którego chcesz scalić innych użytkowników. Powiązane aktywa, licencje, itp zostaną przeniesiony do wybranego użytkownika, a inni użytkownicy zostaną oznaczeni jako usunięci.',
+    'warning_merge_information' => 'Tej akcji NIE MOŻNA cofnąć i powinna zostać użyta TYLKO WTEDY gdy musisz połączyć użytkowników z powodu złego importu lub synchronizacji. Pamiętaj, aby najpierw utworzyć kopię zapasową.',
+    'no_users_selected'     => 'Nie wybrano użytkowników',
+    'not_enough_users_selected'     => 'Co najmniej :count użytkowników musi zostać wybranych',
+    'merge_success'         => ':count użytkowników pomyślnie scalonych w :into_username!',
+    'merged'                => 'scalony',
+    'merged_log_this_user_into' => 'Scalono użytkownika (ID :to_id - :to_username) w ID użytkownika :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Scalono ID użytkownika :from_id (:from_username) z użytkownikiem (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Wyczyść i Zapisz',
+    'update_existing_values'    => 'Uaktualnić istniejące wartości?',
+    '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'   => ' Wysłać e-mail powitalny dla nowych użytkowników?',
+    'back_before_importing'     => 'Kopia zapasowa przed zaimportowaniem?',
+    'csv_header_field'          => 'Nagłówki pól pliku CSV',
+    'import_field'              => 'Importuj pole',
+    'sample_value'              => 'Przykładowa wartość',
+    'no_headers'                => 'Nie znaleziono kolumn',
+    'error_in_import_file'      => 'Wystąpił błąd podczas odczytu pliku CSV: :error',
+    'percent_complete'          => 'Ukończono :percent %',
+    'errors_importing'          => 'Podczas importowania wystąpiły błędy: ',
+    'warning'                   => 'Ostrzeżenie: :warning',
+    'success_redirecting'       => '"Sukces... Przekierowanie.',
+    'setup_successful_migrations' => 'Twoje tabele bazy danych zostały utworzone',
+    'setup_migration_output' => 'Wyniki migracji:',
+    'setup_migration_create_user' => 'Następnie: Stwórz użytkownika',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/pl/help.php b/resources/lang/pl/help.php
index e0699e01dd..0050529b9d 100644
--- a/resources/lang/pl/help.php
+++ b/resources/lang/pl/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Więcej informacji',
 
-    'audit_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.<br><br>Zauważ, że ten zasób jest zablokowany, nie zmieni lokalizacji osoby, składnika aktywów lub miejsca, w którym jest ona kontrolowana.',
+    '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' => 'Aktywa są to elementy identyfikowane przez numer seryjny lub etykietę.  Są to przedmioty o większej wartości, gdzie liczy się identyfikacja określonego elementu.',
 
diff --git a/resources/lang/pl/localizations.php b/resources/lang/pl/localizations.php
index d6c20046ba..43c5c0be33 100644
--- a/resources/lang/pl/localizations.php
+++ b/resources/lang/pl/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Szkocja',
         'SB'=>'Wyspy Salomona',
         'SC'=>'Seszele',
+        'SS'=>'Sudan Południowy',
         'SD'=>'Sudan',
         'SE'=>'Szwecja',
         'SG'=>'Singapur',
diff --git a/resources/lang/pl/mail.php b/resources/lang/pl/mail.php
index 85bdee8ecc..f7a747759e 100644
--- a/resources/lang/pl/mail.php
+++ b/resources/lang/pl/mail.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'acceptance_asset_accepted' => 'A user has accepted an item',
+    'acceptance_asset_accepted' => 'Użytkownik zaakceptował zasób',
     'acceptance_asset_declined' => 'Użytkownik odrzucił zasób',
     'a_user_canceled' => 'Użytkownik anulował zapotrzebowanie na sprzęt na stronie www',
     'a_user_requested' => 'Użytkownik zamówił pozycję na stronie internetowej',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Zaloguj się do aplikacji Snipe-IT przy użyciu poniższych poświadczeń:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Raport niskiego stanu zasobów',
+    'inventory_report' => 'Raport z magazynu',
     'min_QTY' => 'Min. ilość',
     'name' => 'Nazwa',
     'new_item_checked' => 'Nowy przedmiot przypisany do Ciebie został zwrócony, szczegóły poniżej.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Twoje poświadczenia :web',
     'Accessory_Checkin_Notification' => 'Akcesorium zwrócono',
     'Asset_Checkin_Notification' => 'Sprzęt zwrócono',
+    'Asset_Checkout_Notification' => 'Zasób wydany',
     'License_Checkin_Notification' => 'Akcesorium zwrócono',
     'Expected_Checkin_Report' => 'Oczekiwano raportu kontroli aktywów',
     'Expected_Checkin_Notification' => 'Przypomnienie: :name sprawdza termin zbliżający się',
     'Expected_Checkin_Date' => 'Zasób przypisany Tobie ma być zwrócony w dniu :date',
     'your_assets' => 'Zobacz swój sprzęt',
+    'rights_reserved' => 'Wszystkie prawa zastrzeżone.',
 ];
diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php
index 4556b6525b..e61d2473fa 100644
--- a/resources/lang/pl/validation.php
+++ b/resources/lang/pl/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute musi być plikiem.',
     'filled'               => 'Pole :attribute musi posiadać wartość.',
     'image'                => ':attribute musi być obrazkiem.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atrybut: musi zawierać co najmniej: min.',
     ],
     '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.',
+
     'not_in'               => 'Wybrany :attribute jest nieprawidłowy.',
     'numeric'              => ':attribute musi być liczbą.',
     'present'              => ':attribute nie może być puste.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Twoje bieżące hasło jest niepoprawne',
         'dumbpwd'          => 'To hasło jest zbyt powszechne.',
         'statuslabel_type' => 'Musisz wybrać odpowiedni typ etykiety statusu',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute musi być prawidłową datą w formacie YYYY-MM-DD',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/pt-BR/admin/accessories/general.php b/resources/lang/pt-BR/admin/accessories/general.php
index 7dbf44f959..3b3dd7e20d 100644
--- a/resources/lang/pt-BR/admin/accessories/general.php
+++ b/resources/lang/pt-BR/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Atualizar dispositivo',
     'use_default_eula'					=> 'Em vez disso, use o <a href="#" data-toggle="modal" data-target="#eulaModal">EULA padrão primário</a>.',
     'use_default_eula_disabled'			=> '<del>Em vez disso, use o EULA padrão primário.</del> Nenhum EULA padrão primário foi definido. Adicione um nas Configurações.',
+    'clone'                             => 'Clonar Acessório',
+    'delete_disabled'                   => 'Este acessório não pode ser excluído ainda porque alguns itens ainda estão checados.',
 
 );
diff --git a/resources/lang/pt-BR/admin/accessories/message.php b/resources/lang/pt-BR/admin/accessories/message.php
index d1aac7ba2a..e237e8a638 100644
--- a/resources/lang/pt-BR/admin/accessories/message.php
+++ b/resources/lang/pt-BR/admin/accessories/message.php
@@ -24,6 +24,7 @@ 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.'
     ),
 
diff --git a/resources/lang/pt-BR/admin/asset_maintenances/form.php b/resources/lang/pt-BR/admin/asset_maintenances/form.php
index 428f97542d..76cf1ca8a2 100644
--- a/resources/lang/pt-BR/admin/asset_maintenances/form.php
+++ b/resources/lang/pt-BR/admin/asset_maintenances/form.php
@@ -3,11 +3,11 @@
     return [
         'asset_maintenance_type' => 'Tipo de Manutenção de Ativo',
         'title'                  => 'Título',
-        'start_date'             => 'Data de início',
-        'completion_date'        => 'Data Termino',
+        'start_date'             => 'Data Inicial',
+        'completion_date'        => 'Data de Conclusão',
         'cost'                   => 'Custo',
         'is_warranty'            => 'Garantia melhorada',
-        'asset_maintenance_time' => 'Tempo da Manutenção do Ativo(em dias)',
+        'asset_maintenance_time' => 'Tempo de Manutenção do Ativo (em dias)',
         'notes'                  => 'Notas',
         'update'                 => 'Atualizar Manutenção do Ativo',
         'create'                 => 'Criar Manutenção do Ativo'
diff --git a/resources/lang/pt-BR/admin/asset_maintenances/message.php b/resources/lang/pt-BR/admin/asset_maintenances/message.php
index 25b961c7a2..81c429e8ee 100644
--- a/resources/lang/pt-BR/admin/asset_maintenances/message.php
+++ b/resources/lang/pt-BR/admin/asset_maintenances/message.php
@@ -3,19 +3,19 @@
     return [
         'not_found'                    => 'Manutenção do Ativo que você esta procurando não foi encontrada!',
         'delete'                       => [
-            'confirm' => 'Você deseja apagar esta manutenção do ativo?',
-            'error'   => 'Existe um problema para apagar essa manutenção deste ativo. Por favor tente novamente.',
-            'success' => 'A manutenção do ativo foi apagada com sucesso.',
+            'confirm' => 'Tem certeza que deseja excluir esta manutenção do ativo?',
+            'error'   => 'Houve um problema ao excluir a manutenção do ativo. Por favor, tente novamente.',
+            'success' => 'A manutenção do ativo foi excluída com sucesso.',
         ],
         'create'                       => [
-            'error'   => 'Não foi criada a Manutenção do Ativo, por favor tente novamente.',
+            'error'   => 'A Manutenção de Ativo não foi criada, por favor tente novamente.',
             'success' => 'Manutenção do ativo criada com sucesso.',
         ],
         'edit'                       => [
             'error'   => 'Manutenção de ativos não foi alterada, por favor tente novamente.',
             'success' => 'Manutenção de ativo alterada com sucesso.',
         ],
-        'asset_maintenance_incomplete' => 'Não foi Completada Ainda',
+        'asset_maintenance_incomplete' => 'Ainda não concluído',
         'warranty'                     => 'Garantia',
         'not_warranty'                 => 'Sem Garantia',
     ];
diff --git a/resources/lang/pt-BR/admin/categories/message.php b/resources/lang/pt-BR/admin/categories/message.php
index 88740d4e35..9caaee075c 100644
--- a/resources/lang/pt-BR/admin/categories/message.php
+++ b/resources/lang/pt-BR/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'A categoria não foi atualizada, tente novamente',
-        'success' => 'Categoria atualizada com sucesso.'
+        'success' => 'Categoria atualizada com sucesso.',
+        'cannot_change_category_type'   => 'Você não pode alterar o tipo de categoria uma vez que ele foi criado',
     ),
 
     'delete' => array(
diff --git a/resources/lang/pt-BR/admin/components/general.php b/resources/lang/pt-BR/admin/components/general.php
index 09d1cc4751..3ce4f67041 100644
--- a/resources/lang/pt-BR/admin/components/general.php
+++ b/resources/lang/pt-BR/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
     'update'                            => 'Atualizar componente',
+    'checkin_limit'            => 'Valor verificado em deve ser igual ou menor que :assigned_qty'
 );
diff --git a/resources/lang/pt-BR/admin/components/message.php b/resources/lang/pt-BR/admin/components/message.php
index d5d781be7e..146b446650 100644
--- a/resources/lang/pt-BR/admin/components/message.php
+++ b/resources/lang/pt-BR/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'O componente não foi atribuido, por favor tente de novo',
         'success' 		=> 'Componente atribuido com sucesso.',
-        'user_does_not_exist' => 'Esse Usuário é inválido. Por favor, tente novamente.'
+        'user_does_not_exist' => 'Esse Usuário é inválido. Por favor, tente novamente.',
+        'unavailable'      => 'Não há componentes suficientes restantes: :remaining restante, :requested requerido ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pt-BR/admin/consumables/message.php b/resources/lang/pt-BR/admin/consumables/message.php
index 015b9bb02f..ee2b1e30ac 100644
--- a/resources/lang/pt-BR/admin/consumables/message.php
+++ b/resources/lang/pt-BR/admin/consumables/message.php
@@ -23,7 +23,8 @@ 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.',
-        'user_does_not_exist' => 'Esse usuário é inválido. Por favor, tente novamente.'
+        '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. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pt-BR/admin/custom_fields/general.php b/resources/lang/pt-BR/admin/custom_fields/general.php
index df29019a8d..5e77f9418d 100644
--- a/resources/lang/pt-BR/admin/custom_fields/general.php
+++ b/resources/lang/pt-BR/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Usado por modelos',
     'order'   		            => 'Ordem',
     'create_fieldset'         => 'Novo conjunto de campos',
+    'update_fieldset'         => 'Atualizar Conjunto de Campos',
+    'fieldset_does_not_exist'   => 'O Conjunto de Campos :id não existe',
+    'fieldset_updated'         => 'Conjunto de Campos atualizado',
     'create_fieldset_title' => 'Criar um novo conjunto de campos',
     'create_field'            => 'Novo conjunto de campos personalizado',
     'create_field_title' => 'Criar um novo campo personalizado',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'AVISO. Este campo está na tabela de campos personalizados como <code>:db_column</code> mas deve ser <code>:expected</code>.',
     'is_unique' => 'Este valor deve ser único em todos os arquivos',
     'unique' => 'Único',
-    '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' => 'Permitir que o usuário selecionado veja estes valores em sua página de Ativos Atribuídos',
+    'display_in_user_view_table' => 'Visível para o Usuário',
+    'auto_add_to_fieldsets' => 'Adicionar automaticamente para cada novo conjunto de campos',
+    'add_to_preexisting_fieldsets' => 'Adicionar para qualquer conjunto de campos existente',
 ];
diff --git a/resources/lang/pt-BR/admin/departments/message.php b/resources/lang/pt-BR/admin/departments/message.php
index 86e74eb811..596ad9defe 100644
--- a/resources/lang/pt-BR/admin/departments/message.php
+++ b/resources/lang/pt-BR/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Departamento não existe.',
-    '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' => 'Já existe um departamento com esse nome neste local da empresa. Ou escolha um nome mais específico para este departamento. ',
     'assoc_users'	 => 'Este departamento esta atualmente associado a pelo menos um usuário e não pode ser deletado. Por favor atualize seus usuários para não fazer mais referência a este departamento e tente novamente. ',
     'create' => array(
         'error'   => 'O departamento não foi criado, por favor tente novamente.',
diff --git a/resources/lang/pt-BR/admin/hardware/form.php b/resources/lang/pt-BR/admin/hardware/form.php
index 389c5375ca..556325daf3 100644
--- a/resources/lang/pt-BR/admin/hardware/form.php
+++ b/resources/lang/pt-BR/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirma a exclusão de Ativos em Massa',
+    'bulk_restore'      => 'Confirmar Restauração de Ativos em Massa', 
   'bulk_delete_help'	=> 'Reveja os ativos selecionados para deletar. Depois de deletados, estes ativos podem ser restaurados, mas não estarão associados aos usuários.',
+  'bulk_restore_help'	=> 'Revise os ativos para restauração em massa abaixo. Uma vez restaurados, estes ativos não serão associados a quaisquer usuários aos quais foram atribuídos anteriormente.',
   'bulk_delete_warn'	=> 'Você está prestes a excluir.',
+  'bulk_restore_warn'	=> 'Você está prestes a restaurar :asset_count ativos.',
     'bulk_update'		=> 'Ativos da Atualização em Massa',
     'bulk_update_help'	=> 'Este formulário lhe permite atualizar múltiplos ativos de uma vez só. Apenas preencha os campos que você precisa alterar. Qualquer campo deixado em branco permanecerá inalterado. ',
     'bulk_update_warn'	=> 'Você está prestes a editar as propriedades de um único ativo.Você está prestes a editar as propriedades de :asset_count ativos.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Atualizar somente local padrão',
     '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.',
-    'processing_spinner' => 'Processando...',
+    'processing_spinner' => 'Processando... (Isso pode levar algum tempo em arquivos grandes)',
     'optional_infos'  => 'Informação Opcional',
     'order_details'   => 'Informações do pedido relacionado'
 ];
diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php
index 0cbb10477a..816a066279 100644
--- a/resources/lang/pt-BR/admin/hardware/general.php
+++ b/resources/lang/pt-BR/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Este modelo foi excluído.',
     'edit'  					=> 'Editar Ativo',
     'model_deleted'  			=> 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.',
+    'model_invalid'             => 'O modelo deste ativo é inválido.',
+    'model_invalid_fix'         => 'O Ativo deve ser editado para corrigir isso antes de tentar verificá-lo ou verificá-lo.',
     'requestable'               => 'Solicitável',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'Não solicitável',
@@ -21,6 +23,7 @@ return [
     '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.',
     'view'  					=> 'Ver Ativo',
     'csv_error' => 'Você tem um erro no seu arquivo CSV:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Mensagens de erro:',
     'success_messages' => 'Mensagens de sucesso:',
     'alert_details' => 'Por favor, veja abaixo para detalhes.',
-    'custom_export' => 'Exportação Personalizada'
+    'custom_export' => 'Exportação Personalizada',
+    'mfg_warranty_lookup' => ':manufacturer Busca por Situação de Garantia',
 ];
diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php
index 28cc28adc3..ebc9f455ae 100644
--- a/resources/lang/pt-BR/admin/hardware/message.php
+++ b/resources/lang/pt-BR/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'O ativo não foi restaurado, tente novamente',
         'success' 		=> 'Ativo restaurado com sucesso.',
+        'bulk_success' 		=> 'Ativo restaurado com sucesso.',
+        'nothing_updated'   => 'Nenhum ativo foi selecionado, então nada foi restaurado.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/pt-BR/admin/hardware/table.php b/resources/lang/pt-BR/admin/hardware/table.php
index cdb52fa1d9..b4cc8ec342 100644
--- a/resources/lang/pt-BR/admin/hardware/table.php
+++ b/resources/lang/pt-BR/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Entrada/Saída',
     'checkout_date' => 'Data de saída',
     'checkoutto' 	=> 'check-out',
+    'components_cost' => 'Custo Total de Componentes',
     'current_value' => 'Valor Atual',
     'diff' 			=> 'Diferença',
     'dl_csv' 		=> 'Baixar CSV',
diff --git a/resources/lang/pt-BR/admin/licenses/general.php b/resources/lang/pt-BR/admin/licenses/general.php
index 7487526930..d2a8d7eeaf 100644
--- a/resources/lang/pt-BR/admin/licenses/general.php
+++ b/resources/lang/pt-BR/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Sobre Licenças',
-    'about_licenses'                  => 'Licenças são utilizadas para controlar o uso dos softwares. Ela possuem uma quantidade específica que podem ser alocadas para os usuários',
+    'about_licenses_title'      => 'Sobre Licenças',
+    'about_licenses'            => 'Licenças são utilizadas para controlar o uso dos softwares. Ela possuem uma quantidade específica que podem ser alocadas para os usuários',
     'checkin'  					=> 'Retorna Licença Compartilhada',
     'checkout_history'  		=> 'Histórico de Registros',
     'checkout'  				=> 'Registra Licença Compartilhada',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licenças de Software',
     'user'  					=> 'Usuário',
     'view'  					=> 'Ver Licença',
+    'delete_disabled'           => 'Esta licença ainda não pode ser excluída porque algumas vagas ainda estão reservadas.',
+    'bulk'                      =>
+        [
+            '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.',
+                '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',
+                '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',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Checkout de todas as vagas',
+                'modal'                 => 'Esta ação verificará um lugar para o primeiro usuário disponível. | Esta ação verificará todos os :available_seats_count lugares para os primeiros usuários disponíveis. Um usuário é considerado disponível para esta vaga se ele ainda não tiver essa licença reservada para ele, e a propriedade de Autoatribuição de Licenças está ativada na sua conta de usuário.',
+                'enabled_tooltip'   => 'Checkout TODAS as vagas (ou quantos estiverem disponíveis) para TODOS os usuários',
+                'disabled_tooltip'  => 'Isto está desativado porque não há vagas desbloqueadas no momento',
+                'success'           => 'Licença devolvida com sucesso! | :count licenças foram desbloqueadas com sucesso!',
+                '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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/pt-BR/admin/locations/message.php b/resources/lang/pt-BR/admin/locations/message.php
index 3da2255946..45c08a289d 100644
--- a/resources/lang/pt-BR/admin/locations/message.php
+++ b/resources/lang/pt-BR/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Este local está no momento associado com pelo menos um usuário e não pode ser excluído. Atualize seus usuários para não referenciarem mais 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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Ativos atribuídos',
+    'current_location' => 'Localização Atual',
 
 
     'create' => array(
diff --git a/resources/lang/pt-BR/admin/manufacturers/message.php b/resources/lang/pt-BR/admin/manufacturers/message.php
index 0985f4be4c..29bc096686 100644
--- a/resources/lang/pt-BR/admin/manufacturers/message.php
+++ b/resources/lang/pt-BR/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> e <code>{SERIAL}</code> em sua URL como variáveis para ter esses valores auto-povoados na visualização de ativos.',
     'does_not_exist' => 'O fabricante não existe.',
     'assoc_users'	 => 'Este fabricante está no momento associado com pelo menos um modelo e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fabricante e tente novamente. ',
 
diff --git a/resources/lang/pt-BR/admin/manufacturers/table.php b/resources/lang/pt-BR/admin/manufacturers/table.php
index 6e357a5719..671c5bc099 100644
--- a/resources/lang/pt-BR/admin/manufacturers/table.php
+++ b/resources/lang/pt-BR/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'E-mail de suporte',
     'support_phone'   		=> 'Telefone de suporte',
     'support_url'   		=> 'Url de suporte',
+    'warranty_lookup_url'   => 'URL da busca de garantia',
     'update'				=> 'Atualizar Fabricante',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/pt-BR/admin/models/general.php b/resources/lang/pt-BR/admin/models/general.php
index 7fdc23c9d6..c81eadc8c1 100644
--- a/resources/lang/pt-BR/admin/models/general.php
+++ b/resources/lang/pt-BR/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 exluir :model_count asset models.',
+    'bulk_delete_warn'          => 'Você está prestes a excluir um modelo de ativo.|Você está prestes a excluir :model_count modelos de ativos.',
     'restore'                   => 'Restaurar Modelo',
     'requestable'               => 'Usuários podem solicitar este modelo',
 	'show_mac_address'			      => 'Exibir o campo de endereço MAC nos ativos neste modelo',
diff --git a/resources/lang/pt-BR/admin/models/message.php b/resources/lang/pt-BR/admin/models/message.php
index 42daec19b1..87e42bb084 100644
--- a/resources/lang/pt-BR/admin/models/message.php
+++ b/resources/lang/pt-BR/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'O modelo não existe.',
+    'no_association' => 'NENHUM MODEL ASSOCIADO.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'O modelo não foi atualizado, tente novamente',
-        'success' => 'Modelo atualizado com sucesso.'
+        'success' => 'Modelo atualizado com sucesso.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nenhum campo foi alterado, então nada foi atualizado.',
-        'success' 		=> 'Modelos atualizados.'
+        'success' 		=> 'Modelo foi atualizado com sucesso. |:model_count modelos atualizados com sucesso.',
+        'warn'          => 'Você está prestes a atualizar os properies do seguinte modelo: |Você está prestes a editar as propriedades dos seguintes :model_count modelos:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nenhum modelo foi selecionado, então nada foi deletado.',
-        'success' 		    => '::succes_count model (s) deletados!',
+        'success' 		    => 'Modelo excluído!|:success_count modelos deletados!',
         'success_partial' 	=> ':success_count model(s) foram deletados,no entando :fail_count não pode ser excluído porque eles ainda possuem ativos associados a eles.'
     ),
 
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 1345a186b1..584bde1111 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Este é um servidor de Diretório Ativo',
     'alerts'                	=> 'Alertas',
-    'alert_title'               => 'Atualizar configurações de alerta',
+    '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',
     'alerts_enabled'			=> 'Alertas ativados',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Marcando essa caixa, permitirá que usuário substitua a interface por outra diferente.',
     'asset_ids'					=> 'ID do ativo',
     'audit_interval'            => 'Intervalo de auditoria',
-    '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'       => 'Se você for obrigado a auditar fisicamente seus ativos, insira o intervalo em meses que você usa. Se você atualizar este valor, todas as "próximas datas de auditoria" para os ativos com uma data de auditoria futura serão atualizadas.',
     'audit_warning_days'        => 'Limiar de aviso de auditoria',
     'audit_warning_days_help'   => 'Com quantos dias de antecedência deseja ser avisado sobre a verificação de seus ativos?',
     'auto_increment_assets'		=> 'Gerar auto insercao de etiquetas de ativos',
@@ -75,8 +75,9 @@ return [
     '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',
-    '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.',
+    'ldap_default_group'        => 'Grupo de Permissões Padrão',
+    'ldap_default_group_info'   => 'Selecione um grupo para atribuir aos usuários recém-sincronizados. Lembre-se de que um usuário tem as permissões do grupo que ele está atribuído.',
+    'no_default_group'          => 'Sem Grupo Padrão',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'Chave TLS do cliente LDAP',
     'ldap_client_tls_cert'      => 'Certificado TLS do cliente LDAP',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Configurações LDAP',
     'ldap_client_tls_cert_help' => 'Certificado e chave TLS do Client-Side para conexões LDAP geralmente são úteis apenas em configurações do Google Workspace com "Secure LDAP". Ambas são necessárias.',
      'ldap_client_tls_key'       => 'Chave TLS do lado do cliente LDAP',
+    'ldap_location'             => 'Localização LDAP',
+'ldap_location_help'             => 'O campo de Localização do dap deve ser usado se <strong>um OU não estiver sendo usado no DNS de vinculação base.</strong> Deixe em branco se uma busca OU estiver sendo usada.',
     'ldap_login_test_help'      => 'Digite um nome de usuário e senha LDAP válidos a partir do DN base que você especificou acima para testar se seu login LDAP está configurado corretamente. VOCÊ DEVE SALVAR AS CONFIGURAÇÕES LDAP ATUALIZADAS PRIMEIRAMENTE.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Mostrar imagens em e-mails',
     'show_images_in_email_help'   => 'Desmarque esta caixa se sua instalação de Snipe-IT está por trás de uma VPN ou rede fechada e usuários fora da rede não será capazes de carregar imagens, servidas a partir desta instalação em seus e-mails.',
     'site_name'                 => 'Nome do Site',
+    'integrations'               => 'Integrações',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Atualizar configurações do Slack',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Botname do Stack',
-    'slack_channel'             => 'Canal do Stack',
-    'slack_endpoint'            => 'Endpoint do Slack',
-    'slack_integration'         => 'Configurações do Stack',
-    'slack_integration_help'    => 'A integração do Slack é opcional, mas o endpoint e o canal são necessários se você quiser usá-lo. Para configurar a integração do Slack, primeiro você deve <a href=":slack_link" target="_new" rel="noopener">criar um webhook de entrada</a> em sua conta do Slack. Clique no botão <strong>de integração do Slack de teste</strong> para confirmar se suas configurações estão corretas antes de salvar. ',
-    'slack_integration_help_button'    => 'Depois de salvar suas informações do Slack, um botão de teste será exibido.',
-    'slack_test_help'           => 'Teste se sua integração do Slack está configurada corretamente. VOCÊ DEVE SALVAR SUAS CONFIGURAÇÕES NO SLACK PRIMEIRO.',
+    'general_webhook'           => 'Webhook Geral',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Teste para salvar',
+    'webhook_title'               => 'Atualizar configurações de Webhook',
+    'webhook_help'                => 'Configurações de integração',
+    'webhook_botname'             => 'Nome do Bot :app',
+    'webhook_channel'             => 'Canal :app',
+    'webhook_endpoint'            => 'Endpoint :app',
+    'webhook_integration'         => 'Configurações :app',
+    'webhook_test'                 =>'Teste de integração :app',
+    '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.',
     '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',
@@ -301,7 +309,7 @@ return [
     '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, configurações de auditoria',
+    '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',
@@ -322,4 +330,9 @@ 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',
+    '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>.',
+    'google_login'      => 'Configurações de login do Google Workspace',
+    'enable_google_login'  => 'Permitir que os usuários façam login com o Google Workspace',
+    'enable_google_login_help'  => 'Os usuários não serão fornecidos automaticamente. Eles devem ter uma conta existente aqui E no Google Workspace e seu nome de usuário deve corresponder ao endereço de e-mail do Google Workspace. ',
+
 ];
diff --git a/resources/lang/pt-BR/admin/settings/message.php b/resources/lang/pt-BR/admin/settings/message.php
index e519756878..ff5cfc02db 100644
--- a/resources/lang/pt-BR/admin/settings/message.php
+++ b/resources/lang/pt-BR/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testando Autenticação LDAP...',
         'authentication_success' => 'Usuário autenticado no LDAP com sucesso!'
     ],
-    'slack' => [
-        'sending' => 'Enviando mensagem de teste Slack...',
+    'webhook' => [
+        'sending' => 'Enviando mensagem :app de teste...',
         'success_pt1' => 'Sucesso! Verifique o ',
         'success_pt2' => ' canal para sua mensagem de teste, e certifique-se de clicar em SALVAR abaixo para armazenar suas configurações.',
         '500' => '500 Erro no Servidor.',
-        'error' => 'Algo deu errado.',
+        'error' => 'Algo deu errado. :app respondeu com: :error_message',
+        'error_misc' => 'Algo deu errado. :( ',
     ]
 ];
diff --git a/resources/lang/pt-BR/admin/users/general.php b/resources/lang/pt-BR/admin/users/general.php
index e1e30c3f7b..5485665ffb 100644
--- a/resources/lang/pt-BR/admin/users/general.php
+++ b/resources/lang/pt-BR/admin/users/general.php
@@ -19,6 +19,8 @@ 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.',
+    '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',
     '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',
@@ -33,7 +35,6 @@ return [
     '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' => 'ATENÇÃO:',
     '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',
     'checkin_user_properties' => 'Check-in de todas as propriedades associadas a estes usuários',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Remoto',
     'remote_help' => 'Isso pode ser útil se você precisa filtrar por usuários remotos que nunca entram em seus locais físicos.',
     'not_remote_label' => 'Este não é um usuário remoto',
+    'vip_label' => 'Usuário VIP',
+    'vip_help' => 'Isso pode ser útil para marcar pessoas importantes na sua organização, se você quiser lidar com elas de formas especiais.',
+    'create_user' => 'Criar um usuário',
+    'create_user_page_explanation' => 'Esta é a informação de conta que você usará para acessar o site pela primeira vez.',
+    'email_credentials' => 'Credenciais do e-mail',
+    'email_credentials_text' => 'Enviar minhas credenciais para o endereço de e-mail acima',
+    'next_save_user' => 'Próximo: Salvar Usuário',
+    'all_assigned_list_generation' => 'Gerado em:',
+    'email_user_creds_on_create' => 'Enviar por email suas credenciais?',
 ];
diff --git a/resources/lang/pt-BR/admin/users/message.php b/resources/lang/pt-BR/admin/users/message.php
index f42121124f..00d4f632ab 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 [:id] não existe.',
+    'user_not_found'            => 'O usuário não existe.',
     'user_login_required'       => 'O campo de login é requerido',
     'user_password_required'    => 'A senha é requerida.',
     'insufficient_permissions'  => 'Permissões Insuficientes.',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => 'Os usuários selecionados que são ativados e têm um endereço de e-mail válido receberam um link de redefinição de senha.',
     'password_reset_sent'       => 'Um link de redefinição de senha foi enviado para :email!',
     'user_has_no_email'         => 'Esse usuário não tem um endereço de e-mail no seu perfil.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Este usuário não tem nenhum ativo atribuído',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Este usuário não tem e-mail definido.',
+        'success' => 'O usuário foi notificado sobre seu inventário atual.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/pt-BR/auth/general.php b/resources/lang/pt-BR/auth/general.php
index 18beff19a6..74521916eb 100644
--- a/resources/lang/pt-BR/auth/general.php
+++ b/resources/lang/pt-BR/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Lembrar de mim',
     'username_help_top'                 => 'Digite seu <strong>nome de usuário</strong> para receber um email com um link de redefinição de senha.',
     'username_help_bottom'          => 'Seu nome de usuário e endereço de e-mail <em> podem </em> ser o mesmo, mas pode não ser, dependendo da sua configuração. Se você não conseguir lembrar seu nome de usuário, entre em contato com seu administrador. <br> <br> <strong> nomes de usuário sem um endereço de e-mail associado não será enviado por e-mail um link de redefinição de senha.</strong> ',
-    ];
+    'google_login'                  => 'Ou faça login com o Google Workspace',
+    'google_login_failed'           => 'Falha no login do Google. Por favor, tente novamente.',
+
+];
 
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index fa748f2fbf..b561c4ff4c 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Acessórios',
     'activated'			    => 'Ativado',
+    'accepted_date'         => 'Data de Aceite',
     'accessory'				=> 'Acessório',
     'accessory_report'		=> 'Relatório de Acessório',
     'action'                => 'Ação',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Administrador',
     'administrator'			=> 'Administrador',
     'add_seats'             => 'Assentos adicionados',
-    'age'                   => "Age",
+    'age'                   => "Idade",
     'all_assets'			=> 'Todos os Ativos',
     'all'       			=> 'Todos',
     'archived'              => 'Arquivado',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditoria',
     'audit_report'			=> 'Registro de auditoria',
     'assets'				=> 'Ativos',
+    'assets_audited'        => 'ativos auditados',
+    'assets_checked_in_count'     => 'Ativos retornados',
+    'assets_checked_out_count'     => 'ativos retirados',
+    'asset_deleted_warning'     => 'Este ativo foi deletado. Você deve restaurá-lo antes de poder atribuí-lo a alguém.',
+    'assigned_date'         => 'Data atribuída',
     'assigned_to'           => 'Atribuído a :name',
+    'assignee'              => 'Atribuído a',
     'avatar_delete'         => 'Excluir Avatar',
     'avatar_upload'         => 'Carregar Avatar',
     'back'      			=> 'Voltar',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Edição em massa',
     'bulk_delete'           => 'Exclusão em massa',
     'bulk_actions'          => 'Ações em massa',
-    'bulk_checkin_delete'   => 'Check-in em Massa de Itens de Usuários',
+    'bulk_checkin_delete'   => 'Check-in / Excluir Usuários em Massa',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Este dispositivo é de propriedade do usuário',
     'bystatus'              => 'por status',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorias',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Excluído',
     'delete_seats'  		=> 'Assentos Excluídos',
     'deletion_failed'       => 'Falha ao excluir',
@@ -139,6 +149,7 @@ return [
     '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'  => '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',
     'importing'         	=> 'Importando',
     'importing_help'        => 'Você pode importar ativos, acessórios, licenças, componentes, consumíveis e usuários via arquivo CSV. <br><br>O CSV deve ser delimitado por vírgula e formatado com cabeçalhos que correspondem aos dos <a href="https://snipe-it.readme.io/docs/importing" target="_new">CSVs de amostra na documentação</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Manutenções em Ativo',
     'item'  				=> 'Item',
     'item_name'             => 'Nome do Item',
+    'import_file'  			=> 'importar arquivo CSV',
+    'import_type'  			=> 'Tipo de importação CSV',
     'insufficient_permissions' => 'Você não tem permissão!',
     'kits'       			=> 'Kits predefinidos',
     'language'				=> 'Idioma',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Ativos Solicitados',
     'request_canceled'      => 'Solicitação Cancelada',
     'save'  				=> 'Salvar',
+    'select_var'            => 'Selecione :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Selecionar',
     'select_all'            => 'Selecionar Todos',
     'search'				=> 'Buscar',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Assinatura',
     'signed_off_by'         => 'Assinado por',
     'skin'       			=> 'Temas',
-    'slack_msg_note'        => 'Uma mensagem será enviada via Slack',
-    'slack_test_msg'        => 'Parabéns! Parece que sua integração com o sistema está funcionando!',
+    '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!',
     'some_features_disabled' => 'MODO DE DEMONSTRAÇÃO: Algumas funcionalidades estão desativadas nesta instalação.',
     'site_name'				=> 'Nome do Site',
     'state'  				=> 'Situação',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Você tem certeza que deseja apagar',
     'submit'				=> 'Confirmar',
     'target'                => 'Alvo',
-    'toggle_navigation'     => 'Ativar Navegação',
     'time_and_date_display' => 'Exibição de Hora e Data',
     'total_assets'			=> 'total de ativos',
     'total_licenses'		=> 'total de licenças',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Sim',
     'zip'  					=> 'Código postal',
     'noimage'				=> 'Sem imagem para fazer o carregamento ou a imagem não foi encontrada.',
-    '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'   => 'O arquivo solicitado não existe no servidor.',
+    'file_upload_success'   => 'Arquivo enviado com sucesso!',
+    'no_files_uploaded'     => 'Arquivo enviado com sucesso!',
     'token_expired'         => 'A sua sessão expirou. Por favor, tente entrar novamente.',
     'login_enabled'         => 'Login Ativado',
     'audit_due'             => 'Vencimento para auditoria',
@@ -376,7 +389,8 @@ Resultados da Sincronização',
     'bulk_soft_delete'      =>'Também exclua esses usuários. Seu histórico de ativos permanecerá intacto até você remover os registros excluídos nas configurações do Administrador.',
     'bulk_checkin_delete_success' => 'Os usuários selecionados foram excluídos e seus itens foram devolvidos.',
     'bulk_checkin_success' => 'Os itens dos usuários selecionados foram devolvidos.',
-    'set_to_null' => 'Excluir valores para este ativo|Excluir valores para todos os :asset_count ativos ',
+    'set_to_null'           => 'Excluir valores para este ativo|Excluir valores para todos os :asset_count ativos ',
+    'set_users_field_to_null'  => 'Excluir os valores de :field para este usuário! Excluir :field valores para todos :user_count usuários ',
     'na_no_purchase_date'   => 'N/A - Nenhuma data de compra fornecida',
     'assets_by_status'      => 'Ativos por Situação',
     'assets_by_status_type'      => 'Ativos por Tipo de Situação',
@@ -386,8 +400,54 @@ Resultados da Sincronização',
     'start_date'            => 'Data Inicial',
     'end_date'            => 'Data final',
     'alt_uploaded_image_thumbnail' => 'Miniatura carregada',
-    'placeholder_kit'       => 'Selecione um kit'
+    'placeholder_kit'       => 'Selecione um kit',
+    'file_not_found'        => 'Arquivo não encontrado',
+    'preview_not_available' => '(sem visualização)',
+    'setup'                 => 'Configuração',
+    'pre_flight'            => 'Pré-Lançamento',
+    'skip_to_main_content'  => 'Pular para o conteúdo principal',
+    'toggle_navigation'     => 'Alternar navegação',
+    'alerts'                => 'Alertas',
+    'tasks_view_all'        => 'Mostrar todas as tarefas',
+    'true'                  => 'Verdadeiro',
+    'false'                 => 'Falso',
+    'integration_option'    => 'Opções de integração',
+    'log_does_not_exist'    => 'Não existe nenhum registro de histórico correspondente.',
+    'merge_users'           => 'Mesclar Usuários',
+    'merge_information' =>  'Isso irá mesclar os usuários de :count em um único usuário. Selecione o usuário que você deseja mesclar os outros em abaixo e os ativos, licenças associadas, etc. serão movidos para o usuário selecionado e os outros usuários serão marcados como excluídos.',
+    'warning_merge_information' => 'Esta ação NÃO PODERÁ ser desfeita e APENAS deve ser usada quando você precisa mesclar usuários devido a uma importação ou sincronização ruim. Certifique-se de executar um backup primeiro.',
+    'no_users_selected'     => 'Não há usuários selecionados',
+    'not_enough_users_selected'     => 'Pelo menos :count usuários devem ser selecionados',
+    'merge_success'         => ':count usuários mesclados com sucesso em :into_username!',
+    'merged'                => 'mesclado',
+    'merged_log_this_user_into' => 'Mesclou este usuário (ID :to_id - :to_username) em ID de usuário :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Mesclado ID de usuário :from_id (:from_username) para este usuário (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Limpar e Salvar',
+    'update_existing_values'    => 'Atualizar Valores Existentes?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'A geração de etiquetas auto-incrementais de ativos está desabilitada, então todas as linhas precisam ter a coluna "Etiqueta de ativo" preenchidas.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: A geração de etiquetas auto-incrementais de ativos está habilitada assim serão criadas para registros que não possuem a "Etiqueta de ativo" preenchida. As linhas que possuem "Etiqueta de ativo" preenchida serão atualizadas com as informações fornecidas.',
+    'send_welcome_email_to_users'   => ' Enviar E-mail de Boas-vindas para novos Usuários?',
+    'back_before_importing'     => 'Fazer backup antes de importar?',
+    'csv_header_field'          => 'Campo de Cabeçalho CSV',
+    'import_field'              => 'Campo de importação',
+    'sample_value'              => 'Valor de Amostra',
+    'no_headers'                => 'Nenhuma Coluna Encontrada',
+    'error_in_import_file'      => 'Houve um erro ao ler o arquivo CSV: :error',
+    'percent_complete'          => ':percent % Completo',
+    'errors_importing'          => 'Ocorreram alguns Erros ao importar: ',
+    'warning'                   => 'AVISO: :warning',
+    'success_redirecting'       => '"Sucesso... Redirecionando.',
+    'setup_successful_migrations' => 'Suas tabelas de banco de dados foram criadas',
+    'setup_migration_output' => 'Saída de migração:',
+    'setup_migration_create_user' => 'Próximo: Criar Usuário',
+    'importer_generic_error'    => 'Sua importação de arquivo está completa, mas recebemos um erro. Isso é geralmente causado pela limitação de API de terceiros de um webhook de notificação (como o Slack) e não teria interferido na importação em si, mas você deve confirmar isto.',
+    '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.)',
+    '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',
+    'undeployable_tooltip'      => 'Este item não pode ser retirado. Verifique a quantidade restante.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/pt-BR/help.php b/resources/lang/pt-BR/help.php
index e9b400fb63..d0a93d9fba 100644
--- a/resources/lang/pt-BR/help.php
+++ b/resources/lang/pt-BR/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mais Informações',
 
-    'audit_help' => 'Marcar esta caixa irá editar o registro de ativos para refletir esse novo local. Deixando-o desmarcado irá simplesmente anotar o local no log de auditoria.<br><br>Note que este ativo é verificado, não irá alterar a localização da pessoa, ativo ou local para onde for reservado.',
+    'audit_help' => 'Marcar esta caixa irá editar o registro de ativos para refletir esse novo local. Deixando-o desmarcado irá simplesmente anotar o local no log de auditoria.<br><br>Note que se este ativo for verificado, não irá alterar a localização da pessoa, ativo ou local para onde for reservado.',
 
     'assets' => '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.',
 
diff --git a/resources/lang/pt-BR/localizations.php b/resources/lang/pt-BR/localizations.php
index 0a5b2094ab..5e0e95008a 100644
--- a/resources/lang/pt-BR/localizations.php
+++ b/resources/lang/pt-BR/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Escócia',
         'SB'=>'Ilhas Salomão',
         'SC'=>'Seicheles',
+        'SS'=>'Sudão do Sul',
         'SD'=>'Sudão',
         'SE'=>'Suécia',
         'SG'=>'Singapura',
diff --git a/resources/lang/pt-BR/mail.php b/resources/lang/pt-BR/mail.php
index 0edf04a620..bcce87a359 100644
--- a/resources/lang/pt-BR/mail.php
+++ b/resources/lang/pt-BR/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Faça login na sua instalação do Snipe-IT usando os dados abaixo:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Relatório de baixas de inventario',
+    'inventory_report' => 'Relatório de Inventário',
     'min_QTY' => 'Qtde. Min',
     'name' => 'Nome',
     'new_item_checked' => 'Um novo item foi feito Check-out em seu nome, detalhes abaixo.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Suas credenciais do Snipe-IT',
     'Accessory_Checkin_Notification' => 'Ativo verificado em',
     'Asset_Checkin_Notification' => 'Ativo verificado em',
+    'Asset_Checkout_Notification' => 'Ativo retornado',
     'License_Checkin_Notification' => 'Licença verificada em',
     'Expected_Checkin_Report' => 'Relatório de check-in de ativos esperado',
     'Expected_Checkin_Notification' => 'Lembrete: :name prazo de devolução aproximando',
     'Expected_Checkin_Date' => 'Um ativo com check-out para você deve ser verificado novamente em :date',
     'your_assets' => 'Ver seus ativos',
+    'rights_reserved' => 'Todos os direitos reservados.',
 ];
diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php
index b41643e420..120793eb35 100644
--- a/resources/lang/pt-BR/validation.php
+++ b/resources/lang/pt-BR/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'O :attribute deve ser um arquivo.',
     'filled'               => 'O :attribute deve ter um valor.',
     'image'                => 'O :attribute deve ser uma imagem.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'O :attribute deve ter pelo menos :min items.',
     ],
     'starts_with'          => 'O atributo deve começar com um dos seguintes valores.',
+    'ends_with'            => 'O :attribute deve terminar com um dos seguintes: :values.',
+
     'not_in'               => 'O :attribute selecionado é inválido.',
     'numeric'              => 'O :attribute deve ser um número.',
     'present'              => 'O campo:attribute deve estar presente.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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'     => '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',
+        'termination_date.date_format'  =>  'O :attribute deve ser uma data válida em formato DD-MM-YYYY',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/pt-PT/admin/accessories/general.php b/resources/lang/pt-PT/admin/accessories/general.php
index 1c0c4a828f..53266de238 100644
--- a/resources/lang/pt-PT/admin/accessories/general.php
+++ b/resources/lang/pt-PT/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Atualizar acessório',
     'use_default_eula'					=> 'Em vez disso, utilize o <a href="#" data-toggle="modal" data-target="#eulaModal">EULA padrão</a>.',
     'use_default_eula_disabled'			=> '<del>Em vez disso, utilize o EULA padrão</del> Nenhum foi definido. Adicione um nas Configurações.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/pt-PT/admin/accessories/message.php b/resources/lang/pt-PT/admin/accessories/message.php
index 167415df00..0a6df33b9d 100644
--- a/resources/lang/pt-PT/admin/accessories/message.php
+++ b/resources/lang/pt-PT/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'O acessório não foi alocado. Por favor, tente novamente',
         'success' 		=> 'Acessório alocado com sucesso.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.'
     ),
 
diff --git a/resources/lang/pt-PT/admin/asset_maintenances/form.php b/resources/lang/pt-PT/admin/asset_maintenances/form.php
index 19e691dbbf..7da865afa3 100644
--- a/resources/lang/pt-PT/admin/asset_maintenances/form.php
+++ b/resources/lang/pt-PT/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tipo de Manutenção de Artigo',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Título',
-        'start_date'             => 'Data de início',
-        'completion_date'        => 'Data de término',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Custo',
         'is_warranty'            => 'Atualização da garantia',
-        'asset_maintenance_time' => 'Tempo da Manutenção do Artigo (em dias)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notas',
-        'update'                 => 'Atualizar Manutenção do Artigo',
-        'create'                 => 'Criar Manutenção do Artigo'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/pt-PT/admin/categories/message.php b/resources/lang/pt-PT/admin/categories/message.php
index 5614d2df3b..b5f919a9fa 100644
--- a/resources/lang/pt-PT/admin/categories/message.php
+++ b/resources/lang/pt-PT/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'A categoria não foi actualizada, por favor tenta novamente',
-        'success' => 'A categoria foi actualizada com sucesso.'
+        'success' => 'A categoria foi actualizada com sucesso.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/pt-PT/admin/components/general.php b/resources/lang/pt-PT/admin/components/general.php
index 36bfa98ada..f1dabc8594 100644
--- a/resources/lang/pt-PT/admin/components/general.php
+++ b/resources/lang/pt-PT/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Restantes',
     'total' 			                 => 'Total',
     'update'                            => 'Atualizar componente',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/pt-PT/admin/components/message.php b/resources/lang/pt-PT/admin/components/message.php
index 78234eda7b..26e2074d28 100644
--- a/resources/lang/pt-PT/admin/components/message.php
+++ b/resources/lang/pt-PT/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'O componente não foi atribuido, por favor tente de novo',
         'success' 		=> 'Componente atribuido com sucesso.',
-        'user_does_not_exist' => 'O utilizador é invalido. Por favor tente de novo.'
+        'user_does_not_exist' => 'O utilizador é invalido. Por favor tente de novo.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pt-PT/admin/consumables/message.php b/resources/lang/pt-PT/admin/consumables/message.php
index a3d14b4e3b..b5dc06a234 100644
--- a/resources/lang/pt-PT/admin/consumables/message.php
+++ b/resources/lang/pt-PT/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'O consumível não foi alocado. Por favor, tente novamente',
         'success' 		=> 'Consumível alocado com sucesso.',
-        'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.'
+        'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pt-PT/admin/custom_fields/general.php b/resources/lang/pt-PT/admin/custom_fields/general.php
index b5ea1f568e..896a6aac7e 100644
--- a/resources/lang/pt-PT/admin/custom_fields/general.php
+++ b/resources/lang/pt-PT/admin/custom_fields/general.php
@@ -28,6 +28,9 @@ return [
     'used_by_models'   		    => 'Usado por modelos',
     'order'   		            => 'Ordem',
     'create_fieldset'         => 'Novo conjunto de campos',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Criar um novo conjunto de campos',
     'create_field'            => 'Novo conjunto de campos personalizado',
     'create_field_title' => 'Criar um novo campo personalizado',
@@ -47,4 +50,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/pt-PT/admin/groups/message.php b/resources/lang/pt-PT/admin/groups/message.php
index 06544fe87e..b991189a20 100644
--- a/resources/lang/pt-PT/admin/groups/message.php
+++ b/resources/lang/pt-PT/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'O grupo já existe!',
-    'group_not_found'     => 'O Grupo [:id] não existe.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'O atributo nome é obrigatório',
 
     'success' => array(
diff --git a/resources/lang/pt-PT/admin/hardware/form.php b/resources/lang/pt-PT/admin/hardware/form.php
index 9fb5aefc73..e768feae47 100644
--- a/resources/lang/pt-PT/admin/hardware/form.php
+++ b/resources/lang/pt-PT/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirmar Apagar artigos seleccionados',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Reveja os ativos para apagar abaixo. Depois de apagados, estes ativos podem ser restaurados, mas não estarão associados aos utilizadores.',
+  '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'	=> 'Vai apagar :asset_count ativos.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Atualização de ativos em massa',
     'bulk_update_help'	=> 'Este formulário permite a atualização em massa de ativos. Preencha apenas os atributos que precisam de alteração. Qualquer atributo deixado em branco permanecerá inalterado. ',
     'bulk_update_warn'	=> 'Está prestes a editar as propriedades de um único ativo.|Está prestes a editar as propriedades de :asset_count ativos.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Atualizar apenas a localização por defeito',
     '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' => 'A processar...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Informação opcional',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php
index 8059333449..ae335efb6f 100644
--- a/resources/lang/pt-PT/admin/hardware/general.php
+++ b/resources/lang/pt-PT/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Este ativo foi excluído.',
     'edit'  					=> 'Editar artigo',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Solicitavel',
     'requested'				    => 'Requisitado',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restaurar ativo',
     'pending'  					=> 'Pendente',
     'undeployable'  			=> 'Não implementável',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Ver Artigo',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Exportação Personalizada'
+    'custom_export' => 'Exportação Personalizada',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/pt-PT/admin/hardware/message.php b/resources/lang/pt-PT/admin/hardware/message.php
index 521d784562..6dd828e2b6 100644
--- a/resources/lang/pt-PT/admin/hardware/message.php
+++ b/resources/lang/pt-PT/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'O Artigo não foi restaurado, por favor tente novamente',
         'success' 		=> 'Artigo restaurado com sucesso.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'O seu ficheiro foi importado',
         'file_delete_success'   => 'Ficheiro eliminado com sucesso',
         'file_delete_error'      => 'Não foi possível eliminar o ficheiro',
+        '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',
     ],
 
 
diff --git a/resources/lang/pt-PT/admin/hardware/table.php b/resources/lang/pt-PT/admin/hardware/table.php
index 46b4dbde36..a28b947abd 100644
--- a/resources/lang/pt-PT/admin/hardware/table.php
+++ b/resources/lang/pt-PT/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Entrada/Saída',
     'checkout_date' => 'Data de alocação',
     'checkoutto' 	=> 'Alocado a',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Valor Atual',
     'diff' 			=> 'Diferença',
     'dl_csv' 		=> 'Descarregar CSV',
diff --git a/resources/lang/pt-PT/admin/licenses/general.php b/resources/lang/pt-PT/admin/licenses/general.php
index b4b78a9324..e902d0bb57 100644
--- a/resources/lang/pt-PT/admin/licenses/general.php
+++ b/resources/lang/pt-PT/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Sobre as Licenças',
-    'about_licenses'                  => 'As licenças são usadas para controlar o software.  Eles têm um número especificado de lugares disponíveis para atribuir',
+    'about_licenses_title'      => 'Sobre as Licenças',
+    'about_licenses'            => 'As licenças são usadas para controlar o software.  Eles têm um número especificado de lugares disponíveis para atribuir',
     'checkin'  					=> 'Devolver instalação da Licença',
     'checkout_history'  		=> 'Alocar histórico',
     'checkout'  				=> 'Alocar instalação da Licença',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licenças de Software',
     'user'  					=> 'Utilizador',
     'view'  					=> 'Ver Licença',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/pt-PT/admin/manufacturers/message.php b/resources/lang/pt-PT/admin/manufacturers/message.php
index 745b8d2cd9..01496b1d47 100644
--- a/resources/lang/pt-PT/admin/manufacturers/message.php
+++ b/resources/lang/pt-PT/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'O fabricante não existe.',
     'assoc_users'	 => 'O fabricante está atualmente associado com pelo menos um modelo e não pode ser removido. Atualize os modelos para que não referenciem mais este fabricante e tente novamente. ',
 
diff --git a/resources/lang/pt-PT/admin/manufacturers/table.php b/resources/lang/pt-PT/admin/manufacturers/table.php
index 5a8637ea60..0f74cd5f89 100644
--- a/resources/lang/pt-PT/admin/manufacturers/table.php
+++ b/resources/lang/pt-PT/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email de suporte',
     'support_phone'   		=> 'Telefone de suporte',
     'support_url'   		=> 'URL de suporte',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Atualizar Fabricante',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/pt-PT/admin/models/general.php b/resources/lang/pt-PT/admin/models/general.php
index 77a48476bc..8872fc19e8 100644
--- a/resources/lang/pt-PT/admin/models/general.php
+++ b/resources/lang/pt-PT/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     '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'          => 'Esta prestes a eliminar :model_count modelos de artigos.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Restaurar Modelo',
     'requestable'               => 'Este modelo pode ser requisitado pelos utilizadores',
 	'show_mac_address'			      => 'Mostrar endereço MAC dos artigos neste modelo',
diff --git a/resources/lang/pt-PT/admin/models/message.php b/resources/lang/pt-PT/admin/models/message.php
index b06c6dfbb5..aa5da45e39 100644
--- a/resources/lang/pt-PT/admin/models/message.php
+++ b/resources/lang/pt-PT/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'O Modelo não existe.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'O Modelo não foi atualizado. Por favor tente novamente',
-        'success' => 'Modelo atualizado com sucesso.'
+        'success' => 'Modelo atualizado com sucesso.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nenhum campo foi alterado, portanto, nada foi atualizado.',
-        'success' 		=> 'Modelos atualizados.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nenhum modelo selecionado, por isso nenhum modelo foi eliminado.',
-        'success' 		    => ':sucess_count modelo(s) eliminados!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':sucess_count modelo(s) eliminados, no entanto :fail_count não foram eliminados, porque ainda têm artigos associados.'
     ),
 
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index 619a65fb7f..b3a4f2a054 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Isto é um servidor do Active Directoriy',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Enviar alertas para',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Alertas ativos',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Definições de Código de Barras',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Configurações 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Introduza um utilizador e palavra-passe da LDAP válido pertencente ao DN que especificou acima +ara testar se a sua autenticação da LDAP foi configurada corretamente, PRIMEIRO DEVE GRAVAR AS SUAS DEFINIÇÕES ATUALIZADAS DA LDAP.',
     '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'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Mostrar imagens em e-mails',
     'show_images_in_email_help'   => 'Desmarque esta caixa se a sua instalação do Snipe-IT estiver a correr através de uma VPN ou rede fechada e utilizadores fora da rede não conseguirem carregar as imagens desta instalação nos seus e-mails.',
     'site_name'                 => 'Nome do site',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Botname Slack',
-    'slack_channel'             => 'Canal Slack',
-    'slack_endpoint'            => 'Endpoint Slack',
-    'slack_integration'         => 'Definições Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Uma vez gravadas as suas informações do Slack, aparecerá um botão de teste.',
-    'slack_test_help'           => 'Teste se sua integração do Slack está configurada corretamente. DEVE PRIMEIRO GRAVAR AS SUAS CONFIGURAÇÕES ACTUALIZADAS.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/pt-PT/admin/settings/message.php b/resources/lang/pt-PT/admin/settings/message.php
index bc80846490..0e9546b6b1 100644
--- a/resources/lang/pt-PT/admin/settings/message.php
+++ b/resources/lang/pt-PT/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/pt-PT/admin/users/general.php b/resources/lang/pt-PT/admin/users/general.php
index b969fbd3e6..2e6461272c 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'    => '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',
     'software_user'     => 'Software alocado a :name',
     'send_email_help'   => 'Você deve fornecer um endereço de e-mail para este usuário para enviar-lhe credenciais. Credenciais via e-mail só podem ser feitas na criação do usuário. As senhas são armazenadas em hash e não podem ser recuperadas depois de salvas.',
     'view_user'         => 'Ver Utilizador :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/pt-PT/admin/users/message.php b/resources/lang/pt-PT/admin/users/message.php
index 7275a10759..566447be1f 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'            => 'Utilizador [:id] não existe.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'O atributo login é obrigatório',
     'user_password_required'    => 'A password é obrigatória.',
     'insufficient_permissions'  => 'Permissões insuficientes.',
diff --git a/resources/lang/pt-PT/auth/general.php b/resources/lang/pt-PT/auth/general.php
index 5c83e23f85..ec18255f9b 100644
--- a/resources/lang/pt-PT/auth/general.php
+++ b/resources/lang/pt-PT/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Lembrar-me',
     'username_help_top'                 => 'Introduza o seu <strong>nome de usuário</strong> para que lhe seja enviado um email com link de redifinição de senha.',
     'username_help_bottom'          => 'O seu nome de usuário e o seu endereço de email <em>podem</em> podem ser os mesmos, mas também podem não ser os mesmos, dependendo da sua configuração. Se não se recorda do seu nome de usuário, entre em contacto com o seu administrador. <br><br><strong>Nomes de usuário sem um endereço de email associado não receberão um link de redefinição de senha por email. </strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index a97842f5c5..6138d0ef03 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Acessórios',
     'activated'			    => 'Activado',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Acessório',
     'accessory_report'		=> 'Relatório de Acessório',
     'action'                => 'Ação',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Auditoria',
     'audit_report'			=> 'Registro de auditoria',
     'assets'				=> 'Artigos',
+    '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'         => 'Remover Avatar',
     'avatar_upload'         => 'Carregar Avatar',
     'back'      			=> 'Voltar',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Editar em massa',
     'bulk_delete'           => 'Eliminar em massa',
     'bulk_actions'          => 'Ações em massa',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'por Estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorias',
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Removidos',
     'delete_seats'  		=> 'Utilizadores apagados',
     'deletion_failed'       => 'Falha ao Eliminar',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Os tipos de ficheiros aceites são jpg, webp, png, gif e svg. O tamanho máximo permitido para envio é de :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'         	    => 'Importar',
     'importing'         	=> 'A importar',
     'importing_help'        => 'Você pode importar ativoss, acessórios, licenças, componentes, consumíveis e utilizadores via ficheiro CSV. <br><br>O CSV deve ser delimitado por vírgula e formatado com cabeçalhos que correspondem aos dos <a href="https://snipe-it.readme.io/docs/importing" target="_new">CSVs de exemplo na documentação</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Manutenções de Artigos',
     'item'  				=> 'Item',
     'item_name'             => 'Nome do Item',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Permissões insuficientes!',
     'kits'       			=> 'Kits padrão',
     'language'				=> 'Idioma',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Artigos solicitados',
     'request_canceled'      => 'Pedido cancelado',
     'save'  				=> 'Guardar',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Selecione',
     'select_all'            => 'Selecionar Tudo',
     'search'				=> 'Pesquisar',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Assinatura',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'Uma mensagem de slack será enviada',
-    'slack_test_msg'        => 'Parece que a integração Slack com o Snipe-IT está a funcionar!',
+    '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' => 'MODO DE DEMONSTRAÇÃO: Algumas funcionalidades estão desativadas para esta instalação.',
     'site_name'				=> 'Nome do site',
     'state'  				=> 'Distrito',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Tem certeza de que deseja excluir',
     'submit'				=> 'Submeter',
     'target'                => 'Destino',
-    'toggle_navigation'     => 'Activar/Desactivar Navegação',
     'time_and_date_display' => 'Exibição de hora e data',
     'total_assets'			=> 'artigos',
     'total_licenses'		=> 'licenças',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/pt-PT/help.php b/resources/lang/pt-PT/help.php
index 1e4c861266..6d5d39bde5 100644
--- a/resources/lang/pt-PT/help.php
+++ b/resources/lang/pt-PT/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mais Informações',
 
-    '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/pt-PT/localizations.php b/resources/lang/pt-PT/localizations.php
index e2d88a1ac2..97ccd42940 100644
--- a/resources/lang/pt-PT/localizations.php
+++ b/resources/lang/pt-PT/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/pt-PT/mail.php b/resources/lang/pt-PT/mail.php
index 8440e4895d..53659093d8 100644
--- a/resources/lang/pt-PT/mail.php
+++ b/resources/lang/pt-PT/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Faça login na sua instalação do Snipe-IT usando os dados abaixo:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Relatório de baixas de inventario',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Qt. Min.',
     'name' => 'Nome',
     'new_item_checked' => 'Um novo item foi atribuído a ti, os detalhes estão abaixo.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Suas credenciais do Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'Ver seus ativos',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php
index a3358e8d49..a3c7e756f9 100644
--- a/resources/lang/pt-PT/validation.php
+++ b/resources/lang/pt-PT/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'O atributo deve ter pelo menos: itens mínimos.',
     ],
     'starts_with'          => 'O :attribute deve começar com um dos seguintes: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'O :attribute selecionado é inválido.',
     'numeric'              => ':attribute tem que ser um número.',
     'present'              => 'O campo: atributo deve estar presente.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ro/admin/accessories/general.php b/resources/lang/ro/admin/accessories/general.php
index f7a7d204e3..a1e7ab03a4 100644
--- a/resources/lang/ro/admin/accessories/general.php
+++ b/resources/lang/ro/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Actualizare Accesoriu',
     'use_default_eula'					=> 'Foloseste <a href="#" data-toggle="modal" data-target="#eulaModal">EULA general implicita</a> in loc.',
     'use_default_eula_disabled'			=> '<del>Foloseste EULA general implicita.</del> EULA implicita nu a fost gasita. A se crea una in Setari.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ro/admin/accessories/message.php b/resources/lang/ro/admin/accessories/message.php
index 5a668f03e5..ec7b6e48f3 100644
--- a/resources/lang/ro/admin/accessories/message.php
+++ b/resources/lang/ro/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Accesoriu nu a fost predat, vă rugăm să încercaţi din nou',
         'success' 		=> 'Accesoriu a fost predat.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.'
     ),
 
diff --git a/resources/lang/ro/admin/asset_maintenances/form.php b/resources/lang/ro/admin/asset_maintenances/form.php
index 030ce99572..9871af7a50 100644
--- a/resources/lang/ro/admin/asset_maintenances/form.php
+++ b/resources/lang/ro/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tip de întreținere',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titlu',
-        'start_date'             => 'A început',
-        'completion_date'        => 'terminat',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'A costat',
         'is_warranty'            => 'Îmbunătățirea garanției',
-        'asset_maintenance_time' => 'zi',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'notițe',
-        'update'                 => 'Actualizați',
-        'create'                 => 'Crea'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ro/admin/categories/message.php b/resources/lang/ro/admin/categories/message.php
index b97c82deae..4eb40f5fe8 100644
--- a/resources/lang/ro/admin/categories/message.php
+++ b/resources/lang/ro/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Categoria nu a fost actualizata, va rugam incercati iar',
-        'success' => 'Categoria a fost actualizata.'
+        'success' => 'Categoria a fost actualizata.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ro/admin/components/general.php b/resources/lang/ro/admin/components/general.php
index b3e052bf55..b34c42eadb 100644
--- a/resources/lang/ro/admin/components/general.php
+++ b/resources/lang/ro/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Rămas',
     'total' 			                 => 'Total',
     'update'                            => 'Actualizați componenta',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/ro/admin/components/message.php b/resources/lang/ro/admin/components/message.php
index 053b9cb7d9..81abe6ad3c 100644
--- a/resources/lang/ro/admin/components/message.php
+++ b/resources/lang/ro/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Componenta nu a fost verificată, încercați din nou',
         'success' 		=> 'Componenta verificată cu succes.',
-        'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.'
+        'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ro/admin/consumables/message.php b/resources/lang/ro/admin/consumables/message.php
index e59dcf5d49..dc84d55752 100644
--- a/resources/lang/ro/admin/consumables/message.php
+++ b/resources/lang/ro/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Consumul nu a fost verificat, încercați din nou',
         'success' 		=> 'Consumul a fost verificat cu succes.',
-        'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.'
+        'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ro/admin/custom_fields/general.php b/resources/lang/ro/admin/custom_fields/general.php
index 492a5b37dc..3a211e85c2 100644
--- a/resources/lang/ro/admin/custom_fields/general.php
+++ b/resources/lang/ro/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Folosit de modele',
     'order'   		            => 'Ordin',
     'create_fieldset'         => 'Setul de câmpuri noi',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Creați un nou set de câmpuri',
     'create_field'            => 'Noul câmp personalizat',
     'create_field_title' => 'Creați un nou câmp personalizat',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ro/admin/groups/message.php b/resources/lang/ro/admin/groups/message.php
index 6b51d16c88..1d26701601 100644
--- a/resources/lang/ro/admin/groups/message.php
+++ b/resources/lang/ro/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grupul exista deja!',
-    'group_not_found'     => 'Grupul [:id] nu exista.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Campul "Nume" este obligatoriu',
 
     'success' => array(
diff --git a/resources/lang/ro/admin/hardware/form.php b/resources/lang/ro/admin/hardware/form.php
index e8e03823f7..e709de213c 100644
--- a/resources/lang/ro/admin/hardware/form.php
+++ b/resources/lang/ro/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirmarea activelor șterse în bloc',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Consultați mai jos activele pentru ștergerea în bloc. Odată șterse, aceste active pot fi restaurate, dar nu vor mai fi asociate cu utilizatorii cărora li se alocă în prezent.',
+  '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'	=> 'Sunteți pe cale să ștergeți: active_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Actualizarea activelor în bloc',
     'bulk_update_help'	=> 'Acest formular vă permite să actualizați simultan mai multe elemente. Completați câmpurile pe care trebuie să le schimbați. Toate câmpurile rămase necompletate vor rămâne neschimbate.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Actualizați doar locația implicită',
     'asset_not_deployable' => 'Activul este indisponibil și nu poate fi eliberat.',
     'asset_deployable' => 'Activul e disponibil și poate fi eliberat.',
-    'processing_spinner' => 'În curs de procesare...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ro/admin/hardware/general.php b/resources/lang/ro/admin/hardware/general.php
index b4869865da..f02acfd2a0 100644
--- a/resources/lang/ro/admin/hardware/general.php
+++ b/resources/lang/ro/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Acest activ a fost șters.',
     'edit'  					=> 'Editeaza activ',
     'model_deleted'  			=> 'Acest model de active a fost șters. Trebuie să restaurați modelul înainte de a putea restaura activul.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Solicitat',
     'not_requestable'           => 'Nu poate fi solicitat',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restabilirea activului',
     'pending'  					=> 'In asteptare',
     'undeployable'  			=> 'Nelansabil',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Vizualizeaza activ',
     'csv_error' => 'Aveți o eroare în fișierul dvs. CSV:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Mesaje de eroare:',
     'success_messages' => 'Mesaje de succes:',
     'alert_details' => 'Vezi mai jos pentru detalii.',
-    'custom_export' => 'Export date personalizat'
+    'custom_export' => 'Export date personalizat',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ro/admin/hardware/message.php b/resources/lang/ro/admin/hardware/message.php
index 65d7984d15..0a504994a2 100644
--- a/resources/lang/ro/admin/hardware/message.php
+++ b/resources/lang/ro/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Asset nu a fost restaurat, încercați din nou',
         'success' 		=> 'Activul a fost restaurat cu succes.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/ro/admin/hardware/table.php b/resources/lang/ro/admin/hardware/table.php
index 8989ba9ac4..4742921e05 100644
--- a/resources/lang/ro/admin/hardware/table.php
+++ b/resources/lang/ro/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Predat/Primit',
     'checkout_date' => 'Data predare',
     'checkoutto' 	=> 'Predat',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Valoarea Curentă',
     'diff' 			=> 'Diferenta',
     'dl_csv' 		=> 'Descarca CSV',
diff --git a/resources/lang/ro/admin/licenses/general.php b/resources/lang/ro/admin/licenses/general.php
index 61bc9da381..3fe553423e 100644
--- a/resources/lang/ro/admin/licenses/general.php
+++ b/resources/lang/ro/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Despre Licențe',
-    'about_licenses'                  => 'Licențele sunt utilizate pentru a urmări software-ul. Ei au un număr specific de locuri care pot fi verificate pentru persoane fizice',
+    'about_licenses_title'      => 'Despre Licențe',
+    'about_licenses'            => 'Licențele sunt utilizate pentru a urmări software-ul. Ei au un număr specific de locuri care pot fi verificate pentru persoane fizice',
     'checkin'  					=> 'Primire locuri licenta',
     'checkout_history'  		=> 'Istoric predari',
     'checkout'  				=> 'Locuri licente predate',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licente software',
     'user'  					=> 'Utilizator',
     'view'  					=> 'Vizualizeaza licenta',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ro/admin/manufacturers/message.php b/resources/lang/ro/admin/manufacturers/message.php
index 138fba4cd8..d7a8728982 100644
--- a/resources/lang/ro/admin/manufacturers/message.php
+++ b/resources/lang/ro/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Producatorul nu exista.',
     'assoc_users'	 => 'Acest producator este momentan asociat cu cel putin inca un model si nu poate fi sters. Va rugam actualizati modelele care nu mai au legatura cu acest producator si incercati iar. ',
 
diff --git a/resources/lang/ro/admin/manufacturers/table.php b/resources/lang/ro/admin/manufacturers/table.php
index 431811b52c..4d5c4310e3 100644
--- a/resources/lang/ro/admin/manufacturers/table.php
+++ b/resources/lang/ro/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email de suport',
     'support_phone'   		=> 'Telefon suport',
     'support_url'   		=> 'URL de asistență',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Actualizeaza producator',
     'url'   				=> 'URL-',
 
diff --git a/resources/lang/ro/admin/models/general.php b/resources/lang/ro/admin/models/general.php
index e8a0ffd4b2..27137acc97 100644
--- a/resources/lang/ro/admin/models/general.php
+++ b/resources/lang/ro/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 modelul de echipament: model_count.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Restaurare model',
     'requestable'               => 'Utilizatorii pot solicita acest model',
 	'show_mac_address'			      => 'Arata campul Adresa MAC in acest model',
diff --git a/resources/lang/ro/admin/models/message.php b/resources/lang/ro/admin/models/message.php
index f83005db44..8f54d2717c 100644
--- a/resources/lang/ro/admin/models/message.php
+++ b/resources/lang/ro/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modelul nu exista.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a 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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modelul nu a fost actualizat, va rugam incercati iar',
-        'success' => 'Modelul a fost actualizat.'
+        'success' => 'Modelul a fost actualizat.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Nu au fost modificate câmpuri, deci nimic nu a fost actualizat.',
-        'success' 		=> 'Modelele au fost actualizate.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nu au fost selectate câmpuri, deci nimic nu a fost actualizat.',
-        'success' 		    => 'Au fost șterse :success_count model(e)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> 'Au fost șterse :success_count modele, cu toate acestea :fail_count nu au putut fi șterse deoarece au în continuare active asociate cu acestea.'
     ),
 
diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php
index 2acf6ae7a8..a38edc13a7 100644
--- a/resources/lang/ro/admin/settings/general.php
+++ b/resources/lang/ro/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Acesta este un server Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Trimite alerte catre',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Alerte activată',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Setări cod de bare',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Setări 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Introduceți un nume de utilizator LDAP și o parolă valabilă din DN-ul de bază pe care l-ați specificat mai sus pentru a testa dacă datele de conectare LDAP sunt configurate corect. TREBUIE SĂ SAȚI PRIMUL SETĂRI LDAP ACTUALIZATE.',
     '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'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Afișați imaginile în e-mailuri',
     'show_images_in_email_help'   => 'Debifați această casetă dacă instalarea dvs. Snipe-IT se află în spatele unei rețele VPN sau închisă, iar utilizatorii din afara rețelei nu vor putea încărca imagini din această instalare în e-mailurile lor.',
     'site_name'                 => 'Nume site',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Odată ce ați salvat informațiile Slack, va apărea un buton de testare.',
-    'slack_test_help'           => 'Verificați dacă integrarea Slack este configurată corect. TREBUIE SĂ SALVAȚI SETĂRILE DUMNEAVOASTRĂ DE SLACK MAI ÎNTÂI.',
+    'general_webhook'           => 'General Webhook',
+    '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 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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ro/admin/settings/message.php b/resources/lang/ro/admin/settings/message.php
index a039bd2615..1143275dc1 100644
--- a/resources/lang/ro/admin/settings/message.php
+++ b/resources/lang/ro/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ro/admin/users/general.php b/resources/lang/ro/admin/users/general.php
index e1e7e8d61a..7f1a605691 100644
--- a/resources/lang/ro/admin/users/general.php
+++ b/resources/lang/ro/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.',
+    '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 predat catre :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'         => 'Vezi utilizator :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ro/admin/users/message.php b/resources/lang/ro/admin/users/message.php
index dfd973ea8a..8a5d01d04d 100644
--- a/resources/lang/ro/admin/users/message.php
+++ b/resources/lang/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 [:id] nu exista.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Campul de login este necesar',
     'user_password_required'    => 'Este necesara parola.',
     'insufficient_permissions'  => 'Nu aveti permisiuni suficiente.',
diff --git a/resources/lang/ro/auth/general.php b/resources/lang/ro/auth/general.php
index 3a0f89a9fe..f5c9ab08b4 100644
--- a/resources/lang/ro/auth/general.php
+++ b/resources/lang/ro/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Amintește-ți de mine',
     'username_help_top'                 => 'Introdu <strong>numele tău de utilizator</strong> pentru a primi un e-mail cu link-ul de resetare a parolei.',
     'username_help_bottom'          => 'Numele de utilizator și adresa de e-mail <em>pot</em> pot sau nu să coincidă, în funcție de configurația dumneavoastră. Dacă nu vă amintiți numele de utilizator, contactați administratorul. <br><br><strong>Utilizatorilor fără o adresă de e-mail asociată nu li se va trimite prin e-mail link-ul de resetare a parolei.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php
index 59cd7edcc2..1e27c27674 100644
--- a/resources/lang/ro/general.php
+++ b/resources/lang/ro/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accesorii',
     'activated'			    => 'activat',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accesorii',
     'accessory_report'		=> 'Raportul accesoriu',
     'action'                => 'Acțiune',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     'audit_report'			=> 'Jurnal de audit',
     'assets'				=> 'Active',
+    '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'         => 'Sterge avatar',
     'avatar_upload'         => 'Upload Avatar',
     'back'      			=> 'Inapoi',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Anuleaza',
     'categories'			=> 'Categorii',
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Sters',
     'delete_seats'  		=> 'Locurile șterse',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Întreținerea activelor',
     'item'  				=> 'Articol',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nu aveti permisiuni suficiente!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Limba',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Cerere anulată',
     'save'  				=> 'Salveaza',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Selectați',
     'select_all'            => 'Select All',
     'search'				=> 'Căutare',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Semnătură',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => 'Modul DEMO: Unele caracteristici sunt dezactivate pentru această instalare.',
     'site_name'				=> 'Nume site',
     'state'  				=> 'Judet',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Sigur doriți să ștergeți',
     'submit'				=> 'A depune',
     'target'                => 'Ţintă',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Afișarea orei și a datei',
     'total_assets'			=> 'Total active',
     'total_licenses'		=> 'Total licente',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ro/help.php b/resources/lang/ro/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ro/help.php
+++ b/resources/lang/ro/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ro/localizations.php b/resources/lang/ro/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ro/localizations.php
+++ b/resources/lang/ro/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ro/mail.php b/resources/lang/ro/mail.php
index fdd9eb3436..f9b9c288ce 100644
--- a/resources/lang/ro/mail.php
+++ b/resources/lang/ro/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Conectați-vă la noua dvs. instalare Snipe-IT utilizând următoarele acreditări:',
     'login' => 'Logare:',
     'Low_Inventory_Report' => 'Raport privind inventarul redus',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Cantitate min',
     'name' => 'Nume',
     'new_item_checked' => 'Un element nou a fost verificat sub numele dvs., detaliile sunt de mai jos.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Informațiile dvs. Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ro/validation.php b/resources/lang/ro/validation.php
index e6e1e38c18..393750fde9 100644
--- a/resources/lang/ro/validation.php
+++ b/resources/lang/ro/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atributul:: trebuie să aibă cel puțin: min.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => ':attribute selectat nu e valid.',
     'numeric'              => ':attribute trebuie sa fie un numar.',
     'present'              => 'Câmpul atributului trebuie să fie prezent.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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ă',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ru/account/general.php b/resources/lang/ru/account/general.php
index 7fc060a849..3b380267e5 100644
--- a/resources/lang/ru/account/general.php
+++ b/resources/lang/ru/account/general.php
@@ -1,12 +1,12 @@
 <?php
 
 return array(
-    'personal_api_keys' => 'Personal API Keys',
+    '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.',
     '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_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.',
 );
diff --git a/resources/lang/ru/admin/accessories/general.php b/resources/lang/ru/admin/accessories/general.php
index 347214ee41..a30c422ab9 100644
--- a/resources/lang/ru/admin/accessories/general.php
+++ b/resources/lang/ru/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Обновить аксессуар',
     'use_default_eula'					=> 'Использовать <a href="#" data-toggle="modal" data-target="#eulaModal">главное пользовательское соглашение по умолчанию</a>.',
     'use_default_eula_disabled'			=> '<del>Использовать основное пользовательское соглашение.</del> Не задано основное пользовательское соглашение. Добавьте его в Настройках.',
+    'clone'                             => 'Клонировать аксессуар',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ru/admin/accessories/message.php b/resources/lang/ru/admin/accessories/message.php
index 4304b2b643..6364c88e8b 100644
--- a/resources/lang/ru/admin/accessories/message.php
+++ b/resources/lang/ru/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ошибка при выдаче аксессуара. Повторите попытку',
         'success' 		=> 'Аксессуар успешно выдан.',
+        'unavailable'   => 'Нет доступных аксессуаров для выдачи. Проверьте их количество',
         'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.'
     ),
 
diff --git a/resources/lang/ru/admin/asset_maintenances/form.php b/resources/lang/ru/admin/asset_maintenances/form.php
index b37f484f5c..17eef0c484 100644
--- a/resources/lang/ru/admin/asset_maintenances/form.php
+++ b/resources/lang/ru/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Состояние обслуживания',
+        'asset_maintenance_type' => 'Вид обслуживания актива',
         'title'                  => 'Заголовок',
         'start_date'             => 'Дата начала',
-        'completion_date'        => 'Дата окончания',
+        'completion_date'        => 'Дата завершения',
         'cost'                   => 'Стоймость',
         'is_warranty'            => 'Расширенная гарантия',
         'asset_maintenance_time' => 'Время обслуживания (в днях)',
         'notes'                  => 'Примечания',
-        'update'                 => 'Обновить статус',
-        'create'                 => 'Создать'
+        'update'                 => 'Обновить статус обслуживания актива',
+        'create'                 => 'Отправить актив на обслуживание'
     ];
diff --git a/resources/lang/ru/admin/asset_maintenances/general.php b/resources/lang/ru/admin/asset_maintenances/general.php
index fe487b1f43..a68eb0c1db 100644
--- a/resources/lang/ru/admin/asset_maintenances/general.php
+++ b/resources/lang/ru/admin/asset_maintenances/general.php
@@ -11,6 +11,6 @@
         'calibration'        => 'Калибровка',
         'software_support'   => 'Программная поддержка',
         'hardware_support'   => 'Аппаратная поддержка',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'configuration_change'   => 'Изменение конфигурации',
+        'pat_test'           => 'Тест ЭБ',
     ];
diff --git a/resources/lang/ru/admin/categories/message.php b/resources/lang/ru/admin/categories/message.php
index ba3d5a3fbf..94c5ed6c9f 100644
--- a/resources/lang/ru/admin/categories/message.php
+++ b/resources/lang/ru/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Категория не изменена, пожалуйста попробуйте снова',
-        'success' => 'Категория успешно изменена.'
+        'success' => 'Категория успешно изменена.',
+        'cannot_change_category_type'   => 'Вы не можете изменить тип категории после ее создания',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ru/admin/components/general.php b/resources/lang/ru/admin/components/general.php
index b7aa9633d5..49836c234d 100644
--- a/resources/lang/ru/admin/components/general.php
+++ b/resources/lang/ru/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Остаток',
     'total' 			                 => 'Всего',
     'update'                            => 'Обновить компонент',
+    'checkin_limit'            => 'Количество должно быть меньше или равно :assigned_qty'
 );
diff --git a/resources/lang/ru/admin/components/message.php b/resources/lang/ru/admin/components/message.php
index 8f621e5912..e78d128d94 100644
--- a/resources/lang/ru/admin/components/message.php
+++ b/resources/lang/ru/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Не удалось отвязать компонент, пожалуйста попробуйте еще раз',
         'success' 		=> 'Связь с компонентом успешно удалена.',
-        'user_does_not_exist' => 'Неверный пользователь. Попробуйте еще раз.'
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте еще раз.',
+        'unavailable'      => 'Недостаточно компонентов: :remaining - осталось, :requested - запрошено',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ru/admin/consumables/message.php b/resources/lang/ru/admin/consumables/message.php
index 0780066dd0..b4dce77f68 100644
--- a/resources/lang/ru/admin/consumables/message.php
+++ b/resources/lang/ru/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Расходный материал не был выдан, попробуйте ещё раз',
         'success' 		=> 'Расходный материал успешно выдан.',
-        'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.'
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.',
+         'unavailable'      => 'Недостаточно расходных материалов для выдачи. Пожалуйста, проверьте их количество.',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ru/admin/custom_fields/general.php b/resources/lang/ru/admin/custom_fields/general.php
index 591589ad75..e8b23ffecf 100644
--- a/resources/lang/ru/admin/custom_fields/general.php
+++ b/resources/lang/ru/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Использован в моделях',
     'order'   		            => 'Порядок',
     'create_fieldset'         => 'Новый набор полей',
+    'update_fieldset'         => 'Обновить набор полей',
+    'fieldset_does_not_exist'   => 'Набор полей :id не существует',
+    'fieldset_updated'         => 'Набор полей обновлен',
     'create_fieldset_title' => 'Создайте новый набор полей',
     'create_field'            => 'Новое настраиваемое поле',
     'create_field_title' => 'Создайте новое настраиваемое поле',
@@ -41,9 +44,11 @@ return [
     'make_required' => 'Необязательное - нажмите чтобы сделать обязательным',
     'reorder' => 'Изменить порядок',
     '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>.',
+    'db_convert_warning' => 'ВНИМАНИЕ. Настраиваемое поле <code>:db_column</code>, должно быть <code>:expected</code>.',
     'is_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' => 'Разрешить владельцу актива просматривать эти значения на странице Просмотр Назначенных Активов',
+    'display_in_user_view_table' => 'Видимый для пользователя',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/ru/admin/departments/message.php b/resources/lang/ru/admin/departments/message.php
index c4ac88fb3a..d18b4ab153 100644
--- a/resources/lang/ru/admin/departments/message.php
+++ b/resources/lang/ru/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/ru/admin/groups/message.php b/resources/lang/ru/admin/groups/message.php
index 577238b092..bf3db79d81 100644
--- a/resources/lang/ru/admin/groups/message.php
+++ b/resources/lang/ru/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Группа уже существует!',
-    'group_not_found'     => 'Группа [:id] не существует.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Поле "Имя" является обязательным',
 
     'success' => array(
diff --git a/resources/lang/ru/admin/groups/titles.php b/resources/lang/ru/admin/groups/titles.php
index f8be7f8168..c0a12a8e85 100644
--- a/resources/lang/ru/admin/groups/titles.php
+++ b/resources/lang/ru/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> 'Администратор группы',
     'allow' 	 			=> 'Разрешить',
     'deny' 	 				=> 'Запретить',
-    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
+    'permission'            => 'Права доступа',
+    'grant'                 => 'Предоставить',
     'no_permissions'        => 'Эта группа не имеет прав доступа.'
 ];
diff --git a/resources/lang/ru/admin/hardware/form.php b/resources/lang/ru/admin/hardware/form.php
index 8fc554625b..42decf2bb5 100644
--- a/resources/lang/ru/admin/hardware/form.php
+++ b/resources/lang/ru/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Подвердите массовое удаление активов',
+    'bulk_restore'      => 'Подвердите массовое восстановление активов', 
   'bulk_delete_help'	=> 'Просмотрите активны, выбранные для удаления. После удаления активы могут быть восстановлены, но уже не будет привязаны к пользователям, к которым они привязаны сейчас.',
+  'bulk_restore_help'	=> 'Проверьте активы для массового восстановления. После восстановления эти активы не будут связаны с пользователями, с которыми они были ранее связаны.',
   'bulk_delete_warn'	=> 'Вы собираетесь удалить :asset_count активов.',
+  '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_warn'	=> 'Вы собираетесь отредактировать свойства одного ресурса.|Вы собираетесь отредактировать свойства :asset_count assets.',
     'checkedout_to'		=> 'Привязан к',
     'checkout_date'		=> 'Дата выдачи',
     'checkin_date'		=> 'Дата возврата',
@@ -43,9 +46,9 @@ return [
     'asset_location' => 'Обновить местоположение актива',
     'asset_location_update_default_current' => 'Обновить местоположение по умолчанию и фактическое местоположение',
     'asset_location_update_default' => 'Обновить только местоположение по умолчанию',
-    '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' => 'Обработка...',
+    'asset_not_deployable' => 'Этот статус актива не подлежит развертыванию. Этот актив не может быть проверен.',
+    'asset_deployable' => 'Этот статус доступен для развертывания. Этот актив может быть привязан.',
+    'processing_spinner' => 'Обработка... (Это может занять некоторое время на больших файлах)',
     'optional_infos'  => 'Дополнительная информация',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Информация, связанная с заказом'
 ];
diff --git a/resources/lang/ru/admin/hardware/general.php b/resources/lang/ru/admin/hardware/general.php
index 43ecaea855..56ac11e439 100644
--- a/resources/lang/ru/admin/hardware/general.php
+++ b/resources/lang/ru/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
     'archived'  				=> 'Архивированные',
     'asset'  					=> 'Актив',
     'bulk_checkout'             => 'Выдать актив пользователю',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkin'              => 'Проверка активов',
     'checkin'  					=> 'Вернуть актив на склад',
     'checkout'  				=> 'Выдать актив пользователю',
     'clone'  					=> 'Клонировать актив',
@@ -14,31 +14,34 @@ return [
     'deleted'  					=> 'Этот актив был удален.',
     'edit'  					=> 'Редактировать актив',
     '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.',
     'view'  					=> 'Показать актив',
-    'csv_error' => 'You have an error in your CSV file:',
+    '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 Admin &gt; General Settings.
-    </p>
+<p>
+    Загрузите файл CSV, содержащий историю активов. Ресурсы и пользователи ДОЛЖНЫ уже существовать в системе, иначе они будут пропущены. Сопоставление активов для импорта истории происходит по тегу активов. Мы попытаемся найти подходящего пользователя на основе предоставленного вами имени пользователя и критериев, которые вы выберете ниже. Если вы не выберете какие-либо критерии ниже, он просто попытается соответствовать формату имени пользователя, который вы настроили в общих настройках администратора.
+    < / 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>Поля, включенные в CSV, должны соответствовать заголовкам: <strong>Тег актива, Имя, Дата оформления заказа, дата регистрации</strong>. Любые дополнительные поля будут проигнорированы. < / p>
 
-    <p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format',
-    'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format',
-    'csv_import_match_first' => 'Try to match users by first name (jane) format',
-    'csv_import_match_email' => 'Try to match users by email as username',
+    <p>Дата проверки: пустые даты или даты проверки функций будут возвращать элементы связанному пользователю.  Исключение столбца CheckinDatecolumn создаст дату проверки с сегодняшней датой.</p>    ',
+    'csv_import_match_f-l' => 'Попробуйте сопоставить пользователей по формату имени.фамилии (Джейн.Смит)',
+    'csv_import_match_initial_last' => 'Попробуйте сопоставить пользователей по имени и фамилии в формате jsmith',
+    'csv_import_match_first' => 'Попробуйте сопоставить пользователей по формату имени (Джейн)',
+    'csv_import_match_email' => 'Попробуйте сопоставить пользователей по электронной почте в качестве имени пользователя',
     'csv_import_match_username' => 'Попытаться сопоставить пользователей по имени пользователя',
     'error_messages' => 'Сообщения об ошибках:',
-    'success_messages' => 'Success messages:',
+    'success_messages' => 'Сообщения об успехе:',
     'alert_details' => 'Подробности смотрите ниже.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Пользовательский экспорт',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ru/admin/hardware/message.php b/resources/lang/ru/admin/hardware/message.php
index 9305cd59c6..9e2ecd0436 100644
--- a/resources/lang/ru/admin/hardware/message.php
+++ b/resources/lang/ru/admin/hardware/message.php
@@ -5,7 +5,7 @@ return [
     'undeployable' 		=> '<strong>Внимание: </strong> Этот актив был помечен как выданный.
                         Если этот статус изменился, необходимо его обновить.',
     'does_not_exist' 	=> 'Актив не существует.',
-    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    'does_not_exist_or_not_requestable' => 'Этот актив не существует или не подлежит запросу.',
     'assoc_users'	 	=> 'Этот актив в настоящее время привязан к пользователю и не может быть удален. Пожалуйста сначала снимите привязку, и затем попробуйте удалить снова. ',
 
     'create' => [
@@ -17,12 +17,14 @@ return [
         'error'   			=> 'Актив не был изменен, пожалуйста попробуйте снова',
         'success' 			=> 'Актив успешно изменен.',
         'nothing_updated'	=>  'Поля не выбраны, нечего обновлять.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'Никакие ресурсы не были выбраны, поэтому ничего не обновлялось.',
     ],
 
     'restore' => [
         'error'   		=> 'Актив не был восстановлен, повторите попытку',
         'success' 		=> 'Актив успешно восстановлен.',
+        'bulk_success' 		=> 'Актив успешно восстановлен.',
+        'nothing_updated'   => 'Ни один из активов не выбран, поэтому ничего не восстановлено.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Ваш файл был импортирован',
         'file_delete_success'   => 'Ваш файл был успешно удален',
         'file_delete_error'      => 'Невозможно удалить файл',
+        'header_row_has_malformed_characters' => 'Один или несколько атрибутов в строке заголовка содержат неправильно сформированные символы UTF-8',
+        'content_row_has_malformed_characters' => 'Один или несколько атрибутов в первой строке содержимого содержат неправильно сформированные символы UTF-8',
     ],
 
 
diff --git a/resources/lang/ru/admin/hardware/table.php b/resources/lang/ru/admin/hardware/table.php
index 7fb5d77539..224aefe7be 100644
--- a/resources/lang/ru/admin/hardware/table.php
+++ b/resources/lang/ru/admin/hardware/table.php
@@ -4,11 +4,12 @@ return [
 
     'asset_tag'   	=> 'Тег',
     'asset_model'       => 'Модель',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Текущее значение',
     'change' 		=> 'Отвязан/Привязан',
     'checkout_date' => 'Дата привязки',
     'checkoutto' 	=> 'Привязан',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Total Components Cost',
+    'current_value' => 'Текущее значение',
     'diff' 			=> 'Разн',
     'dl_csv' 		=> 'Загрузить CSV',
     'eol' 			=> 'Истек',
@@ -22,9 +23,9 @@ return [
     'image'		    => 'Изображение устройства',
     'days_without_acceptance' => 'Дней без принятия',
     'monthly_depreciation' => 'Ежемесячная амортизация',
-    'assigned_to'    => 'Assigned To',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'assigned_to'    => 'Назначенный На',
+    'requesting_user' => 'Запрашивающий пользователь',
+    'requested_date' => 'Запрошенная дата',
+    'changed'       => 'Измененный',
+    'icon' => 'Значок',
 ];
diff --git a/resources/lang/ru/admin/kits/general.php b/resources/lang/ru/admin/kits/general.php
index 39e5b7c29b..6c30d94a89 100644
--- a/resources/lang/ru/admin/kits/general.php
+++ b/resources/lang/ru/admin/kits/general.php
@@ -36,15 +36,15 @@ return [
     'accessory_updated'                 => 'Accessory was successfully updated',
     'accessory_detached'                => 'Accessory was successfully detached',
     'accessory_error'                   => 'Accessory already attached to kit',
-    'accessory_deleted'                 => 'Delete was successful',
-    'accessory_none'                    => 'Accessory does not exist',
+    '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_none'                          => 'Комплекта не существует',
+    'kit_created'                       => 'Комплект успешно создан',
+    'kit_updated'                       => 'Комплект успешно изменен',
+    'kit_not_found'                     => 'Комплект не найден',
+    'kit_deleted'                       => 'Комплект успешно удален',
+    'kit_model_updated'                 => 'Модель успешно изменена',
     'kit_model_detached'                => 'Model was successfully detached',
 ];
diff --git a/resources/lang/ru/admin/licenses/general.php b/resources/lang/ru/admin/licenses/general.php
index 7b5f736bcc..ae0c79e3e6 100644
--- a/resources/lang/ru/admin/licenses/general.php
+++ b/resources/lang/ru/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'О лицензиях',
-    'about_licenses'                  => 'Лицензии используются для отслеживания программного обеспечения.  Как правило, количество пользователей, которые могут их использовать - ограничено',
+    'about_licenses_title'      => 'О лицензиях',
+    'about_licenses'            => 'Лицензии используются для отслеживания программного обеспечения.  Как правило, количество пользователей, которые могут их использовать - ограничено',
     'checkin'  					=> 'Отвязать лицензию',
     'checkout_history'  		=> 'История привязок',
     'checkout'  				=> 'Привязать лицензию',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Лицензии ПО',
     'user'  					=> 'Пользователь',
     'view'  					=> 'Показать лицензию',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ru/admin/licenses/message.php b/resources/lang/ru/admin/licenses/message.php
index 7e191bcb7a..2ebe2e60fe 100644
--- a/resources/lang/ru/admin/licenses/message.php
+++ b/resources/lang/ru/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Лицензии не существует или у вас нет разрешения на её просмотр.',
     'user_does_not_exist' => 'Пользователь не существует.',
     'asset_does_not_exist' 	=> 'Актив который вы пытаетесь ассоциировать с этой лицензией не существует.',
     'owner_doesnt_match_asset' => 'Владелец актива, который вы пытаетесь связать с этой лицензией, отличается от выбранного в списке пользователя.',
diff --git a/resources/lang/ru/admin/locations/message.php b/resources/lang/ru/admin/locations/message.php
index 325e445531..3c9904bf3d 100644
--- a/resources/lang/ru/admin/locations/message.php
+++ b/resources/lang/ru/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Данный статус связан с одним или несколькими активами, и не может быть удален. Удалите либо измените связанные активы. ',
     'assoc_assets'	 => 'Это месторасположение связано как минимум с одним активом и не может быть удалено. Измените ваши активы так, чтобы они не ссылались на это месторасположение и попробуйте ещё раз. ',
     'assoc_child_loc'	 => 'У этого месторасположения является родительским и у него есть как минимум одно месторасположение уровнем ниже. Поэтому оно не может быть удалено. Обновите ваши месторасположения, так чтобы не ссылаться на него и попробуйте снова. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Присвоенные активы',
+    'current_location' => 'Текущее местоположение',
 
 
     'create' => array(
diff --git a/resources/lang/ru/admin/locations/table.php b/resources/lang/ru/admin/locations/table.php
index 68e91858d8..188acdcc5e 100644
--- a/resources/lang/ru/admin/locations/table.php
+++ b/resources/lang/ru/admin/locations/table.php
@@ -20,21 +20,21 @@ return [
     'parent'                    => 'Родитель',
     'currency'                  => 'Валюта местонахождения',
     'ldap_ou'                   => 'Поиск в LDAP OU',
-    'user_name'                 => 'User Name',
-    'department'                => 'Department',
-    'location'                  => 'Location',
-    'asset_tag'                 => 'Assets Tag',
-    'asset_name'                => 'Name',
-    'asset_category'            => 'Category',
-    'asset_manufacturer'        => 'Manufacturer',
-    'asset_model'               => 'Model',
-    'asset_serial'              => 'Serial',
-    'asset_location'            => 'Location',
-    'asset_checked_out'         => 'Checked Out',
-    'asset_expected_checkin'    => 'Expected Checkin',
-    'date'                      => 'Date:',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'user_name'                 => 'Имя пользователя',
+    'department'                => 'Подразделение',
+    'location'                  => 'Местоположение',
+    'asset_tag'                 => 'Тег активов',
+    'asset_name'                => 'Название',
+    'asset_category'            => 'Категория',
+    'asset_manufacturer'        => 'Производитель',
+    'asset_model'               => 'Модель',
+    'asset_serial'              => 'Серийный номер',
+    'asset_location'            => 'Расположение',
+    'asset_checked_out'         => 'Проверено',
+    'asset_expected_checkin'    => 'Ожидаемая проверка',
+    'date'                      => 'Дата:',
+    'signed_by_asset_auditor'   => 'Подписано (Аудитором активов):',
+    'signed_by_finance_auditor' => 'Подписано (Аудитором активов):',
+    'signed_by_location_manager' => 'Подписано (Менеджер по местоположению):',
+    'signed_by'                 => 'Подписано:',
 ];
diff --git a/resources/lang/ru/admin/manufacturers/message.php b/resources/lang/ru/admin/manufacturers/message.php
index eb55e40ee4..1d7ba8de70 100644
--- a/resources/lang/ru/admin/manufacturers/message.php
+++ b/resources/lang/ru/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Производителя не существует.',
     'assoc_users'	 => 'Этот производитель сейчас связан с как минимум одной моделью и не может быть удален. Для удаления необходимо удалить связь модели с производителем. ',
 
diff --git a/resources/lang/ru/admin/manufacturers/table.php b/resources/lang/ru/admin/manufacturers/table.php
index c878296418..e14609d050 100644
--- a/resources/lang/ru/admin/manufacturers/table.php
+++ b/resources/lang/ru/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Электронная почта поддержки',
     'support_phone'   		=> 'Телефон поддержки',
     'support_url'   		=> 'Страница поддержки',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Обновить производителя',
     'url'   				=> 'Адрес',
 
diff --git a/resources/lang/ru/admin/models/general.php b/resources/lang/ru/admin/models/general.php
index af4665996a..0c602ca76b 100644
--- a/resources/lang/ru/admin/models/general.php
+++ b/resources/lang/ru/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'Эта модель была удалена.',
     'bulk_delete'               => 'Массовое удаление моделей активов',
     'bulk_delete_help'               => 'Установите флажки ниже, чтобы подтвердить удаление выбранных моделей активов. Модели, имеющие связанные с ними активы, не могут быть удалены до тех пор, пока активы не будут связаны с другой моделью.',
-    'bulk_delete_warn'          => 'Вы собираетесь удалить :model_count моделей активов.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Восстановить модель',
     'requestable'               => 'Данная модель может быть запрошена пользователем',
 	'show_mac_address'			      => 'Отображать поле MAC адрес для данной модели',
diff --git a/resources/lang/ru/admin/models/message.php b/resources/lang/ru/admin/models/message.php
index 9e798979c0..c66f219ed8 100644
--- a/resources/lang/ru/admin/models/message.php
+++ b/resources/lang/ru/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Модель не существует.',
+    'no_association' => 'НЕТ СВЯЗАННОЙ МОДЕЛИ.',
+    'no_association_fix' => 'Это странно и ужасно сломает вещи. Отредактируйте этот актив сейчас, чтобы назначить ему модель.',
     'assoc_users'	 => 'Данная модель связана с одним или несколькими активами, и не может быть удалена. Удалите либо измените связанные активы. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Невозможно обновить Модель, повторите еще раз',
-        'success' => 'Модель успешно обновлена.'
+        'success' => 'Модель успешно обновлена.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Никаких изменений нет, поэтому ничего не обновлено.',
-        'success' 		=> 'Модели обновлены.'
+        'success' 		=> 'Модель успешно обновлена. |:model_count моделей успешно обновлено.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Ни одна модель не выбрана, поэтому нечего удалить.',
-        'success' 		    => 'Удалено :success_count моделей(ль)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> 'Удалено : success_count моделей(ль), однако: fail_count моделей не удалены, потому что они всё ещё имеют связанные с ними активы.'
     ),
 
diff --git a/resources/lang/ru/admin/reports/general.php b/resources/lang/ru/admin/reports/general.php
index 6d94fbb482..603e69447e 100644
--- a/resources/lang/ru/admin/reports/general.php
+++ b/resources/lang/ru/admin/reports/general.php
@@ -3,7 +3,7 @@
 return [
     'info'   => 'Выберите опции, которые должны отображаться в отчете актива.',
     'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
+    'send_reminder' => 'Отправить напоминание',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request'
diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php
index 34d953c0aa..3930d1aae6 100644
--- a/resources/lang/ru/admin/settings/general.php
+++ b/resources/lang/ru/admin/settings/general.php
@@ -10,31 +10,31 @@ return [
     'admin_cc_email'            => 'Скрытая копия',
     'admin_cc_email_help'       => 'Если вы хотите отправлять копии писем, что приходят пользователям при выдаче/возврате, на какой-то дополнительный адрес электронной почты, то введите его здесь. В противном случае оставьте это поле пустым.',
     'is_ad'				        => 'У вас сервер Active Directory',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert 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_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
+    'allow_user_skin_help_text' => 'Включение позволит пользователю изменять тему веб-интерфейса',
     '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_interval_help'       => 'Если требуется регулярное проведение аудита, вы можете обозначить необходимый вам интервал в месяцах. При обновлении этого значения, будут обновлены все "даты следующего аудита" у активов с приближающейся датой аудита.',
     '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'         => '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_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_logged_out'         => 'Все пользователи, включая текущего, будут разлогинены после завершения восстановления.',
+    'backups_large'             => 'Очень большой бекап может не уложиться в стандартные значения ожидания и может потребоваться запуск восстановления через командную строку.',
     'barcode_settings'			=> 'Настройки штрихкода',
     'confirm_purge'			    => 'Подтвердить удаление',
     'confirm_purge_help'		=> 'Введите "DELETE" в поле ниже для окончательного удаления ваших удаленных записей. Это действие не может быть отменено и ПОЛНОСТЬЮ очистит все удаленные записи. (Предварительно сделайте бекап, просто на всякий случай.)',
@@ -57,7 +57,7 @@ return [
     'barcode_type'				=> 'Тип 2D штрихкода',
     'alt_barcode_type'			=> 'Тип линейного штрихкода',
     'email_logo_size'       => 'В почте лучше всего выглядят квадратные логотипы. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Включено',
     'eula_settings'				=> 'Настройки лицензионного соглашения',
     'eula_markdown'				=> 'Это EULA поддерживает <a href="https://help.github.com/articles/github-flavored-markdown/">форматирование Github flavored markdown</a>.',
     'favicon'                   => 'Favicon',
@@ -67,16 +67,17 @@ return [
     'footer_text_help'          => 'Этот текст будет отображаться в правой части нижнего колонтитула. Разрешается использовать ссылки следующего вида <a href="https://help.github.com/articles/github-flavored-markdown/">Github ароматизированные уценок</a>. Использование прочей HTML разметки, переводов строк, изображений - может привести к непредсказуемым результатам.',
     'general_settings'			=> 'Общие настройки',
     'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_help'     => 'EULA по умолчанию и прочее',
     'generate_backup'			=> 'Создать резервную копию',
     'header_color'              => 'Цвет заголовка',
     'info'                      => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.',
-    'label_logo'                => 'Label Logo',
+    'label_logo'                => 'Логотип этикетки',
     '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.',
+    'ldap_default_group'        => 'Группа прав доступа по умолчанию',
+    'ldap_default_group_info'   => 'Выберите группу для привязки к пользователю, помните пользователь получает права доступа группы к которой он привязан.',
+    'no_default_group'          => 'Нет группы по умолчанию',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'Клиентский TLS-ключ LDAP',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Настройка LDAP',
     'ldap_client_tls_cert_help' => 'Клиентский TLS сертификат и Ключ для LDAP-соединений обычно принято использовать только в конфигурациях Google Workspace с параметром “Secure LDAP”. Оба параметра обязательны.',
      'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Введите действительное имя пользователя и пароль LDAP из базового DN, указанного выше, чтобы проверить, правильно ли настроен логин LDAP. СНАЧАЛА ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШИ ОБНОВЛЕННЫЕ НАСТРОЙКИ LDAP.',
     'ldap_login_sync_help'      => 'Этим производится проверка правильности синхронизации LDAP. Если тест подлинности LDAP не пройдёт, пользователи так и не смогут войти в систему. СНАЧАЛА ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШИ ОБНОВЛЕННЫЕ НАСТРОЙКИ LDAP.',
     'ldap_manager'              => 'LDAP Manager',
@@ -97,9 +100,9 @@ return [
     'ldap_tls_help'             => 'Отметьте, только если у вас запущен STARTTLS на вашем LDAP сервере. ',
     'ldap_uname'                => 'Имя пользователя LDAP Bind',
     'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
+    'ldap_phone'                => 'LDAP номер телефона',
     'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
+    'ldap_country'              => 'Страна LDAP',
     'ldap_pword'                => 'Пароль LDAP Bind',
     'ldap_basedn'               => 'Основной Bind DN',
     'ldap_filter'               => 'Фильтр LDAP',
@@ -122,9 +125,9 @@ return [
     'login'                     => 'Попытки входа',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP-адрес',
-    'login_success'             => 'Success?',
-    'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
+    'login_success'             => 'Успешно?',
+    'login_user_agent'          => 'Браузер пользователя',
+    'login_help'                => 'Список попыток входа',
     'login_note'                => 'Комментарий для экрана логина',
     'login_note_help'           => 'Опционально выводит несколько предложений на экране логина. Например, чтобы помочь людям, которые нашли потерянное или украденное устройство. Здесь можно использовать <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Параметры входа удаленного пользователя',
@@ -145,7 +148,7 @@ return [
     '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',
@@ -156,7 +159,7 @@ return [
     '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_symbols' => 'Требовать хотя бы один символ',
     'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
     'pwd_secure_min'            => 'Минимальное количество символов',
     'pwd_secure_min_help'       => 'Минимально разрешенное значение - 8',
@@ -165,28 +168,28 @@ return [
     'qr_help'                   => 'Включить QR коды',
     'qr_text'                   => 'Текст QR кода',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    'saml_title'                => 'Обновление настроек SAML',
+    'saml_help'                 => 'Настройки SAML',
     'saml_enabled'              => 'SAML включён',
     'saml_integration'          => 'Интеграция SAML',
     'saml_sp_entityid'          => 'ID записи',
     'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
     'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
     'saml_sp_x509cert'          => 'Открытая часть Сертификата',
-    '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_sp_metadata_url'      => 'URL Метаданных',
+    'saml_idp_metadata'         => 'Метаданные SAML IdP',
+    'saml_idp_metadata_help'    => 'Метаданные IdP можно указать с помощью URL или XML-файла.',
     'saml_attr_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_attr_mapping_username_help' => 'NameID будет использоваться, если сопоставление атрибутов указано как unspecified или указано неверно.',
+    'saml_forcelogin_label'     => 'Приоритет входа SAML',
     'saml_forcelogin'           => 'Сделать SAML-авторизацию входом по умолчанию',
-    '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_forcelogin_help'      => 'Вы можете использовать \'/login?nosaml\' для перехода на обычную страницу входа.',
+    'saml_slo_label'            => 'Единый выход SAML',
+    'saml_slo'                  => 'Отправить запрос на выход в IdP при выходе',
+    'saml_slo_help'             => 'Это приведет к тому, что пользователь будет сначала перенаправлен на IdP при выходе. Оставьте неотмеченным, если IdP не поддерживает SAML SLO, инициированный SP.',
     'saml_custom_settings'      => 'Дополнительные параметры SAML',
     'saml_custom_settings_help' => 'Вы можете указать дополнительные параметры библиотеке onelogin/php-saml. Используйте на свой страх и риск.',
-    'saml_download'             => 'Download Metadata',
+    'saml_download'             => 'Скачать Метаданные',
     'setting'                   => 'Настройка',
     'settings'                  => 'Настройки',
     'show_alerts_in_menu'       => 'Показать оповещения в верхнем меню',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Показать изображения в письмах',
     'show_images_in_email_help'   => 'Снимите этот флажок, если ваша установка Snipe-IT находится за VPN или в закрытой сети в случае, если в E-mail-ах, которые просматриваются пользователями за пределами указанной сети не отбражаются/не загружаются изображения из данной установки Snipe-IT.',
     'site_name'                 => 'Название сайта',
+    'integrations'               => 'Интеграции',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Имя бота в Slack',
-    'slack_channel'             => 'Канал в Slack',
-    'slack_endpoint'            => 'Slack endpoint',
-    'slack_integration'         => 'Настройки Slack',
-    'slack_integration_help'    => 'Интеграция со Slack - необязательна, однако конечная точка и канал - обязательны, если Вы планируете её использовать. Для конфигурации интеграции со Slack, Вы должны в первую очередь <a href=":slack_link" target="_new" rel="noopener"> создать исходящий веб-хук</a> на свою учетную запись Slack. Нажмите на кнопку <strong> Протестировать Интеграцию со Slack</strong> чтобы убедится перед сохранением, что Ваши параметры - верны. ',
-    'slack_integration_help_button'    => 'Как только вы сохраните вашу информацию в Slack, появится кнопка тест.',
-    'slack_test_help'           => 'Тест конфигурации Slack. ПЕРЕД ЭТИМ ИЗМЕНЕННЫЕ НАСТРОЙКИ SLACK ДОЛЖНЫ БЫЛИ БЫТЬ СОХРАНЕНЫ.',
+    'general_webhook'           => 'General Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Протестировать перед сохранением',
+    'webhook_title'               => 'Обновить настройки Webhook',
+    'webhook_help'                => 'Настройки интеграций',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app канал',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app Настройки',
+    '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',
     'support_footer'            => 'Ссылки на поддержу в нижнем колонтитуле ',
     'support_footer_help'       => 'Отображать или не отображать ссылку на руководство пользователя и поддержку Snipe-IT',
@@ -216,8 +224,8 @@ return [
     'update'                    => 'Обновить настройки',
     'value'                     => 'Значение',
     'brand'                     => 'Фирменный стиль',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    'brand_keywords'            => 'нижняя часть страницы, логотип, print, тема, оболочка, верхняя часть страницы, цветовая палитра, цвет, css',
+    'brand_help'                => 'Логотип, Имя сайта',
     'web_brand'                 => 'Тип Web-Брендинга',
     'about_settings_title'      => 'О настройках',
     'about_settings_text'       => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.',
@@ -229,7 +237,7 @@ return [
     'privacy_policy'            => 'Политика конфидициальности',
     'privacy_policy_link_help'  => 'Добавленный здесь URL-адрес, будет являться ссылкой на политику конфиденциальности и будет отображаться в футере приложения, а также будет добавлен в e-mail сообщения, которые посылает система, в соответствии с GDPR. ',
     'purge'                     => 'Очистка удалённых записей',
-    'purge_deleted'             => 'Purge Deleted ',
+    'purge_deleted'             => 'Очистить удаленное',
     'labels_display_bgutter'    => 'Метка внизу страницы',
     'labels_display_sgutter'    => 'Метка сбоку страницы',
     'labels_fontsize'           => 'Размер шрифта метки',
@@ -275,51 +283,56 @@ return [
     'unique_serial_help_text'                => 'Установка этого флажка включает ограничение по уникальности на серии активов',
     'zerofill_count'        => 'Длина инвентарного номера, включая заполнение нулями',
     'username_format_help'   => 'Этот параметр используется только в процессе импорта, если имя пользователя не предоставляется и мы должны сгенерировать его для Вас.',
-    'oauth_title' => 'OAuth API Settings',
+    'oauth_title' => 'Настройки OAuth API',
     'oauth' => 'OAuth',
     'oauth_help' => 'Oauth Endpoint Settings',
     'asset_tag_title' => 'Update Asset Tag Settings',
     'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => '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',
+    'barcodes_spinner' => 'Попытка удаления файлов...',
+    'barcode_delete_cache' => 'Удалить кеш штрихкодов',
+    'branding_title' => 'Обновить настройки брендирования',
+    'general_title' => 'Обновить основные настройки',
+    'mail_test' => 'Отправить тестовое сообщение',
+    'mail_test_help' => 'Это отправит тестовое сообщение :replyto.',
+    'filter_by_keyword' => 'Сортировать по ключевому слову',
+    'security' => 'Безопасность',
+    'security_title' => 'Обновить настройки безопасности',
     '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' => 'Локализация',
+    'localization_title' => 'Обновить настройки локализации',
     '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',
+    'localization_help' => 'Язык, формат даты',
+    'notifications' => 'Уведомления',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
-    'ldap_ad' => 'LDAP/AD',
-    'employee_number' => 'Employee Number',
-    'create_admin_user' => 'Create a User ::',
-    'create_admin_success' => 'Success! Your admin user has been added!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
+    'labels' => 'Этикетки',
+    'labels_title' => 'Обновить настройки этикетки',
+    'labels_help' => 'Настройки &amp; размеров этикетки',
+    'purge' => 'Очистить',
+    'purge_keywords' => 'удалить полностью',
+    'purge_help' => 'Очистка удалённых записей',
+    'ldap_extension_warning' => 'Похоже на вашем сервере не установлен или не включен модуль LDAP синхронизации. Вы можете сохранить ваши параметры, но вам потребуется установить\\включить модуль для PHP прежде выполнить синхронизацию с доменом.',
+    'ldap_ad' => 'LDAP/Active Directory',
+    'employee_number' => 'Номер сотрудника',
+    'create_admin_user' => 'Создать пользователя ::',
+    'create_admin_success' => 'Отлично! Администратор успешно добавлен!',
+    'create_admin_redirect' => 'Нажмите тут, что бы авторизоваться в вашем приложении!',
     '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_successful_migrations' => 'Ваши таблицы базы данных были созданы',
     'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
+    'setup_migration_create_user' => 'Далее: Создать пользователя',
     'ldap_settings_link' => 'LDAP Settings Page',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'slack_test' => 'Протестировать <i class="fab fa-slack"></i> интеграцию',
+    '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. ',
+
 ];
diff --git a/resources/lang/ru/admin/settings/message.php b/resources/lang/ru/admin/settings/message.php
index ed867f9556..3569f1a414 100644
--- a/resources/lang/ru/admin/settings/message.php
+++ b/resources/lang/ru/admin/settings/message.php
@@ -11,8 +11,8 @@ 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'       => 'Да, восстановить. Я осознаю, что это перезапишет все существующие данные в базе данных. Это также выйдет из учетных записей всех ваших существующих пользователей (включая вас).',
+        'restore_confirm'       => 'Вы уверены, что хотите восстановить базу данных из :filename?'
     ],
     'purge' => [
         'error'     => 'Возникла ошибка при попытке очистки. ',
@@ -20,24 +20,25 @@ 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!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+    'webhook' => [
+        'sending' => 'Отправка тестового сообщения в :app...',
+        'success_pt1' => 'Успех! Проверьте ',
+        'success_pt2' => ' канал для вашего тестового сообщения и не забудьте нажать СОХРАНИТЬ ниже, чтобы сохранить ваши настройки.',
+        '500' => '500 Ошибка на сервера.',
+        'error' => 'Что-то пошло не так. :app ответил: :error_message',
+        'error_misc' => 'Что-то пошло не так. :( ',
     ]
 ];
diff --git a/resources/lang/ru/admin/settings/table.php b/resources/lang/ru/admin/settings/table.php
index 22db5c84ed..9f251911d5 100644
--- a/resources/lang/ru/admin/settings/table.php
+++ b/resources/lang/ru/admin/settings/table.php
@@ -1,6 +1,6 @@
 <?php
 
 return array(
-    'created'   => 'Created',
-    'size' => 'Size',
+    'created'   => 'Создан',
+    'size' => 'Размер',
 );
diff --git a/resources/lang/ru/admin/statuslabels/message.php b/resources/lang/ru/admin/statuslabels/message.php
index adaf1921c5..9bfbf90998 100644
--- a/resources/lang/ru/admin/statuslabels/message.php
+++ b/resources/lang/ru/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ 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>.',
+        'deployable'   => 'Эти активы могут быть проверены. Как только они будут назначены, они получат мета-статус <i class="fas fa-circle text-blue"></i> <strong>Развернуты</strong>.',
         'archived'   => 'Эти активы не могут быть проверены и будут отображаться только в архивированном виде. Это полезно для сохранения информации об активах для составления бюджета / исторических целей, но не оставляя их вне списка текущих активов.',
         'pending'   => 'Эти активы еще не могут быть назначены никому, часто используемым для предметов, которые не подлежат ремонту, но, как ожидается, возвращаются в обращение.',
     ],
diff --git a/resources/lang/ru/admin/users/general.php b/resources/lang/ru/admin/users/general.php
index 6b41eaa41b..99786f6ed5 100644
--- a/resources/lang/ru/admin/users/general.php
+++ b/resources/lang/ru/admin/users/general.php
@@ -17,28 +17,38 @@ return [
     'last_login'        => 'Последний вход',
     'ldap_config_text'  => 'Параметры конфигурации LDAP можно найти Администратор > Параметры. Выбранное местоположение будет установлено для всех импортируемых пользователей. (Необязательно).',
     'print_assigned'    => 'Печать всех назначенных',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'email_assigned'    => 'Список адресов электронной почты всех назначенных',
+    'user_notified'     => 'Пользователю был отправлен по электронной почте список назначенных им в данный момент элементов.',
+    'auto_assign_label' => 'Включить этого пользователя при автоматическом назначении лицензий',
+    'auto_assign_help'  => 'Пропустить этого пользователя в автоматическом назначении лицензий',
     'software_user'     => 'Программное обеспечение привязано к :name',
     'send_email_help'   => 'Вы должны указать адрес электронной почты для этого пользователя, чтобы отправить им учетные данные. Электронная почта может быть выполнена только при создании пользователя. Пароли хранятся в одностороннем хэше и не могут быть восстановлены после сохранения.',
     'view_user'         => 'Показать пользователя :name',
     'usercsv'           => 'CSV файл',
     'two_factor_admin_optin_help' => 'Ваши текущие параметры администрирования разрешают избирательное применение двухфакторной аутентификации.  ',
-    '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' => 'WARNING:',
-    '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',
+    'two_factor_enrolled' => 'Устройство 2FA зарегистрировано ',
+    'two_factor_active'   => '2FA Активный ',
+    '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/ru/admin/users/message.php b/resources/lang/ru/admin/users/message.php
index 7f89e29636..8bf1e9995a 100644
--- a/resources/lang/ru/admin/users/message.php
+++ b/resources/lang/ru/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Вы успешно отклонили актив.',
     'bulk_manager_warn'	        => 'Ваши пользователи были успешно обновлены, однако запись менеджера не была сохранена, потому что выбранный менеджер также присутствовал в редактируемом списке пользователей, и пользователи не могут быть менеджерами самим себе. Пожалуйста выберите ваших пользователей снова, за исключением их менеджера.',
     'user_exists'               => 'Пользователь уже существует!',
-    'user_not_found'            => 'Пользователь [:id] не существует.',
+    'user_not_found'            => 'Пользователь не существует.',
     'user_login_required'       => 'Поле "Логин" является обязательным',
     'user_password_required'    => 'Поле "Пароль" является обязательным.',
     'insufficient_permissions'  => 'Недостаточно прав.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'Интеграция с LDAP не настроена для этой инсталляции.',
     'password_resets_sent'      => 'Ссылка для сброса пароля была отправлена выбранным пользователям которые имеют действительный адрес электронной почты а активированы.',
     'password_reset_sent'       => 'Ссылка для сброса пароля была отправлена на адрес :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'У этого пользователя нет адреса электронной почты в его профиле.',
+    'user_has_no_assets_assigned'   => 'У этого пользователя нет назначенных активов',
 
 
     'success' => array(
@@ -61,7 +61,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/ru/admin/users/table.php b/resources/lang/ru/admin/users/table.php
index 3643b2a194..ac77b115cb 100644
--- a/resources/lang/ru/admin/users/table.php
+++ b/resources/lang/ru/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+click (или cmd+click в Mac OS), чтобы отменить выбор групп.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Наследование',
     'job' 					=> 'Должность',
diff --git a/resources/lang/ru/auth.php b/resources/lang/ru/auth.php
index db310aa1bb..80a618183a 100644
--- a/resources/lang/ru/auth.php
+++ b/resources/lang/ru/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' => 'Слишком много неудачных попыток входа. Пожалуйста, попробуйте через :seconds секунд.',
 
 );
diff --git a/resources/lang/ru/auth/general.php b/resources/lang/ru/auth/general.php
index 8c16fdb562..f750d24fa9 100644
--- a/resources/lang/ru/auth/general.php
+++ b/resources/lang/ru/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Запомнить меня',
     'username_help_top'                 => 'Введите своё <strong>Имя Пользователя</strong>, чтобы получить ссылку для сброса пароля.',
     'username_help_bottom'          => 'Ваши Имя Пользователя и Ваш E-Mail <em>могут</em> быть одинаковыми, но могут и не быть, в зависимости от Вашей конфигурации. Если Вы не можете вспомнить Ваше Имя Пользователя - обратитесь к Вашему системному администратору.<br><br><strong>Имена Пользователя, к которым не привязан адрес электронной почты, не смогут получить ссылку на сброс пароля.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Не удаётся авторизоваться через Google аккаунт, пожалуйста попробуйте ещё раз.',
+
+];
 
diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php
index 419707d4a5..920e9c61ab 100644
--- a/resources/lang/ru/general.php
+++ b/resources/lang/ru/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Аксессуары',
     'activated'			    => 'Активно',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Аксессуар',
     'accessory_report'		=> 'Отчёт по аксессуарам',
     'action'                => 'Действие',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Администратор',
     'administrator'			=> 'Администратор',
     'add_seats'             => 'Рабочих мест',
-    'age'                   => "Age",
+    'age'                   => "Возраст",
     'all_assets'			=> 'Все активы',
     'all'       			=> 'Все',
     'archived'              => 'Архивные',
@@ -22,12 +23,18 @@ return [
     'asset_tag'				=> 'Тег актива',
     'asset_tags'            => 'Инвентарный номер актива',
     'assets_available'		=> 'Доступные активы',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'accept_assets'         => 'Принять активы: название',
+    'accept_assets_menu'    => 'Принять активы',
     'audit'				    => 'аудит',
     'audit_report'			=> 'Журнал аудита',
     'assets'				=> 'Активы',
-    'assigned_to'           => 'Assigned to :name',
+    'assets_audited'        => 'активы проверены',
+    'assets_checked_in_count'     => 'assets checked in',
+    'assets_checked_out_count'     => 'assets checked out',
+    'asset_deleted_warning'     => 'Этот актив был удален. Его нужно восстановить, прежде чем назначить кому-либо.',
+    'assigned_date'         => 'Дата назначения',
+    'assigned_to'           => 'Привязано к :name',
+    'assignee'              => 'Выдано',
     'avatar_delete'         => 'Удалить аватар',
     'avatar_upload'         => 'Загрузить аватар',
     'back'      			=> 'Назад',
@@ -35,10 +42,12 @@ return [
     'bulkaudit'             => 'Массовый аудит',
     'bulkaudit_status'      => 'Состояние аудита',
     'bulk_checkout'  		=> 'Массовая выдача',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_edit'             => 'Массовое редактирование',
+    'bulk_delete'           => 'Массовое удаление',
+    'bulk_actions'          => 'Массовые действия',
+    'bulk_checkin_delete'   => 'Групповое выделение / Удалить пользователей',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Это устройство принадлежит пользователю',
     'bystatus'              => 'по статусу',
     'cancel'  				=> 'Отмена',
     'categories'			=> 'Категории',
@@ -67,13 +76,13 @@ return [
     'created'               => 'Элемент создан',
     'created_asset'			=> 'Создать актив',
     'created_at' 			=> 'Создано в',
-    'created_by'            => 'Created By',
+    'created_by'            => 'Создано',
     'record_created' 		=> 'Запись Создана',
     'updated_at' 			=> 'Обновлено',
     'currency'  			=> 'Руб.', // this is deprecated
     'current'  				=> 'Текущий',
-    'current_password'      => 'Current Password',
-    'customize_report'      => 'Customize Report',
+    'current_password'      => 'Текущий пароль',
+    'customize_report'      => 'Настройка отчета',
     'custom_report'         => 'Пользовательский отчет по активам',
     'dashboard'				=> 'Панель мониторинга',
     'days'      			=> 'дней',
@@ -83,14 +92,15 @@ return [
     'debug_warning_text'    => 'Это приложение выполняется в режиме с включенной отладкой. Это может нарушить конфиденциальность данных, если приложение доступно для внешнего мира. Отключите режим отладки, поменяв значение <code>APP_DEBUG</code> в файле <code>.env</code> на <code>false</code>.',
     'delete'  				=> 'Удалить',
     'delete_confirm'  		=> 'Вы действительно хотите удалить?',
+    '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'				=> 'Загрузка',
@@ -99,12 +109,12 @@ return [
     'eol'					=> 'EOL',
     'email_domain'			=> 'Домен адреса электронной почты',
     'email_format'			=> 'Формат адреса электронной почты',
-    'employee_number'       => 'Employee Number',
+    'employee_number'       => 'Номер сотрудника',
     'email_domain_help'		=> 'Он используется для генерации адреса при импорте',
     'error'				    => 'Ошибка',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    '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)',
@@ -113,32 +123,33 @@ return [
     'first'					=> 'В начало',
     'firstnamelastname'     => 'Имя Фамилия (ivanivanov@example.com)',
     'lastname_firstinitial' => 'Фамилия Первая буква имени (ivanov_i@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+    'firstinitial.lastname' => 'Первая буква имени и фамилия (i.ivanov@example.com)',
     'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
     'first_name'			=> 'Имя',
     'first_name_format'		=> 'Имя (jane@example.com)',
     'files'                 => 'Файлы',
     'file_name'				=> 'Файл',
     'file_type'             => 'Тип файла',
-    'filesize'              => 'File Size',
+    '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/">разметку markdown</a>.',
     'groups'				=> 'Группы',
     'gravatar_email'        => 'Адрес электронной почты Gravatar',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Измените ваш аватар на Gravatar.com</small></a>.',
     'history'  			    => 'История',
     'history_for'  			=> 'История для',
     '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.',
+    'filetypes_size_help'   => 'Максимальный размер файла - :size.',
     'image_filetypes_help'  => 'Допустимые типы файлов - pg, webp, png, gif, и svg. Максимальный размер файла :size.',
+    'unaccepted_image_type'  => 'Нечитаемый файл изображения. Допустимые типы файлов: jpg, webp, png, gif и svg. Медиа тип этого файла: :mimetype.',
     'import'         	    => 'Импорт',
     'importing'         	=> 'Импортируется',
     'importing_help'        => 'Вы можете импортировать активы, аксессуары, лицензии, компоненты, расходные материалы и пользователей через CSV-файл. <br><br>CSV должен быть разделен запятыми и отформатирован заголовками, которые соответствуют заголовкам <a href="https://snipe-it.readme.io/docs/importing" target="_new">образца CSV в документации</a>.',
@@ -147,7 +158,9 @@ return [
     'asset_maintenance_report' => 'Отчет по обслуживанию',
     'asset_maintenances'       => 'Активы на обслуживании',
     'item'  				=> 'Предмет',
-    'item_name'             => 'Item Name',
+    'item_name'             => 'Название',
+    'import_file'  			=> 'Импорт CSV',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Недостаточно прав!',
     'kits'       			=> 'Готовые наборы',
     'language'				=> 'Язык',
@@ -159,16 +172,16 @@ return [
     'licenses_available'	=> 'Доступные лицензии',
     'licenses'				=> 'Лицензии',
     'list_all'				=> 'Весь список',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Загрузка, пожалуйста подождите...',
     'lock_passwords'        => 'Это значение не будет сохранено в демо-версии.',
     'feature_disabled'      => 'Функция отключена в этой версии.',
     'location'              => 'Расположение',
     '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'				=> 'облегченный язык разметки.',
@@ -188,7 +201,7 @@ return [
     'no'  					=> 'Нет',
     'notes'  				=> 'Примечания',
     'order_number'          => 'Номер заказа',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Только удаленные активы',
     'page_menu'				=> 'Показаны элементы _MENU_',
     'pagination_info'		=> 'Показаны _START_ для _END_ _TOTAL_ элементы',
     'pending'				=> 'Ожидание',
@@ -206,18 +219,19 @@ return [
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Готов к установке',
     'recent_activity'		=> 'Недавняя активность',
-    'remaining'             => 'Remaining',
+    'remaining'             => 'Осталось',
     'remove_company'        => 'Удалить привязку компании',
     'reports'				=> 'Отчеты',
     'restored'				=> 'восстановлено',
     'restore'				=> 'Восстановить',
-    'requestable_models'    => 'Requestable Models',
+    'requestable_models'    => 'Запрашиваемые модели',
     'requested'				=> 'Запрошено',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Запрашиваемая дата',
+    'requested_assets'      => 'Запрашиваемые активы',
+    'requested_assets_menu' => 'Запрошенные активы',
     'request_canceled'      => 'Запрос отменен',
     'save'  				=> 'Сохранить',
+    'select_var'            => 'Выберите :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Выбор',
     'select_all'            => 'Выбрать все',
     'search'				=> 'Поиск',
@@ -238,10 +252,10 @@ return [
     'show_current'  		=> 'Показать текущий',
     'sign_in'				=> 'Вход',
     'signature'             => 'Подпись',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Подписано:',
     'skin'       			=> 'Оформление',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'webhook_msg_note'        => 'Уведомление будет отправлено через webhook',
+    'webhook_test_msg'        => 'Ого! Похоже, что интеграция :app со Snipe-IT работает!',
     'some_features_disabled' => 'ДЕМО РЕЖИМ: Некоторые функции отключены.',
     'site_name'				=> 'Название сайта',
     'state'  				=> 'Область/Регион',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Вы действительно хотите удалить',
     'submit'				=> 'Принять',
     'target'                => 'Цель',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Время и дата',
     'total_assets'			=> 'Всего активов',
     'total_licenses'		=> 'Всего лицензий',
@@ -263,7 +276,7 @@ return [
     'undeployable'			=> 'Не развертываемый',
     'unknown_admin'			=> 'Неизвестный администратор',
     'username_format'		=> 'Формат имени пользователя',
-    'username'              => 'Username',
+    '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.',
     'uploaded'              => 'Загружено',
@@ -274,51 +287,51 @@ return [
     'users'                 => 'Пользователи',
     '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_overdue'         => 'Overdue for Audit',
+    'login_enabled'         => 'Вход разрешен',
+    'audit_due'             => 'Ожидает аудита',
+    'audit_overdue'         => 'Проверка просрочена',
     'accept'                => 'Принять :asset',
     'i_accept'              => 'Принимаю',
     'i_decline'             => 'Отклоняю',
-    'accept_decline'        => 'Accept/Decline',
+    'accept_decline'        => 'Принять/Отклонить',
     'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
     'clear_signature'       => 'Очистить подпись',
     'show_help'             => 'Показать справку',
     'hide_help'             => 'Скрыть справку',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
+    'view_all'              => 'просмотреть все',
+    '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!',
+    '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'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
     'checked_out_to'        => 'Checked out to',
-    'fields'                => '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',
+    '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>',
@@ -331,62 +344,109 @@ return [
     'export'                => 'Экспорт',
     'ldap_sync'             => 'LDAP Sync',
     'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
+    'synchronize'           => 'Синхронизировать',
+    'sync_results'          => 'Результаты синхронизации',
     'license_serial'        => 'Серийный номер/Ключ продукта',
     'invalid_category'      => 'Неверная категория',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
+    'dashboard_info'        => 'Это ваша панель управления. Таких панелей много, но эта — моя.',
     '60_percent_warning'    => '60% выполнено (предупреждение)',
-    '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'       => 'Если ничего не добавлено, то и отображать нечего. Начните добавлять активы, аксессуары, расходные материалов или лицензии!',
     'new_asset'             => 'Создать актив',
-    'new_license'           => 'New License',
+    'new_license'           => 'Создать лицензию',
     'new_accessory'         => 'Создать аксессуар',
     'new_consumable'        => 'Создать новый расходник',
-    'collapse'              => 'Collapse',
-    'assigned'              => 'Assigned',
+    'collapse'              => 'Свернуть',
+    'assigned'              => 'Назначено',
     'asset_count'           => 'Количество активов',
     'accessories_count'     => 'Количество аксессуаров',
     'consumables_count'     => 'Количество расходников',
     'components_count'      => 'Количество компонентов',
-    'licenses_count'        => 'Licenses Count',
+    'licenses_count'        => 'Количество лицензий',
     'notification_error'    => 'Ошибка:',
     'notification_error_hint' => 'Please check the form below for errors',
     'notification_success'  => 'Успешно:',
     'notification_warning'   => 'Внимание:',
     'notification_info'      => 'Информация:',
-    'asset_information'     => 'Asset Information',
+    'asset_information'     => 'Информация об активе',
     'model_name'            => 'Название модели:',
-    'asset_name'            => 'Asset Name:',
-    'consumable_information' => 'Consumable Information:',
+    'asset_name'            => 'Название Актива:',
+    'consumable_information' => 'Информация о расходнике:',
     'consumable_name'       => 'Consumable Name:',
     'accessory_information' => 'Accessory Information:',
     'accessory_name'       => 'Accessory Name:',
-    'clone_item'            => 'Clone Item',
+    'clone_item'            => 'Клонировать позицию',
     'checkout_tooltip' => 'Check this item out',
     'checkin_tooltip' => 'Check this item in',
-    'checkout_user_tooltip' => 'Check this item out to a user',
-    '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',
+    'checkout_user_tooltip' => 'Выдать эту единицу пользователю',
+    'maintenance_mode'      => 'Служба временно недоступна для системных обновлений. Пожалуйста, проверьте позже.',
+    'maintenance_mode_title' => 'Система временно недоступна',
+    'ldap_import'           => 'Пароль пользователя не должен управляться LDAP. (Это позволяет отправлять ссылку на сброс забытого пароля.)',
+    'purge_not_allowed'     => 'Очистка удаленных данных отключена в файле .env. Обратитесь в службу поддержки или к системному администратору.',
+    'backup_delete_not_allowed'     => 'Удаление резервных копий было отключено в файле .env. Обратитесь в службу поддержки или к системному администратору.',
+    '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_soft_delete'      =>'Также безопасно удалите этих пользователей. Их история активов останется неизменной до тех пор, пока вы не очистите записи в настройках администратора.',
+    'bulk_checkin_delete_success' => 'Выбранные пользователи были удалены, а их активы перенесены.',
     '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 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',
+    'hello_name'            => 'Добро пожаловать, :name!',
+    'unaccepted_profile_warning'   => 'Вам переданы :count активов. Нажмите здесь, чтобы принять или отклонить.',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    'placeholder_kit'       => 'Выберите набор',
+    'file_not_found'        => 'Файл не найден',
+    'preview_not_available' => '(без превью)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Перейти к основному содержанию',
+    'toggle_navigation'     => 'Toggle navigation',
+    'alerts'                => 'Alerts',
+    'tasks_view_all'        => 'Показать все задачи',
+    'true'                  => 'Да',
+    'false'                 => 'Ложь',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    '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, licences, 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'     => 'Ни один пользователь не выбран',
+    'not_enough_users_selected'     => 'Должно быть выбрано хотя бы :count пользователей',
+    'merge_success'         => ':count пользователей успешно объединены в :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'            => 'Очистить и сохранить',
+    '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'   => 'Отправить приветственное письмо для новых пользователей?',
+    'back_before_importing'     => 'Сделать бекап перед импортом?',
+    'csv_header_field'          => 'Поле заголовка CSV',
+    'import_field'              => 'Import Field',
+    'sample_value'              => 'Пример значения',
+    'no_headers'                => 'Столбцы не найдены',
+    'error_in_import_file'      => 'Ошибка при чтении файла CSV: :error',
+    'percent_complete'          => ':percent % выполнено',
+    'errors_importing'          => 'При импорте произошли ошибки: ',
+    'warning'                   => 'ВНИМАНИЕ: :warning',
+    'success_redirecting'       => '"Успешно... Переадресация.',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ru/help.php b/resources/lang/ru/help.php
index 4b9fa3bbd5..6598d537b4 100644
--- a/resources/lang/ru/help.php
+++ b/resources/lang/ru/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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ru/localizations.php b/resources/lang/ru/localizations.php
index be2c321861..32b39df7c6 100644
--- a/resources/lang/ru/localizations.php
+++ b/resources/lang/ru/localizations.php
@@ -2,111 +2,111 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Выберите язык',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
-        'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
-        'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
-        'tl'=> 'Tagalog',
-        'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
-        'zu'=> 'Zulu',
+        'en'=> 'Английский, США',
+        'en-GB'=> 'Английский, Великобритания',
+        'af'=> 'Африкаанс',
+        'ar'=> 'Арабский',
+        'bg'=> 'Болгарский',
+        'zh-CN'=> 'Китайский (упрощенный)',
+        'zh-TW'=> 'Китайский (Традиционный)',
+        'hr'=> 'Хорватский',
+        'cs'=> 'Чешский',
+        'da'=> 'Датский',
+        'nl'=> 'Голландский',
+        'en-ID'=> 'Английский (Индонезия)',
+        'et'=> 'Эстонский',
+        'fil'=> 'Филиппинский',
+        'fi'=> 'Финский',
+        'fr'=> 'Французский',
+        'de'=> 'Немецкий',
+        'de-i'=> 'Немецкий (неформальный)',
+        'el'=> 'Греческий',
+        'he'=> 'Иврит',
+        'hu'=> 'Венгерский',
+        'is' => 'Исландский',
+        'id'=> 'Индонезийский',
+        'ga-IE'=> 'Ирландский',
+        'it'=> 'Итальянский',
+        'ja'=> 'Японский',
+        'ko'=> 'Корейский',
+        'lv'=>'Латвийский',
+        'lt'=> 'Литовский',
+        'mk'=> 'Македонский',
+        'ms'=> 'Малайский',
+        'mi'=> 'Маори',
+        'mn'=> 'Монгольский',
+        'no'=> 'Норвежский',
+        'fa'=> 'Персидский',
+        'pl'=> 'Польский',
+        'pt-PT'=> 'Португальский',
+        'pt-BR'=> 'Португальский (Бразилия)',
+        'ro'=> 'Румынский',
+        'ru'=> 'Русский',
+        'sr-CS' => 'Сербский (Латиница)',
+        'sl'=> 'Словенский',
+        'es-ES'=> 'Испанский',
+        'es-CO'=> 'Испанский (Колумбия)',
+        'es-MX'=> 'Испанский (Мексика)',
+        'es-VE'=> 'Испанский (Венесуэла)',
+        'sv-SE'=> 'Шведский',
+        'tl'=> 'Тагальский',
+        'ta'=> 'Тамильский',
+        'th'=> 'Тайский',
+        'tr'=> 'Турецкий',
+        'uk'=> 'Украинский',
+        'vi'=> 'Вьетнамский',
+        'cy'=> 'Валлийский',
+        'zu'=> 'Зулу',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Выберите страну',
     
     'countries' => [
-        'AC'=>'Ascension Island',
-        'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AC'=>'Остров Вознесения',
+        'AD'=>'Андора',
+        'AE'=>'Объединенные Арабские Эмираты',
+        'AF'=>'Афганистан',
+        'AG'=>'Антигуа и Барбуда',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
+        'AL'=>'Албания',
+        'AM'=>'Армения',
         'AN'=>'Netherlands Antilles',
-        'AO'=>'Angola',
-        'AQ'=>'Antarctica',
-        'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
-        'AW'=>'Aruba',
+        'AO'=>'Ангола',
+        'AQ'=>'Антарктика',
+        'AR'=>'Аргентина',
+        'AS'=>'Американское Самоа',
+        'AT'=>'Австрия',
+        'AU'=>'Австралия',
+        'AW'=>'Аруба',
         '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',
+        'AZ'=>'Азербайджан',
+        'BA'=>'Босния и Герцеговина',
+        'BB'=>'Барбадос',
+        'BE'=>'Бельгия',
+        'BD'=>'Бангладеш',
+        'BF'=>'Буркина-Фасо',
+        'BG'=>'Болгария',
+        'BH'=>'Бахрейн',
+        'BI'=>'Бурунди',
+        'BJ'=>'Бенин',
+        'BM'=>'Бермудские острова',
         'BN'=>'Brunei Darussalam',
-        'BO'=>'Bolivia',
-        'BR'=>'Brazil',
-        'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
+        'BO'=>'Боливия',
+        'BR'=>'Бразилия',
+        'BS'=>'Багамские острова',
+        'BT'=>'Бутан',
         'BV'=>'Bouvet Island',
-        'BW'=>'Botswana',
-        'BY'=>'Belarus',
-        'BZ'=>'Belize',
-        'CA'=>'Canada',
+        'BW'=>'Ботсвана',
+        'BY'=>'Беларусь',
+        'BZ'=>'Белиз',
+        'CA'=>'Канада',
         'CC'=>'Cocos (Keeling) Islands',
         'CD'=>'Congo (Democratic Republic)',
         'CF'=>'Central African Republic',
         'CG'=>'Congo (Republic)',
-        'CH'=>'Switzerland',
+        'CH'=>'Швейцария',
         'CI'=>'Côte d\'Ivoire',
         'CK'=>'Cook Islands',
         'CL'=>'Chile',
@@ -133,75 +133,75 @@ return [
         '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',
+        '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'=>'Kuwait',
         'KY'=>'Cayman Islands',
         'KZ'=>'Kazakhstan',
         'LA'=>'Lao People\'s Democratic Republic',
         'LB'=>'Lebanon',
         'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
-        'LK'=>'Sri Lanka',
+        'LI'=>'Лихтенштейн',
+        'LK'=>'Шри-Ланка',
         'LR'=>'Liberia',
         'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
+        'LT'=>'Литва',
+        'LU'=>'Люксембург',
+        'LV'=>'Латвия',
         'LY'=>'Libyan Arab Jamahiriya',
         'MA'=>'Morocco',
         'MC'=>'Monaco',
         'MD'=>'Moldova, Republic Of',
         'ME'=>'Montenegro',
-        'MG'=>'Madagascar',
+        'MG'=>'Мадагаскар',
         'MH'=>'Marshall Islands',
         'MK'=>'Macedonia, The Former Yugoslav Republic Of',
         'ML'=>'Mali',
@@ -239,58 +239,59 @@ return [
         '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',
-        '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',
+        'PM'=>'Сен-Пьер и Микелон',
+        'PN'=>'Острова Питкэрн',
+        'PR'=>'Пуэрто-Рико',
+        'PS'=>'Палестина',
+        'PT'=>'Португалия',
+        'PW'=>'Палау',
+        'PY'=>'Парагвай',
+        'QA'=>'Катар',
+        'RE'=>'Реюньон',
+        'RO'=>'Румыния',
+        'RS'=>'Сербия',
+        'RU'=>'Российская Федерация',
+        'RW'=>'Руанда',
+        'SA'=>'Саудовская Аравия',
+        'UK'=>'Шотландия',
+        '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'=>'Uganda',
         'UK'=>'United Kingdom',
         'US'=>'United States',
diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php
index a0edc32129..27aaba5312 100644
--- a/resources/lang/ru/mail.php
+++ b/resources/lang/ru/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Чтобы войти в Snipe-It используйте следующие логин и пароль:',
     'login' => 'Логин:',
     'Low_Inventory_Report' => 'Отчет о заканчивающихся предметах',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Мин Кол-во',
     'name' => 'Название',
     'new_item_checked' => 'Новый предмет был выдан под вашем именем, подробности ниже.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Ваш логин и пароль от Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Напоминание: приближается крайний срок проверки :name',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'Посмотреть активы',
+    'rights_reserved' => 'Все права защищены.',
 ];
diff --git a/resources/lang/ru/passwords.php b/resources/lang/ru/passwords.php
index 25633b4581..e01ea8947c 100644
--- a/resources/lang/ru/passwords.php
+++ b/resources/lang/ru/passwords.php
@@ -1,8 +1,8 @@
 <?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!',
+    'sent'	        => 'Если указанный пользователь зарегистрирован и имеет действительный адрес электронной почты, то письмо для восстановления пароля уже отправлено.',
+    'user'			=> 'Если указанный пользователь зарегистрирован и имеет действительный адрес электронной почты, то письмо для восстановления пароля уже отправлено.',
+    'token'         => 'Токен сброса пароля недействителен, или устарел, или не соответствует имени пользователя.',
+    'reset'         => 'Ваш пароль был сброшен!',
 ];
diff --git a/resources/lang/ru/reminders.php b/resources/lang/ru/reminders.php
index b51fef2d32..e8b9a1e5a5 100644
--- a/resources/lang/ru/reminders.php
+++ b/resources/lang/ru/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Пароли должны совпадать и содержать минимум 6 символов.",
     "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/ru/validation.php b/resources/lang/ru/validation.php
index 51a2f173df..a477e4d13d 100644
--- a/resources/lang/ru/validation.php
+++ b/resources/lang/ru/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => 'Атрибут: должен быть файлом.',
     'filled'               => 'Поле атрибута: должно иметь значение.',
     'image'                => ':attribute должен быть изображением.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    'import_field_empty'    => 'Значение :fieldname не может быть пустым.',
     'in'                   => 'Выбранный :attribute неправильный.',
     'in_array'             => 'Поле: атрибут не существует в: other.',
     'integer'              => ':attribute должно быть числом.',
     'ip'                   => ':attribute должно быть IP адресом.',
     'ipv4'                 => 'Атрибут: должен быть действительным адресом IPv4.',
     'ipv6'                 => 'Атрибут: должен быть действительным адресом IPv6.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => ':attribute должен быть уникальным для этого местоположения компании',
     'json'                 => 'Атрибут: должен быть действительной строкой JSON.',
     'max'                  => [
         'numeric' => ':attribute не должно быть больше :max.',
@@ -67,6 +67,8 @@ return [
         'array'   => 'Атрибут: должен содержать не менее: мин.',
     ],
     'starts_with'          => ':attribute должен начинаться с одного из следующих значений: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Выбранный :attribute неправильный.',
     'numeric'              => ':attribute должно быть числом.',
     'present'              => 'Поле атрибута: должно присутствовать.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Ваш текущий пароль неверен',
         'dumbpwd'          => 'Этот пароль слишком распространен.',
         'statuslabel_type' => 'Вы должны выбрать допустимый тип метки статуса',
+
+        // 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 должен быть допустимой датой в формате 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',
+
     ],
 
     /*
diff --git a/resources/lang/si-LK/admin/accessories/general.php b/resources/lang/si-LK/admin/accessories/general.php
index 00f1861179..64dc82e9d7 100644
--- a/resources/lang/si-LK/admin/accessories/general.php
+++ b/resources/lang/si-LK/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/si-LK/admin/accessories/message.php b/resources/lang/si-LK/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/si-LK/admin/accessories/message.php
+++ b/resources/lang/si-LK/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/si-LK/admin/asset_maintenances/form.php b/resources/lang/si-LK/admin/asset_maintenances/form.php
index 973636c5f6..f11c19da8b 100644
--- a/resources/lang/si-LK/admin/asset_maintenances/form.php
+++ b/resources/lang/si-LK/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'සම්පූර්ණයි',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'පිරිවැය',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'දින',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'සටහන්',
-        'update'                 => 'යාවත්කාල',
-        'create'                 => 'සාදන්න'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/si-LK/admin/categories/message.php b/resources/lang/si-LK/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/si-LK/admin/categories/message.php
+++ b/resources/lang/si-LK/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/si-LK/admin/components/general.php b/resources/lang/si-LK/admin/components/general.php
index 150dd679bb..5f04e652ed 100644
--- a/resources/lang/si-LK/admin/components/general.php
+++ b/resources/lang/si-LK/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Remaining',
     'total' 			                 => 'එකතුව',
     'update'                            => 'Update Component',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/si-LK/admin/components/message.php b/resources/lang/si-LK/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/si-LK/admin/components/message.php
+++ b/resources/lang/si-LK/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/si-LK/admin/consumables/message.php b/resources/lang/si-LK/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/si-LK/admin/consumables/message.php
+++ b/resources/lang/si-LK/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/si-LK/admin/custom_fields/general.php b/resources/lang/si-LK/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/si-LK/admin/custom_fields/general.php
+++ b/resources/lang/si-LK/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/si-LK/admin/groups/message.php b/resources/lang/si-LK/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/si-LK/admin/groups/message.php
+++ b/resources/lang/si-LK/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/si-LK/admin/hardware/form.php b/resources/lang/si-LK/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/si-LK/admin/hardware/form.php
+++ b/resources/lang/si-LK/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/si-LK/admin/hardware/general.php b/resources/lang/si-LK/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/si-LK/admin/hardware/general.php
+++ b/resources/lang/si-LK/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/si-LK/admin/hardware/message.php b/resources/lang/si-LK/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/si-LK/admin/hardware/message.php
+++ b/resources/lang/si-LK/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/si-LK/admin/hardware/table.php b/resources/lang/si-LK/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/si-LK/admin/hardware/table.php
+++ b/resources/lang/si-LK/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/si-LK/admin/licenses/general.php b/resources/lang/si-LK/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/si-LK/admin/licenses/general.php
+++ b/resources/lang/si-LK/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/si-LK/admin/manufacturers/message.php b/resources/lang/si-LK/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/si-LK/admin/manufacturers/message.php
+++ b/resources/lang/si-LK/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/si-LK/admin/manufacturers/table.php b/resources/lang/si-LK/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/si-LK/admin/manufacturers/table.php
+++ b/resources/lang/si-LK/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/si-LK/admin/models/general.php b/resources/lang/si-LK/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/si-LK/admin/models/general.php
+++ b/resources/lang/si-LK/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/si-LK/admin/models/message.php b/resources/lang/si-LK/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/si-LK/admin/models/message.php
+++ b/resources/lang/si-LK/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/si-LK/admin/settings/general.php b/resources/lang/si-LK/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/si-LK/admin/settings/general.php
+++ b/resources/lang/si-LK/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/si-LK/admin/settings/message.php b/resources/lang/si-LK/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/si-LK/admin/settings/message.php
+++ b/resources/lang/si-LK/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/si-LK/admin/users/general.php b/resources/lang/si-LK/admin/users/general.php
index daa568e8bf..b097ccec69 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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/si-LK/admin/users/message.php b/resources/lang/si-LK/admin/users/message.php
index 247a1b321e..adf26b3229 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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/si-LK/auth/general.php b/resources/lang/si-LK/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/si-LK/auth/general.php
+++ b/resources/lang/si-LK/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/si-LK/help.php b/resources/lang/si-LK/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/si-LK/help.php
+++ b/resources/lang/si-LK/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/si-LK/localizations.php b/resources/lang/si-LK/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/si-LK/localizations.php
+++ b/resources/lang/si-LK/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/si-LK/mail.php b/resources/lang/si-LK/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/si-LK/mail.php
+++ b/resources/lang/si-LK/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/si-LK/validation.php b/resources/lang/si-LK/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/si-LK/validation.php
+++ b/resources/lang/si-LK/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/sk/admin/accessories/general.php b/resources/lang/sk/admin/accessories/general.php
index cf45da0bc6..9041c5120b 100644
--- a/resources/lang/sk/admin/accessories/general.php
+++ b/resources/lang/sk/admin/accessories/general.php
@@ -16,5 +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.',
 
 );
diff --git a/resources/lang/sk/admin/accessories/message.php b/resources/lang/sk/admin/accessories/message.php
index 2b115da530..f21cfb9f15 100644
--- a/resources/lang/sk/admin/accessories/message.php
+++ b/resources/lang/sk/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/sk/admin/asset_maintenances/form.php b/resources/lang/sk/admin/asset_maintenances/form.php
index 2aa005c45f..785d06b08f 100644
--- a/resources/lang/sk/admin/asset_maintenances/form.php
+++ b/resources/lang/sk/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'Completed',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/sk/admin/categories/message.php b/resources/lang/sk/admin/categories/message.php
index 2562d155e8..52e060b96a 100644
--- a/resources/lang/sk/admin/categories/message.php
+++ b/resources/lang/sk/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategóriu sa nepodarilo aktualizovať, skúste prosím znovu',
-        'success' => 'Kategória bola úspešne aktualizovaná.'
+        'success' => 'Kategória bola úspešne aktualizovaná.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/sk/admin/components/general.php b/resources/lang/sk/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/sk/admin/components/general.php
+++ b/resources/lang/sk/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/sk/admin/components/message.php b/resources/lang/sk/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/sk/admin/components/message.php
+++ b/resources/lang/sk/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sk/admin/consumables/message.php b/resources/lang/sk/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/sk/admin/consumables/message.php
+++ b/resources/lang/sk/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/sk/admin/custom_fields/general.php b/resources/lang/sk/admin/custom_fields/general.php
index 88510af6c7..19654fae87 100644
--- a/resources/lang/sk/admin/custom_fields/general.php
+++ b/resources/lang/sk/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/sk/admin/groups/message.php b/resources/lang/sk/admin/groups/message.php
index b94224b627..71a7fe83e9 100644
--- a/resources/lang/sk/admin/groups/message.php
+++ b/resources/lang/sk/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Skupiny už existuje!',
-    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Pole názov je povinné',
 
     'success' => array(
diff --git a/resources/lang/sk/admin/hardware/form.php b/resources/lang/sk/admin/hardware/form.php
index fe7febcf80..16685208d4 100644
--- a/resources/lang/sk/admin/hardware/form.php
+++ b/resources/lang/sk/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Potvrdiť hromadné odstránenie majetku',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Nepovinné informácie',
     'order_details'   => 'Informácie súvisiace s objednávkou'
 ];
diff --git a/resources/lang/sk/admin/hardware/general.php b/resources/lang/sk/admin/hardware/general.php
index 12713367cb..d3309f9707 100644
--- a/resources/lang/sk/admin/hardware/general.php
+++ b/resources/lang/sk/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Upraviť majetok',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Vyžiadateľný',
     'requested'				    => 'Vyžiadané',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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.',
     'view'  					=> 'Zobraziť majetok',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/sk/admin/hardware/message.php b/resources/lang/sk/admin/hardware/message.php
index 020740a48e..2c1d670d1c 100644
--- a/resources/lang/sk/admin/hardware/message.php
+++ b/resources/lang/sk/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Majetok nebol obnovený, prosím skúste znovu',
         'success' 		=> 'Majetok bol úspešne obnovený.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Súbor bol naimportovaný',
         'file_delete_success'   => 'Súbor bol úspešné odstránený',
         'file_delete_error'      => 'Súbor sa nepodarilo odstrániť',
+        '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',
     ],
 
 
diff --git a/resources/lang/sk/admin/hardware/table.php b/resources/lang/sk/admin/hardware/table.php
index 50cc08ca63..9103fcbf73 100644
--- a/resources/lang/sk/admin/hardware/table.php
+++ b/resources/lang/sk/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Vsetup/Výstup',
     'checkout_date' => 'Dátum odovzdania',
     'checkoutto' 	=> 'Odovzdané',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Rozdiel',
     'dl_csv' 		=> 'Stiahnuť CSV',
diff --git a/resources/lang/sk/admin/licenses/general.php b/resources/lang/sk/admin/licenses/general.php
index 4f57a79aa0..980f5191bf 100644
--- a/resources/lang/sk/admin/licenses/general.php
+++ b/resources/lang/sk/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/sk/admin/manufacturers/message.php b/resources/lang/sk/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/sk/admin/manufacturers/message.php
+++ b/resources/lang/sk/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/sk/admin/manufacturers/table.php b/resources/lang/sk/admin/manufacturers/table.php
index 5561827f1e..a9bef99c40 100644
--- a/resources/lang/sk/admin/manufacturers/table.php
+++ b/resources/lang/sk/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Emailová podpora',
     'support_phone'   		=> 'Telefónna podpora',
     'support_url'   		=> 'URL podpory',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Upraviť výrobcu',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/sk/admin/models/general.php b/resources/lang/sk/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/sk/admin/models/general.php
+++ b/resources/lang/sk/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/sk/admin/models/message.php b/resources/lang/sk/admin/models/message.php
index 5d03744778..7b58230fa6 100644
--- a/resources/lang/sk/admin/models/message.php
+++ b/resources/lang/sk/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model neexistuje.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model nebol upravený, prosím skúste znovu',
-        'success' => 'Model bol úspešne upravený.'
+        'success' => 'Model bol úspešne upravený.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Neboli zmenené žiadne polia, preto nebolo nič aktualizované.',
-        'success' 		=> 'Model bol upravený.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Neboli vybrané ziadne modely, preto nebolo nič odmazané.',
-        'success' 		    => ':success_count model(y) vymazaný(é)!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         '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/admin/settings/general.php b/resources/lang/sk/admin/settings/general.php
index 98825725a2..2a9164472c 100644
--- a/resources/lang/sk/admin/settings/general.php
+++ b/resources/lang/sk/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Toto je server typu Active Directory',
     'alerts'                	=> 'Upozornenia',
-    'alert_title'               => 'Aktualizovať nastavenia upozornení',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Poslať varovania na adresu',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Povoliť varovania mailom',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Nastavnia čiarového kódu',
@@ -77,6 +77,7 @@ return [
     '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'       => 'Kľúč TLS na strane klienta LDAP',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP Settings',
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ 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',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Aktualizovať Slack nastavenia',
-    'slack_help'                => 'Slack nastavenia',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack kanál',
-    'slack_endpoint'            => 'Slack koncový bod',
-    'slack_integration'         => 'Slack nastavenia',
-    'slack_integration_help'    => 'Slack integrácia je voliteľná, avšak koncový bod a kanál sú povinné ak ich chcete používať. K nastaveniu integrácie so Slackom musíte najprv <a href=":slack_link" target="_new" rel="noopener">vytvoriť prichádzajúci webhook</a> vo Vašom Slack účte. Kliknite na tlačidlo <strong>Otestovať slack integráciu</strong> pre potvrdenie správnosti Vašich nastavení pred uložením. ',
-    'slack_integration_help_button'    => 'Po uložení nastavnia Slacku sa zobrazí tlačidlo na ich otestovanie.',
-    'slack_test_help'           => 'Otestuje či je Vaša Slack integrácia nastavená správne. MUSÍTE NAJPRV ULOŽIŤ AKTUALIZOVANÉ NASTAVENIA.',
+    'general_webhook'           => 'General Webhook',
+    '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 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',
@@ -301,7 +309,7 @@ return [
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Jazyk, zobrazenie dátumu',
     'notifications' => 'Notifikácie',
-    'notifications_help' => 'Emailové upozornenia, nastavenia autitu',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Štítky',
     'labels_title' => 'Aktualizovať nastavenia štítka',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'Stránka nastavenia LDAP',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/sk/admin/settings/message.php b/resources/lang/sk/admin/settings/message.php
index d105bac3dd..6b835e0e30 100644
--- a/resources/lang/sk/admin/settings/message.php
+++ b/resources/lang/sk/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Chyba servera.',
-        'error' => 'Niečo sa pokazilo.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/sk/admin/users/general.php b/resources/lang/sk/admin/users/general.php
index d4c922e65b..518df797c7 100644
--- a/resources/lang/sk/admin/users/general.php
+++ b/resources/lang/sk/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     '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',
     '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',
@@ -33,7 +35,6 @@ return [
     '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' => 'Odstrániť členstvo v skupine',
-    'warning_deletion' => 'VAROVANIE:',
     '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' => 'Aktualizovať všetky asety pre týchto užívateľov na tento status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
@@ -41,4 +42,13 @@ 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_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/sk/admin/users/message.php b/resources/lang/sk/admin/users/message.php
index c50bab4d1b..bd9e0895e0 100644
--- a/resources/lang/sk/admin/users/message.php
+++ b/resources/lang/sk/admin/users/message.php
@@ -6,7 +6,7 @@ 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'            => 'Používateľ [:id] neexistuje.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Prihlasovacie meno je povinné',
     'user_password_required'    => 'Heslo je povinné.',
     'insufficient_permissions'  => 'Nedostatočné oprávnenia.',
diff --git a/resources/lang/sk/auth/general.php b/resources/lang/sk/auth/general.php
index 571117c1d9..2fb96de502 100644
--- a/resources/lang/sk/auth/general.php
+++ b/resources/lang/sk/auth/general.php
@@ -12,5 +12,8 @@ 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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/sk/general.php b/resources/lang/sk/general.php
index e5108e7a0f..bf501a9b52 100644
--- a/resources/lang/sk/general.php
+++ b/resources/lang/sk/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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'           => 'Pridelené k :name',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Delete Avatar',
     'avatar_upload'         => 'Upload Avatar',
     'back'      			=> 'Back',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Hromadná editácia',
     'bulk_delete'           => 'Hromadné vymazanie',
     'bulk_actions'          => 'Hromadné akcie',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Zrušiť',
     'categories'			=> 'Categories',
@@ -83,6 +92,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'  				=> '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',
     'deletion_failed'       => 'Vymazanie zlyhalo',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Uložiť',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Vybrať všetko',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Podpísal',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Prepnúť navigáciu',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/sk/help.php b/resources/lang/sk/help.php
index c965d684d2..29848f9682 100644
--- a/resources/lang/sk/help.php
+++ b/resources/lang/sk/help.php
@@ -15,7 +15,7 @@ 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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/sk/localizations.php b/resources/lang/sk/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/sk/localizations.php
+++ b/resources/lang/sk/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/sk/mail.php b/resources/lang/sk/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/sk/mail.php
+++ b/resources/lang/sk/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/sk/validation.php b/resources/lang/sk/validation.php
index dfc7db46f5..7f53c73df5 100644
--- a/resources/lang/sk/validation.php
+++ b/resources/lang/sk/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     '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.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/sl/admin/accessories/general.php b/resources/lang/sl/admin/accessories/general.php
index af5853f933..062c4043b7 100644
--- a/resources/lang/sl/admin/accessories/general.php
+++ b/resources/lang/sl/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Posodobi Dodatke',
     'use_default_eula'					=> 'Uporabite <a href="#" data-toggle="modal" data-target="#eulaModal">privzeto EULA</a> namesto tega.',
     'use_default_eula_disabled'			=> '<del>Namesto tega uporabite privzeto EULA.</del> Ni privzetega EULA. Dodajte ga v Nastavitvah.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/sl/admin/accessories/message.php b/resources/lang/sl/admin/accessories/message.php
index d54f701a25..a291a6d9fe 100644
--- a/resources/lang/sl/admin/accessories/message.php
+++ b/resources/lang/sl/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/sl/admin/asset_maintenances/form.php b/resources/lang/sl/admin/asset_maintenances/form.php
index d6f49f15e9..522c262920 100644
--- a/resources/lang/sl/admin/asset_maintenances/form.php
+++ b/resources/lang/sl/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Vrsta vzdrževanja',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Naslov',
-        'start_date'             => 'Začeto',
-        'completion_date'        => 'Končano',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Izboljšanje garancije',
-        'asset_maintenance_time' => 'Dnevi',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Opombe',
-        'update'                 => 'Posodobi',
-        'create'                 => 'Ustvari'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/sl/admin/categories/message.php b/resources/lang/sl/admin/categories/message.php
index e53353661e..a9a34d2a95 100644
--- a/resources/lang/sl/admin/categories/message.php
+++ b/resources/lang/sl/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorija ni bila posodobljena, poskusite znova',
-        'success' => 'Kategorija uspešno posodobljena.'
+        'success' => 'Kategorija uspešno posodobljena.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/sl/admin/components/general.php b/resources/lang/sl/admin/components/general.php
index 7f7bfb7097..474d4f6f32 100644
--- a/resources/lang/sl/admin/components/general.php
+++ b/resources/lang/sl/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Ostanek',
     'total' 			                 => 'Skupaj',
     'update'                            => 'Posodobi komponento',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/sl/admin/components/message.php b/resources/lang/sl/admin/components/message.php
index 7879f99ca6..cf0c03f8bf 100644
--- a/resources/lang/sl/admin/components/message.php
+++ b/resources/lang/sl/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Komponenta ni bila izdana, poskusite znova',
         'success' 		=> 'Komponenta je bila uspešno izdana.',
-        'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.'
+        'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sl/admin/consumables/message.php b/resources/lang/sl/admin/consumables/message.php
index 32da69fd6a..9edcd7a8c9 100644
--- a/resources/lang/sl/admin/consumables/message.php
+++ b/resources/lang/sl/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Potrošni material ni bil izdan, poskusite znova',
         'success' 		=> 'Potrošni material uspešno izdan.',
-        'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.'
+        'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sl/admin/custom_fields/general.php b/resources/lang/sl/admin/custom_fields/general.php
index 685916fe91..8d4665ea3d 100644
--- a/resources/lang/sl/admin/custom_fields/general.php
+++ b/resources/lang/sl/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Uporabljeno po modelih',
     'order'   		            => 'Naročilo',
     'create_fieldset'         => 'Nov set polj',
+    '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'            => 'Novo polje po meri',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/sl/admin/groups/message.php b/resources/lang/sl/admin/groups/message.php
index ebe804b14d..4958e8fdc6 100644
--- a/resources/lang/sl/admin/groups/message.php
+++ b/resources/lang/sl/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Skupina že obstaja!',
-    'group_not_found'     => 'Skupina [: id] ne obstaja.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Polje ime je obvezno',
 
     'success' => array(
diff --git a/resources/lang/sl/admin/hardware/form.php b/resources/lang/sl/admin/hardware/form.php
index 40b56c252b..6d2f3c32cc 100644
--- a/resources/lang/sl/admin/hardware/form.php
+++ b/resources/lang/sl/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Potrdite množičn izbris sredstev',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_delete_warn'	=> 'Brisali boste: asset_count sredstev.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/sl/admin/hardware/general.php b/resources/lang/sl/admin/hardware/general.php
index b522a2ea8d..561f054a98 100644
--- a/resources/lang/sl/admin/hardware/general.php
+++ b/resources/lang/sl/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'To sredstvo je bilo izbrisano.',
     'edit'  					=> 'Urejanje sredstva',
     'model_deleted'  			=> 'Model tega sredstva je bil izbrisan. Pred obnovitvijo sredstva je potrebno obnoviti model.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Zahtevano',
     'requested'				    => 'Zahtevano',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Obnovitev sredstev',
     'pending'  					=> 'Na čakanju',
     'undeployable'  			=> 'Nerazdeljeno',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/sl/admin/hardware/message.php b/resources/lang/sl/admin/hardware/message.php
index 8e43049b2b..d0874dc045 100644
--- a/resources/lang/sl/admin/hardware/message.php
+++ b/resources/lang/sl/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Sredstvo ni bilo obnovljeno, poskusite znova',
         'success' 		=> 'Sredstvo je bilo uspešno obnovljeno.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/sl/admin/hardware/table.php b/resources/lang/sl/admin/hardware/table.php
index cf47fd5a42..8235968922 100644
--- a/resources/lang/sl/admin/hardware/table.php
+++ b/resources/lang/sl/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Prejeto/Izdano',
     'checkout_date' => 'Datum Izdaje',
     'checkoutto' 	=> 'Izdano',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Razlika',
     'dl_csv' 		=> 'Prenesi CSV',
diff --git a/resources/lang/sl/admin/licenses/general.php b/resources/lang/sl/admin/licenses/general.php
index 06ce742108..85f7b9c4e4 100644
--- a/resources/lang/sl/admin/licenses/general.php
+++ b/resources/lang/sl/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'O licencah',
-    'about_licenses'                  => 'Licence se uporabljajo za sledenje programske opreme. Imajo določeno število prostih mest, ki jih je mogoče izdati posameznikom',
+    'about_licenses_title'      => 'O licencah',
+    'about_licenses'            => 'Licence se uporabljajo za sledenje programske opreme. Imajo določeno število prostih mest, ki jih je mogoče izdati posameznikom',
     'checkin'  					=> 'Prevzem licenčnih mest',
     'checkout_history'  		=> 'Zgodovina izdaje',
     'checkout'  				=> 'Izdaj licenco',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licence za programsko opremo',
     'user'  					=> 'Uporabnik',
     'view'  					=> 'Ogled licence',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/sl/admin/manufacturers/message.php b/resources/lang/sl/admin/manufacturers/message.php
index 16c8ba3c07..c9f2ad04bd 100644
--- a/resources/lang/sl/admin/manufacturers/message.php
+++ b/resources/lang/sl/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Proizvajalec ne obstaja.',
     'assoc_users'	 => 'Ta proizvajalec je trenutno povezan z vsaj enim modelom in ga ni mogoče izbrisati. Prosimo, posodobite svoje modele, da ne bodo vsebovali tega proizvajalca in poskusili znova. ',
 
diff --git a/resources/lang/sl/admin/manufacturers/table.php b/resources/lang/sl/admin/manufacturers/table.php
index 2e2dad4c80..2691ff010a 100644
--- a/resources/lang/sl/admin/manufacturers/table.php
+++ b/resources/lang/sl/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Podpora e-pošta',
     'support_phone'   		=> 'Podpora telefon',
     'support_url'   		=> 'Podporni URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Posodobi proizvajalca',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/sl/admin/models/general.php b/resources/lang/sl/admin/models/general.php
index 271dea6294..6dfd342001 100644
--- a/resources/lang/sl/admin/models/general.php
+++ b/resources/lang/sl/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Izbrisali boste :modelov_count modelov sredstev.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Obnovi model',
     'requestable'               => 'Uporabniki lahko zahtevajo ta model',
 	'show_mac_address'			      => 'V tem modelu prikažite polje MAC naslov v sredstvih',
diff --git a/resources/lang/sl/admin/models/message.php b/resources/lang/sl/admin/models/message.php
index d710a868d1..eed4215ccf 100644
--- a/resources/lang/sl/admin/models/message.php
+++ b/resources/lang/sl/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model ne obstaja.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a 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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model ni bil posodobljen, poskusite znova',
-        'success' => 'Model je bil uspešno posodobljen.'
+        'success' => 'Model je bil uspešno posodobljen.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Polja niso bila spremenjena, nič ni posodobljeno.',
-        'success' 		=> 'Modeli so posodobljeni.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Modeli niso bili izbrani, nič ni izbrisano.',
-        'success' 		    => ': model (i) so izbrisani!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         '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/admin/settings/general.php b/resources/lang/sl/admin/settings/general.php
index 29a780884b..753a43505d 100644
--- a/resources/lang/sl/admin/settings/general.php
+++ b/resources/lang/sl/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'To je strežnik Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Pošlji opozorila na',
     '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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Ime mesta',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack nastavitve',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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 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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/sl/admin/settings/message.php b/resources/lang/sl/admin/settings/message.php
index 4f10088e75..9dd7a1f09d 100644
--- a/resources/lang/sl/admin/settings/message.php
+++ b/resources/lang/sl/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/sl/admin/users/general.php b/resources/lang/sl/admin/users/general.php
index acda247771..6e4fa889d1 100644
--- a/resources/lang/sl/admin/users/general.php
+++ b/resources/lang/sl/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     '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',
     '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/sl/admin/users/message.php b/resources/lang/sl/admin/users/message.php
index 5f8c377d27..b5d1dc9238 100644
--- a/resources/lang/sl/admin/users/message.php
+++ b/resources/lang/sl/admin/users/message.php
@@ -6,7 +6,7 @@ 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 [: id] ne obstaja.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Polje za prijavo je obvezno',
     'user_password_required'    => 'Geslo je obvezno.',
     'insufficient_permissions'  => 'Nezadostna dovoljenja.',
diff --git a/resources/lang/sl/auth/general.php b/resources/lang/sl/auth/general.php
index 60f3d10601..c097d4bd39 100644
--- a/resources/lang/sl/auth/general.php
+++ b/resources/lang/sl/auth/general.php
@@ -13,5 +13,8 @@ return [
     'username_help_top'                 => 'Vnesi svoje <strong>uporabniško ime</strong> za pošiljanje povezave za ponastavitev gesla.',
     'username_help_bottom'          => 'Uporabniško ime in geslo <em>sta lahko</em> enaki, vendar to ni nujno, odvisno od konfiguracije. Če se ne spomniš uporabniškega imena, kontaktiraj skrbnika.
 <br><br><strong>Uporabniškim imenom brez dodeljenega e-poštnega računa ne bo poslane povezave za ponastavitev gesla.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/sl/general.php b/resources/lang/sl/general.php
index 858c4d3757..351f2d1a92 100644
--- a/resources/lang/sl/general.php
+++ b/resources/lang/sl/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Dodatki',
     'activated'			    => 'Aktiviran',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Dodatna oprema',
     'accessory_report'		=> 'Poročilo o dodatni opremi',
     'action'                => 'Dejanje',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Revizija',
     'audit_report'			=> 'Dnevnik revizije',
     'assets'				=> 'Sredstva',
+    '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'         => 'Izbriši Avatar',
     'avatar_upload'         => 'Naloži Avatar',
     'back'      			=> 'Nazaj',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'po Statusu',
     'cancel'  				=> 'Prekliči',
     'categories'			=> 'Kategorije',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Izbrisano',
     'delete_seats'  		=> 'Izbrisana mesta',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Sprejemljivi tipi datotek so jpg, png, gif in svg. Dovoljena je največja velikost nalaganja :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',
     'importing'         	=> 'Uvažanje',
     'importing_help'        => 'Mogoč je uvoz sredstev, dodatkov, licenc, komponent, potrošnega materiala in uporabnikov preko datotek CSV.
@@ -149,6 +160,8 @@ return [
     'asset_maintenances'       => 'Sredstva vzdrževanja',
     'item'  				=> 'Element',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nezadostna dovoljenja!',
     'kits'       			=> 'Vnaprej določeni kompleti',
     'language'				=> 'Jezik',
@@ -219,6 +232,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Zahteva je bila preklicana',
     'save'  				=> 'Shrani',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Izberite',
     'select_all'            => 'Select All',
     'search'				=> 'Iskanje',
@@ -241,8 +255,8 @@ return [
     'signature'             => 'Podpis',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Preobleka',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Ohh! Izgleda, da tvoja integracija Slack z Snipe-IT deluje!',
+    '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: nekatere funkcije so onemogočene za to namestitev.',
     'site_name'				=> 'Ime mesta',
     'state'  				=> 'Stanje',
@@ -254,7 +268,6 @@ return [
     'sure_to_delete'    => 'Ali ste prepričani, da želite izbrisati',
     'submit'				=> 'Pošlji',
     'target'                => 'Cilj',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Prikaz časa in datuma',
     'total_assets'			=> 'skupno sredstev',
     'total_licenses'		=> 'skupno licenc',
@@ -376,7 +389,8 @@ 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 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',
@@ -386,8 +400,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/sl/help.php b/resources/lang/sl/help.php
index 909617e5d2..cbfe24d3dc 100644
--- a/resources/lang/sl/help.php
+++ b/resources/lang/sl/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Več informacij',
 
-    'audit_help' => 'Če potrdite to polje, boste spremenili zapis sredstva, da bo odražal to novo lokacijo. Če je ne potrdite, boste lokacijo preprosto zabeležili v revizijskem dnevniku.<br><br>Upoštevajte, da če je to sredstvo izdano, to ne bo spremenilo lokacije osebe, sredstva ali lokacije, na katero je izdano.',
+    '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' => '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.',
 
diff --git a/resources/lang/sl/localizations.php b/resources/lang/sl/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/sl/localizations.php
+++ b/resources/lang/sl/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/sl/mail.php b/resources/lang/sl/mail.php
index 724180c6a4..31848ef446 100644
--- a/resources/lang/sl/mail.php
+++ b/resources/lang/sl/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Prijavite se v svojo novo namestitev Snipe-IT s spodnjimi poverilnicami:',
     'login' => 'Prijava:',
     'Low_Inventory_Report' => 'Poročilo o nizki zalogi',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min kol',
     'name' => 'Ime',
     'new_item_checked' => 'Pod vašim imenom je bil izdan nov element, spodaj so podrobnosti.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Vaše poverilnice Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/sl/validation.php b/resources/lang/sl/validation.php
index 2f6bedde23..d18eeefacd 100644
--- a/resources/lang/sl/validation.php
+++ b/resources/lang/sl/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Atribut mora imeti vsaj: min elementov.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Izbrani atribut je neveljaven.',
     'numeric'              => 'Atribut mora biti število.',
     'present'              => 'Polje atribut mora biti prisotno.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Vaše trenutno geslo je napačno',
         'dumbpwd'          => 'To geslo je preveč pogosto.',
         'statuslabel_type' => 'Izbrati morate veljavn status oznake',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/sr-CS/admin/accessories/general.php b/resources/lang/sr-CS/admin/accessories/general.php
index 51dc61e776..ec7e0ec59a 100644
--- a/resources/lang/sr-CS/admin/accessories/general.php
+++ b/resources/lang/sr-CS/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Ažuriraj pribore',
     'use_default_eula'					=> 'Umesto ovoga upotrebite <a href="#" data-toggle="modal" data-target="#eulaModal">primarnu postavku EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Koristi osnovnu, default EULA.</del> Nema primarne, default EULA. Dodajte jednu u Postavke.',
+    'clone'                             => 'Kloniraj pribor',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/sr-CS/admin/accessories/message.php b/resources/lang/sr-CS/admin/accessories/message.php
index 55d768529e..c8dc5057e8 100644
--- a/resources/lang/sr-CS/admin/accessories/message.php
+++ b/resources/lang/sr-CS/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Pribor nije potvrdjen, pokušajte ponovo',
         'success' 		=> 'Pribor je uspešno proveren.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušajte ponovo.'
     ),
 
diff --git a/resources/lang/sr-CS/admin/asset_maintenances/form.php b/resources/lang/sr-CS/admin/asset_maintenances/form.php
index bdb85a424d..12131b790d 100644
--- a/resources/lang/sr-CS/admin/asset_maintenances/form.php
+++ b/resources/lang/sr-CS/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Vrsta održavanja',
+        'asset_maintenance_type' => 'Tip održavanja imovine',
         'title'                  => 'Naslov',
-        'start_date'             => 'Započeto',
-        'completion_date'        => 'Završeno',
+        'start_date'             => 'Datum početka',
+        'completion_date'        => 'Datum završetka',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Poboljšanje garancije',
-        'asset_maintenance_time' => 'Dani',
+        'asset_maintenance_time' => 'Vreme trajanja održavanja opreme (koliko dana)',
         'notes'                  => 'Zabeleške',
-        'update'                 => 'Ažuriraj',
-        'create'                 => 'Kreiraj'
+        'update'                 => 'Dopuna održavanja opreme',
+        'create'                 => 'Napravite zahtev za održavanje opreme'
     ];
diff --git a/resources/lang/sr-CS/admin/categories/message.php b/resources/lang/sr-CS/admin/categories/message.php
index 523ed58bc5..c0dbee3f7a 100644
--- a/resources/lang/sr-CS/admin/categories/message.php
+++ b/resources/lang/sr-CS/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorija nije ažurirana, pokušajte ponovo',
-        'success' => 'Kategorija je uspješno ažurirana.'
+        'success' => 'Kategorija je uspješno ažurirana.',
+        'cannot_change_category_type'   => 'Kada je kreiran, tip kategorije nije moguće promeniti',
     ),
 
     'delete' => array(
diff --git a/resources/lang/sr-CS/admin/components/general.php b/resources/lang/sr-CS/admin/components/general.php
index a811317a49..170ad81789 100644
--- a/resources/lang/sr-CS/admin/components/general.php
+++ b/resources/lang/sr-CS/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Preostalo',
     'total' 			                 => 'Ukupno',
     'update'                            => 'Ažuriraj komponentu',
+    'checkin_limit'            => 'Količina prijavljenih mora biti jednaka ili manja od :assigned_qty'
 );
diff --git a/resources/lang/sr-CS/admin/components/message.php b/resources/lang/sr-CS/admin/components/message.php
index 3f39dcec93..84a5507d30 100644
--- a/resources/lang/sr-CS/admin/components/message.php
+++ b/resources/lang/sr-CS/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Component was not checked out, please try again',
         'success' 		=> 'Component checked out successfully.',
-        'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušaj te ponovo.'
+        'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušaj te ponovo.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sr-CS/admin/consumables/message.php b/resources/lang/sr-CS/admin/consumables/message.php
index 2b0cd5b67e..6126e8e593 100644
--- a/resources/lang/sr-CS/admin/consumables/message.php
+++ b/resources/lang/sr-CS/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Consumable was not checked out, please try again',
         'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušaj te ponovo.'
+        'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušaj te ponovo.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sr-CS/admin/custom_fields/general.php b/resources/lang/sr-CS/admin/custom_fields/general.php
index b589c01ba9..9d89498a96 100644
--- a/resources/lang/sr-CS/admin/custom_fields/general.php
+++ b/resources/lang/sr-CS/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Koriste ga modeli',
     'order'   		            => 'Porudžbina',
     'create_fieldset'         => 'Novo Polje',
+    'update_fieldset'         => 'Osveži grupu polja',
+    'fieldset_does_not_exist'   => 'Grupa polja :id ne postoji',
+    'fieldset_updated'         => 'Grupa polja je osvežena',
     'create_fieldset_title' => 'Kreirajte novu grupu polja',
     'create_field'            => 'Novo prilagodjeno polje',
     'create_field_title' => 'Kreirajte prilagođeno polje',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'UPOZORENJE. Ovo polje je u tabeli prilagođenih polja kao <code>:db_column</code>, ali bi trebalo da bude <code>:expected</code>.',
     'is_unique' => 'Ova vrednost mora biti jedinstvena za sva sredstva',
     'unique' => 'Jedinstven',
-    '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' => 'Dozvoli zaduženom korisniku da vidi ove vrednosti na njihovoj stranici pregleda zadužene imovine',
+    'display_in_user_view_table' => 'Vidljivo korisniku',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/sr-CS/admin/groups/message.php b/resources/lang/sr-CS/admin/groups/message.php
index f54b4f72a7..8b7e339d22 100644
--- a/resources/lang/sr-CS/admin/groups/message.php
+++ b/resources/lang/sr-CS/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grupa već postoji!',
-    'group_not_found'     => 'Grupa [: id] ne postoji.',
+    'group_not_found'     => 'Не постоји ИД групе :id.',
     'group_name_required' => 'Polje naziv je obavezno',
 
     'success' => array(
diff --git a/resources/lang/sr-CS/admin/hardware/form.php b/resources/lang/sr-CS/admin/hardware/form.php
index 1ba951247d..7069382318 100644
--- a/resources/lang/sr-CS/admin/hardware/form.php
+++ b/resources/lang/sr-CS/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Potvrda grupnog brisanja imovine',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Pregledajte stavke za grupno brisanje. Jednom izbrisana, ta se sredstva mogu vratiti, ali više neće biti povezana s korisnicima koji su trenutno dodeljeni.',
+  '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'	=> 'Izbrisaćete: asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Grupno ažuriranje imovine',
     'bulk_update_help'	=> 'Ova forma vam omogućava da ažururate više stavki odjednom. Popunite samo polja koja želite da izmenite. Nepopunjena polja ostaće nepromenjena. ',
-    '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_warn'	=> 'Sada ćete izmeniti svojstva jedne imovine.|Sada ćete izmeniti svojstva :asset_count imovina.',
     'checkedout_to'		=> 'Checked Out To',
     'checkout_date'		=> 'Checkout Date',
     'checkin_date'		=> 'Checkin Date',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Izmeni samo predefinisanu 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.',
-    'processing_spinner' => 'Obrada...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Opcione informacije',
     'order_details'   => 'Informacije o nabavci'
 ];
diff --git a/resources/lang/sr-CS/admin/hardware/general.php b/resources/lang/sr-CS/admin/hardware/general.php
index b267301aa8..7f1036dbec 100644
--- a/resources/lang/sr-CS/admin/hardware/general.php
+++ b/resources/lang/sr-CS/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Imovina je obrisana.',
     'edit'  					=> 'Uređivanje imovine',
     'model_deleted'  			=> 'Ovaj Model osnovnog sredstva je izbrisan. Morate da vratite model da bi ste mogli da vratite sredstvo.',
+    'model_invalid'             => 'Model ove imovine je neispravan.',
+    'model_invalid_fix'         => 'Ova imovinu bi trebalo izmeniti da bi se ovo ispravilo pre pokušaja zaduživanja ili razduživanja.',
     'requestable'               => 'Može da se potražuje',
     'requested'				    => 'Zatraženo',
     'not_requestable'           => 'Ne može da se potražuje',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'U čekanju',
     'undeployable'  			=> 'Ne može da se razmesti',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Prikaz imovine',
     'csv_error' => 'Postoji greška u tvojoj CSV datoteci:',
     'import_text' => '
@@ -33,5 +36,6 @@ Otpremite CSV koji sadrži istoriju osnovnog sredstva. Sredstva i korisnici MORA
     'error_messages' => 'Poruka o grešci:',
     'success_messages' => 'Poruke o uspehu:',
     'alert_details' => 'Za detalje pogledajte ispod.',
-    'custom_export' => 'Uobičajen izvoz'
+    'custom_export' => 'Uobičajen izvoz',
+    'mfg_warranty_lookup' => 'Pretraga statusa :manufacturer garancije',
 ];
diff --git a/resources/lang/sr-CS/admin/hardware/message.php b/resources/lang/sr-CS/admin/hardware/message.php
index 1712fe46d1..b5a30655bc 100644
--- a/resources/lang/sr-CS/admin/hardware/message.php
+++ b/resources/lang/sr-CS/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Imovina nije obnovljena, pokušajte ponovo',
         'success' 		=> 'Imovina je uspešno obnovljena.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Vaš fajl je importovan',
         'file_delete_success'   => 'Vaš je fajl uspešno izbrisan',
         'file_delete_error'      => 'Fajl nime moguće izbrisati',
+        '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',
     ],
 
 
diff --git a/resources/lang/sr-CS/admin/hardware/table.php b/resources/lang/sr-CS/admin/hardware/table.php
index 85cf1d495a..5b58e44075 100644
--- a/resources/lang/sr-CS/admin/hardware/table.php
+++ b/resources/lang/sr-CS/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'U/I',
     'checkout_date' => 'Datum odjave',
     'checkoutto' 	=> 'Odjavljen',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Trenutna vrednost',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Download CSV',
diff --git a/resources/lang/sr-CS/admin/licenses/general.php b/resources/lang/sr-CS/admin/licenses/general.php
index 4c76ec7d96..dab5a2a317 100644
--- a/resources/lang/sr-CS/admin/licenses/general.php
+++ b/resources/lang/sr-CS/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'O licencama',
-    'about_licenses'                  => 'Licence se koriste za praćenje softvera. Imaju određeni broj mesta koja se mogu dodeliti pojedincima',
+    'about_licenses_title'      => 'O licencama',
+    'about_licenses'            => 'Licence se koriste za praćenje softvera. Imaju određeni broj mesta koja se mogu dodeliti pojedincima',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Checkout History',
     'checkout'  				=> 'Checkout License Seat',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Licence za softver',
     'user'  					=> 'Korisnik',
     'view'  					=> 'Prikaži licencu',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/sr-CS/admin/licenses/message.php b/resources/lang/sr-CS/admin/licenses/message.php
index bf30fa06f2..711583c089 100644
--- a/resources/lang/sr-CS/admin/licenses/message.php
+++ b/resources/lang/sr-CS/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Licenca ne postoji ili vi nemate dozvolu da je vidite.',
     'user_does_not_exist' => 'Korisnik ne postoji.',
     'asset_does_not_exist' 	=> 'Imovina koju pokušavate povezati s ovom licencom ne postoji.',
     'owner_doesnt_match_asset' => 'Imovina koju pokušavate povezati s ovom licencom nije u vlasništvu osobe koja je odabrana u padajućem meniju.',
diff --git a/resources/lang/sr-CS/admin/locations/message.php b/resources/lang/sr-CS/admin/locations/message.php
index d023850c32..9ec24a6ac9 100644
--- a/resources/lang/sr-CS/admin/locations/message.php
+++ b/resources/lang/sr-CS/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Ta je lokacija trenutno povezana s barem jednim korisnikom i ne može se izbrisati. Ažurirajte korisnike da više se ne referenciraju na ovu lokaciju i pokušajte ponovno. ',
     '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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Dodeljena imovina',
+    'current_location' => 'Trenutna lokacija',
 
 
     'create' => array(
diff --git a/resources/lang/sr-CS/admin/manufacturers/message.php b/resources/lang/sr-CS/admin/manufacturers/message.php
index 9e2b26804b..768dc97255 100644
--- a/resources/lang/sr-CS/admin/manufacturers/message.php
+++ b/resources/lang/sr-CS/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Proizvođač ne postoji.',
     'assoc_users'	 => 'Ovaj je proizvođač trenutno povezan s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da se više ne referenciraju na ovog proizvođača i pokušajte ponovno. ',
 
diff --git a/resources/lang/sr-CS/admin/manufacturers/table.php b/resources/lang/sr-CS/admin/manufacturers/table.php
index 75e52c5e02..0338fd6309 100644
--- a/resources/lang/sr-CS/admin/manufacturers/table.php
+++ b/resources/lang/sr-CS/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email za podršku',
     'support_phone'   		=> 'Telefon za podršku',
     'support_url'   		=> 'URL za podršku',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Ažuriraj proizvođača',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/sr-CS/admin/models/general.php b/resources/lang/sr-CS/admin/models/general.php
index fc1386a28d..fd7dbb1a05 100644
--- a/resources/lang/sr-CS/admin/models/general.php
+++ b/resources/lang/sr-CS/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => 'Želite da obrišete :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Vraćanje modela',
     'requestable'               => 'Korisnici mogu zatražiti ovaj model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
diff --git a/resources/lang/sr-CS/admin/models/message.php b/resources/lang/sr-CS/admin/models/message.php
index c63a1b282a..3990a29671 100644
--- a/resources/lang/sr-CS/admin/models/message.php
+++ b/resources/lang/sr-CS/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model ne postoji.',
+    'no_association' => 'NEMA POVEZANOG MODELA.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model nije ažuriran, pokušajte ponovo',
-        'success' => 'Model je uspešno ažuriran.'
+        'success' => 'Model je uspešno ažuriran.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Polja nisu menjana, tako da ništa nije ažurirano.',
-        'success' 		=> 'Modeli su ažurirani.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Nijedan model nije odabran, tako da ništa nije izbrisano.',
-        'success' 		    => ':success_count model(a) izbrisan(o)!',
+        '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/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php
index 88d2c399c0..c3a964deb6 100644
--- a/resources/lang/sr-CS/admin/settings/general.php
+++ b/resources/lang/sr-CS/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Ovo je Active Directory server',
     'alerts'                	=> 'Upozorenja',
-    'alert_title'               => 'Obnovite podešavanja 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',
     'alerts_enabled'			=> 'Upozorenja na email su omogućena',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Vraćanje rezervne kopije',
     '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>za vraćanje iz prethodne rezervne kopije. (Ovo trenutno ne funkcioniše sa S3 skladištem datoteka ili Docker-om.<br><br>Vaša <strong>cela :app_name baza podataka i sve otpremljene datoteke biće u potpunosti zamenjene</strong> onim što se nalazi u datoteci rezervne kopije.  ',
+    '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'         => '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',
@@ -75,8 +75,9 @@ return [
     'label_logo_size'           => 'Kvadratni logotipi izgledaju najbolje – biće prikazani u gornjem desnom uglu svake oznake sredstva. ',
     'laravel'                   => 'Laravel verzija',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Default Permissions Group',
+    'ldap_default_group'        => 'Predefinisana grupa dozvola',
     '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'          => 'Nema predefinisane grupe',
     'ldap_help'                 => 'LDAP/Aktivni direktorijum',
     'ldap_client_tls_key'       => 'LDAP Klijent TLS Ključ',
     'ldap_client_tls_cert'      => 'LDAP klijentskiTLS sertifikat',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP podešavanja',
     'ldap_client_tls_cert_help' => 'TLS sertifikat i ključ na strani klijenta za LDAP veze su obično korisni samo u Google Workspace konfiguracijama sa „Secure LDAP-om“. Oba su obavezna.',
      'ldap_client_tls_key'       => 'LDAP klijentski TLS ključ',
+    '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'      => 'Unesite važeće LDAP korisničko ime i lozinku iz osnovnog DN-a koji ste naveli iznad da biste proverili da li je vaša LDAP prijava ispravno konfigurisana. PRVO MORATE SAČUVATI VAŠA AŽURIRANA LDAP PODEŠAVANJA.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Prikaži slike u imejlovima',
     'show_images_in_email_help'   => 'Poništite izbor u ovom polju za potvrdu ako je vaša Snipe-IT instalacija iza VPN-a ili zatvorene mreže i korisnici van mreže neće moći da učitavaju slike koje se serviraju iz ove instalacije u svoje imejlove.',
     'site_name'                 => 'Naziv sajta',
+    'integrations'               => 'Integracije',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Obnovite Slack podešavanja',
-    'slack_help'                => 'Slack podešavanja',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack kanal',
-    'slack_endpoint'            => 'Slack krajnja tačka',
-    'slack_integration'         => 'Slack podešavanja',
-    'slack_integration_help'    => 'Slack integracija je opciona, međutim krajnja tačka i kanal su potrebni ako želite da je koristite. Da biste konfigurisali Slack integraciju, prvo morate da <a href=":slack_link" target="_nev" rel="noopener">napravite dolazni veb-huk</a> na svom Slack nalogu. Kliknite na dugme <strong>Testiraj Slack integraciju</strong> da biste potvrdili da su vaša podešavanja tačna pre nego što ih sačuvate. ',
-    'slack_integration_help_button'    => 'Kada sačuvate svoje Slack informacije, pojaviće se dugme za testiranje.',
-    'slack_test_help'           => 'Testirajte da li je vaša Slack integracija ispravno konfigurisana. PRVO MORATE SAČUVATI SVOJE AŽURIRANA PODEŠAVANJA SLACK.',
+    'general_webhook'           => 'Opšta veb zakačka',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Testiraj da sačuvaš',
+    'webhook_title'               => 'Obnovite podešavanja veb zakački',
+    'webhook_help'                => 'Podešavanje integracija',
+    'webhook_botname'             => ':app naziv bota',
+    'webhook_channel'             => ':app kanal',
+    'webhook_endpoint'            => ':app krajnja tačka',
+    'webhook_integration'         => ':app podešavanja',
+    'webhook_test'                 =>'Testiraj :app integraciju',
+    '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 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',
@@ -305,7 +313,7 @@ return [
     '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, podešavanja revizije',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Povećavanje i prefiksi',
     'labels' => 'Oznake',
     'labels_title' => 'Obnovite podešavanja oznaka',
@@ -326,4 +334,9 @@ 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',
+    '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. ',
+
 ];
diff --git a/resources/lang/sr-CS/admin/settings/message.php b/resources/lang/sr-CS/admin/settings/message.php
index 7519ab487b..28302233e3 100644
--- a/resources/lang/sr-CS/admin/settings/message.php
+++ b/resources/lang/sr-CS/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testiranje LDAP autentifikacije...',
         'authentication_success' => 'Autentifikacija korisnika na LDAP-u je uspešna!'
     ],
-    'slack' => [
-        'sending' => 'Slack test poruke...',
+    'webhook' => [
+        'sending' => 'Slanje :app probne poruke...',
         'success_pt1' => 'Uspešno! Proverite ',
-        'success_pt2' => ' kanal za vašu test poruku i obavezno kliknite na SAČUVAJ ispod da biste sačuvali svoja podešavanja.',
+        'success_pt2' => ' kanal za vašu probnu poruku i obavezno kliknite na SAČUVAJ ispod da biste sačuvali svoja podešavanja.',
         '500' => '500 Greška servera.',
-        'error' => 'Nešto nije u redu.',
+        'error' => 'Nešto nije u redu. :app je adgovorila sa: :error_message',
+        'error_misc' => 'Nešto nije u redu. :( ',
     ]
 ];
diff --git a/resources/lang/sr-CS/admin/users/general.php b/resources/lang/sr-CS/admin/users/general.php
index 8d8bfe61c8..d8fc65db5e 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.',
+    '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',
     'send_email_help'   => 'Morate da navedete adresu e-pošte za ovog korisnika da biste mu poslali akreditive. Slanje akreditiva e-poštom se može izvršiti samo prilikom kreiranja korisnika. Lozinke se čuvaju u jednosmernom hešu i ne mogu se preuzeti kada su sačuvane.',
     'view_user'         => 'Prikaži korisnika :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Samo superadministratori mogu odobriti korisniku superadministratorski pristup.',
     'admin_permission_warning' => 'Samo korisnici sa administratorskim pravima ili većim mogu odobriti korisniku administratorski pristup.',
     'remove_group_memberships' => 'Uklonite članstvo u grupi',
-    'warning_deletion' => 'UPOZORENJE:',
     'warning_deletion_information' => 'Potrebno je da obeležite SVE stavke navedene ispod počevši od stavke :broj korisnika. Imena superadministratora su istaknuta crvenom bojom.',
     'update_user_assets_status' => 'Uredi svu imovinu ovih korisnika u ovaj status',
     'checkin_user_properties' => 'Proverite sva svojstva povezana sa ovim korisnicima',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Daljinski',
     'remote_help' => 'Ovo može biti korisno ako treba da filtrirate prema udaljenim korisnicima koji nikada ili retko dolaze na vaše fizičke lokacije.',
     'not_remote_label' => 'Ovo nije udaljeni korisnik',
+    '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' => 'Kreiraj korisnika',
+    'create_user_page_explanation' => 'Ovo su informacije o nalogu koje će te koristiti da pristupite sajtu po prvi put.',
+    'email_credentials' => 'Akreditivi za Email',
+    'email_credentials_text' => 'Pošalji moje akreditive na adresu elektornske pošte navedene iznad',
+    'next_save_user' => 'Sledeće: Sačuvaj korisnika',
+    'all_assigned_list_generation' => 'Generisano:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/sr-CS/admin/users/message.php b/resources/lang/sr-CS/admin/users/message.php
index 64a226afb5..9a141314c9 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 [:id] ne postoji.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Polje za prijavu je obavezno',
     'user_password_required'    => 'Lozinka je obavezna.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => 'Odabranim korisnicima koji su aktivirani i imaju važeće adrese e-pošte poslat je link za resetovanje lozinke.',
     'password_reset_sent'       => 'Link za resetovanje lozinke je poslat na :email!',
     'user_has_no_email'         => 'Ovaj korisnik nema adresu e-pošte u svom profilu.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Ovaj korisnik nema nijednu zaduženu imovinu',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Korisnik nema navedenu adresu e-pošte.',
+        'success' => 'Ovaj korisnik je obavešten o njegovom trenutnom inventaru.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/sr-CS/auth/general.php b/resources/lang/sr-CS/auth/general.php
index cfb035bbfd..880a0f97c8 100644
--- a/resources/lang/sr-CS/auth/general.php
+++ b/resources/lang/sr-CS/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Zapamti me',
     'username_help_top'                 => 'Unesite svoje <strong>korisničko ime</strong> da biste e-poštom dobili vezu za resetovanje lozinke.',
     'username_help_bottom'          => 'Vaše korisničko ime i adresa e-pošte <em>mogu</em> biti isti, ali možda i nisu, u zavisnosti od vaše konfiguracije. Ako ne možete da se setite svog korisničkog imena, obratite se administratoru. <br><br><strong>Korisničkim imenima bez povezane adrese e-pošte neće se slati link za ponovno postavljanje lozinke.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index cfffdaa9a1..28ac10c71a 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Dodatna oprema',
     'activated'			    => 'Aktiviran',
+    'accepted_date'         => 'Datum preuzimanja',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Akcija',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Dodana mesta',
-    'age'                   => "Age",
+    'age'                   => "Godine",
     'all_assets'			=> 'Sve imovine',
     'all'       			=> 'Sve',
     'archived'              => 'Arhivirano',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Revizija',
     'audit_report'			=> 'Zapisnik revizije',
     'assets'				=> 'Imovina',
+    'assets_audited'        => 'popisana imovina',
+    'assets_checked_in_count'     => 'razdužena imovina',
+    'assets_checked_out_count'     => 'zadužena imovina',
+    'asset_deleted_warning'     => 'Ova imovina je obrisana. Morate je povratiti pre nego što je zadužite nekome.',
+    'assigned_date'         => 'Datum dodele',
     'assigned_to'           => 'Zadužen :name',
+    'assignee'              => 'Dodeljeno',
     'avatar_delete'         => 'Obriši avatar',
     'avatar_upload'         => 'Učitaj avatar',
     'back'      			=> 'Nazad',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Masovno uređivanje',
     'bulk_delete'           => 'Masovno brisanje',
     'bulk_actions'          => 'Masovne radnje',
-    'bulk_checkin_delete'   => 'Grupno prijavljivanje stavki od strane korisnika',
+    'bulk_checkin_delete'   => 'Grupno razduživanje / brisanje korisnika',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Ova imovina je u vlasništvu korisnika',
     'bystatus'              => 'prema statusu',
     'cancel'  				=> 'Otkazati',
     'categories'			=> 'Kategorije',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Izbrisano',
     'delete_seats'  		=> 'Izbrisana mesta',
     'deletion_failed'       => 'Neuspelo brisanje',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => 'Uključi izbrisana sredstva.',
     'filetypes_size_help'   => 'Maksimalna dozvoljena veličina za otpremanje je :size.',
     'image_filetypes_help'  => 'Prihvatljivi tipovi datoteka su jpg, webp, png, gif i svg. 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',
     'importing'         	=> 'Uvoženje',
     'importing_help'        => 'Možete uvesti imovinu, opremu, licence, komponente, potrošnu robu i korisnike uz pomoć CSV datoteke. <br><br>Podaci u CSV datoteci trebaju biti odvojeni zarezom i formatirani sa zaglavljima koji se poklapaju sa <a href="https://snipe-it.readme.io/docs/importing" target="_new">primerima CSV-a u dokumentaciji</a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Održavanja imovine',
     'item'  				=> 'Stavka',
     'item_name'             => 'Naziv stavke',
+    'import_file'  			=> 'uvezi CSV datoteku',
+    'import_type'  			=> 'tip CSV uvoza',
     'insufficient_permissions' => 'Nedovoljna dozvola!',
     'kits'       			=> 'Kompleti opreme',
     'language'				=> 'Jezik',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Zatražena imovina',
     'request_canceled'      => 'Zahtev je otkazan',
     'save'  				=> 'Sačuvaj',
+    'select_var'            => 'Izaberite :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Označi',
     'select_all'            => 'Izaberi sve',
     'search'				=> 'Pretraga',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Potpis',
     'signed_off_by'         => 'Potpisao',
     'skin'       			=> 'Izgledi',
-    'slack_msg_note'        => 'A slack poruka će biti poslata',
-    'slack_test_msg'        => 'Izgleda da vaša Slack integracija sa Snipe-IT radi!',
+    'webhook_msg_note'        => 'Obaveštenje će biti poslato putem veb zakačke',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MOD: Neke funkcije su onemogućene za ovu instalaciju.',
     'site_name'				=> 'Naziv sajta',
     'state'  				=> 'Savezna država',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Da li ste sigurni da želite izbrisati',
     'submit'				=> 'Submit',
     'target'                => 'Cilj',
-    'toggle_navigation'     => 'Navigacioni meni',
     'time_and_date_display' => 'Prikaz vremena i datuma',
     'total_assets'			=> 'ukupna imovina',
     'total_licenses'		=> 'ukupne licence',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Da',
     'zip'  					=> 'Zip',
     'noimage'				=> 'Nije prenesena slika ili slika nije pronađena.',
-    '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'   => 'Zahtevana datoteka ne postoji na serveru.',
+    'file_upload_success'   => 'Uspešno postavljanje datoteke!',
+    'no_files_uploaded'     => 'Uspešno postavljanje datoteke!',
     'token_expired'         => 'Sesija za obrazac je istekla. Molim pokušajte ponovo.',
     'login_enabled'         => 'Prijava je omogućena',
     'audit_due'             => 'Spremno za reviziju',
@@ -375,18 +388,65 @@ 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' => 'Delete values for this asset|Delete values for all :asset_count assets ',
-    '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'
+    'set_to_null'           => 'Obriši vrednosti ove imovine|Obriši vrednosti za svih :asset_count imovina ',
+    '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',
+    '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',
+    'preview_not_available' => '(nema predpregleda)',
+    'setup'                 => 'Postavke',
+    'pre_flight'            => 'Pre poletanja',
+    'skip_to_main_content'  => 'Pređi na glavni sadržaj',
+    'toggle_navigation'     => 'Navigacioni meni',
+    'alerts'                => 'Upozorenja',
+    'tasks_view_all'        => 'Vidi sve zadatke',
+    'true'                  => 'Tačno',
+    'false'                 => 'Netačno',
+    'integration_option'    => 'Opcija integracije',
+    'log_does_not_exist'    => 'Ne postoji odgovarajući zapis u dnevniku.',
+    'merge_users'           => 'Objedini korisnike',
+    'merge_information' =>  'Ovo će objediniti :count u jednog korisnika. Izaberite korisnika ispod u kojeg želite da objedinite ostale korisnike, i povezane imovine, licence i slično će biti prebaćeno na izabranog korisnika i ostali korisnici će biti označeni kao obrisani.',
+    'warning_merge_information' => 'Ova radnja NE MOŽE biti opozvana i trebalo bi je koristiti JEDINO kada morate da objedinite korisnike zbog lošeg uvoza ili sinhronizacije. Obavezno pre toga napravite rezervnu kopiju.',
+    'no_users_selected'     => 'Nema izabranih korisnika',
+    'not_enough_users_selected'     => 'Najmanje :count korisnika mora biti izabrano',
+    'merge_success'         => ':count korisnika je uspešno objedinjeno u :into_username!',
+    'merged'                => 'objedinjeno',
+    'merged_log_this_user_into' => 'Ovaj korisnik (ID :to_id - :to_username) je obejdinjen u korisnika ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Objedinjen korisnik ID :from_id (:from_username) u ovog korisnika (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Očisti i sačuvaj',
+    'update_existing_values'    => 'Osvežiti postojeće vrednosti?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generisanje samo-inkrementirajuće imovinske oznake je onemogućeno tako da svi redovi moraju imati popunjenu kolonu "Imovinska Oznaka".',
+    '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'   => ' Pošalji e-poruku dobrodošlice novim korisnicima?',
+    'back_before_importing'     => 'Napraviti rezervnu kopiju pre uvoza?',
+    'csv_header_field'          => 'Polje CSV zaglavlja',
+    'import_field'              => 'Polje uvoza',
+    'sample_value'              => 'Primer vrednosti',
+    'no_headers'                => 'Nijedna kolona nije pronađena',
+    'error_in_import_file'      => 'Pojavila se greška pri čitanju CSV datoteke: :error',
+    'percent_complete'          => 'Završeno je :percent %',
+    'errors_importing'          => 'Pojavile su se neke greške pri uvoženju: ',
+    'warning'                   => 'UPOZORENJE: :warning',
+    'success_redirecting'       => '"Uspešno... preusmeravanje.',
+    'setup_successful_migrations' => 'Napravljene su tabele vaše baze podataka',
+    'setup_migration_output' => 'Rezultat migracije:',
+    'setup_migration_create_user' => 'Sledeće: Napravite korisnika',
+    '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' => 'Potvrdi',
+    'autoassign_licenses' => 'Autmoatski dodelljene 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.',
+    'modal_confirm_generic'      => 'Da li ste sigurni?',
+    'cannot_be_deleted'      => 'Ova stavka ne može biti obrisana',
+    'undeployable_tooltip'      => 'Ovaj predmet ne može biti zadužen. Proveriti količinu na stanju.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/sr-CS/help.php b/resources/lang/sr-CS/help.php
index 63154f0afa..becddc6d01 100644
--- a/resources/lang/sr-CS/help.php
+++ b/resources/lang/sr-CS/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Više informacija',
 
-    'audit_help' => 'Markiranjem ovog kvadratića će izmeniti zapis imovine kako bi preslikao novu lokaciju. Ukoliko ostane ne markirano samo će se ubeležiti lokacija u zapisniku popisa.<br><br>Bitno je znati da ukoliko je imovina zadužena, neće promeniti lokaciju korisnika, imovine ili lokacije kojoj je zadužena.',
+    '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' => 'Imovina su stavke koje se prate po serijskom ili inventarnom broju. To su obično predmeti veće vrednosti gde je važna identifikacija konkretnog predmeta.',
 
diff --git a/resources/lang/sr-CS/localizations.php b/resources/lang/sr-CS/localizations.php
index 3e808a9e06..e47a4b6567 100644
--- a/resources/lang/sr-CS/localizations.php
+++ b/resources/lang/sr-CS/localizations.php
@@ -8,19 +8,19 @@ return [
         'en-GB'=> 'Engleski, UK',
         'af'=> 'Afrikaans',
         'ar'=> 'Arapski',
-        'bg'=> 'Bulgarian',
+        'bg'=> 'Bugarski',
         'zh-CN'=> 'Kineski pojednostavljen',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
+        'zh-TW'=> 'Kineski tradicionalan',
+        'hr'=> 'Hrvatski',
+        'cs'=> 'Češki',
+        'da'=> 'Danski',
+        'nl'=> 'Holandski',
         'en-ID'=> 'Engleski, Indonezija',
         'et'=> 'Estonski',
         'fil'=> 'Filipinski',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
+        'fi'=> 'Finski',
+        'fr'=> 'Francuski',
+        'de'=> 'Nemački',
         'de-i'=> 'Nemački (neformalni)',
         'el'=> 'Grčki',
         'he'=> 'Hebrejski',
@@ -31,7 +31,7 @@ return [
         'it'=> 'Italijanski',
         'ja'=> 'Japanski',
         'ko'=> 'Korejski',
-        'lv'=>'Latvian',
+        'lv'=>'Letonski',
         'lt'=> 'Litvanski',
         'mk'=> 'Makedonski',
         'ms'=> 'Malajski',
@@ -50,266 +50,267 @@ return [
         'es-CO'=> 'Spanish, Colombia',
         'es-MX'=> 'Spanish, Mexico',
         'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'sv-SE'=> 'Švedski',
         'tl'=> 'Tagalog',
         'ta'=> 'Tamil',
-        'th'=> 'Thai',
-        'tr'=> 'Turkish',
-        'uk'=> 'Ukranian',
-        'vi'=> 'Vietnamese',
-        'cy'=> 'Welsh',
+        'th'=> 'Tajlandski',
+        'tr'=> 'Turski',
+        'uk'=> 'Ukrajinski',
+        'vi'=> 'Vijetnamski',
+        'cy'=> 'Velški',
         'zu'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Izaberite državu',
     
     'countries' => [
         'AC'=>'Ascension Island',
-        'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AD'=>'Andora',
+        'AE'=>'Ujedinjeni Arapski Emirati',
+        'AF'=>'Afganistan',
+        'AG'=>'Antigva i Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albanija',
+        'AM'=>'Jermenija',
+        'AN'=>'Holandski Antili',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'Antartika',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AS'=>'Američka Samoa',
+        'AT'=>'Austrija',
+        'AU'=>'Australija',
         'AW'=>'Aruba',
         'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AZ'=>'Azerbejdžan',
+        'BA'=>'Bosna i Hercegovina',
         'BB'=>'Barbados',
         'BE'=>'Belgium',
-        'BD'=>'Bangladesh',
+        'BD'=>'Bangladeš',
         'BF'=>'Burkina Faso',
-        'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BG'=>'Bugarska',
+        'BH'=>'Bahrein',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
         'BN'=>'Brunei Darussalam',
-        'BO'=>'Bolivia',
+        'BO'=>'Bolivija',
         'BR'=>'Brazil',
-        'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
+        'BS'=>'Bahami',
+        'BT'=>'Butan',
         'BV'=>'Bouvet Island',
-        'BW'=>'Botswana',
-        'BY'=>'Belarus',
-        'BZ'=>'Belize',
-        'CA'=>'Canada',
+        'BW'=>'Bocvana',
+        'BY'=>'Belorusija',
+        'BZ'=>'Beliz',
+        'CA'=>'Kanada',
         'CC'=>'Cocos (Keeling) Islands',
         'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
+        'CF'=>'Centralnoafrička Republika',
         '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',
+        'CH'=>'Švajcarska',
+        'CI'=>'Obala slonovače',
+        'CK'=>'Kukova ostrva',
+        'CL'=>'Čile',
+        'CM'=>'Kamerun',
+        'CN'=>'Narodna republika Kina',
+        'CO'=>'Kolumbija',
+        'CR'=>'Kostarika',
+        'CU'=>'Kuba',
         'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
-        'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
+        'CX'=>'Božićno ostrvo',
+        'CY'=>'Kipar',
+        'CZ'=>'Češka republika',
+        'DE'=>'Nemačka',
+        'DJ'=>'Đibuti',
+        'DK'=>'Danska',
         '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',
+        'DO'=>'Dominikanska republika',
+        'DZ'=>'Alžir',
+        'EC'=>'Ekvador',
+        'EE'=>'Estonija',
+        'EG'=>'Egipat',
+        'ER'=>'Eritreja',
+        'ES'=>'Španija',
+        'ET'=>'Etiopija',
+        'EU'=>'Evropska unija',
+        'FI'=>'Finska',
+        'FJ'=>'Fidži',
+        'FK'=>'Folklanska ostrva',
+        'FM'=>'Mikronezija',
+        'FO'=>'Farska ostrva',
+        'FR'=>'Francuska',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GE'=>'Gruzija',
+        'GF'=>'Francuska gvajana',
         'GG'=>'Guernsey',
-        'GH'=>'Ghana',
+        'GH'=>'Gana',
         'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
-        'GM'=>'Gambia',
-        'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
+        'GL'=>'Grenland',
+        'GM'=>'Gambija',
+        'GN'=>'Gvineja',
+        'GP'=>'Gvadalupe',
+        'GQ'=>'Ekvatorijalna gvineja',
+        'GR'=>'Grčka',
         'GS'=>'South Georgia And The South Sandwich Islands',
-        'GT'=>'Guatemala',
+        'GT'=>'Gvatemala',
         'GU'=>'Guam',
-        'GW'=>'Guinea-Bissau',
-        'GY'=>'Guyana',
+        'GW'=>'Gvineja Bisao',
+        'GY'=>'Gvajana',
         'HK'=>'Hong Kong',
         'HM'=>'Heard And Mc Donald Islands',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Hrvatska',
         'HT'=>'Haiti',
-        'HU'=>'Hungary',
-        'ID'=>'Indonesia',
-        'IE'=>'Ireland',
-        'IL'=>'Israel',
-        'IM'=>'Isle of Man',
-        'IN'=>'India',
+        'HU'=>'Mađarska',
+        'ID'=>'Indonezija',
+        'IE'=>'Irska',
+        'IL'=>'Izrael',
+        'IM'=>'Ostrvo čoveka',
+        'IN'=>'Indija',
         'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IQ'=>'Irak',
+        'IR'=>'Iran',
+        'IS'=>'Island',
+        'IT'=>'Italija',
         'JE'=>'Jersey',
-        'JM'=>'Jamaica',
+        'JM'=>'Jamajka',
         'JO'=>'Jordan',
         'JP'=>'Japan',
-        'KE'=>'Kenya',
-        'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KE'=>'Kenija',
+        'KG'=>'Kirgistan',
+        'KH'=>'Kambodža',
         'KI'=>'Kiribati',
         'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
-        'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
+        'KN'=>'Sent Kits i Nevis',
+        'KR'=>'Koreja (Republika)',
+        'KW'=>'Kuvajt',
+        'KY'=>'Kajmanska ostrva',
+        'KZ'=>'Kazahstan',
         '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',
+        'LC'=>'Sveta Lucija',
+        'LI'=>'Lihtenštajn',
+        'LK'=>'Šri Lanka',
+        'LR'=>'Liberija',
+        'LS'=>'Lesoto',
+        'LT'=>'Litvanija',
+        'LU'=>'Luksemburg',
+        'LV'=>'Letonija',
         'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
-        'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
-        'ME'=>'Montenegro',
-        'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
+        'MA'=>'Maroko',
+        'MC'=>'Monako',
+        'MD'=>'Moldavija (Republika)',
+        'ME'=>'Crna gora',
+        'MG'=>'Madagaskar',
+        'MH'=>'Maršalska ostrva',
         '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',
+        'MM'=>'Mijanmar',
+        'MN'=>'Mongolija',
+        'MO'=>'Makao',
+        'MP'=>'Severna Marijanska ostrva',
+        'MQ'=>'Martinik',
+        'MR'=>'Mauritanija',
+        'MS'=>'Monserat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
-        'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'MU'=>'Mauricijus',
+        'MV'=>'Maldivi',
+        'MW'=>'Malavi',
+        'MX'=>'Meksiko',
+        'MY'=>'Malezija',
+        'MZ'=>'Mozambik',
+        'NA'=>'Namibija',
+        'NC'=>'Nova Kaledonija',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
-        'NG'=>'Nigeria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NF'=>'Norfolska ostrva',
+        'NG'=>'Nigerija',
+        'NI'=>'Nikaragva',
+        'NL'=>'Holandija',
+        'NO'=>'Norveška',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Novi Zeland',
         'OM'=>'Oman',
         'PA'=>'Panama',
         'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PF'=>'Francuska Polinezija',
+        'PG'=>'Papua Nova Gvineja',
+        'PH'=>'Filipini',
         'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
+        'PL'=>'Poljska',
+        'PM'=>'Sen Pjer i Mikelon',
         'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PR'=>'Portoriko',
+        'PS'=>'Palestina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
-        'PY'=>'Paraguay',
-        'QA'=>'Qatar',
+        'PY'=>'Paragvaj',
+        'QA'=>'Katar',
         'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
-        'SC'=>'Seychelles',
+        'RO'=>'Rumunija',
+        'RS'=>'Srbija',
+        'RU'=>'Rusija',
+        'RW'=>'Ruanda',
+        'SA'=>'Južna Arabija',
+        'UK'=>'Škotska',
+        'SB'=>'Solomonska ostrva',
+        'SC'=>'Sejšeli',
+        'SS'=>'Južni Sudan',
         'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
-        'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
+        'SE'=>'Švedska',
+        'SG'=>'Singapur',
+        'SH'=>'Sveta Helena',
+        'SI'=>'Slovenija',
         'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
+        'SK'=>'Slovačka',
+        'SL'=>'Sijera Leone',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
-        'SO'=>'Somalia',
-        'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'SO'=>'Somalija',
+        'SR'=>'Surinam',
+        'ST'=>'Sao Tome i Principe',
+        'SU'=>'Sovjetski savez',
         'SV'=>'El Salvador',
         'SY'=>'Syrian Arab Republic',
-        'SZ'=>'Swaziland',
+        'SZ'=>'Svazilend',
         'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
+        'TD'=>'Čad',
         'TF'=>'French Southern Territories',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
+        'TH'=>'Tajland',
+        'TJ'=>'Tadžikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Istočni Timor',
         'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TN'=>'Tunis',
         'TO'=>'Tonga',
         'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TR'=>'Turska',
+        'TT'=>'Trinidad i Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TW'=>'Tajvan',
+        'TZ'=>'Tanzanija',
+        'UA'=>'Ukrajina',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
+        'UK'=>'Ujedinjeno Kraljevstvo',
+        'US'=>'Sjedinjene države',
         'UM'=>'United States Minor Outlying Islands',
-        'UY'=>'Uruguay',
+        'UY'=>'Urugvaj',
         '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',
+        'VA'=>'Vatikan',
+        'VC'=>'Sent Vinsent i Grenadini',
+        'VE'=>'Venecuela',
+        'VG'=>'Devičanska ostrva (Britanija)',
+        'VI'=>'Devičanska ostrva (SAD)',
+        'VN'=>'Vijetnam',
         'VU'=>'Vanuatu',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
-        'YE'=>'Yemen',
+        'YE'=>'Jemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
-        'ZM'=>'Zambia',
-        'ZW'=>'Zimbabwe',
+        'ZA'=>'Južna Afrika',
+        'ZM'=>'Zambija',
+        'ZW'=>'Zimbabve',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/sr-CS/mail.php b/resources/lang/sr-CS/mail.php
index 43c7ce46d2..d6502680b2 100644
--- a/resources/lang/sr-CS/mail.php
+++ b/resources/lang/sr-CS/mail.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'acceptance_asset_accepted' => 'A user has accepted an item',
-    'acceptance_asset_declined' => 'A user has declined an item',
+    'acceptance_asset_accepted' => 'Korisnik je prihvatio stavku',
+    'acceptance_asset_declined' => 'Korisnik je odbio stavku',
     'a_user_canceled' => 'Korisnik je otkazao zahtev za stavke na Web lokaciji',
     'a_user_requested' => 'Korisnik je zatražio stavke na Web lokaciji',
     'accessory_name' => 'Naziv dodatne opreme, pribora:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Prijavite se u vašu novu Snipe-IT instalaciju koristeći kredencijale ispod:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Izveštaj o niskim zalihama',
+    'inventory_report' => 'Izveštaj o zalihama',
     'min_QTY' => 'Min Kol',
     'name' => 'Naziv',
     'new_item_checked' => 'Nova stavka je proverena pod vašim imenom, detalji su u nastavku.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Vaši Snipe-IT kredencijali',
     'Accessory_Checkin_Notification' => 'Oprema razdužena',
     'Asset_Checkin_Notification' => 'Imovina razdužena',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Licenca razdužena',
     'Expected_Checkin_Report' => 'Izveštaj o očekivanoj proveri imovine',
     'Expected_Checkin_Notification' => 'Izveštaj o očekivanoj proveri imovine',
     'Expected_Checkin_Date' => 'Imovina koja vam je odjavljena treba da bude ponovo prijavljena :date',
     'your_assets' => 'Pregledaj svoju imovinu',
+    'rights_reserved' => 'Sva prava zadržana.',
 ];
diff --git a/resources/lang/sr-CS/validation.php b/resources/lang/sr-CS/validation.php
index 3575771fb2..934eb9c6c8 100644
--- a/resources/lang/sr-CS/validation.php
+++ b/resources/lang/sr-CS/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute mora biti datoteka.',
     'filled'               => ':attribute mora imati vrednost.',
     'image'                => ':attribute mora biti slika.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute mora imati barem :min stavke.',
     ],
     'starts_with'          => ':attribute mora da počne sa jednom od sledećih vrednosti: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Odabrani :attribute nije ispravan.',
     'numeric'              => ':attribute mora biti broj.',
     'present'              => ':attribute polje mora biti prisutno.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Vaša lozinka je neispravna',
         'dumbpwd'          => 'Lozinka nije sigurna.',
         'statuslabel_type' => 'Morate odabrati ispravnu vrstu oznake statusa',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute mora biti ispravan datum u YYYY-MM-DD formatu',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/sv-SE/admin/accessories/general.php b/resources/lang/sv-SE/admin/accessories/general.php
index ef2e34f563..b2dc828932 100644
--- a/resources/lang/sv-SE/admin/accessories/general.php
+++ b/resources/lang/sv-SE/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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',
+    '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 d8333f1aba..2a73936139 100644
--- a/resources/lang/sv-SE/admin/accessories/message.php
+++ b/resources/lang/sv-SE/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Tillbehöret checkades inte ut. Vänligen försök igen',
         'success' 		=> 'Tillbehöret checkades ut.',
+        '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.'
     ),
 
diff --git a/resources/lang/sv-SE/admin/asset_maintenances/form.php b/resources/lang/sv-SE/admin/asset_maintenances/form.php
index 3e769dda7d..96dbb4b58f 100644
--- a/resources/lang/sv-SE/admin/asset_maintenances/form.php
+++ b/resources/lang/sv-SE/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Underhållstyp',
+        'asset_maintenance_type' => 'Typ av tillgångsunderhåll',
         'title'                  => 'Titel',
-        'start_date'             => 'Startad',
-        'completion_date'        => 'Slutförd',
+        'start_date'             => 'Startdatum',
+        'completion_date'        => 'Datum för slutförande',
         'cost'                   => 'Kostnad',
         'is_warranty'            => 'Förbättring av garanti',
-        'asset_maintenance_time' => 'Dagar',
+        'asset_maintenance_time' => 'Tillgångs underhållstid (i dagar)',
         'notes'                  => 'Anteckningar',
-        'update'                 => 'Uppdatera',
-        'create'                 => 'Skapa'
+        'update'                 => 'Uppdatera tillgångsunderhåll',
+        'create'                 => 'Skapa tillgångsunderhåll'
     ];
diff --git a/resources/lang/sv-SE/admin/categories/message.php b/resources/lang/sv-SE/admin/categories/message.php
index 6c56770f71..784138aae1 100644
--- a/resources/lang/sv-SE/admin/categories/message.php
+++ b/resources/lang/sv-SE/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategorin uppdaterades inte, vänligen försök igen.',
-        'success' => 'Kategorin uppdaterades.'
+        'success' => 'Kategorin uppdaterades.',
+        'cannot_change_category_type'   => 'Du kan inte ändra kategoritypen när den har skapats',
     ),
 
     'delete' => array(
diff --git a/resources/lang/sv-SE/admin/components/general.php b/resources/lang/sv-SE/admin/components/general.php
index 8ceddbcdd8..6219255cf0 100644
--- a/resources/lang/sv-SE/admin/components/general.php
+++ b/resources/lang/sv-SE/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Återstående',
     'total' 			                 => 'Totalt',
     'update'                            => 'Uppdatera komponent',
+    'checkin_limit'            => 'Incheckad mängd 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 a7b01d47f4..fa6b09bf79 100644
--- a/resources/lang/sv-SE/admin/components/message.php
+++ b/resources/lang/sv-SE/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.',
+        'unavailable'      => 'Inte tillräckligt med komponenter kvar: :remaining kvar, :requested efterfrågat ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sv-SE/admin/consumables/message.php b/resources/lang/sv-SE/admin/consumables/message.php
index 3c58c06e46..5858e376fc 100644
--- a/resources/lang/sv-SE/admin/consumables/message.php
+++ b/resources/lang/sv-SE/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sv-SE/admin/custom_fields/general.php b/resources/lang/sv-SE/admin/custom_fields/general.php
index 5550e9fc4e..d5401b2e05 100644
--- a/resources/lang/sv-SE/admin/custom_fields/general.php
+++ b/resources/lang/sv-SE/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Används av modeller',
     'order'   		            => 'Sortering',
     'create_fieldset'         => 'Ny fältsamling',
+    'update_fieldset'         => 'Uppdatera fältsamling',
+    'fieldset_does_not_exist'   => 'Användare [: id] existerar inte',
+    'fieldset_updated'         => 'Fältsamling uppdaterad',
     'create_fieldset_title' => 'Skapa en ny fältsamling',
     'create_field'            => 'Nytt anpassat fält',
     'create_field_title' => 'Skapa ett nytt anpassat fält',
@@ -44,6 +47,8 @@ return [
     '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' => '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' => 'Tillåt den utcheckade användaren att visa dessa värden i sin vy tilldelad tillgångssida',
+    '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',
 ];
diff --git a/resources/lang/sv-SE/admin/departments/message.php b/resources/lang/sv-SE/admin/departments/message.php
index dc9b01a1fb..1f19ac2363 100644
--- a/resources/lang/sv-SE/admin/departments/message.php
+++ b/resources/lang/sv-SE/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Avdelningen existerar inte.',
-    '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' => '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.',
     'create' => array(
         'error'   => 'Avdelningen skapades inte, var god försök igen.',
diff --git a/resources/lang/sv-SE/admin/groups/message.php b/resources/lang/sv-SE/admin/groups/message.php
index ae2b9253c5..1541448bf4 100644
--- a/resources/lang/sv-SE/admin/groups/message.php
+++ b/resources/lang/sv-SE/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Gruppen existerar redan!',
-    'group_not_found'     => 'Grupp [:id] existerar inte.',
+    'group_not_found'     => 'Grupp-ID :id finns inte.',
     'group_name_required' => 'Namnfältet är obligatoriskt',
 
     'success' => array(
diff --git a/resources/lang/sv-SE/admin/hardware/form.php b/resources/lang/sv-SE/admin/hardware/form.php
index c6592b45ee..28db173d2c 100644
--- a/resources/lang/sv-SE/admin/hardware/form.php
+++ b/resources/lang/sv-SE/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Bekräfta storlekar för borttagning av bulk',
+    '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Uppdatera endast standardplats',
     '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...',
+    'processing_spinner' => 'Bearbetar... (Detta kan ta lite tid på stora filer)',
     'optional_infos'  => 'Valfri information',
     'order_details'   => 'Beställningsrelaterad information'
 ];
diff --git a/resources/lang/sv-SE/admin/hardware/general.php b/resources/lang/sv-SE/admin/hardware/general.php
index f63e0baa02..d4f8a6b679 100644
--- a/resources/lang/sv-SE/admin/hardware/general.php
+++ b/resources/lang/sv-SE/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Denna tillgång har tagits bort.',
     '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'             => 'Modellen för denna tillgång är ogiltig.',
+    'model_invalid_fix'         => 'Tillgången bör redigeras för att rätta till detta innan du försöker checka in eller ut.',
     'requestable'               => 'Tillgängliga',
     'requested'				    => 'Begärda',
     'not_requestable'           => 'Inte begärbar',
@@ -21,6 +23,7 @@ return [
     '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.',
     'view'  					=> 'Visa tillgång',
     'csv_error' => 'Du har ett fel i din CSV-fil:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Felmeddelanden:',
     'success_messages' => 'Lyckade meddelande:',
     'alert_details' => 'Se nedan för detaljer.',
-    'custom_export' => 'Anpassad export'
+    'custom_export' => 'Anpassad export',
+    'mfg_warranty_lookup' => ':manufacturer Garantistatus Uppsök',
 ];
diff --git a/resources/lang/sv-SE/admin/hardware/message.php b/resources/lang/sv-SE/admin/hardware/message.php
index a0c26424f7..049c5d63ba 100644
--- a/resources/lang/sv-SE/admin/hardware/message.php
+++ b/resources/lang/sv-SE/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     '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.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Din fil har importerats',
         'file_delete_success'   => 'Din fil har tagits bort',
         'file_delete_error'      => 'Filen kunde inte raderas',
+        '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',
     ],
 
 
diff --git a/resources/lang/sv-SE/admin/hardware/table.php b/resources/lang/sv-SE/admin/hardware/table.php
index fac6703404..ccc8e04e8b 100644
--- a/resources/lang/sv-SE/admin/hardware/table.php
+++ b/resources/lang/sv-SE/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In ut',
     'checkout_date' => 'Checkout Date',
     'checkoutto' 	=> 'Checkat ut',
+    'components_cost' => 'Total kostnad för komponenter',
     'current_value' => 'Nuvarande värde',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Hämta CSV',
diff --git a/resources/lang/sv-SE/admin/licenses/general.php b/resources/lang/sv-SE/admin/licenses/general.php
index 53c13c17f1..e35a2998e7 100644
--- a/resources/lang/sv-SE/admin/licenses/general.php
+++ b/resources/lang/sv-SE/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Programvarulicenser',
     'user'  					=> 'Användare',
     'view'  					=> 'Visa licens',
+    'delete_disabled'           => 'Licensen kan inte tas bort ännu eftersom vissa platser 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',
+                'success'           => 'Licensen har checkats in! | Alla licenser har checkats in!',
+                'log_msg'           => 'Incheckad via bulk licens checkout i licens GUI',
+            ],
+
+            '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',
+                'success'           => 'Licensen har checkats ut! | :count licenser har checkats ut!',
+                'error_no_seats'    => 'Det finns inga återstående platser 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/sv-SE/admin/locations/message.php b/resources/lang/sv-SE/admin/locations/message.php
index 33067af75b..bd384b9113 100644
--- a/resources/lang/sv-SE/admin/locations/message.php
+++ b/resources/lang/sv-SE/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Platsen är associerad med minst en användare och kan inte tas bort. Vänligen uppdatera dina användare så dom inte refererar 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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Tilldelade tillgångar',
+    'current_location' => 'Nuvarande plats',
 
 
     'create' => array(
diff --git a/resources/lang/sv-SE/admin/manufacturers/message.php b/resources/lang/sv-SE/admin/manufacturers/message.php
index ac230410c7..1c3b5e6eca 100644
--- a/resources/lang/sv-SE/admin/manufacturers/message.php
+++ b/resources/lang/sv-SE/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Använd <code>{LOCALE}</code> och <code>{SERIAL}</code> i din URL som variabler för att få dessa värden automatiskt fyllda när du visar tillgångar.',
     '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. ',
 
diff --git a/resources/lang/sv-SE/admin/manufacturers/table.php b/resources/lang/sv-SE/admin/manufacturers/table.php
index a54ae28bf1..2b253c71ac 100644
--- a/resources/lang/sv-SE/admin/manufacturers/table.php
+++ b/resources/lang/sv-SE/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Telefon',
     'support_url'   		=> 'Stödadress',
+    'warranty_lookup_url'   => 'Garanti Lookup URL',
     'update'				=> 'Uppdatera Tillverkare',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/sv-SE/admin/models/general.php b/resources/lang/sv-SE/admin/models/general.php
index cc398bf01f..6d4bc840f9 100644
--- a/resources/lang/sv-SE/admin/models/general.php
+++ b/resources/lang/sv-SE/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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.',
-    'bulk_delete_warn'          => 'Du håller på att ta bort: model_count modeller.',
+    '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',
     'requestable'               => 'Användare kan begära denna modell',
 	'show_mac_address'			      => 'Visa fältet MAC-adress för tillgångar av denna modell',
diff --git a/resources/lang/sv-SE/admin/models/message.php b/resources/lang/sv-SE/admin/models/message.php
index 76830cffec..9b1aaa762e 100644
--- a/resources/lang/sv-SE/admin/models/message.php
+++ b/resources/lang/sv-SE/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Modellen finns inte.',
+    'no_association' => 'INGEN MODEL FÖRBUNDEN.',
+    '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.',
     '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Modellen uppdaterades inte, försök igen',
-        'success' => 'Modellen uppdaterad.'
+        'success' => 'Modellen uppdaterad.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Inga fält ändrades, så ingenting uppdaterades.',
-        'success' 		=> 'Modeller 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:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Inga tillgångar valdes, så ingenting togs bort.',
-        'success' 		    => ': success_count modell (er) borttagen!',
+        'success' 		    => 'Modell borttagen! |:success_count modeller borttagna!',
         'success_partial' 	=> ':success_count modell(erna) raderades, men :fail_count kunde inte raderas eftersom de fortfarande har tillgångar kopplade till sig.'
     ),
 
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index cfb15e1b27..e78ae788f7 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Detta är en Active Directory-server',
     'alerts'                	=> 'Varningar',
-    'alert_title'               => 'Uppdatera varningsinställningar',
+    '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',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Genom att markera denna ruta kan en användare åsidosätta gränssnittet med ett annat.',
     'asset_ids'					=> 'Tillgångs-ID',
     'audit_interval'            => 'Inventeringsintervall',
-    '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'       => '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_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?',
     'auto_increment_assets'		=> 'Generera automatisk ökning av tillgångstaggar',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Återställ från säkerhetskopia',
     '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_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_large'             => 'Mycket stora säkerhetskopior kan stoppa omställningsprocessen och behöver köras via kommandoraden. ',
     'barcode_settings'			=> 'Streckkodsinställningar',
@@ -75,8 +75,9 @@ return [
     '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',
     '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.',
+    '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.',
+    'no_default_group'          => 'Ingen standardgrupp',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP-klient TLS-nyckel',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS-certifikat',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP-inställningar',
     'ldap_client_tls_cert_help' => 'TLS-certifikat och nyckel för LDAP-anslutningar från klientsidan är vanligtvis bara användbara i Google Workspace-konfigurationer med "Secure LDAP". Båda krävs.',
      'ldap_client_tls_key'       => 'LDAP-klient TLS-nyckel',
+    'ldap_location'             => 'LDAP-plats',
+'ldap_location_help'             => 'LDAP platsfältet bör användas om <strong>ett OU inte används i Base Bind DN.</strong> Lämna detta tomt om en OU-sökning används.',
     'ldap_login_test_help'      => 'Ange ett giltigt LDAP användarnamn och lösenord från basen DN du angav ovan för att testa om LDAP-inloggningen är korrekt konfigurerad. DU MÅSTE SPARA DINA UPPDATERADE LDAPINSTÄLLNINGAR FÖRST.',
     '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',
@@ -197,16 +200,21 @@ return [
     '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',
+    'integrations'               => 'Integreringar',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Uppdatera Slack inställningar',
-    'slack_help'                => 'Slack inställningar',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack intgration är valfri, men användarevilkor och kanal krävs om du vill använda den. För att konfigurera Slack integration måste du först <a href=":slack_link" target="_new">skapa en inkommande webhook</a> på ditt slack-konto. ',
-    'slack_integration_help_button'    => 'När du har sparat din Slack-information visas en testknapp.',
-    'slack_test_help'           => 'Testa om din Slack-integration är konfigurerad korrekt. DU MÅSTE SPARA DINA UPPDATERADE SLACK-INSTÄLLNINGAR FÖRST.',
+    'general_webhook'           => 'Allmän Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test att spara',
+    '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_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',
@@ -301,7 +309,7 @@ return [
     'localization_keywords' => 'lokalisering, valuta, lokal, lokal, tidszon, tidszon, internationell, internatinalisering, språk, språk, översättning',
     'localization_help' => 'Språk, datumvisning',
     'notifications' => 'Aviseringar',
-    'notifications_help' => 'E-post varningar, inventeringsnställningar',
+    'notifications_help' => 'E-postnotiser och revisionsinställningar',
     'asset_tags_help' => 'Ökande och prefix',
     'labels' => 'Etiketter',
     'labels_title' => 'Uppdatera etikettinställningar',
@@ -322,4 +330,9 @@ return [
     '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',
+    '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_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. ',
+
 ];
diff --git a/resources/lang/sv-SE/admin/settings/message.php b/resources/lang/sv-SE/admin/settings/message.php
index cf809a90eb..9e0c42ef44 100644
--- a/resources/lang/sv-SE/admin/settings/message.php
+++ b/resources/lang/sv-SE/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testar LDAP-autentisering...',
         'authentication_success' => 'Användaren är autentiserad mot LDAP framgångsrikt!'
     ],
-    'slack' => [
-        'sending' => 'Skickar Slack testmeddelande...',
+    'webhook' => [
+        'sending' => 'Skickar :app testmeddelande...',
         '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ågonting gick fel.',
+        'error' => 'Något gick fel. :app svarade med: :error_message',
+        'error_misc' => 'Någonting gick fel. :( ',
     ]
 ];
diff --git a/resources/lang/sv-SE/admin/users/general.php b/resources/lang/sv-SE/admin/users/general.php
index e1f394a7b0..442d9d88bc 100644
--- a/resources/lang/sv-SE/admin/users/general.php
+++ b/resources/lang/sv-SE/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     '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.',
+    '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',
     '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Endast superadministratörer kan ge en användare superadmin å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' => 'VARNING:',
     '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.',
     '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',
@@ -41,4 +42,13 @@ return [
     '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.',
+    '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_text' => 'E-posta mina uppgifter till e-postadressen ovan',
+    'next_save_user' => 'Nästa: Spara användare',
+    'all_assigned_list_generation' => 'Skapad den:',
+    '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 06e35e71eb..ce4d77bbc8 100644
--- a/resources/lang/sv-SE/admin/users/message.php
+++ b/resources/lang/sv-SE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     '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.',
     'user_exists'               => 'Användaren existerar redan!',
-    'user_not_found'            => 'Användare [: id] existerar inte.',
+    'user_not_found'            => 'Användaren finns inte.',
     'user_login_required'       => 'Inloggningsfältet krävs',
     'user_password_required'    => 'Lösenordet krävs.',
     'insufficient_permissions'  => 'Otillräckliga tillstånd.',
@@ -15,7 +15,7 @@ return array(
     '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.',
     '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.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => 'Den här användaren har inga tilldelade tillgångar',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Den här användaren har ingen e-postadress.',
+        'success' => 'Användaren har meddelats om sitt nuvarande inventarie.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/sv-SE/auth/general.php b/resources/lang/sv-SE/auth/general.php
index a29241d65f..08e3a012d6 100644
--- a/resources/lang/sv-SE/auth/general.php
+++ b/resources/lang/sv-SE/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google-inloggning misslyckades, försök igen.',
+
+];
 
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index 487df68ada..e283ce3588 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Tillbehör',
     'activated'			    => 'Aktiverad',
+    'accepted_date'         => 'Datum Accepterat',
     'accessory'				=> 'Tillbehör',
     'accessory_report'		=> 'Tillbehörsrapport',
     'action'                => 'Åtgärd',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Administratör',
     'administrator'			=> 'Administratör',
     'add_seats'             => 'Tillagda platser',
-    'age'                   => "Age",
+    'age'                   => "Ålder",
     'all_assets'			=> 'Alla Tillgångar',
     'all'       			=> 'Alla',
     'archived'              => 'Arkiverad',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Inventera',
     'audit_report'			=> 'Inventeringsloggar',
     'assets'				=> 'Tillgångar',
+    'assets_audited'        => 'inventarier granskade',
+    'assets_checked_in_count'     => 'tillgångar incheckade',
+    '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',
+    'assignee'              => 'Tilldelad till',
     'avatar_delete'         => 'Ta bort Avatar',
     'avatar_upload'         => 'Ladda upp Avatar',
     'back'      			=> 'Bakåt',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Massredigera',
     'bulk_delete'           => 'Massradering',
     'bulk_actions'          => 'Massåtgärder',
-    'bulk_checkin_delete'   => 'Bulk incheckning av Objekt från användare',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Ta bort användare',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Denna enhet ägs av användaren',
     'bystatus'              => 'efter status',
     'cancel'  				=> 'Avbryt',
     'categories'			=> 'Kategorier',
@@ -83,6 +92,7 @@ return [
     '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>.',
     '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.',
     'deleted'  				=> 'Raderad',
     'delete_seats'  		=> 'Borttagna platser',
     'deletion_failed'       => 'Borttagning misslyckades',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Godkända filtyper är jpg, webp, png, gif och svg. Max 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',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Artikel',
     'item_name'             => 'Objektnamn',
+    'import_file'  			=> 'importera CSV-fil',
+    'import_type'  			=> 'CSV importtyp',
     'insufficient_permissions' => 'Otillräckliga behörigheter!',
     'kits'       			=> 'Fördefinierade paket',
     'language'				=> 'Språk',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Begärda tillgångar',
     'request_canceled'      => 'Förfrågan annulleras',
     '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',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signatur',
     'signed_off_by'         => 'Signerad av',
     'skin'       			=> 'Skal',
-    'slack_msg_note'        => 'Ett slack meddelande kommer att skickas',
-    'slack_test_msg'        => 'Åh hai! Ser ut som din Slack integration med Snipe-IT fungerar!',
+    'webhook_msg_note'        => 'Ett meddelande kommer att skickas via webhook',
+    'webhook_test_msg'        => 'Hej! Ser ut som din :app integration med Snipe-IT fungerar!',
     'some_features_disabled' => 'DEMO MODE: Vissa funktioner är inaktiverade för den här installationen.',
     'site_name'				=> 'Sidnamn',
     'state'  				=> 'stat',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Är du säker på att du vill radera',
     'submit'				=> 'Lämna',
     'target'                => 'Mål',
-    'toggle_navigation'     => 'Visa/dölj navigering',
     'time_and_date_display' => 'Tid och datumvisning',
     'total_assets'			=> 'totala tillgångar',
     'total_licenses'		=> 'totala licenser',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> 'Ja',
     'zip'  					=> 'Blixtlås',
     'noimage'				=> 'Ingen bild uppladdad eller bild hittades inte.',
-    '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'   => '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.',
     'login_enabled'         => 'Inloggning aktiverad',
     'audit_due'             => 'Nästa inventering',
@@ -375,7 +388,8 @@ return [
     '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 denna tillgång|Ta bort värden för alla :asset_count tillgångar ',
+    '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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Startdatum',
     'end_date'            => 'Slutdatum',
     'alt_uploaded_image_thumbnail' => 'Uppladdad miniatyrbild',
-    'placeholder_kit'       => 'Välj ett kit'
+    'placeholder_kit'       => 'Välj ett kit',
+    'file_not_found'        => 'Filen kan inte hittas',
+    'preview_not_available' => '(ingen förhandsgranskning)',
+    'setup'                 => 'Ställ in',
+    'pre_flight'            => 'Förtest',
+    'skip_to_main_content'  => 'Hoppa till huvudinnehållet',
+    'toggle_navigation'     => 'Växla navigering',
+    'alerts'                => 'Varningar',
+    'tasks_view_all'        => 'Visa alla uppgifter',
+    'true'                  => 'Sant',
+    'false'                 => 'Falskt',
+    'integration_option'    => 'Integreringsalternativ',
+    '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 den användare du vill slå samman de andra i nedan, och tillhörande tillgångar, licenser, etc kommer att flyttas över till den valda användaren och de andra användarna kommer att markeras som borttagna.',
+    '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.',
+    '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!',
+    '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_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?',
+    'back_before_importing'     => 'Säkerhetskopiera innan import?',
+    'csv_header_field'          => 'CSV Header Fält',
+    'import_field'              => 'Import Fält',
+    'sample_value'              => 'Exempel värde',
+    'no_headers'                => 'Inga kolumner hittades',
+    'error_in_import_file'      => 'Det gick inte att läsa CSV-filen: :error',
+    'percent_complete'          => ':procent % Slutförd',
+    'errors_importing'          => 'Några fel inträffade vid import: ',
+    'warning'                   => 'VARNING: :warning',
+    'success_redirecting'       => '"Lyckades... Omdirigerar.',
+    'setup_successful_migrations' => 'Dina databastabeller har skapats',
+    'setup_migration_output' => 'Migrationsresultat:',
+    '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.',
+    'confirm' => 'Bekräfta',
+    'autoassign_licenses' => 'Auto-tilldela licenser',
+    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
+    '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.',
+    'modal_confirm_generic'      => 'Är du säker?',
+    'cannot_be_deleted'      => 'Det här objektet kan inte raderas',
+    'undeployable_tooltip'      => 'Det här objektet kan inte checkas ut. Kolla antalet kvar.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/sv-SE/help.php b/resources/lang/sv-SE/help.php
index 617df0e415..04cb73e49b 100644
--- a/resources/lang/sv-SE/help.php
+++ b/resources/lang/sv-SE/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Mer information',
 
-    'audit_help' => 'Om du markerar denna ruta kommer tillgångsposten att ändras för att återspegla den nya platsen. 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 platsen den är utcheckad till.',
+    '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.',
 
diff --git a/resources/lang/sv-SE/localizations.php b/resources/lang/sv-SE/localizations.php
index b9c88d2e5a..40a1d3fe22 100644
--- a/resources/lang/sv-SE/localizations.php
+++ b/resources/lang/sv-SE/localizations.php
@@ -34,14 +34,14 @@ return [
         'lv'=>'Lettiska',
         'lt'=> 'Litauiska',
         'mk'=> 'Makedonska',
-        'ms'=> 'Malay',
+        'ms'=> 'Malajiska',
         'mi'=> 'Maori',
         'mn'=> 'Mongoliska',
         'no'=> 'Norska',
         'fa'=> 'Persiska',
         'pl'=> 'Polska',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
+        'pt-PT'=> 'Portugisiska',
+        'pt-BR'=> 'Portugisiska, Brasilien',
         'ro'=> 'Rumänska',
         'ru'=> 'Ryska',
         'sr-CS' => 'Serbiska (latinsk)',
@@ -52,7 +52,7 @@ return [
         'es-VE'=> 'Spanska, Venezuela',
         'sv-SE'=> 'Svenska',
         'tl'=> 'Tagalog',
-        'ta'=> 'Tamil',
+        'ta'=> 'Tamilska',
         'th'=> 'Thailändska',
         'tr'=> 'Turkiska',
         'uk'=> 'Ukrainska',
@@ -64,67 +64,67 @@ return [
     'select_country' => 'Välj ett land',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Ön Ascension',
         'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AE'=>'Förenade Arabemiraten',
+        'AF'=>'Afganistan',
+        'AG'=>'Antigua och Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albanien',
+        'AM'=>'Armenien',
+        'AN'=>'Aragonesiska',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'Antarktis',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
+        'AS'=>'Amerikanska Samoa',
         'AT'=>'Österrike',
         'AU'=>'Australien',
         'AW'=>'Aruba',
         'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AZ'=>'Azerbajdzjan',
+        'BA'=>'Bosnien och Hercegovina',
         'BB'=>'Barbados',
         'BE'=>'Belgien',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
-        'BG'=>'Bulgaria',
+        'BG'=>'Bulgarien',
         'BH'=>'Bahrain',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
         'BN'=>'Brunei Darussalam',
-        'BO'=>'Bolivia',
-        'BR'=>'Brazil',
+        'BO'=>'Bolivien',
+        'BR'=>'Brasilien',
         'BS'=>'Bahamas',
         'BT'=>'Bhutan',
         'BV'=>'Bouvet Island',
         'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BY'=>'Vitryssland',
         'BZ'=>'Belize',
-        'CA'=>'Canada',
+        'CA'=>'Kanada',
         'CC'=>'Cocos (Keeling) Islands',
-        'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
-        'CG'=>'Congo (Republic)',
+        'CD'=>'Kongo (Demokratiska republiken)',
+        'CF'=>'Centralafrikanska republiken',
+        'CG'=>'Kongo (Republiken)',
         'CH'=>'Schweiz',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
+        'CI'=>'Elfenbenskusten',
+        'CK'=>'Cooköarna',
         'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CM'=>'Kamerun',
+        'CN'=>'Folkrepubliken Kina',
         'CO'=>'Colombia',
         'CR'=>'Costa Rica',
-        'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
+        'CU'=>'Kuba',
+        'CV'=>'Kap Verde',
+        'CX'=>'Julön',
+        'CY'=>'Cypern',
+        'CZ'=>'Tjeckien',
+        'DE'=>'Tyskland',
         'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
+        'DK'=>'Danmark',
         'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
+        'DO'=>'Dominikanska republiken',
+        'DZ'=>'Algeriet',
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Egypten',
@@ -134,9 +134,9 @@ return [
         'EU'=>'Europeiska unionen',
         'FI'=>'Finland',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
+        'FK'=>'Falklandsöarna (Malvinas)',
+        'FM'=>'Mikronesiens federerade stater',
+        'FO'=>'Färöarna',
         'FR'=>'Frankrike',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
@@ -168,10 +168,10 @@ return [
         'IM'=>'Isle of Man',
         'IN'=>'India',
         'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IQ'=>'Irak',
+        'IR'=>'Iran',
+        'IS'=>'Island',
+        'IT'=>'Italien',
         'JE'=>'Jersey',
         'JM'=>'Jamaica',
         'JO'=>'Jordan',
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'Södra Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sverige',
         'SG'=>'Singapore',
diff --git a/resources/lang/sv-SE/mail.php b/resources/lang/sv-SE/mail.php
index cf65a0ce4c..c221c56114 100644
--- a/resources/lang/sv-SE/mail.php
+++ b/resources/lang/sv-SE/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Logga in på din nya Snipe-IT-installation med hjälp av inloggningsuppgifterna nedan:',
     'login' => 'Logga in:',
     'Low_Inventory_Report' => 'Meddelande om lågt lagersaldo',
+    'inventory_report' => 'Inventarierapport',
     'min_QTY' => 'Min. antal',
     'name' => 'namn',
     'new_item_checked' => 'En ny artikel har blivit utcheckad i ditt namn, se detaljer nedan.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Dina Snipe-IT användaruppgifter',
     'Accessory_Checkin_Notification' => 'Tillbehöret har checkats in',
     'Asset_Checkin_Notification' => 'Tillgången har checkats in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Licensen har checkats in',
     'Expected_Checkin_Report' => 'Förväntad incheckningsrapport för tillgång',
     'Expected_Checkin_Notification' => 'Påminnelse: :name sluttiden för incheckning närmar sig',
     'Expected_Checkin_Date' => 'En tillgång som checkas ut till dig kommer att checkas in igen :date',
     'your_assets' => 'Visa dina tillgångar',
+    'rights_reserved' => 'Med ensamrätt.',
 ];
diff --git a/resources/lang/sv-SE/validation.php b/resources/lang/sv-SE/validation.php
index 5debedf51b..57d56bb46f 100644
--- a/resources/lang/sv-SE/validation.php
+++ b/resources/lang/sv-SE/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => ':attribute måste vara en fil.',
     'filled'               => ':attribute fältet måste ha ett värde.',
     'image'                => ':attribute måste vara en bild.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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.',
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute måste innehålla minst :min saker.',
     ],
     'starts_with'          => ':attribute måste börja med något av följande: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Det valda :attribute är ogiltigt.',
     'numeric'              => ':attribute måste vara ett nummer.',
     'present'              => ':attribute fältet måste finnas.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute måste vara ett giltigt datum i YYYY-MM-DD format',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/ta/admin/accessories/general.php b/resources/lang/ta/admin/accessories/general.php
index 01c5cb9285..6f0a1b6233 100644
--- a/resources/lang/ta/admin/accessories/general.php
+++ b/resources/lang/ta/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'புதுப்பித்தல் துணை',
     'use_default_eula'					=> 'பதிலாக <a href="#" data-toggle="modal" data-target="#eulaModal">primary இயல்புநிலை EULA</a> ஐப் பயன்படுத்துக.',
     'use_default_eula_disabled'			=> '<del> முதன்மை இயல்புநிலை EULA ஐப் பயன்படுத்தவும் .</del> முதன்மை இயல்புநிலை EULA அமைக்கப்படவில்லை. அமைப்புகளில் ஒன்றைச் சேர்க்கவும்.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ta/admin/accessories/message.php b/resources/lang/ta/admin/accessories/message.php
index d2a89ad798..d9709ed83a 100644
--- a/resources/lang/ta/admin/accessories/message.php
+++ b/resources/lang/ta/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'அசெஸரி அவுட் சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்',
         'success' 		=> 'அசெஸரி வெற்றிகரமாக சோதிக்கப்பட்டது.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.'
     ),
 
diff --git a/resources/lang/ta/admin/asset_maintenances/form.php b/resources/lang/ta/admin/asset_maintenances/form.php
index b82e2ec90f..5b599b3324 100644
--- a/resources/lang/ta/admin/asset_maintenances/form.php
+++ b/resources/lang/ta/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'பராமரிப்பு வகை',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'தலைப்பு',
-        'start_date'             => 'தொடங்குதல்',
-        'completion_date'        => 'நிறைவு',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'செலவு',
         'is_warranty'            => 'உத்தரவாதத்தை முன்னேற்றம்',
-        'asset_maintenance_time' => 'நாட்களில்',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'குறிப்புக்கள்',
-        'update'                 => 'புதுப்பிக்கப்பட்டது',
-        'create'                 => 'உருவாக்கவும்'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ta/admin/categories/message.php b/resources/lang/ta/admin/categories/message.php
index e90faccec1..6fb5adb9be 100644
--- a/resources/lang/ta/admin/categories/message.php
+++ b/resources/lang/ta/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'வகை புதுப்பிக்கப்படவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்',
-        'success' => 'வகை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.'
+        'success' => 'வகை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ta/admin/components/general.php b/resources/lang/ta/admin/components/general.php
index a398121fdc..6dc96826b7 100644
--- a/resources/lang/ta/admin/components/general.php
+++ b/resources/lang/ta/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'மீதமுள்ள',
     'total' 			                 => 'மொத்த',
     'update'                            => 'உபகரணத்தை புதுப்பிக்கவும்',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/ta/admin/components/message.php b/resources/lang/ta/admin/components/message.php
index 5c105450ee..25bea8e57c 100644
--- a/resources/lang/ta/admin/components/message.php
+++ b/resources/lang/ta/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'உபகரணத்தை சோதிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்',
         'success' 		=> 'உபகரணமானது வெற்றிகரமாக சரிபார்க்கப்பட்டது.',
-        'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.'
+        'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ta/admin/consumables/message.php b/resources/lang/ta/admin/consumables/message.php
index 1ac3840a5b..df08773648 100644
--- a/resources/lang/ta/admin/consumables/message.php
+++ b/resources/lang/ta/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'நுகர்வோர் சரிபார்க்கப்படவில்லை, தயவு செய்து மீண்டும் முயற்சிக்கவும்',
         'success' 		=> 'நுகர்வோர் வெற்றிகரமாக சோதிக்கப்பட்டது.',
-        'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.'
+        'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ta/admin/custom_fields/general.php b/resources/lang/ta/admin/custom_fields/general.php
index 883e119b73..5858697c8b 100644
--- a/resources/lang/ta/admin/custom_fields/general.php
+++ b/resources/lang/ta/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'மாதிரிகள் பயன்படுத்தப்படுகிறது',
     'order'   		            => 'ஆணை',
     'create_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'            => 'புதிய தனிப்பயன் புலம்',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ta/admin/groups/message.php b/resources/lang/ta/admin/groups/message.php
index 709bca3651..67686378a3 100644
--- a/resources/lang/ta/admin/groups/message.php
+++ b/resources/lang/ta/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'குழு ஏற்கனவே உள்ளது!',
-    'group_not_found'     => 'குழு [: id] இல்லை.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'பெயர் புலம் தேவை',
 
     'success' => array(
diff --git a/resources/lang/ta/admin/hardware/form.php b/resources/lang/ta/admin/hardware/form.php
index 175893be98..0363770e9f 100644
--- a/resources/lang/ta/admin/hardware/form.php
+++ b/resources/lang/ta/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'பெரும்பங்கு சொத்துக்களை நீக்குவதை உறுதிப்படுத்தவும்',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ta/admin/hardware/general.php b/resources/lang/ta/admin/hardware/general.php
index 23b8e099f2..468fd78884 100644
--- a/resources/lang/ta/admin/hardware/general.php
+++ b/resources/lang/ta/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'சொத்து திருத்து',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'கோரப்பட்டது',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'சொத்து மீட்டமை',
     'pending'  					=> 'நிலுவையில்',
     'undeployable'  			=> 'Undeployable',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ta/admin/hardware/message.php b/resources/lang/ta/admin/hardware/message.php
index cab67aedab..c180deb576 100644
--- a/resources/lang/ta/admin/hardware/message.php
+++ b/resources/lang/ta/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'சொத்து மீட்டமைக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்',
         'success' 		=> 'சொத்து வெற்றிகரமாக மீட்டமைக்கப்பட்டது.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'உங்கள் கோப்பு இறக்குமதி செய்யப்பட்டது',
         'file_delete_success'   => 'உங்கள் கோப்பு வெற்றிகரமாக நீக்கப்பட்டது',
         'file_delete_error'      => 'கோப்பை நீக்க முடியவில்லை',
+        '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',
     ],
 
 
diff --git a/resources/lang/ta/admin/hardware/table.php b/resources/lang/ta/admin/hardware/table.php
index 5939d886ff..889700c499 100644
--- a/resources/lang/ta/admin/hardware/table.php
+++ b/resources/lang/ta/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'உள்ளே வெளியே',
     'checkout_date' => 'புதுப்பிப்பு தேதி',
     'checkoutto' 	=> 'சரிபார்க்கப்பட்டது',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'வேறுபாடு',
     'dl_csv' 		=> 'CSV ஐ பதிவிறக்குக',
diff --git a/resources/lang/ta/admin/licenses/general.php b/resources/lang/ta/admin/licenses/general.php
index 078dc2c34d..99d01472bd 100644
--- a/resources/lang/ta/admin/licenses/general.php
+++ b/resources/lang/ta/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'உரிமங்கள் பற்றி',
-    'about_licenses'                  => 'மென்பொருள் கண்காணிக்க பயன்படுகிறது. தனிநபர்களிடம் சோதிக்கப்படக்கூடிய குறிப்பிட்ட எண்ணிக்கையிலான இடங்களை அவர்கள் கொண்டுள்ளனர்',
+    'about_licenses_title'      => 'உரிமங்கள் பற்றி',
+    'about_licenses'            => 'மென்பொருள் கண்காணிக்க பயன்படுகிறது. தனிநபர்களிடம் சோதிக்கப்படக்கூடிய குறிப்பிட்ட எண்ணிக்கையிலான இடங்களை அவர்கள் கொண்டுள்ளனர்',
     'checkin'  					=> 'Checkin உரிமத்தின் இடம்',
     'checkout_history'  		=> 'புதுப்பித்து வரலாறு',
     'checkout'  				=> 'புதுப்பித்து உரிமம் இருக்கை',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'மென்பொருள் உரிமங்கள்',
     'user'  					=> 'பயனர்',
     'view'  					=> 'உரிமத்தைக் காட்டு',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ta/admin/manufacturers/message.php b/resources/lang/ta/admin/manufacturers/message.php
index 9407c4f84e..294f0a85f9 100644
--- a/resources/lang/ta/admin/manufacturers/message.php
+++ b/resources/lang/ta/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'உற்பத்தியாளர் இல்லை.',
     'assoc_users'	 => 'இந்த உற்பத்தியாளர் தற்போது குறைந்தது ஒரு மாதிரியுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த உற்பத்தியாளரை இனி குறிப்பிடுவதற்கு உங்கள் மாதிரியைப் புதுப்பிக்கவும் மீண்டும் முயற்சிக்கவும்.',
 
diff --git a/resources/lang/ta/admin/manufacturers/table.php b/resources/lang/ta/admin/manufacturers/table.php
index 700c409a2b..8855f7c4d4 100644
--- a/resources/lang/ta/admin/manufacturers/table.php
+++ b/resources/lang/ta/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'ஆதரவு மின்னஞ்சல்',
     'support_phone'   		=> 'ஆதரவு தொலைபேசி',
     'support_url'   		=> 'ஆதரவு URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'உற்பத்தியாளர் புதுப்பிக்கவும்',
     'url'   				=> 'URL ஐ',
 
diff --git a/resources/lang/ta/admin/models/general.php b/resources/lang/ta/admin/models/general.php
index 903b6c4c85..71d86f3707 100644
--- a/resources/lang/ta/admin/models/general.php
+++ b/resources/lang/ta/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'மாடலை மீட்டெடுக்கவும்',
     'requestable'               => 'பயனர்கள் இந்த மாதிரியைக் கோரலாம்',
 	'show_mac_address'			      => 'இந்த மாடலில் சொத்துகளில் MAC முகவரியினைக் காட்டு',
diff --git a/resources/lang/ta/admin/models/message.php b/resources/lang/ta/admin/models/message.php
index f6dd2d4da1..b78cc3881f 100644
--- a/resources/lang/ta/admin/models/message.php
+++ b/resources/lang/ta/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'மாதிரி இல்லை.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'தற்போது இந்த மாதிரி ஒன்று ஒன்று அல்லது அதற்கு மேற்பட்ட சொத்துக்களுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. சொத்துக்களை நீக்கிவிட்டு மீண்டும் நீக்குவதற்கு முயற்சிக்கவும்.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'மாதிரி புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்',
-        'success' => 'மாடல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.'
+        'success' => 'மாடல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'எந்த துறைகளும் மாற்றப்படவில்லை, அதனால் எதுவும் புதுப்பிக்கப்படவில்லை.',
-        'success' 		=> 'மாதிரிகள் புதுப்பிக்கப்பட்டன.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/ta/admin/settings/general.php b/resources/lang/ta/admin/settings/general.php
index b7eee079db..7446577c7f 100644
--- a/resources/lang/ta/admin/settings/general.php
+++ b/resources/lang/ta/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'இது ஒரு Active Directory சேவையகம்',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'எச்சரிக்கைகள் அனுப்ப',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'எச்சரிக்கைகள் இயக்கப்பட்டன',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'பார்கோடு அமைப்புகள்',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'தள பெயர்',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'துல்லியமான மூலப்பொருள்',
-    'slack_channel'             => 'ஸ்லாக் சேனல்',
-    'slack_endpoint'            => 'ஸ்லாக் முடிவுக்கு',
-    'slack_integration'         => 'மெல்லிய அமைப்புகள்',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> 'ஸ்னாப்-ஐடி பதிப்பு',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ta/admin/settings/message.php b/resources/lang/ta/admin/settings/message.php
index 8667f1971d..70bfb21879 100644
--- a/resources/lang/ta/admin/settings/message.php
+++ b/resources/lang/ta/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ta/admin/users/general.php b/resources/lang/ta/admin/users/general.php
index 771c8ed7a9..5415880629 100644
--- a/resources/lang/ta/admin/users/general.php
+++ b/resources/lang/ta/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.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'மென்பொருள் சரிபார்க்கப்பட்டது: பெயர்',
     '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'         => 'பயனர் காண்க: பெயர்',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ta/admin/users/message.php b/resources/lang/ta/admin/users/message.php
index 28cff39d32..f19b9618c3 100644
--- a/resources/lang/ta/admin/users/message.php
+++ b/resources/lang/ta/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'இந்த சொத்து வெற்றிகரமாக நிராகரித்தது.',
     'bulk_manager_warn'	        => 'உங்கள் பயனர் வெற்றிகரமாக புதுப்பிக்கப்பட்டிருந்தாலும், உங்கள் மேலாளர் நுழைவு சேமிக்கப்படவில்லை, ஏனெனில் நீங்கள் தேர்ந்தெடுத்த மேலாளர் பயனர் பட்டியலில் திருத்தப்பட வேண்டும், மேலும் பயனர்கள் தங்கள் மேலாளராக இருக்கலாம். மேலாளரைத் தவிர்த்து உங்கள் பயனர்களை மீண்டும் தேர்ந்தெடுக்கவும்.',
     'user_exists'               => 'பயனர் ஏற்கனவே உள்ளது!',
-    'user_not_found'            => 'பயனர் [: id] இல்லை.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'உள்நுழைவுத் துறை தேவைப்படுகிறது',
     'user_password_required'    => 'கடவுச்சொல் தேவை.',
     'insufficient_permissions'  => 'போதிய அனுமதிகள் இல்லை.',
diff --git a/resources/lang/ta/auth/general.php b/resources/lang/ta/auth/general.php
index 0aa6186501..7547107403 100644
--- a/resources/lang/ta/auth/general.php
+++ b/resources/lang/ta/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php
index d96af89378..a3cdb7137a 100644
--- a/resources/lang/ta/general.php
+++ b/resources/lang/ta/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'கருவிகள்',
     'activated'			    => 'இயக்கப்பட்டது',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'துணை',
     'accessory_report'		=> 'துணை குறிப்பு',
     'action'                => 'அதிரடி',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'நிர்வாகம்',
     'administrator'			=> 'நிர்வாகி',
     'add_seats'             => 'சேர்க்கப்பட்டது இடங்கள்',
-    'age'                   => "Age",
+    'age'                   => "வயது",
     'all_assets'			=> 'அனைத்து சொத்துகளும்',
     'all'       			=> 'அனைத்து',
     'archived'              => 'காப்பகப்படுத்தியவை',
@@ -20,14 +21,20 @@ return [
     'asset'					=> 'சொத்து',
     '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'    => 'சொத்துக்களை ஒப்புக்கொள்',
     'audit'				    => 'தணிக்கை',
     'audit_report'			=> 'தணிக்கைப் பதிவு',
     'assets'				=> 'சொத்துக்கள்',
-    'assigned_to'           => 'Assigned to :name',
+    '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'           => ':nameக்கு ஒதுக்கப்பட்டது',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Avatar நீக்கு',
     'avatar_upload'         => 'Avatar பதிவேற்றவும்',
     'back'      			=> 'மீண்டும்',
@@ -35,10 +42,12 @@ return [
     'bulkaudit'             => 'மொத்த ஆடிட்',
     'bulkaudit_status'      => 'தணிக்கை நிலை',
     'bulk_checkout'  		=> 'மொத்த புதுப்பிப்பு',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_edit'             => 'மொத்த திருத்தம்',
+    'bulk_delete'           => 'மொத்த நீக்கம்',
+    'bulk_actions'          => 'மொத்த செயல்கள்',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'ரத்து',
     'categories'			=> 'வகைகள்',
@@ -83,6 +92,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.',
     'deleted'  				=> 'நீக்கப்பட்ட',
     'delete_seats'  		=> 'நீக்கப்பட்ட இடங்கள்',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'இறக்குமதி',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'சொத்து பராமரித்தல்',
     'item'  				=> 'பொருள்',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'போதிய அனுமதிகள் இல்லை!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'மொழி',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'கோரிக்கை ரத்து செய்யப்பட்டது',
     'save'  				=> 'சேமி',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'தேர்வு',
     'select_all'            => 'Select All',
     'search'				=> 'தேடல்',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'கையொப்பம்',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => 'டெமோ முறை: இந்த நிறுவலுக்கு சில அம்சங்கள் முடக்கப்பட்டுள்ளன.',
     'site_name'				=> 'தள பெயர்',
     'state'  				=> 'நிலை',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'நீங்கள் நிச்சயமாக நீக்க விரும்புகிறீர்களா?',
     'submit'				=> 'சமர்ப்பி',
     'target'                => 'இலக்கு',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'நேரம் மற்றும் தேதி காட்சி',
     'total_assets'			=> 'மொத்த சொத்துக்கள்',
     'total_licenses'		=> 'மொத்த உரிமங்கள்',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ta/help.php b/resources/lang/ta/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ta/help.php
+++ b/resources/lang/ta/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ta/localizations.php b/resources/lang/ta/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ta/localizations.php
+++ b/resources/lang/ta/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ta/mail.php b/resources/lang/ta/mail.php
index ab6262f139..c8289267ad 100644
--- a/resources/lang/ta/mail.php
+++ b/resources/lang/ta/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'கீழே உள்ள சான்றுகளை பயன்படுத்தி உங்கள் புதிய Snipe-IT நிறுவலுக்கு உள்நுழையவும்:',
     'login' => 'உள் நுழை:',
     'Low_Inventory_Report' => 'குறைவான சரக்கு அறிக்கை',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'குறைந்தது QTY',
     'name' => 'பெயர்',
     'new_item_checked' => 'உங்கள் பெயரில் ஒரு புதிய உருப்படி சோதிக்கப்பட்டது, விவரங்கள் கீழே உள்ளன.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'உங்கள் கத்தரி-ஐடி சான்றுகள்',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ta/validation.php b/resources/lang/ta/validation.php
index 5cfdf6804a..8b19f3457f 100644
--- a/resources/lang/ta/validation.php
+++ b/resources/lang/ta/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => ': பண்புக்கூறு குறைந்தபட்சம்: நிமிடம் உருப்படிகள் வேண்டும்.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
     'numeric'              => 'பண்புக்கூறு: ஒரு எண் இருக்க வேண்டும்.',
     'present'              => ': பண்புக்கூறு களஞ்சியம் இருக்க வேண்டும்.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'உங்கள் தற்போதைய கடவுச்சொல் தவறானது',
         'dumbpwd'          => 'அந்த கடவுச்சொல் மிகவும் பொதுவானது.',
         'statuslabel_type' => 'செல்லுபடியாகும் நிலை லேபிள் வகை தேர்ந்தெடுக்க வேண்டும்',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/th/admin/accessories/general.php b/resources/lang/th/admin/accessories/general.php
index f347748b4d..d6304d83b1 100644
--- a/resources/lang/th/admin/accessories/general.php
+++ b/resources/lang/th/admin/accessories/general.php
@@ -16,5 +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.',
 
 );
diff --git a/resources/lang/th/admin/accessories/message.php b/resources/lang/th/admin/accessories/message.php
index f94571f673..7c1554fe54 100644
--- a/resources/lang/th/admin/accessories/message.php
+++ b/resources/lang/th/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'อุปกรณ์เสริมยังไม่ถูกเช็คเอ้าท์ กรุณาลองอีกครั้ง',
         'success' 		=> 'อุปกรณ์เสริมเช็คเอ้าท์เรียบร้อยแล้ว',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง'
     ),
 
diff --git a/resources/lang/th/admin/asset_maintenances/form.php b/resources/lang/th/admin/asset_maintenances/form.php
index 1f896fc47a..bcd2740236 100644
--- a/resources/lang/th/admin/asset_maintenances/form.php
+++ b/resources/lang/th/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'ประเภทการซ่อมบำรุงสินทรัพย์',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'ชื่อเรื่อง',
-        'start_date'             => 'วันที่เริ่มต้น',
-        'completion_date'        => 'วันที่แล้วเสร็จ',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'ต้นทุน',
         'is_warranty'            => 'การปรับปรุงการรับประกัน',
-        'asset_maintenance_time' => 'ระยะเวลาการซ่อมบำรุงสินทรัพย์ (หน่วยเป็น วัน)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'หมายเหตุ',
-        'update'                 => 'แก้ไขการซ่อมบำรุงสินทรัพย์',
-        'create'                 => 'สร้างการซ่อมบำรุงสินทรัพย์'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/th/admin/asset_maintenances/general.php b/resources/lang/th/admin/asset_maintenances/general.php
index 1f6106916c..2dd76d3467 100644
--- a/resources/lang/th/admin/asset_maintenances/general.php
+++ b/resources/lang/th/admin/asset_maintenances/general.php
@@ -11,6 +11,6 @@
         'calibration'        => 'การเปรียบเทียบค่า',
         'software_support'   => 'การสนับสนุน Software',
         'hardware_support'   => 'การสนับสนุน Hardware',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'configuration_change'   => 'เปลี่ยนการตั้งค่า',
+        'pat_test'           => 'การทดสอบสินค้าอันตราย',
     ];
diff --git a/resources/lang/th/admin/categories/message.php b/resources/lang/th/admin/categories/message.php
index 92bed1972f..d75989743b 100644
--- a/resources/lang/th/admin/categories/message.php
+++ b/resources/lang/th/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'ยังไม่ได้ปรับปรุงหมวดหมู่ กรุณาลองอีกครั้ง',
-        'success' => 'ปรับปรุงหมวดหมู่เรียบร้อยแล้ว.'
+        'success' => 'ปรับปรุงหมวดหมู่เรียบร้อยแล้ว.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/th/admin/components/general.php b/resources/lang/th/admin/components/general.php
index 570e0fc33d..dc19e71191 100644
--- a/resources/lang/th/admin/components/general.php
+++ b/resources/lang/th/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'ที่เหลืออยู่',
     'total' 			                 => 'ทั้งหมด',
     'update'                            => 'อัพเดตคอมโพเนนต์',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/th/admin/components/message.php b/resources/lang/th/admin/components/message.php
index 2cb04d1ea6..887b7e6cd0 100644
--- a/resources/lang/th/admin/components/message.php
+++ b/resources/lang/th/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'ตรวจสอบคอมโพเนนต์แล้วโปรดลองอีกครั้ง',
         'success' 		=> 'ตรวจสอบคอมโพเนนต์เรียบร้อยแล้ว',
-        'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.'
+        'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/th/admin/consumables/message.php b/resources/lang/th/admin/consumables/message.php
index 5c85c464a8..98f3d3e82b 100644
--- a/resources/lang/th/admin/consumables/message.php
+++ b/resources/lang/th/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'วัสดุสิ้นเปลืองยังไม่ถูกเช็คเอ้าท์ กรุณาลองใหม่อีกครั้ง',
         'success' 		=> 'เช็คเอ้าท์วัสดุสิ้นเปลืองแล้ว',
-        'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.'
+        'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/th/admin/custom_fields/general.php b/resources/lang/th/admin/custom_fields/general.php
index 8dfc68089e..a04b04a887 100644
--- a/resources/lang/th/admin/custom_fields/general.php
+++ b/resources/lang/th/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'		=> 'ชุดฟิลด์ที่ช่วยให้คุณสร้างกลุ่มของฟิลด์ที่กำหนดได้เอง ซึ่งมักจะใช้ซ้ำสำหรับการเจาะจงประเภทของสินทรัพย์',
+    'custom_format'             => 'กำหนดรูปแบบ...',
     'encrypt_field'      	        => 'เข้ารหัสค่าของฟิลด์นี้ในฐานข้อมูล',
     'encrypt_field_help'      => 'คำเตือน: การเข้ารหัสฟิลด์ทำให้ไม่สามารถค้นหาได้',
     'encrypted'      	        => 'เข้ารหัส',
@@ -27,23 +27,28 @@ return [
     'used_by_models'   		    => 'ใช้ตามโมเดล',
     'order'   		            => 'ใบสั่ง',
     'create_fieldset'         => 'Fieldset ใหม่',
-    'create_fieldset_title' => 'Create a new fieldset',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
+    'create_fieldset_title' => 'สร้างชุดฟิวด์ใหม่',
     'create_field'            => 'ฟิลด์ที่กำหนดเองใหม่',
-    'create_field_title' => 'Create a new custom field',
+    'create_field_title' => 'สร้างฟิลด์ที่กำหนดเองใหม่',
     'value_encrypted'      	        => 'ค่าของฟิลด์นี้ถูกเข้ารหัสในฐานข้อมูล เฉพาะผู้ดูแลระบบเท่านั้นที่สามารถดูค่าที่ถอดรหัสได้',
     'show_in_email'     => 'ใส่ค่าของฟิลด์นี้ลงในอีเมลเช็คเอาต์ที่ส่งถึงผู้ใช้หรือไม่? ฟิลด์ที่เข้ารหัสไม่สามารถรวมอยู่ในอีเมลได้',
-    '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',
+    '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> but should be <code>:expected</code>.',
+    'is_unique' => 'ค่านี้ต้องไม่ซ้ำใคร',
+    'unique' => 'ไม่ซ้ำใคร',
+    'display_in_user_view' => 'อนุญาตให้ผู้ใช้เข้าดูข้อมูลเหล่านี้ในหน้ากำหนดสินทรัพย์',
+    'display_in_user_view_table' => 'เปิดเห็นผู้ใช้',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/th/admin/custom_fields/message.php b/resources/lang/th/admin/custom_fields/message.php
index 7da352e33e..5824244772 100644
--- a/resources/lang/th/admin/custom_fields/message.php
+++ b/resources/lang/th/admin/custom_fields/message.php
@@ -51,7 +51,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'เกิดข้อผิดพลาดในการตรวจสอบค่าชุดฟิลด์เริ่มต้น',
 
     ),
 
diff --git a/resources/lang/th/admin/groups/message.php b/resources/lang/th/admin/groups/message.php
index 14e71677fb..7ef718819d 100644
--- a/resources/lang/th/admin/groups/message.php
+++ b/resources/lang/th/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'มีกลุ่มอยู่แล้ว',
-    'group_not_found'     => 'ไม่มีกลุ่ม [:id]',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'ต้องกำหนดชื่อฟิลด์',
 
     'success' => array(
diff --git a/resources/lang/th/admin/hardware/form.php b/resources/lang/th/admin/hardware/form.php
index b442220ef5..4e5a465425 100644
--- a/resources/lang/th/admin/hardware/form.php
+++ b/resources/lang/th/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'ยืนยันการลบเนื้อหาเป็นกลุ่ม',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/th/admin/hardware/general.php b/resources/lang/th/admin/hardware/general.php
index 1a79b9f556..6e5b6158e3 100644
--- a/resources/lang/th/admin/hardware/general.php
+++ b/resources/lang/th/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'สินทรัพย์นี้ถูกลบไปแล้ว',
     'edit'  					=> 'แก้ไขสินทรัพย์',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'ร้องขอได้',
     'requested'				    => 'การขอใช้บริการ',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'กู้คืนสินทรัพย์',
     'pending'  					=> 'อยู่ระหว่างดำเนินการ',
     'undeployable'  			=> 'ไม่สามารถนำไปใช้งานได้',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/th/admin/hardware/message.php b/resources/lang/th/admin/hardware/message.php
index 6650bb73b0..d6e892b1e2 100644
--- a/resources/lang/th/admin/hardware/message.php
+++ b/resources/lang/th/admin/hardware/message.php
@@ -4,7 +4,7 @@ return [
 
     'undeployable' 		=> '<strong>คำเตือน: </strong> สินทรัพย์นี้ถูกกำหนดสถานะให้ไม่สามารถใช้งานได้ หากสถานะนี้ถูกเปลี่ยน กรุณาอัพเดทสถานะสินทรัพย์ด้วย',
     'does_not_exist' 	=> 'ไม่มีสินทรัพย์',
-    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    'does_not_exist_or_not_requestable' => 'สินทรัพย์นั้นไม่มีอยู่หรือไม่สามารถร้องขอได้',
     'assoc_users'	 	=> 'ขณะนี้มีการตรวจสอบเนื้อหานี้แก่ผู้ใช้และไม่สามารถลบออกได้ โปรดตรวจสอบเนื้อหาเป็นครั้งแรกจากนั้นลองลบอีกครั้ง',
 
     'create' => [
@@ -16,12 +16,14 @@ return [
         'error'   			=> 'ไม่ได้อัปเดตเนื้อหาโปรดลองอีกครั้ง',
         'success' 			=> 'อัปเดตเนื้อหาสำเร็จแล้ว',
         'nothing_updated'	=>  'ไม่มีการเลือกเขตข้อมูลดังนั้นไม่มีการอัปเดตอะไรเลย',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'ไม่มีการเลือกรายการสินทรัพย์ จึงไม่มีการอัพเดท',
     ],
 
     'restore' => [
         'error'   		=> 'ไม่ได้กู้คืนเนื้อหาโปรดลองอีกครั้ง',
         'success' 		=> 'กู้คืนเนื้อหาเรียบร้อยแล้ว',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'ไฟล์ของคุณถูกนำเข้าแล้ว',
         'file_delete_success'   => 'ไฟล์ของคุณถูกลบเรียบร้อยแล้ว',
         'file_delete_error'      => 'ไม่สามารถลบไฟล์ได้',
+        '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',
     ],
 
 
diff --git a/resources/lang/th/admin/hardware/table.php b/resources/lang/th/admin/hardware/table.php
index 65d470c8dc..1c8ce1e667 100644
--- a/resources/lang/th/admin/hardware/table.php
+++ b/resources/lang/th/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In / Out',
     'checkout_date' => 'ชำระเงินวันที่',
     'checkoutto' 	=> 'เช็คเอาท์',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'diff',
     'dl_csv' 		=> 'ดาวน์โหลด CSV',
diff --git a/resources/lang/th/admin/licenses/general.php b/resources/lang/th/admin/licenses/general.php
index 74b4c2a39f..1d21099e2d 100644
--- a/resources/lang/th/admin/licenses/general.php
+++ b/resources/lang/th/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'เกี่ยวกับใบอนุญาต',
-    'about_licenses'                  => 'ใบอนุญาตใช้ในการติดตามซอฟต์แวร์ พวกเขามีจำนวนที่นั่งที่ระบุซึ่งสามารถเช็คเอาท์ให้บุคคลอื่นได้',
+    'about_licenses_title'      => 'เกี่ยวกับใบอนุญาต',
+    'about_licenses'            => 'ใบอนุญาตใช้ในการติดตามซอฟต์แวร์ พวกเขามีจำนวนที่นั่งที่ระบุซึ่งสามารถเช็คเอาท์ให้บุคคลอื่นได้',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'ประวัติการชำระเงิน',
     'checkout'  				=> 'ใบอนุญาตเบิกจ่ายที่นั่ง',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'ใบอนุญาตซอฟต์แวร์',
     'user'  					=> 'ผู้ใช้งาน',
     'view'  					=> 'ดูใบอนุญาต',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/th/admin/licenses/message.php b/resources/lang/th/admin/licenses/message.php
index 6e90b6cb10..e22e72e87e 100644
--- a/resources/lang/th/admin/licenses/message.php
+++ b/resources/lang/th/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'ไม่พบใบอนุญาตหรือคุณไม่มีสิทธิ์ในการเข้าถึง',
     'user_does_not_exist' => 'ไม่มีผู้ใช้',
     'asset_does_not_exist' 	=> 'เนื้อหาที่คุณกำลังพยายามเชื่อมโยงกับใบอนุญาตนี้ไม่มีอยู่',
     'owner_doesnt_match_asset' => 'เนื้อหาที่คุณกำลังพยายามเชื่อมโยงกับใบอนุญาตนี้เป็นของ somene ไม่ใช่บุคคลที่เลือกในรายการที่กำหนดให้กับ dropdown',
diff --git a/resources/lang/th/admin/locations/message.php b/resources/lang/th/admin/locations/message.php
index eb3c0cd0b0..6aae7c477f 100644
--- a/resources/lang/th/admin/locations/message.php
+++ b/resources/lang/th/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับผู้ใช้งานคนใดคนหนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงผู้ใช้งานของท่านไม่ให้มีส่วนเกี่ยวข้องกับสถานที่นี้ และลองอีกครั้ง. ',
     'assoc_assets'	 => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับผู้ใช้งานคนใดคนหนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงผู้ใช้งานของท่านไม่ให้มีส่วนเกี่ยวข้องกับสถานที่นี้ และลองอีกครั้ง. ',
     'assoc_child_loc'	 => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับหมวดสถานที่ใดที่หนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงสถานที่ของท่านไม่ให้มีส่วนเกี่ยวข้องกับหมวดสถานที่นี้ และลองอีกครั้ง. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'สินทรัพย์ถูกมอบหมายแล้ว',
+    'current_location' => 'ตำแหน่งปัจจุบัน',
 
 
     'create' => array(
diff --git a/resources/lang/th/admin/manufacturers/message.php b/resources/lang/th/admin/manufacturers/message.php
index 0dac5bc316..45b1834559 100644
--- a/resources/lang/th/admin/manufacturers/message.php
+++ b/resources/lang/th/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'ยังไม่มีผู้ผลิต',
     'assoc_users'	 => 'ผู้ผลิตนี้มีความสัมพันธ์ในรายการโมเดลอย่างน้อยหนึ่งรายการในปัจจุบัน และไม่สามารถลบได้ กรุณาอัพเดทโมเดลของคุณออกจากความสัมพันธ์ดังกล่าว และลองอีกครั้ง ',
 
diff --git a/resources/lang/th/admin/manufacturers/table.php b/resources/lang/th/admin/manufacturers/table.php
index 971c670306..d6461ca315 100644
--- a/resources/lang/th/admin/manufacturers/table.php
+++ b/resources/lang/th/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'อีเมลสนับสนุน',
     'support_phone'   		=> 'โทรศัพท์สนับสนุน',
     'support_url'   		=> 'URL การสนับสนุน',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'ปรับปรุงผู้ผลิต',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/th/admin/models/general.php b/resources/lang/th/admin/models/general.php
index 7810661d7f..e708cc824a 100644
--- a/resources/lang/th/admin/models/general.php
+++ b/resources/lang/th/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'การลบรายการเป็นกลุ่ม',
     'bulk_delete_help'               => 'ใช้ช่องทำเครื่องหมายด้านล่างเพื่อยืนยันการลบโมเดลเนื้อหาที่เลือก โมเดลสินทรัพย์ที่มีเนื้อหาเกี่ยวข้องกับเนื้อหาเหล่านั้นไม่สามารถลบออกได้จนกว่าสินทรัพย์จะเชื่อมโยงกับโมเดลอื่น',
-    'bulk_delete_warn'          => 'คุณกำลังจะลบ: asset_count',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'กู้คืนโมเดล',
     'requestable'               => 'ผู้ใช้สามารถขอรับโมเดลนี้ได้',
 	'show_mac_address'			      => 'แสดง MAC address ในสินทรัพย์ของโมเดลนี้',
diff --git a/resources/lang/th/admin/models/message.php b/resources/lang/th/admin/models/message.php
index 9b746940a6..edc73b310f 100644
--- a/resources/lang/th/admin/models/message.php
+++ b/resources/lang/th/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'ไม่มีโมเดลนี้',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'โมเดลนี้มีความสัมพันธ์กับสินทรัพย์หนึ่ง หรือมากกว่าในปัจจุบัน และจะไม่สามารถลบได้ กรุณาลบสินทรัพย์และลองอีกครั้ง ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'ยังไม่ได้ปรับปรุงโมเดล กรุณาลองใหม่อีกครั้ง',
-        'success' => 'ปรับปรุงโมเดลเรียบร้อยแล้ว'
+        'success' => 'ปรับปรุงโมเดลเรียบร้อยแล้ว',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'ไม่มีการเปลี่ยนแปลงเขตข้อมูลดังนั้นไม่มีอะไรที่ได้รับการปรับปรุง',
-        'success' 		=> 'อัปเดตโมเดลแล้ว'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'ไม่มีการเลือกรายการใด ๆ ดังนั้นจึงไม่มีสิ่งใดถูกลบ',
-        'success' 		    => ': แบบจำลอง success_count ลบ',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ': success_count โมเดลถูกลบแล้วอย่างไรก็ตาม: ไม่สามารถลบข้อมูล fail_count เนื่องจากยังมีเนื้อหาที่เชื่อมโยงอยู่'
     ),
 
diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php
index e0a4d19805..04a6151d05 100644
--- a/resources/lang/th/admin/settings/general.php
+++ b/resources/lang/th/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'หากคุณต้องการส่งสำเนาเช็คอิน / เช็คเอาต์อีเมลที่ส่งถึงผู้ใช้ไปยังบัญชีอีเมลอื่นให้ป้อนได้ที่นี่ มิฉะนั้นปล่อยให้ฟิลด์นี้ว่างเปล่า',
     'is_ad'				        => 'นี่คือเซิร์ฟเวอร์ Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'ส่งแจ้งเตือนไปยัง',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'การแจ้งเตือนถูกเปิดใช้งานแล้ว',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'ตั้งค่าบาร์โค๊ด',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'ป้อนชื่อผู้ใช้และรหัสผ่าน LDAP ที่ถูกต้องจากฐานข้อมูล DN ที่คุณระบุไว้ด้านบนเพื่อทดสอบว่าการเข้าสู่ระบบ LDAP ของคุณมีการกำหนดค่าอย่างถูกต้องหรือไม่ คุณต้องบันทึกการตั้งค่า LDAP ที่อัปเดตก่อน',
     'ldap_login_sync_help'      => 'นี่เป็นการทดสอบว่า LDAP สามารถซิงค์ได้อย่างถูกต้อง หากแบบสอบถามการตรวจสอบสิทธิ์ LDAP ของคุณไม่ถูกต้องผู้ใช้อาจยังไม่สามารถเข้าสู่ระบบได้ คุณต้องบันทึกการตั้งค่า LDAP ที่อัปเดตก่อน',
     'ldap_manager'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'แสดงภาพในอีเมล',
     'show_images_in_email_help'   => 'ยกเลิกการทำเครื่องหมายในช่องนี้หากการติดตั้ง Snipe-IT ของคุณอยู่หลัง VPN หรือเครือข่ายที่ปิดอยู่และผู้ใช้ภายนอกเครือข่ายจะไม่สามารถโหลดภาพที่แสดงจากการติดตั้งนี้ในอีเมลของตนได้',
     'site_name'                 => 'ชื่อไซต์',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'เมื่อคุณได้บันทึกข้อมูลของคุณแล้วปุ่มทดสอบจะปรากฏขึ้น',
-    'slack_test_help'           => 'ทดสอบว่าการบูรณาการแบบ Slack ของคุณได้รับการกำหนดค่าอย่างถูกต้องหรือไม่ คุณต้องบันทึกการตั้งค่าที่เพิ่งอัปโหลดไว้ก่อน',
+    'general_webhook'           => 'General Webhook',
+    '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_help'       => 'ระบุผู้ที่เห็นลิงก์ไปยังข้อมูลสนับสนุน Snipe-IT และคู่มือผู้ใช้',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/th/admin/settings/message.php b/resources/lang/th/admin/settings/message.php
index 09bbde3fd6..d97ceea3a2 100644
--- a/resources/lang/th/admin/settings/message.php
+++ b/resources/lang/th/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/th/admin/users/general.php b/resources/lang/th/admin/users/general.php
index 4f828a2eb3..a1526b6405 100644
--- a/resources/lang/th/admin/users/general.php
+++ b/resources/lang/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.',
+    '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',
     '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'         => 'ดูผู้ใช้ :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/th/admin/users/message.php b/resources/lang/th/admin/users/message.php
index 681a31a2b1..b6403f65bb 100644
--- a/resources/lang/th/admin/users/message.php
+++ b/resources/lang/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.',
     'user_login_required'       => 'ต้องการชื่อผู้ใช้งาน',
     'user_password_required'    => 'ต้องการรหัสผ่าน',
     'insufficient_permissions'  => 'สิทธิ์การใช้งานไม่เพียงพอ',
diff --git a/resources/lang/th/auth/general.php b/resources/lang/th/auth/general.php
index 65875a08ba..a875164ca9 100644
--- a/resources/lang/th/auth/general.php
+++ b/resources/lang/th/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php
index b98d246d5a..fcb39ec154 100644
--- a/resources/lang/th/general.php
+++ b/resources/lang/th/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'อุปกรณ์',
     'activated'			    => 'เปิดใช้งาน',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'อุปกรณ์',
     'accessory_report'		=> 'รายงานอุปกรณ์เสริม',
     'action'                => 'ดำเนินการ',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'การตรวจสอบบัญชี',
     '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'           => 'มอบหมายให้:',
+    'assignee'              => 'Assigned to',
     'avatar_delete'         => 'ลบรูปภาพประจำตัว',
     'avatar_upload'         => 'อัพโหลดภาพประจำตัว',
     'back'      			=> 'ย้อนกลับ',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'แก้ไขจำนวนมาก',
     'bulk_delete'           => 'ลบเป็นกลุ่ม',
     'bulk_actions'          => 'ดำเนินการกับข้อมูลเป็นชุด',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'ตามสถานะ',
     'cancel'  				=> 'ยกเลิก',
     'categories'			=> 'ประเภท',
@@ -83,6 +92,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.',
     'deleted'  				=> 'ลบแล้ว',
     'delete_seats'  		=> 'ลบที่นั่งแล้ว',
     'deletion_failed'       => 'การลบล้มเหลว',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => 'ชนิดไฟล๋ที่ยอมรับ :types ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size |ชนิดไฟล๋ที่ยอมรับ :types ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
     'filetypes_size_help'   => 'ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
     'image_filetypes_help'  => 'ชนิดไฟล์ที่รองรับคือ jpg, webp, png, gif, และ svg. ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :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'         	    => 'นำเข้า',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'ซ่อมบำรุงสินทรัพย์',
     'item'  				=> 'รายการ',
     'item_name'             => 'ชื่อสิ่งนี้',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'สิทธิ์ไม่เพียงพอ!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'ภาษา',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'คำขอยกเลิกแล้ว',
     'save'  				=> 'บันทึก',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'เลือก',
     'select_all'            => 'เลือกทั้งหมด',
     'search'				=> 'ค้นหา',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'ลายเซ็น',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'รูปแบบ/เทมเพลต',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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: คุณลักษณะบางอย่างถูกปิดใช้งานสำหรับการติดตั้งนี้',
     'site_name'				=> 'ชื่อไซต์',
     'state'  				=> 'รัฐ',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'คุณแน่ใจหรือไม่ว่าต้องการลบ',
     'submit'				=> 'เสนอ',
     'target'                => 'เป้า',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'การแสดงเวลาและวันที่',
     'total_assets'			=> 'ทรัพย์สินทั้งหมด',
     'total_licenses'		=> 'ลิขสิทธิ์ทั้งหมด',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/th/help.php b/resources/lang/th/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/th/help.php
+++ b/resources/lang/th/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/th/localizations.php b/resources/lang/th/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/th/localizations.php
+++ b/resources/lang/th/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/th/mail.php b/resources/lang/th/mail.php
index e89e282342..2494f08e29 100644
--- a/resources/lang/th/mail.php
+++ b/resources/lang/th/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'เข้าสู่ระบบการติดตั้ง Snipe-IT ใหม่ของคุณโดยใช้ข้อมูลรับรองด้านล่าง:',
     'login' => 'เข้าสู่ระบบ:',
     'Low_Inventory_Report' => 'รายงานพื้นที่โฆษณาต่ำ',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'ชื่อ',
     'new_item_checked' => 'รายการใหม่ได้รับการตรวจสอบภายใต้ชื่อของคุณแล้วรายละเอียดมีดังนี้',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'ข้อมูลรับรอง Snipe-IT ของคุณ',
     'Accessory_Checkin_Notification' => 'เช็คอินอุปกรณ์เสริมแล้ว',
     'Asset_Checkin_Notification' => 'เช็คอินสินทรัพย์แล้ว',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'เช็คอินใบอนุญาตแล้ว',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'เตือนความจำ :: ใกล้หมดเวลาเช็คอิน',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'ดูสินทรัพย์ที่มี',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/th/validation.php b/resources/lang/th/validation.php
index 7e0afde723..34fd5d2d92 100644
--- a/resources/lang/th/validation.php
+++ b/resources/lang/th/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'แอตทริบิวต์: ต้องมีอย่างน้อย: รายการต่ำสุด',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => ':attribute ที่เลือกไม่ถูกต้อง',
     'numeric'              => ':attribute ต้องเป็นตัวเลขเท่านั้น',
     'present'              => 'ฟิลด์แอ็ตทริบิวต์: ต้องมีอยู่',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'รหัสผ่านปัจจุบันของคุณไม่ถูกต้อง',
         'dumbpwd'          => 'รหัสผ่านที่ใช้กันอยู่ทั่วไป',
         'statuslabel_type' => 'คุณต้องเลือกประเภทป้ายสถานะที่ถูกต้อง',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/tl/admin/accessories/general.php b/resources/lang/tl/admin/accessories/general.php
index 96470c14f4..4bbd79aa22 100644
--- a/resources/lang/tl/admin/accessories/general.php
+++ b/resources/lang/tl/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/tl/admin/accessories/message.php b/resources/lang/tl/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/tl/admin/accessories/message.php
+++ b/resources/lang/tl/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/tl/admin/asset_maintenances/form.php b/resources/lang/tl/admin/asset_maintenances/form.php
index b743dcdda8..091bac06cf 100644
--- a/resources/lang/tl/admin/asset_maintenances/form.php
+++ b/resources/lang/tl/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Ang Uri ng Pagpapanatili',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Ang Pamagat',
-        'start_date'             => 'Nagsimula na',
-        'completion_date'        => 'Nakumpleto na',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Ang Halaga',
         'is_warranty'            => 'Ang Pagpapabuti ng Warantiya',
-        'asset_maintenance_time' => 'Ang mga araw',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Ang mga Palatandaan',
-        'update'                 => 'I-update',
-        'create'                 => 'Lumikha'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/tl/admin/categories/message.php b/resources/lang/tl/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/tl/admin/categories/message.php
+++ b/resources/lang/tl/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/tl/admin/components/general.php b/resources/lang/tl/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/tl/admin/components/general.php
+++ b/resources/lang/tl/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/tl/admin/components/message.php b/resources/lang/tl/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/tl/admin/components/message.php
+++ b/resources/lang/tl/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/tl/admin/consumables/message.php b/resources/lang/tl/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/tl/admin/consumables/message.php
+++ b/resources/lang/tl/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/tl/admin/custom_fields/general.php b/resources/lang/tl/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/tl/admin/custom_fields/general.php
+++ b/resources/lang/tl/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/tl/admin/groups/message.php b/resources/lang/tl/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/tl/admin/groups/message.php
+++ b/resources/lang/tl/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/tl/admin/hardware/form.php b/resources/lang/tl/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/tl/admin/hardware/form.php
+++ b/resources/lang/tl/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/tl/admin/hardware/general.php b/resources/lang/tl/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/tl/admin/hardware/general.php
+++ b/resources/lang/tl/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/tl/admin/hardware/message.php b/resources/lang/tl/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/tl/admin/hardware/message.php
+++ b/resources/lang/tl/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/tl/admin/hardware/table.php b/resources/lang/tl/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/tl/admin/hardware/table.php
+++ b/resources/lang/tl/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/tl/admin/licenses/general.php b/resources/lang/tl/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/tl/admin/licenses/general.php
+++ b/resources/lang/tl/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/tl/admin/manufacturers/message.php b/resources/lang/tl/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/tl/admin/manufacturers/message.php
+++ b/resources/lang/tl/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/tl/admin/manufacturers/table.php b/resources/lang/tl/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/tl/admin/manufacturers/table.php
+++ b/resources/lang/tl/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/tl/admin/models/general.php b/resources/lang/tl/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/tl/admin/models/general.php
+++ b/resources/lang/tl/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/tl/admin/models/message.php b/resources/lang/tl/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/tl/admin/models/message.php
+++ b/resources/lang/tl/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/tl/admin/settings/general.php b/resources/lang/tl/admin/settings/general.php
index 488968c79b..ce841258d8 100644
--- a/resources/lang/tl/admin/settings/general.php
+++ b/resources/lang/tl/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Ito ay isang Aktibong serber ng Direktorya',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Punagana na ang Alerto sa Email',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/tl/admin/settings/message.php b/resources/lang/tl/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/tl/admin/settings/message.php
+++ b/resources/lang/tl/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/tl/admin/users/general.php b/resources/lang/tl/admin/users/general.php
index daa568e8bf..b097ccec69 100644
--- a/resources/lang/tl/admin/users/general.php
+++ b/resources/lang/tl/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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/tl/admin/users/message.php b/resources/lang/tl/admin/users/message.php
index 247a1b321e..adf26b3229 100644
--- a/resources/lang/tl/admin/users/message.php
+++ b/resources/lang/tl/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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/tl/auth/general.php b/resources/lang/tl/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/tl/auth/general.php
+++ b/resources/lang/tl/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/tl/general.php b/resources/lang/tl/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/tl/general.php
+++ b/resources/lang/tl/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/tl/help.php b/resources/lang/tl/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/tl/help.php
+++ b/resources/lang/tl/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/tl/localizations.php b/resources/lang/tl/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/tl/localizations.php
+++ b/resources/lang/tl/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/tl/mail.php b/resources/lang/tl/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/tl/mail.php
+++ b/resources/lang/tl/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/tl/validation.php b/resources/lang/tl/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/tl/validation.php
+++ b/resources/lang/tl/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/tr/admin/accessories/general.php b/resources/lang/tr/admin/accessories/general.php
index 5a7ff849bd..a13992ad3c 100644
--- a/resources/lang/tr/admin/accessories/general.php
+++ b/resources/lang/tr/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Aksesuar Güncelleştirme',
     'use_default_eula'					=> '<a href="#" data-toggle="modal" data-target="#eulaModal">\'yı Varsayılan Sözleşme</a> yerine kullan.',
     'use_default_eula_disabled'			=> '<del>Varsayılan sözleşmeyi kullan</del> Varsayılan sözleşme tanımlı değil. Lütfen Ayarlar\'dan ekleyiniz.',
+    'clone'                             => 'Aksesuarı çoğalt',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/tr/admin/accessories/message.php b/resources/lang/tr/admin/accessories/message.php
index 6e3bbe875c..bce66441d3 100644
--- a/resources/lang/tr/admin/accessories/message.php
+++ b/resources/lang/tr/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/tr/admin/asset_maintenances/form.php b/resources/lang/tr/admin/asset_maintenances/form.php
index b808675ee0..68f44d81dc 100644
--- a/resources/lang/tr/admin/asset_maintenances/form.php
+++ b/resources/lang/tr/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Varlık bakım tipi',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Başlık',
-        'start_date'             => 'Başladı',
-        'completion_date'        => 'Tamamlandı',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Ücret',
         'is_warranty'            => 'Garanti İyileştirme',
-        'asset_maintenance_time' => 'Günler',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notlar',
-        'update'                 => 'Güncelle',
-        'create'                 => 'Oluştur'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/tr/admin/categories/message.php b/resources/lang/tr/admin/categories/message.php
index 3833ba7fd1..cd583570a2 100644
--- a/resources/lang/tr/admin/categories/message.php
+++ b/resources/lang/tr/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Kategori güncellenemedi, Lütfen tekrar deneyin',
-        'success' => 'Kategori güncellendi.'
+        'success' => 'Kategori güncellendi.',
+        'cannot_change_category_type'   => 'Kategori tipini oluşturduktan sonra üzerinde değişiklik yapamazsınız',
     ),
 
     'delete' => array(
diff --git a/resources/lang/tr/admin/components/general.php b/resources/lang/tr/admin/components/general.php
index f189c1d8cf..bf37c8e1c0 100644
--- a/resources/lang/tr/admin/components/general.php
+++ b/resources/lang/tr/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Kalan',
     'total' 			                 => 'Toplam',
     'update'                            => 'Bileşeni düzenle',
+    'checkin_limit'            => 'Giren toplam tutar :assigned_qty miktarına eşit ya da daha az olmalıdır'
 );
diff --git a/resources/lang/tr/admin/components/message.php b/resources/lang/tr/admin/components/message.php
index 3b46880f7d..70f01af121 100644
--- a/resources/lang/tr/admin/components/message.php
+++ b/resources/lang/tr/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Bileşeni çıkışı yapılamadı, lütfen tekrar deneyin',
         'success' 		=> 'Bileşen çıkışı başarıyla yapıldı.',
-        '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.',
+        'unavailable'      => 'Yeterli bileşen kalmadı: : miktar miktar, :talep edilen talep edilen',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/tr/admin/consumables/message.php b/resources/lang/tr/admin/consumables/message.php
index 13a2d0016f..e20aeb6931 100644
--- a/resources/lang/tr/admin/consumables/message.php
+++ b/resources/lang/tr/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Sarf malzemesi çıkışı yapılamadı, lütfen tekrar deneyin',
         'success' 		=> 'Sarf malzemesi çıkışı yapıldı.',
-        '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.',
+         'unavailable'      => 'Bu zimmetleme işlemi için yeterli sarf malzeme kalmamış. Lütfen stok miktarını kontrol edin.',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/tr/admin/custom_fields/general.php b/resources/lang/tr/admin/custom_fields/general.php
index 59c67a6d4e..0419af72f4 100644
--- a/resources/lang/tr/admin/custom_fields/general.php
+++ b/resources/lang/tr/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Modellerle Kullanılmıştır',
     'order'   		            => 'Sipariş',
     'create_fieldset'         => 'Yeni alan kümesi',
+    'update_fieldset'         => 'Fieldset\'i güncelle',
+    'fieldset_does_not_exist'   => 'Fieldset :id yok',
+    'fieldset_updated'         => 'Fieldset güncellendi',
     'create_fieldset_title' => 'Yeni bir alan kümesi oluştur',
     'create_field'            => 'Yeni özel alan',
     'create_field_title' => 'Yeni bir özel alan oluştur',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => 'UYARI. Bu alan, özel alanlar tablosunda <code>:db_column</code> olarak bulunur, ancak <code>:expected</code> olmalıdır.',
     'is_unique' => 'Bu değer tüm varlıklarda benzersiz olmalıdır',
     'unique' => 'Benzersiz',
-    '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' => 'Teslim alınan kullanıcının bu değerleri Atanan Varlıkları Görüntüle sayfasında görüntülemesine izin ver',
+    'display_in_user_view_table' => 'Kullanıcı tarafından görülebilir',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
 ];
diff --git a/resources/lang/tr/admin/departments/message.php b/resources/lang/tr/admin/departments/message.php
index c4fb66235e..ee249cee66 100644
--- a/resources/lang/tr/admin/departments/message.php
+++ b/resources/lang/tr/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Bölüm mevcut değil.',
-    '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' => 'Bu şirket konumunda bu ada sahip bir departman zaten var. Veya bu departman için daha spesifik bir isim seçin. ',
     'assoc_users'	 => 'Bu bölüm şu anda en az bir kullanıcı ile ilişkili ve silinemez. Bölümü silebilmek için ilişkili kullanıcıları güncelleyin. ',
     'create' => array(
         'error'   => 'Bölüm oluşturulmadı, lütfen yeniden deneyin.',
diff --git a/resources/lang/tr/admin/groups/message.php b/resources/lang/tr/admin/groups/message.php
index cc1b3dae12..b5854d7328 100644
--- a/resources/lang/tr/admin/groups/message.php
+++ b/resources/lang/tr/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grup zaten mevcut.',
-    'group_not_found'     => 'Grup [:id] mevcut değil.',
+    'group_not_found'     => 'Group ID : ID mevcut değil.',
     'group_name_required' => 'İsim alanı zorunludur',
 
     'success' => array(
diff --git a/resources/lang/tr/admin/hardware/form.php b/resources/lang/tr/admin/hardware/form.php
index e722283ab4..0e6f82e296 100644
--- a/resources/lang/tr/admin/hardware/form.php
+++ b/resources/lang/tr/admin/hardware/form.php
@@ -2,11 +2,14 @@
 
 return [
     'bulk_delete'		=> 'Toplu varlık silmeyi onaylıyor musunuz?',
+    'bulk_restore'      => 'Toplu varlık geriyüklemesini onaylayın', 
   'bulk_delete_help'	=> 'Toplu silme için aşağıdaki Varlıkları gözden geçirin. Silindikten sonra bu varlıkların geri yüklenebilir fakat atanmış olan herhangi bir kullanıcı ile ilişkili olmayacaktır.',
+  'bulk_restore_help'	=> 'Aşağıdaki varlık geri yüklemesini gözden geçirin. Geri yüklendiklerinde saha önceden atanmış olan sahiplerine dair aitlikleri kalmayacaktır.',
   'bulk_delete_warn'	=> ':asset_count adet varlığı düzenlemek üzeresiniz.',
+  'bulk_restore_warn'	=> 'Geri yüklüyorsunuz : asset_count assets.',
     'bulk_update'		=> 'Demirbaşları Toplu Güncelle',
     'bulk_update_help'	=> 'Bu form birden çok demirbaşı tek seferde güncellemenizi sağlar. Lütfen sadece değiştirmek istediğiniz alanları doldurunuz. Değiştirilmesini istemediğiniz alanları boş bırakınız. ',
-    '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_warn'	=> 'Tek bir varlığın özelliklerini düzenlemek üzeresiniz.| :asset_count varlıkların özelliklerini düzenlemek üzeresiniz.',
     'checkedout_to'		=> 'Çıkış Yapılmış Olan Kişi',
     'checkout_date'		=> 'Çıkış Tarihi',
     'checkin_date'		=> 'Giriş Tarihi',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Sadece varsayılan 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.',
-    'processing_spinner' => 'İşleniyor...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Opsiyonel Bilgi',
     'order_details'   => 'Sipariş Bilgileri'
 ];
diff --git a/resources/lang/tr/admin/hardware/general.php b/resources/lang/tr/admin/hardware/general.php
index 4644b814a1..eea8f3f5e6 100644
--- a/resources/lang/tr/admin/hardware/general.php
+++ b/resources/lang/tr/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Bu varlık silindi.',
     'edit'  					=> 'Demirbaşı Düzenle',
     'model_deleted'  			=> 'Bu varlık modeli silindi. Varlığı geri almak için modelini geri almalısınız.',
+    'model_invalid'             => 'Bu varlığın model bilgisi hatalı.',
+    'model_invalid_fix'         => 'Varlığı iade alma veya teslim etme işlemi öncesinde bunu düzeltmek için varlık bilgisi düzenlenmelidir.',
     'requestable'               => 'Talep edilebilir',
     'requested'				    => 'Talep edildi',
     'not_requestable'           => 'Talep Edilemez',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Demirbaşı Geri Getir',
     'pending'  					=> 'Bekliyor',
     'undeployable'  			=> 'Dağtılamaz',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Demirbaşı Görüntüle',
     'csv_error' => 'CSV dosyanızda bir hata var:',
     'import_text' => '
@@ -39,5 +42,6 @@ return [
     'error_messages' => 'Hata mesajı:',
     'success_messages' => 'Başarı mesajı:',
     'alert_details' => 'Detaylar için aşağıyı okuyun.',
-    'custom_export' => 'Özel Dışarı Aktar'
+    'custom_export' => 'Özel Dışarı Aktar',
+    'mfg_warranty_lookup' => ':Üretici garantisinin durumuna bakma',
 ];
diff --git a/resources/lang/tr/admin/hardware/message.php b/resources/lang/tr/admin/hardware/message.php
index 2f6072b3c6..350f74fd98 100644
--- a/resources/lang/tr/admin/hardware/message.php
+++ b/resources/lang/tr/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Demirbaş geri getirilemedi, lütfen tekrar deneyin',
         'success' 		=> 'Demirbaş geri getirildi.',
+        'bulk_success' 		=> 'Varlık başarı ile geri yüklendi.',
+        'nothing_updated'   => 'Herhangi bir varlık seçili olmadığı için hiçbirşey geri yüklenmedi.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         'success'               => 'Dosyanızı içe aktarıldı',
         'file_delete_success'   => 'Dosyanız başarıyla silindi',
         'file_delete_error'      => 'Dosya silenemedi',
+        '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',
     ],
 
 
diff --git a/resources/lang/tr/admin/hardware/table.php b/resources/lang/tr/admin/hardware/table.php
index a4effe209e..e8ead9aa9f 100644
--- a/resources/lang/tr/admin/hardware/table.php
+++ b/resources/lang/tr/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Giriş/Çıkış',
     'checkout_date' => 'Çıkış Tarihi',
     'checkoutto' 	=> 'Çıkış Yapıldı',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Mevcut Değer',
     'diff' 			=> 'Fark',
     'dl_csv' 		=> 'CSV Dosyasını İndir',
diff --git a/resources/lang/tr/admin/licenses/general.php b/resources/lang/tr/admin/licenses/general.php
index 2b64606501..62530c617a 100644
--- a/resources/lang/tr/admin/licenses/general.php
+++ b/resources/lang/tr/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Lisanslar Hakkında',
-    'about_licenses'                  => 'Lisanslar yazılım takibi için kullanılır.  Kullanıcı sayısı kadar kişide kullanılabilir',
+    'about_licenses_title'      => 'Lisanslar Hakkında',
+    'about_licenses'            => 'Lisanslar yazılım takibi için kullanılır.  Kullanıcı sayısı kadar kişide kullanılabilir',
     'checkin'  					=> 'Lisans Kullanıcısı Girişi',
     'checkout_history'  		=> 'Çıkış Geçmişi',
     'checkout'  				=> 'Lisans Kullanıcı Çıkışı',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Yazılım Lisansları',
     'user'  					=> 'Kullanıcı',
     'view'  					=> 'Lisansı Göster',
+    'delete_disabled'           => 'Bazı koltuklar hala kullanıma alınmış olduğundan bu lisans henüz silinemez.',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Tüm koltukları ayır',
+                '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Tüm koltukları incele',
+                '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'  => 'Ulaşılabilir koltruk olmadığı için bu devre dışı bırakıldı',
+                '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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/tr/admin/licenses/message.php b/resources/lang/tr/admin/licenses/message.php
index bdc530f86e..43375fce70 100644
--- a/resources/lang/tr/admin/licenses/message.php
+++ b/resources/lang/tr/admin/licenses/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'does_not_exist' => 'Lisans mevcut değil veya görüntüleme izniniz yok.',
     'user_does_not_exist' => 'Kullanıcı mevcut değil.',
     'asset_does_not_exist' 	=> 'Lisans ile ilişkilendirmek istediğiniz demirbaş mevcut değil.',
     'owner_doesnt_match_asset' => 'Lisans ile ilişkilendirmek istediğiniz demirbaş ilişkilendirmek istediğiniz kişiden başkasına atanmış durumda.',
diff --git a/resources/lang/tr/admin/locations/message.php b/resources/lang/tr/admin/locations/message.php
index 9930b5064f..79c56aa50d 100644
--- a/resources/lang/tr/admin/locations/message.php
+++ b/resources/lang/tr/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'Konum en az 1 kullanıcı ile ilişkili durumda ve silinemez. Lütfen önce kullanıcıları güncelleyerek konumu boşaltın ve tekrar deneyin. ',
     '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' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Atanan Varlıklar',
+    'current_location' => 'Mevcut konum',
 
 
     'create' => array(
diff --git a/resources/lang/tr/admin/manufacturers/message.php b/resources/lang/tr/admin/manufacturers/message.php
index e6a894ec17..d1869f7b7c 100644
--- a/resources/lang/tr/admin/manufacturers/message.php
+++ b/resources/lang/tr/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Üretici mevcut değil.',
     'assoc_users'	 => 'Üretici en az 1 model ile ilişkili durumda ve silinemez. Lütfen önce modelleri güncelleyerek üreticiyi boşa çıkarın ve tekrar deneyin. ',
 
diff --git a/resources/lang/tr/admin/manufacturers/table.php b/resources/lang/tr/admin/manufacturers/table.php
index 8140ec5f2f..30bb7b88f0 100644
--- a/resources/lang/tr/admin/manufacturers/table.php
+++ b/resources/lang/tr/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Destek Maili',
     'support_phone'   		=> 'Destek telefonu',
     'support_url'   		=> 'Destek URL\'si',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Üretici Güncelle',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/tr/admin/models/general.php b/resources/lang/tr/admin/models/general.php
index 854d3fae0c..64d5f0d6f7 100644
--- a/resources/lang/tr/admin/models/general.php
+++ b/resources/lang/tr/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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'          => ':model_count varlık modellerini silmek üzeresiniz.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Modeli geri getir',
     'requestable'               => 'Kullanıcılar bu modeli talep edebilir',
 	'show_mac_address'			      => 'Bu model demirbaşta MAC adresi göster',
diff --git a/resources/lang/tr/admin/models/message.php b/resources/lang/tr/admin/models/message.php
index 05e3dda1b9..b69cbd99a6 100644
--- a/resources/lang/tr/admin/models/message.php
+++ b/resources/lang/tr/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model mevcut değil.',
+    'no_association' => 'İlişkilendirilmiş bir model bulunmamaktadır.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model güncellenemedi, lütfen tekrar deneyin',
-        'success' => 'Model güncellendi.'
+        'success' => 'Model güncellendi.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Hiçbir alan değiştirilmedi, dolayısıyla hiç bir alan güncellenmedi.',
-        'success' 		=> 'Model güncellendi.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Hiçbir model seçilmedi, bu nedenle hiçbir şey silinmedi.',
-        'success' 		    => ': success_count model (ler) silindi!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count adet model(ler) silindi, ancak :fail_count adet için silme işlemini tamamlayamadık, çünkü bunlar halâ varlıklarla ilişkilendirilmiş durumda.'
     ),
 
diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php
index f7ffa8f373..330495d552 100644
--- a/resources/lang/tr/admin/settings/general.php
+++ b/resources/lang/tr/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Active Directory sunucusudur',
     'alerts'                	=> 'Uyarı',
-    'alert_title'               => 'Güncelleme Uyarı Ayarları',
+    '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',
     'alerts_enabled'			=> 'Uyarılar etkinleştirildi',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => 'Bu kutuyu işaretlemek, kullanıcının UI kaplamasını farklı bir kaplamayla geçersiz kılmasına olanak tanır.',
     'asset_ids'					=> 'Demirbaş No',
     'audit_interval'            => 'Denetim Aralığı',
-    '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'       => 'Varlıklarınızı düzenli olarak fiziksel olarak denetlemeniz gerekiyorsa, kullandığınız aralığı ay olarak girin. Bu değeri güncellerseniz, denetim tarihi yaklaşan varlıklar için tüm "sonraki denetim tarihleri" güncellenir.',
     'audit_warning_days'        => 'Denetim Uyarı Eşiği',
     'audit_warning_days_help'   => 'Mal varlığının denetime tabi olması gerektiği zaman sizi kaç gün öncesinden uyarmalıyız?',
     'auto_increment_assets'		=> 'Otomatik olarak artan varlık etiketi oluşturun',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Yedekten geri dön',
     'backups_upload'            => 'Yedeği yükle',
     'backups_path'              => 'Yedeklerin sunucuda saklanacağı yer <code>:path</code>',
-    'backups_restore_warning'   => 'Geri yükleme butonunu kullanın <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> önceki yedeklemelerden (Şu anda "S3 file storage" yada "Docker" çalışmıyor.<br><br>Sizin<strong>entire :app_name Veritabanı yüklediğiniz dosyalarla değiştirilecektir.</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'         => '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ı',
@@ -75,8 +75,9 @@ return [
     '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',
-    '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.',
+    'ldap_default_group'        => 'Varsayılan İzinler Grubu',
+    'ldap_default_group_info'   => 'Yeni senkronize edilen kullanıcılara atamak için bir grup seçin. Bir kullanıcının atandığı grubun izinlerini aldığını unutmayın.',
+    'no_default_group'          => 'Varsayılan Grup Yok',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP İstemci Tarafı TLS anahtarı',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Sertifikası',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'LDAP Ayarları',
     'ldap_client_tls_cert_help' => 'LDAP bağlantıları için İstemci Tarafı TLS Sertifikası ve Anahtarı, genellikle yalnızca "Güvenli LDAP" içeren Google Workspace yapılandırmalarında kullanışlıdır. Her ikisi de gereklidir.',
      'ldap_client_tls_key'       => 'LDAP İstemci tarafı TLS anahtarı',
+    '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'      => 'LDAP ayarlarınızı doğru yapılandırıp yapılandırmadığınızı test etmek yukarıda belirttiğiniz DN için geçerli bir LDAP kullanıcı adı ve parolası giriniz. ÖNCE GÜNCEL LDAP AYARLARINI KAYDETMELİSİN.',
     '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'E-postalarda resimleri göster',
     'show_images_in_email_help'   => 'Snipe-IT kurulumunuz bir VPN\'in ya da kapalı bir ağın arkasındaysa ve ağ dışındaki kullanıcılar bu kurulumda sunulan görüntüleri e-postalarına yükleyemezse bu kutunun işaretini kaldırın.',
     'site_name'                 => 'Site Adı',
-    'slack'                     => 'Gevşek',
-    'slack_title'               => 'Slack ayarlarını güncelleştir',
-    'slack_help'                => 'Slack ayarları',
-    'slack_botname'             => 'Slack Bot Adı',
-    'slack_channel'             => 'Slack Kanalı',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Ayarları',
-    'slack_integration_help'    => 'Slack entegrasyonu isteğe bağlıdır, ancak kullanmak istiyorsanız uç nokta ve kanal gereklidir. Slack entegrasyonunu yapılandırmak için önce Slack hesabınızda <a href=":slack_link" target="_new" rel="noopener">gelen bir web kancası oluşturmanız</a> gerekir. Kaydetmeden önce ayarlarınızın doğru olduğunu onaylamak için <strong>Slack Entegrasyonunu Test Et</strong> düğmesini tıklayın. ',
-    'slack_integration_help_button'    => 'Slack bilgilerinizi kaydettikten sonra bir test düğmesi görünecektir.',
-    'slack_test_help'           => 'Slack entegrasyonunuzun doğru yapılandırılıp yapılandırılmadığını test edin. İLK OLARAK GÜNCELLENMİŞ SLACK AYARLARINIZI KAYDETMELİSİNİZ.',
+    'integrations'               => 'Integrations',
+    'slack'                     => 'Slack',
+    'general_webhook'           => 'General Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Kaydetmek için test et',
+    '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'            => 'Destek Bağlantıları Altbilgisi ',
     'support_footer_help'       => 'Snipe-IT destek, bilgi ve Kullanıcı Kılavuzu linklerini kimin göreceğini seçin',
@@ -301,7 +309,7 @@ return [
     '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' => 'Email alarmları, Denetim Ayarları',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Artış ve örnekler',
     'labels' => 'Etiket',
     'labels_title' => 'Etiket ayarlarını güncelle',
@@ -322,4 +330,9 @@ 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',
+    '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. ',
+
 ];
diff --git a/resources/lang/tr/admin/settings/message.php b/resources/lang/tr/admin/settings/message.php
index becfbf75f9..8b34c8b92f 100644
--- a/resources/lang/tr/admin/settings/message.php
+++ b/resources/lang/tr/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP kimlik doğrulaması deneniyor...',
         'authentication_success' => 'LDAP kullanıcı kimliği başarıyla doğrulandı!'
     ],
-    'slack' => [
-        'sending' => 'Slack test mesajı gönderiliyor...',
-        'success_pt1' => 'Başarılı! Kontrol edin ',
-        'success_pt2' => ' test mesajınız için kanal seçin ve ayarlarınızı kaydetmek için aşağıdaki KAYDET\'i tıkladığınızdan emin olun.',
-        '500' => '500 Sunucu Hatası.',
-        'error' => 'Bir şeyler yanlış gitti.',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/tr/admin/users/general.php b/resources/lang/tr/admin/users/general.php
index 79556e12dd..874a0558cd 100644
--- a/resources/lang/tr/admin/users/general.php
+++ b/resources/lang/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.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Yazılıma :name için çıkış yapılmış',
     'send_email_help'   => 'Bu kullanıcıya kimlik bilgilerini gönderebilmesi için bir e-posta adresi sağlamalısınız. E-posta kimlik bilgileri yalnızca kullanıcı oluşturulurken yapılabilir. Parolalar tek yönlü bir karmada saklanır ve bir kez kaydedildikten sonra geri alınamaz.',
     'view_user'         => 'Kullanıcıyı Görüntüle :name',
@@ -33,12 +35,20 @@ return [
     'superadmin_permission_warning' => 'Yalnızca süper yöneticiler bir kullanıcıya süper yönetici erişimi verebilir.',
     'admin_permission_warning' => 'Yalnızca yönetici haklarına veya daha fazlasına sahip kullanıcılar, bir kullanıcıya yönetici erişimi verebilir.',
     'remove_group_memberships' => 'Grup Üyeliklerini Kaldır',
-    'warning_deletion' => 'UYARILAR:',
-    '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' => 'Aşağıda listelenen :sayılan kullanıcı(lar) daki TÜM öğeleri kontrol etmek üzeresiniz. Süper yönetici adları kırmızıyla vurgulanır.',
     'update_user_assets_status' => 'Bu kullanıcılar için tüm varlıkları bu duruma güncelleyin',
     'checkin_user_properties' => 'Bu kullanıcılarla ilişkili tüm mülkleri kontrol edin',
     'remote_label'   => 'Bu uzak bir kullanıcı',
     'remote'   => 'Uzaktan Kumanda',
     'remote_help' => 'Bu, fiziksel konumlarınıza hiç gelmeyen veya nadiren gelen uzak kullanıcılara göre filtrelemeniz gerektiğinde yararlı olabilir.',
     'not_remote_label' => 'Bu uzak bir kullanıcı değil',
+    'vip_label' => 'VIP user',
+    'vip_help' => 'Organizasyonunuzdaki kişileri özel bir şekilde belirtmek, işaretlemek istiyor iseniz bu yardımcı olabilir.',
+    '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' => 'Bu tarihinde oluşturuldu:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/tr/admin/users/message.php b/resources/lang/tr/admin/users/message.php
index 06f6c5f14d..c438488d9e 100644
--- a/resources/lang/tr/admin/users/message.php
+++ b/resources/lang/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ı [:id] yok.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Oturum açma alanı gerekli',
     'user_password_required'    => 'Şifre Gerekli.',
     'insufficient_permissions'  => 'Yetersiz izinler.',
@@ -14,8 +14,8 @@ return array(
     'ldap_not_configured'        => 'LDAP entegrasyonu bu yükleme için yapılandırılmamış.',
     'password_resets_sent'      => 'Etkinleştirilmiş ve geçerli bir e-posta adresine sahip seçilen kullanıcılara şifre sıfırlama bağlantısı gönderildi.',
     'password_reset_sent'       => ':email! adresine bir şifre sıfırlama bağlantısı gönderildi!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_email'         => 'Bu kullanıcının profilinde bir e-posta adresi yok.',
+    'user_has_no_assets_assigned'   => 'Bu kullanıcının atanmış herhangi bir varlığı yok',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Bu kullanıcının e-posta grubu yok.',
+        'success' => 'Kullanıcı, mevcut envanteri hakkında bilgilendirildi.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/tr/auth/general.php b/resources/lang/tr/auth/general.php
index f8c5d76168..3fd5cdca28 100644
--- a/resources/lang/tr/auth/general.php
+++ b/resources/lang/tr/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Beni hatırla',
     'username_help_top'                 => 'E-posta ile bir şifre sıfırlama bağlantısı almak için <strong> kullanıcı adınızı </strong> girin.',
     'username_help_bottom'          => 'Kullanıcı adınız ve e-posta adresiniz <em> olabilir</em> aynı olabilir, ancak yapılandırmanıza bağlı olarak olmayabilir. Kullanıcı adınızı hatırlayamıyorsanız, yöneticinize başvurun. <br><br><strong>İlişkili bir e-posta adresi olmayan kullanıcı adlarına e-postayla şifre sıfırlama bağlantısı gönderilmeyecektir.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/tr/button.php b/resources/lang/tr/button.php
index 63fca140a2..1b18fdfee9 100644
--- a/resources/lang/tr/button.php
+++ b/resources/lang/tr/button.php
@@ -4,7 +4,7 @@ return [
     'actions' 	                => 'Hareketler',
     'add'    	                => 'Yeni ekle',
     'cancel'                    => 'İptal',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Tümünü Kontrol Et / Kullanıcıyı Sil',
     'delete'  	                => 'Sil',
     'edit'    	                => 'Düzenle',
     'restore' 	                => 'Geri yükle',
diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php
index 86329aaf3a..d003e86ef0 100644
--- a/resources/lang/tr/general.php
+++ b/resources/lang/tr/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Aksesuarlar',
     'activated'			    => 'Aktif edildi',
+    'accepted_date'         => 'Kabul edilme günü',
     'accessory'				=> 'Aksesuar',
     'accessory_report'		=> 'Aksesuar Raporu',
     'action'                => 'Hareket',
@@ -11,7 +12,7 @@ return [
     'admin'					=> 'Yönetici',
     'administrator'			=> 'Yönetici',
     'add_seats'             => 'Eklenen kişi sayısı',
-    'age'                   => "Age",
+    'age'                   => "Yaş",
     'all_assets'			=> 'Tüm Demirbaşlar',
     'all'       			=> 'Tümü',
     'archived'              => 'Arşivlenmiş',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Denetim',
     'audit_report'			=> 'Denetim Günlüğü',
     'assets'				=> 'Demirbaşlar',
+    'assets_audited'        => 'denetlenen varlıklar',
+    'assets_checked_in_count'     => 'geri alınan zimmetler',
+    'assets_checked_out_count'     => 'zimmetlenen varlıklar',
+    'asset_deleted_warning'     => 'Bu varlık silinmiştir. Birisine zimmetlemeden önce geri yüklemelisiniz.',
+    'assigned_date'         => 'Zimmet tarihi',
     'assigned_to'           => 'Bana Atanmış',
+    'assignee'              => 'Zimmetlenen',
     'avatar_delete'         => 'Profil Resmini Sil',
     'avatar_upload'         => 'Profil Resmi Yükle',
     'back'      			=> 'Geri',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Toplu Düzenle',
     'bulk_delete'           => 'Toplu Sil',
     'bulk_actions'          => 'Toplu Eylemler',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Toplu işlem / Kullanıcıları sil',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Bu cihaz kullanıcı tarafından sahiplenilmiştir.',
     'bystatus'              => 'Duruma göre',
     'cancel'  				=> 'İptal',
     'categories'			=> 'Kategoriler',
@@ -86,6 +95,7 @@ Context | Request Context
 ',
     'delete'  				=> 'Sil',
     'delete_confirm'  		=> 'Öğeyi silmek istediğinizden emin misiniz?',
+    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Silinmiş',
     'delete_seats'  		=> 'Silinen Kullanıcı Lisansı Sayısı',
     'deletion_failed'       => 'Silme başarısız',
@@ -105,8 +115,8 @@ Context | Request Context
     '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'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
+    '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)',
@@ -137,11 +147,12 @@ Context | Request Context
     'id'  					=> 'Kimlik',
     'image'                 => 'Görsel',
     'image_delete'         	=> 'Resmi sil',
-    'include_deleted'       => 'Include Deleted Assets',
+    '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'  => 'Kabul edilen dosya türleri jpg, webp, png, gif ve svg\'dir. İzin verilen maksimum yükleme boyutu :size \'dir.',
+    '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'         	    => 'İçeri aktar',
     'importing'         	=> 'İçeri Aktarma',
     'importing_help'        => 'Demirbaşları, aksesuarları, lisansları, bileşenleri, sarf malzemelerini ve kullanıcıları CSV dosyası ile içeri aktarabilirsiniz. <br><br> CSV, virgülle ayrılmış olmalı ve <a href="https://snipe-it.readme.io/docs/importing" target="_new">dökümandaki örnek CSV\'lerdekilerle eşleşen başlıklarla hazırlanmalıdır.</a>.',
@@ -151,6 +162,8 @@ Context | Request Context
     'asset_maintenances'       => 'Demirbaş bakımları',
     'item'  				=> 'Ürün',
     'item_name'             => 'Öğe İsmi',
+    'import_file'  			=> 'CSV dosyasını içeri al',
+    'import_type'  			=> 'CSV içeri alma türü',
     'insufficient_permissions' => 'İzinler yetersiz!',
     'kits'       			=> 'Ön Tanımlı Setler',
     'language'				=> 'Dil',
@@ -191,7 +204,7 @@ Context | Request Context
     'no'  					=> 'Hayır',
     'notes'  				=> 'Notlar',
     'order_number'          => 'Sipariş Numarası',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Yalnızca Silinen Varlıklar',
     'page_menu'				=> '_MENU_ Öğe gösteriliyor',
     'pagination_info'		=> '_START_ - _END_ of _TOTAL_ arası öğeler',
     'pending'				=> 'Bekliyor',
@@ -221,6 +234,7 @@ Context | Request Context
     'requested_assets_menu' => 'Talep Edilen Varlıklar',
     'request_canceled'      => 'Talep iptal edildi',
     'save'  				=> 'Kaydet',
+    'select_var'            => 'Seçin :tür... ', // this will eventually replace all of our other selects
     'select'				=> 'Seç',
     'select_all'            => 'Tümünü Seç',
     'search'				=> 'Ara',
@@ -243,8 +257,8 @@ Context | Request Context
     'signature'             => 'İmza',
     'signed_off_by'         => 'İmzalayan',
     'skin'       			=> 'Tema',
-    'slack_msg_note'        => 'Bir slack mesajı gönderilecek',
-    'slack_test_msg'        => 'Oo merhaba! Görünüşe göre Snipe-IT ile Slack entegrasyonunuz çalışıyor!',
+    'webhook_msg_note'        => 'Webhook üzerinden bir ileti gönderilecek',
+    'webhook_test_msg'        => 'Oh hai! 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',
@@ -256,7 +270,6 @@ Context | Request Context
     'sure_to_delete'    => 'Silmek istediğinize emin misiniz',
     'submit'				=> 'Gönder',
     'target'                => 'Hedef',
-    'toggle_navigation'     => 'Gezinmeyi Aç/Kapat',
     'time_and_date_display' => 'Zaman ve Tarih Görüntüle',
     'total_assets'			=> 'Toplam Demirbaşlar',
     'total_licenses'		=> 'Toplam Lisanslar',
@@ -284,9 +297,9 @@ Context | Request Context
     'yes' 					=> 'Evet',
     'zip'  					=> 'Zip',
     'noimage'				=> 'Yüklenen görüntü veya resim bulunamadı.',
-    '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'   => 'İstenen dosya sunucuda yok.',
+    'file_upload_success'   => 'Dosya yükleme başarılı!',
+    'no_files_uploaded'     => 'Dosya yükleme başarılı!',
     'token_expired'         => 'Oturum zaman aşımına uğradı. Lütfen tekrar giriş yapın.',
     'login_enabled'         => 'Kullanıcı Aktif',
     'audit_due'             => 'Beklenen Denetimler',
@@ -340,7 +353,7 @@ Context | Request Context
     'invalid_category'      => 'Geçersiz kategori',
     'dashboard_info'        => 'Bu sizin kontrol paneliniz. Onun gibi çok var ama bu sizinki.',
     '60_percent_warning'    => '%60 Tamamlandı (uyarı)',
-    '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'       => 'Henüz bir şey eklememişsiniz gibi görünüyor, bu yüzden gösterecek bir şeyimiz yok. Şimdi bazı varlıklar, aksesuarlar, sarf malzemeleri veya lisanslar ekleyerek başlayın!',
     'new_asset'             => 'Yeni Varlık',
     'new_license'           => 'Yeni Lisans',
     'new_accessory'         => 'Yeni Aksesuar',
@@ -375,21 +388,68 @@ Context | Request Context
     'backup_delete_not_allowed'     => 'Yedek dosyaları silmek .env dosyasında engellenmiştir. Destek birimiyle veya yöneticinizle görüşün.',
     'additional_files'           => 'Ek Dosyalar',
     'shitty_browser'        => 'İmza algılanmadı. Eski bir tarayıcı kullanıyorsanız, varlık kabulünüzü tamamlamak için lütfen güncel bir tarayıcı kullanın.',
-    '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 ',
-    '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',
+    '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_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'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'Kabul gerektiren öğeleriniz var. Kabul etmek veya reddetmek için buraya tıklayın',
     'start_date'            => 'Başlangıç Tarihi',
     'end_date'            => 'Bitiş Tarihi',
     'alt_uploaded_image_thumbnail' => 'Yüklenen küçük resim',
-    'placeholder_kit'       => 'Bir kit seçin'
+    'placeholder_kit'       => 'Bir kit seçin',
+    'file_not_found'        => 'Dosya bulunamadı',
+    'preview_not_available' => '(ön izleme yok)',
+    'setup'                 => 'Kurulum',
+    'pre_flight'            => 'Deneme',
+    'skip_to_main_content'  => 'Ana içeriğe geç',
+    'toggle_navigation'     => 'Gezinme şeklini değiştir.',
+    'alerts'                => 'Uyarılar',
+    'tasks_view_all'        => 'Tüm görevleri görüntüleyin',
+    'true'                  => 'True',
+    'false'                 => 'False',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'Eşleşen LOG kaydı bulunamadı.',
+    'merge_users'           => 'Kullanıcıları birleştir',
+    '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, licences, 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'     => 'Kullanıcı seçilmedi',
+    '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'            => 'Temizle ve Kaydet',
+    'update_existing_values'    => 'Mevcut Değerler Güncellensinmi?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Otomatik artan varlık etiketi pasif olduğu için bütün "Varlık Etiketi" sütunu doldurmalısınız.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Not: Otomatik artan varlık etiketlerinin oluşturulması etkindir, böylece "Varlık Etiketi" doldurulmamış satırlar için etiket oluşturulur. "Varlık Etiketi" girilmiş olan satırlar eski bilgilerle kalacaktır..',
+    'send_welcome_email_to_users'   => ' Yeni Kullanıcılar için Hoş Geldiniz E-postası Gönderilsin mi?',
+    'back_before_importing'     => 'İçeri almadan önce yedeklensinmi?',
+    'csv_header_field'          => 'CSV Başlık Alanı',
+    'import_field'              => 'İçeri alma alanı',
+    'sample_value'              => 'Örnek Değer',
+    'no_headers'                => 'Sütun Bulunamadı',
+    'error_in_import_file'      => 'CSV dosyası okunurken bir hata oluştu: : hata',
+    'percent_complete'          => ':yüzde % tamamlandı',
+    'errors_importing'          => 'İçeri alırken bazı hatalar oluştu: ',
+    'warning'                   => 'DİKKAT: :dikkat',
+    'success_redirecting'       => '"Başarılı... Yönlendiriliyor.',
+    'setup_successful_migrations' => 'Veritabanı tablolarınız oluşturuldu',
+    'setup_migration_output' => 'Taşıma sonucu:',
+    'setup_migration_create_user' => 'Sonraki adım: Kullanıcı oluşturma',
+    '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' => 'Doğrula',
+    'autoassign_licenses' => 'Lisansları Otomatik Ata',
+    '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'      => 'Emin misiniz?',
+    'cannot_be_deleted'      => 'Bu öğe silinemez',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/tr/help.php b/resources/lang/tr/help.php
index 56e7edda26..66d6ccda33 100644
--- a/resources/lang/tr/help.php
+++ b/resources/lang/tr/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Daha Fazla Bilgi',
 
-    'audit_help' => 'Bu kutucuğu işaretlediğinizde varlık kaydı yeni lokasyonu gösterir. İşaretlenmemiş olarak bırakırsanız denetim kayıtlarında basitçe lokasyonu not edecektir. <br><br>Eğer varlığın çıkışı yapılmışsa, çıkışı yapılan kişiyi, varlığı veya lokasyonu değiştirmeyecektir.',
+    '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' => 'Varlıklar seri numaraları veya varlık etiketleri ile takip edilir. Bunlar bir öğeyi belirlemek için daha yüksek öneme sahip olma eğilimindedir.',
 
diff --git a/resources/lang/tr/localizations.php b/resources/lang/tr/localizations.php
index 3f3d7b78ba..91397e517e 100644
--- a/resources/lang/tr/localizations.php
+++ b/resources/lang/tr/localizations.php
@@ -4,56 +4,56 @@ return [
 
     'select_language' => 'Bir dil seçin',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
+        'en'=> 'İngilizce, US',
+        'en-GB'=> 'İngilizce, UK',
+        'af'=> 'Akrika dili',
+        'ar'=> 'Arapça',
+        'bg'=> 'Bulgarca',
+        'zh-CN'=> 'Basitleştirilmiş Çince',
+        'zh-TW'=> 'Geleneksel Çince',
+        'hr'=> 'Hırvatça',
+        'cs'=> 'Çekçe',
+        'da'=> 'Danca',
+        'nl'=> 'Hollanda Felemenkçe',
+        'en-ID'=> 'İngilizce, Endonezya',
+        'et'=> 'Estonya Estçe',
         'fil'=> 'Filipino',
         'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
+        'fr'=> 'Fransızca',
+        'de'=> 'Almanca',
         'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
+        'el'=> 'Yunanca',
+        'he'=> 'İbranice',
+        'hu'=> 'Macarca',
         'is' => 'Icelandic',
         'id'=> 'Indonesian',
         'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
+        'it'=> 'İtalyanca',
+        'ja'=> 'Japonca',
+        'ko'=> 'Korece',
+        'lv'=>'Letonca',
         'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
+        'mk'=> 'Makedonca',
         'ms'=> 'Malay',
-        'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
+        'mi'=> 'Maori Dili',
+        'mn'=> 'Moğolca',
+        'no'=> 'Norveç dili',
+        'fa'=> 'Farsça',
         'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
-        'tl'=> 'Tagalog',
-        'ta'=> 'Tamil',
-        'th'=> 'Thai',
+        'pt-PT'=> 'Portekizce',
+        'pt-BR'=> 'Brezilya Portekizcesi',
+        'ro'=> 'Rumence',
+        'ru'=> 'Rusça',
+        'sr-CS' => 'Sırpça (Latin)',
+        'sl'=> 'Slovakça',
+        'es-ES'=> 'İspanyolca',
+        'es-CO'=> 'İspanyolca, Kolombiya',
+        'es-MX'=> 'İspanyolca, Meksika',
+        'es-VE'=> 'İspanyolca, Venezuela',
+        'sv-SE'=> 'İsveç dili',
+        'tl'=> 'Tagalogca',
+        'ta'=> 'Tamilce',
+        'th'=> 'Tayland Dili',
         'tr'=> 'Türkçe',
         'uk'=> 'Ukranian',
         'vi'=> 'Vietnamese',
@@ -101,36 +101,36 @@ return [
         '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',
+        'CA'=>'Kanada',
+        'CC'=>'Cocos (Keeling) Adaları',
+        'CD'=>'Kongo Demokratik Cumhuriyeti',
+        'CF'=>'Orta Afrika Cumhuriyeti',
+        'CG'=>'Kongo Cunhuriyeti',
+        'CH'=>'İsviçre',
+        'CI'=>'Fildişi Sahili',
+        'CK'=>'Cook Adaları',
+        'CL'=>'Şili',
+        'CM'=>'Kamerun',
+        'CN'=>'Çin',
+        'CO'=>'Kolombiya',
+        'CR'=>'Kosta Rika',
+        'CU'=>'Küba',
         'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
-        'DJ'=>'Djibouti',
+        'CX'=>'Christmas Adası',
+        'CY'=>'Kıbrıs',
+        'CZ'=>'Çek Cumhuriyeti',
+        'DE'=>'Almanya',
+        'DJ'=>'Cibuti',
         'DK'=>'Denmark',
-        'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
-        'EC'=>'Ecuador',
-        'EE'=>'Estonia',
-        'EG'=>'Egypt',
-        'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
+        'DM'=>'Dominik',
+        'DO'=>'Dominik Cumhuriyeti',
+        'DZ'=>'Cezayir',
+        'EC'=>'Ekvador',
+        'EE'=>'Estonya',
+        'EG'=>'Mısır',
+        'ER'=>'Eritre',
+        'ES'=>'İspanya',
+        'ET'=>'Etiyopya',
         'EU'=>'European Union',
         'FI'=>'Finland',
         'FJ'=>'Fiji',
@@ -150,7 +150,7 @@ return [
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
         'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
+        'GR'=>'Yunanistan',
         'GS'=>'South Georgia And The South Sandwich Islands',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
@@ -181,56 +181,56 @@ return [
         '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',
+        'KN'=>'Saint Kitts ve Nevis',
+        'KR'=>'Kore Cumhuriyeti',
+        'KW'=>'Kuveyt',
+        'KY'=>'Cayman Adaları',
+        'KZ'=>'Kazakistan',
+        'LA'=>'Lao Demokratik Halk Cumhuriyeti',
+        'LB'=>'Lübnan',
         'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
+        'LI'=>'Lihtenştayn',
         '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',
+        'LR'=>'Liberya',
+        'LS'=>'Lesoto',
+        'LT'=>'Litvanya',
+        'LU'=>'Lüksemburg',
+        'LV'=>'Letonya',
+        'LY'=>'Libya Arap Cemahiriyesi',
+        'MA'=>'Fas',
+        'MC'=>'Monako',
+        'MD'=>'Moldova Cumhuriyeti',
+        'ME'=>'Karadağ',
+        'MG'=>'Madagaskar',
+        'MH'=>'Marshall Adaları',
+        'MK'=>'Makedonya, Eski Yugoslav Cumhuriyeti',
         'ML'=>'Mali',
         'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
+        'MN'=>'Moğolistan',
+        'MO'=>'Makao',
+        'MP'=>'Kuzey Mariana Adaları',
+        'MQ'=>'Martinik',
+        'MR'=>'Moritanya',
         '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',
+        'MV'=>'Maldivler',
+        'MW'=>'Malavi',
+        'MX'=>'Meksika',
+        'MY'=>'Malezya',
+        'MZ'=>'Mozambik',
+        'NA'=>'Namibya',
+        'NC'=>'Yeni Kaledonya',
+        'NE'=>'Nijer',
+        'NF'=>'Norfolk Adası',
+        'NG'=>'Nijerya',
+        'NI'=>'Nikaragua',
+        'NL'=>'Hollanda',
+        'NO'=>'Norveç',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Yeni Zelanda',
         'OM'=>'Oman',
         'PA'=>'Panama',
         'PE'=>'Peru',
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'Güney Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
@@ -281,8 +282,8 @@ return [
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
         'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TM'=>'Türkmenistan',
+        'TN'=>'Tunus',
         'TO'=>'Tonga',
         'TP'=>'East Timor (old code)',
         'TR'=>'Turkey',
diff --git a/resources/lang/tr/mail.php b/resources/lang/tr/mail.php
index 3683a015f0..39f26050dc 100644
--- a/resources/lang/tr/mail.php
+++ b/resources/lang/tr/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Yeni Snipe-IT Kurulumu oturum açma kimlik bilgilerini aşağıdaki gibidir. ',
     'login' => 'Giriş:',
     'Low_Inventory_Report' => 'Düşük Stok Raporu',
+    'inventory_report' => 'Envanter Raporu',
     '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.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Snipe-IT Bilgileriniz',
     'Accessory_Checkin_Notification' => 'Aksesuar Zimmet Kabul',
     'Asset_Checkin_Notification' => 'Varlık Zimmet Kabul',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Lisans Zimmet Kabul',
     'Expected_Checkin_Report' => 'Beklenen varlık iade raporu',
     'Expected_Checkin_Notification' => 'Hatırlatma ::name Son seçim zamanı yaklaşıyor',
     'Expected_Checkin_Date' => 'Size teslim edilen bir varlık :date tarihinde tekrar teslim edilecektir',
     'your_assets' => 'Varlıkları Görüntüleme',
+    'rights_reserved' => 'Her türlü hakkı saklıdır.',
 ];
diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php
index 4f6945e581..54af8b14e4 100644
--- a/resources/lang/tr/validation.php
+++ b/resources/lang/tr/validation.php
@@ -43,14 +43,14 @@ return [
     '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.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    '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' => 'The :attribute must be unique to this Company Location',
+    '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ı.',
@@ -67,6 +67,8 @@ return [
         'array'   => ': Özelliği en az: dakika öğesine sahip olmalıdır.',
     ],
     'starts_with'          => 'Özellik aşağıdaki değerlerden biriyle başlamalıdır.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => ':attribute geçersiz.',
     'numeric'              => ':attribute sayı olmalıdır.',
     'present'              => ': Attribute alanı bulunmalıdır.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Geçerli şifre yanlış',
         'dumbpwd'          => 'Bu şifre çok yaygındır.',
         'statuslabel_type' => 'Geçerli bir durum etiketi türü seçmelisiniz',
+
+        // 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 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',
+        'termination_date.date_format'  =>  ':attribute YYYY-MM-DD şeklinde geçerli bir tarih formatında olmalıdır',
+        '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',
+
     ],
 
     /*
diff --git a/resources/lang/uk/admin/accessories/general.php b/resources/lang/uk/admin/accessories/general.php
index 4ced62dffc..6f7ad8e4d1 100644
--- a/resources/lang/uk/admin/accessories/general.php
+++ b/resources/lang/uk/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Оновити аксесуар',
     '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/uk/admin/accessories/message.php b/resources/lang/uk/admin/accessories/message.php
index fc1bd83344..a0006224f9 100644
--- a/resources/lang/uk/admin/accessories/message.php
+++ b/resources/lang/uk/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Аксесуар успішно видано.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'That user is invalid. Please try again.'
     ),
 
diff --git a/resources/lang/uk/admin/asset_maintenances/form.php b/resources/lang/uk/admin/asset_maintenances/form.php
index 23994c178c..8b3651f496 100644
--- a/resources/lang/uk/admin/asset_maintenances/form.php
+++ b/resources/lang/uk/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Тип обслуговування',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Назва',
-        'start_date'             => 'Розпочато',
-        'completion_date'        => 'Завершено',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Вартість',
         'is_warranty'            => 'Покращення гарантії',
-        'asset_maintenance_time' => 'Днів',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Нотатки',
-        'update'                 => 'Оновити',
-        'create'                 => 'Створити'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/uk/admin/categories/message.php b/resources/lang/uk/admin/categories/message.php
index 051d29cb0c..8f94546634 100644
--- a/resources/lang/uk/admin/categories/message.php
+++ b/resources/lang/uk/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Категорія успішно оновлена.'
+        'success' => 'Категорія успішно оновлена.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/uk/admin/components/general.php b/resources/lang/uk/admin/components/general.php
index 4837ad900f..57bbecdc5d 100644
--- a/resources/lang/uk/admin/components/general.php
+++ b/resources/lang/uk/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Залишилось',
     'total' 			                 => 'Загалом',
     'update'                            => 'Оновити компонент',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/uk/admin/components/message.php b/resources/lang/uk/admin/components/message.php
index b1ba4de11f..9a4d0c1497 100644
--- a/resources/lang/uk/admin/components/message.php
+++ b/resources/lang/uk/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Компонент не було видано, спробуйте ще раз',
         'success' 		=> 'Копонент успішно видано.',
-        'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.'
+        'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/uk/admin/consumables/message.php b/resources/lang/uk/admin/consumables/message.php
index 957281f8e6..16e4ec2044 100644
--- a/resources/lang/uk/admin/consumables/message.php
+++ b/resources/lang/uk/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/uk/admin/custom_fields/general.php b/resources/lang/uk/admin/custom_fields/general.php
index f16ab299b9..44517f14c2 100644
--- a/resources/lang/uk/admin/custom_fields/general.php
+++ b/resources/lang/uk/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Used By Models',
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/uk/admin/groups/message.php b/resources/lang/uk/admin/groups/message.php
index 1b3eed7e00..c39033a6f2 100644
--- a/resources/lang/uk/admin/groups/message.php
+++ b/resources/lang/uk/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Група вже існує!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/uk/admin/hardware/form.php b/resources/lang/uk/admin/hardware/form.php
index 5355503bd6..19138b4dc9 100644
--- a/resources/lang/uk/admin/hardware/form.php
+++ b/resources/lang/uk/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Обробка...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/uk/admin/hardware/general.php b/resources/lang/uk/admin/hardware/general.php
index eddacaed5e..43a14a797d 100644
--- a/resources/lang/uk/admin/hardware/general.php
+++ b/resources/lang/uk/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Редагувати актив',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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'  					=> 'Переглянути актив',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/uk/admin/hardware/message.php b/resources/lang/uk/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/uk/admin/hardware/message.php
+++ b/resources/lang/uk/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/uk/admin/hardware/table.php b/resources/lang/uk/admin/hardware/table.php
index 1359e58389..a5c9bcfaf3 100644
--- a/resources/lang/uk/admin/hardware/table.php
+++ b/resources/lang/uk/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In/Out',
     'checkout_date' => 'Дата видачі',
     'checkoutto' 	=> 'Видано',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Різниця',
     'dl_csv' 		=> 'Завантажити CSV',
diff --git a/resources/lang/uk/admin/licenses/general.php b/resources/lang/uk/admin/licenses/general.php
index 5b7f4b19af..07079fba30 100644
--- a/resources/lang/uk/admin/licenses/general.php
+++ b/resources/lang/uk/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Про ліцензії',
-    'about_licenses'                  => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
+    'about_licenses_title'      => 'Про ліцензії',
+    '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'  				=> 'Checkout License Seat',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Ліцензії на програмне забезпечення',
     'user'  					=> 'Користувач',
     'view'  					=> 'Переглянути ліцензію',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/uk/admin/manufacturers/message.php b/resources/lang/uk/admin/manufacturers/message.php
index 8518bff2e3..300ec7549d 100644
--- a/resources/lang/uk/admin/manufacturers/message.php
+++ b/resources/lang/uk/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/uk/admin/manufacturers/table.php b/resources/lang/uk/admin/manufacturers/table.php
index d81f020360..44fd4907ae 100644
--- a/resources/lang/uk/admin/manufacturers/table.php
+++ b/resources/lang/uk/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Email підтримки',
     'support_phone'   		=> 'Телефон підтримки',
     'support_url'   		=> 'URL підтримки',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Оновити виробника',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/uk/admin/models/general.php b/resources/lang/uk/admin/models/general.php
index 8440ef5cb6..1fa9b5942e 100644
--- a/resources/lang/uk/admin/models/general.php
+++ b/resources/lang/uk/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Відновити модель',
     'requestable'               => 'Користувачі можуть створювати запит на цю модель',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
diff --git a/resources/lang/uk/admin/models/message.php b/resources/lang/uk/admin/models/message.php
index f09a3d9142..3668f73f15 100644
--- a/resources/lang/uk/admin/models/message.php
+++ b/resources/lang/uk/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Модель не існує.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -25,17 +27,19 @@ return array(
 
     'restore' => array(
         'error'   		=> 'Model was not restored, please try again',
-        'success' 		=> 'Model restored successfully.'
+        'success' 		=> 'Модель успішно відновлена.'
     ),
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Моделі оновлено.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/uk/admin/settings/general.php b/resources/lang/uk/admin/settings/general.php
index 47be388c40..df39d8f4c2 100644
--- a/resources/lang/uk/admin/settings/general.php
+++ b/resources/lang/uk/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Це сервер Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
@@ -32,7 +32,7 @@ return [
     '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_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'			=> 'Параметри штрих-кодів',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Назва сайту',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/uk/admin/settings/message.php b/resources/lang/uk/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/uk/admin/settings/message.php
+++ b/resources/lang/uk/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/uk/admin/statuslabels/table.php b/resources/lang/uk/admin/statuslabels/table.php
index 92a08218f8..125371adff 100644
--- a/resources/lang/uk/admin/statuslabels/table.php
+++ b/resources/lang/uk/admin/statuslabels/table.php
@@ -13,7 +13,7 @@ return array(
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
     'show_in_nav'   => 'Show in side nav',
-    'title'      	=> 'Status Labels',
+    'title'      	=> 'Статуси активів',
     'undeployable'  => 'Undeployable',
-    'update'      	=> 'Update Status Label',
+    'update'      	=> 'Оновити статуси активів',
 );
diff --git a/resources/lang/uk/admin/users/general.php b/resources/lang/uk/admin/users/general.php
index b030f5445a..5f3a164d6e 100644
--- a/resources/lang/uk/admin/users/general.php
+++ b/resources/lang/uk/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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/uk/admin/users/message.php b/resources/lang/uk/admin/users/message.php
index 3d4dcce22a..2c69852ab4 100644
--- a/resources/lang/uk/admin/users/message.php
+++ b/resources/lang/uk/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_not_found'            => 'User [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Недостатньо прав.',
diff --git a/resources/lang/uk/auth/general.php b/resources/lang/uk/auth/general.php
index 0cb92b2095..e9041c3521 100644
--- a/resources/lang/uk/auth/general.php
+++ b/resources/lang/uk/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Запам\'ятати мене',
     'username_help_top'                 => 'Введіть ваше <strong>ім\'я користувача</strong>, щоб отримати посилання для зміни пароля.',
     'username_help_bottom'          => 'Ваше ім\'я користувача та електронна адреса <em>можуть бути</em> однаковими, але можуть не бути, в залежності від вашої конфігурації. Якщо ви не можете згадати своє ім\'я користувача, зверніться до адміністратора. <br><br><strong>Якщо ім\'я користувача не має пов\'язаної електронної пошти, то неможливо надіслати посилання для зміни пароля.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/uk/auth/message.php b/resources/lang/uk/auth/message.php
index b71075f4bf..82fd71dd3c 100644
--- a/resources/lang/uk/auth/message.php
+++ b/resources/lang/uk/auth/message.php
@@ -11,7 +11,7 @@ return array(
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
+        'success'               => 'Ви успішно увійшли в систему.',
         'code_required'         => 'Two-factor code is required.',
         'invalid_code'          => 'Two-factor code is invalid.',
     ),
@@ -23,7 +23,7 @@ return array(
 
     'logout' => array(
         'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'success' => 'Ви успішно вийшли з системи.',
     ),
 
     'signup' => array(
@@ -38,7 +38,7 @@ return array(
 
     '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.',
+        'success' => 'Ваш пароль успішно скинуто.',
     ),
 
 
diff --git a/resources/lang/uk/button.php b/resources/lang/uk/button.php
index 84974e2142..63368e9a4a 100644
--- a/resources/lang/uk/button.php
+++ b/resources/lang/uk/button.php
@@ -8,14 +8,14 @@ return [
     'delete'  	                => 'Видалити',
     'edit'    	                => 'Редагувати',
     'restore' 	                => 'Відновити',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Видалити',
     'request'                   => 'Запит',
     'submit'  	                => 'Зберегти',
-    'upload'                    => 'Upload',
+    'upload'                    => 'Завантажити',
     'select_file'				=> 'Обрати файл...',
-    'select_files'				=> 'Select Files...',
+    'select_files'				=> 'Обрати файли...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
-    'send_password_link'        => 'Send Password Reset Link',
+    'send_password_link'        => 'Надіслати посилання для скидання пароля',
     'go'                        => 'Go',
     'bulk_actions'              => 'Bulk Actions',
     'add_maintenance'           => 'Add Maintenance',
diff --git a/resources/lang/uk/general.php b/resources/lang/uk/general.php
index ff44271d52..d055a61142 100644
--- a/resources/lang/uk/general.php
+++ b/resources/lang/uk/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Аксесуари',
     'activated'			    => 'Активоване',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Аксесуари',
     'accessory_report'		=> 'Звіт про аксесуари',
     'action'                => 'Дія',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Аудит',
     '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',
     'avatar_delete'         => 'Видалити аватар',
     'avatar_upload'         => 'Завантажити аватар',
     'back'      			=> 'Назад',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Скасувати',
     'categories'			=> 'Категорії',
@@ -83,6 +92,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_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'  				=> 'Видалено',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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'  => 'Допустимі типи файлів - jpg, webp, png, gif і svg. Максимальний дозволений розмір файлу :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'         	    => 'Імпорт',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Дії над активами',
     'item'  				=> 'Елемент',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Недостатньо прав!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Мова',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Запит скасовано',
     'save'  				=> 'Зберегти',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Обрати',
     'select_all'            => 'Select All',
     'search'				=> 'Пошук',
@@ -240,12 +254,12 @@ return [
     'signature'             => 'Підпис',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => 'РЕЖИМ ДЕМО: Деякі функції відключені.',
     'site_name'				=> 'Назва сайту',
     'state'  				=> 'Статус',
-    'status_labels'			=> 'Status Labels',
+    'status_labels'			=> 'Статуси активів',
     'status'    			=> 'Статус',
     'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Постачальник',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Ви впевнені, що бажаєте видалити',
     'submit'				=> 'Зберегти',
     'target'                => 'Ціль',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Відображення часу та дати',
     'total_assets'			=> 'всього активів',
     'total_licenses'		=> 'всього ліцензій',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/uk/help.php b/resources/lang/uk/help.php
index d68fedf034..3b7dc77a7b 100644
--- a/resources/lang/uk/help.php
+++ b/resources/lang/uk/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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/uk/localizations.php b/resources/lang/uk/localizations.php
index be2c321861..b0244c6e9c 100644
--- a/resources/lang/uk/localizations.php
+++ b/resources/lang/uk/localizations.php
@@ -2,57 +2,57 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Оберіть мову',
     'languages' => [
-        'en'=> 'English, US',
-        'en-GB'=> 'English, UK',
+        'en'=> 'Англійська, США',
+        'en-GB'=> 'Англійська, Великобританія',
         'af'=> 'Afrikaans',
-        'ar'=> 'Arabic',
-        'bg'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'hr'=> 'Croatian',
-        'cs'=> 'Czech',
-        'da'=> 'Danish',
-        'nl'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et'=> 'Estonian',
-        'fil'=> 'Filipino',
-        'fi'=> 'Finnish',
-        'fr'=> 'French',
-        'de'=> 'German',
-        'de-i'=> 'German (Informal)',
-        'el'=> 'Greek',
-        'he'=> 'Hebrew',
-        'hu'=> 'Hungarian',
-        'is' => 'Icelandic',
-        'id'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it'=> 'Italian',
-        'ja'=> 'Japanese',
-        'ko'=> 'Korean',
-        'lv'=>'Latvian',
-        'lt'=> 'Lithuanian',
-        'mk'=> 'Macedonian',
-        'ms'=> 'Malay',
-        'mi'=> 'Maori',
-        'mn'=> 'Mongolian',
-        'no'=> 'Norwegian',
-        'fa'=> 'Persian',
-        'pl'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro'=> 'Romanian',
-        'ru'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sl'=> 'Slovenian',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
-        'tl'=> 'Tagalog',
-        'ta'=> 'Tamil',
+        'ar'=> 'Арабська',
+        'bg'=> 'Болгарська',
+        'zh-CN'=> 'Китайська спрощена',
+        'zh-TW'=> 'Китайська традиційна',
+        'hr'=> 'Хорватська',
+        'cs'=> 'Чеська',
+        'da'=> 'Датська',
+        'nl'=> 'Нідерландська',
+        'en-ID'=> 'Англійська, Індонезія',
+        'et'=> 'Естонська',
+        'fil'=> 'Філіппінська',
+        'fi'=> 'Фінська',
+        'fr'=> 'Французька',
+        'de'=> 'Німецька',
+        'de-i'=> 'Німецька (неофіційна)',
+        'el'=> 'Грецька',
+        'he'=> 'Іврит',
+        'hu'=> 'Угорська',
+        'is' => 'Ісландська',
+        'id'=> 'Індонезійська',
+        'ga-IE'=> 'Ірландська',
+        'it'=> 'Італійська',
+        'ja'=> 'Японська',
+        'ko'=> 'Корейська',
+        'lv'=>'Латвійська',
+        'lt'=> 'Литовська',
+        'mk'=> 'Македонська',
+        'ms'=> 'Малайська',
+        'mi'=> 'Маорійська',
+        'mn'=> 'Монгольська',
+        'no'=> 'Норвезька',
+        'fa'=> 'Перська',
+        'pl'=> 'Польська',
+        'pt-PT'=> 'Португальська',
+        'pt-BR'=> 'Португальська, Бразилія',
+        'ro'=> 'Румунська',
+        'ru'=> 'Російська',
+        'sr-CS' => 'Сербська (латиниця)',
+        'sl'=> 'Словенська',
+        'es-ES'=> 'Іспанська',
+        'es-CO'=> 'Іспанська, Колумбія',
+        'es-MX'=> 'Іспанська, Мексика',
+        'es-VE'=> 'Іспанська, Венесуела',
+        'sv-SE'=> 'Шведська',
+        'tl'=> 'Тагальська',
+        'ta'=> 'Тамільська',
         'th'=> 'Thai',
         'tr'=> 'Turkish',
         'uk'=> 'Ukranian',
@@ -106,9 +106,9 @@ return [
         'CD'=>'Congo (Democratic Republic)',
         'CF'=>'Central African Republic',
         'CG'=>'Congo (Republic)',
-        'CH'=>'Switzerland',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
+        'CH'=>'Швейцарська',
+        'CI'=>'Кот-д’Івуар',
+        'CK'=>'Острови Кука',
         'CL'=>'Chile',
         'CM'=>'Cameroon',
         'CN'=>'People\'s Republic of China',
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/uk/mail.php b/resources/lang/uk/mail.php
index 30679f6008..6f3c10c451 100644
--- a/resources/lang/uk/mail.php
+++ b/resources/lang/uk/mail.php
@@ -11,7 +11,7 @@ return [
     'asset' => 'Актив:',
     'asset_name' => 'Найменування Активу:',
     'asset_requested' => 'Запит на актив',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Тег активу',
     'assigned_to' => 'Відповідальний',
     'best_regards' => 'З найкращими побажаннями,',
     'canceled' => 'Скасовано:',
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Логін:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Мін. кількість',
     'name' => 'Назва',
     'new_item_checked' => 'Новий елемент був виданий під вашим ім\'ям, докладніше про це нижче.',
@@ -55,7 +56,7 @@ return [
     'requested' => 'Запрошено користувачем:',
     'reset_link' => 'Ваше посилання для скидання пароля',
     'reset_password' => 'Натисніть тут для скидання пароля:',
-    'serial' => 'Serial',
+    'serial' => 'Серійний номер',
     'supplier' => 'Постачальник',
     'tag' => 'Тег',
     'test_email' => 'Test Email from Snipe-IT',
@@ -67,16 +68,18 @@ return [
     'to_reset' => 'To reset your :web password, complete this form:',
     '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',
+    'user' => 'Користувач',
+    'username' => 'Ім\'я кристувача',
     'welcome' => 'Ласкаво просимо, :name',
     'welcome_to' => 'Ласкаво просимо до :web!',
     'your_credentials' => 'Ваші облікові дані Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets',
+    'your_assets' => 'Переглянути Ваші Активи',
+    'rights_reserved' => 'Усі права захищені.',
 ];
diff --git a/resources/lang/uk/validation.php b/resources/lang/uk/validation.php
index e01bf462f5..52e4e40ccb 100644
--- a/resources/lang/uk/validation.php
+++ b/resources/lang/uk/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Поточний пароль неправильний',
         'dumbpwd'          => 'Цей пароль занадто вживаний.',
         'statuslabel_type' => 'Ви повинні вибрати правильний тип статуса',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/ur-PK/admin/accessories/general.php b/resources/lang/ur-PK/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/ur-PK/admin/accessories/general.php
+++ b/resources/lang/ur-PK/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/ur-PK/admin/accessories/message.php b/resources/lang/ur-PK/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/ur-PK/admin/accessories/message.php
+++ b/resources/lang/ur-PK/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/ur-PK/admin/asset_maintenances/form.php b/resources/lang/ur-PK/admin/asset_maintenances/form.php
index 2aa005c45f..785d06b08f 100644
--- a/resources/lang/ur-PK/admin/asset_maintenances/form.php
+++ b/resources/lang/ur-PK/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
-        'completion_date'        => 'Completed',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/ur-PK/admin/categories/message.php b/resources/lang/ur-PK/admin/categories/message.php
index 48cf5478e1..4e493f68b6 100644
--- a/resources/lang/ur-PK/admin/categories/message.php
+++ b/resources/lang/ur-PK/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/ur-PK/admin/components/general.php b/resources/lang/ur-PK/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/ur-PK/admin/components/general.php
+++ b/resources/lang/ur-PK/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/ur-PK/admin/components/message.php b/resources/lang/ur-PK/admin/components/message.php
index 1d13970f23..0a7dd8d954 100644
--- a/resources/lang/ur-PK/admin/components/message.php
+++ b/resources/lang/ur-PK/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ur-PK/admin/consumables/message.php b/resources/lang/ur-PK/admin/consumables/message.php
index 48a3cfbd9f..c0d0aa7f68 100644
--- a/resources/lang/ur-PK/admin/consumables/message.php
+++ b/resources/lang/ur-PK/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      '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.'
+        '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(
diff --git a/resources/lang/ur-PK/admin/custom_fields/general.php b/resources/lang/ur-PK/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/ur-PK/admin/custom_fields/general.php
+++ b/resources/lang/ur-PK/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/ur-PK/admin/groups/message.php b/resources/lang/ur-PK/admin/groups/message.php
index f14b6339e8..495acaf36b 100644
--- a/resources/lang/ur-PK/admin/groups/message.php
+++ b/resources/lang/ur-PK/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(
diff --git a/resources/lang/ur-PK/admin/hardware/form.php b/resources/lang/ur-PK/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/ur-PK/admin/hardware/form.php
+++ b/resources/lang/ur-PK/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/ur-PK/admin/hardware/general.php b/resources/lang/ur-PK/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/ur-PK/admin/hardware/general.php
+++ b/resources/lang/ur-PK/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/ur-PK/admin/hardware/message.php b/resources/lang/ur-PK/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/ur-PK/admin/hardware/message.php
+++ b/resources/lang/ur-PK/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/ur-PK/admin/hardware/table.php b/resources/lang/ur-PK/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/ur-PK/admin/hardware/table.php
+++ b/resources/lang/ur-PK/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/ur-PK/admin/licenses/general.php b/resources/lang/ur-PK/admin/licenses/general.php
index 25a536ec56..0187d076a3 100644
--- a/resources/lang/ur-PK/admin/licenses/general.php
+++ b/resources/lang/ur-PK/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?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',
+    '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',
@@ -18,4 +18,30 @@ return array(
     '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/ur-PK/admin/manufacturers/message.php b/resources/lang/ur-PK/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/ur-PK/admin/manufacturers/message.php
+++ b/resources/lang/ur-PK/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     '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. ',
 
diff --git a/resources/lang/ur-PK/admin/manufacturers/table.php b/resources/lang/ur-PK/admin/manufacturers/table.php
index 4e3ea9904d..38cab6fd91 100644
--- a/resources/lang/ur-PK/admin/manufacturers/table.php
+++ b/resources/lang/ur-PK/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
     'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/ur-PK/admin/models/general.php b/resources/lang/ur-PK/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/ur-PK/admin/models/general.php
+++ b/resources/lang/ur-PK/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/ur-PK/admin/models/message.php b/resources/lang/ur-PK/admin/models/message.php
index e3b29d5b4b..5f47336526 100644
--- a/resources/lang/ur-PK/admin/models/message.php
+++ b/resources/lang/ur-PK/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/ur-PK/admin/settings/general.php
+++ b/resources/lang/ur-PK/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/ur-PK/admin/settings/message.php b/resources/lang/ur-PK/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/ur-PK/admin/settings/message.php
+++ b/resources/lang/ur-PK/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/ur-PK/admin/users/general.php b/resources/lang/ur-PK/admin/users/general.php
index daa568e8bf..b097ccec69 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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/ur-PK/admin/users/message.php b/resources/lang/ur-PK/admin/users/message.php
index 247a1b321e..adf26b3229 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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/ur-PK/auth/general.php b/resources/lang/ur-PK/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/ur-PK/auth/general.php
+++ b/resources/lang/ur-PK/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/ur-PK/help.php b/resources/lang/ur-PK/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/ur-PK/help.php
+++ b/resources/lang/ur-PK/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/ur-PK/localizations.php b/resources/lang/ur-PK/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/ur-PK/localizations.php
+++ b/resources/lang/ur-PK/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/ur-PK/mail.php b/resources/lang/ur-PK/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/ur-PK/mail.php
+++ b/resources/lang/ur-PK/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/ur-PK/validation.php b/resources/lang/ur-PK/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/ur-PK/validation.php
+++ b/resources/lang/ur-PK/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/vi/admin/accessories/general.php b/resources/lang/vi/admin/accessories/general.php
index afbf585945..47711ed468 100644
--- a/resources/lang/vi/admin/accessories/general.php
+++ b/resources/lang/vi/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Cập nhật Phụ Kiện',
     'use_default_eula'					=> 'Dùng <a href="#" data-toggle="modal" data-target="#eulaModal"> điều khoản sử dụng mặc định.',
     'use_default_eula_disabled'			=> '<del>Dùng điều khoản sử dụng mặc định.<del> Điều khoản sử dụng chưa được thiết lập. Hãy thêm một cái vào trong phần Settings.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/vi/admin/accessories/message.php b/resources/lang/vi/admin/accessories/message.php
index 11c27cec0a..5affd34148 100644
--- a/resources/lang/vi/admin/accessories/message.php
+++ b/resources/lang/vi/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.'
     ),
 
diff --git a/resources/lang/vi/admin/asset_maintenances/form.php b/resources/lang/vi/admin/asset_maintenances/form.php
index 239e34acb3..7700759a6a 100644
--- a/resources/lang/vi/admin/asset_maintenances/form.php
+++ b/resources/lang/vi/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Lại duy trì tài sản',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Tiêu đề',
-        'start_date'             => 'Ngày bắt đầu',
-        'completion_date'        => 'Ngày hoàn thành',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Chi phí',
         'is_warranty'            => 'Tăng bảo hành',
-        'asset_maintenance_time' => 'Thời gian bảo trì tài sản (ngày)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Ghi chú',
-        'update'                 => 'Cập nhật tài sản đang bảo trì',
-        'create'                 => 'Tạo Bảo hành Tài sản'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/vi/admin/categories/message.php b/resources/lang/vi/admin/categories/message.php
index 8eb36e581d..3ccb2b571a 100644
--- a/resources/lang/vi/admin/categories/message.php
+++ b/resources/lang/vi/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Hạng mục chưa được cập nhật. Bạn hãy thử lại',
-        'success' => 'Hạng mục được cập nhật thành công.'
+        'success' => 'Hạng mục được cập nhật thành công.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/vi/admin/components/general.php b/resources/lang/vi/admin/components/general.php
index e32e296e24..11a548fdb6 100644
--- a/resources/lang/vi/admin/components/general.php
+++ b/resources/lang/vi/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Còn lại',
     'total' 			                 => 'Tổng số',
     'update'                            => 'Cập nhật Hợp phần',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/vi/admin/components/message.php b/resources/lang/vi/admin/components/message.php
index 7fed42c951..4055c51358 100644
--- a/resources/lang/vi/admin/components/message.php
+++ b/resources/lang/vi/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Hợp phần đã không được kiểm tra, hãy thử lại',
         'success' 		=> 'Thành phần được kiểm tra thành công.',
-        'user_does_not_exist' => 'Người dùng đó không hợp lệ. Vui lòng thử lại.'
+        'user_does_not_exist' => 'Người dùng đó không hợp lệ. Vui lòng thử lại.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/vi/admin/consumables/message.php b/resources/lang/vi/admin/consumables/message.php
index 86edc8e97f..2eafeb818d 100644
--- a/resources/lang/vi/admin/consumables/message.php
+++ b/resources/lang/vi/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Vật tư phụ chưa checkout, xin thử lại',
         'success' 		=> 'Vật tư phụ đã checkout thành công.',
-        'user_does_not_exist' => 'Người dùng này không tồn tại. Xin vui lòng thử lại.'
+        'user_does_not_exist' => 'Người dùng này không tồn tại. Xin vui lòng thử lại.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/vi/admin/custom_fields/general.php b/resources/lang/vi/admin/custom_fields/general.php
index e92dbc31fc..073a16b74f 100644
--- a/resources/lang/vi/admin/custom_fields/general.php
+++ b/resources/lang/vi/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Được sử dụng theo mô hình',
     'order'   		            => 'Gọi món',
     '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'            => 'Trường tùy chỉnh mới',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     'unique' => 'Duy nhất',
     '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',
 ];
diff --git a/resources/lang/vi/admin/groups/message.php b/resources/lang/vi/admin/groups/message.php
index 7a8c41dd0f..d21f219bff 100644
--- a/resources/lang/vi/admin/groups/message.php
+++ b/resources/lang/vi/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Nhóm đã tồn tại!',
-    'group_not_found'     => 'Nhóm [:id] không tồn tại.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Trường tên thì bắt buộc',
 
     'success' => array(
diff --git a/resources/lang/vi/admin/hardware/form.php b/resources/lang/vi/admin/hardware/form.php
index bfaa0983a1..781c0ce6fc 100644
--- a/resources/lang/vi/admin/hardware/form.php
+++ b/resources/lang/vi/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Xác nhận Hàng loạt Xóa Tài sản',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Xem lại tài sản để xóa hàng loạt dưới đây. Sau khi đã xóa, những nội dung này có thể được khôi phục, nhưng chúng sẽ không còn được kết hợp với bất kỳ người dùng nào hiện đang được chỉ định.',
+  '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'	=> 'Bạn sắp xóa: asset_count tài sản.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Cập nhật tài sản số lượng lớn',
     'bulk_update_help'	=> 'Form này cho phép bạn cập nhật nhiều tài sản cùng lúc. Chỉ điền vào ô bạn cần thay đổi. Bất kỳ ô nào để trống sẽ thông báo là chưa thay đổi. ',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Chỉ cập nhật vị trí tài sản mặc định',
     '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.',
-    'processing_spinner' => 'Đang xử lý...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Thông tin bổ sung',
     'order_details'   => 'Thông tin đơn hàng'
 ];
diff --git a/resources/lang/vi/admin/hardware/general.php b/resources/lang/vi/admin/hardware/general.php
index 79b4cd3cce..9c1fa07e11 100644
--- a/resources/lang/vi/admin/hardware/general.php
+++ b/resources/lang/vi/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'Tài sản này đã bị xóa.',
     'edit'  					=> 'Sửa tài sản',
     'model_deleted'  			=> 'Model tài sản này đã bị xóa. Vui lòng khôi phục lại model trước khi khôi phục tài sản.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Cho phép đề xuất',
     'requested'				    => 'Yêu cầu',
     'not_requestable'           => 'Không cho phép đề xuất',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Phục hồi tài sản',
     'pending'  					=> 'Đang chờ',
     'undeployable'  			=> 'Không cho phép cấp phát',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Xem tài sản',
     'csv_error' => 'Có lỗi trong file CSV của bạn:',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Thông báo lỗi:',
     'success_messages' => 'Thông báo thành công:',
     'alert_details' => 'Xem bên dưới để biết thêm chi tiết.',
-    'custom_export' => 'Lựa chọn xuất'
+    'custom_export' => 'Lựa chọn xuất',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/vi/admin/hardware/message.php b/resources/lang/vi/admin/hardware/message.php
index ecab59b46b..2e0cab4d61 100644
--- a/resources/lang/vi/admin/hardware/message.php
+++ b/resources/lang/vi/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Tài sản không được khôi phục, bạn hãy thử lại',
         'success' 		=> 'Tài sản được khôi phục thành công.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/vi/admin/hardware/table.php b/resources/lang/vi/admin/hardware/table.php
index 0dce1d57bc..036a1775bc 100644
--- a/resources/lang/vi/admin/hardware/table.php
+++ b/resources/lang/vi/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'Vào/Ra',
     'checkout_date' => 'Ngày checkout',
     'checkoutto' 	=> 'Đã checkout',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Giá trị hiện tại',
     'diff' 			=> 'Khác nhau',
     'dl_csv' 		=> 'Tải tập tin CSV xuống',
diff --git a/resources/lang/vi/admin/licenses/general.php b/resources/lang/vi/admin/licenses/general.php
index 740dd56a87..2f7a4bc97b 100644
--- a/resources/lang/vi/admin/licenses/general.php
+++ b/resources/lang/vi/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Về giấy phép',
-    'about_licenses'                  => 'Giấy phép được sử dụng để theo dõi phần mềm. Họ có một số lượng ghế xác định mà có thể được kiểm tra ra cho cá nhân',
+    'about_licenses_title'      => 'Về giấy phép',
+    'about_licenses'            => 'Giấy phép được sử dụng để theo dõi phần mềm. Họ có một số lượng ghế xác định mà có thể được kiểm tra ra cho cá nhân',
     'checkin'  					=> 'Checkin bản quyền đặt vào',
     'checkout_history'  		=> 'Lịch sử Checkout',
     'checkout'  				=> 'Checkout bản quyền đặt vào',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Bản quyền phần mềm',
     'user'  					=> 'Người dùng',
     'view'  					=> 'Xem bản quyền',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/vi/admin/manufacturers/message.php b/resources/lang/vi/admin/manufacturers/message.php
index 18478fdc20..5534417b18 100644
--- a/resources/lang/vi/admin/manufacturers/message.php
+++ b/resources/lang/vi/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Hãng sản xuất không tồn tại.',
     'assoc_users'	 => 'Nhà sản xuất này hiện tại đang được liên kết với ít nhất một kiểu tài sản và không thể xóa. Xin vui lòng cập nhật kiểu tài sản của bạn để không liên kết đến nhà sản xuất này và thử lại. ',
 
diff --git a/resources/lang/vi/admin/manufacturers/table.php b/resources/lang/vi/admin/manufacturers/table.php
index 845503de36..1662b9c9b7 100644
--- a/resources/lang/vi/admin/manufacturers/table.php
+++ b/resources/lang/vi/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Hỗ trợ Email',
     'support_phone'   		=> 'Điện thoại hỗ trợ',
     'support_url'   		=> 'URL Hỗ trợ',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Cập nhật hãng sản xuất',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/vi/admin/models/general.php b/resources/lang/vi/admin/models/general.php
index dbf47b8f30..cb58c28a62 100644
--- a/resources/lang/vi/admin/models/general.php
+++ b/resources/lang/vi/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Khôi phục Model',
     'requestable'               => 'Người dùng có thể yêu cầu mô hình này',
 	'show_mac_address'			      => 'Hiển thị trường địa chỉ MAC trong tài sản của model này',
diff --git a/resources/lang/vi/admin/models/message.php b/resources/lang/vi/admin/models/message.php
index e3c98ec1e7..ca46f12559 100644
--- a/resources/lang/vi/admin/models/message.php
+++ b/resources/lang/vi/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Kiểu tài sản không tồn tại.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a 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. ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Kiểu tài sản chưa cập nhật, xin thử lại',
-        'success' => 'Kiểu tài sản đã cập nhật thành công.'
+        'success' => 'Kiểu tài sản đã cập nhật thành công.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Không có trường nào được thay đổi, vì vậy không có gì được cập nhật.',
-        'success' 		=> 'Các mô hình được cập nhật.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Không có mục nào được chọn, nên không có gì bị xóa cả.',
-        'success' 		    => ':succes_count model(s) đã được xóa!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(s) kiểu tài sản đã được xóa, tuy nhiên có :fail_count loại không cho phép xóa vì chúng vẫn còn gắn liên kết đết tài sản.'
     ),
 
diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php
index 7b447094b5..a5801fc2bf 100644
--- a/resources/lang/vi/admin/settings/general.php
+++ b/resources/lang/vi/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     '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.',
     'is_ad'				        => 'Đây là một máy chủ Active Directory',
     'alerts'                	=> 'Cảnh báo',
-    'alert_title'               => 'Cập nhật cài đặt 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',
     'alerts_enabled'			=> 'Bật Cảnh báo',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => 'Đang khôi phục từ bản sao lưu',
     '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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Cài đặt 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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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'      => 'Nhập một ngày hợp lệ LDAP tên người dùng và mật khẩu từ cơ sở DN bạn đã nêu trên để kiểm tra xem LDAP đăng nhập của bạn được cấu hình đúng. BẠN PHẢI LƯU THIẾT ĐẶT CẬP NHẬT LDAP CỦA BẠN ĐẦU TIÊN.',
     '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'              => 'LDAP Manager',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Hiển thị ảnh trong email',
     'show_images_in_email_help'   => 'Bỏ chọn hộp này nếu cài đặt Snipe-IT của bạn nằm sau VPN hoặc mạng riêng tư và người dùng bên ngoài mạng sẽ không thể tải hình ảnh được cung cấp từ cài đặt này trong email của họ.',
     'site_name'                 => 'Tên trang web',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Cài đặt Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Khi bạn đã lưu thông tin Slack của mình, một nút kiểm tra sẽ xuất hiện.',
-    'slack_test_help'           => 'Kiểm tra xem tích hợp Slack của bạn có được cấu hình đúng không. BẠN PHẢI LƯU CÀI ĐẶT CẬP NHẬT SLACK ĐẦU TIÊN.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Nhãn',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/vi/admin/settings/message.php b/resources/lang/vi/admin/settings/message.php
index 79ee94da00..7760dee071 100644
--- a/resources/lang/vi/admin/settings/message.php
+++ b/resources/lang/vi/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Thành công! Kiểm tra tại ',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/vi/admin/users/general.php b/resources/lang/vi/admin/users/general.php
index ee0e7392ed..9ff450b64b 100644
--- a/resources/lang/vi/admin/users/general.php
+++ b/resources/lang/vi/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'    => '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',
     'software_user'     => 'Phần mềm đã được checkout đến :name',
     'send_email_help'   => 'Bạn phải cung cấp địa chỉ email của người dùng để gửi chứng thực. Gửi mail chứng thực chỉ có hiệu lực đối với người dùng tạo ra. Mật khẩu được mã hóa một chiều và không thể lấy lại một khi đã lưu.',
     'view_user'         => 'Xem người dùng :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Chỉ quyền superadmins mới cấp quyền người dùng truy cập.',
     'admin_permission_warning' => 'Chỉ có quyền admins trở lên mới có thể cấp quyền truy cập cho người dùng.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'CẢNH BÁO:',
     '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',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Từ xa',
     '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/vi/admin/users/message.php b/resources/lang/vi/admin/users/message.php
index 4f7bac450c..0a6e0b40c8 100644
--- a/resources/lang/vi/admin/users/message.php
+++ b/resources/lang/vi/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 [:id] không tồn tại.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Trường đăng nhập thì bắt buộc',
     'user_password_required'    => 'Mật khẩu thì bắt buộc.',
     'insufficient_permissions'  => 'Không có đủ quyền.',
diff --git a/resources/lang/vi/auth/general.php b/resources/lang/vi/auth/general.php
index ace09e0f9d..4bb34593d3 100644
--- a/resources/lang/vi/auth/general.php
+++ b/resources/lang/vi/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Ghi nhớ tôi',
     'username_help_top'                 => 'Nhập <strong>tên người dùng</strong> của bạn để nhận liên kết đặt lại mật khẩu.',
     'username_help_bottom'          => 'Tên người dùng và email của bạn <em>có thể</em> giống nhau hoặc không, tùy vào cách cấu hình của bạn. Nếu bạn không nhớ tên người dùng hãy liên hệ với quản trị viên. <br><br><strong> Tên người dùng không được liên kết với email sẽ không nhận được liên kết đặt lại mật khẩu.</strong> ',
-    ];
+    'google_login'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php
index ed2d4d6c4b..53d221bb21 100644
--- a/resources/lang/vi/general.php
+++ b/resources/lang/vi/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Phụ kiện',
     'activated'			    => 'Kích hoạt',
+    'accepted_date'         => 'Ngày chấp nhận',
     'accessory'				=> 'Phụ kiện',
     'accessory_report'		=> 'Báo cáo phụ kiện',
     'action'                => 'Tác vụ',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Kiểm toán',
     'audit_report'			=> 'Sổ ghi chép đánh giá',
     'assets'				=> 'Tài sản',
+    'assets_audited'        => 'tài sản đã được kiểm toán',
+    'assets_checked_in_count'     => 'assets checked in',
+    'assets_checked_out_count'     => 'assets checked out',
+    'asset_deleted_warning'     => 'Tài sản này đã bị xóa. Bạn phải khôi phục nó trước khi bạn có thể gán nó cho ai đó.',
+    'assigned_date'         => 'Date Assigned',
     'assigned_to'           => 'Được giao cho :name',
+    'assignee'              => 'Bàn giao cho',
     'avatar_delete'         => 'Xóa hình đại diện',
     'avatar_upload'         => 'Tải lên hình đại diện',
     'back'      			=> 'Quay lại',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Chỉnh sửa hàng loạt',
     'bulk_delete'           => 'Xoá hàng loạt',
     'bulk_actions'          => 'Hàng loạt hành động',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'Trạng thái',
     'cancel'  				=> 'Hủy',
     'categories'			=> 'Danh mục',
@@ -83,6 +92,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' => 'Are you sure you wish to delete :item? This can not be undone.',
     'deleted'  				=> 'Đã xóa',
     'delete_seats'  		=> 'Ghế đã Xóa',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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'   => 'Max upload size allowed is :size.',
     'image_filetypes_help'  => 'Các loại tệp được chấp nhận là jpg, webp, png, gif và svg. Kích thước tải lên tối đa được cho phép là :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'         	    => 'Nhập',
     'importing'         	=> 'Importing',
     'importing_help'        => 'Bạn có thể nhập nội dung, phụ kiện, giấy phép, linh kiện, vật tư tiêu hao và người dùng qua tệp CSV. <br> <br> CSV phải được phân cách bằng dấu phẩy và được định dạng với các tiêu đề khớp với các tiêu đề trong <a href="https://snipe-it.readme.io/docs/importing" target="_new"> CSV trong tài liệu mẫu </a>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Tài sản đang bảo trì',
     'item'  				=> 'Mục',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Không đủ quyền!',
     'kits'       			=> 'Bộ dụng cụ đã tạo sẵn',
     'language'				=> 'Ngôn ngữ',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Yêu cầu Đã Hủy',
     'save'  				=> 'Lưu',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Chọn',
     'select_all'            => 'Chọn tất cả',
     'search'				=> 'Tìm kiếm',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Chữ ký',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Giao diện',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Có vẻ như tích hợp Slack của bạn với Snipe-IT đang hoạt động!',
+    '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: 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ố',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Bạn có chắc chắn muốn xoá',
     'submit'				=> 'Đệ trình',
     'target'                => 'Mục tiêu',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Hiển thị thời gian và ngày tháng',
     'total_assets'			=> 'tổng số tài sản',
     'total_licenses'		=> 'tổng số bản quyền',
@@ -362,7 +375,7 @@ return [
     'accessory_information' => 'Accessory Information:',
     'accessory_name'       => 'Accessory Name:',
     'clone_item'            => 'Clone Item',
-    'checkout_tooltip' => 'Check this item out',
+    'checkout_tooltip' => 'Cấp phát tài sản',
     'checkin_tooltip' => 'Check this item in',
     'checkout_user_tooltip' => 'Check this item out to a user',
     'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     '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ụ'
+    'placeholder_kit'       => 'Chọn công cụ',
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/vi/help.php b/resources/lang/vi/help.php
index 0fe3c39977..87c1b7829b 100644
--- a/resources/lang/vi/help.php
+++ b/resources/lang/vi/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Đọc thêm',
 
-    'audit_help' => 'Chọn hộp này sẽ chỉnh sửa bản ghi nội dung để phản ánh vị trí mới này. Bỏ chọn nó sẽ chỉ ghi lại vị trí trong nhật ký kiểm tra. <br> <br> Lưu ý rằng nội dung này đã được kiểm tra, nó sẽ không thay đổi vị trí của người, tài sản hoặc vị trí mà nó được kiểm tra.',
+    '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' => 'Nội dung là các mục được theo dõi bằng số sê-ri hoặc thẻ nội dung. Chúng có xu hướng trở thành những mặt hàng có giá trị cao hơn khi việc xác định một mặt hàng cụ thể rất quan trọng.',
 
diff --git a/resources/lang/vi/localizations.php b/resources/lang/vi/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/vi/localizations.php
+++ b/resources/lang/vi/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/vi/mail.php b/resources/lang/vi/mail.php
index 1a9bb5b09b..793940a17a 100644
--- a/resources/lang/vi/mail.php
+++ b/resources/lang/vi/mail.php
@@ -43,6 +43,7 @@ return [
     '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:',
     'login' => 'Đăng nhập:',
     'Low_Inventory_Report' => 'Báo cáo tồn kho thấp',
+    'inventory_report' => 'Inventory Report',
     '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.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Thông tin về Snipe-IT của bạn',
     'Accessory_Checkin_Notification' => 'Phụ kiện đã cấp phát thành công',
     'Asset_Checkin_Notification' => 'Tài sản đã cấp phát thành công',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'Giấy phép đã cấp phát thành công',
     'Expected_Checkin_Report' => 'Báo cáo mong muốn cấp phát tài sản',
     'Expected_Checkin_Notification' => 'Nhắn nhở: hạn chót cấp phát cho :name gần đến',
     'Expected_Checkin_Date' => 'Một tài sản đã thu hồi về cho bạn vì đã hoàn lại vào ngày :date',
     'your_assets' => 'Xen qua tài sản của bạn',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/vi/validation.php b/resources/lang/vi/validation.php
index 2d20b74855..4318f20e8e 100644
--- a/resources/lang/vi/validation.php
+++ b/resources/lang/vi/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'Thuộc tính: phải có ít nhất: min items.',
     ],
     'starts_with'          => 'Trường :attribute phải kết thúc bằng một trong những giá trị sau: :values',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     '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.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         '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ệ',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/zh-CN/admin/accessories/general.php b/resources/lang/zh-CN/admin/accessories/general.php
index e34677f381..fd5d981e65 100644
--- a/resources/lang/zh-CN/admin/accessories/general.php
+++ b/resources/lang/zh-CN/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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'                   => '不能删除此配件，因为有些物品仍然被借出。',
 
 );
diff --git a/resources/lang/zh-CN/admin/accessories/message.php b/resources/lang/zh-CN/admin/accessories/message.php
index f33e5de77f..bdca30aac3 100644
--- a/resources/lang/zh-CN/admin/accessories/message.php
+++ b/resources/lang/zh-CN/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> '配件不能被预订，请重试。',
         'success' 		=> '配件成功预订。',
+        'unavailable'   => '配件不可被借出。检查可用数量',
         'user_does_not_exist' => '无效用户，请重试。'
     ),
 
diff --git a/resources/lang/zh-CN/admin/asset_maintenances/form.php b/resources/lang/zh-CN/admin/asset_maintenances/form.php
index 54c3930dd2..c7d81c8e51 100644
--- a/resources/lang/zh-CN/admin/asset_maintenances/form.php
+++ b/resources/lang/zh-CN/admin/asset_maintenances/form.php
@@ -7,8 +7,8 @@
         'completion_date'        => '完成日期',
         'cost'                   => '维护费用',
         'is_warranty'            => '质保升级/延期',
-        'asset_maintenance_time' => '资产维护所需天数',
+        'asset_maintenance_time' => '资产维护时间 (天)',
         'notes'                  => '备注',
-        'update'                 => '创建资产维护',
-        'create'                 => '更新资产维护'
+        'update'                 => '更新资产维护',
+        'create'                 => '创建资产维护'
     ];
diff --git a/resources/lang/zh-CN/admin/asset_maintenances/general.php b/resources/lang/zh-CN/admin/asset_maintenances/general.php
index d7a5e3db6d..71eef8f576 100644
--- a/resources/lang/zh-CN/admin/asset_maintenances/general.php
+++ b/resources/lang/zh-CN/admin/asset_maintenances/general.php
@@ -11,6 +11,6 @@
         'calibration'        => '校准',
         'software_support'   => '软件支持',
         'hardware_support'   => '硬件支持',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'configuration_change'   => '配置更改',
+        'pat_test'           => 'PAT 测试',
     ];
diff --git a/resources/lang/zh-CN/admin/categories/message.php b/resources/lang/zh-CN/admin/categories/message.php
index 68f33b8920..9d9b4c0201 100644
--- a/resources/lang/zh-CN/admin/categories/message.php
+++ b/resources/lang/zh-CN/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => '分类更新失败，请重试',
-        'success' => '分类更新成功'
+        'success' => '分类更新成功',
+        'cannot_change_category_type'   => '分类类型一旦创建就无法更改',
     ),
 
     'delete' => array(
diff --git a/resources/lang/zh-CN/admin/components/general.php b/resources/lang/zh-CN/admin/components/general.php
index e7bc55d545..65f04d7aba 100644
--- a/resources/lang/zh-CN/admin/components/general.php
+++ b/resources/lang/zh-CN/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => '剩余',
     'total' 			                 => '总计',
     'update'                            => '更新组件',
+    'checkin_limit'            => '归还的数量必须等于或小于 :assigned_qty'
 );
diff --git a/resources/lang/zh-CN/admin/components/message.php b/resources/lang/zh-CN/admin/components/message.php
index 1b86333819..78e22783e8 100644
--- a/resources/lang/zh-CN/admin/components/message.php
+++ b/resources/lang/zh-CN/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '借出组件失败，请重试。',
         'success' 		=> '借出组件成功。',
-        'user_does_not_exist' => '无效用户，请重试。'
+        'user_does_not_exist' => '无效用户，请重试。',
+        'unavailable'      => '还没有足够的组件: :remaining 件剩余, :requested 件需求 ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zh-CN/admin/consumables/message.php b/resources/lang/zh-CN/admin/consumables/message.php
index 0174a13f57..7c1e4fd6e9 100644
--- a/resources/lang/zh-CN/admin/consumables/message.php
+++ b/resources/lang/zh-CN/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '耗材领取失败，请重试',
         'success' 		=> '耗材领取成功',
-        'user_does_not_exist' => '无效用户，请重试。'
+        'user_does_not_exist' => '无效用户，请重试。',
+         'unavailable'      => '没有足够的耗材可被借出。请检查剩余数量。 ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zh-CN/admin/custom_fields/general.php b/resources/lang/zh-CN/admin/custom_fields/general.php
index 3e9e8b3b4a..22c75a19d7 100644
--- a/resources/lang/zh-CN/admin/custom_fields/general.php
+++ b/resources/lang/zh-CN/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => '引用模板',
     'order'   		            => '排序',
     'create_fieldset'         => '新增字段集',
+    'update_fieldset'         => '更新字段集',
+    'fieldset_does_not_exist'   => '字段集 :id 不存在',
+    'fieldset_updated'         => '字段集已更新',
     'create_fieldset_title' => '创建一个新的字段集',
     'create_field'            => '新增字段',
     'create_field_title' => '创建一个新自定义字段',
@@ -44,6 +47,8 @@ return [
     'db_convert_warning' => '警告。此字段作为 <code>:db_column</code> 的自定义字段表，但应该是 <code>:expected</code>。',
     'is_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' => '允许借出的用户在他们的“查看已分配的资产”页面中查看这些值',
+    'display_in_user_view_table' => '对用户可见',
+    'auto_add_to_fieldsets' => '自动将此添加到每个新字段集',
+    'add_to_preexisting_fieldsets' => '添加到任何现有的字段集',
 ];
diff --git a/resources/lang/zh-CN/admin/departments/message.php b/resources/lang/zh-CN/admin/departments/message.php
index ae56af3a1c..1af3cf4919 100644
--- a/resources/lang/zh-CN/admin/departments/message.php
+++ b/resources/lang/zh-CN/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/zh-CN/admin/groups/message.php b/resources/lang/zh-CN/admin/groups/message.php
index 555709d02e..24917b7b0f 100644
--- a/resources/lang/zh-CN/admin/groups/message.php
+++ b/resources/lang/zh-CN/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => '分组已经存在',
-    'group_not_found'     => '分组[:id]不存在',
+    'group_not_found'     => '分组 ID :id 不存在。',
     'group_name_required' => '名称为必填项',
 
     'success' => array(
diff --git a/resources/lang/zh-CN/admin/hardware/form.php b/resources/lang/zh-CN/admin/hardware/form.php
index b4e87b851b..705fb275bf 100644
--- a/resources/lang/zh-CN/admin/hardware/form.php
+++ b/resources/lang/zh-CN/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> '批量删除确认',
+    'bulk_restore'      => '确认批量恢复资产', 
   '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个资产的属性。',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => '仅更新默认位置',
     'asset_not_deployable' => '该资产状态为不可部署。无法借出此资产。',
     'asset_deployable' => '该状态为可部署。可以借出此资产。',
-    'processing_spinner' => '处理中……',
+    'processing_spinner' => '处理中...（对于大型文件可能需要一些时间）',
     'optional_infos'  => '可选信息',
     'order_details'   => '订单相关信息'
 ];
diff --git a/resources/lang/zh-CN/admin/hardware/general.php b/resources/lang/zh-CN/admin/hardware/general.php
index a580ab8981..ae7a9a875e 100644
--- a/resources/lang/zh-CN/admin/hardware/general.php
+++ b/resources/lang/zh-CN/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> '此资产已被删除。',
     'edit'  					=> '编辑资产',
     'model_deleted'  			=> '这个资源模型已被删除。您必须先还原模型才能还原素材。',
+    'model_invalid'             => '此资产的型号无效。',
+    'model_invalid_fix'         => '在尝试归还或借出资产之前，应编辑资产以更正此问题。',
     'requestable'               => '可申领',
     'requested'				    => '已申请',
     'not_requestable'           => '不可申领',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> '还原资产',
     'pending'  					=> '待处理',
     'undeployable'  			=> '不可部署',
+    'undeployable_tooltip'  	=> '此资产的状态标签为不可部署，此时无法借出。',
     'view'  					=> '查看资产',
     'csv_error' => '您的CSV文件中有一个错误：',
     'import_text' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => '错误信息：',
     'success_messages' => '成功信息：',
     'alert_details' => '请参阅下面的详细信息。',
-    'custom_export' => '自定义导出'
+    'custom_export' => '自定义导出',
+    'mfg_warranty_lookup' => ':manufacturer 保修状态查询',
 ];
diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php
index d33ae9729c..7f86f4129d 100644
--- a/resources/lang/zh-CN/admin/hardware/message.php
+++ b/resources/lang/zh-CN/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> '资产未被恢复，请重试。',
         'success' 		=> '资产恢复成功。',
+        'bulk_success' 		=> '资产已成功恢复。',
+        'nothing_updated'   => '没有选择任何资产，所以没有恢复。', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => '您的文件已被导入',
         'file_delete_success'   => '您的文件已成功删除',
         'file_delete_error'      => '该文件无法被删除',
+        'header_row_has_malformed_characters' => '标题行中的一个或多个属性包含格式错误的 UTF-8 字符',
+        'content_row_has_malformed_characters' => '第一行内容中的一个或多个属性包含格式错误的 UTF-8 字符',
     ],
 
 
diff --git a/resources/lang/zh-CN/admin/hardware/table.php b/resources/lang/zh-CN/admin/hardware/table.php
index 3839a39fa6..edb9fb0344 100644
--- a/resources/lang/zh-CN/admin/hardware/table.php
+++ b/resources/lang/zh-CN/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> '进/出',
     'checkout_date' => '借出日期',
     'checkoutto' 	=> '已借出',
+    'components_cost' => '组件总成本',
     'current_value' => '当前值',
     'diff' 			=> '差价',
     'dl_csv' 		=> '下载CSV格式',
diff --git a/resources/lang/zh-CN/admin/licenses/general.php b/resources/lang/zh-CN/admin/licenses/general.php
index 312b3dd6cf..5306b7cd43 100644
--- a/resources/lang/zh-CN/admin/licenses/general.php
+++ b/resources/lang/zh-CN/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => '关于许可证',
-    'about_licenses'                  => '许可证用于跟踪软件。 它们包含特殊位数的数字，可以借出给个人。',
+    'about_licenses_title'      => '关于许可证',
+    'about_licenses'            => '许可证用于跟踪软件。 它们包含特殊位数的数字，可以借出给个人。',
     'checkin'  					=> '接入许可证数量',
     'checkout_history'  		=> '借出历史记录',
     'checkout'  				=> '借出许可证数量',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> '软件许可证',
     'user'  					=> '用户',
     'view'  					=> '查看许可证',
+    'delete_disabled'           => '此许可证不能被删除，因为有些席位仍然被借出。',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => '归还所有席位',
+                'modal'             => '此操作将归还一个席位。| 此操作将归还此许可证的所有 :checkedout_seas_count 个座位。',
+                'enabled_tooltip'   => '从用户和资产中归还此许可证的所有席位',
+                'disabled_tooltip'  => '此功能已禁用，因为当前没有借出的席位',
+                'success'           => '许可证归还成功！| 所有许可证都已归还成功！',
+                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => '借出所有席位',
+                'modal'                 => '此操作将借出一个席位给第一个可用的用户。| 此操作将借出所有 :available _seas_count 个席位给第一个可用的用户。 如果此许可证尚未借出给用户，并且在该用户账户上启用了“自动分配许可证”属性，则认定该用户可以使用此席位。',
+                'enabled_tooltip'   => '向所有用户借出所有（或尽可能多）的席位',
+                'disabled_tooltip'  => '此功能已禁用，因为当前没有可用的席位',
+                'success'           => '许可证成功借出！ | :count 个许可证成功借出！',
+                'error_no_seats'    => '此许可证已无剩余席位。',
+                'warn_not_enough_seats'    => ':count 个用户被分配了此许可证，但我们没有可用的许可证席位。',
+                'warn_no_avail_users'    => '没有什么要做的。没有尚未分配此许可证的用户。',
+                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/zh-CN/admin/locations/message.php b/resources/lang/zh-CN/admin/locations/message.php
index fec3bac965..f87df0f848 100644
--- a/resources/lang/zh-CN/admin/locations/message.php
+++ b/resources/lang/zh-CN/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => '该位置下管理的还有其他用户，目前不能删除，请更新该用户的信息之后，再尝试删除。',
     'assoc_assets'	 => '删除失败，该位置已与其它资产关联。请先更新资产以取消关联，然后重试。 ',
     'assoc_child_loc'	 => '删除失败，该位置是一个或多个子位置的上层节点。请更新地理位置信息以取消关联，然后重试。 ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => '已分配的资产',
+    'current_location' => '当前地理位置',
 
 
     'create' => array(
diff --git a/resources/lang/zh-CN/admin/manufacturers/message.php b/resources/lang/zh-CN/admin/manufacturers/message.php
index 63902c2791..a977a78762 100644
--- a/resources/lang/zh-CN/admin/manufacturers/message.php
+++ b/resources/lang/zh-CN/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => '在您的 URL 中使用 <code>{LOCALE}</code> 和 <code>{SERIAL}</code> 作为变量，以便在查看资产时自动填充这些值。',
     'does_not_exist' => '制造商不存在',
     'assoc_users'	 => '这个制造商下关联的还有其他资产，请确认后再重试。',
 
diff --git a/resources/lang/zh-CN/admin/manufacturers/table.php b/resources/lang/zh-CN/admin/manufacturers/table.php
index 99e59a6340..af8b904da5 100644
--- a/resources/lang/zh-CN/admin/manufacturers/table.php
+++ b/resources/lang/zh-CN/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> '邮件客服支持',
     'support_phone'   		=> '电话客服支持',
     'support_url'   		=> '网站客服支持',
+    'warranty_lookup_url'   => '保修查询URL',
     'update'				=> '更新制造商',
     'url'   				=> 'URL',
 
diff --git a/resources/lang/zh-CN/admin/models/general.php b/resources/lang/zh-CN/admin/models/general.php
index 2524bbac64..9f3c23aa65 100644
--- a/resources/lang/zh-CN/admin/models/general.php
+++ b/resources/lang/zh-CN/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => '此模型已被删除。',
     'bulk_delete'               => '批量删除资产型号',
     'bulk_delete_help'               => '使用下面的复选框确认删除所选资产型号。若有与之关联的资产，该资产型号则不能删除，除非将关联资产关联到别的资产型号。',
-    'bulk_delete_warn'          => '您即将删除:model_count资产型号。',
+    'bulk_delete_warn'          => '您即将删除一个资产型号。 |您将删除 :model_count 个资产型号。',
     'restore'                   => '恢复型号',
     'requestable'               => '用户可申请此型号',
 	'show_mac_address'			      => '在此型号资产中显示MAC地址',
diff --git a/resources/lang/zh-CN/admin/models/message.php b/resources/lang/zh-CN/admin/models/message.php
index 21a6dba5ce..9004cd0558 100644
--- a/resources/lang/zh-CN/admin/models/message.php
+++ b/resources/lang/zh-CN/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => '模板不存在',
+    'no_association' => '没有关联的型号。',
+    'no_association_fix' => '这将以怪异且可怕的方式破坏一切。立即编辑此资产并为其指定一个型号。',
     'assoc_users'	 => '本模板下目前还有相关的资产，不能被删除，请删除资产以后，再重试。',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => '模板没有被更新，请重试。',
-        'success' => '模板更新成功。'
+        'success' => '模板更新成功。',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> '没有字段被更改，因此没有更新任何内容。',
-        'success' 		=> '模板已更新。'
+        'success' 		=> '型号已成功更新|:model_count 个型号已成功更新。',
+        'warn'          => '您将要更新以下型号的属性：|您将要编辑 :model_count 个型号的属性：',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => '没有型号被选中，所以没有删除任何东西。',
-        'success' 		    => ':success_count 个已删除！',
+        'success' 		    => '型号已删除！|:succes_count 个型号已删除！',
         'success_partial' 	=> ':success_count 个已删除, 但是 :fail_count 个因为还有关联资产所以没办法删除。'
     ),
 
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index 679b4f1a49..5ce63049a4 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => '如果你想给用户额外的邮件账户发送签入/签出副本，请在此输入邮箱地址，否则请留空。',
     'is_ad'				        => '这是AD域服务器',
     'alerts'                	=> '警报',
-    'alert_title'               => '更新警报设置',
+    'alert_title'               => '更新通知设置',
     'alert_email'				=> '发送警报',
     'alert_email_help'    => '您希望向其发送警报的电子邮件地址或通讯组列表，以逗号分隔',
     'alerts_enabled'			=> '警报已启用',
@@ -21,7 +21,7 @@ return [
     'allow_user_skin_help_text' => '勾选此框将允许用户以不同的方式覆盖界面皮肤。',
     '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_interval_help'       => '如果您需要定期对您的资产进行盘点，请输入时间间隔（以月为单位）。如果您更新此值，则将更新具有即将到来的盘点日期的资产的所有“下一个盘点日期”。',
     'audit_warning_days'        => '盘点开始提醒',
     'audit_warning_days_help'   => '需要提前多少天让我们通知您需要盘点资产？',
     'auto_increment_assets'		=> '生成自动递增的资产标签',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => '从备份中还原',
     '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'   => '使用恢复按钮 <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_logged_out'         => '恢复完成后，包括您在内的所有现有用户都将被注销。',
     'backups_large'             => '非常大的备份在恢复尝试时可能会超时，可能仍然需要通过命令行运行。 ',
     'barcode_settings'			=> '条码设置',
@@ -75,8 +75,9 @@ return [
     '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.',
+    'ldap_default_group'        => '默认权限组',
+    'ldap_default_group_info'   => '选择要分配给新同步用户的组。注意，用户会获得分配给他们的组的权限。',
+    'no_default_group'          => '没有默认组',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP 客户端TLS 密钥',
     'ldap_client_tls_cert'      => 'LDAP 客户端TLS 证书',
@@ -85,6 +86,9 @@ return [
     'ldap_settings'             => 'LDAP 设置',
     'ldap_client_tls_cert_help' => 'LDAP 连接的客户端TLS 证书和密钥通常仅用于谷歌工作空间配置，两者都是必需的。',
      'ldap_client_tls_key'       => 'LDAP 客户端TLS 密钥',
+    'ldap_location'             => 'LDAP 位置',
+'ldap_location_help'             => '如果在 Base Bind DN 中没有使用 <strong>则Ldap 位置字段。</strong> 如果正在使用 OU 搜索，请将此留空。
+如果<strong>在 Base Bind DN 中没有使用OU，则应使用Ldap Location字段</strong>如果正在使用OU搜索，请将此项留空。',
     'ldap_login_test_help'      => '根据你指定的base DN，输入有效的LDAP用户名和密码，以测试您的LDAP登录是否配置正确。当然您必须先保存您更改的LDAP设置。',
     'ldap_login_sync_help'      => '这只证明了LDAP同步正确。如果您的LDAP身份验证查询设置不正确，用户可能仍然无法登录。当然您必须先保存您的LDAP设置。',
     'ldap_manager'              => 'LDAP 管理器',
@@ -197,16 +201,21 @@ return [
     'show_images_in_email'     => '在电子邮件中显示图片。',
     'show_images_in_email_help'   => '如果外部用户无法在邮件中通过你安装在VPN或内网的Snipe-IT加载图片，请取消此复选框。',
     'site_name'                 => '站点名称',
+    'integrations'               => '集成',
     'slack'                     => 'Slack',
-    'slack_title'               => '更新 Slack 设置',
-    'slack_help'                => 'Slack设置',
-    'slack_botname'             => 'Slack Bot名称',
-    'slack_channel'             => 'Slack频道',
-    'slack_endpoint'            => 'Slack节点',
-    'slack_integration'         => 'Slack设置',
-    'slack_integration_help'    => 'Slack 集成是可选的，但如果您想要使用它，则需要端点和频道。 要配置 Slack 集成，您必须先 <a href=":slack_link" target="_new" rel="noopener">在您的 Slack 帐户上创建传入的 webhook</a> 。 点击 <strong>测试 Slack 集成</strong> 按钮在保存之前确认您的设置是正确的。 ',
-    'slack_integration_help_button'    => '一旦你保存了你的Slack信息，就会出现一个测试按钮。',
-    'slack_test_help'           => '测试您的Slack集成是否配置正确。你一定要先保存你的设置。',
+    'general_webhook'           => '常规Webhook',
+    'webhook'                   => ':app',
+    'webhook_presave'           => '测试以保存',
+    'webhook_title'               => '更新 Webhook 设置',
+    'webhook_help'                => '集成设置',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app 频道',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app 设置',
+    'webhook_test'                 =>'测试 :app 集成',
+    '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 设置',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => '支持页脚链接 ',
     'support_footer_help'       => '指定谁可以看到指向Snipe-IT支持信息和用户手册的链接',
@@ -301,7 +310,7 @@ return [
     'localization_keywords' => '本地化、货币、本地、本地、时区、时区、国际、内部、语言、语言、翻译',
     'localization_help' => '语言，日期显示',
     'notifications' => '通知',
-    'notifications_help' => '电子邮件提醒，盘点设置',
+    'notifications_help' => '电子邮件警报和盘点设置',
     'asset_tags_help' => '递增和前缀',
     'labels' => '标签',
     'labels_title' => '更新标签设置',
@@ -322,4 +331,9 @@ return [
     'setup_migration_create_user' => '下一步：创建用户',
     'ldap_settings_link' => 'LDAP 设置页面',
     'slack_test' => '测试 <i class="fab fa-slack"></i> 集成',
+    '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 登录设置',
+    'enable_google_login'  => '允许用户使用 Google Workspace 登录',
+    'enable_google_login_help'  => '这些用户将不会被自动配置。 他们必须拥有一个已存在的账户以及 一个 Google Workspace 账户，并且已存在账户的用户名必须与 Google Workspace 账户的电子邮件地址相匹配。 ',
+
 ];
diff --git a/resources/lang/zh-CN/admin/settings/message.php b/resources/lang/zh-CN/admin/settings/message.php
index da01f4ab7b..e93c0bc5fe 100644
--- a/resources/lang/zh-CN/admin/settings/message.php
+++ b/resources/lang/zh-CN/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => '测试 LDAP 身份验证...',
         'authentication_success' => '用户已成功通过LDAP认证！'
     ],
-    'slack' => [
-        'sending' => '正在发送Slack测试消息...',
+    'webhook' => [
+        'sending' => '正在发送 :app 测试消息...',
         'success_pt1' => '成功！请检查 ',
-        'success_pt2' => ' 您的测试消息频道，并且一定要点击下面的“保存”来存储您的设置。',
+        'success_pt2' => ' 测试消息的频道，并且一定要点击下面的“保存”来存储您的设置。',
         '500' => '500 服务器错误。',
-        'error' => '出了错。',
+        'error' => '出错了。:app响应：:error_message',
+        'error_misc' => '出错了:( ',
     ]
 ];
diff --git a/resources/lang/zh-CN/admin/users/general.php b/resources/lang/zh-CN/admin/users/general.php
index c23b9cdfea..f9188963f4 100644
--- a/resources/lang/zh-CN/admin/users/general.php
+++ b/resources/lang/zh-CN/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => '打印所有已分配资产',
     'email_assigned'    => '邮件发送所有已分配的列表',
     'user_notified'     => '用户已通过电子邮件收到当前分配给他们的物品列表。',
+    'auto_assign_label' => '在自动分配符合条件的许可证时包括此用户',
+    'auto_assign_help'  => '在自动分配许可证时跳过此用户',
     'software_user'     => ':name 借走的软件',
     'send_email_help'   => '您必须为此用户提供电子邮件地址才能发送他们的凭据。电子邮件凭据只能在用户创建时完成。 密码存储在单向散列中，保存后无法检索。',
     'view_user'         => '查看用户： :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => '只有超级管理员可以授予用户超级管理员访问权限。',
     'admin_permission_warning' => '只有拥有管理员权限或更大权限的用户才能授予用户管理员权限。',
     'remove_group_memberships' => '删除群组成员',
-    'warning_deletion' => '警告：',
     'warning_deletion_information' => '下列 :count 个用户的所有物品将要归还。超级管理员名称高亮为红色。',
     'update_user_assets_status' => '将这些用户的所有资产更新到此状态',
     'checkin_user_properties' => '归还与这些用户相关的所有资产',
@@ -41,4 +42,13 @@ return [
     '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/zh-CN/admin/users/message.php b/resources/lang/zh-CN/admin/users/message.php
index b724f9c52b..3937d96b3f 100644
--- a/resources/lang/zh-CN/admin/users/message.php
+++ b/resources/lang/zh-CN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => '你已拒绝此项资产。',
     'bulk_manager_warn'	        => '您的用户已成功更新，但是您的经理条目未保存，因为您选择的经理也在要编辑的用户列表中，用户可能不是自己的经理。请再次选择您的用户，不包括经理。',
     'user_exists'               => '用户已经存在!',
-    'user_not_found'            => '用户[:id] 不存在',
+    'user_not_found'            => '用户不存在。',
     'user_login_required'       => '登陆字段是必须的',
     'user_password_required'    => '密码为必填项',
     'insufficient_permissions'  => '权限不足',
@@ -15,7 +15,7 @@ return array(
     'password_resets_sent'      => '被选中的已激活并拥有有效电子邮件地址的用户已经收到了一个密码重置链接。',
     'password_reset_sent'       => '密码重置链接已发送至 :email!',
     'user_has_no_email'         => '此用户的个人资料中没有电子邮件地址。',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => '此用户没有分配任何资产',
 
 
     'success' => array(
@@ -61,7 +61,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/zh-CN/auth/general.php b/resources/lang/zh-CN/auth/general.php
index f02c6e3825..d4c89d62f5 100644
--- a/resources/lang/zh-CN/auth/general.php
+++ b/resources/lang/zh-CN/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => '记住我',
     'username_help_top'                 => '请输入您的 <strong>用户名</strong> 发送密码重置链接到邮箱。',
     'username_help_bottom'          => '您的用户名和邮箱地址<em>可以</em>相同，也可以不同，这取决于您的配置。如果您忘记了您的用户名，请与管理员联系。<br><br><strong>没有关联电子邮件地址的用户名将不会通过电子邮件发送密码重置链接。 </strong> ',
-    ];
+    'google_login'                  => '或使用 Google Workspac 登录',
+    'google_login_failed'           => 'Google 登录失败，请重试。',
+
+];
 
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index 228ce75bbb..02fc0509aa 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> '附属品',
     'activated'			    => '已激活',
+    'accepted_date'         => '接受日期',
     'accessory'				=> '附属品',
     'accessory_report'		=> '配件报告',
     'action'                => '操作',
@@ -11,7 +12,7 @@ return [
     'admin'					=> '管理员',
     'administrator'			=> '管理员',
     'add_seats'             => '已增加空位',
-    'age'                   => "Age",
+    'age'                   => "年龄",
     'all_assets'			=> '所有资产',
     'all'       			=> '所有',
     'archived'              => '已存档',
@@ -27,7 +28,13 @@ return [
     'audit'				    => '审计',
     'audit_report'			=> '审核日志',
     'assets'				=> '资产',
+    'assets_audited'        => '已盘点资产',
+    'assets_checked_in_count'     => '资产已归还',
+    'assets_checked_out_count'     => '资产已借出',
+    'asset_deleted_warning'     => '此资产已被删除。您必须先恢复它才能将其分配给某人。',
+    'assigned_date'         => '分配日期',
     'assigned_to'           => '借出给:name的资产',
+    'assignee'              => '分配给',
     'avatar_delete'         => '删除头像',
     'avatar_upload'         => '上传头像',
     'back'      			=> '后退',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => '批量编辑',
     'bulk_delete'           => '批量删除',
     'bulk_actions'          => '批量操作',
-    'bulk_checkin_delete'   => '从用户批量归还物品',
+    'bulk_checkin_delete'   => '批量归还 / 删除用户',
+    'byod'                  => '自带设备',
+    'byod_help'             => '此设备归用户所有',
     'bystatus'              => '按状态',
     'cancel'  				=> '取消',
     'categories'			=> '目录',
@@ -83,6 +92,7 @@ return [
     'debug_warning_text'    => '此应用程序运行在生产模式下的调试状态。如果您的应用程序可以被外部访问，这会使敏感数据暴露。通过将 <code>.env</code> 文件中的<code>APP_DEBUG</code> 值设置为 <code>false</code>来 禁用调试模式。',
     'delete'  				=> '刪除',
     'delete_confirm'  		=> '是否确定删除此项',
+    'delete_confirm_no_undo' => '你确定要删除这条数据吗？这个数据将会无法恢复。',
     'deleted'  				=> '已删除',
     'delete_seats'  		=> '已移除空位',
     'deletion_failed'       => '删除失败',
@@ -139,6 +149,7 @@ return [
     'filetypes_accepted_help'    => '可接受的文件类型是 :types. 最大允许上传大小为 :size.|可接受的文件类型是 :types. 最大允许上传大小为 :size.',
     'filetypes_size_help'   => '允许最大上传文件的大小为 :size.',
     'image_filetypes_help'  => '接受jpg，png，gif和svg类型的文件。文件大小应小于 :size。',
+    'unaccepted_image_type'  => '此图像文件不可读。可接受的文件类型为jpg、webp、png、gif和svg。此文件的 mimetype 类型为：:mimetype。',
     'import'         	    => '导入',
     'importing'         	=> '正在导入…',
     'importing_help'        => '您可以通过CSV文件导入资产、配件、许可证、组件、消耗品和用户。 <br><br>CSV 应以逗号分隔和格式化，并且在文档</a> 中与 <a href="https://snipe-it.readme.io/docs/importing" target="_new">样本CSV中的标头匹配。',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => '资产维修',
     'item'  				=> '条目',
     'item_name'             => '物品名称',
+    'import_file'  			=> '导入 CSV 文件',
+    'import_type'  			=> 'CSV 导入类型',
     'insufficient_permissions' => '没有足够的权限',
     'kits'       			=> '预定义的 Kits',
     'language'				=> '语言',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => '已申领资产',
     'request_canceled'      => '取消请求',
     'save'  				=> '保存​​',
+    'select_var'            => '选择 :thing... ', // this will eventually replace all of our other selects
     'select'				=> '选择',
     'select_all'            => '全选',
     'search'				=> '搜索',
@@ -240,8 +254,8 @@ return [
     'signature'             => '签名',
     'signed_off_by'         => '管理员签名',
     'skin'       			=> '主题',
-    'slack_msg_note'        => '将发送一条slack消息',
-    'slack_test_msg'        => '哦哈！看起来 Slack 已经成功应用到 Snipe-IT 了！',
+    'webhook_msg_note'        => '通知将通过 webhook 发送',
+    'webhook_test_msg'        => '哦哈！看起来您的 :app 与Snipe-IT 的整合工作正常！',
     'some_features_disabled' => '演示模式: 此安装将禁用某些功能。',
     'site_name'				=> '站点名称',
     'state'  				=> '省份',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '是否确认要删除',
     'submit'				=> '提交',
     'target'                => '目标',
-    'toggle_navigation'     => 'Toogle 导航',
     'time_and_date_display' => '时间和日期显示',
     'total_assets'			=> '共计资产',
     'total_licenses'		=> '共计许可证',
@@ -281,9 +294,9 @@ return [
     'yes' 					=> '是',
     '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_does_not_exist'   => '请求的文件在服务器上不存在。',
+    'file_upload_success'   => '文件上传成功！',
+    'no_files_uploaded'     => '文件上传成功！',
     'token_expired'         => '表单会话已过期，请重新提交',
     'login_enabled'         => '登录已启用',
     'audit_due'             => '到期审计',
@@ -375,7 +388,8 @@ return [
     'bulk_soft_delete'      =>'也可以“软删除”这些用户。他们的资产历史将保持不变，除非直到您清理管理设置中删除的记录。',
     'bulk_checkin_delete_success' => '您所选的用户已被删除，其名下资产已归还。',
     'bulk_checkin_success' => '选中用户的物品已归还。',
-    'set_to_null' => '删除此资产的值|删除所有:asset_count个资产的值 ',
+    'set_to_null'           => '删除此资产的值|删除所有:asset_count个资产的值 ',
+    'set_users_field_to_null'  => '删除此用户的 :field 值|删除所有 :user_count 个用户的 :field 值 ',
     'na_no_purchase_date'   => 'N/A-未提供购买日期',
     'assets_by_status'      => '按状态显示的资产',
     'assets_by_status_type'      => '按状态类型显示的资产',
@@ -385,8 +399,54 @@ return [
     'start_date'            => '开始日期',
     'end_date'            => '结束日期',
     'alt_uploaded_image_thumbnail' => '已上传缩略图',
-    'placeholder_kit'       => '选择一个套件'
+    'placeholder_kit'       => '选择一个套件',
+    'file_not_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'   => ' 给新用户发送欢迎电子邮件？',
+    'back_before_importing'     => '导入前备份？',
+    'csv_header_field'          => 'CSV 页眉字段',
+    'import_field'              => '导入字段',
+    'sample_value'              => '示例值',
+    'no_headers'                => '没有找到列',
+    'error_in_import_file'      => '读取CSV文件时出错：:error',
+    'percent_complete'          => ':percent % 完成',
+    'errors_importing'          => '导入时发生错误： ',
+    'warning'                   => '警告：:warning',
+    'success_redirecting'       => '"成功... 重定向。',
+    'setup_successful_migrations' => '您的数据库表已创建',
+    'setup_migration_output' => '迁移输出：',
+    'setup_migration_create_user' => '下一步：创建用户',
+    'importer_generic_error'    => '您的文件导入已完成，但我们收到了一个错误。 这通常是由来自通知Webhook (例如Slack) 的第三方API缓存造成的，不会干扰导入操作， 但您应该对此进行确认。',
+    'confirm' => '确认',
+    'autoassign_licenses' => '自动分配许可证',
+    'autoassign_licenses_help' => '允许此用户通过批量分配许可UI或cli工具分配许可证。',
+    'autoassign_licenses_help_long' => '这允许用户通过批量分配的许可UI或cli工具分配许可证。 (例如，您可能不想让承包商自动分配您只提供给员工的许可。) 您仍然可以单独将许可证分配给这些用户，但他们不会被包含在借出许可证中给所有用户功能。)',
+    'no_autoassign_licenses_help' => '不包括通过许可证UI或cli工具进行批量分配的用户。',
+    'modal_confirm_generic'      => '您确定吗？',
+    'cannot_be_deleted'      => '此物品不能被删除',
+    'undeployable_tooltip'      => '无法借出此物品。请检查剩余数量。',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/zh-CN/help.php b/resources/lang/zh-CN/help.php
index 6d24c36a5a..24702daffa 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' => '资产是指按序号或资产标签跟踪的物品，往往是指识别某一具体物品的价值较高的物品。',
 
diff --git a/resources/lang/zh-CN/localizations.php b/resources/lang/zh-CN/localizations.php
index a5a28a7971..db690b41be 100644
--- a/resources/lang/zh-CN/localizations.php
+++ b/resources/lang/zh-CN/localizations.php
@@ -4,7 +4,7 @@ return [
 
     'select_language' => '选择一种语言',
     'languages' => [
-        'en'=> 'English, US',
+        'en'=> '中文',
         'en-GB'=> 'English, UK',
         'af'=> 'Afrikaans',
         'ar'=> 'Arabic',
@@ -61,7 +61,7 @@ return [
         'zu'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => '选择国家',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -111,7 +111,7 @@ return [
         'CK'=>'Cook Islands',
         'CL'=>'Chile',
         'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
+        'CN'=>'中国',
         'CO'=>'Colombia',
         'CR'=>'Costa Rica',
         'CU'=>'Cuba',
@@ -156,7 +156,7 @@ return [
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
-        'HK'=>'Hong Kong',
+        'HK'=>'中国香港',
         'HM'=>'Heard And Mc Donald Islands',
         'HN'=>'Honduras',
         'HR'=>'Croatia (local name: Hrvatska)',
@@ -207,7 +207,7 @@ return [
         'ML'=>'Mali',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
+        'MO'=>'中国澳门',
         'MP'=>'Northern Mariana Islands',
         'MQ'=>'Martinique',
         'MR'=>'Mauritania',
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
@@ -288,7 +289,7 @@ return [
         'TR'=>'Turkey',
         'TT'=>'Trinidad And Tobago',
         'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
+        'TW'=>'中国台湾',
         'TZ'=>'Tanzania, United Republic Of',
         'UA'=>'Ukraine',
         'UG'=>'Uganda',
diff --git a/resources/lang/zh-CN/mail.php b/resources/lang/zh-CN/mail.php
index 96d87e2eb0..53ec9d611e 100644
--- a/resources/lang/zh-CN/mail.php
+++ b/resources/lang/zh-CN/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => '请使用以下凭据登录新安装的 Snipe-IT：',
     'login' => '登录：',
     'Low_Inventory_Report' => '低库存报告',
+    'inventory_report' => '库存报告',
     'min_QTY' => '最小数量',
     'name' => '名字',
     'new_item_checked' => '一项新物品已分配至您的名下，详细信息如下。',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => '您的 Snipe-IT 登录凭据',
     'Accessory_Checkin_Notification' => '配件已签入',
     'Asset_Checkin_Notification' => '资产已签入',
+    'Asset_Checkout_Notification' => '资产已借出',
     'License_Checkin_Notification' => '许可证已签入',
     'Expected_Checkin_Report' => '预期的资产检查报告',
     'Expected_Checkin_Notification' => '提醒：:name 签入截止日期已接近。',
     'Expected_Checkin_Date' => '借出的资产将在 :date 重新签入',
     'your_assets' => '查看您的资产',
+    'rights_reserved' => '版权所有。',
 ];
diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php
index 497b1e4793..5130659cd7 100644
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/validation.php
@@ -43,14 +43,14 @@ return [
     'file'                 => '：属性必须是一个文件。',
     'filled'               => '：属性字段必须有一个值。',
     'image'                => ':attribute 必须是图片格式',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    'import_field_empty'    => ':fieldname 的值不能为空。',
     'in'                   => '选择的 :attribute 无效',
     'in_array'             => '：属性字段不存在于：其他。',
     'integer'              => ':attribute 必须是整数',
     'ip'                   => ':attribute 必须是有效IP',
     'ipv4'                 => '：属性必须是有效的IPv4地址。',
     'ipv6'                 => '：属性必须是有效的IPv6地址。',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
+    'is_unique_department' => ':attribute 必须是唯一的公司地理位置',
     'json'                 => '：属性必须是有效的JSON字符串。',
     'max'                  => [
         'numeric' => ':attribute 不大于 :max',
@@ -67,6 +67,8 @@ return [
         'array'   => '：属性必须至少有：最小项。',
     ],
     'starts_with'          => ':attribute 必须以以下一个开始：:values',
+    'ends_with'            => ':attribute 必须以: :values 其中一个结尾。',
+
     'not_in'               => '选择的 :attribute 无效',
     'numeric'              => ':attribute 必须是数字',
     'present'              => '：属性字段必须存在。',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => '您当前的密码不正确',
         'dumbpwd'          => '那个密码太常见了。',
         'statuslabel_type' => '您必须选择有效的状态标签类型',
+
+        // 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 必须是 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 格式的有效日期',
+
     ],
 
     /*
diff --git a/resources/lang/zh-HK/admin/accessories/general.php b/resources/lang/zh-HK/admin/accessories/general.php
index e9a2e69ff6..bed7f38fab 100644
--- a/resources/lang/zh-HK/admin/accessories/general.php
+++ b/resources/lang/zh-HK/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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/zh-HK/admin/accessories/message.php b/resources/lang/zh-HK/admin/accessories/message.php
index a356463064..542f71f03c 100644
--- a/resources/lang/zh-HK/admin/accessories/message.php
+++ b/resources/lang/zh-HK/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      '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.'
     ),
 
diff --git a/resources/lang/zh-HK/admin/asset_maintenances/form.php b/resources/lang/zh-HK/admin/asset_maintenances/form.php
index 04a707e15e..785d06b08f 100644
--- a/resources/lang/zh-HK/admin/asset_maintenances/form.php
+++ b/resources/lang/zh-HK/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => '資產維護類型',
-        'title'                  => '標題',
-        'start_date'             => '開始日期',
-        'completion_date'        => '完成日期',
-        'cost'                   => '維護費用',
-        'is_warranty'            => '保固升級/延期',
-        'asset_maintenance_time' => '資產維護所需天數',
-        'notes'                  => '備註',
-        'update'                 => '更新資產維護',
-        'create'                 => '新建資產維護'
+        '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/zh-HK/admin/categories/message.php b/resources/lang/zh-HK/admin/categories/message.php
index 48ad3197f0..4e493f68b6 100644
--- a/resources/lang/zh-HK/admin/categories/message.php
+++ b/resources/lang/zh-HK/admin/categories/message.php
@@ -2,24 +2,25 @@
 
 return array(
 
-    'does_not_exist' => '類別不存在',
-    'assoc_models'	 => '至少還有一個樣板與此類別關聯，目前不能被刪除，請檢查後重試。 ',
-    'assoc_items'	 => '至少還有一個 :asset_type 與此類別關聯，目前不能被刪除，請您檢查 :asset_type 後重試。 ',
+    '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'   => '新增類別失敗，請重試。',
-        'success' => '新增類別成功。'
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
     ),
 
     'update' => array(
-        'error'   => '更新類別失敗，請重試。',
-        'success' => '更新類別成功。'
+        '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'   => '您確定要刪除此類別嗎？',
-        'error'   => '刪除類別時發生問題。請再試一次。',
-        'success' => '刪除類別成功。'
+        '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/zh-HK/admin/components/general.php b/resources/lang/zh-HK/admin/components/general.php
index f7689a7ad1..5b788a51ec 100644
--- a/resources/lang/zh-HK/admin/components/general.php
+++ b/resources/lang/zh-HK/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     '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/zh-HK/admin/components/message.php b/resources/lang/zh-HK/admin/components/message.php
index 1e6ff3ebac..0a7dd8d954 100644
--- a/resources/lang/zh-HK/admin/components/message.php
+++ b/resources/lang/zh-HK/admin/components/message.php
@@ -2,34 +2,35 @@
 
 return array(
 
-    'does_not_exist' => '組件不存在',
+    'does_not_exist' => 'Component does not exist.',
 
     'create' => array(
-        'error'   => '新增組件失敗，請重試。',
-        'success' => '新增組件成功。'
+        'error'   => 'Component was not created, please try again.',
+        'success' => 'Component created successfully.'
     ),
 
     'update' => array(
-        'error'   => '更新組件失敗，請重試。',
-        'success' => '更新組件成功。'
+        'error'   => 'Component was not updated, please try again',
+        'success' => 'Component updated successfully.'
     ),
 
     'delete' => array(
-        'confirm'   => '您確定要刪除此組件嗎？',
-        'error'   => '刪除組件時發生問題。請再試一次。',
-        'success' => '刪除組件成功。'
+        '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.'
     ),
 
      'checkout' => array(
-        'error'   		=> '組件借出失敗。請再試一次。',
-        'success' 		=> '借出組件成功。',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        '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'   		=> '組件繳回失敗。請再試一次。',
-        'success' 		=> '繳回組件成功。',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        '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/zh-HK/admin/consumables/message.php b/resources/lang/zh-HK/admin/consumables/message.php
index 82b9d94005..c0d0aa7f68 100644
--- a/resources/lang/zh-HK/admin/consumables/message.php
+++ b/resources/lang/zh-HK/admin/consumables/message.php
@@ -2,34 +2,35 @@
 
 return array(
 
-    'does_not_exist' => '耗材不存在。',
+    'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
-        'error'   => '新增耗材失敗，請重試。',
-        'success' => '新增耗材成功。'
+        'error'   => 'Consumable was not created, please try again.',
+        'success' => 'Consumable created successfully.'
     ),
 
     'update' => array(
-        'error'   => '更新耗材失敗，請重試。',
-        'success' => '更新耗材成功。'
+        'error'   => 'Consumable was not updated, please try again',
+        'success' => 'Consumable updated successfully.'
     ),
 
     'delete' => array(
-        'confirm'   => '您確定要刪除此耗材嗎？',
-        'error'   => '刪除耗材時發生問題。請再試一次。',
-        'success' => '刪除耗材成功。'
+        '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'   		=> '耗材領取失敗，請重試。',
-        'success' 		=> '耗材領取成功。',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        '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'   		=> '耗材登記失敗，請重試。',
-        'success' 		=> '耗材登記成功',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        '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/zh-HK/admin/custom_fields/general.php b/resources/lang/zh-HK/admin/custom_fields/general.php
index 92bf240a76..1923aa7f4a 100644
--- a/resources/lang/zh-HK/admin/custom_fields/general.php
+++ b/resources/lang/zh-HK/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     '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',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/zh-HK/admin/groups/message.php b/resources/lang/zh-HK/admin/groups/message.php
index 40ceb5e787..495acaf36b 100644
--- a/resources/lang/zh-HK/admin/groups/message.php
+++ b/resources/lang/zh-HK/admin/groups/message.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'group_exists'        => '群組已存在',
-    'group_not_found'     => '群組 [:id] 不存在',
-    'group_name_required' => '名稱欄位必填',
+    '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' => '新增群組成功。',
-        'update' => '更新群組成功。',
-        'delete' => '刪除群組成功。',
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
     ),
 
     'delete' => array(
-        'confirm'   => '您確定要刪除此群組嗎？',
-        'create' => '新增群組時發生問題。請重試。',
-        'update' => '更新群組時發生問題。請重試。',
-        'delete' => '刪除群組時發生問題。請重試。',
+        '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/zh-HK/admin/hardware/form.php b/resources/lang/zh-HK/admin/hardware/form.php
index 22aac61d07..6bcb884bab 100644
--- a/resources/lang/zh-HK/admin/hardware/form.php
+++ b/resources/lang/zh-HK/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/zh-HK/admin/hardware/general.php b/resources/lang/zh-HK/admin/hardware/general.php
index 67226061b1..b0a48f2ce4 100644
--- a/resources/lang/zh-HK/admin/hardware/general.php
+++ b/resources/lang/zh-HK/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/zh-HK/admin/hardware/message.php b/resources/lang/zh-HK/admin/hardware/message.php
index d2214ce00c..18f3b3fa24 100644
--- a/resources/lang/zh-HK/admin/hardware/message.php
+++ b/resources/lang/zh-HK/admin/hardware/message.php
@@ -23,6 +23,8 @@ return [
     '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' => [
@@ -49,6 +51,8 @@ return [
         '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',
+        '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',
     ],
 
 
diff --git a/resources/lang/zh-HK/admin/hardware/table.php b/resources/lang/zh-HK/admin/hardware/table.php
index 6166ba8045..10629fd22c 100644
--- a/resources/lang/zh-HK/admin/hardware/table.php
+++ b/resources/lang/zh-HK/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     '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',
diff --git a/resources/lang/zh-HK/admin/licenses/general.php b/resources/lang/zh-HK/admin/licenses/general.php
index 8c873d56a0..0187d076a3 100644
--- a/resources/lang/zh-HK/admin/licenses/general.php
+++ b/resources/lang/zh-HK/admin/licenses/general.php
@@ -1,22 +1,47 @@
 <?php
 
 return array(
-    'about_licenses_title'            => '關於授權',
-    'about_licenses'                  => '授權是用來追踨可供借出的軟體數量。',
-    'checkin'  					=> '繳回授權數量',
-    'checkout_history'  		=> '借出歷史記錄',
-    'checkout'  				=> '借出授權數量',
-    'edit'  					=> '編輯授權',
-    'filetype_info'				=> '允許檔案類型：png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar。',
-    'clone'  					=> '複製授權',
-    'history_for'  				=> '歷史記錄',
-    'in_out'  					=> '進/出',
-    'info'  					=> '授權訊息',
-    'license_seats'  			=> '授權數量',
-    'seat'  					=> '數量',
-    'seats'  					=> '數量',
-    'software_licenses'  		=> '軟體授權',
-    'user'  					=> '使用者
-',
-    'view'  					=> '檢視授權',
+    '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',
+    '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 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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/zh-HK/admin/manufacturers/message.php b/resources/lang/zh-HK/admin/manufacturers/message.php
index 4d5de1310d..d6656683ae 100644
--- a/resources/lang/zh-HK/admin/manufacturers/message.php
+++ b/resources/lang/zh-HK/admin/manufacturers/message.php
@@ -2,28 +2,29 @@
 
 return array(
 
-    'does_not_exist' => '製造商不存在',
-    'assoc_users'	 => '至少還有一個資產與此製造商關聯，目前不能被删除，請確認後重試。 ',
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
+    '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'   => '新增製造商失敗，請重試。',
-        'success' => '新增製造商成功。'
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
     ),
 
     'update' => array(
-        'error'   => '更新製造商失敗，請重試。',
-        'success' => '更新製造商成功。'
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
     ),
 
     'restore' => array(
-        'error'   => '製造商恢復失敗，請重試。',
-        'success' => '製造商恢復成功。'
+        'error'   => 'Manufacturer was not restored, please try again',
+        'success' => 'Manufacturer restored successfully.'
     ),
 
     'delete' => array(
-        'confirm'   => '您確定要刪除此製造商嗎？',
-        'error'   => '刪除製造商失敗，請重試。',
-        'success' => '刪除製造商成功。'
+        '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/zh-HK/admin/manufacturers/table.php b/resources/lang/zh-HK/admin/manufacturers/table.php
index 12cdd792e8..38cab6fd91 100644
--- a/resources/lang/zh-HK/admin/manufacturers/table.php
+++ b/resources/lang/zh-HK/admin/manufacturers/table.php
@@ -1,16 +1,17 @@
 <?php
 
 return array(
-    'about_manufacturers_title'    => '關於製造商',
-    'about_manufacturers_text'  => '廠商是提供您資產的公司，您可以在這裡儲存重要的支援資訊，並顯示在資產的詳細頁面。',
-    'asset_manufacturers'	=> '資產製造商',
-    'create'				=> '新增製造商',
+    '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'      			=> '名稱',
-    'support_email'   		=> '支援 Email',
-    'support_phone'   		=> '支援電話',
-    'support_url'   		=> '支援網址',
-    'update'				=> '更新製造商',
-    'url'   				=> '網址',
+    'name'      			=> 'Name',
+    'support_email'   		=> 'Support Email',
+    'support_phone'   		=> 'Support Phone',
+    'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'update'				=> 'Update Manufacturer',
+    'url'   				=> 'URL',
 
 );
diff --git a/resources/lang/zh-HK/admin/models/general.php b/resources/lang/zh-HK/admin/models/general.php
index d2d77e0e8c..7e4a77adbc 100644
--- a/resources/lang/zh-HK/admin/models/general.php
+++ b/resources/lang/zh-HK/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    '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',
diff --git a/resources/lang/zh-HK/admin/models/message.php b/resources/lang/zh-HK/admin/models/message.php
index c64026575a..5f47336526 100644
--- a/resources/lang/zh-HK/admin/models/message.php
+++ b/resources/lang/zh-HK/admin/models/message.php
@@ -2,41 +2,45 @@
 
 return array(
 
-    'does_not_exist' => '樣板不存在',
-    'assoc_users'	 => '至少還有一個資產與此樣板關聯，目前不能被删除，請在刪除資產後重試。 ',
+    'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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. ',
 
 
     'create' => array(
-        'error'   => '新增樣板失敗，請重試。',
-        'success' => '新增樣板成功。',
-        'duplicate_set' => '資產名稱、製造商、型號都相同的其它資產樣板已存在。',
+        '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'   => '更新樣板失敗，請重試。',
-        'success' => '更新樣板成功。'
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
-        'confirm'   => '您確定要刪除此樣板嗎？',
-        'error'   => '刪除樣板失敗，請重試。',
-        'success' => '刪除樣板成功。'
+        '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'   		=> '恢復樣板失敗，請重試。',
-        'success' 		=> '恢復樣板成功。'
+        'error'   		=> 'Model was not restored, please try again',
+        'success' 		=> 'Model restored successfully.'
     ),
 
     'bulkedit' => array(
-        'error'   		=> '沒有欄位被更改，因此沒有更新任何內容。',
-        'success' 		=> '樣板已更新。'
+        '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 properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
-        'error'   		    => '沒有型號被選擇，因此沒有更新任何內容。',
-        'success' 		    => ':success_count 個型號已刪除!',
-        'success_partial' 	=> ':success_count 個型號被刪除, 但是 :fail_count 無法被刪除, 因為它們仍有與之關聯的資產。'
+        '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/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php
index d41deaf935..92faf85c5f 100644
--- a/resources/lang/zh-HK/admin/settings/general.php
+++ b/resources/lang/zh-HK/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_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',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/zh-HK/admin/settings/message.php b/resources/lang/zh-HK/admin/settings/message.php
index 174a15fbd9..48b42d1202 100644
--- a/resources/lang/zh-HK/admin/settings/message.php
+++ b/resources/lang/zh-HK/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/zh-HK/admin/users/general.php b/resources/lang/zh-HK/admin/users/general.php
index daa568e8bf..b097ccec69 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.',
+    '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',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/zh-HK/admin/users/message.php b/resources/lang/zh-HK/admin/users/message.php
index 247a1b321e..adf26b3229 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 [:id] does not exist.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
diff --git a/resources/lang/zh-HK/auth/general.php b/resources/lang/zh-HK/auth/general.php
index 78b6780927..4486f090b2 100644
--- a/resources/lang/zh-HK/auth/general.php
+++ b/resources/lang/zh-HK/auth/general.php
@@ -12,5 +12,8 @@ return [
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index f0b6a3f2cf..01779a8854 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'Audit',
     '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',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    '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',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Import',
     '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>.',
@@ -148,6 +159,8 @@ return [
     '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',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/zh-HK/help.php b/resources/lang/zh-HK/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/zh-HK/help.php
+++ b/resources/lang/zh-HK/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/zh-HK/localizations.php b/resources/lang/zh-HK/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/zh-HK/localizations.php
+++ b/resources/lang/zh-HK/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/zh-HK/mail.php b/resources/lang/zh-HK/mail.php
index b0ae7de76b..7dd8d6181c 100644
--- a/resources/lang/zh-HK/mail.php
+++ b/resources/lang/zh-HK/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'login' => 'Login:',
     'Low_Inventory_Report' => 'Low Inventory Report',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
@@ -74,9 +75,11 @@ return [
     'your_credentials' => 'Your Snipe-IT credentials',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/zh-HK/validation.php b/resources/lang/zh-HK/validation.php
index 04f8d65303..df514da6f9 100644
--- a/resources/lang/zh-HK/validation.php
+++ b/resources/lang/zh-HK/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/zh-TW/admin/accessories/general.php b/resources/lang/zh-TW/admin/accessories/general.php
index 1c440714db..2420dbae0f 100644
--- a/resources/lang/zh-TW/admin/accessories/general.php
+++ b/resources/lang/zh-TW/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     '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'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/zh-TW/admin/accessories/message.php b/resources/lang/zh-TW/admin/accessories/message.php
index 9f62a18600..9b99ec9eb1 100644
--- a/resources/lang/zh-TW/admin/accessories/message.php
+++ b/resources/lang/zh-TW/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> '配件借出失敗。請再試一次。',
         'success' 		=> '借出配件成功。',
+        'unavailable'   => '配件不足無法借出, 檢查可用數量.',
         'user_does_not_exist' => '使用者不正確。請再試一次。'
     ),
 
diff --git a/resources/lang/zh-TW/admin/asset_maintenances/form.php b/resources/lang/zh-TW/admin/asset_maintenances/form.php
index 04a707e15e..28e2909e23 100644
--- a/resources/lang/zh-TW/admin/asset_maintenances/form.php
+++ b/resources/lang/zh-TW/admin/asset_maintenances/form.php
@@ -3,12 +3,12 @@
     return [
         'asset_maintenance_type' => '資產維護類型',
         'title'                  => '標題',
-        'start_date'             => '開始日期',
+        'start_date'             => '起始日期',
         'completion_date'        => '完成日期',
         'cost'                   => '維護費用',
         'is_warranty'            => '保固升級/延期',
-        'asset_maintenance_time' => '資產維護所需天數',
+        'asset_maintenance_time' => '資產維護時間 (天)',
         'notes'                  => '備註',
         'update'                 => '更新資產維護',
-        'create'                 => '新建資產維護'
+        'create'                 => '建立資產維護'
     ];
diff --git a/resources/lang/zh-TW/admin/categories/message.php b/resources/lang/zh-TW/admin/categories/message.php
index 48ad3197f0..e92081855b 100644
--- a/resources/lang/zh-TW/admin/categories/message.php
+++ b/resources/lang/zh-TW/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => '更新類別失敗，請重試。',
-        'success' => '更新類別成功。'
+        'success' => '更新類別成功。',
+        'cannot_change_category_type'   => '類別類型一旦建立就不可更改',
     ),
 
     'delete' => array(
diff --git a/resources/lang/zh-TW/admin/components/general.php b/resources/lang/zh-TW/admin/components/general.php
index e537e9c373..22d15ba9ed 100644
--- a/resources/lang/zh-TW/admin/components/general.php
+++ b/resources/lang/zh-TW/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => '剩餘',
     'total' 			                 => '總計',
     'update'                            => '更新組件',
+    'checkin_limit'            => '借出數量必須等於或小於 :assigned_qty'
 );
diff --git a/resources/lang/zh-TW/admin/components/message.php b/resources/lang/zh-TW/admin/components/message.php
index 1e6ff3ebac..0af8ceca3b 100644
--- a/resources/lang/zh-TW/admin/components/message.php
+++ b/resources/lang/zh-TW/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '組件借出失敗。請再試一次。',
         'success' 		=> '借出組件成功。',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        'user_does_not_exist' => '使用者不正確。請再試一次。',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zh-TW/admin/consumables/message.php b/resources/lang/zh-TW/admin/consumables/message.php
index 82b9d94005..e9f4482756 100644
--- a/resources/lang/zh-TW/admin/consumables/message.php
+++ b/resources/lang/zh-TW/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> '耗材領取失敗，請重試。',
         'success' 		=> '耗材領取成功。',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        'user_does_not_exist' => '使用者不正確。請再試一次。',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zh-TW/admin/custom_fields/general.php b/resources/lang/zh-TW/admin/custom_fields/general.php
index b7a7d7f7f4..0e6d3a6f99 100644
--- a/resources/lang/zh-TW/admin/custom_fields/general.php
+++ b/resources/lang/zh-TW/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => '引用型號',
     'order'   		            => '排序',
     'create_fieldset'         => '新增欄位集',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => '建立新的欄位集',
     'create_field'            => '新增欄位',
     'create_field_title' => '建立新的客製化欄位',
@@ -43,7 +46,9 @@ return [
     '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' => '此值在所有資產之中必須是唯一的',
-    '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',
 ];
diff --git a/resources/lang/zh-TW/admin/groups/message.php b/resources/lang/zh-TW/admin/groups/message.php
index 40ceb5e787..e91500bda4 100644
--- a/resources/lang/zh-TW/admin/groups/message.php
+++ b/resources/lang/zh-TW/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => '群組已存在',
-    'group_not_found'     => '群組 [:id] 不存在',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => '名稱欄位必填',
 
     'success' => array(
diff --git a/resources/lang/zh-TW/admin/hardware/form.php b/resources/lang/zh-TW/admin/hardware/form.php
index 3d7c399006..c5c36c3f91 100644
--- a/resources/lang/zh-TW/admin/hardware/form.php
+++ b/resources/lang/zh-TW/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> '確認批次刪除資產',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   '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_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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => '只更新預設位置',
     '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_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php
index fd49c25ac4..9a0b3d571c 100644
--- a/resources/lang/zh-TW/admin/hardware/general.php
+++ b/resources/lang/zh-TW/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> '此資產已被刪除.',
     'edit'  					=> '編輯資產',
     'model_deleted'  			=> '此資產模板已被刪除. 你必須先還原資產模板才可還原資產.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => '可申領',
     'requested'				    => '已申領',
     'not_requestable'           => '不可申請',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> '還原資產',
     'pending'  					=> '待處理',
     'undeployable'  			=> '不可部署',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => '錯誤訊息:',
     'success_messages' => '成功訊息:',
     'alert_details' => '請看下面的詳細資料.',
-    'custom_export' => '自定義匯出'
+    'custom_export' => '自定義匯出',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php
index c003b6a97d..01293d050e 100644
--- a/resources/lang/zh-TW/admin/hardware/message.php
+++ b/resources/lang/zh-TW/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> '恢復資產失敗，請重試。',
         'success' 		=> '恢復資產成功。',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => '您的檔案已被匯入。',
         'file_delete_success'   => '您的檔案已成功刪除。',
         'file_delete_error'      => '您的檔案無法被刪除。',
+        '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',
     ],
 
 
diff --git a/resources/lang/zh-TW/admin/hardware/table.php b/resources/lang/zh-TW/admin/hardware/table.php
index cd3ccb13fc..cda77407ce 100644
--- a/resources/lang/zh-TW/admin/hardware/table.php
+++ b/resources/lang/zh-TW/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> '進/出',
     'checkout_date' => '借出日期',
     'checkoutto' 	=> '已借出',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> '價差',
     'dl_csv' 		=> '下載CSV檔',
diff --git a/resources/lang/zh-TW/admin/licenses/general.php b/resources/lang/zh-TW/admin/licenses/general.php
index 8c873d56a0..39e81b0a68 100644
--- a/resources/lang/zh-TW/admin/licenses/general.php
+++ b/resources/lang/zh-TW/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => '關於授權',
-    'about_licenses'                  => '授權是用來追踨可供借出的軟體數量。',
+    'about_licenses_title'      => '關於授權',
+    'about_licenses'            => '授權是用來追踨可供借出的軟體數量。',
     'checkin'  					=> '繳回授權數量',
     'checkout_history'  		=> '借出歷史記錄',
     'checkout'  				=> '借出授權數量',
@@ -19,4 +19,30 @@ return array(
     'user'  					=> '使用者
 ',
     'view'  					=> '檢視授權',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => '借出所有座位',
+                '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'           => '執照成功借出! | :count 份執照成功被借出!',
+                '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'    => '無需任何操作. 所有使用者皆已分配此執照.',
+                'log_msg'           => '透過圖形化介面的執照大量借出功能借出執照.',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/zh-TW/admin/locations/message.php b/resources/lang/zh-TW/admin/locations/message.php
index b6d10bc1b2..db8a9fcf51 100644
--- a/resources/lang/zh-TW/admin/locations/message.php
+++ b/resources/lang/zh-TW/admin/locations/message.php
@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => '至少還有一位使用者與此位置關聯，目前不能被删除，請檢查後重試。 ',
     'assoc_assets'	 => '至少還有一個資產與此位置關聯，目前不能被删除，請檢查後重試。 ',
     'assoc_child_loc'	 => '至少還有一個子項目與此位置關聯，目前不能被删除，請檢查後重試。 ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => '已分配資產',
+    'current_location' => '目前位置',
 
 
     'create' => array(
diff --git a/resources/lang/zh-TW/admin/manufacturers/message.php b/resources/lang/zh-TW/admin/manufacturers/message.php
index 4d5de1310d..5b950e0999 100644
--- a/resources/lang/zh-TW/admin/manufacturers/message.php
+++ b/resources/lang/zh-TW/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => '製造商不存在',
     'assoc_users'	 => '至少還有一個資產與此製造商關聯，目前不能被删除，請確認後重試。 ',
 
diff --git a/resources/lang/zh-TW/admin/manufacturers/table.php b/resources/lang/zh-TW/admin/manufacturers/table.php
index 12cdd792e8..9a42964bc6 100644
--- a/resources/lang/zh-TW/admin/manufacturers/table.php
+++ b/resources/lang/zh-TW/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> '支援 Email',
     'support_phone'   		=> '支援電話',
     'support_url'   		=> '支援網址',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> '更新製造商',
     'url'   				=> '網址',
 
diff --git a/resources/lang/zh-TW/admin/models/general.php b/resources/lang/zh-TW/admin/models/general.php
index c48babe704..bb82d043e1 100644
--- a/resources/lang/zh-TW/admin/models/general.php
+++ b/resources/lang/zh-TW/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => '此型號已被刪除.',
     'bulk_delete'               => '批次刪除資產型號',
     'bulk_delete_help'               => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。',
-    'bulk_delete_warn'          => '您即將刪除資產型號 :model_count。',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => '恢復型號',
     'requestable'               => '使用者可申請此型號',
 	'show_mac_address'			      => '在型號資產中顯示MAC地址',
diff --git a/resources/lang/zh-TW/admin/models/message.php b/resources/lang/zh-TW/admin/models/message.php
index c64026575a..90590bf041 100644
--- a/resources/lang/zh-TW/admin/models/message.php
+++ b/resources/lang/zh-TW/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => '樣板不存在',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => '至少還有一個資產與此樣板關聯，目前不能被删除，請在刪除資產後重試。 ',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => '更新樣板失敗，請重試。',
-        'success' => '更新樣板成功。'
+        'success' => '更新樣板成功。',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> '沒有欄位被更改，因此沒有更新任何內容。',
-        'success' 		=> '樣板已更新。'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => '沒有型號被選擇，因此沒有更新任何內容。',
-        'success' 		    => ':success_count 個型號已刪除!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count 個型號被刪除, 但是 :fail_count 無法被刪除, 因為它們仍有與之關聯的資產。'
     ),
 
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 8c4de04307..ad8e514a7b 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => '如果您想將發送給用戶的繳回/借出電子郵件的副本發送到其他電子郵件帳戶，請在此處輸入。否則，請將此字段留空。',
     'is_ad'				        => '這是AD域伺服器',
     'alerts'                	=> '警告',
-    'alert_title'               => '更新警告設定',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> '發送警報',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> '警報已啟用',
@@ -32,7 +32,7 @@ return [
     'backups_restoring'         => '從備份還原',
     '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'			=> '條碼設定',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     '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_client_tls_key'       => 'LDAP 客戶端 TLS 金鑰',
+    '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'      => '從上方指定的 DN 中輸入有效的 LDAP 使用者名和密碼, 以測試是否正確配置了 LDAP 登錄。您必須先保存更新的 LDAP 設置。',
     'ldap_login_sync_help'      => '這僅測試 LDAP 可以正確同步。如果 LDAP 身份驗證查詢不正確, 使用者可能仍無法登錄。您必須先保存更新的 LDAP 設置。',
     'ldap_manager'              => 'LDAP 管理者',
@@ -198,16 +201,21 @@ return [
     'show_images_in_email'     => '在電子郵件中顯示圖片',
     'show_images_in_email_help'   => '如果您的Snipe-IT安裝位於VPN或封閉網絡後面，並且外部網絡的用戶無法將通過此安裝提供的圖像加載到其電子郵件中，請取消選中此框。',
     'site_name'                 => '站台名稱',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Bot 名稱',
-    'slack_channel'             => 'Slack 頻道',
-    'slack_endpoint'            => 'Slack 節點',
-    'slack_integration'         => 'Slack 設定',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => '一旦你保存了你的Slack信息，就會出現一個測試按鈕。',
-    'slack_test_help'           => '測試您的Slack集成是否配置正確。你必須首先保存你的更新的設置。',
+    'general_webhook'           => 'General Webhook',
+    '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 版本',
     'support_footer'            => '支援頁尾連結',
     'support_footer_help'       => '指定誰可以看到指向Snipe-IT支持信息和用戶手冊的鏈接',
@@ -302,7 +310,7 @@ return [
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => '語言, 日期顯示',
     'notifications' => '通知',
-    'notifications_help' => '電子郵件通知, 稽核設定',
+    'notifications_help' => '電子郵件通知與稽核設定',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => '標籤',
     'labels_title' => '更新標籤設定',
@@ -323,4 +331,9 @@ return [
     'setup_migration_create_user' => '下一步: 建立使用者',
     'ldap_settings_link' => 'LAD 設定頁面',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/zh-TW/admin/settings/message.php b/resources/lang/zh-TW/admin/settings/message.php
index 4bbd12408b..9fb95fc8d8 100644
--- a/resources/lang/zh-TW/admin/settings/message.php
+++ b/resources/lang/zh-TW/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'LDAP 授權測試中...',
         'authentication_success' => '用戶成功透過 LDAP 驗證'
     ],
-    'slack' => [
-        'sending' => 'Slack 測試訊息送出中...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 伺服器錯誤',
-        'error' => '出了點問題。',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/zh-TW/admin/users/general.php b/resources/lang/zh-TW/admin/users/general.php
index 59d6deb923..9b302a0cc2 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'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    '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.',
     'view_user'         => '檢視使用者： :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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 使用者',
+    '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_user_page_explanation' => '這是你用來首次登入網站的帳戶資訊',
+    'email_credentials' => '電子郵件憑證',
+    'email_credentials_text' => '將我的憑證寄送到以下電子郵件信箱',
+    'next_save_user' => '下一步: 儲存使用者',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];
diff --git a/resources/lang/zh-TW/admin/users/message.php b/resources/lang/zh-TW/admin/users/message.php
index d83620f45c..97ff54b3a4 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'            => '使用者 [:id] 不存在',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => '登入欄位是必需的',
     'user_password_required'    => '密碼欄位是必需的',
     'insufficient_permissions'  => '權限不足',
@@ -15,7 +15,7 @@ return array(
     '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'       => '密碼重置連結已傳送至 :email',
     'user_has_no_email'         => '該使用者的個人資料尚未填寫電子郵件。',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'user_has_no_assets_assigned'   => '該用戶未擁有已分配資產',
 
 
     'success' => array(
@@ -61,7 +61,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => '該用戶未設定email',
+        'success' => '已就當前資產通知此用戶'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/zh-TW/auth/general.php b/resources/lang/zh-TW/auth/general.php
index 68cacd4e20..cc8d9b35e3 100644
--- a/resources/lang/zh-TW/auth/general.php
+++ b/resources/lang/zh-TW/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => '記住我',
     'username_help_top'                 => '輸入您的<strong>使用者名稱</strong>透過電子郵件發送密碼重設連結',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 4dcbebd4a4..0ee36b3325 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> '配件',
     'activated'			    => '已啟用',
+    'accepted_date'         => '接受日期',
     'accessory'				=> '配件',
     'accessory_report'		=> '配件報告',
     'action'                => '操作',
@@ -11,7 +12,7 @@ return [
     'admin'					=> '管理員',
     'administrator'			=> '管理員',
     'add_seats'             => '新增授權',
-    'age'                   => "Age",
+    'age'                   => "年齡",
     'all_assets'			=> '所有資產',
     'all'       			=> '所有',
     'archived'              => '已封存',
@@ -22,12 +23,18 @@ return [
     'asset_tag'				=> '資產標籤',
     'asset_tags'            => '資產標籤',
     'assets_available'		=> '可用資產',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'accept_assets'         => '接受資產',
+    'accept_assets_menu'    => '授權資產',
     'audit'				    => '稽核',
     'audit_report'			=> '稽核記錄',
     'assets'				=> '資產',
+    'assets_audited'        => '已稽核資產',
+    'assets_checked_in_count'     => '已繳回資產',
+    'assets_checked_out_count'     => '已領用資產',
+    'asset_deleted_warning'     => '該資產已被刪除。在分配該資產前要先回復刪除。',
+    'assigned_date'         => '分配日期',
     'assigned_to'           => '指派給 :name',
+    'assignee'              => '分配給',
     'avatar_delete'         => '刪除頭像',
     'avatar_upload'         => '上傳頭像',
     'back'      			=> '返回',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => '批次編輯',
     'bulk_delete'           => '批次刪除',
     'bulk_actions'          => '批次操作',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => '按狀態',
     'cancel'  				=> '取消',
     'categories'			=> '類別',
@@ -83,6 +92,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.',
     'deleted'  				=> '刪除',
     'delete_seats'  		=> '刪除授權',
     'deletion_failed'       => '刪除失敗',
@@ -137,8 +147,9 @@ return [
     '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.',
+    'filetypes_size_help'   => '上傳檔案大小上限為 :size',
     'image_filetypes_help'  => '接受的檔案類型有 jpg、webp, png、gif 和 svg。允許的最大上傳大小為 :size。',
+    'unaccepted_image_type'  => '此影像無法被讀取。可接受的檔案格式為 jpg, webp, png, gif 以及 svg。此影像的 mimetype 為 :mimetype。',
     'import'         	    => '匯入',
     'importing'         	=> '匯入中',
     'importing_help'        => '您可透過 CSV 格式檔案匯入資產、授權、配件、耗材以及使用者。<br><br> CSV檔案必須以逗號分格，並依照<a href="https://snipe-it.readme.io/docs/importing" target="_new">說明文件中的CSV範例</a>保留首部及格式。',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => '資產維護',
     'item'  				=> '項目',
     'item_name'             => '項目名稱',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => '沒有足夠的權限',
     'kits'       			=> '預設組',
     'language'				=> '語言',
@@ -203,7 +216,7 @@ return [
     'quantity'		        => '數量',
     'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'quickscan_checkin_status'  	=> '繳回狀態',
     'ready_to_deploy'		=> '準備部署',
     'recent_activity'		=> '最近操作活動',
     'remaining'             => '剩餘',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => '取消申請',
     'save'  				=> '儲存',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> '選擇',
     'select_all'            => '全部選取',
     'search'				=> '搜尋',
@@ -240,8 +254,8 @@ return [
     'signature'             => '簽名',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> '主題',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => '看起來 Slack 已成功整合到 Snipe-IT 了!',
+    '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' => '演示模式︰ 此安裝禁用某些功能。',
     'site_name'				=> '網站名稱',
     'state'  				=> '省份',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => '您確定要刪除嗎？',
     'submit'				=> '送出',
     'target'                => '目標',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => '顯示時間與日期',
     'total_assets'			=> '總資產',
     'total_licenses'		=> '總計授權',
@@ -311,7 +324,7 @@ return [
     'setup_create_admin'    => '建立管理員',
     'setup_done'            => '完成!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
-    'checked_out'           => 'Checked Out',
+    'checked_out'           => '已領用',
     'checked_out_to'        => 'Checked out to',
     'fields'                => '欄位',
     'last_checkout'         => 'Last Checkout',
@@ -344,7 +357,7 @@ return [
     'new_consumable'        => '新增耗材',
     'collapse'              => '收起',
     'assigned'              => '已分配',
-    'asset_count'           => 'Asset Count',
+    'asset_count'           => '資產數量',
     'accessories_count'     => '配件數量',
     'consumables_count'     => 'Consumables Count',
     'components_count'      => 'Components Count',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => '開始日期',
     'end_date'            => '結束日期',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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'                  => '是',
+    'false'                 => '否',
+    'integration_option'    => '整合選項',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    '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, licences, 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'     => '沒有選擇使用者',
+    '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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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' => '確認',
+    'autoassign_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'      => '你確定嗎?',
+    'cannot_be_deleted'      => '此項目無法被刪除',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/zh-TW/help.php b/resources/lang/zh-TW/help.php
index 5f69eec929..8581071a57 100644
--- a/resources/lang/zh-TW/help.php
+++ b/resources/lang/zh-TW/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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/zh-TW/localizations.php b/resources/lang/zh-TW/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/zh-TW/localizations.php
+++ b/resources/lang/zh-TW/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/zh-TW/mail.php b/resources/lang/zh-TW/mail.php
index 2193116d0e..63df79078f 100644
--- a/resources/lang/zh-TW/mail.php
+++ b/resources/lang/zh-TW/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => '使用以下憑證登入新安裝的 Snipe-IT：',
     'login' => '登入',
     'Low_Inventory_Report' => '低庫存報告',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => '最小數量',
     'name' => '名字',
     'new_item_checked' => '一項新物品已分配至您的名下，詳細資訊如下。',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => '您的 Snipe-IT 憑證',
     'Accessory_Checkin_Notification' => '配件繳回',
     'Asset_Checkin_Notification' => '資產繳回',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => '授權繳回',
     'Expected_Checkin_Report' => '預計資產繳回報告',
     'Expected_Checkin_Notification' => '提醒: :name 接近繳回最後期限',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => '查看您的資產',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php
index fd1e65d529..4b5d847d96 100644
--- a/resources/lang/zh-TW/validation.php
+++ b/resources/lang/zh-TW/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => ':attribute 最少要有 :min 個項目',
     ],
     'starts_with'          => ':attribute 必須以下列之一做為開頭: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => '選擇的 :attribute 無效',
     'numeric'              => ':attribute 必須是數字',
     'present'              => '：屬性字段必須存在。',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => '當前密碼不正確！',
         'dumbpwd'          => '該密碼太常見。',
         'statuslabel_type' => '您必須選擇一個有效的狀態標籤',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/lang/zu/admin/accessories/general.php b/resources/lang/zu/admin/accessories/general.php
index a8ca617304..105f9134af 100644
--- a/resources/lang/zu/admin/accessories/general.php
+++ b/resources/lang/zu/admin/accessories/general.php
@@ -16,5 +16,7 @@ return array(
     'update'  							=> 'Buyekeza Ukufinyelela',
     'use_default_eula'					=> 'Sebenzisa okungu-<a href="#" data-toggle="modal" data-target="#eulaModal">kuzenzakalela okuzenzakalelayo ku-EULA</a> kunalokho.',
     'use_default_eula_disabled'			=> '<del>Sebenzisa i-EULA eyinhloko yokuzenzakalela esikhundleni.</del> Ayikho i-EULA eyimilayezo eyisisekelo esethiwe. Sicela ungeze eyodwa kuzilungiselelo.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/zu/admin/accessories/message.php b/resources/lang/zu/admin/accessories/message.php
index 701e5fdeef..8b4c4560ff 100644
--- a/resources/lang/zu/admin/accessories/message.php
+++ b/resources/lang/zu/admin/accessories/message.php
@@ -24,6 +24,7 @@ return array(
      'checkout' => 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.'
     ),
 
diff --git a/resources/lang/zu/admin/asset_maintenances/form.php b/resources/lang/zu/admin/asset_maintenances/form.php
index 98f3388294..52360528e9 100644
--- a/resources/lang/zu/admin/asset_maintenances/form.php
+++ b/resources/lang/zu/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Uhlobo lokulondoloza',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Isihloko',
-        'start_date'             => 'Iqalile',
-        'completion_date'        => 'Kuqedile',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Izindleko',
         'is_warranty'            => 'Ukuthuthukiswa kwewaranti',
-        'asset_maintenance_time' => 'Izinsuku',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Amanothi',
-        'update'                 => 'Ukubuyekeza',
-        'create'                 => 'Dala'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];
diff --git a/resources/lang/zu/admin/categories/message.php b/resources/lang/zu/admin/categories/message.php
index d65a2dad80..58e0bdf658 100644
--- a/resources/lang/zu/admin/categories/message.php
+++ b/resources/lang/zu/admin/categories/message.php
@@ -13,7 +13,8 @@ return array(
 
     'update' => array(
         'error'   => 'Isigaba asibuyekezwanga, sicela uzame futhi',
-        'success' => 'Isigaba sibuyekezwe ngempumelelo.'
+        'success' => 'Isigaba sibuyekezwe ngempumelelo.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
     ),
 
     'delete' => array(
diff --git a/resources/lang/zu/admin/components/general.php b/resources/lang/zu/admin/components/general.php
index 55f8aa33c3..ed84ef5948 100644
--- a/resources/lang/zu/admin/components/general.php
+++ b/resources/lang/zu/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Ukuhlala',
     'total' 			                 => 'Inani',
     'update'                            => 'Buyekeza Ingxenye',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/lang/zu/admin/components/message.php b/resources/lang/zu/admin/components/message.php
index f64e4cbe88..893f4af6bf 100644
--- a/resources/lang/zu/admin/components/message.php
+++ b/resources/lang/zu/admin/components/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ingxenye ayizange ihlolwe, sicela uzame futhi',
         'success' 		=> 'Ingxenye ihloliwe ngempumelelo.',
-        'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.'
+        'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zu/admin/consumables/message.php b/resources/lang/zu/admin/consumables/message.php
index 6a7effdbeb..8e6d4846de 100644
--- a/resources/lang/zu/admin/consumables/message.php
+++ b/resources/lang/zu/admin/consumables/message.php
@@ -23,7 +23,8 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ukuthengwa akuzange kuhlolwe, sicela uzame futhi',
         'success' 		=> 'Ukuthengwa kuhloliwe ngempumelelo.',
-        'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.'
+        'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zu/admin/custom_fields/general.php b/resources/lang/zu/admin/custom_fields/general.php
index 0ff4267a44..e6be1eb023 100644
--- a/resources/lang/zu/admin/custom_fields/general.php
+++ b/resources/lang/zu/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Isetshenziswe ngamamodeli',
     'order'   		            => 'I-oda',
     'create_fieldset'         => 'Fieldset entsha',
+    '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'            => 'Insimu Engokwezifiso Entsha',
     'create_field_title' => 'Create a new custom field',
@@ -46,4 +49,6 @@ return [
     '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',
 ];
diff --git a/resources/lang/zu/admin/groups/message.php b/resources/lang/zu/admin/groups/message.php
index 68c113d4e4..7b4d665ce4 100644
--- a/resources/lang/zu/admin/groups/message.php
+++ b/resources/lang/zu/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Iqembu selivele likhona!',
-    'group_not_found'     => 'Iqembu [: id] alikho.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Inkambu yegama iyadingeka',
 
     'success' => array(
diff --git a/resources/lang/zu/admin/hardware/form.php b/resources/lang/zu/admin/hardware/form.php
index 6747cded8a..49608e93ed 100644
--- a/resources/lang/zu/admin/hardware/form.php
+++ b/resources/lang/zu/admin/hardware/form.php
@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Qinisekisa u-Bulk Susa amafa',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Buyekeza amafa wokususwa okuningi ngezansi. Uma usususiwe, la mafa angabuyiselwa, kodwa ngeke ahlanganiswe nanoma yimuphi abasebenzisi okwamanje abelwe wona.',
+  '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'	=> 'Uzosusa: impahla ye-asethi_diza.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Ukuvuselela amafa we-Bulk',
     'bulk_update_help'	=> 'Leli fomu likuvumela ukuthi ubuyekeze amafa amaningi ngesikhathi esisodwa. Gcwalisa kuphela amasimu okudingayo ukuguqula. Noma yiziphi izinkambu ezishiywe zingenakushintshwa.',
     '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.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];
diff --git a/resources/lang/zu/admin/hardware/general.php b/resources/lang/zu/admin/hardware/general.php
index 7e1e1223e6..fd3ea6db0d 100644
--- a/resources/lang/zu/admin/hardware/general.php
+++ b/resources/lang/zu/admin/hardware/general.php
@@ -14,6 +14,8 @@ return [
     'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Hlela Impahla',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
     'requestable'               => 'Iyadingeka',
     'requested'				    => 'Kuceliwe',
     'not_requestable'           => 'Not Requestable',
@@ -21,6 +23,7 @@ return [
     'restore'  					=> 'Buyisela imali',
     'pending'  					=> 'Kulindile',
     'undeployable'  			=> 'Awuvumelekile',
+    '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' => '
@@ -40,5 +43,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];
diff --git a/resources/lang/zu/admin/hardware/message.php b/resources/lang/zu/admin/hardware/message.php
index 9a60bd0bf3..475a57f655 100644
--- a/resources/lang/zu/admin/hardware/message.php
+++ b/resources/lang/zu/admin/hardware/message.php
@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Ifa alizange libuyiselwe, sicela uzame futhi',
         'success' 		=> 'Ifa libuyiselwe ngempumelelo.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -48,6 +50,8 @@ return [
         'success'               => 'Ifayela lakho lifakiwe',
         'file_delete_success'   => 'Ifayela lakho lisusiwe ngempumelelo',
         'file_delete_error'      => 'Ifayela alikwazanga ukususwa',
+        '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',
     ],
 
 
diff --git a/resources/lang/zu/admin/hardware/table.php b/resources/lang/zu/admin/hardware/table.php
index abf988d9cd..e8ea2d1fbf 100644
--- a/resources/lang/zu/admin/hardware/table.php
+++ b/resources/lang/zu/admin/hardware/table.php
@@ -8,6 +8,7 @@ return [
     'change' 		=> 'In / Out',
     'checkout_date' => 'Usuku lokuhlola',
     'checkoutto' 	=> 'Ikhishiwe',
+    'components_cost' => 'Total Components Cost',
     'current_value' => 'Current Value',
     'diff' 			=> 'Ukuhluka',
     'dl_csv' 		=> 'Landa i-CSV',
diff --git a/resources/lang/zu/admin/licenses/general.php b/resources/lang/zu/admin/licenses/general.php
index 7de97daf4c..49ece72277 100644
--- a/resources/lang/zu/admin/licenses/general.php
+++ b/resources/lang/zu/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'Mayelana namalayisense',
-    'about_licenses'                  => 'Amalayisensi asetshenziselwa ukulandelela isofthiwe. Unenombolo ecacisiwe yezihlalo ezingahlolwa kubantu ngabanye',
+    'about_licenses_title'      => 'Mayelana namalayisense',
+    'about_licenses'            => 'Amalayisensi asetshenziselwa ukulandelela isofthiwe. Unenombolo ecacisiwe yezihlalo ezingahlolwa kubantu ngabanye',
     'checkin'  					=> 'Isikhundla selayisensi ye-Checkin',
     'checkout_history'  		=> 'Umlando Wokuhlola',
     'checkout'  				=> 'I-Checkout License Isihlalo',
@@ -18,4 +18,30 @@ return array(
     'software_licenses'  		=> 'Ilayisense Yezinhlelo',
     'user'  					=> 'Umsebenzisi',
     'view'  					=> 'Buka ilayisense',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout 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',
+
+
+            ],
+    ],
 );
diff --git a/resources/lang/zu/admin/manufacturers/message.php b/resources/lang/zu/admin/manufacturers/message.php
index 8a84d0ace0..ea41974df9 100644
--- a/resources/lang/zu/admin/manufacturers/message.php
+++ b/resources/lang/zu/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Umkhiqizi akekho.',
     'assoc_users'	 => 'Lo menzi okwamanje uhlotshaniswa okungenani oyisibonelo esisodwa futhi angeke asuswe. Sicela ubuyekeze amamodeli akho ukuba angasaphinde abhekisele kulo mkhiqizi futhi uzame futhi.',
 
diff --git a/resources/lang/zu/admin/manufacturers/table.php b/resources/lang/zu/admin/manufacturers/table.php
index 181e478849..b91a7f22be 100644
--- a/resources/lang/zu/admin/manufacturers/table.php
+++ b/resources/lang/zu/admin/manufacturers/table.php
@@ -10,6 +10,7 @@ return array(
     'support_email'   		=> 'Support Imeyili',
     'support_phone'   		=> 'Ifoni yokusekela',
     'support_url'   		=> 'I-URL yokusekela',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Buyekeza umkhiqizi',
     'url'   				=> 'I-URL',
 
diff --git a/resources/lang/zu/admin/models/general.php b/resources/lang/zu/admin/models/general.php
index c58ed3b775..0045a65eaf 100644
--- a/resources/lang/zu/admin/models/general.php
+++ b/resources/lang/zu/admin/models/general.php
@@ -6,7 +6,7 @@ return array(
     '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 :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Buyisela Isibonelo',
     'requestable'               => 'Abasebenzisi bangacela lesi model',
 	'show_mac_address'			      => 'Khombisa inkambu yekheli le-MAC kumpahla kule model',
diff --git a/resources/lang/zu/admin/models/message.php b/resources/lang/zu/admin/models/message.php
index 199d47d682..054dd4cbef 100644
--- a/resources/lang/zu/admin/models/message.php
+++ b/resources/lang/zu/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
     'does_not_exist' => 'Isibonelo asikho.',
+    'no_association' => 'NO MODEL ASSOCIATED.',
+    '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.',
 
 
@@ -14,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Isibonelo asibuyekezwanga, sicela uzame futhi',
-        'success' => 'Isibonelo sibuyekezwe ngempumelelo.'
+        'success' => 'Isibonelo sibuyekezwe ngempumelelo.',
     ),
 
     'delete' => array(
@@ -30,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Azikho amasimu ashintshiwe, ngakho akukho lutho olubuyekeziwe.',
-        'success' 		=> 'Amamodeli abuyekeziwe.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies 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' 		    => ':success_count model(s) 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/zu/admin/settings/general.php b/resources/lang/zu/admin/settings/general.php
index 00c1e89f95..202ff96867 100644
--- a/resources/lang/zu/admin/settings/general.php
+++ b/resources/lang/zu/admin/settings/general.php
@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Lena iseva ye-Active Directory',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    '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',
     'alerts_enabled'			=> 'Izaziso zivuliwe',
@@ -32,7 +32,7 @@ return [
     '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_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',
@@ -77,6 +77,7 @@ return [
     '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',
@@ -85,6 +86,8 @@ return [
     'ldap_settings'             => 'Izilungiselelo ze-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_client_tls_key'       => 'LDAP Client-Side TLS key',
+    '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',
@@ -197,16 +200,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Igama lesayithi',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Izilungiselelo ze-Slack',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'general_webhook'           => 'General Webhook',
+    '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'  			=> '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',
@@ -301,7 +309,7 @@ return [
     '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',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
@@ -322,4 +330,9 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    '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. ',
+
 ];
diff --git a/resources/lang/zu/admin/settings/message.php b/resources/lang/zu/admin/settings/message.php
index 0d32e2fa5c..eb2c7f10f2 100644
--- a/resources/lang/zu/admin/settings/message.php
+++ b/resources/lang/zu/admin/settings/message.php
@@ -33,11 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
-        'sending' => 'Sending Slack test message...',
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/lang/zu/admin/users/general.php b/resources/lang/zu/admin/users/general.php
index cf1486a396..fab80c228c 100644
--- a/resources/lang/zu/admin/users/general.php
+++ b/resources/lang/zu/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.',
+    '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',
     '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'         => 'Buka umsebenzisi: igama',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to 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',
@@ -41,4 +42,13 @@ 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_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/zu/admin/users/message.php b/resources/lang/zu/admin/users/message.php
index ddcd9d661e..2be5abbc1f 100644
--- a/resources/lang/zu/admin/users/message.php
+++ b/resources/lang/zu/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 [: id] akekho.',
+    'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Insimu yokungena ngemvume iyadingeka',
     'user_password_required'    => 'Iphasiwedi iyadingeka.',
     'insufficient_permissions'  => 'Izimvume ezinganele.',
diff --git a/resources/lang/zu/auth/general.php b/resources/lang/zu/auth/general.php
index 3ac3a4ad31..382c6734d9 100644
--- a/resources/lang/zu/auth/general.php
+++ b/resources/lang/zu/auth/general.php
@@ -12,5 +12,8 @@ return [
     'remember_me'                   => 'Ngikhumbule',
     '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'                  => 'Or login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+
+];
 
diff --git a/resources/lang/zu/general.php b/resources/lang/zu/general.php
index 8e52400f4e..4110d53a80 100644
--- a/resources/lang/zu/general.php
+++ b/resources/lang/zu/general.php
@@ -3,6 +3,7 @@
 return [
     'accessories'			=> 'Izesekeli',
     'activated'			    => 'Kuvunyelwe',
+    'accepted_date'         => 'Date Accepted',
     'accessory'				=> 'Ukufinyelela',
     'accessory_report'		=> 'Umbiko wokufinyelela',
     'action'                => 'Isenzo',
@@ -27,7 +28,13 @@ return [
     'audit'				    => 'I-Audit',
     'audit_report'			=> 'I-Audit Log',
     'assets'				=> 'Amafa',
+    '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'         => 'Susa i-Avatar',
     'avatar_upload'         => 'Layisha i-Avatar',
     'back'      			=> 'Emuva',
@@ -38,7 +45,9 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Khansela',
     'categories'			=> 'Izigaba',
@@ -83,6 +92,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.',
     'deleted'  				=> 'Isusiwe',
     'delete_seats'  		=> 'Izihlalo ezifakiwe',
     'deletion_failed'       => 'Deletion failed',
@@ -139,6 +149,7 @@ return [
     '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, and svg. 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.',
     'import'         	    => 'Ngenisa',
     '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>.',
@@ -148,6 +159,8 @@ return [
     'asset_maintenances'       => 'Ama-Maintenances aseMpahla',
     'item'  				=> 'Into',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Izimvume ezinganele!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Ulimi',
@@ -218,6 +231,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Isicelo sikhanseliwe',
     'save'  				=> 'Londoloza',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Khetha',
     'select_all'            => 'Select All',
     'search'				=> 'Sesha',
@@ -240,8 +254,8 @@ return [
     'signature'             => 'Isiginesha',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    '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' => 'I-DEMO MODE: Ezinye izici zikhutshaziwe ngalokhu kufakwa futhi idatha kule nqubo izosetha kabusha nsuku zonke.',
     'site_name'				=> 'Igama lesayithi',
     'state'  				=> 'Isimo',
@@ -253,7 +267,6 @@ return [
     'sure_to_delete'    => 'Uqinisekile ukuthi ufisa ukususa',
     'submit'				=> 'Thumela',
     'target'                => 'I-Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Isikhathi Nosuku Lokubonisa',
     'total_assets'			=> 'izimpahla eziphelele',
     'total_licenses'		=> 'amalayisensi ephelele',
@@ -375,7 +388,8 @@ 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 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',
@@ -385,8 +399,54 @@ return [
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit'
+    '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, licences, 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?',
+    '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',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    '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',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
-
-
-];
\ No newline at end of file
+];
diff --git a/resources/lang/zu/help.php b/resources/lang/zu/help.php
index ac0df59422..a3a2ddd762 100644
--- a/resources/lang/zu/help.php
+++ b/resources/lang/zu/help.php
@@ -15,7 +15,7 @@ return [
 
     '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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    '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.',
 
diff --git a/resources/lang/zu/localizations.php b/resources/lang/zu/localizations.php
index be2c321861..b04d4cb903 100644
--- a/resources/lang/zu/localizations.php
+++ b/resources/lang/zu/localizations.php
@@ -256,6 +256,7 @@ return [
         'UK'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
         'SD'=>'Sudan',
         'SE'=>'Sweden',
         'SG'=>'Singapore',
diff --git a/resources/lang/zu/mail.php b/resources/lang/zu/mail.php
index d2310a616d..402de90290 100644
--- a/resources/lang/zu/mail.php
+++ b/resources/lang/zu/mail.php
@@ -43,6 +43,7 @@ return [
     'login_first_admin' => 'Ngena ngemvume ekufakweni kwakho okusha kwe-Snipe-IT usebenzisa iziqinisekiso ezingezansi:',
     'login' => 'Ngena ngemvume:',
     'Low_Inventory_Report' => 'Umbiko Wokungenisa Okuphansi',
+    'inventory_report' => 'Inventory Report',
     'min_QTY' => 'I-Min QTY',
     'name' => 'Igama',
     'new_item_checked' => 'Into entsha ihloliwe ngaphansi kwegama lakho, imininingwane ingezansi.',
@@ -73,9 +74,11 @@ return [
     'your_credentials' => 'Izimpawu zakho ze-Snipe-IT',
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'View Your Assets',
+    'rights_reserved' => 'All rights reserved.',
 ];
diff --git a/resources/lang/zu/validation.php b/resources/lang/zu/validation.php
index 724b9e25d1..a10e6d7bfc 100644
--- a/resources/lang/zu/validation.php
+++ b/resources/lang/zu/validation.php
@@ -67,6 +67,8 @@ return [
         'array'   => 'I: i-attribut kumele ibe okungenani: min min.',
     ],
     'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+
     'not_in'               => 'Okukhethiwe: imfanelo ayivumelekile.',
     'numeric'              => 'I: imfanelo kufanele ibe inombolo.',
     'present'              => 'I: insimu yemfanelo kufanele ibe khona.',
@@ -103,17 +105,6 @@ return [
     ],
 
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
-
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
@@ -131,6 +122,18 @@ return [
         'hashed_pass'      => 'Iphasiwedi yakho yamanje ayilungile',
         'dumbpwd'          => 'Lelo phasiwedi livame kakhulu.',
         'statuslabel_type' => 'Kumele ukhethe uhlobo lwelebula lesimo esivumelekile',
+
+        // 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',
+
     ],
 
     /*
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 000df2652a..3463d5eff3 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -54,7 +54,7 @@
           @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to'])
 
 
-             @if ($accessory->requireAcceptance() || $accessory->getEula() || ($snipeSettings->slack_endpoint!=''))
+             @if ($accessory->requireAcceptance() || $accessory->getEula() || ($snipeSettings->webhook_endpoint!=''))
                  <div class="form-group notification-callout">
                      <div class="col-md-8 col-md-offset-3">
                          <div class="callout callout-info">
@@ -71,9 +71,9 @@
                                  <br>
                              @endif
 
-                             @if ($snipeSettings->slack_endpoint!='')
+                             @if ($snipeSettings->webhook_endpoint!='')
                                  <i class="fab fa-slack"></i>
-                                 A slack message will be sent
+                                 {{ trans('general.webhook_msg_note') }}
                              @endif
                          </div>
                      </div>
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
old mode 100755
new mode 100644
index d6233d4e5a..b3ff55d419
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -21,22 +21,8 @@
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
-
-
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{  Storage::disk('public')->url('accessories/'.e($item->image)) }}" class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('accessories_upload_path')])
 
-@include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 82d7c8201a..86b4ee7730 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -12,38 +12,6 @@
 @parent
 @stop
 
-{{-- Right header --}}
-@section('header_right')
-    @can('manage', \App\Models\Accessory::class)
-        <div class="dropdown pull-right">
-          <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">
-            @if ($accessory->assigned_to != '')
-              @can('checkin', \App\Models\Accessory::class)
-              <li role="menuitem">
-                <a href="{{ route('accessories.checkin.show', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a>
-              </li>
-              @endcan
-            @else
-              @can('checkout', \App\Models\Accessory::class)
-              <li role="menuitem">
-                <a href="{{ route('accessories.checkout.show', $accessory->id)  }}">{{ trans('admin/accessories/general.checkout') }}</a>
-              </li>
-              @endcan
-            @endif
-            @can('update', \App\Models\Accessory::class)
-            <li role="menuitem">
-              <a href="{{ route('accessories.edit', $accessory->id) }}">{{ trans('admin/accessories/general.edit') }}</a>
-            </li>
-            @endcan
-          </ul>
-        </div>
-    @endcan
-@stop
-
 {{-- Page content --}}
 @section('content')
     {{-- Page content --}}
@@ -131,7 +99,7 @@
                         </div>
                     </div>
 
-                    <!-- histor tab pane -->
+                    <!-- history tab pane -->
                      <div class="tab-pane fade" id="history">
                          <div class="table table-responsive">
                              <div class="row">
@@ -266,13 +234,13 @@
                                 </table>
                             </div>
                         </div>
-                        </div>
-                        </div> <!-- /.tab-pane -->
-                    @endcan
-
-                        </div>
                     </div>
-                </div>
+                </div> <!-- /.tab-pane -->
+                @endcan
+            </div>
+        </div>
+    </div>
+
 
 
 <!-- side address column -->
@@ -289,10 +257,10 @@
 
       @if ($accessory->company)
           <div class="row">
-              <div class="col-md-4" style="padding-bottom: 15px;">
-                  {{ trans('general.company')}}
+              <div class="col-md-3" style="padding-bottom: 15px;">
+                  <strong> {{ trans('general.company')}}</strong>
               </div>
-              <div class="col-md-8">
+              <div class="col-md-9">
                   <a href="{{ route('companies.show', $accessory->company->id) }}">{{ $accessory->company->name }} </a>
               </div>
           </div>
@@ -301,10 +269,10 @@
 
       @if ($accessory->category)
           <div class="row">
-              <div class="col-md-4" style="padding-bottom: 15px;">
-                  {{ trans('general.category')}}
+              <div class="col-md-3" style="padding-bottom: 10px;">
+                  <strong>{{ trans('general.category')}}</strong>
               </div>
-              <div class="col-md-8">
+              <div class="col-md-9">
                   <a href="{{ route('categories.show', $accessory->category->id) }}">{{ $accessory->category->name }} </a>
               </div>
           </div>
@@ -312,79 +280,75 @@
 
 
       @if ($accessory->notes)
-
-          <div class="col-md-12">
+        <div class="row">
+          <div class="col-md-3" style="padding-bottom: 10px;">
               <strong>
                   {{ trans('general.notes') }}
               </strong>
           </div>
-          <div class="col-md-12">
-              {!! nl2br(e($accessory->notes)) !!}
+          <div class="col-md-9">
+              {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
           </div>
+       </div>
 
      @endif
 
 
       <div class="row">
-          <div class="col-md-4" style="padding-bottom: 15px;">
-              Number remaining
+          <div class="col-md-3" style="padding-bottom: 10px;">
+              <strong>{{ trans('admin/accessories/general.remaining') }}</strong>
           </div>
-          <div class="col-md-8">
+          <div class="col-md-9">
               {{ $accessory->numRemaining() }}
           </div>
       </div>
 
+      <div class="row">
+          <div class="col-md-3" style="padding-bottom: 10px;">
+              <strong>{{ trans('general.checked_out') }}</strong>
+          </div>
+          <div class="col-md-9">
+              {{ $accessory->users_count }}
+          </div>
+      </div>
+</div>
 
+    <div class="col-md-3 pull-right">
+        @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>
+                </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)
+                <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>
+                </div>
+        @endcan
 
-          @can('checkout', \App\Models\Accessory::class)
-              <div class="row">
-                  <div class="col-md-12 text-center">
-                      <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>
-                  </div>
-              </div>
-          @endcan
-
-
-        <div class="tab-pane fade" id="history">
-            <div class="row">
-                <div class="col-md-12">
-                    <table
-                            class="table table-striped snipe-table"
-                            data-cookie-id-table="AccessoryHistoryTable"
-                            data-id-table="AccessoryHistoryTable"
-                            id="AccessoryHistoryTable"
-                            data-pagination="true"
-                            data-show-columns="true"
-                            data-side-pagination="server"
-                            data-show-refresh="true"
-                            data-show-export="true"
-                            data-sort-order="desc"
-                            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-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> <!-- /.col-md-12-->
-            </div> <!-- /.row-->
-        </div><!--tab history-->
-    </div><!--col-md-3-->
-</div><!--row-->
+        @can('delete', $accessory)
+            @if ($accessory->users_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">
+                    {{ 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">
+                        {{ trans('general.delete') }}
+                        </a>
+                    </span>
+                </div>
+            @endif
+        @endcan
+    </div>
+</div>
 
 
 
@@ -397,5 +361,13 @@
 
 
 @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);
+        });
+    </script>
 @include ('partials.bootstrap-table')
 @stop
diff --git a/resources/views/account/accept/accept-accessory-eula.blade.php b/resources/views/account/accept/accept-accessory-eula.blade.php
index 6f4ddd934c..6109196c6e 100644
--- a/resources/views/account/accept/accept-accessory-eula.blade.php
+++ b/resources/views/account/accept/accept-accessory-eula.blade.php
@@ -34,9 +34,9 @@
 
 
 <p>
-    Assigned on: {{$check_out_date}}<br>
-    Assigned to: {{$assigned_to}}<br>
-    Accepted on: {{$accepted_date}}
+    {{ trans('general.assigned_date') }}: {{$check_out_date}}<br>
+    {{ trans('general.assignee') }}: {{$assigned_to}}<br>
+    {{ trans('general.accepted_date') }}: {{$accepted_date}}
 </p>
 
 
diff --git a/resources/views/account/accept/accept-asset-eula.blade.php b/resources/views/account/accept/accept-asset-eula.blade.php
index 6eb21e9302..1a541f0701 100644
--- a/resources/views/account/accept/accept-asset-eula.blade.php
+++ b/resources/views/account/accept/accept-asset-eula.blade.php
@@ -37,9 +37,9 @@
 
 
 <p>
-Assigned on: {{$check_out_date}}<br>
-Assigned to: {{$assigned_to}}<br>
-Accepted on: {{$accepted_date}}
+    {{ trans('general.assigned_date') }}: {{$check_out_date}}<br>
+    {{ trans('general.assignee') }}: {{$assigned_to}}<br>
+    {{ trans('general.accepted_date') }}: {{$accepted_date}}
 </p>
 
 
diff --git a/resources/views/account/accept/accept-component-eula.blade.php b/resources/views/account/accept/accept-component-eula.blade.php
index 258894342f..f18159b6c4 100644
--- a/resources/views/account/accept/accept-component-eula.blade.php
+++ b/resources/views/account/accept/accept-component-eula.blade.php
@@ -34,9 +34,9 @@
 
 
 <p>
-    Assigned on: {{$check_out_date}}<br>
-    Assigned to: {{$assigned_to}}<br>
-    Accepted on: {{$accepted_date}}
+    {{ trans('general.assigned_date') }}: {{$check_out_date}}<br>
+    {{ trans('general.assignee') }}: {{$assigned_to}}<br>
+    {{ trans('general.accepted_date') }}: {{$accepted_date}}
 </p>
 
 
diff --git a/resources/views/account/accept/accept-consumable-eula.blade.php b/resources/views/account/accept/accept-consumable-eula.blade.php
index 3800ca01af..cb5fee4964 100644
--- a/resources/views/account/accept/accept-consumable-eula.blade.php
+++ b/resources/views/account/accept/accept-consumable-eula.blade.php
@@ -34,9 +34,9 @@
 
 
 <p>
-    Assigned on: {{$check_out_date}}<br>
-    Assigned to: {{$assigned_to}}<br>
-    Accepted on: {{$accepted_date}}
+    {{ trans('general.assigned_date') }}: {{$check_out_date}}<br>
+    {{ trans('general.assignee') }}: {{$assigned_to}}<br>
+    {{ trans('general.accepted_date') }}: {{$accepted_date}}
 </p>
 
 
diff --git a/resources/views/account/accept/accept-license-eula.blade.php b/resources/views/account/accept/accept-license-eula.blade.php
index f35be6d5cc..af82d6fd15 100644
--- a/resources/views/account/accept/accept-license-eula.blade.php
+++ b/resources/views/account/accept/accept-license-eula.blade.php
@@ -34,9 +34,9 @@
 
 
 <p>
-    Assigned on: {{$check_out_date}}<br>
-    Assigned to: {{$assigned_to}}<br>
-    Accepted on: {{$accepted_date}}
+    {{ trans('general.assigned_date') }}: {{$check_out_date}}<br>
+    {{ trans('general.assignee') }}: {{$assigned_to}}<br>
+    {{ trans('general.accepted_date') }}: {{$accepted_date}}
 </p>
 
 
diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index e5725e4897..c05bc3a892 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -43,35 +43,39 @@
             <div class="col-sm-12 col-sm-offset-1 col-md-10 col-md-offset-1">
                 <div class="panel box box-default">
                     <div class="box-body">
+                        <div class="col-md-12">
                         @if ($acceptance->checkoutable->getEula())
                             <div id="eula_div" style="padding-bottom: 20px">
                                 {!!  $acceptance->checkoutable->getEula() !!}
                             </div>
                         @endif
-
+                        </div>
+                        <div class="col-md-12">
                         <h3>{{$acceptance->checkoutable->present()->name()}}</h3>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" class="minimal" name="asset_acceptance" id="accepted" value="accepted">
+                        </div>
+                        <div class="col-md-12">
+                            <label class="form-control">
+                                <input type="radio" name="asset_acceptance" id="accepted" value="accepted">
                                 {{trans('general.i_accept')}}
                             </label>
-                        </div>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" class="minimal" name="asset_acceptance" id="declined" value="declined">
+                            <label class="form-control">
+                                <input type="radio" name="asset_acceptance" id="declined" value="declined">
                                 {{trans('general.i_decline')}}
                             </label>
+
                         </div>
 
                         @if ($snipeSettings->require_accept_signature=='1')
-                            <h3 style="padding-top: 20px">{{trans('general.sign_tos')}}</h3>
-                            <div id="signature-pad" class="m-signature-pad">
-                                <div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">
-                                    <canvas></canvas>
-                                    <input type="hidden" name="signature_output" id="signature_output">
-                                </div>
-                                <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
-                                    <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button>
+                            <div class="col-md-12">
+                                <h3 style="padding-top: 20px">{{trans('general.sign_tos')}}</h3>
+                                <div id="signature-pad" class="m-signature-pad">
+                                    <div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">
+                                        <canvas></canvas>
+                                        <input type="hidden" name="signature_output" id="signature_output">
+                                    </div>
+                                    <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
+                                        <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button>
+                                    </div>
                                 </div>
                             </div>
                         @endif
diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php
index f97c6c5644..f2a9bc56f2 100755
--- a/resources/views/account/accept/index.blade.php
+++ b/resources/views/account/accept/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-{{ trans('general.accept_assets', array('name' => $user->present()->fullName())) }}
+{{ trans('general.accept_assets', array('name' => empty($user) ? '' : $user->present()->full_name)) }}
 @parent
 @stop
 
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 0764a3033c..2c3158c88f 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -104,23 +104,26 @@
 
         <!-- Avatar -->
 
-        @if ($user->avatar)
-          <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-            <label class="col-md-3 control-label" for="avatar_delete">{{ trans('general.image_delete') }}</label>
-            <div class="col-md-9">
-              <label for="avatar_delete">
-                {{ Form::checkbox('avatar_delete', '1', old('avatar_delete'), array('class' => 'minimal')) }}
+        @if (($user->avatar) && ($user->avatar!=''))
+          <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']) }}
+                {{ trans('general.image_delete') }}
               </label>
-              <br>
-              <img src="{{ url('/') }}/uploads/avatars/{{  $user->avatar }}" alt="{{ $user->present()->fullName() }} avatar image">
-              {!! $errors->first('avatar_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
+              {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-md-9 col-md-offset-3">
+              <img src="{{ Storage::disk('public')->url(app('users_upload_path').e($user->avatar)) }}" class="img-responsive">
+              {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </div>
           </div>
         @endif
 
 
-        @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar'])
-
+        @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar', 'image_path' => app('users_upload_path')])
 
 
         <!-- Two factor opt in -->
@@ -128,9 +131,9 @@
         <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 for="two_factor_optin">{{ Form::checkbox('two_factor_optin', '1', Request::old('two_factor_optin', $user->two_factor_optin),array('class' => 'minimal')) }}
+              <label class="form-control">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin)) }}
             @else
-                <label for="avatar">{{ Form::checkbox('two_factor_optin', '1', Request::old('two_factor_optin', $user->two_factor_optin),['class' => 'disabled minimal', 'disabled' => 'disabled']) }}
+                <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>
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index 27aad2c979..adec7a100a 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -57,6 +57,7 @@
                                         <thead>
                                             <tr>
                                                 <th class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="true">{{ trans('general.image') }}</th>
+                                                <th class="col-md-2" data-field="asset_tag" data-sortable="true" >{{ trans('general.asset_tag') }}</th>                                                
                                                 <th class="col-md-2" data-field="model" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
                                                 <th class="col-md-2" data-field="model_number" data-sortable="true">{{ trans('admin/models/table.modelnumber') }}</th>
                                                 <th class="col-md-2" data-field="name" data-sortable="true">{{ trans('admin/hardware/form.name') }}</th>
@@ -78,7 +79,7 @@
                         <div class="col-md-12">
 
                             @if ($models->count() > 0)
-                            <h2>{{ trans('general.requestable_models') }}</h4>
+                            <h2>{{ trans('general.requestable_models') }}</h2>
                                 <table
                                         name="requested-assets"
                                         data-toolbar="#toolbar"
@@ -104,8 +105,8 @@
                                                 <td>
 
                                                     @if ($requestableModel->image)
-                                                        <a href="{{ url('/') }}/uploads/models/{{ $requestableModel->image }}" data-toggle="lightbox" data-type="image">
-                                                            <img src="{{ url('/') }}/uploads/models/{{ $requestableModel->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive">
+                                                        <a href="{{ config('app.url') }}/uploads/models/{{ $requestableModel->image }}" data-toggle="lightbox" data-type="image">
+                                                            <img src="{{ config('app.url') }}/uploads/models/{{ $requestableModel->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive">
                                                         </a>
                                                     @endif
 
@@ -113,7 +114,7 @@
 
                                                 <td>
                                                     @can('view', \App\Models\AssetModel::class)
-                                                        <a href="{{ url('/') }}'/models/'.{{ $requestableModel->id }}) }}">{{ $requestableModel->name }}</a>
+                                                        <a href="{{ route('models.show', ['model' => $requestableModel->id]) }}">{{ $requestableModel->name }}</a>
                                                     @else
                                                         {{ $requestableModel->name }}
                                                     @endcan
diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php
index 1645fff0a3..5c2cd1fa2d 100644
--- a/resources/views/asset_maintenances/edit.blade.php
+++ b/resources/views/asset_maintenances/edit.blade.php
@@ -87,11 +87,10 @@
         <!-- Warranty -->
         <div class="form-group">
           <div class="col-sm-offset-3 col-sm-9">
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" value="1" name="is_warranty" id="is_warranty" {{ Request::old('is_warranty', $item->is_warranty) == '1' ? ' checked="checked"' : '' }} class="minimal"> {{ trans('admin/asset_maintenances/form.is_warranty') }}
+              <label class="form-control">
+                <input type="checkbox" value="1" name="is_warranty" id="is_warranty" {{ old('is_warranty', $item->is_warranty) == '1' ? ' checked="checked"' : '' }}>
+                {{ trans('admin/asset_maintenances/form.is_warranty') }}
               </label>
-            </div>
           </div>
         </div>
 
diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/asset_maintenances/index.blade.php
index 69d3c2643b..f5deb48b61 100644
--- a/resources/views/asset_maintenances/index.blade.php
+++ b/resources/views/asset_maintenances/index.blade.php
@@ -54,11 +54,11 @@
     function maintenanceActions(value, row) {
         var actions = '<nobr>';
         if ((row) && (row.available_actions.update === true)) {
-            actions += '<a href="{{ url('/') }}/hardware/maintenances/' + row.id + '/edit" class="btn btn-sm btn-warning" data-tooltip="true" title="Update"><i class="fas fa-pencil-alt"></i></a>&nbsp;';
+            actions += '<a href="{{ config('app.url') }}/hardware/maintenances/' + row.id + '/edit" class="btn btn-sm btn-warning" data-tooltip="true" title="Update"><i class="fas fa-pencil-alt"></i></a>&nbsp;';
         }
         actions += '</nobr>'
         if ((row) && (row.available_actions.delete === true)) {
-            actions += '<a href="{{ url('/') }}/hardware/maintenances/' + row.id + '" '
+            actions += '<a href="{{ config('app.url') }}/hardware/maintenances/' + row.id + '" '
                 + ' class="btn btn-danger btn-sm delete-asset"  data-tooltip="true"  '
                 + ' data-toggle="modal" '
                 + ' data-content="{{ trans('general.sure_to_delete') }} ' + row.name + '?" '
diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php
index cea5eb2c04..58abdbc7f5 100644
--- a/resources/views/asset_maintenances/view.blade.php
+++ b/resources/views/asset_maintenances/view.blade.php
@@ -93,7 +93,7 @@ use Carbon\Carbon;
       <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>
-          {{ $assetMaintenance->notes }}
+          {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
         </div>
       </div>
       <!-- 5th Row End -->
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 644443a6df..8d9f648a9a 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -53,9 +53,9 @@
                                             <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password" id="password" autocomplete="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="checkbox">
-                                            <label style="margin-left: -20px;">
-                                                <input name="remember" type="checkbox" value="1" class="minimal"> {{ trans('auth/general.remember_me')  }}
+                                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                                            <label class="form-control">
+                                                <input name="remember" type="checkbox" value="1"> {{ trans('auth/general.remember_me')  }}
                                             </label>
                                         </div>
                                     </fieldset>
@@ -64,7 +64,7 @@
                             </div> <!-- end row -->
 
                             @if (!config('app.require_saml') && $snipeSettings->saml_enabled)
-                            <div class="row ">
+                            <div class="row">
                                 <div class="text-right col-md-12">
                                     <a href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
                                 </div>
@@ -73,22 +73,32 @@
                         </div>
                         <div class="box-footer">
                             @if (config('app.require_saml'))
-                            <a class="btn btn-lg btn-primary btn-block" href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
+                                <a class="btn btn-primary btn-block" href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
                             @else
-                            <button class="btn btn-lg btn-primary btn-block">{{ trans('auth/general.login')  }}</button>
+                                <button class="btn btn-primary btn-block">{{ trans('auth/general.login')  }}</button>
                             @endif
-                        </div>
-                        <div class="text-right col-md-12 col-sm-12 col-xs-12" style="padding-top: 10px;">
+
                             @if ($snipeSettings->custom_forgot_pass_url)
-                                <a href="{{ $snipeSettings->custom_forgot_pass_url  }}" rel="noopener">{{ trans('auth/general.forgot_password')  }}</a>
+                                <div class="col-md-12 text-right" style="padding-top: 15px;">
+                                    <a href="{{ $snipeSettings->custom_forgot_pass_url  }}" rel="noopener">{{ trans('auth/general.forgot_password')  }}</a>
+                                </div>
                             @elseif (!config('app.require_saml'))
-                                <a href="{{ route('password.request')  }}">{{ trans('auth/general.forgot_password')  }}</a>
+                                <div class="col-md-12 text-right" style="padding-top: 15px;">
+                                    <a href="{{ route('password.request')  }}">{{ trans('auth/general.forgot_password')  }}</a>
+                                </div>
                             @endif
 
-
                         </div>
+
                     </div> <!-- end login box -->
 
+                    @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!=''))
+
+                        <a href="{{ route('google.redirect')  }}" class="btn btn-block btn-social btn-google">
+                            <i class="fa-brands fa-google"></i> {{ trans('auth/general.google_login') }}
+                        </a>
+                    @endif
+
                 </div> <!-- col-md-4 -->
 
             </div> <!-- end row -->
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 9d4d25c814..813e8463e9 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -39,21 +39,17 @@
 
 <!-- Use default checkbox -->
 <div class="form-group">
-    <div class="col-md-3">
-    </div>
-    <div class="col-md-9">
+    <div class="col-md-9 col-md-offset-3">
         @if ($snipeSettings->default_eula_text!='')
-            <label for="use_default_eula">
-            {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal', 'aria-label'=>'use_default_eula']) }}
-            {!! trans('admin/categories/general.use_default_eula') !!}
+            <label class="form-control">
+                {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['aria-label'=>'use_default_eula']) }}
+                <span>{!! trans('admin/categories/general.use_default_eula') !!}</span>
             </label>
         @else
-            <div class="icheckbox disabled">
-                <label for="use_default_eula">
-                {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
-                {!! trans('admin/categories/general.use_default_eula_disabled') !!}
-                </label>
-            </div>
+            <label class="form-control form-control--disabled">
+                {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
+                <span>{!! trans('admin/categories/general.use_default_eula_disabled') !!}</span>
+            </label>
         @endif
     </div>
 </div>
@@ -61,11 +57,9 @@
 
 <!-- Require Acceptance -->
 <div class="form-group">
-    <div class="col-md-3">
-    </div>
-    <div class="col-md-9">
-        <label for="require_acceptance">
-        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal', 'aria-label'=>'require_acceptance']) }}
+    <div class="col-md-9 col-md-offset-3">
+        <label class="form-control">
+        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['aria-label'=>'require_acceptance']) }}
         {{ trans('admin/categories/general.require_acceptance') }}
         </label>
     </div>
@@ -74,31 +68,17 @@
 
 <!-- Email on Checkin -->
 <div class="form-group">
-    <div class="col-md-3">
-    </div>
-    <div class="col-md-9">
-        <label for="checkin_email">
-        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal','aria-label'=>'checkin_email']) }}
+    <div class="col-md-9 col-md-offset-3">
+        <label class="form-control">
+        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['aria-label'=>'checkin_email']) }}
         {{ trans('admin/categories/general.checkin_email') }}
         </label>
     </div>
 </div>
 
 
+@include ('partials.forms.edit.image-upload', ['image_path' => app('categories_upload_path')])
 
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-9">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{ Storage::disk('public')->url(app('categories_upload_path').e($item->image)) }}" class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 
 @stop
 
diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php
index 6e33594b17..9b361c46c7 100644
--- a/resources/views/categories/view.blade.php
+++ b/resources/views/categories/view.blade.php
@@ -39,7 +39,7 @@
                     <li class="active">
                         <a href="#items" data-toggle="tab" title="{{ trans('general.items') }}"> {{ ucwords($category_type_route) }}
                             @if ($category->category_type=='asset')
-                            <badge class="badge badge-secondary"> {{ $category->assets()->AssetsForShow()->count() }}</badge>
+                            <badge class="badge badge-secondary"> {{ $category->showableAssets()->count() }}</badge>
                             @endif
                         </a>
                     </li>
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php
index bc74c7357d..d05a53709b 100644
--- a/resources/views/companies/edit.blade.php
+++ b/resources/views/companies/edit.blade.php
@@ -9,18 +9,8 @@
 {{-- Page content --}}
 @section('inputFields')
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/companies/table.name')])
+@include ('partials.forms.edit.phone')
+@include ('partials.forms.edit.fax')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('companies_upload_path')])
 
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 8dca260443..6a7055f727 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -42,7 +42,7 @@
                                 <input type="text" class="form-control" name="checkin_qty" aria-label="checkin_qty" value="{{ old('assigned_qty', $component_assets->assigned_qty) }}">
                             </div>
                             <div class="col-md-9 col-md-offset-2">
-                            <p class="help-block">Must be {{ $component_assets->assigned_qty }} or less.</p>
+                            <p class="help-block">{{ trans('admin/components/general.checkin_limit', ['assigned_qty' => $component_assets->assigned_qty]) }}</p>
                             {!! $errors->first('checkin_qty', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i>
                             :message</span>') !!}
                             </div>
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php
index e27670658c..a104a81e1d 100644
--- a/resources/views/components/checkout.blade.php
+++ b/resources/views/components/checkout.blade.php
@@ -10,7 +10,7 @@
 @section('content')
 
 <div class="row">
-  <div class="col-md-9">
+  <div class="col-md-8">
     <form class="form-horizontal" method="post" action="" autocomplete="off">
       <!-- CSRF Token -->
       {{ csrf_field() }}
@@ -25,30 +25,26 @@
         @endif
 
         <div class="box-body">
-          @if ($component->name)
-          <!-- consumable name -->
-          <div class="form-group">
-            <label class="col-sm-3 control-label">{{ trans('admin/components/general.component_name') }}</label>
-            <div class="col-md-6">
-              <p class="form-control-static">{{ $component->name }}</p>
-            </div>
-          </div>
-          @endif
-
           <!-- Asset -->
             @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id'])
 
             <div class="form-group {{ $errors->has('assigned_qty') ? ' has-error' : '' }}">
-              <label for="assigned_qty" class="col-md-3 control-label">{{ trans('general.qty') }}
-                <i class='icon-asterisk'></i></label>
-              <div class="col-md-9">
-                <input class="form-control" type="text" name="assigned_qty" id="assigned_qty" style="width: 70px;" value="{{ old('assigned_qty') ?? 1 }}" />
-                {!! $errors->first('assigned_qty', '<br><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+              <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 }}" />
               </div>
+              @if ($errors->first('assigned_qty'))
+                <div class="col-md-9 col-md-offset-3">
+                  {!! $errors->first('assigned_qty', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                </div>
+              @endif
             </div>
 
+
             <!-- Note -->
-            <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+            <div class="form-group{{ $errors->has('note') ? ' error' : '' }}">
               <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
               <div class="col-md-7">
                 <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $component->note) }}</textarea>
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 77cdb17c3c..5279f03990 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -17,24 +17,12 @@
 @include ('partials.forms.edit.serial', ['fieldname' => 'serial'])
 @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.purchase_cost')
-
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{ Storage::disk('public')->url(app('components_upload_path').e($item->image)) }}"  class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')])
 
-@include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index f768f78484..bc17e893a1 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -41,7 +41,7 @@
             @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true'])
 
 
-            @if ($consumable->requireAcceptance() || $consumable->getEula() || ($snipeSettings->slack_endpoint!=''))
+            @if ($consumable->requireAcceptance() || $consumable->getEula() || ($snipeSettings->webhook_endpoint!=''))
               <div class="form-group notification-callout">
                 <div class="col-md-8 col-md-offset-3">
                   <div class="callout callout-info">
@@ -58,9 +58,9 @@
                         <br>
                     @endif
 
-                    @if ($snipeSettings->slack_endpoint!='')
+                    @if ($snipeSettings->webhook_endpoint!='')
                         <i class="fab fa-slack"></i>
-                        A slack message will be sent
+                        {{ trans('general.webhook_msg_note') }}
                     @endif
                   </div>
                 </div>
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index a270cc33db..f32e74b196 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -11,6 +11,7 @@
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/consumables/table.title')])
 @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'consumable'])
+@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
 @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 @include ('partials.forms.edit.model_number')
@@ -20,20 +21,7 @@
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
-
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{ Storage::disk('public')->url(app('consumables_upload_path').e($item->image)) }}"  class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('consumables_upload_path')])
 
-@include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 6bb3dc26be..fa9b5ab485 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -155,7 +155,7 @@
 
                       <td>
                         @if ($file->note)
-                          {{ $file->note }}
+                          {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!}
                         @endif
                       </td>
                       <td>
@@ -275,7 +275,7 @@
       </strong>
               </div>
     <div class="col-md-12">
-      {!! nl2br(e($consumable->notes)) !!}
+      {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!}
             </div>
           </div>
   @endif
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 35f3e1b89a..ac945d8597 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -1,8 +1,8 @@
-@php
-    use App\Models\CustomField;
-@endphp
+@extends('layouts/default', [
+    'helpText' => trans('admin/custom_fields/general.about_fieldsets_text'),
+    'helpPosition' => 'right',
+])
 
-@extends('layouts/default')
 
 {{-- Page title --}}
 @section('title')
@@ -21,24 +21,31 @@
 {{-- Page content --}}
 @section('content')
 
-<div class="row">
-  <div class="col-md-9">
     <!-- Horizontal Form -->
-        @if ($field->id)
-          {{ Form::open(['route' => ['fields.update', $field->id], 'class'=>'form-horizontal']) }}
-          {{ method_field('PUT') }}
-        @else
-          {{ Form::open(['route' => 'fields.store', 'class'=>'form-horizontal']) }}
-        @endif
+    @if ($field->id)
+        {{ Form::open(['route' => ['fields.update', $field->id], 'class'=>'form-horizontal']) }}
+        {{ method_field('PUT') }}
+    @else
+        {{ Form::open(['route' => 'fields.store', 'class'=>'form-horizontal']) }}
+    @endif
 
+    @csrf
+<div class="row">
+  <div class="col-md-12">
     <div class="box box-default">
+        <div class="box-header with-border text-right">
+            <button type="submit" class="btn btn-primary"> {{ trans('general.save') }}</button>
+        </div>
       <div class="box-body">
+
+          <div class="col-md-8">
+
           <!-- Name -->
           <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
-            <label for="name" class="col-md-4 control-label">
+            <label for="name" class="col-md-3 control-label">
               {{ trans('admin/custom_fields/general.field_name') }}
             </label>
-            <div class="col-md-6 required">
+            <div class="col-md-8 required">
                 {{ Form::text('name', old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }}
                 {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
@@ -46,10 +53,10 @@
 
           <!-- Element Type -->
           <div class="form-group {{ $errors->has('element') ? ' has-error' : '' }}">
-            <label for="element" class="col-md-4 control-label">
+            <label for="element" class="col-md-3 control-label">
               {{ trans('admin/custom_fields/general.field_element') }}
             </label>
-            <div class="col-md-6 required">
+            <div class="col-md-8 required">
 
             {!! Form::customfield_elements('element', old('element', $field->element), 'field_element select2 form-control') !!}
             {!! $errors->first('element', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -59,10 +66,10 @@
 
           <!-- Element values -->
           <div class="form-group {{ $errors->has('field_values') ? ' has-error' : '' }}" id="field_values_text" style="display:none;">
-            <label for="field_values" class="col-md-4 control-label">
+            <label for="field_values" class="col-md-3 control-label">
               {{ trans('admin/custom_fields/general.field_values') }}
             </label>
-            <div class="col-md-6 required">
+            <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']) !!}
               {!! $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>
@@ -71,7 +78,7 @@
 
           <!-- Format -->
           <div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}" id="format_values">
-            <label for="format" class="col-md-4 control-label">
+            <label for="format" class="col-md-3 control-label">
               {{ trans('admin/custom_fields/general.field_format') }}
             </label>
               @php
@@ -80,17 +87,17 @@
                 $field_format = 'CUSTOM REGEX';
               }
               @endphp
-            <div class="col-md-6 required">
+            <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')) }}
               {!! $errors->first('format', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
           </div>
           <!-- Custom Format -->
           <div class="form-group {{ $errors->has('custom_format') ? ' has-error' : '' }}" id="custom_regex" style="display:none;">
-            <label for="custom_format" class="col-md-4 control-label">
+            <label for="custom_format" class="col-md-3 control-label">
               {{ trans('admin/custom_fields/general.field_custom_format') }}
             </label>
-            <div class="col-md-6 required">
+            <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}$/')) }}
                 <p class="help-block">{!! trans('admin/custom_fields/general.field_custom_format_help') !!}</p>
 
@@ -101,68 +108,120 @@
 
           <!-- Help Text -->
           <div class="form-group {{ $errors->has('help_text') ? ' has-error' : '' }}">
-              <label for="help_text" class="col-md-4 control-label">
+              <label for="help_text" class="col-md-3 control-label">
                   {{ trans('admin/custom_fields/general.help_text') }}
               </label>
-              <div class="col-md-6">
+              <div class="col-md-8">
                   {{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'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>
           </div>
 
-          <!-- Show in Email  -->
-          <div class="form-group {{ $errors->has('show_in_email') ? ' has-error' : '' }}"  id="show_in_email">
-              <div class="col-md-8 col-md-offset-4">
-                  <label for="show_in_email">
-                      <input type="checkbox" name="show_in_email" aria-label="show_in_email" value="1" class="minimal"{{ (old('show_in_email') || $field->show_in_email) ? ' checked="checked"' : '' }}>
+
+
+              <!-- Auto-Add to Future Fieldsets  -->
+          <div class="form-group {{ $errors->has('auto_add_to_fieldsets') ? ' has-error' : '' }}"  id="auto_add_to_fieldsets">
+              <div class="col-md-9 col-md-offset-3">
+                  <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') }}
+                  </label>
+              </div>
+
+              <div class="col-md-9 col-md-offset-3">
+                  <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') }}
+                  </label>
+              </div>
+
+              @if (!$field->id)
+              <!-- Encrypted  -->
+                  <div class="col-md-9 col-md-offset-3">
+                      <label class="form-control">
+                          <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted"{{ (Request::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>
+                      </div>
+                  </div>
+              @endif
+
+              <!-- Show in Email  -->
+              <div class="col-md-9 col-md-offset-3">
+                  <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') }}
                   </label>
               </div>
 
-          </div>
-
-          <!-- Show in View All Assets profile view  -->
-          <div class="form-group {{ $errors->has('display_in_user_view') ? ' has-error' : '' }}"  id="display_in_user_view">
-              <div class="col-md-8 col-md-offset-4">
-                  <label for="display_in_user_view">
-                      <input type="checkbox" name="display_in_user_view" aria-label="display_in_user_view" value="1" class="minimal"{{ (old('display_in_user_view') || $field->display_in_user_view) ? ' checked="checked"' : '' }}>
+              <!-- Show in View All Assets profile view  -->
+              <div class="col-md-9 col-md-offset-3">
+                  <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"' : '' }}>
                       {{ trans('admin/custom_fields/general.display_in_user_view') }}
                   </label>
               </div>
 
+              <!-- Value Must be Unique -->
+              <div class="col-md-9 col-md-offset-3">
+                  <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') }}
+                  </label>
+              </div>
+
           </div>
 
-          <!-- Value Must be Unique -->
-          <div class="form-group {{ $errors->has('is_unique') ? ' has-error' : '' }}"  id="is_unique">
-            <div class="col-md-8 col-md-offset-4">
-                <label for="is_unique">
-                    <input type="checkbox" name="is_unique" aria-label="is_unique" value="1" class="minimal"{{ (old('is_unique') || $field->is_unique) ? ' checked="checked"' : '' }}>
-                    {{ trans('admin/custom_fields/general.is_unique') }}
-                </label>
-            </div>
-
-        </div>
-
-
-      @if (!$field->id)
-        <!-- Encrypted  -->
-        <div class="form-group {{ $errors->has('encrypted') ? ' has-error' : '' }}">
-          <div class="col-md-8 col-md-offset-4">
-            <label for="field_encrypted">
-              <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted" class="minimal"{{ (Request::old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
-              {{ trans('admin/custom_fields/general.encrypt_field') }}
-            </label>
           </div>
-          <div class="col-md-6 col-md-offset-4" 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>
-            </div>
+          @if ($fieldsets->count() > 0)
+          <!-- begin fieldset columns -->
+          <div class="col-md-4">
+
+              <h4>{{ trans('admin/custom_fields/general.fieldsets') }}</h4>
+              {!! $errors->first('associate_fieldsets', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+
+              <label class="form-control">
+                  <input type="checkbox" id="checkAll">
+                  {{ trans('general.select_all') }}
+              </label>
+
+                @foreach ($fieldsets as $fieldset)
+                    @php
+                        $array_fieldname = 'associate_fieldsets.'.$fieldset->id;
+
+                        // Consider the form data first
+                        if (old($array_fieldname) == $fieldset->id) {
+                            $checked = 'checked';
+                        // Otherwise check DB
+                        } elseif (isset($field->fieldset) && ($field->fieldset->contains($fieldset->id))) {
+                            $checked = 'checked';
+                        } else {
+                            $checked = '';
+                        }
+                    @endphp
+
+                          <label class="form-control{{ $errors->has('associate_fieldsets.'.$fieldset->id) ? ' has-error' : '' }}">
+                              <input type="checkbox"
+                                     name="associate_fieldsets[{{ $fieldset->id }}]"
+                                     class="fieldset"
+                                     value="{{ $fieldset->id }}"
+                                    {{ $checked }}>
+                              {{ $fieldset->name }}
+                              {!! $errors->first('associate_fieldsets.'.$fieldset->id, '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+
+                          </label>
+
+                @endforeach
+
           </div>
-        </div>
-      @endif
-
+          @endif
       </div> <!-- /.box-body-->
 
       <div class="box-footer text-right">
@@ -171,20 +230,22 @@
 
     </div> <!--.box.box-default-->
 
-      {{ Form::close() }}
+
   </div> <!--/.col-md-9-->
 
-  <div class="col-md-3">
-    <h2>{{ trans('admin/custom_fields/general.about_custom_fields_title') }}</h2>
-    <p>{{ trans('admin/custom_fields/general.about_custom_fields_text') }}</p>
-  </div>
-  
+
 </div>
+{{ Form::close() }}
 @stop
 
 @section('moar_scripts')
 <script nonce="{{ csrf_token() }}">
     $(document).ready(function(){
+
+        $("#checkAll").change(function () {
+            $(".fieldset").prop('checked', $(this).prop("checked"));
+        });
+
         // Only display the custom format field if it's a custom format validation type
         $(".format").change(function(){
             $(this).find("option:selected").each(function(){
@@ -219,18 +280,22 @@
         }).change();
     });
 
-    // Checkbox handling
-    $('#field_encrypted').on('ifChecked', function(event){
-        $("#encrypt_warning").show();
-        $("#show_in_email").hide();
-        $("#display_in_user_view").hide();
+
+    $("#field_encrypted").change(function() {
+        if (this.checked) {
+            $("#encrypt_warning").show();
+            $("#show_in_email").hide();
+            $("#display_in_user_view").hide();
+            $("#is_unique").hide();
+        } else {
+            $("#encrypt_warning").hide();
+            $("#show_in_email").show();
+            $("#display_in_user_view").show();
+            $("#is_unique").show();
+        }
     });
 
-    $('#field_encrypted').on('ifUnchecked', function(event){
-        $("#encrypt_warning").hide();
-        $("#show_in_email").show();
-        $("#display_in_user_view").show();
-    });
+
 
 </script>
 @stop
diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php
index 04885891ec..7a35ca146f 100644
--- a/resources/views/custom_fields/fieldsets/edit.blade.php
+++ b/resources/views/custom_fields/fieldsets/edit.blade.php
@@ -1,49 +1,17 @@
-@extends('layouts.default')
+@extends('layouts/edit-form', [
+    'createText' => trans('admin/custom_fields/general.create_fieldset') ,
+    'updateText' => trans('admin/custom_fields/general.update_fieldset'),
+    'helpText' => trans('admin/custom_fields/general.about_fieldsets_text'),
+    'helpPosition' => 'right',
+    'formAction' => (isset($item->id)) ? route('fieldsets.update', ['fieldset' => $item->id]) : route('fieldsets.store'),
+])
 
-{{-- Page title --}}
-@section('title')
-  {{ trans('admin/custom_fields/general.create_fieldset') }}
-@parent
-@stop
-
-@section('header_right')
-<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
-  {{ trans('general.back') }}</a>
-@stop
-
-
-{{-- Page content --}}
 @section('content')
-<div class="row">
-  <div class="col-md-9">
-
-  {{ Form::open(['route' => 'fieldsets.store', 'class'=>'form-horizontal']) }}
-    <!-- Horizontal Form -->
-    <div class="box box-default">
-      <div class="box-body">
-
-          <!-- Name -->
-        <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
-          <label for="name" class="col-md-4 control-label">
-            {{ trans('admin/custom_fields/general.fieldset_name') }}
-          </label>
-          <div class="col-md-6">
-            <input class="form-control" type="text" name="name" id="name" value="{{ old('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> <!-- /.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>
-      </div>
-
-    </div> <!-- /.box.box-default-->
-    {{ Form::close() }}
-  </div>
-  <div class="col-md-3">
-    <h2>{{ trans('admin/custom_fields/general.about_fieldsets_title') }}</h4>
-    <p>{{ trans('admin/custom_fields/general.about_fieldsets_text') }}</p>
-  </div>
-</div>
+    @parent
 @stop
+
+@section('inputFields')
+@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')])
+@stop
+
+
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index 2f19a1f400..003ee0cd84 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -51,7 +51,7 @@
                 </span>
               </td>
               @endcan
-              <td class="index">{{$field->pivot->order}}</td>
+              <td class="index">{{$field->pivot->order + 1}}</td>
               <td>{{$field->name}}</td>
               <td>{{$field->format}}</td>
               <td>{{$field->element}}</td>
@@ -104,8 +104,8 @@
 
                 <div class="form-group col-md-2" style="vertical-align: middle;">
 
-                  <label for="required">
-                    {{ Form::checkbox('required', 'on', old('required'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+                  <label class="form-control">
+                    {{ Form::checkbox('required', 'on', old('required'), array('aria-label'=>'required')) }}
                     {{ trans('admin/custom_fields/general.required') }}
                   </label>
 
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 08c43cdd7b..141d715344 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -21,7 +21,7 @@
         <h2 class="box-title">{{ trans('admin/custom_fields/general.fieldsets') }}</h2>
         <div class="box-tools pull-right">
           @can('create', \App\Models\CustomFieldset::class)
-          <a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
+          <a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
           @endcan
         </div>
       </div><!-- /.box-header -->
@@ -69,8 +69,18 @@
                 @endforeach
               </td>
               <td>
+
+                <nobr>
+
+                @can('update', $fieldset)
+                  <a href="{{ route('fieldsets.edit', $fieldset->id) }}" class="btn btn-warning btn-sm">
+                    <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                    <span class="sr-only">{{ trans('button.edit') }}</span>
+                  </a>
+                @endcan
+
                 @can('delete', $fieldset)
-                {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete']) }}
+                {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete','style' => 'display:inline-block']) }}
                   @if($fieldset->models->count() > 0)
                   <button type="submit" class="btn btn-danger btn-sm disabled" disabled><i class="fas fa-trash"></i></button>
                   @else
@@ -78,6 +88,7 @@
                   @endif
                 {{ Form::close() }}
                 @endcan
+                  </nobr>
               </td>
             </tr>
             @endforeach
@@ -100,7 +111,7 @@
         <h2 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
         <div class="box-tools pull-right">
           @can('create', \App\Models\CustomField::class)
-          <a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
+          <a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
           @endcan
         </div>
 
@@ -134,6 +145,9 @@
               <th data-sortable="true"><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"><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"><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"><i class="fa fa-envelope" aria-hidden="true"><span class="sr-only">Show in Email</span></i></th>
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.field_element_short') }}</th>
@@ -157,6 +171,7 @@
               </td>
               <td>{{ $field->format }}</td>
               <td>{!!  ($field->field_encrypted=='1' ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>') !!}</td>
+              <td>{!!  ($field->show_in_listview=='1' ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>') !!}</td>
               <td>{!!  ($field->display_in_user_view=='1' ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>') !!}</td>
               <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>{{ $field->element }}</td>
@@ -167,26 +182,29 @@
               </td>
               <td>
                 <nobr>
+                  {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }}
                   @can('update', $field)
-                <a href="{{ route('fields.edit', $field->id) }}" class="btn btn-warning btn-sm">
-                  <i class="fas fa-pencil-alt" aria-hidden="true"></i>
-                  <span class="sr-only">{{ trans('button.edit') }}</span>
-                </a>
+                    <a href="{{ route('fields.edit', $field->id) }}" class="btn btn-warning btn-sm">
+                      <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                      <span class="sr-only">{{ trans('button.edit') }}</span>
+                    </a>
                 @endcan
+
                 @can('delete', $field)
-                {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }}
-                @if($field->fieldset->count()>0)
-                <button type="submit" class="btn btn-danger btn-sm disabled" disabled>
-                  <i class="fas fa-trash" aria-hidden="true"></i>
-                  <span class="sr-only">{{ trans('button.delete') }}</span></button>
-                @else
-                <button type="submit" class="btn btn-danger btn-sm">
-                  <i class="fas fa-trash" aria-hidden="true"></i>
-                  <span class="sr-only">{{ trans('button.delete') }}</span>
-                </button>
-                @endif
-                {{ Form::close() }}
+
+                  @if($field->fieldset->count()>0)
+                    <button type="submit" class="btn btn-danger btn-sm disabled" disabled>
+                      <i class="fas fa-trash" aria-hidden="true"></i>
+                      <span class="sr-only">{{ trans('button.delete') }}</span></button>
+                  @else
+                    <button type="submit" class="btn btn-danger btn-sm">
+                      <i class="fas fa-trash" aria-hidden="true"></i>
+                      <span class="sr-only">{{ trans('button.delete') }}</span>
+                    </button>
+                  @endif
+
                 @endcan
+                  {{ Form::close() }}
                 </nobr>
               </td>
             </tr>
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 1dd732b97a..296a940b3f 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -274,7 +274,7 @@
 </div> <!--/row-->
 <div class="row">
     <div class="col-md-6">
-         <!-- Categories -->
+         <!-- Locations -->
          <div class="box box-default">
             <div class="box-header with-border">
                 <h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.locations') }}</h2>
diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php
index 0a2c1a7d46..c1a2b38d56 100644
--- a/resources/views/departments/edit.blade.php
+++ b/resources/views/departments/edit.blade.php
@@ -16,26 +16,16 @@
         <input id="hidden_company_id" type="hidden" name="company_id" value="{{ Auth::user()->company_id }}">
     @endif
 
+    @include ('partials.forms.edit.phone')
+    @include ('partials.forms.edit.fax')
 
     <!-- Manager -->
     @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
 
     <!-- Location -->
     @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')])
 
-    <!-- Image -->
-    @if ($item->image)
-        <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-            <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-            <div class="col-md-5">
-                {{ Form::checkbox('image_delete') }}
-                <img src="{{ Storage::disk('public')->url(app('departments_upload_path').e($item->image)) }}" class="img-responsive" />
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </div>
-        </div>
-    @endif
-
-    @include ('partials.forms.edit.image-upload')
 
 @stop
 
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index 8a867e3776..d7405ba0f6 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -16,11 +16,11 @@
   <div class="col-md-8 col-md-offset-2">
 
     <div style="padding-top: 200px">
-      <img src="{{ 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">
             <div class="error-content">
               <h2><i class="fas fa-exclamation-triangle text-yellow"></i> 403 Forbidden.</h2>
               <p>
-                Sad panda. You are not authorized to do the thing. Maybe <a href="{{ url('/') }}">return to the dashboard</a>, or contact your administrator.
+                Sad panda. You are not authorized to do the thing. Maybe <a href="{{ config('app.url') }}">return to the dashboard</a>, or contact your administrator.
               </p>
 
     </div>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 03e140bd3a..77d7c32521 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -16,12 +16,12 @@
   <div class="col-md-8 col-md-offset-2">
 
     <div style="padding-top: 200px">
-      <img src="{{ 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">
             <div class="error-content">
               <h2><i class="fas fa-exclamation-triangle text-yellow"></i> 404 Page not found.</h2>
               <p>
                 Sad panda. We could not find the page you were looking for.
-                You should maybe <a href="{{ url('/') }}">return to the dashboard</a>.
+                You should maybe <a href="{{ config('app.url') }}">return to the dashboard</a>.
               </p>
 
     </div>
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 013d0f1ce6..4adb020d4e 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -29,7 +29,7 @@
         <div class="col-md-12">
 
           <div class="col-md-2">
-            <img src="{{ url('/') }}/img/sad-panda.png" class="pull-right" style="width: 140px; height: 140px;">
+            <img src="{{ config('app.url') }}/img/sad-panda.png" class="pull-right" style="width: 140px; height: 140px;">
           </div>
           <div class="alert alert-warning fade in">
             <h2> {{ trans('general.maintenance_mode') }}</h2>
diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 3c8769f56a..cb95b3762a 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -77,7 +77,7 @@
             <tbody class="permissions-group">
                 <tr class="header-row permissions-row">
                     <td class="col-md-5 tooltip-base permissions-item"
-                        data-toggle="tooltip"
+                        data-tooltip="true"
                         data-placement="right"
                         title="{{ $localPermission['note'] }}">
                             @unless (empty($localPermission['label']))
@@ -87,12 +87,12 @@
                             @endunless
                     </td>
                     <td class="col-md-1 permissions-item">
-                        <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
-                        {{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+                        <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'].']']) }}
                     </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", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+                        {{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
                     </td>
                 </tr>
             </tbody>
@@ -100,7 +100,7 @@
             <tbody class="permission-group">
                 <tr class="header-row permissions-row">
                     <td class="col-md-5 tooltip-base permissions-item header-name"
-                        data-toggle="tooltip"
+                        data-tooltip="true"
                         data-placement="right"
                         title="{{ $localPermission['note'] }}">
                         <h2>{{ $area }}</h2>
@@ -109,11 +109,11 @@
                     </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", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
+                        {{ Form::radio("$area", '1',false,['value'=>"grant",  'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
                     </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", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
+                        {{ Form::radio("$area", '0',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
                     </td>
                 </tr>
 
@@ -122,18 +122,18 @@
                     <tr class="permissions-row">
                         <td
                                 class="col-md-5 tooltip-base permissions-item"
-                                data-toggle="tooltip"
+                                data-tooltip="true"
                                 data-placement="right"
                                 title="{{ $this_permission['note'] }}">
                                 {{ $this_permission['label'] }}
                         </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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
+                            {{ 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'].']']) }}
                         </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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
+                            {{ 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'].']']) }}
                         </td>
 
                     </tr>
@@ -165,10 +165,10 @@
             });
 
             // Check/Uncheck all radio buttons in the group
-            $('tr.header-row input:radio').on('ifClicked', function () {
+            $('tr.header-row input:radio').change(function() {
                 value = $(this).attr('value');
                 area = $(this).data('checker-group');
-                $('.radiochecker-'+area+'[value='+value+']').iCheck('check');
+                $('.radiochecker-'+area+'[value='+value+']').prop('checked', true);
             });
 
 
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
index ffc193c7cf..4b2a2f0e32 100755
--- a/resources/views/groups/index.blade.php
+++ b/resources/views/groups/index.blade.php
@@ -41,9 +41,9 @@
 
             <thead>
               <tr>
-               <th data-switchable="true" data-sortable="false" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
+               <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">{{ trans('admin/groups/table.users') }}</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="actions"   data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th>
               </tr>
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 5b147c5492..8b859a40a3 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -55,16 +55,14 @@
 
                     <!-- Update location -->
                         <div class="form-group">
-                            <div class="col-sm-offset-3 col-md-9">
-                                <label>
-                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
+
+                            <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') }}
                                 </label>
-
-                                @include ('partials.more-info', ['helpText' => trans('help.audit_help'), 'helpPosition' => 'right'])
-
-
-
+                                <p class="help-block">{!! trans('help.audit_help') !!}</p>
                             </div>
+
                         </div>
 
 
diff --git a/resources/views/hardware/bulk-restore.blade.php b/resources/views/hardware/bulk-restore.blade.php
new file mode 100644
index 0000000000..caabe9fab8
--- /dev/null
+++ b/resources/views/hardware/bulk-restore.blade.php
@@ -0,0 +1,62 @@
+@extends('layouts/default')
+
+{{-- Page title --}}
+@section('title')
+{{ trans('admin/hardware/form.bulk_restore') }}
+@parent
+@stop
+
+@section('header_right')
+<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
+  {{ trans('general.back') }}</a>
+@stop
+
+{{-- Page content --}}
+@section('content')
+<div class="row">
+  <!-- left column -->
+  <div class="col-md-12">
+    <p>{{ trans('admin/hardware/form.bulk_restore_help') }}</p>
+    <form class="form-horizontal" method="post" action="{{ route('hardware/bulkrestore') }}" autocomplete="off" role="form">
+      {{csrf_field()}}
+      <div class="box box-default">
+        <div class="box-header with-border">
+          <h2 class="box-title" style="color: red">{{ trans('admin/hardware/form.bulk_restore_warn', ['asset_count' => count($assets)]) }}</h2>
+        </div>
+
+        <div class="box-body">
+          <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>
+              </tr>
+            </thead>
+            <tbody>
+              @foreach ($assets as $asset)
+              <tr>
+                <td><input type="checkbox" name="ids[]" value="{{ $asset->id }}" checked="checked"></td>
+                <td>{{ $asset->id }}</td>
+                <td>{{ $asset->present()->name() }}</td>
+                <td>
+                  @if ($asset->location)
+                  {{ $asset->location->name }}
+                  @endif
+                </td>
+              </tr>
+              @endforeach
+            </tbody>
+          </table>
+        </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.restore') }}</button>
+        </div><!-- /.box-footer -->
+      </div><!-- /.box -->
+    </form>
+  </div> <!-- .col-md-12-->
+</div><!--.row-->
+@stop
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index f6e94028be..c2fe105a2d 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -31,16 +31,16 @@
           <!-- 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-3">
+            <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>
               </div>
               {!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
             </div>
-            <div class="col-md-6">
-              <label>
-                {{ Form::checkbox('null_purchase_date', '1', false, ['class' => 'minimal']) }}
+            <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)]) }}
               </label>
             </div>
@@ -49,7 +49,7 @@
           <!-- 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-3">
+             <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>
@@ -57,9 +57,9 @@
 
                  {!! $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-6">
-                <label>
-                  {{ Form::checkbox('null_expected_checkin_date', '1', false, ['class' => 'minimal']) }}
+              <div class="col-md-5">
+                <label class="form-control">
+                  {{ Form::checkbox('null_expected_checkin_date', '1', false, ['checked' => 'false']) }}
                   {{ trans_choice('general.set_to_null', count($assets), ['asset_count' => count($assets)]) }}
                 </label>
               </div>
@@ -72,7 +72,7 @@
               {{ 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:350px', 'aria-label'=>'status_id')) }}
+              {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', '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>
@@ -84,16 +84,13 @@
 
         <!-- Update actual location  -->
           <div class="form-group">
-            <div class="col-md-3"></div>
-            <div class="col-md-9">
-
-                <label for="update_real_loc">
-                  {{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['class'=>'minimal', 'aria-label'=>'update_real_loc']) }}
+            <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']) }}
                   {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                 </label>
-                <br>
-                <label for="update_default_loc">
-                  {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['class'=>'minimal', 'aria-label'=>'update_default_loc']) }}
+                <label class="form-control">
+                  {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
                   {{ trans('admin/hardware/form.asset_location_update_default') }}
                 </label>
 
@@ -144,20 +141,43 @@
             </div>
           </div>
 
+          <!-- Next audit Date -->
+          <div class="form-group {{ $errors->has('next_audit_date') ? ' has-error' : '' }}">
+            <label for="next_audit_date" class="col-md-3 control-label">{{ trans('general.next_audit_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="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>
+              </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>
+            <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)]) }}
+              </label>
+            </div>
+          </div>
+
           <!-- Requestable -->
           <div class="form-group {{ $errors->has('requestable') ? ' has-error' : '' }}">
             <div class="control-label col-md-3">
               <strong>{{ trans('admin/hardware/form.requestable') }}</strong>
             </div>
             <div class="col-md-7">
-              <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="1"> {{ trans('general.yes')}}
+              <label class="form-control">
+                <input type="radio" name="requestable" value="1">
+                {{ trans('general.yes')}}
               </label>
-              <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="0"> {{ trans('general.no')}}
+              <label class="form-control">
+                <input type="radio" name="requestable" value="0">
+                {{ trans('general.no')}}
               </label>
-              <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="" checked> {{ trans('general.do_not_change')}}
+              <label class="form-control">
+                <input type="radio" name="requestable" value="" checked>
+                {{ trans('general.do_not_change')}}
               </label>
             </div>
           </div>
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index c39704289f..dd6237b1bd 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -46,13 +46,13 @@
 
                           @else
                             <span class="text-danger text-bold">
-                      <i class="fas fa-exclamation-triangle"></i>This asset's model is invalid!
-                      The asset <a href="{{ route('hardware.edit', $asset->id) }}">should be edited</a> to correct this before attempting to check it in or out.</span>
+                      <i class="fas fa-exclamation-triangle"></i>{{ trans('admin/hardware/general.model_invalid')}}
+                      <a href="{{ route('hardware.edit', $asset->id) }}"></a> {{ trans('admin/hardware/general.model_invalid_fix')}}</span>
                           @endif
                         </p>
                       </div>
                     </div>
-
+ 
 
                     <!-- Asset Name -->
                     <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
@@ -73,7 +73,7 @@
                       </div>
                     </div>
 
-                  @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null])
+                  @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null, 'hide_location_radio' => true])
 
                   <!-- Checkout/Checkin Date -->
                     <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 2b3cdbc19e..9f91dace17 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -26,6 +26,16 @@
                     </div>
                     <div class="box-body">
                     {{csrf_field()}}
+                        @if ($asset->company && $asset->company->name)
+                            <div class="form-group">
+                                {{ Form::label('model', trans('general.company'), array('class' => 'col-md-3 control-label')) }}
+                                <div class="col-md-8">
+                                    <p class="form-control-static">
+                                        {{ $asset->company->name }}
+                                    </p>
+                                </div>
+                            </div>
+                        @endif
                     <!-- AssetModel name -->
                         <div class="form-group">
                             {{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
@@ -33,11 +43,10 @@
                                 <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"></i>This asset's model is invalid!
-                  The asset <a href="{{ route('hardware.edit', $asset->id) }}">should be edited</a> to correct this before attempting to check it in or out.</span>
+                  <i class="fas fa-exclamation-triangle"></i>{{ trans('admin/hardware/general.model_invalid')}}
+                  <a href="{{ route('hardware.edit', $asset->id) }}"></a> {{ trans('admin/hardware/general.model_invalid_fix')}}</span>
                                     @endif
                                 </p>
                             </div>
@@ -105,7 +114,7 @@
                             </div>
                         </div>
 
-                        @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->slack_endpoint!=''))
+                        @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
                             <div class="form-group notification-callout">
                                 <div class="col-md-8 col-md-offset-3">
                                     <div class="callout callout-info">
@@ -122,9 +131,9 @@
                                             <br>
                                         @endif
 
-                                        @if ($snipeSettings->slack_endpoint!='')
+                                        @if ($snipeSettings->webhook_endpoint!='')
                                             <i class="fab fa-slack" aria-hidden="true"></i>
-                                            {{ trans('general.slack_msg_note')}}
+                                            {{ trans('general.webhook_msg_note') }}
                                         @endif
                                     </div>
                                 </div>
@@ -168,4 +177,4 @@
 
 
     </script>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 07c04d7f8b..aff215ae26 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -18,18 +18,22 @@
   <!-- Asset Tag -->
   <div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
     <label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
-    
-      <!-- we are editing an existing asset -->
+
+
+
       @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' : '' }}">
-          <input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ Request::old('asset_tag', $item->asset_tag) }}" data-validation="required">
+
+
+          <input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ old('asset_tag', $item->asset_tag) }}" data-validation="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>
       @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' : '' }}">
-              <input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ Request::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}" data-validation="required">
+              <input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ old('asset_tags.1', \App\Models\Asset::autoincrement_asset()) }}" data-validation="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>
@@ -40,11 +44,8 @@
           </div>
       @endif
   </div>
-    
 
-
-
-    @include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'translated_serial' => trans('admin/hardware/form.serial')])
+    @include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'old_val_name' => 'serials.1', 'translated_serial' => trans('admin/hardware/form.serial')])
 
     <div class="input_fields_wrap">
     </div>
@@ -67,23 +68,10 @@
     @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id'])
     @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])
 
-    <!-- Image -->
-    @if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            <label class="control-label" for="image_delete">
-            <input type="checkbox" value="1" name="image_delete" id="image_delete" class="minimal" {{ Request::old('image_delete') == '1' ? ' checked="checked"' : '' }}>
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-            <div style="margin-top: 0.5em">
-                <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($item->image)) }}" class="img-responsive" />
-            </div>
-        </div>
-    </div>
-    @endif
 
-    @include ('partials.forms.edit.image-upload')
+
+    @include ('partials.forms.edit.image-upload', ['image_path' => app('assets_upload_path')])
+
 
     <div id='custom_fields_content'>
         <!-- Custom Fields -->
@@ -92,7 +80,7 @@
         @endif
         @if (Request::old('model_id'))
             @php
-                $model = \App\Models\AssetModel::find(Request::old('model_id'));
+                $model = \App\Models\AssetModel::find(old('model_id'));
             @endphp
         @elseif (isset($selected_model))
             @php
@@ -124,8 +112,8 @@
             <!-- byod checkbox -->
             <div class="form-group">
                 <div class="col-md-7 col-md-offset-3">
-                    <label for="byod">
-                        <input type="checkbox" value="1" name="byod" class="minimal" {{ (old('remote', $item->byod)) == '1' ? ' checked="checked"' : '' }} aria-label="byod">
+                    <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') }}
 
                     </label>
@@ -149,6 +137,7 @@
             <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
@@ -194,7 +183,7 @@
 
             $.ajax({
                 type: 'GET',
-                url: "{{ url('/') }}/models/" + modelid + "/custom_fields",
+                url: "{{ config('app.url') }}/models/" + modelid + "/custom_fields",
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
@@ -226,7 +215,7 @@
         if (status_id != '') {
             $(".status_spinner").css("display", "inline");
             $.ajax({
-                url: "{{url('/') }}/api/v1/statuslabels/" + status_id + "/deployable",
+                url: "{{config('app.url') }}/api/v1/statuslabels/" + status_id + "/deployable",
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index a73b37f2ce..a9a0dba580 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -62,15 +62,9 @@
        
           <div class="row">
             <div class="col-md-12">
-              
-              @if (Request::get('status')!='Deleted')
 
-
-
-                @include('partials.asset-bulk-actions')
+                @include('partials.asset-bulk-actions', ['status' => Request::get('status')])
                    
-              @endif
-
               <table
                 data-advanced-search="true"
                 data-click-to-select="true"
diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index b25b08a0a9..ab4cb5e339 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -52,7 +52,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
     }
     img.barcode {
         display:block;
-        margin-top:-7px;
+        margin-top:{{$settings->qr_code=='1' ? '-15px' : '-7px;'}};
         width: 100%;
     }
     div.label-logo {
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index b2075c51d0..677e0c0f15 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -73,7 +73,7 @@
         <div class="col-md-6">
             <div class="box box-default" id="checkedin-div" style="display: none">
                 <div class="box-header with-border">
-                    <h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> assets checked in) </h2>
+                    <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">
     
@@ -86,7 +86,7 @@
                         </tr>
                         <tr id="checkin-loader" style="display: none;">
                             <td colspan="3">
-                                <i class="fas fa-spinner spin" aria-hidden="true"></i> Processing...
+                                <i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('general.processing') }}...
                             </td>
                         </tr>
                         </thead>
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index dbcae0fa26..1745d74f38 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -50,9 +50,12 @@
                     <!-- Update location -->
                         <div class="form-group">
                             <div class="col-sm-offset-3 col-md-9">
-                                <label>
-                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
-                                </label> <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> More Info" data-html="true" data-content="Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to."><i class="far fa-life-ring"></i></a>
+                                <label class="form-control">
+                                    <input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
+                                </label>
+
+                                <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> More Info" data-html="true" data-content="Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that 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>
 
@@ -99,7 +102,7 @@
         <div class="col-md-6">
             <div class="box box-default" id="audited-div" style="display: none">
                 <div class="box-header with-border">
-                    <h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> assets audited) </h2>
+                    <h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> {{ trans('general.assets_audited') }}) </h2>
                 </div>
                 <div class="box-body">
     
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index 5a38d89ce5..dcc8a01936 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -17,11 +17,6 @@
         <div class="col-md-12">
             <div class="box">
                 <div class="box-body">
-                    {{ Form::open([
-                      'method' => 'POST',
-                      'route' => ['hardware/bulkedit'],
-                      'class' => 'form-inline',
-                       'id' => 'bulkForm']) }}
                     <div class="row">
                         <div class="col-md-12">
 
@@ -51,7 +46,7 @@
                         <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>
                         <th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
-                        <th class="col-md-1">{{ trans('general.checkin').'/'.trans('general.checkout') }}</th>
+                        <th class="col-md-1">{{ trans('button.actions') }}</th> <th></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -64,7 +59,7 @@
                                 @if (($request->itemType() == "asset") && ($request->requestable))
                                     <a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
                                 @elseif (($request->itemType() == "asset_model") && ($request->requestable))
-                                        <a href="{{ url('/') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ url('/') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
+                                        <a href="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
                                 @endif
 
 
@@ -72,11 +67,11 @@
                             <td>
 
                             @if ($request->itemType() == "asset")
-                            <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}">
+                            <a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}">
                                 {{ $request->name() }}
                             </a>
                             @elseif ($request->itemType() == "asset_model")
-                                <a href="{{ url('/') }}/models/{{ $request->requestable->id }}">
+                                <a href="{{ config('app.url') }}/models/{{ $request->requestable->id }}">
                                     {{ $request->name() }}
                                 </a>
                              @endif
@@ -94,8 +89,8 @@
                             @endif
                             </td>
                             <td>
-                                @if ($request->requestingUser())
-                                <a href="{{ url('/') }}/users/{{ $request->requestingUser()->id }}">
+                                @if ($request->requestingUser() && !$request->requestingUser()->trashed())
+                                <a href="{{ config('app.url') }}/users/{{ $request->requestingUser()->id }}">
                                     {{ $request->requestingUser()->present()->fullName() }}
                                 </a>
                                @else
@@ -103,12 +98,20 @@
                                 @endif
                             </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],
+                                    ]) }}
+                                    <button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
+                                {{ Form::close() }}
+                            </td>
                             <td>
                                 @if ($request->itemType() == "asset")
                                     @if ($request->requestable->assigned_to=='')
-                                        <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_user_tooltip') }}">{{ trans('general.checkout') }}</a>
+                                        <a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_user_tooltip') }}">{{ trans('general.checkout') }}</a>
                                         @else
-                                        <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_toolip') }}">{{ trans('general.checkin') }}</a>
+                                        <a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_toolip') }}">{{ trans('general.checkin') }}</a>
                                     @endif
 
                                 @endif
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 336283b6ba..6c1aef99eb 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -6,67 +6,6 @@
     @parent
 @stop
 
-{{-- Right header --}}
-@section('header_right')
-
-
-    @can('manage', \App\Models\Asset::class)
-        @if ($asset->deleted_at=='')
-        <div class="dropdown pull-right">
-            <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">
-                
-                @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
-                    @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
-                        @can('checkin', \App\Models\Asset::class)
-                            <li role="menuitem">
-                                <a href="{{ route('hardware.checkin.create', $asset->id) }}">
-                                    {{ trans('admin/hardware/general.checkin') }}
-                                </a>
-                            </li>
-                        @endcan
-                    @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
-                        @can('checkout', \App\Models\Asset::class)
-                            <li role="menuitem">
-                                <a href="{{ route('hardware.checkout.create', $asset->id)  }}">
-                                    {{ trans('admin/hardware/general.checkout') }}
-                                </a>
-                            </li>
-                        @endcan
-                    @endif
-                @endif
-
-                @can('update', \App\Models\Asset::class)
-                    <li role="menuitem">
-                        <a href="{{ route('hardware.edit', $asset->id) }}">
-                            {{ trans('admin/hardware/general.edit') }}
-                        </a>
-                    </li>
-                @endcan
-
-                @can('create', \App\Models\Asset::class)
-                    <li role="menuitem">
-                        <a href="{{ route('clone/hardware', $asset->id) }}">
-                            {{ trans('admin/hardware/general.clone') }}
-                        </a>
-                    </li>
-                @endcan
-
-                @can('audit', \App\Models\Asset::class)
-                    <li role="menuitem">
-                        <a href="{{ route('asset.audit.create', $asset->id)  }}">
-                            {{ trans('general.audit') }}
-                        </a>
-                    </li>
-                @endcan
-            </ul>
-        </div>
-        @endif
-    @endcan
-@stop
-
 {{-- Page content --}}
 @section('content')
 
@@ -75,8 +14,7 @@
         @if (!$asset->model)
             <div class="col-md-12">
                 <div class="callout callout-danger">
-                    <h2>NO MODEL ASSOCIATED</h2>
-                        <p>This will break things in weird and horrible ways. Edit this asset now to assign it a model. </p>
+                      <p><strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}</p>
                 </div>
             </div>
         @endif
@@ -85,9 +23,8 @@
             <div class="col-md-12">
                 <div class="alert alert-danger">
                     <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
-                    <strong>WARNING: </strong>
-                    This asset has been deleted.
-                    You must restore it before you can assign it to someone.
+                    <strong>{{ trans('general.notification_warning') }} </strong>
+                    {{ trans('general.asset_deleted_warning') }}
                 </div>
             </div>
         @endif
@@ -184,7 +121,7 @@
                           </span>
                         <span class="hidden-xs hidden-sm">
                             {{ trans('general.additional_files') }}
-                            {!! ($asset->model->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</badge>' : '' !!}
+                            {!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</badge>' : '' !!}
                           </span>
                     </a>
                     </li>
@@ -244,7 +181,7 @@
                                                         <i class="fas fa-circle text-green"></i>
                                                     @elseif (($asset->assetstatus) && ($asset->assetstatus->pending=='1'))
                                                         <i class="fas fa-circle text-orange"></i>
-                                                    @elseif (($asset->assetstatus) && ($asset->assetstatus->archived=='1'))
+                                                    @else
                                                         <i class="fas fa-times text-red"></i>
                                                     @endif
                                                     <a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">
@@ -343,8 +280,9 @@
                                                     @if (($asset->model) && ($asset->model->manufacturer->url))
                                                         <li>
                                                             <i class="fas fa-globe-americas" aria-hidden="true"></i>
-                                                            <a href="{{ $asset->model->manufacturer->url }}">
+                                                            <a href="{{ $asset->model->manufacturer->url }}" target="_blank">
                                                                 {{ $asset->model->manufacturer->url }}
+                                                                <i class="fa fa-external-link" aria-hidden="true"></i>
                                                             </a>
                                                         </li>
                                                     @endif
@@ -352,8 +290,19 @@
                                                     @if (($asset->model) && ($asset->model->manufacturer->support_url))
                                                         <li>
                                                             <i class="far fa-life-ring" aria-hidden="true"></i>
-                                                            <a href="{{ $asset->model->manufacturer->support_url }}">
+                                                            <a href="{{ $asset->model->manufacturer->support_url }}" target="_blank">
                                                                 {{ $asset->model->manufacturer->support_url }}
+                                                                <i class="fa fa-external-link" aria-hidden="true"></i>
+                                                            </a>
+                                                        </li>
+                                                    @endif
+
+                                                    @if (($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
+                                                        <li>
+                                                            <i class="far 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>
                                                             </a>
                                                         </li>
                                                     @endif
@@ -457,7 +406,7 @@
                                                 </div>
                                                 <div class="col-md-6{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
                                                     @if ($field->field_encrypted=='1')
-                                                        <i class="fas fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
+                                                        <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
                                                     @endif
 
                                                     @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} ))
@@ -531,6 +480,25 @@
                                             </div>
                                         </div>
                                     @endif
+                                    @if(($asset->components->count() > 0) && ($asset->purchase_cost))
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <strong>
+                                                    {{ trans('admin/hardware/table.components_cost') }}
+                                                </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->getComponentCost())}}
+                                            </div>
+                                        </div>
+                                    @endif
                                     @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))
                                         <div class="row">
                                             <div class="col-md-2">
@@ -596,9 +564,9 @@
                                                 {{ $asset->warranty_months }}
                                                 {{ trans('admin/hardware/form.months') }}
 
-                                                @if (($asset->serial && $asset->model->manufacturer) && $asset->model->manufacturer->name == 'Apple')
-                                                    <a href="https://checkcoverage.apple.com/us/{{ \App\Models\Setting::getSettings()->locale  }}/?sn={{ $asset->serial }}" target="_blank">
-                                                        <i class="fa-brands fa-apple" aria-hidden="true"><span class="sr-only">Applecare Status Lookup</span></i>
+                                                @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>
                                                 @endif
                                             </div>
@@ -672,7 +640,8 @@
 
                                             </div>
                                         </div>
-
+                                    @endif
+                                    @if ($asset->asset_eol_date)
                                         <div class="row">
                                             <div class="col-md-2">
                                                 <strong>
@@ -680,10 +649,10 @@
                                                 </strong>
                                             </div>
                                             <div class="col-md-6">
-                                                @if ($asset->purchase_date)
-                                                {{ Helper::getFormattedDateObject($asset->present()->eol_date(), 'date', false) }}
+                                                @if ($asset->asset_eol_date)
+                                                {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }}
                                                 -
-                                                {{ Carbon::parse($asset->present()->eol_date())->diffForHumans(['parts' => 2]) }}
+                                                {{ Carbon::parse($asset->asset_eol_date)->diffForHumans(['parts' => 2]) }}
                                                 @else
                                                     {{ trans('general.na_no_purchase_date') }}
                                                 @endif
@@ -711,7 +680,7 @@
                                             </strong>
                                         </div>
                                         <div class="col-md-6">
-                                            {!! nl2br(e($asset->notes)) !!}
+                                            {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
                                         </div>
                                     </div>
 
@@ -854,17 +823,73 @@
                             <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">
+                                                    <a href="{{ route('hardware.checkin.create', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                        {{ trans('admin/hardware/general.checkin') }}
+                                                    </a>
+                                                </div>
+                                            @endcan
+                                        @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
+                                            @can('checkout', \App\Models\Asset::class)
+                                                <div class="col-md-12" style="padding-top: 5px;">
+                                                    <a href="{{ route('hardware.checkout.create', $asset->id)  }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                        {{ trans('admin/hardware/general.checkout') }}
+                                                    </a>
+                                                </div>
+                                            @endcan
+                                        @endif
+                                    @endif
+
+
+                                    @can('update', $asset)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('hardware.edit', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('admin/hardware/general.edit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('create', $asset)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('clone/hardware', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary 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;">
+                                            <a href="{{ route('asset.audit.create', $asset->id)  }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('general.audit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('delete', $asset)
+                                        @if ($asset->deleted_at=='')
+                                            <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
+                                                <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }} </button>
+                                                <span class="sr-only">{{ trans('general.delete') }}</span>
+                                            </div>
+                                        @endif
+                                    @endcan
+
                                 @if ($asset->deleted_at!='')
-                                    <div class="text-center col-md-12" style="padding-bottom: 15px;">
+                                    <div class="text-center col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
                                         <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
                                         @csrf 
                                         <button class="btn btn-danger col-md-12">{{ trans('general.restore') }}</button>
@@ -877,11 +902,13 @@
                                 @endif
 
                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
+                                    <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>
 
@@ -900,6 +927,10 @@
                                                 </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>{{ $asset->location->name }}</li>
                                                 <li>{{ $asset->location->address }}
@@ -915,7 +946,16 @@
                                                     {{ $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
                             </div> <!-- div.col-md-4 -->
@@ -1144,17 +1184,15 @@
                       data-cookie="true">
                 <thead>
                 <tr>
-                  <th data-visible="true" style="width: 40px;" class="hidden-xs">{{ trans('admin/hardware/table.icon') }}</th>
+                  <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="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>
                   <th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</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
-                    <th class="col-md-3" data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
+                  <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
+                  <th class="col-md-3" data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
                   <th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
                 </tr>
                 </thead>
@@ -1264,7 +1302,7 @@
                         <div class="row">
                             <div class="col-md-12">
 
-                                @if ($asset->model->uploads->count() > 0)
+                                @if (($asset->model) && ($asset->model->uploads->count() > 0))
                                     <table
                                             class="table table-striped snipe-table"
                                             id="assetModelFileHistory"
@@ -1368,6 +1406,16 @@
 @stop
 
 @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);
+        });
+
+    </script>
     @include ('partials.bootstrap-table')
 
 @stop
diff --git a/resources/views/importer/import.blade.php b/resources/views/importer/import.blade.php
deleted file mode 100644
index 950f4d73f6..0000000000
--- a/resources/views/importer/import.blade.php
+++ /dev/null
@@ -1,120 +0,0 @@
-@extends('layouts/default')
-
-{{-- Page title --}}
-@section('title')
-{{ trans('general.import') }}
-@parent
-@stop
-
-{{-- Page content --}}
-@section('content')
-    {{-- Hide importer until vue has rendered it, if we continue using vue for other things we should move this higher in the style --}}
-    <style>
-        [v-cloak] {
-            display:none;
-        }
-
-    </style>
-
-<div id="app">
-    <importer inline-template v-cloak>
-        <div class="row">
-        <alert v-show="alert.visible" :alert-type="alert.type" v-on:hide="alert.visible = false">@{{ alert.message }}</alert>
-            <errors :errors="importErrors"></errors>
-
-            <div class="col-md-9">
-                <div class="box">
-                    <div class="box-body">
-                        <div class="row">
-
-                            <div class="col-md-12">
-
-                                <div class="col-md-9" v-show="progress.visible" style="padding-bottom:20px">
-                                    <div class="progress progress-striped-active" style="margin-top: 8px">
-                                        <div class="progress-bar" :class="progress.currentClass" role="progressbar" :style="progressWidth">
-                                            <span>@{{ progress.statusText }}</span>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="col-md-3 text-right pull-right">
-
-                                    <!-- The fileinput-button span is used to style the file input field as button -->
-                                    @if (!config('app.lock_passwords'))
-                                        <span class="btn btn-primary fileinput-button">
-                                        <span>{{ trans('button.select_file') }}</span>
-                                         <!-- The file input field used as target for the file upload widget -->
-                                        <label for="files[]"><span class="sr-only">{{ trans('button.select_file') }}</span></label>
-                                        <input id="fileupload" type="file" name="files[]" data-url="{{ route('api.imports.index') }}" accept="text/csv" aria-label="files[]">
-                                        </span>
-                                    @endif
-
-                                </div>
-
-                            </div>
-
-
-
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12 table-responsive" style="padding-top: 30px;">
-
-                                <table data-pagination="true"
-                                        data-id-table="upload-table"
-                                        data-search="true"
-                                        data-side-pagination="client"
-                                        id="upload-table"
-                                        class="col-md-12 table table-striped snipe-table">
-
-                                    <tr>
-                                        <th class="col-md-6">{{ trans('general.file_name') }}</th>
-                                        <th class="col-md-3">{{ trans('general.created_at') }}</th>
-                                        <th class="col-md-1">{{ trans('general.filesize') }}</th>
-                                        <th class="col-md-1 text-right"><span class="sr-only">{{ trans('general.actions') }}</span></th>
-                                    </tr>
-
-                                    <template v-for="(currentFile, index) in files">
-                                    		<tr>
-                                    			<td class="col-md-6">@{{ currentFile.file_path }}</td>
-                                    			<td class="col-md-3">@{{ currentFile.created_at }} </td>
-                                    			<td class="col-md-1">@{{ currentFile.filesize }}</td>
-                                                <td class="col-md-1 text-right">
-                                                    <button class="btn btn-sm btn-info" @click="toggleEvent(currentFile.id)">
-                                                        <i class="fas fa-retweet fa-fw" aria-hidden="true"></i>
-                                                        <span class="sr-only">{{ trans('general.import') }}</span>
-                                                    </button>
-
-                                                    <button class="btn btn-sm btn-danger" @click="deleteFile(currentFile, index)">
-                                                        <i class="fas fa-trash icon-white" aria-hidden="true"></i><span class="sr-only"></span></button>
-                                    			</td>
-                                    		</tr>
-                                                <import-file
-                                                    :key="currentFile.id"
-                                                    :file="currentFile"
-                                                    :custom-fields="customFields"
-                                                    @alert="updateAlert(alert)">
-                                                </import-file>
-                                    </template>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <h2>{{ trans('general.importing') }}</h2>
-                <p>{!!   trans('general.importing_help') !!}</p>
-            </div>
-
-        </div>
-    </importer>
-</div>
-@stop
-
-@section('moar_scripts')
-<script nonce="{{ csrf_token() }}">
-    new Vue({
-        el: '#app'
-    });
-</script>
-@endsection
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 5a64054376..3dcbfc0ea6 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1,30 +1,32 @@
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
-      @section('title')
-      @show
-      :: {{ $snipeSettings->site_name }}
+        @section('title')
+        @show
+        :: {{ $snipeSettings->site_name }}
     </title>
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1" name="viewport">
 
-      <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes">
 
 
-
-      <link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/logo.png' }}">
-      <link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/logo.png' }}">
-      <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="apple-touch-icon"
+          href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/snipe-logo-bug.png' }}">
+    <link rel="apple-touch-startup-image"
+          href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/snipe-logo-bug.png' }}">
+    <link rel="shortcut icon" type="image/ico"
+          href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->favicon)) : config('app.url').'/favicon.ico' }} ">
 
 
-      <meta name="csrf-token" content="{{ csrf_token() }}">
-      <meta name="baseUrl" content="{{ url('/') }}/">
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta name="baseUrl" content="{{ config('app.url') }}/">
 
     <script nonce="{{ csrf_token() }}">
-      window.Laravel = { csrfToken: '{{ csrf_token() }}' };
+        window.Laravel = {csrfToken: '{{ csrf_token() }}'};
     </script>
 
     {{-- stylesheets --}}
@@ -32,7 +34,8 @@
     @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '')
         <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.Auth::user()->present()->skin.'.min.css')) }}">
     @else
-    <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
+        <link rel="stylesheet"
+              href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
     @endif
     {{-- page level css --}}
     @stack('css')
@@ -40,931 +43,980 @@
 
 
     @if (($snipeSettings) && ($snipeSettings->header_color!=''))
-    <style nonce="{{ csrf_token() }}">
-        .main-header .navbar, .main-header .logo {
-            background-color: {{ $snipeSettings->header_color }};
-            background: -webkit-linear-gradient(top,  {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
-            background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
-            border-color: {{ $snipeSettings->header_color }};
-        }
-        .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li:hover > a, .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li.active > a {
-          border-left-color: {{ $snipeSettings->header_color }};
-        }
+        <style nonce="{{ csrf_token() }}">
+            .main-header .navbar, .main-header .logo {
+                background-color: {{ $snipeSettings->header_color }};
+                background: -webkit-linear-gradient(top,  {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
+                background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
+                border-color: {{ $snipeSettings->header_color }};
+            }
 
-        .btn-primary {
-          background-color: {{ $snipeSettings->header_color }};
-          border-color: {{ $snipeSettings->header_color }};
-        }
-    </style>
+            .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li:hover > a, .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->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
 
     {{-- Custom CSS --}}
     @if (($snipeSettings) && ($snipeSettings->custom_css))
-    <style>
-        {!! $snipeSettings->show_custom_css() !!}
-    </style>
+        <style>
+            {!! $snipeSettings->show_custom_css() !!}
+        </style>
     @endif
 
 
     <script nonce="{{ csrf_token() }}">
-          window.snipeit = {
-              settings: {
-                  "per_page": {{ $snipeSettings->per_page }}
-              }
-          };
+        window.snipeit = {
+            settings: {
+                "per_page": {{ $snipeSettings->per_page }}
+            }
+        };
     </script>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <script src="{{ url(asset('js/html5shiv.js')) }}" nonce="{{ csrf_token() }}"></script>
-        <script src="{{ url(asset('js/respond.js')) }}" nonce="{{ csrf_token() }}"></script>
+    <script src="{{ url(asset('js/html5shiv.js')) }}" nonce="{{ csrf_token() }}"></script>
+    <script src="{{ url(asset('js/respond.js')) }}" nonce="{{ csrf_token() }}"></script>
 
     @livewireStyles
 
-  </head>
+</head>
 
-  @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '')
-      <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? Auth::user()->present()->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
-  @else
-      <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
-  @endif
-
-  <a class="skip-main" href="#main">Skip to main content</a>
-    <div class="wrapper">
-
-      <header class="main-header">
-
-        <!-- Logo -->
-
-
-        <!-- Header Navbar: style can be found in header.less -->
-        <nav class="navbar navbar-static-top" role="navigation">
-          <!-- Sidebar toggle button above the compact sidenav -->
-          <a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="push-menu" role="button">
-            <span class="sr-only">Toggle navigation</span>
-          </a>
-          <div class="nav navbar-nav navbar-left">
-              <div class="left-navblock">
-                 @if ($snipeSettings->brand == '3')
-                      <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
-                          @if ($snipeSettings->logo!='')
-                          <img class="navbar-brand-img" src="{{ Storage::disk('public')->url($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
-                          @endif
-                          {{ $snipeSettings->site_name }}
-                      </a>
-                  @elseif ($snipeSettings->brand == '2')
-                      <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
-                          @if ($snipeSettings->logo!='')
-                            <img class="navbar-brand-img" src="{{ Storage::disk('public')->url($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
-                          @endif
-                          <span class="sr-only">{{ $snipeSettings->site_name }}</span>
-                      </a>
-                  @else
-                      <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
-                          {{ $snipeSettings->site_name }}
-                      </a>
-                  @endif
-              </div>
-            </div>
-
-          <!-- Navbar Right Menu -->
-            <div class="navbar-custom-menu">
-              <ul class="nav navbar-nav">
-                  @can('index', \App\Models\Asset::class)
-                  <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!} tabindex="-1">
-                      <a href="{{ url('hardware') }}" accesskey="1" tabindex="-1">
-                          <i class="fas fa-barcode fa-fw" aria-hidden="true"></i>
-                          <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"' : '') !!} tabindex="-1">
-                      <a href="{{ route('licenses.index') }}" accesskey="2" tabindex="-1">
-                          <i class="far fa-save fa-fw"></i>
-                          <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"' : '') !!} tabindex="-1">
-                      <a href="{{ route('accessories.index') }}" accesskey="3" tabindex="-1">
-                          <i class="far fa-keyboard fa-fw"></i>
-                          <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>
-                          <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>
-                          <span class="sr-only">{{ trans('general.components') }}</span>
-                      </a>
-                  </li>
-                  @endcan
-
-                  @can('index', \App\Models\Asset::class)
-                  <li>
-                  <form class="navbar-form navbar-left form-horizontal" role="search" 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') }}">
-                              <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>
-                                  <span class="sr-only">{{ trans('general.search') }}</span>
-                              </button>
-                          </div>
-                      </div>
-                  </form>
-                  </li>
-                  @endcan
-
-                  @can('admin')
-                  <li class="dropdown" aria-hidden="true">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" tabindex="-1">
-                      {{ trans('general.create') }}
-                      <strong class="caret"></strong>
-                    </a>
-                   <ul class="dropdown-menu">
-                     @can('create', \App\Models\Asset::class)
-                      <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>
-                                  {{ trans('general.asset') }}
-                              </a>
-                      </li>
-                       @endcan
-                       @can('create', \App\Models\License::class)
-                       <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>
-                               {{ trans('general.license') }}
-                           </a>
-                       </li>
-                       @endcan
-                       @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>
-                               {{ trans('general.accessory') }}</a>
-                       </li>
-                       @endcan
-                       @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>
-                               {{ trans('general.consumable') }}
-                           </a>
-                       </li>
-                       @endcan
-                       @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>
-                           {{ trans('general.component') }}
-                           </a>
-                       </li>
-                       @endcan
-                         @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>
-                                     {{ trans('general.user') }}
-                                 </a>
-                             </li>
-                         @endcan
-                   </ul>
-                </li>
-               @endcan
-
-               @can('admin')
-               @if ($snipeSettings->show_alerts_in_menu=='1')
-               <!-- Tasks: style can be found in dropdown.less -->
-               <?php $alert_items = Helper::checkLowInventory(); ?>
-
-               <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">Alerts</span>
-                   @if (count($alert_items))
-                    <span class="label label-danger">{{ count($alert_items) }}</span>
-                   @endif
-                 </a>
-                 <ul class="dropdown-menu">
-                   <li class="header">{{ trans('general.quantity_minimum', array('count' => count($alert_items))) }}</li>
-                   <li>
-                     <!-- 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'])}}">
-                            <h2 class="task_menu">{{ $alert_items[$i]['name'] }}
-                              <small class="pull-right">
-                                {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}
-                              </small>
-                            </h2>
-                            <div class="progress xs">
-                              <div class="progress-bar progress-bar-yellow" style="width: {{ $alert_items[$i]['percent'] }}%" role="progressbar" aria-valuenow="{{ $alert_items[$i]['percent'] }}" aria-valuemin="0" aria-valuemax="100">
-                                <span class="sr-only">{{ $alert_items[$i]['percent'] }}% Complete</span>
-                              </div>
-                            </div>
-                          </a>
-                        </li>
-                        <!-- end task item -->
-                      @endfor
-                     </ul>
-                   </li>
-                   {{-- <li class="footer">
-                     <a href="#">View all tasks</a>
-                   </li> --}}
-                 </ul>
-               </li>
-               @endcan
-               @endif
-
-
-               <!-- User Account: style can be found in dropdown.less -->
-               @if (Auth::check())
-               <li class="dropdown user user-menu">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                   @if (Auth::user()->present()->gravatar())
-                       <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image" alt="">
-                   @else
-                      <i class="fas fa-users" aria-hidden="true"></i>
-                   @endif
-
-                   <span class="hidden-xs">{{ Auth::user()->first_name }} <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>
-                             {{ 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>
-                             {{ 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>
-                             {{ trans('general.accept_assets_menu') }}
-                         </a></li>
-
-
-
-                     <li>
-                          <a href="{{ route('profile') }}">
-                             <i class="fas fa-user fa-fw" aria-hidden="true"></i>
-                              {{ trans('general.editprofile') }}
-                         </a>
-                     </li>
-                     <li>
-                         <a href="{{ route('account.password.index') }}">
-                             <i class="fa-solid fa-asterisk fa-fw" aria-hidden="true"></i>
-                             {{ trans('general.changepassword') }}
-                         </a>
-                     </li>
-
-
-
-                     @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') }}
-                         </a>
-                     </li>
-                     @endcan
-                     <li class="divider"></li>
-                     <li>
-
-                        <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') }}
-                        </a>
-                        
-                        <form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
-                            {{ csrf_field() }}
-                        </form>
-
-                     </li>
-                 </ul>
-               </li>
-               @endif
-
-
-               @can('superadmin')
-               <li>
-                   <a href="{{ route('settings.index') }}">
-                       <i class="fa fa-cogs fa-fw" aria-hidden="true"></i>
-                       <span class="sr-only">{{ trans('general.admin') }}</span>
-                   </a>
-               </li>
-               @endcan
-            </ul>
-          </div>
-      </nav>
-       <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>
-      </a>
-       <!-- Sidebar toggle button-->
-      </header>
-
-        <!-- Left side column. contains the logo and sidebar -->
-      <aside class="main-sidebar">
-        <!-- 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">
-            @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> <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>
-                  <span>{{ trans('general.assets') }}</span>
-                  <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li>
-                      <a href="{{ url('hardware') }}">
-                          <i class="far fa-circle text-grey fa-fw" aria-hidden="true"></i>
-                        {{ trans('general.list_all') }}
-                    </a>
-                  </li>
-
-                    <?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
-                    @if (count($status_navs) > 0)
-                        @foreach ($status_navs as $status_nav)
-                            <li{!! (Request::is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}><a href="{{ route('statuslabels.show', ['statuslabel' => $status_nav->id]) }}">
-                                <i class="fas fa-circle text-grey fa-fw" aria-hidden="true"{!!  ($status_nav->color!='' ? ' style="color: '.e($status_nav->color).'"' : '') !!}></i>
-                                 {{ $status_nav->name }} ({{ $status_nav->asset_count }})</a></li>
-                        @endforeach
-                    @endif
-
-
-                  <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
-                    <a href="{{ url('hardware?status=Deployed') }}">
-                        <i class="far fa-circle text-blue fa-fw"></i>
-                        {{ trans('general.all') }}
-                        {{ trans('general.deployed') }}
-                        ({{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }})
-                    </a>
-                  </li>
-                  <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
-                    <a href="{{ url('hardware?status=RTD') }}">
-                        <i class="far fa-circle text-green fa-fw"></i>
-                        {{ trans('general.all') }}
-                        {{ trans('general.ready_to_deploy') }}
-                        ({{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }})
-                    </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>
-                          {{ trans('general.all') }}
-                          {{ trans('general.pending') }}
-                          ({{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }})
-                      </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>
-                          {{ trans('general.all') }}
-                          {{ trans('general.undeployable') }}
-                          ({{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }})
-                      </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>
-                            {{ trans('general.all') }}
-                            {{ trans('general.byod') }}
-                            ({{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }})
-                        </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>
-                          {{ trans('general.all') }}
-                          {{ trans('admin/hardware/general.archived') }}
-                          ({{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }})
-                          </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>
-                        {{ trans('admin/hardware/general.requestable') }}
-                        </a>
-                    </li>
-
-                    @can('audit', \App\Models\Asset::class)
-                        <li{!! (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') }}
-                            </a>
-                        </li>
-                        <li{!! (Request::is('hardware/audit/overdue') ? ' class="active"' : '') !!}>
-                            <a href="{{ route('assets.audit.overdue') }}">
-                                <i class="fas fa-exclamation-triangle text-red fa-fw"></i> {{ trans('general.audit_overdue') }}
-                            </a>
-                        </li>
-                    @endcan
-
-                  <li class="divider">&nbsp;</li>
-                    @can('checkin', \App\Models\Asset::class)
-                        <li{!! (Request::is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
-                            <a href="{{ route('hardware/quickscancheckin') }}">
-                                {{ trans('general.quickscan_checkin') }}
-                            </a>
-                        </li>
-                    @endcan
-
-                    @can('checkout', \App\Models\Asset::class)
-                    <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
-                        <a href="{{ route('hardware.bulkcheckout.show') }}">
-                            {{ trans('general.bulk_checkout') }}
-                        </a>
-                    </li>
-                    <li{!! (Request::is('hardware/requested') ? ' class="active"' : '') !!}>
-                        <a href="{{ route('assets.requested') }}">
-                            {{ trans('general.requested') }}</a>
-                    </li>
-                    @endcan
-
-                    @can('create', \App\Models\Asset::class)
-                      <li{!! (Request::query('Deleted') ? ' class="active"' : '') !!}>
-                          <a href="{{ url('hardware?status=Deleted') }}">
-                              {{ trans('general.deleted') }}
-                          </a>
-                      </li>
-                      <li>
-                          <a href="{{ route('maintenances.index') }}">
-                            {{ trans('general.asset_maintenances') }}
-                          </a>
-                      </li>
-                    @endcan
-                    @can('admin')
-                      <li>
-                          <a href="{{ url('hardware/history') }}">
-                            {{ trans('general.import-history') }}
-                          </a>
-                      </li>
-                    @endcan
-                    @can('audit', \App\Models\Asset::class)
-                        <li>
-                            <a href="{{ route('assets.bulkaudit') }}">
-                                {{ trans('general.bulkaudit') }}
-                            </a>
-                        </li>
-                    @endcan
-                </ul>
-              </li>
-              @endcan
-              @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>
-                    <span>{{ trans('general.licenses') }}</span>
-                  </a>
-              </li>
-              @endcan
-              @can('index', \App\Models\Accessory::class)
-              <li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
-                <a href="{{ route('accessories.index') }}">
-                  <i class="far fa-keyboard fa-fw"></i>
-                  <span>{{ trans('general.accessories') }}</span>
-                </a>
-              </li>
-              @endcan
-              @can('view', \App\Models\Consumable::class)
-            <li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
-                <a href="{{ url('consumables') }}">
-                  <i class="fas fa-tint fa-fw"></i>
-                  <span>{{ trans('general.consumables') }}</span>
-                </a>
-            </li>
-             @endcan
-             @can('view', \App\Models\Component::class)
-            <li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
-                <a href="{{ route('components.index') }}">
-                  <i class="far fa-hdd fa-fw"></i>
-                  <span>{{ trans('general.components') }}</span>
-                </a>
-            </li>
-            @endcan
-            @can('view', \App\Models\PredefinedKit::class)
-                <li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
-                    <a href="{{ route('kits.index') }}">
-                        <i class="fa fa-object-group fa-fw"></i>
-                        <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>
-                      <span>{{ trans('general.people') }}</span>
-                  </a>
-            </li>
-            @endcan
-            @can('import')
-                <li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
-                    <a href="{{ route('imports.index') }}">
-                        <i class="fas fa-cloud-download-alt fa-fw" aria-hidden="true"></i>
-                        <span>{{ trans('general.import') }}</span>
-                    </a>
-                </li>
-            @endcan
-
-            @can('backend.interact')
-                <li 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>
-                        <span>{{ trans('general.settings') }}</span>
-                        <i class="fa fa-angle-left pull-right"></i>
-                    </a>
-
-                    <ul class="treeview-menu">
-                        @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
-                            <li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
-                                <a href="{{ route('fields.index') }}">
-                                    {{ trans('admin/custom_fields/general.custom_fields') }}
-                                </a>
-                            </li>
-                        @endif
-
-                        @can('view', \App\Models\Statuslabel::class)
-                            <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
-                                <a href="{{ route('statuslabels.index') }}">
-                                    {{ trans('general.status_labels') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\AssetModel::class)
-                            <li>
-                                <a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }}>
-                                    {{ trans('general.asset_models') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Category::class)
-                            <li>
-                                <a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }}>
-                                    {{ trans('general.categories') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Manufacturer::class)
-                            <li>
-                                <a href="{{ route('manufacturers.index') }}" {{ (Request::is('/manufacturers') ? ' class="active"' : '') }}>
-                                    {{ trans('general.manufacturers') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Supplier::class)
-                            <li>
-                                <a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }}>
-                                    {{ trans('general.suppliers') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Department::class)
-                            <li>
-                                <a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }}>
-                                    {{ trans('general.departments') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Location::class)
-                            <li>
-                                <a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }}>
-                                    {{ trans('general.locations') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Company::class)
-                            <li>
-                                <a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }}>
-                                    {{ trans('general.companies') }}
-                                </a>
-                            </li>
-                        @endcan
-
-                        @can('view', \App\Models\Depreciation::class)
-                            <li>
-                                <a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }}>
-                                    {{ trans('general.depreciation') }}
-                                </a>
-                            </li>
-                        @endcan
-                    </ul>
-                </li>
-            @endcan
-
-            @can('reports.view')
-            <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
-                <a href="#"  class="dropdown-toggle">
-                    <i class="fas fa-chart-bar fa-fw"></i>
-                    <span>{{ trans('general.reports') }}</span>
-                    <i class="fa fa-angle-left pull-right"></i>
-                </a>
-
-                <ul class="treeview-menu">
-                    <li>
-                        <a href="{{ route('reports.activity') }}" {{ (Request::is('reports/activity') ? ' class="active"' : '') }}>
-                            {{ trans('general.activity_report') }}
-                        </a>
-                    </li>
-
-                    <li><a href="{{ route('reports.audit') }}" {{ (Request::is('reports.audit') ? ' class="active"' : '') }}>
-                            {{ trans('general.audit_report') }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ url('reports/depreciation') }}" {{ (Request::is('reports/depreciation') ? ' class="active"' : '') }}>
-                            {{ trans('general.depreciation_report') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url('reports/licenses') }}" {{ (Request::is('reports/licenses') ? ' class="active"' : '') }}>
-                            {{ trans('general.license_report') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url('reports/asset_maintenances') }}" {{ (Request::is('reports/asset_maintenances') ? ' class="active"' : '') }}>
-                            {{ trans('general.asset_maintenance_report') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url('reports/unaccepted_assets') }}" {{ (Request::is('reports/unaccepted_assets') ? ' class="active"' : '') }}>
-                            {{ trans('general.unaccepted_asset_report') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url('reports/accessories') }}" {{ (Request::is('reports/accessories') ? ' class="active"' : '') }}>
-                            {{ trans('general.accessory_report') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
-                            {{ trans('general.custom_report') }}
-                        </a>
-                    </li>
-                </ul>
-            </li>
-            @endcan
-
-            @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>
-            <span>{{ trans('admin/hardware/general.requestable') }}</span>
-            </a>
-            </li>
-            @endcan
-
-
-          </ul>
-        </section>
-        <!-- /.sidebar -->
-      </aside>
-
-      <!-- Content Wrapper. Contains page content -->
-
-      <div class="content-wrapper" role="main" id="setting-list">
-
-          @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> <strong>{{ strtoupper(trans('general.debug_warning')) }}:</strong>
-                      {!! trans('general.debug_warning_text') !!}
-                  </div>
-              </div>
-      @endif
-
-        <!-- Content Header (Page header) -->
-        <section class="content-header" style="padding-bottom: 30px;">
-          <h1 class="pull-left pagetitle">@yield('title') </h1>
-
-            @if (isset($helpText))
-            @include ('partials.more-info',
-                                   [
-                                       'helpText' => $helpText,
-                                       'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
-                                   ])
-            @endif
-          <div class="pull-right">
-            @yield('header_right')
-          </div>
-
-
-
-        </section>
-
-
-        <section class="content" id="main" tabindex="-1">
-
-          <!-- Notifications -->
-          <div class="row">
-              @if (config('app.lock_passwords'))
-                  <div class="col-md-12">
-                      <div class="callout callout-info">
-                          {{ trans('general.some_features_disabled') }}
-                      </div>
-                  </div>
-              @endif
-
-          @include('notifications')
-          </div>
-
-
-          <!-- Content -->
-            <div id="{!! (Request::is('*api*') ? 'app' : 'webui') !!}">
-          @yield('content')
-            </div>
-
-        </section>
-
-      </div><!-- /.content-wrapper -->
-
-      <footer class="main-footer hidden-print">
-
-        <div class="pull-right hidden-xs">
-          @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') }})
-              @endif
-          @endif
-
-          @if ($snipeSettings->support_footer!='off')
-              @if (($snipeSettings->support_footer=='on') || (($snipeSettings->support_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
-                <a target="_blank" class="btn btn-default btn-xs" href="https://snipe-it.readme.io/docs/overview" rel="noopener">{{ trans('general.user_manual') }}</a>
-                <a target="_blank" class="btn btn-default btn-xs" href="https://snipeitapp.com/support/" rel="noopener">{{ trans('general.bug_report') }}</a>
-                 @endif
-          @endif
-
-        @if ($snipeSettings->privacy_policy_link!='')
-            <a target="_blank" class="btn btn-default btn-xs" rel="noopener" href="{{  $snipeSettings->privacy_policy_link }}" target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
+@if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '')
+    <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? Auth::user()->present()->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
+    @else
+        <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
         @endif
 
 
-        </div>
-          @if ($snipeSettings->footer_text!='')
-              <div class="pull-right">
-                  {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
-              </div>
-          @endif
-          
+        <a class="skip-main" href="#main">{{ trans('general.skip_to_main_content') }}</a>
+        <div class="wrapper">
 
-          <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>.
-      </footer>
+            <header class="main-header">
+
+                <!-- Logo -->
+
+
+                <!-- Header Navbar: style can be found in header.less -->
+                <nav class="navbar navbar-static-top" role="navigation">
+                    <!-- Sidebar toggle button above the compact sidenav -->
+                    <a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="push-menu"
+                       role="button">
+                        <span class="sr-only">{{ trans('general.toggle_navigation') }}</span>
+                    </a>
+                    <div class="nav navbar-nav navbar-left">
+                        <div class="left-navblock">
+                            @if ($snipeSettings->brand == '3')
+                                <a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
+                                    @if ($snipeSettings->logo!='')
+                                        <img class="navbar-brand-img"
+                                             src="{{ Storage::disk('public')->url($snipeSettings->logo) }}"
+                                             alt="{{ $snipeSettings->site_name }} logo">
+                                    @endif
+                                    {{ $snipeSettings->site_name }}
+                                </a>
+                            @elseif ($snipeSettings->brand == '2')
+                                <a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
+                                    @if ($snipeSettings->logo!='')
+                                        <img class="navbar-brand-img"
+                                             src="{{ Storage::disk('public')->url($snipeSettings->logo) }}"
+                                             alt="{{ $snipeSettings->site_name }} logo">
+                                    @endif
+                                    <span class="sr-only">{{ $snipeSettings->site_name }}</span>
+                                </a>
+                            @else
+                                <a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
+                                    {{ $snipeSettings->site_name }}
+                                </a>
+                            @endif
+                        </div>
+                    </div>
+
+                    <!-- Navbar Right Menu -->
+                    <div class="navbar-custom-menu">
+                        <ul class="nav navbar-nav">
+                            @can('index', \App\Models\Asset::class)
+                                <li aria-hidden="true"
+                                    {!! (Request::is('hardware*') ? ' class="active"' : '') !!} tabindex="-1">
+                                    <a href="{{ url('hardware') }}" accesskey="1" tabindex="-1">
+                                        <i class="fas fa-barcode fa-fw" aria-hidden="true"></i>
+                                        <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"' : '') !!} tabindex="-1">
+                                    <a href="{{ route('licenses.index') }}" accesskey="2" tabindex="-1">
+                                        <i class="far fa-save fa-fw"></i>
+                                        <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"' : '') !!} tabindex="-1">
+                                    <a href="{{ route('accessories.index') }}" accesskey="3" tabindex="-1">
+                                        <i class="far fa-keyboard fa-fw"></i>
+                                        <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>
+                                        <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>
+                                        <span class="sr-only">{{ trans('general.components') }}</span>
+                                    </a>
+                                </li>
+                            @endcan
+
+                            @can('index', \App\Models\Asset::class)
+                                <li>
+                                    <form class="navbar-form navbar-left form-horizontal" role="search"
+                                          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') }}">
+                                                <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>
+                                                    <span class="sr-only">{{ trans('general.search') }}</span>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </li>
+                            @endcan
+
+                            @can('admin')
+                                <li class="dropdown" aria-hidden="true">
+                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+                                        {{ trans('general.create') }}
+                                        <strong class="caret"></strong>
+                                    </a>
+                                    <ul class="dropdown-menu">
+                                        @can('create', \App\Models\Asset::class)
+                                            <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>
+                                                    {{ trans('general.asset') }}
+                                                </a>
+                                            </li>
+                                        @endcan
+                                        @can('create', \App\Models\License::class)
+                                            <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>
+                                                    {{ trans('general.license') }}
+                                                </a>
+                                            </li>
+                                        @endcan
+                                        @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>
+                                                    {{ trans('general.accessory') }}</a>
+                                            </li>
+                                        @endcan
+                                        @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>
+                                                    {{ trans('general.consumable') }}
+                                                </a>
+                                            </li>
+                                        @endcan
+                                        @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>
+                                                    {{ trans('general.component') }}
+                                                </a>
+                                            </li>
+                                        @endcan
+                                        @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>
+                                                    {{ trans('general.user') }}
+                                                </a>
+                                            </li>
+                                        @endcan
+                                    </ul>
+                                </li>
+                            @endcan
+
+                            @can('admin')
+                                @if ($snipeSettings->show_alerts_in_menu=='1')
+                                    <!-- Tasks: style can be found in dropdown.less -->
+                                    <?php $alert_items = Helper::checkLowInventory(); ?>
+
+                                    <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>
+                                            @endif
+                                        </a>
+                                        <ul class="dropdown-menu">
+                                            <li class="header">{{ trans('general.quantity_minimum', array('count' => count($alert_items))) }}</li>
+                                            <li>
+                                                <!-- 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'])}}">
+                                                                <h2 class="task_menu">{{ $alert_items[$i]['name'] }}
+                                                                    <small class="pull-right">
+                                                                        {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}
+                                                                    </small>
+                                                                </h2>
+                                                                <div class="progress xs">
+                                                                    <div class="progress-bar progress-bar-yellow"
+                                                                         style="width: {{ $alert_items[$i]['percent'] }}%"
+                                                                         role="progressbar"
+                                                                         aria-valuenow="{{ $alert_items[$i]['percent'] }}"
+                                                                         aria-valuemin="0" aria-valuemax="100">
+                                                                        <span class="sr-only">{{ $alert_items[$i]['percent'] }}% Complete</span>
+                                                                    </div>
+                                                                </div>
+                                                            </a>
+                                                        </li>
+                                                        <!-- end task item -->
+                                                    @endfor
+                                                </ul>
+                                            </li>
+                                            {{-- <li class="footer">
+                                              <a href="#">{{ trans('general.tasks_view_all') }}</a>
+                                            </li> --}}
+                                        </ul>
+                                    </li>
+                                @endcan
+                            @endif
 
 
 
-    </div><!-- ./wrapper -->
+                            <!-- User Account: style can be found in dropdown.less -->
+                            @if (Auth::check())
+                                <li class="dropdown user user-menu">
+                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                        @if (Auth::user()->present()->gravatar())
+                                            <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
+                                                 alt="">
+                                        @else
+                                            <i class="fas fa-users" aria-hidden="true"></i>
+                                        @endif
+
+                                        <span class="hidden-xs">{{ Auth::user()->first_name }} <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>
+                                                {{ 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>
+                                                    {{ 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>
+                                                {{ trans('general.accept_assets_menu') }}
+                                            </a></li>
 
 
-    <!-- end main container -->
+                                        <li>
+                                            <a href="{{ route('profile') }}">
+                                                <i class="fas fa-user fa-fw" aria-hidden="true"></i>
+                                                {{ trans('general.editprofile') }}
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="{{ route('account.password.index') }}">
+                                                <i class="fa-solid fa-asterisk fa-fw" aria-hidden="true"></i>
+                                                {{ trans('general.changepassword') }}
+                                            </a>
+                                        </li>
+
+
+                                        @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') }}
+                                                </a>
+                                            </li>
+                                        @endcan
+                                        <li class="divider"></li>
+                                        <li>
+
+                                            <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') }}
+                                            </a>
+
+                                            <form id="logout-form" action="{{ route('logout.post') }}" method="POST"
+                                                  style="display: none;">
+                                                {{ csrf_field() }}
+                                            </form>
+
+                                        </li>
+                                    </ul>
+                                </li>
+                            @endif
+
+
+                            @can('superadmin')
+                                <li>
+                                    <a href="{{ route('settings.index') }}">
+                                        <i class="fa fa-cogs fa-fw" aria-hidden="true"></i>
+                                        <span class="sr-only">{{ trans('general.admin') }}</span>
+                                    </a>
+                                </li>
+                            @endcan
+                        </ul>
+                    </div>
+                </nav>
+                <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>
+                </a>
+                <!-- Sidebar toggle button-->
+            </header>
+
+            <!-- Left side column. contains the logo and sidebar -->
+            <aside class="main-sidebar">
+                <!-- 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">
+                        @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>
+                                    <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>
+                                    <span>{{ trans('general.assets') }}</span>
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </a>
+                                <ul class="treeview-menu">
+                                    <li>
+                                        <a href="{{ url('hardware') }}">
+                                            <i class="far fa-circle text-grey fa-fw" aria-hidden="true"></i>
+                                            {{ trans('general.list_all') }}
+                                        </a>
+                                    </li>
+
+                                    <?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
+                                    @if (count($status_navs) > 0)
+                                        @foreach ($status_navs as $status_nav)
+                                            <li{!! (Request::is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}>
+                                                <a href="{{ route('statuslabels.show', ['statuslabel' => $status_nav->id]) }}">
+                                                    <i class="fas fa-circle text-grey fa-fw"
+                                                       aria-hidden="true"{!!  ($status_nav->color!='' ? ' style="color: '.e($status_nav->color).'"' : '') !!}></i>
+                                                    {{ $status_nav->name }} ({{ $status_nav->asset_count }})</a></li>
+                                        @endforeach
+                                    @endif
+
+
+                                    <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
+                                        <a href="{{ url('hardware?status=Deployed') }}">
+                                            <i class="far fa-circle text-blue fa-fw"></i>
+                                            {{ trans('general.all') }}
+                                            {{ trans('general.deployed') }}
+                                            ({{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }})
+                                        </a>
+                                    </li>
+                                    <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
+                                        <a href="{{ url('hardware?status=RTD') }}">
+                                            <i class="far fa-circle text-green fa-fw"></i>
+                                            {{ trans('general.all') }}
+                                            {{ trans('general.ready_to_deploy') }}
+                                            ({{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }})
+                                        </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>
+                                            {{ trans('general.all') }}
+                                            {{ trans('general.pending') }}
+                                            ({{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }})
+                                        </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>
+                                            {{ trans('general.all') }}
+                                            {{ trans('general.undeployable') }}
+                                            ({{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }})
+                                        </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>
+                                            {{ trans('general.all') }}
+                                            {{ trans('general.byod') }}
+                                            ({{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }})
+                                        </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>
+                                            {{ trans('general.all') }}
+                                            {{ trans('admin/hardware/general.archived') }}
+                                            ({{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }})
+                                        </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>
+                                            {{ trans('admin/hardware/general.requestable') }}
+                                        </a>
+                                    </li>
+
+                                    @can('audit', \App\Models\Asset::class)
+                                        <li{!! (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') }}
+                                            </a>
+                                        </li>
+                                        <li{!! (Request::is('hardware/audit/overdue') ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('assets.audit.overdue') }}">
+                                                <i class="fas fa-exclamation-triangle text-red fa-fw"></i> {{ trans('general.audit_overdue') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    <li class="divider">&nbsp;</li>
+                                    @can('checkin', \App\Models\Asset::class)
+                                        <li{!! (Request::is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('hardware/quickscancheckin') }}">
+                                                {{ trans('general.quickscan_checkin') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('checkout', \App\Models\Asset::class)
+                                        <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('hardware.bulkcheckout.show') }}">
+                                                {{ trans('general.bulk_checkout') }}
+                                            </a>
+                                        </li>
+                                        <li{!! (Request::is('hardware/requested') ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('assets.requested') }}">
+                                                {{ trans('general.requested') }}</a>
+                                        </li>
+                                    @endcan
+
+                                    @can('create', \App\Models\Asset::class)
+                                        <li{!! (Request::query('Deleted') ? ' class="active"' : '') !!}>
+                                            <a href="{{ url('hardware?status=Deleted') }}">
+                                                {{ trans('general.deleted') }}
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="{{ route('maintenances.index') }}">
+                                                {{ trans('general.asset_maintenances') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+                                    @can('admin')
+                                        <li>
+                                            <a href="{{ url('hardware/history') }}">
+                                                {{ trans('general.import-history') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+                                    @can('audit', \App\Models\Asset::class)
+                                        <li>
+                                            <a href="{{ route('assets.bulkaudit') }}">
+                                                {{ trans('general.bulkaudit') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+                                </ul>
+                            </li>
+                        @endcan
+                        @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>
+                                    <span>{{ trans('general.licenses') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+                        @can('index', \App\Models\Accessory::class)
+                            <li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('accessories.index') }}">
+                                    <i class="far fa-keyboard fa-fw"></i>
+                                    <span>{{ trans('general.accessories') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+                        @can('view', \App\Models\Consumable::class)
+                            <li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
+                                <a href="{{ url('consumables') }}">
+                                    <i class="fas fa-tint fa-fw"></i>
+                                    <span>{{ trans('general.consumables') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+                        @can('view', \App\Models\Component::class)
+                            <li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('components.index') }}">
+                                    <i class="far fa-hdd fa-fw"></i>
+                                    <span>{{ trans('general.components') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+                        @can('view', \App\Models\PredefinedKit::class)
+                            <li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('kits.index') }}">
+                                    <i class="fa fa-object-group fa-fw"></i>
+                                    <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>
+                                    <span>{{ trans('general.people') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+                        @can('import')
+                            <li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('imports.index') }}">
+                                    <i class="fas fa-cloud-download-alt fa-fw" aria-hidden="true"></i>
+                                    <span>{{ trans('general.import') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+
+                        @can('backend.interact')
+                            <li 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>
+                                    <span>{{ trans('general.settings') }}</span>
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </a>
+
+                                <ul class="treeview-menu">
+                                    @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
+                                        <li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('fields.index') }}">
+                                                {{ trans('admin/custom_fields/general.custom_fields') }}
+                                            </a>
+                                        </li>
+                                    @endif
+
+                                    @can('view', \App\Models\Statuslabel::class)
+                                        <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('statuslabels.index') }}">
+                                                {{ trans('general.status_labels') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\AssetModel::class)
+                                        <li>
+                                            <a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }}>
+                                                {{ trans('general.asset_models') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Category::class)
+                                        <li>
+                                            <a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }}>
+                                                {{ trans('general.categories') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Manufacturer::class)
+                                        <li>
+                                            <a href="{{ route('manufacturers.index') }}" {{ (Request::is('/manufacturers') ? ' class="active"' : '') }}>
+                                                {{ trans('general.manufacturers') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Supplier::class)
+                                        <li>
+                                            <a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }}>
+                                                {{ trans('general.suppliers') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Department::class)
+                                        <li>
+                                            <a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }}>
+                                                {{ trans('general.departments') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Location::class)
+                                        <li>
+                                            <a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }}>
+                                                {{ trans('general.locations') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Company::class)
+                                        <li>
+                                            <a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }}>
+                                                {{ trans('general.companies') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+
+                                    @can('view', \App\Models\Depreciation::class)
+                                        <li>
+                                            <a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }}>
+                                                {{ trans('general.depreciation') }}
+                                            </a>
+                                        </li>
+                                    @endcan
+                                </ul>
+                            </li>
+                        @endcan
+
+                        @can('reports.view')
+                            <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
+                                <a href="#" class="dropdown-toggle">
+                                    <i class="fas fa-chart-bar fa-fw"></i>
+                                    <span>{{ trans('general.reports') }}</span>
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </a>
+
+                                <ul class="treeview-menu">
+                                    <li>
+                                        <a href="{{ route('reports.activity') }}" {{ (Request::is('reports/activity') ? ' class="active"' : '') }}>
+                                            {{ trans('general.activity_report') }}
+                                        </a>
+                                    </li>
+
+                                    <li>
+                                        <a href="{{ route('reports.audit') }}" {{ (Request::is('reports.audit') ? ' class="active"' : '') }}>
+                                            {{ trans('general.audit_report') }}</a>
+                                    </li>
+                                    <li>
+                                        <a href="{{ url('reports/depreciation') }}" {{ (Request::is('reports/depreciation') ? ' class="active"' : '') }}>
+                                            {{ trans('general.depreciation_report') }}
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="{{ url('reports/licenses') }}" {{ (Request::is('reports/licenses') ? ' class="active"' : '') }}>
+                                            {{ trans('general.license_report') }}
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="{{ url('reports/asset_maintenances') }}" {{ (Request::is('reports/asset_maintenances') ? ' class="active"' : '') }}>
+                                            {{ trans('general.asset_maintenance_report') }}
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="{{ url('reports/unaccepted_assets') }}" {{ (Request::is('reports/unaccepted_assets') ? ' class="active"' : '') }}>
+                                            {{ trans('general.unaccepted_asset_report') }}
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="{{ url('reports/accessories') }}" {{ (Request::is('reports/accessories') ? ' class="active"' : '') }}>
+                                            {{ trans('general.accessory_report') }}
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
+                                            {{ trans('general.custom_report') }}
+                                        </a>
+                                    </li>
+                                </ul>
+                            </li>
+                        @endcan
+
+                        @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>
+                                    <span>{{ trans('admin/hardware/general.requestable') }}</span>
+                                </a>
+                            </li>
+                        @endcan
+
+
+                    </ul>
+                </section>
+                <!-- /.sidebar -->
+            </aside>
+
+            <!-- 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>
+                            <strong>{{ strtoupper(trans('general.debug_warning')) }}:</strong>
+                            {!! trans('general.debug_warning_text') !!}
+                        </div>
+                    </div>
+                @endif
+
+                <!-- Content Header (Page header) -->
+                <section class="content-header" style="padding-bottom: 30px;">
+                    <h1 class="pull-left pagetitle">@yield('title') </h1>
+
+                    @if (isset($helpText))
+                        @include ('partials.more-info',
+                                               [
+                                                   'helpText' => $helpText,
+                                                   'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
+                                               ])
+                    @endif
+                    <div class="pull-right">
+                        @yield('header_right')
+                    </div>
+
+
+                </section>
+
+
+                <section class="content" id="main" tabindex="-1">
+
+                    <!-- Notifications -->
+                    <div class="row">
+                        @if (config('app.lock_passwords'))
+                            <div class="col-md-12">
+                                <div class="callout callout-info">
+                                    {{ trans('general.some_features_disabled') }}
+                                </div>
+                            </div>
+                        @endif
+
+                        @include('notifications')
+                    </div>
+
+
+                    <!-- Content -->
+                    <div id="{!! (Request::is('*api*') ? 'app' : 'webui') !!}">
+                        @yield('content')
+                    </div>
+
+                </section>
+
+            </div><!-- /.content-wrapper -->
+            <footer class="main-footer hidden-print">
+
+                <div class="pull-right hidden-xs">
+                    @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') }})
+                        @endif
+                    @endif
+
+                    @if ($snipeSettings->support_footer!='off')
+                        @if (($snipeSettings->support_footer=='on') || (($snipeSettings->support_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
+                            <a target="_blank" class="btn btn-default btn-xs"
+                               href="https://snipe-it.readme.io/docs/overview"
+                               rel="noopener">{{ trans('general.user_manual') }}</a>
+                            <a target="_blank" class="btn btn-default btn-xs" href="https://snipeitapp.com/support/"
+                               rel="noopener">{{ trans('general.bug_report') }}</a>
+                        @endif
+                    @endif
+
+                    @if ($snipeSettings->privacy_policy_link!='')
+                        <a target="_blank" class="btn btn-default btn-xs" rel="noopener"
+                           href="{{  $snipeSettings->privacy_policy_link }}"
+                           target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
+                    @endif
+
 
-    <div class="modal modal-danger fade" id="dataConfirmModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h2 class="modal-title" id="myModalLabel">&nbsp;</h2>
                 </div>
-                <div class="modal-body"></div>
-                <div class="modal-footer">
-                <form method="post" id="deleteForm" role="form">
-                    {{ csrf_field() }}
-                    {{ method_field('DELETE') }}
+                @if ($snipeSettings->footer_text!='')
+                    <div class="pull-right">
+                        {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
+                    </div>
+                @endif
 
-                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('general.cancel') }}</button>
-                    <button type="submit" class="btn btn-outline" id="dataConfirmOK">{{ trans('general.yes') }}</button>
-                </form>
+
+                <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>.
+            </footer>
+
+
+
+        </div><!-- ./wrapper -->
+
+
+        <!-- end main container -->
+
+        <div class="modal modal-danger fade" id="dataConfirmModal" tabindex="-1" role="dialog"
+             aria-labelledby="myModalLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                        <h2 class="modal-title" id="myModalLabel">&nbsp;</h2>
+                    </div>
+                    <div class="modal-body"></div>
+                    <div class="modal-footer">
+                        <form method="post" id="deleteForm" role="form">
+                            {{ csrf_field() }}
+                            {{ method_field('DELETE') }}
+
+                            <button type="button" class="btn btn-default pull-left"
+                                    data-dismiss="modal">{{ trans('general.cancel') }}</button>
+                            <button type="submit" class="btn btn-outline"
+                                    id="dataConfirmOK">{{ trans('general.yes') }}</button>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
 
-    <div class="modal modal-warning fade" id="restoreConfirmModal" tabindex="-1" role="dialog" aria-labelledby="confirmModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title" id="confirmModalLabel">&nbsp;</h4>
-                </div>
-                <div class="modal-body"></div>
-                <div class="modal-footer">
-                <form method="post" id="restoreForm" role="form">
-                    {{ csrf_field() }}
-                    {{ method_field('POST') }}
+        <div class="modal modal-warning fade" id="restoreConfirmModal" tabindex="-1" role="dialog"
+             aria-labelledby="confirmModalLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                        <h4 class="modal-title" id="confirmModalLabel">&nbsp;</h4>
+                    </div>
+                    <div class="modal-body"></div>
+                    <div class="modal-footer">
+                        <form method="post" id="restoreForm" role="form">
+                            {{ 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" id="dataConfirmOK">{{ trans('general.yes') }}</button>
-                </form>
+                            <button type="button" class="btn btn-default pull-left"
+                                    data-dismiss="modal">{{ trans('general.cancel') }}</button>
+                            <button type="submit" class="btn btn-outline"
+                                    id="dataConfirmOK">{{ trans('general.yes') }}</button>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    {{-- Javascript files --}}
-    <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
-    <script defer src="{{ url(mix('js/dist/all-defer.js')) }}" nonce="{{ csrf_token() }}"></script>
+        {{-- Javascript files --}}
+        <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
+        <script defer src="{{ url(mix('js/dist/all-defer.js')) }}" nonce="{{ csrf_token() }}"></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>
+        <!-- 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>
 
-    {{-- Page level javascript --}}
-    @stack('js')
+        {{-- Page level javascript --}}
+        @stack('js')
 
-    @section('moar_scripts')
-    @show
+        @section('moar_scripts')
+        @show
 
 
-    <script nonce="{{ csrf_token() }}">
+        <script nonce="{{ csrf_token() }}">
 
 
-        // ignore: 'input[type=hidden]' is required here to validate the select2 lists
-        $.validate({
-            form : '#create-form',
-            modules : 'date, toggleDisabled',
-            disabledFormFilter : '#create-form',
-            showErrorDialogs : true,
-            ignore: 'input[type=hidden]'
-        });
+            // ignore: 'input[type=hidden]' is required here to validate the select2 lists
+            $.validate({
+                form: '#create-form',
+                modules: 'date, toggleDisabled',
+                disabledFormFilter: '#create-form',
+                showErrorDialogs: true,
+                ignore: 'input[type=hidden]'
+            });
 
 
+            $(function () {
 
+                $('[data-tooltip="true"]').tooltip();
+                $('[data-toggle="popover"]').popover();
+                $('.select2 span').addClass('needsclick');
+                $('.select2 span').removeAttr('title');
 
+                // This javascript handles saving the state of the menu (expanded or not)
+                $('body').bind('expanded.pushMenu', function () {
+                    $.ajax({
+                        type: 'GET',
+                        url: "{{ route('account.menuprefs', ['state'=>'open']) }}",
+                        _token: "{{ csrf_token() }}"
+                    });
 
-        $(function () {
-  
-            $('[data-toggle="tooltip"]').tooltip();
-            $('[data-toggle="popover"]').popover();
-            $('.select2 span').addClass('needsclick');
-            $('.select2 span').removeAttr('title');
+                });
 
-            // This javascript handles saving the state of the menu (expanded or not)
-            $('body').bind('expanded.pushMenu', function() {
-                $.ajax({
-                    type: 'GET',
-                    url: "{{ route('account.menuprefs', ['state'=>'open']) }}",
-                    _token: "{{ csrf_token() }}"
+                $('body').bind('collapsed.pushMenu', function () {
+                    $.ajax({
+                        type: 'GET',
+                        url: "{{ route('account.menuprefs', ['state'=>'close']) }}",
+                        _token: "{{ csrf_token() }}"
+                    });
                 });
 
             });
 
-            $('body').bind('collapsed.pushMenu', function() {
-                $.ajax({
-                    type: 'GET',
-                    url: "{{ route('account.menuprefs', ['state'=>'close']) }}",
-                    _token: "{{ csrf_token() }}"
-                });
+            // Initiate the ekko lightbox
+            $(document).on('click', '[data-toggle="lightbox"]', function (event) {
+                event.preventDefault();
+                $(this).ekkoLightbox();
             });
 
-        });
 
-        // Initiate the ekko lightbox
-        $(document).on('click', '[data-toggle="lightbox"]', function(event) {
-            event.preventDefault();
-            $(this).ekkoLightbox();
-        });
+        </script>
 
+        @if ((Session::get('topsearch')=='true') || (Request::is('/')))
+            <script nonce="{{ csrf_token() }}">
+                $("#tagSearch").focus();
+            </script>
+        @endif
 
+        @include('partials.bpay')
 
-    </script>
+        @livewireScripts
 
-    @if ((Session::get('topsearch')=='true') || (Request::is('/')))
-    <script nonce="{{ csrf_token() }}">
-         $("#tagSearch").focus();
-    </script>
-    @endif
-
-    @livewireScripts
-    
-  </body>
+        </body>
 </html>
diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index cb17931031..791590141c 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -31,35 +31,34 @@
         <!-- box -->
         <div class="box box-default">
             <!-- box-header -->
-            <div class="box-header with-border text-right">
+            <div class="box-header with-border">
+
+                @if ((isset($topSubmit) && ($topSubmit=='true')) || (isset($item->id)))
 
                 <div class="col-md-12 box-title text-right" style="padding: 0px; margin: 0px;">
-
-                    <div class="col-md-12" style="padding: 0px; margin: 0px;">
                         <div class="col-md-9 text-left">
                             @if ($item->id)
-                                <h2 class="box-title text-left" style="padding-top: 8px;">
+                                <h2 class="box-title" style="padding-top: 8px; padding-bottom: 7px;">
                                     {{ $item->display_name }}
                                 </h2>
                             @endif
                         </div>
+                        @if (isset($topSubmit) && ($topSubmit=='true'))
                         <div class="col-md-3 text-right" style="padding-right: 10px;">
-                            <a class="btn btn-link text-left" href="{{ URL::previous() }}">
-                                {{ trans('button.cancel') }}
-                            </a>
-                            <button type="submit" class="btn btn-primary">
+                            <button type="submit" class="btn btn-primary pull-right">
                                 <i class="fas fa-check icon-white" aria-hidden="true"></i>
                                 {{ trans('general.save') }}
                             </button>
                         </div>
-                    </div>
+                        @endif
                 </div>
-
             </div><!-- /.box-header -->
+            @endif
 
             <!-- box-body -->
             <div class="box-body">
 
+                <div style="padding-top: 30px;">
                     @if ($item->id)
                     {{ method_field('PUT') }}
                     @endif
@@ -68,6 +67,7 @@
                     {{ csrf_field() }}
                     @yield('inputFields')
                     @include('partials.forms.edit.submit')
+                </div>
 
             </div> <!-- ./box-body -->
         </div> <!-- box -->
diff --git a/resources/views/layouts/setup.blade.php b/resources/views/layouts/setup.blade.php
index 3c11b2ece9..13270a4d5d 100644
--- a/resources/views/layouts/setup.blade.php
+++ b/resources/views/layouts/setup.blade.php
@@ -4,12 +4,13 @@
     <head>
       <title>
         @section('title')
-         Snipe-IT Setup
+         Snipe-IT {{ trans('general.setup') }}
         @show
       </title>
         <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
 
 
+
         <script nonce="{{ csrf_token() }}">
             window.snipeit = {
                 settings: {
@@ -57,7 +58,7 @@
           <div class="container">
               <div class="row">
                   <div class="col-lg-10 col-lg-offset-1">
-                    <h1 class="page-header">Snipe-IT Pre-Flight</h1>
+                    <h1 class="page-header">Snipe-IT {{ trans('general.pre_flight') }}</h1>
                   </div>
                   <div class="col-lg-11 col-lg-offset-1">
 
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 77e58e2fdb..4d41d8c03b 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -65,7 +65,7 @@
                 </div>
 
 
-                @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->slack_endpoint!=''))
+                @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
                     <div class="form-group notification-callout">
                         <div class="col-md-8 col-md-offset-3">
                             <div class="callout callout-info">
@@ -88,9 +88,9 @@
                                     <br>
                                 @endif
 
-                                @if ($snipeSettings->slack_endpoint!='')
+                                @if ($snipeSettings->webhook_endpoint!='')
                                     <i class="fab fa-slack"></i>
-                                    {{ trans('general.slack_msg_note') }}
+                                    {{ trans('general.webhook_msg_note') }}
                                 @endif
                             </div>
                         </div>
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index 0936f8b2b7..cdbbc23e74 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -56,10 +56,14 @@
 
 <!-- Reassignable -->
 <div class="form-group {{ $errors->has('reassignable') ? ' has-error' : '' }}">
-    <label for="reassignable" class="col-md-3 control-label">{{ trans('admin/licenses/form.reassignable') }}</label>
-    <div class="col-md-7 input-group">
-        {{ Form::Checkbox('reassignable', '1', old('reassignable', $item->id ? $item->reassignable : '1'),array('class' => 'minimal', 'aria-label'=>'reassignable')) }}
+    <div class="col-md-3 control-label">
+        <strong>{{ trans('admin/licenses/form.reassignable') }}</strong>
+    </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')) }}
         {{ trans('general.yes') }}
+        </label>
     </div>
 </div>
 
@@ -73,9 +77,9 @@
 <div class="form-group {{ $errors->has('expiration_date') ? ' has-error' : '' }}">
     <label for="expiration_date" class="col-md-3 control-label">{{ trans('admin/licenses/form.expiration') }}</label>
 
-    <div class="input-group col-md-3">
+    <div class="input-group col-md-4">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true" 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) }}">
+            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ old('expiration_date', $item->expiration_date) }}" maxlength="10">
             <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
         </div>
         {!! $errors->first('expiration_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -87,9 +91,9 @@
 <div class="form-group {{ $errors->has('termination_date') ? ' has-error' : '' }}">
     <label for="termination_date" class="col-md-3 control-label">{{ trans('admin/licenses/form.termination_date') }}</label>
 
-    <div class="input-group col-md-3">
+    <div class="input-group col-md-4">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" 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) }}">
+            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ old('termination_date', $item->termination_date) }}" maxlength="10">
             <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
         </div>
         {!! $errors->first('termination_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -110,10 +114,12 @@
 
 <!-- Maintained -->
 <div class="form-group {{ $errors->has('maintained') ? ' has-error' : '' }}">
-    <label for="maintained" class="col-md-3 control-label">{{ trans('admin/licenses/form.maintained') }}</label>
-    <div class="checkbox col-md-7">
-        {{ Form::Checkbox('maintained', '1', old('maintained', $item->maintained),array('class' => 'minimal', 'aria-label'=>'maintained')) }}
+    <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')) }}
         {{ trans('general.yes') }}
+        </label>
     </div>
 </div>
 
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index b8f6d7f684..8dcf10caf2 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -10,7 +10,7 @@
 {{-- Page content --}}
 @section('content')
 <div class="row">
-  <div class="col-md-12">
+  <div class="col-md-9">
 
     <!-- Custom Tabs -->
     <div class="nav-tabs-custom">
@@ -56,21 +56,7 @@
             <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
           </a>
         </li>
-
-    
-        @can('update', $license)
-          <li class="dropdown pull-right">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="fas fa-cog" aria-hidden="true"></i> {{ trans('button.actions') }}
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="{{ route('licenses.edit', $license->id) }}">{{ trans('admin/licenses/general.edit') }}</a></li>
-              <li><a href="{{ route('clone/license', $license->id) }}">{{ trans('admin/licenses/general.clone') }}</a></li>
-            </ul>
-          </li>
-        @endcan
-
+        
         @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>
@@ -332,7 +318,7 @@
                       </strong>
                     </div>
                     <div class="col-md-9">
-                      {!! $license->maintained ? '<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') !!}
+                      {!! $license->maintained ? '<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') !!}
                     </div>
                   </div>
 
@@ -358,7 +344,7 @@
                       </strong>
                     </div>
                     <div class="col-md-9">
-                      {{ $license->reassignable ? 'Yes' : 'No' }}
+                      {!! $license->reassignable ? '<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') !!}
                     </div>
                   </div>
 
@@ -371,15 +357,17 @@
                       </strong>
                     </div>
                     <div class="col-md-9">
-                      {!! nl2br(e($license->notes)) !!}
+                      {!! nl2br(Helper::parseEscapedMarkedownInline($license->notes)) !!}
                     </div>
                   </div>
                   @endif
 
               </div> <!-- end row-striped -->
             </div>
-            </div>
-          </div> <!-- end tab-pane -->
+
+
+          </div>
+       </div> <!-- end tab-pane -->
 
 
 
@@ -550,13 +538,100 @@
               </table>
               </div>
             </div> <!-- /.col-md-12-->
+
+
           </div> <!-- /.row-->
         </div> <!-- /.tab-pane -->
+
       </div> <!-- /.tab-content -->
+
     </div> <!-- nav-tabs-custom -->
   </div>  <!-- /.col -->
+  <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>
+    @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;">
+          {{ 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">
+          {{ 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 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>
+      @endif
+    @endcan
+
+    @can('checkin', $license)
+
+      @if (($license->seats - $license->availCount()->count()) > 0 )
+        <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;">
+          {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
+        </a>
+      @else
+        <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;">
+             {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
+            </a>
+          </span>
+      @endif
+    @endcan
+
+    @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">
+          {{ 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">
+              {{ trans('general.delete') }}
+            </a>
+          </span>
+      @endif
+    @endcan
+  </div>
+
 </div> <!-- /.row -->
 
+
+@can('checkin', \App\Models\License::class)
+  @include ('modals.confirm-action',
+        [
+            'modal_name' => 'checkinFromAllModal',
+            'route' => route('licenses.bulkcheckin', $license->id),
+            'title' => trans('general.modal_confirm_generic'),
+            'body' => trans_choice('admin/licenses/general.bulk.checkin_all.modal', 2, ['checkedout_seats_count' => $checkedout_seats_count])
+        ])
+@endcan
+
+@can('checkout', \App\Models\License::class)
+  @include ('modals.confirm-action',
+        [
+            'modal_name' => 'checkoutFromAllModal',
+            'route' => route('licenses.bulkcheckout', $license->id),
+            'title' => trans('general.modal_confirm_generic'),
+            'body' => trans_choice('admin/licenses/general.bulk.checkout_all.modal', 2, ['available_seats_count' => $available_seats_count])
+        ])
+@endcan
+
+
+
 @can('update', \App\Models\License::class)
   @include ('modals.upload-file', ['item_type' => 'license', 'item_id' => $license->id])
 @endcan
@@ -565,5 +640,15 @@
 
 
 @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);
+    });
+
+  </script>
   @include ('partials.bootstrap-table')
 @stop
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 2e7be41d3c..19b2b4dbe3 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,15 +1,15 @@
 <span> {{-- This <span> doesn't seem to fix it, neither does a div? --}}
     <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>
-        <span wire:ignore> {{-- wire:ignore is because Select 2 mangles the dom in many awful ways, and so does iCheckbox --}}
-            <div class="col-md-9">
-                {{ Form::select('custom_fieldset', Helper::customFieldsetList(), old('custom_fieldset', $fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px', 'aria-label'=>'custom_fieldset', 'wire:model' => 'fieldset_id', 'id' => 'glooobits')) }} {{-- when we have this wrapped in 'ignore', the wire:model won't work --}}
+            <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' => $_instance->id)) }}
                 {!! $errors->first('custom_fieldset', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
-                <label class="m-l-xs">
-                    {{ Form::checkbox('add_default_values', 1, Request::old('add_default_values', $add_default_values), ['class' => 'minimal', 'wire:model' => "add_default_values", 'id' => 'add_default_values']) }}
+            </div>
+            <div class="col-md-3">
+                    <label class="form-control">
+                    {{ Form::checkbox('add_default_values', 1, old('add_default_values', $add_default_values), ['data-livewire-component' => $_instance->id, 'id' => 'add_default_values', 'wire:model' => 'add_default_values']) }}
                     {{ trans('admin/models/general.add_default_values') }}
                 </label>
-                </span>
             </div>
     </div>
     @if ($this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}}
@@ -32,7 +32,7 @@
                                 @elseif ($field->element == "text")
                                     <input class="form-control m-b-xs" type="text" value="{{ $field->defaultValue($model_id) }}" id="default-value{{ $field->id }}" name="default_values[{{ $field->id }}]">
                                 @elseif($field->element == "textarea")
-                                    <textarea class="form-control" id="default-value{{ $field->id }}" name="default_values[{{ $field->id }}]">{{ $field->defaultValue($model_id) }}</textarea><br>
+                                    <textarea class="form-control" style="width: 100%;" id="default-value{{ $field->id }}" name="default_values[{{ $field->id }}]">{{ $field->defaultValue($model_id) }}</textarea><br>
                                 @elseif($field->element == "listbox")
 
                                     <select class="form-control m-b-xs" name="default_values[{{ $field->id }}]">
@@ -63,34 +63,4 @@
         </div>
     </div>
     @endif
-    <script>
-    // *still* haven't figured out why this doesn't seem to work at all...
-    // And even if it did, I hate having $(function () {}) as my DOM-ready checker in some places, and
-    // DOMContentLoaded in another...
-    /* document.addEventListener("DOMContentLoaded", function () {
-         Livewire.hook('component.initialized', function (component) {
-            $('#glooobits').on('select2:select',function (event) { //'change' seems to be the jquery-compatible version but I think the select2 versions might be nicer.
-                console.log("Select2 has changed!!!!!")
-                console.dir(event)
-                @this.set('fieldset_id',event.params.data.id)
-                // Livewire.first().set('fieldset_id',event.params.data.id) // I still don't know why @this does'nt work here?
-            })
-
-         })
-    }) */
-
-    </script>
-    @push('js')
-    <script>
-    $(function () {
-        $('#glooobits').on('select2:select',function (event) { //'change' seems to be the jquery-compatible version but I think the select2 versions might be nicer.
-            {{-- @this.set('fieldset_id',event.params.data.id) --}}
-            Livewire.first().set('fieldset_id',event.params.data.id) // I still don't know why @this does'nt work here?
-        })
-        $('#add_default_values').on('ifToggled',function (event) {
-            Livewire.first().set('add_default_values',event.target.checked)
-        })
-    })
-    </script>
-    @endpush
 </span>
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
new file mode 100644
index 0000000000..60f4502b22
--- /dev/null
+++ b/resources/views/livewire/importer.blade.php
@@ -0,0 +1,393 @@
+@section('title')
+    {{ trans('general.import') }}
+    @parent
+@stop
+<div>
+    {{-- Livewire requires a 'master' <div>, above --}}
+        <div class="row">
+
+{{-- alert --}}
+@if($message != '')
+    <div class="col-md-12" class="{{ $message_type }}">
+        <div class="alert alert-{{ $this->message_type }} ">
+            <button type="button" class="close" wire:click="$set('message','')">&times;</button>
+            @if($message_type == 'success')
+                <i class="fas fa-check faa-pulse animated" aria-hidden="true"></i>
+            @endif
+            <strong>{{-- title --}} </strong>
+            {{ $message }}
+        </div>
+    </div>
+@endif
+
+@if($import_errors)
+            <div class="box">
+                <div class="box-body">
+                    <div class="alert alert-warning">
+                        <strong><i class="fa fa-warning info" aria-hidden="true"></i> {{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}</strong>
+                    </div>
+
+                    <div class="errors-table">
+                        <table class="table table-striped table-bordered" id="errors-table">
+                            <thead>
+                            <th>{{ trans('general.item') }}</th>
+                            <th>{{ trans('general.error') }}</th>
+                            </thead>
+                            <tbody>
+                            @php \Log::debug("import errors are: ".print_r($import_errors,true)); @endphp
+                            @foreach($import_errors AS $key => $actual_import_errors)
+                                @php \Log::debug("Key is: $key"); @endphp
+                                @foreach($actual_import_errors AS $table => $error_bag)
+                                    @php \Log::debug("Table is: $table"); @endphp
+                                    @foreach($error_bag as $field => $error_list)
+                                        @php \Log::debug("Field is: $field"); @endphp
+                                        <tr>
+                                            <td>{{ $activeFile->file_path ?? "Unknown File" }}</td>
+                                            <td>
+                                                <b>{{ $field }}:</b>
+                                                <span>{{ implode(", ",$error_list) }}</span>
+                                                <br />
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                @endforeach
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+@endif
+
+            <div class="col-md-9">
+                <div class="box">
+                    <div class="box-body">
+                        <div class="row">
+
+                            <div class="col-md-12">
+                                @if($progress != -1)
+                                    <div class="col-md-9" style="padding-bottom:20px" id='progress-container'>
+                                        <div class="progress progress-striped-active" style="margin-top: 8px"> {{-- so someof these values are in importer.vue! --}}
+                                            <div id='progress-bar' class="progress-bar {{ $progress_bar_class }}" role="progressbar" style="width: {{ $progress }}%">
+                                                <span id='progress-text'>{{ $progress_message }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endif
+
+                                <div class="col-md-3 text-right pull-right">
+
+                                    <!-- The fileinput-button span is used to style the file input field as button -->
+                                    @if (!config('app.lock_passwords'))
+                                        <span class="btn btn-primary fileinput-button">
+                                        <span>{{ trans('button.select_file') }}</span>
+                                         <!-- The file input field used as target for the file upload widget -->
+                                        <label for="files[]"><span class="sr-only">{{ trans('admin/importer/general.select_file') }}</span></label>
+                                        <input id="fileupload" type="file" name="files[]" data-url="{{ route('api.imports.index') }}" accept="text/csv" aria-label="files[]">
+                                        </span>
+                                    @endif
+
+                                </div>
+
+                            </div>
+
+
+
+                        </div>
+                        <div class="row">
+                            <div class="col-md-12 table-responsive" style="padding-top: 30px;">
+                                <table data-pagination="true"
+                                        data-id-table="upload-table"
+                                        data-search="true"
+                                        data-side-pagination="client"
+                                        id="upload-table"
+                                        class="col-md-12 table table-striped snipe-table">
+
+                                    <tr>
+                                        <th class="col-md-6">
+                                            {{ trans('general.file_name') }}
+                                        </th>
+                                        <th class="col-md-3">
+                                            {{ trans('general.created_at') }}
+                                        </th>
+                                        <th class="col-md-1">
+                                            {{ trans('general.filesize') }}
+                                        </th>
+                                        <th class="col-md-1 text-right">
+                                            <span class="sr-only">{{ trans('general.actions') }}</span>
+                                        </th>
+                                    </tr>
+
+                                    @foreach($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>
+                                                <td class="col-md-1 text-right" style="white-space: nowrap;">
+                                                    <button class="btn btn-sm btn-info" wire:click="selectFile({{ $currentFile->id }})">
+                                                        <i class="fas fa-retweet fa-fw" aria-hidden="true"></i>
+                                                        <span class="sr-only">{{ trans('general.import') }}</span>
+                                                    </button>
+                                                    <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>
+                                    			</td>
+                                    		</tr>
+
+                                            @if( $currentFile && $activeFile && ($currentFile->id == $activeFile->id))
+                                                <tr class="warning">
+                                                    <td colspan="4">
+
+                                                        <div class="form-group">
+
+                                                                <label for="activeFile.import_type" class="col-md-3 col-xs-12">
+                                                                    {{ trans('general.import_type') }}
+                                                                </label>
+
+                                                                <div class="col-md-9 col-xs-12">
+                                                                    {{ 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' => $_instance->id
+                                                                    ]) }}
+                                                                    @if ($activeFile->import_type === 'asset' && $snipeSettings->auto_increment_assets == 0)
+                                                                        <p class="help-block">
+                                                                            {{ trans('general.auto_incrementing_asset_tags_disabled_so_tags_required') }}
+                                                                        </p>
+                                                                    @endif
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="form-group col-md-9 col-md-offset-3">
+                                                                <label class="form-control">
+                                                                    <input type="checkbox" name="update" data-livewire-component="{{ $_instance->id }}" wire:model="update">
+                                                                    {{ trans('general.update_existing_values') }}
+                                                                </label>
+                                                                @if ($activeFile->import_type === '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
+
+                                                                <label class="form-control">
+                                                                    <input type="checkbox" name="send_welcome" data-livewire-component="{{ $_instance->id }}" wire:model="send_welcome">
+                                                                    {{ trans('general.send_welcome_email_to_users') }}
+                                                                </label>
+
+                                                                <label class="form-control">
+                                                                    <input type="checkbox" name="run_backup" data-livewire-component="{{ $_instance->id }}" wire:model="run_backup">
+                                                                    {{ trans('general.back_before_importing') }}
+                                                                </label>
+
+                                                            </div>
+
+
+                                                            @if($statusText)
+                                                                <div class="alert col-md-8 col-md-offset-3{{ $statusType == 'success' ? ' alert-success' : ($statusType == 'error' ? ' alert-danger' : ' alert-info') }}" style="padding-top: 20px;">
+                                                                    {!! $statusText !!}
+                                                                </div>
+                                                            @endif
+
+
+                                                            @if ($activeFile->import_type)
+                                                                <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>
+                                                                    <hr style="border-top: 1px solid lightgray">
+                                                                </div>
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="col-md-3 text-right">
+                                                                        <strong>{{ trans('general.csv_header_field') }}</strong>
+                                                                    </div>
+                                                                    <div class="col-md-4">
+                                                                        <strong>{{ trans('general.import_field') }}</strong>
+                                                                    </div>
+                                                                    <div class="col-md-5">
+                                                                        <strong>{{ trans('general.sample_value') }}</strong>
+                                                                    </div>
+                                                                </div><!-- /div row -->
+
+                                                                @if($activeFile->header_row)
+
+                                                                    @foreach($activeFile->header_row 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">
+
+                                                                                {{ 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' => $_instance->id
+                                                                                    ],[
+                                                                                        '-' => ['disabled' => true] // this makes the "-----" line unclickable
+                                                                                    ])
+                                                                                }}
+                                                                            </div>
+                                                                            <div class="col-md-5">
+                                                                                <p class="form-control-static">{{ str_limit($activeFile->first_row[$index], 50, '...') }}</p>
+                                                                            </div>
+                                                                        </div><!-- /div row -->
+                                                                    @endforeach
+                                                                @else
+                                                                    {{ trans('general.no_headers') }}
+                                                                @endif
+
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="col-md-3 text-left">
+                                                                        <a href="#" wire:click="$set('activeFile',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>
+                                                                        <br><br>
+                                                                    </div>
+                                                                </div>
+
+                                                                @if($statusText)
+                                                                    <div class="alert col-md-8 col-md-offset-3{{ $statusType == 'success' ? ' alert-success' : ($statusType == 'error' ? ' alert-danger' : ' alert-info') }}" style="padding-top: 20px;">
+                                                                        {!! $statusText !!}
+                                                                    </div>
+                                                                @endif
+                                                            @else
+                                                                <div class="form-group col-md-10">
+                                                                    <div class="col-md-3 text-left">
+                                                                        <a href="#" wire:click="$set('activeFile',null)">{{ trans('general.cancel') }}</a>
+                                                                    </div>
+                                                                </div>
+                                                            @endif {{-- end of if ... activeFile->import_type --}}
+
+                                                        </div><!-- /div v-show -->                                                    </td>
+                                                </tr>
+                                            @endif
+                                            </tr>
+                                    @endforeach
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <h2>{{ trans('general.importing') }}</h2>
+                <p>{!!   trans('general.importing_help') !!}</p>
+            </div>
+
+        </div>
+</div>
+@push('js')
+    <script>
+
+        {{-- TODO: Maybe change this to the file upload thing that's baked-in to Livewire? --}}
+        $('#fileupload').fileupload({
+            dataType: 'json',
+            done: function(e, data) {
+                @this.progress_bar_class = 'progress-bar-success';
+                @this.progress_message = '{{ trans('general.notification_success') }}'; // TODO - we're already round-tripping to the server here - I'd love it if we could get internationalized text here
+                @this.progress = 100;
+            },
+            add: function(e, data) {
+                data.headers = {
+                    "X-Requested-With": 'XMLHttpRequest',
+                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                };
+                data.process().done( function () {data.submit();});
+                @this.progress = 0;
+            },
+            progress: function(e, data) {
+                @this.progress = parseInt((data.loaded / data.total * 100, 10));
+                @this.progress_message = @this.progress+'% Complete'; // TODO - make this use general.percent_complete as a translation, passing :percent as a variable
+            },
+            fail: function(e, data) {
+                @this.progress_bar_class = "progress-bar-danger";
+                @this.progress = 100;
+
+                var error_message = ''
+                for(var i in data.jqXHR.responseJSON.messages) {
+                    error_message += i+": "+data.jqXHR.responseJSON.messages[i].join(", ")
+                }
+                @this.progress_message = error_message;
+            }
+        })
+
+        // For the importFile part:
+        $(function () {
+
+
+            // 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(!@this.activeFile.import_type) {
+                    @this.statusType='error';
+                    @this.statusText= "An import type is required... "; //TODO: translate?
+                    return;
+                }
+                @this.statusType ='pending';
+                @this.statusText = '<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{ trans('admin/hardware/form.processing_spinner') }}';
+                @this.generate_field_map().then(function (mappings_raw) {
+                    var mappings = JSON.parse(mappings_raw)
+                    // console.warn("Here is the mappings:")
+                    // console.dir(mappings)
+                    // console.warn("Uh, active file id is, I guess: "+@this.activeFile.id)
+                    var this_file = @this.file_id; // okay, I actually don't know what I'm doing here.
+                    $.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
+                        contentType: 'application/json',
+                        data: JSON.stringify({
+                            'import-update': !!@this.update,
+                            'send-welcome': !!@this.send_welcome,
+                            'import-type': @this.activeFile.import_type,
+                            'run-backup': !!@this.run_backup,
+                            'column-mappings': mappings
+                        }),
+                        headers: {
+                            "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                        }
+                    }).done( function (body) {
+                        // Success
+                        @this.statusType="success";
+                        @this.statusText = "{{ trans('general.success_redirecting') }}";
+                        // console.dir(body)
+                        window.location.href = body.messages.redirect_url;
+                    }).fail( function (jqXHR, textStatus, error) {
+                        // Failure
+                        var body = jqXHR.responseJSON
+                        if((body) && (body.status) && body.status == 'import-errors') {
+                            @this.emit('importError', body.messages);
+                            @this.import_errors = body.messages
+
+                            @this.statusType='error';
+                            @this.statusText = "Error";
+
+                        //  If Slack/notifications hits API thresholds, we *do* 500, but we never
+                        //  actually surface that info.
+                        //
+                        // A 500 on notifications doesn't mean your import failed, so this is a confusing state.
+                        //
+                        //  Ideally we'd have a message like "Your import worked, but not all
+                        // notifications could be sent".
+                        } else {
+                            console.warn("Not import-errors, just regular errors - maybe API limits")
+                            @this.message_type="warning"
+                            if ((body) && (error in body)) {
+                                @this.message = body.error ? body.error:"Unknown error - might just be throttling by notifications."
+                            } else {
+                                @this.message = "{{ trans('general.importer_generic_error') }}"
+                            }
+
+                        }
+                        @this.activeFile = null; //@this.set('hideDetails')
+                    });
+                })
+                return false;
+            });})
+
+    </script>
+@endpush
diff --git a/resources/views/livewire/login-form.blade.php b/resources/views/livewire/login-form.blade.php
index 6561adc8e1..264361c133 100644
--- a/resources/views/livewire/login-form.blade.php
+++ b/resources/views/livewire/login-form.blade.php
@@ -62,8 +62,9 @@
                                     </div>
                                     <div class="form-group">
                                         <div class="checkbox">
-                                            <label style="margin-left: -20px;">
-                                                <input name="remember" type="checkbox" value="1" class="minimal"> {{ trans('auth/general.remember_me')  }}
+                                            <label class="form-control">
+                                                <input name="remember" type="checkbox" value="1">
+                                                {{ trans('auth/general.remember_me')  }}
                                             </label>
                                         </div>
                                 </div>
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
new file mode 100644
index 0000000000..a3c6ddc0fa
--- /dev/null
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -0,0 +1,187 @@
+{{-- Page title --}}
+@section('title')
+{{ trans('admin/settings/general.webhook_title') }}
+@parent
+@stop
+
+@section('header_right')
+<a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
+@stop
+
+
+{{-- Page content --}}
+@section('content')
+
+<div><!-- livewire div - do not remove -->
+    <form class="form-horizontal" role="form" wire:submit.prevent="submit">
+        {{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="{{$webhook_icon}}"></i> {{ trans('admin/settings/general.webhook', ['app' => $webhook_name] ) }}
+                        </h2>
+                    </div>
+
+                <div class="box-body">
+                    @if($webhook_selected != 'general')
+                    <div class="col-md-12">
+                            <p>
+                                {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!}
+                            </p>
+                        <br>
+                    </div>
+                    @endif
+
+                    <div class="col-md-12" style="border-top: 0px;">
+
+                        @if(session()->has('success'))
+                            <div class="alert alert-success fade in">
+                                {{session('success')}}
+                            </div>
+                        @endif
+                        @if(session()->has('error'))
+                            <div class="alert alert-danger fade in">
+                                {{session('error')}}
+                            </div>
+                        @endif
+
+                        <div class="form-group">
+                            <div class="col-md-2">
+                                <label for="webhook_selected">
+                                    {{ trans('general.integration_option') }}
+
+								</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')), 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')), 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
+
+                            </div>
+                        </div>
+
+                        @if (Helper::isDemoMode())
+                            @include('partials.forms.demo-mode')
+                        @endif
+
+                        <!--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 ])) }}
+                            </div>
+                            <div class="col-md-9 required">
+                                    <input type="text" wire:model="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>
+
+                        @if (Helper::isDemoMode())
+                            @include('partials.forms.demo-mode')
+                        @endif
+
+
+                        <!-- Webhook channel -->
+                        <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 ])) }}
+                            </div>
+                            <div class="col-md-9 required">
+                                    <input type="text" wire:model="webhook_channel" class="form-control" placeholder="#IT-Ops" value="{{ old('webhook_channel', $webhook_channel) }}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
+
+                                {!! $errors->first('webhook_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                            </div>
+                        </div>
+
+                        @if (Helper::isDemoMode())
+                            @include('partials.forms.demo-mode')
+                        @endif
+
+                        <!-- Webhook botname -->
+                        <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 ])) }}
+                            </div>
+                            <div class="col-md-9">
+                                    <input type="text" wire:model="webhook_botname" class='form-control' placeholder="Snipe-Bot" {{ old('webhook_botname', $webhook_botname)}}{{ Helper::isDemoMode() ? ' disabled' : ''}}>
+                                {!! $errors->first('webhook_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                            </div><!--col-md-10-->
+                        </div>
+
+                        @if (!Helper::isDemoMode())
+                            @include('partials.forms.demo-mode')
+                        @endif
+
+                        <!--Webhook Integration Test-->
+                        @if($webhook_selected == 'slack')
+                            @if($webhook_endpoint != null && $webhook_channel != null)
+                                <div class="form-group">
+                                    <div class="col-md-offset-2 col-md-9">
+                                        <a href="#" wire:click.prevent="testWebhook"
+                                           class="btn btn-default btn-sm pull-left">
+                                            <i class="{{$webhook_icon}}" aria-hidden="true"></i>
+                                                {!! trans('admin/settings/general.webhook_test',['app' => ucwords($webhook_selected) ]) !!}
+                                        </a>
+                                        <div wire:loading>
+                                            <span style="padding-left: 5px; font-size: 20px">
+                                                <i class="fas fa-spinner fa-spin" aria-hidden="true"></i>
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            @endif
+                        @endif
+                    </div><!-- /.col-md-12 -->
+               </div><!-- /.box-body -->
+
+                <div class="box-footer">
+                    <div class="text-right col-md-12">
+
+                        <button type="reset" wire:click.prevent="clearSettings" class="col-md-2 text-left btn btn-danger pull-left"{{ Helper::isDemoMode() ? ' disabled' : ''}}>{{ trans('general.clear_and_save') }}</button>
+
+                        <a class="btn btn-link pull-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
+
+
+                        <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>
+
+                    </div> <!-- /.col-md-12 -->
+                </div><!--box-footer-->
+
+           </div> <!-- /.box -->
+       </div> <!-- /.col-md-8-->
+    </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);
+        });
+
+        // Re-render select2
+        window.livewire.hook('message.processed', function (el, component) {
+            $('.select2').select2();
+        });
+    });
+
+
+</script>
+@endsection
+
+
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index c7fe202fa8..95ba245359 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'])
 
+@include ('partials.forms.edit.phone')
+@include ('partials.forms.edit.fax')
+
 <!-- Currency -->
 <div class="form-group {{ $errors->has('currency') ? ' has-error' : '' }}">
     <label for="currency" class="col-md-3 control-label">
@@ -43,68 +46,6 @@
     </div>
 @endif
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-9">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
-            </label>
-            <br>
-            <img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" alt="Image for {{ $item->name }}">
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('locations_upload_path')])
 @stop
 
-@if (!$item->id)
-@section('moar_scripts')
-<script nonce="{{ csrf_token() }}">
-
-    var $eventSelect = $(".parent");
-    $eventSelect.on("change", function () { parent_details($eventSelect.val()); });
-    $(function() {
-        var parent_loc = $(".parent option:selected").val();
-        if(parent_loc!=''){
-            parent_details(parent_loc);
-        }
-    });
-
-    function parent_details(id) {
-
-        if (id) {
-//start ajax request
-$.ajax({
-    type: 'GET',
-    url: "{{url('/') }}/api/locations/"+id+"/check",
-//force to handle it as text
-dataType: "text",
-success: function(data) {
-    var json = $.parseJSON(data);
-    $("#city").val(json.city);
-    $("#address").val(json.address);
-    $("#address2").val(json.address2);
-    $("#state").val(json.state);
-    $("#zip").val(json.zip);
-    $(".country").select2("val",json.country);
-}
-});
-} else {
-    $("#city").val('');
-    $("#address").val('');
-    $("#address2").val('');
-    $("#state").val('');
-    $("#zip").val('');
-    $(".country").select2("val",'');
-}
-
-
-
-};
-</script>
-@stop
-@endif
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
index cdba0aca91..9f54978ff5 100644
--- a/resources/views/locations/print.blade.php
+++ b/resources/views/locations/print.blade.php
@@ -36,13 +36,13 @@
 
         <h3>
         @if ($snipeSettings->logo!='')
-            <img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
         @endif
         {{ $snipeSettings->site_name }}
         </h3>
     @elseif ($snipeSettings->brand == '2')
         @if ($snipeSettings->logo!='')
-            <img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
         @endif
     @else
       <h3>{{ $snipeSettings->site_name }}</h3>
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 355dd478df..6e87344053 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -30,6 +30,17 @@
         </div>
     </div>
 
+    <!-- Warranty Lookup URL -->
+    <div class="form-group {{ $errors->has('warranty_lookup_url') ? ' has-error' : '' }}">
+        <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) }}" />
+            <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>
+    </div>
+
     <!-- Support Phone -->
     <div class="form-group {{ $errors->has('support_phone') ? ' has-error' : '' }}">
         <label for="support_phone" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.support_phone') }}
@@ -50,23 +61,8 @@
         </div>
     </div>
 
-<!-- Image -->
-    @if (($item->image) && ($item->image!=''))
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
-            </label>
-            <br>
-            <img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" alt="Image for {{ $item->name }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
-        </div>
-    </div>
-    @endif
+@include ('partials.forms.edit.image-upload', ['image_path' => app('manufacturers_upload_path')])
 
 
-    @include ('partials.forms.edit.image-upload')
-
 
 @stop
diff --git a/resources/views/modals/confirm-action.blade.php b/resources/views/modals/confirm-action.blade.php
new file mode 100644
index 0000000000..135a9799ed
--- /dev/null
+++ b/resources/views/modals/confirm-action.blade.php
@@ -0,0 +1,27 @@
+<!-- Modal -->
+<div class="modal fade" id="{{ $modal_name }}" tabindex="-1" role="dialog" aria-labelledby="{{ $modal_name }}Label" 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>
+                <h4 class="modal-title" id="{{ $modal_name }}Label">{{ $title }}</h4>
+            </div>
+            <form action="{{ $route }}" method="POST" class="form-horizontal">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+            <div class="modal-body">
+
+                <div class="row">
+                    <div class="col-md-12">
+                        {{ $body }}
+                    </div>
+                </div>
+
+            </div> <!-- /.modal-body-->
+            <div class="modal-footer">
+                <a href="#" class="pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</a>
+                <button type="submit" class="btn btn-primary">{{ trans('general.confirm') }}</button>
+            </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 6fc0359c81..360d14ce32 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -16,17 +16,17 @@
                 </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-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="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufactuer_id"></select>
+                        <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-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 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>
 
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index 5f4ab989ed..09c53751ce 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h2 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
+                <h4 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
             </div>
             {{ Form::open([
             'method' => 'POST',
@@ -19,7 +19,7 @@
 
                         <label class="btn btn-default">
                             {{ trans('button.select_file')  }}
-                            <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xlsx,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf" style="display:none" required>
+                            <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xlsx,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf,application/json" style="display:none" required>
                         </label>
 
                     </div>
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index 19f19d2b15..6a2efeecaa 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -78,15 +78,15 @@
                         </div>
                     </div>
                     
-					<!-- Space for keep consistance of layout -->
-					<div class="dynamic-form-row"></div>
+
                     
 					<!-- Checkbox for activation new user, by default set for activated -->
 					<div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-activated">{{ trans('general.login_enabled') }}:</label></div>
-						<div class="col-md-8 col-xs-12">
-						<input type="checkbox" value="1" name="activated" id="modal-activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
-						{{ trans('admin/users/general.activated_help_text') }}
+						<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>                    
                     
diff --git a/resources/views/models/bulk-delete.blade.php b/resources/views/models/bulk-delete.blade.php
index 90e6b7ba07..d198c06ec4 100644
--- a/resources/views/models/bulk-delete.blade.php
+++ b/resources/views/models/bulk-delete.blade.php
@@ -21,7 +21,7 @@
                 {{csrf_field()}}
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        <h2 class="box-title" style="color: red">{{ trans('admin/models/general.bulk_delete_warn', ['model_count' => $valid_count]) }}</h2>
+                        <h2 class="box-title" style="color: red">{{ trans_choice('admin/models/general.bulk_delete_warn', $valid_count, ['model_count' => $valid_count]) }}</h2>
                     </div>
 
                     <div class="box-body">
@@ -30,7 +30,7 @@
                             <tr>
                                 <td class="col-md-1">
                                     <label>
-                                        <input type="checkbox" class="all minimal" checked="checked">
+                                        <input type="checkbox" id="checkAll" checked="checked">
                                     </label>
 
                                 </td>
@@ -42,7 +42,7 @@
                             @foreach ($models as $model)
                                 <tr{!!  (($model->assets_count > 0 ) ? ' class="danger"' : '') !!}>
                                     <td>
-                                        <input type="checkbox" name="ids[]" class="minimal{{  (($model->assets_count == 0) ? '' : ' disabled') }}" value="{{ $model->id }}" {!!  (($model->assets_count == 0) ? ' checked="checked"' : ' disabled') !!}>
+                                        <input type="checkbox" name="ids[]" class="{  (($model->assets_count == 0) ? '' : ' disabled') }}" value="{{ $model->id }}" {!!  (($model->assets_count == 0) ? ' checked="checked"' : ' disabled') !!}>
                                     </td>
                                     <td>{{ $model->assets_count }}</td>
                                     <td>{{ $model->name }}</td>
@@ -65,28 +65,10 @@
 @section('moar_scripts')
     <script>
 
-        // Check-all / Uncheck all
-        $(function () {
-            var checkAll = $('input.all');
-            var checkboxes = $('input.minimal');
 
-
-            checkAll.on('ifChecked ifUnchecked', function(event) {
-                if (event.type == 'ifChecked') {
-                    checkboxes.iCheck('check');
-                } else {
-                    checkboxes.iCheck('uncheck');
-                }
-            });
-
-            checkboxes.on('ifChanged', function(event){
-                if(checkboxes.filter(':checked').length == checkboxes.length) {
-                    checkAll.prop('checked', 'checked');
-                } else {
-                    checkAll.removeProp('checked');
-                }
-                checkAll.iCheck('update');
-            });
+        $("#checkAll").change(function () {
+            $("input:checkbox").prop('checked', $(this).prop("checked"));
         });
+
     </script>
 @stop
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 412e54e21a..91b9e5f882 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -21,11 +21,14 @@
                 {{ csrf_field() }}
 
                 <div class="box box-default">
-                    <div class="box-header with-border">
-                        <div class="box-title"><i class="fas fa-exclamation-triangle"></i>{{ trans('general.bulk_edit_about_to') }}</div>
-                    </div>
                     <div class="box-body">
 
+                        <div class="callout callout-warning">
+                            <i class="fas fa-exclamation-triangle"></i>
+                            {{ trans_choice('admin/models/message.bulkedit.warn', count($models), ['model_count' => count($models)]) }}
+                        </div>
+
+
                         <table class="table">
                             <tbody>
                         @foreach ($models as $model)
@@ -33,7 +36,11 @@
                             <tr{!!  (($model->assets_count > 0 ) ? ' class="warning"' : ' class="success"') !!}>
                                     <td>
                                         <i class="fa {!!  (($model->assets_count > 0 ) ? 'fa-warning info' : 'fa-check success') !!}"></i>
-                                        {{ $model->display_name }}  ({{ $model->model_number }})
+                                        {{ $model->display_name }}
+
+                                            @if ($model->model_number)
+                                                ({{ $model->model_number }})
+                                            @endif
                                         </td>
                                         <td>{{ $model->assets_count }} assets
                                     </td>
@@ -73,20 +80,24 @@
                             </div>
 
                             <!-- requestable -->
-                                <div class="form-group {{ $errors->has('requestable') ? 'has-error' : '' }}">
-                                <div class="col-md-7 col-md-offset-3">
-
-
-                                    <div class="checkbox">
-                                        <label for="requestable">
-                                            {{ Form::radio('requestable', '', true, ['aria-label'=>'requestable', 'class'=>'minimal']) }} {{  trans('admin/hardware/general.requestable_status_warning')}}<br>
-                                            {{ Form::radio('requestable', '1', old('requestable'), ['aria-label'=>'requestable', 'class'=>'minimal']) }}  {{  trans('admin/hardware/general.requestable')}} <br>
-                                            {{ Form::radio('requestable', '0', old('requestable'), ['aria-label'=>'requestable', 'class'=>'minimal']) }}  {{  trans('admin/hardware/general.not_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']) }}
+                                            {{  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']) }}
+                                            {{  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']) }}
+                                            {{  trans('admin/hardware/general.not_requestable')}}
                                         </label>
-                                    </div>
 
-                                </div>
+
+                                    </div>
                                 </div>
 
                             @foreach ($models as $model)
@@ -95,9 +106,10 @@
                         </div>
                     </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>
-                    </div>
+                    <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>
+                    </div><!-- /.box-footer -->
                 </div> <!--/.box.box-default-->
             </form>
         </div> <!--/.col-md-8-->
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index f73a93903f..cbc6a731ab 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -18,8 +18,8 @@
                     <!-- Checkboxes -->
                   @foreach ($field->formatFieldValuesAsArray() as $key => $value)
                       <div>
-                          <label>
-                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" class="minimal" {{  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"' : '')) }}>
+                          <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"' : '')) }}>
                               {{ $value }}
                           </label>
                       </div>
@@ -29,8 +29,8 @@
               @foreach ($field->formatFieldValuesAsArray() as $value)
 
               <div>
-                  <label>
-                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" class="minimal" {{ 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"' : '')) }}>
+                  <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>
@@ -77,7 +77,7 @@
 
         @if ($field->field_encrypted)
         <div class="col-md-1 col-sm-1 text-left">
-            <i class="fas fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
+            <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
         </div>
         @endif
 
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 436e425179..74d3c1b83c 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -11,8 +11,8 @@
 @section('inputFields')
 
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/models/table.name'), 'required' => 'true'])
-@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
 @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'asset'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.depreciation')
 
@@ -20,9 +20,9 @@
 
 <div class="form-group {{ $errors->has('eol') ? ' has-error' : '' }}">
     <label for="eol" class="col-md-3 control-label">{{ trans('general.eol') }}</label>
-    <div class="col-md-2">
+    <div class="col-md-3 col-sm-4 col-xs-7">
         <div class="input-group">
-            <input class="col-md-1 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="{{ Request::old('eol', isset($item->eol)) ? $item->eol : ''  }}" />
             <span class="input-group-addon">
                 {{ trans('general.months') }}
             </span>
@@ -38,24 +38,7 @@
 
 @include ('partials.forms.edit.notes')
 @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])
+@include ('partials.forms.edit.image-upload', ['image_path' => app('models_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-    <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-    <div class="col-md-5">
-        <label for="image_delete">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
-        </label>
-        <br>
-        <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($item->image )) }}" alt="Image for {{ $item->name }}" class="img-responsive">
-        {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
-    </div>
-</div>
-
-
-@endif
-
-@include ('partials.forms.edit.image-upload')
 
 @stop
\ No newline at end of file
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 3b9078d29c..8bce7365fd 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -305,7 +305,7 @@
 
 
                     @if  ($model->deleted_at!='')
-                        <li><br /><a href="{{ route('restore/model', $model->id) }}" class="btn-flat large info ">{{ trans('admin/models/general.restore') }}</a></li>
+                        <li><br /><a href="{{ route('models.restore.store', $model->id) }}" class="btn-flat large info ">{{ trans('admin/models/general.restore') }}</a></li>
                     @endif
                 </ul>
 
diff --git a/resources/views/notifications/FirstAdmin.blade.php b/resources/views/notifications/FirstAdmin.blade.php
index f6d9202bb2..b6d8e89db2 100644
--- a/resources/views/notifications/FirstAdmin.blade.php
+++ b/resources/views/notifications/FirstAdmin.blade.php
@@ -10,7 +10,7 @@ Go To {{$snipeSettings->site_name}}
 
 {{ trans('mail.best_regards') }} <br>
 @if ($snipeSettings->show_url_in_emails=='1')
-    <p><a href="{{ url('/') }}">{{ $snipeSettings->site_name }}</a></p>
+    <p><a href="{{ config('app.url') }}">{{ $snipeSettings->site_name }}</a></p>
 @else
     <p>{{ $snipeSettings->site_name }}</p>
 @endif
diff --git a/resources/views/notifications/Welcome.blade.php b/resources/views/notifications/Welcome.blade.php
index 7501a81bb8..82dcd3e155 100644
--- a/resources/views/notifications/Welcome.blade.php
+++ b/resources/views/notifications/Welcome.blade.php
@@ -12,7 +12,7 @@ Go To {{$snipeSettings->site_name}}
 
 {{ trans('mail.best_regards') }} <br>
 @if ($snipeSettings->show_url_in_emails=='1')
-    <p><a href="{{ url('/') }}">{{ $snipeSettings->site_name }}</a></p>
+    <p><a href="{{ config('app.url') }}">{{ $snipeSettings->site_name }}</a></p>
 @else
     <p>{{ $snipeSettings->site_name }}</p>
 @endif
diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.php
index 5616525b13..50191d4a37 100644
--- a/resources/views/notifications/markdown/asset-acceptance.blade.php
+++ b/resources/views/notifications/markdown/asset-acceptance.blade.php
@@ -11,7 +11,7 @@
 | **{{ ucfirst(trans('general.accepted')) }}** | {{ $accepted_date }} |
 @endif
 @if (isset($declined_date))
-| **{{ trans('general.declined') }}** | {{ $declined_date }} |
+| **{{ ucfirst(trans('general.declined')) }}** | {{ $declined_date }} |
 @endif
 @if ((isset($item_tag)) && ($item_tag!=''))
 | **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |
diff --git a/resources/views/notifications/markdown/checkin-accessory.blade.php b/resources/views/notifications/markdown/checkin-accessory.blade.php
index cf1536518b..98a49bf7e2 100644
--- a/resources/views/notifications/markdown/checkin-accessory.blade.php
+++ b/resources/views/notifications/markdown/checkin-accessory.blade.php
@@ -3,7 +3,7 @@
 
 {{ trans('mail.the_following_item') }}
 
-@if ($item->getImageUrl())
+@if (($snipeSettings->show_images_in_email =='1') && $item->getImageUrl())
 <center><img src="{{ $item->getImageUrl() }}" alt="Asset" style="max-width: 570px;"></center>
 @endif
 
diff --git a/resources/views/notifications/markdown/report-expected-checkins.blade.php b/resources/views/notifications/markdown/report-expected-checkins.blade.php
index 9c8a13e80e..3715188d42 100644
--- a/resources/views/notifications/markdown/report-expected-checkins.blade.php
+++ b/resources/views/notifications/markdown/report-expected-checkins.blade.php
@@ -10,7 +10,7 @@
 @php
 $checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
 @endphp
-| [{{ $asset->present()->name }}]({{ route('hardware.show', ['hardware' => $asset->id]) }}) | [{{ $asset->assigned->present()->fullName }}]({{ route('users.show', ['user'=>$asset->assigned->id]) }})  | {{ $checkin['formatted'] }}
+| [{{ $asset->present()->name }}]({{ route('hardware.show', ['hardware' => $asset->id]) }}) | [{{ $asset->assigned->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assigned->id]) }})  | {{ $checkin['formatted'] }}
 @endforeach
 @endcomponent
 
diff --git a/resources/views/notifications/markdown/report-expiring-assets.blade.php b/resources/views/notifications/markdown/report-expiring-assets.blade.php
index 4311096a6d..7c91fff974 100644
--- a/resources/views/notifications/markdown/report-expiring-assets.blade.php
+++ b/resources/views/notifications/markdown/report-expiring-assets.blade.php
@@ -10,7 +10,7 @@ $expires = Helper::getFormattedDateObject($asset->present()->warranty_expires, '
 $diff = round(abs(strtotime($asset->present()->warranty_expires) - strtotime(date('Y-m-d')))/86400);
 $icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' ');
 @endphp
-<tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> </td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ $expires['formatted'] }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} </td></tr>
+<tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> </td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ !is_null($expires) ? $expires['formatted'] : '' }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} </td></tr>
 @endforeach
 </table>
 @endcomponent
diff --git a/resources/views/notifications/markdown/user-inventory.blade.php b/resources/views/notifications/markdown/user-inventory.blade.php
index d597338549..7b298dbc32 100644
--- a/resources/views/notifications/markdown/user-inventory.blade.php
+++ b/resources/views/notifications/markdown/user-inventory.blade.php
@@ -9,9 +9,18 @@
 ## {{ $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></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></th> </tr>
 @foreach($assets as $asset)
-<tr><td>{{ $asset->present()->name }}</td><td> {{ $asset->asset_tag }} </td><td> {{ $asset->serial }} </td></tr>
+<tr>
+    <td>{{ $asset->present()->name }}</td>
+    <td> {{ $asset->asset_tag }} </td>
+    <td> {{ $asset->serial }} </td>
+    @if (($snipeSettings->show_images_in_email =='1') && $asset->getImageUrl())
+    <td>
+        <img src="{{ asset($asset->getImageUrl()) }}" alt="Asset" style="max-width: 64px;">
+    </td>
+    @endif
+</tr>
 @endforeach
 </table>
 @endif
@@ -20,9 +29,16 @@
 ## {{ $accessories->count() }} {{ trans('general.accessories') }}
 
 <table width="100%">
-<tr><th align="left">{{ trans('mail.name') }} </th></tr>
+    <tr><th align="left">{{ trans('mail.name') }} </th> <th></th> </tr>
 @foreach($accessories as $accessory)
-<tr><td>{{ $accessory->name }}</td></tr>
+<tr>
+    <td>{{ $accessory->name }}</td>
+    @if (($snipeSettings->show_images_in_email =='1') && $accessory->getImageUrl())
+    <td>
+        <img src="{{ asset($accessory->getImageUrl()) }}" alt="Accessory" style="max-width: 64px;">
+    </td>
+    @endif
+</tr>
 @endforeach
 </table>
 @endif
@@ -31,9 +47,11 @@
 ## {{ $licenses->count() }} {{ trans('general.licenses') }}
 
 <table width="100%">
-<tr><th align="left"{{ trans('mail.name') }} </th></tr>
+<tr><th align="left">{{ trans('mail.name') }} </th></tr>
 @foreach($licenses as $license)
-<tr><td>{{ $license->name }}</td></tr>
+<tr>
+    <td>{{ $license->name }}</td>
+</tr>
 @endforeach
 </table>
 @endif
diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index e7f8368296..09519501ce 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -12,7 +12,12 @@
             {{ trans('button.bulk_actions') }}
         </span>
     </label>
-    <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions">
+    <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
+        @else
         @can('update', \App\Models\Asset::class)
             <option value="edit">{{ trans('button.edit') }}</option>
         @endcan
@@ -20,6 +25,7 @@
             <option value="delete">{{ trans('button.delete') }}</option>
         @endcan
         <option value="labels" 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>
diff --git a/resources/views/partials/assets-assigned.blade.php b/resources/views/partials/assets-assigned.blade.php
index f4a9f8bdb4..2ec51f36b7 100644
--- a/resources/views/partials/assets-assigned.blade.php
+++ b/resources/views/partials/assets-assigned.blade.php
@@ -13,7 +13,7 @@
 
                 $.ajax({
                     type: 'GET',
-                    url: '{{ url('/') }}/api/v1/users/' + userid + '/assets',
+                    url: '{{ config('app.url') }}/api/v1/users/' + userid + '/assets',
                     headers: {
                         "X-Requested-With": 'XMLHttpRequest',
                         "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
@@ -45,7 +45,7 @@
                                 } else {
                                     table_html += "<td></td> ";
                                 }
-                                table_html += '<td><a href="{{ url('/') }}/hardware/' + asset.id + '">';
+                                table_html += '<td><a href="{{ config('app.url') }}/hardware/' + asset.id + '">';
 
                                 if ((asset.name == '') && (asset.name != null)) {
                                     table_html += " " + asset.model.name;
@@ -60,7 +60,7 @@
                                 table_html += "</tr>";
                             }
                         } else {
-                            table_html += '<tr><td colspan="4">No assets checked out to '+ $('.js-data-user-ajax').find('option:selected').text() + ' yet!</td></tr>';
+                            table_html += '<tr><td colspan="4">{{ trans('admin/users/message.user_has_no_assets_assigned') }}</td></tr>';
                         }
                         $('#current_assets_content').html(table_html + '</tbody></table></div></div>');
 
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 4ba7aa0f19..c4cae63e87 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -55,6 +55,7 @@
             stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
             undefinedText: '',
             iconsPrefix: 'fa',
+            cookieStorage: '{{ config('session.bs_table_storage') }}',
             cookie: true,
             cookieExpire: '2y',
             mobileResponsive: true,
@@ -94,7 +95,7 @@
 
             exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ],
             onLoadSuccess: function () {
-                $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
+                $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
             }
 
             });
@@ -173,7 +174,7 @@
     function genericRowLinkFormatter(destination) {
         return function (value,row) {
             if (value) {
-                return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '">' + value + '</a>';
+                return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '">' + value + '</a>';
             }
         };
     }
@@ -215,7 +216,7 @@
                         text_help = '';
                 }
 
-                return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '" data-toggle="tooltip" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
+                return '<nobr><a href="{{ config('app.url') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
             } else if ((value) && (value.name)) {
 
                 // Add some overrides for any funny urls we have
@@ -225,13 +226,13 @@
                     var dpolymorphicItemFormatterest = 'fields/';
                 }
 
-                return '<nobr><a href="{{ url('/') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '">' + value.name + '</a></span>';
+                return '<nobr><a href="{{ config('app.url') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '">' + value.name + '</a></span>';
             }
         };
     }
 
     function hardwareAuditFormatter(value, row) {
-        return '<a href="{{ 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/audit/' + row.id + '/" class="btn btn-sm bg-yellow" data-tooltip="true" title="Audit this item">{{ trans('general.audit') }}</a>';
     }
 
 
@@ -261,29 +262,36 @@
             }
 
             if ((row.available_actions) && (row.available_actions.clone === true)) {
-                actions += '<a href="{{ url('/') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" title="{{ 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') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {
-                actions += '<a href="{{ url('/') }}/' + dest + '/' + row.id + '/edit" class="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') }}"><i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.delete === true)) {
-                actions += '<a href="{{ url('/') }}/' + dest + '/' + row.id + '" '
-                    + ' class="btn btn-danger btn-sm delete-asset"  data-toggle="tooltip"  '
+
+                // use the asset tag if no name is provided
+                var name_for_box = row.name
+                if (row.name=='') {
+                    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') }} ' + row.name + '?" '
+                    + ' 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">Delete</span></a>&nbsp;';
+                    + '<i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;';
             } else {
-                actions += '<a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><i class="fas fa-trash"></i></a>&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;"><i class="fas fa-trash"></i></a></span>&nbsp;';
             }
 
 
             if ((row.available_actions) && (row.available_actions.restore === true)) {
-                actions += '<form style="display: inline;" method="POST" action="{{ url('/') }}/' + dest + '/' + row.id + '/restore"> ';
+                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-toggle="tooltip" 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') }}"><i class="fas fa-retweet"></i></button>&nbsp;';
             }
 
             actions +='</nobr>';
@@ -327,12 +335,12 @@
                 item_icon = '';
             }
 
-            // display the username if it's checked out to a user
-            if (value.username) {
+            // display the username if it's checked out to a user, but don't do it if the username's there already
+            if (value.username && !value.name.match('\\(') && !value.name.match('\\)')) {
                 value.name = value.name + ' (' + value.username + ')';
             }
 
-            return '<nobr><a href="{{ url('/') }}/' + item_destination +'/' + value.id + '" data-tooltip="true" title="' + value.type + '"><i class="' + item_icon + ' text-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} "></i> ' + value.name + '</a></nobr>';
+            return '<nobr><a href="{{ config('app.url') }}/' + item_destination +'/' + value.id + '" data-tooltip="true" title="' + value.type + '"><i class="' + item_icon + ' text-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} "></i> ' + value.name + '</a></nobr>';
 
         } else {
             return '';
@@ -364,9 +372,9 @@
     function licenseSeatInOutFormatter(value, row) {
         // The user is allowed to check the license seat out and it's available
         if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
-            return '<a href="{{ url('/') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
+            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="{{ url('/') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" 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="Check in this license seat.">{{ trans('general.checkin') }}</a>';
         }
 
     }
@@ -376,18 +384,26 @@
 
             // The user is allowed to check items out, AND the item is deployable
             if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
-                    return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
 
-            // The user is allowed to check items out, but the item is not deployable
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
+
+            // The user is allowed to check items out, but the item is not able to be checked out
             } else if (((row.user_can_checkout == false)) && (row.available_actions.checkout == true) && (!row.assigned_to)) {
-                return '<div  data-toggle="tooltip" title="This item has a status label that is undeployable and cannot be checked out at this time."><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></div>';
+
+                // We use slightly different language for assets versus other things, since they are the only
+                // item that has a status label
+                if (destination =='hardware') {
+                    return '<span  data-tooltip="true" title="{{ trans('admin/hardware/general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
+                } else {
+                    return '<span  data-tooltip="true" title="{{ trans('general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
+                }
 
             // The user is allowed to check items in
             } else if (row.available_actions.checkin == true)  {
                 if (row.assigned_to) {
-                    return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
                 } else if (row.assigned_pivot_id) {
-                    return '<a href="{{ url('/') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
                 }
 
             }
@@ -401,11 +417,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-toggle="tooltip" title="Cancel this item request">{{ trans('button.cancel') }}</button>';
+            return '<button class="btn btn-danger btn-sm disabled" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>';
         } else if (value.available_actions.cancel == true)  {
-            return '<form action="{{ url('/') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-toggle="tooltip" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
+            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>';
         } else if (value.available_actions.request == true)  {
-            return '<form action="{{ url('/') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-toggle="tooltip" title="Request this item">{{ trans('button.request') }}</button></form>';
+            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="Request this item">{{ trans('button.request') }}</button></form>';
         }
 
     }
@@ -496,8 +512,12 @@
     }
 
     function externalLinkFormatter(value) {
+
         if (value) {
-            return '<a href="' + value + '" target="_blank">' + value + '</a>';
+            if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
+                return '<nobr><a href="' + value + '" target="_blank" title="External link to ' + value + '" data-tooltip="true" ><i class="fa fa-external-link"></i> ' + value + '</a></nobr>';
+            }
+            return value;
         }
     }
 
@@ -506,7 +526,7 @@
         if (value) {
             var groups = '';
             for (var index in value.rows) {
-                groups += '<a href="{{ url('/') }}/admin/groups/' + value.rows[index].id + '" class="label label-default">' + value.rows[index].name + '</a> ';
+                groups += '<a href="{{ config('app.url') }}/admin/groups/' + value.rows[index].id + '" class="label label-default">' + value.rows[index].name + '</a> ';
             }
             return groups;
         }
@@ -535,20 +555,20 @@
 
     function deployedLocationFormatter(row, value) {
         if ((row) && (row!=undefined)) {
-            return '<a href="{{ url('/') }}/locations/' + row.id + '">' + row.name + '</a>';
+            return '<a href="{{ config('app.url') }}/locations/' + row.id + '">' + row.name + '</a>';
         } else if (value.rtd_location) {
-            return '<a href="{{ url('/') }}/locations/' + value.rtd_location.id + '" data-toggle="tooltip" title="Default Location">' + value.rtd_location.name + '</a>';
+            return '<a href="{{ config('app.url') }}/locations/' + value.rtd_location.id + '" data-tooltip="true" title="Default Location">' + value.rtd_location.name + '</a>';
         }
 
     }
 
     function groupsAdminLinkFormatter(value, row) {
-        return '<a href="{{ url('/') }}/admin/groups/' + row.id + '">' + value + '</a>';
+        return '<a href="{{ config('app.url') }}/admin/groups/' + row.id + '">' + value + '</a>';
     }
 
     function assetTagLinkFormatter(value, row) {
         if ((row.asset) && (row.asset.id)) {
-            return '<a href="{{ url('/') }}/hardware/' + row.asset.id + '">' + row.asset.asset_tag + '</a>';
+            return '<a href="{{ config('app.url') }}/hardware/' + row.asset.id + '">' + row.asset.asset_tag + '</a>';
         }
         return '';
 
@@ -556,23 +576,23 @@
 
     function departmentNameLinkFormatter(value, row) {
         if ((row.assigned_user) && (row.assigned_user.department) && (row.assigned_user.department.name)) {
-            return '<a href="{{ url('/') }}/department/' + row.assigned_user.department.id + '">' + row.assigned_user.department.name + '</a>';
+            return '<a href="{{ config('app.url') }}/department/' + row.assigned_user.department.id + '">' + row.assigned_user.department.name + '</a>';
         }
 
     }
 
     function assetNameLinkFormatter(value, row) {
         if ((row.asset) && (row.asset.name)) {
-            return '<a href="{{ url('/') }}/hardware/' + row.asset.id + '">' + row.asset.name + '</a>';
+            return '<a href="{{ config('app.url') }}/hardware/' + row.asset.id + '">' + row.asset.name + '</a>';
         }
 
     }
 
     function trueFalseFormatter(value) {
         if ((value) && ((value == 'true') || (value == '1'))) {
-            return '<i class="fas fa-check text-success"></i>';
+            return '<i class="fas fa-check text-success"></i><span class="sr-only">{{ trans('general.true') }}</span>';
         } else {
-            return '<i class="fas fa-times text-danger"></i>';
+            return '<i class="fas fa-times text-danger"></i><span class="sr-only">{{ trans('general.false') }}</span>';
         }
     }
 
@@ -602,19 +622,19 @@
 
     function assetCompanyFilterFormatter(value, row) {
         if (value) {
-            return '<a href="{{ url('/') }}/hardware/?company_id=' + row.id + '">' + value + '</a>';
+            return '<a href="{{ config('app.url') }}/hardware/?company_id=' + row.id + '">' + value + '</a>';
         }
     }
 
     function assetCompanyObjFilterFormatter(value, row) {
         if ((row) && (row.company)) {
-            return '<a href="{{ url('/') }}/hardware/?company_id=' + row.company.id + '">' + row.company.name + '</a>';
+            return '<a href="{{ config('app.url') }}/hardware/?company_id=' + row.company.id + '">' + row.company.name + '</a>';
         }
     }
 
     function usersCompanyObjFilterFormatter(value, row) {
         if (value) {
-            return '<a href="{{ url('/') }}/users/?company_id=' + row.id + '">' + value + '</a>';
+            return '<a href="{{ config('app.url') }}/users/?company_id=' + row.id + '">' + value + '</a>';
         } else {
             return value;
         }
@@ -623,21 +643,25 @@
     function employeeNumFormatter(value, row) {
 
         if ((row) && (row.assigned_to) && ((row.assigned_to.employee_number))) {
-            return '<a href="{{ url('/') }}/users/' + row.assigned_to.id + '">' + row.assigned_to.employee_number + '</a>';
+            return '<a href="{{ config('app.url') }}/users/' + row.assigned_to.id + '">' + row.assigned_to.employee_number + '</a>';
         }
     }
 
     function orderNumberObjFilterFormatter(value, row) {
         if (value) {
-            return '<a href="{{ url('/') }}/hardware/?order_number=' + row.order_number + '">' + row.order_number + '</a>';
+            return '<a href="{{ config('app.url') }}/hardware/?order_number=' + row.order_number + '">' + row.order_number + '</a>';
+        }
+    }
+
+    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>'
         }
     }
 
 
    function imageFormatter(value, row) {
 
-
-
         if (value) {
 
             // This is a clunky override to handle unusual API responses where we're presenting a link instead of an array
@@ -798,7 +822,7 @@
         //  This is necessary to make the bootstrap tooltips work inside of the
         // wenzhixin/bootstrap-table formatters
         $('#table').on('post-body.bs.table', function () {
-            $('[data-toggle="tooltip"]').tooltip({
+            $('[data-tooltip="true"]').tooltip({
                 container: 'body'
             });
 
diff --git a/resources/views/partials/bpay.blade.php b/resources/views/partials/bpay.blade.php
new file mode 100644
index 0000000000..0cf0be5403
--- /dev/null
+++ b/resources/views/partials/bpay.blade.php
@@ -0,0 +1,15 @@
+@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/forms/demo-mode.blade.php b/resources/views/partials/forms/demo-mode.blade.php
new file mode 100644
index 0000000000..4a942204e4
--- /dev/null
+++ b/resources/views/partials/forms/demo-mode.blade.php
@@ -0,0 +1,5 @@
+<div class="row">
+    <div class="col-md-10 col-md-offset-2">
+        {!! Helper::showDemoModeFieldWarning() !!}
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index b33673381a..c8bf734033 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')) }}
     <div class="col-md-7">
-        {{Form::text('address', old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address')) }}
+        {{Form::text('address', old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address', 'maxlength'=>'191')) }}
         {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -9,13 +9,13 @@
 <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')) }}
+        {{Form::text('address2', old('address2', $item->address2), array('class' => 'form-control', 'aria-label'=>'address2', 'maxlength'=>'191')) }}
         {!! $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')) }}
+    {{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label', 'maxlength'=>'191')) }}
     <div class="col-md-7">
     {{Form::text('city', old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city')) }}
         {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -23,7 +23,7 @@
 </div>
 
 <div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
-    {{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }}
+    {{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label', 'maxlength'=>'191')) }}
     <div class="col-md-7">
     {{Form::text('state', old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state')) }}
         {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -40,7 +40,7 @@
 </div>
 
 <div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
-    {{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label')) }}
+    {{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label', 'maxlength'=>'10')) }}
     <div class="col-md-7">
     {{Form::text('zip', old('zip', $item->zip), array('class' => 'form-control')) }}
         {!! $errors->first('zip', '<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/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index 402c959cce..684b8d76da 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -3,8 +3,8 @@
 
     {{ 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="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))) ? ' data-validation="required" required' : '' !!}>
+    <div class="col-md-7{{  (isset($item) && (Helper::checkIfRequired($item, $fieldname))) ? ' required' : '' }}">
+        <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))) ? ' data-validation="required" required' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
             @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 : '' }}
diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php
index dec5b993a4..722e1cf088 100644
--- a/resources/views/partials/forms/edit/company-select.blade.php
+++ b/resources/views/partials/forms/edit/company-select.blade.php
@@ -4,7 +4,7 @@
     <div class="form-group">
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-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 }}">
+            <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} : ''))
                     <option value="{{ $company_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                         {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
@@ -21,7 +21,7 @@
     <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">
-            <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select">
+            <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} : ''))
                     <option value="{{ $company_id }}" selected="selected">
                         {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
diff --git a/resources/views/partials/forms/edit/datepicker.blade.php b/resources/views/partials/forms/edit/datepicker.blade.php
index ab5a501072..9d2a714bb7 100644
--- a/resources/views/partials/forms/edit/datepicker.blade.php
+++ b/resources/views/partials/forms/edit/datepicker.blade.php
@@ -3,7 +3,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-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}) ? $item->{$fieldname}->format('Y-m-d') : '') }}" readonly style="background-color:inherit">
+            <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>
         {!! $errors->first($fieldname, '<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/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index 4729b54518..c695d04ef4 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -3,7 +3,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-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 }}">
+        <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'" : '' }}>
             @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 : '' }}
diff --git a/resources/views/partials/forms/edit/eol_date.blade.php b/resources/views/partials/forms/edit/eol_date.blade.php
new file mode 100644
index 0000000000..4e57610165
--- /dev/null
+++ b/resources/views/partials/forms/edit/eol_date.blade.php
@@ -0,0 +1,11 @@
+<!-- Purchase 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', $item->asset_eol_date ?? $item->present()->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
new file mode 100644
index 0000000000..6e8a1d7fd4
--- /dev/null
+++ b/resources/views/partials/forms/edit/fax.blade.php
@@ -0,0 +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')) }}
+    <div class="col-md-7">
+        {{Form::text('fax', old('fax', $item->fax), array('class' => 'form-control')) }}
+        {!! $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
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index c30c03082b..577f90eaac 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -1,12 +1,34 @@
+<!-- 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') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </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
+
+<!-- Image Upload and preview -->
+
 <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}">
-    <label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
+    <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ trans('general.image_upload') }}</label>
     <div class="col-md-9">
 
-        <input type="file" id="image" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="image" class="sr-only">
+        <input type="file" id="{{ (isset($fieldname) ? $fieldname : 'image') }}" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
 
         <label class="btn btn-default" aria-hidden="true">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" style="display:none; max-width: 90%" aria-label="image" aria-hidden="true">
+            <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" style="display:none; max-width: 90%" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-hidden="true">
         </label>
         <span class='label label-default' id="uploadFile-info"></span>
 
@@ -14,7 +36,7 @@
         {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
     <div class="col-md-4 col-md-offset-3" aria-hidden="true">
-        <img id="uploadFile-imagePreview" style="max-width: 200px; display: none;" alt="{{ trans('partials/forms/general.alt_uploaded_image_thumbnail') }}">
+        <img id="uploadFile-imagePreview" style="max-width: 300px; display: none;" alt="{{ trans('partials/forms/general.alt_uploaded_image_thumbnail') }}">
     </div>
 </div>
 
diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
index 6603f58784..c0ce9f9b8e 100644
--- a/resources/views/partials/forms/edit/location-select.blade.php
+++ b/resources/views/partials/forms/edit/location-select.blade.php
@@ -3,7 +3,7 @@
 
     {{ 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))) ? ' data-validation="required" 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))) ? ' data-validation="required" required' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
             @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 : '' }}
@@ -30,6 +30,21 @@
     </div>
     @endif
 
+    @if (isset($hide_location_radio))
+    <!-- Update actual location  -->
+    <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']) }}
+                {{ 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']) }}
+                {{ trans('admin/hardware/form.asset_location_update_default_current') }}
+            </label>
+        </div>
+    </div> <!--/form-group-->
+    @endif
 
 </div>
 
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index 900adf9d70..46c587d641 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -4,7 +4,7 @@
     {{ 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="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))) ? ' data-validation="required" required' : '' !!}>
+        <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))) ? ' data-validation="required" required' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
             @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 : '' }}
diff --git a/resources/views/partials/forms/edit/minimum_quantity.blade.php b/resources/views/partials/forms/edit/minimum_quantity.blade.php
index 83b15a124c..1566ab2e9c 100644
--- a/resources/views/partials/forms/edit/minimum_quantity.blade.php
+++ b/resources/views/partials/forms/edit/minimum_quantity.blade.php
@@ -6,7 +6,7 @@
             <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) }}" />
         </div>
             <div class="col-md-7" style="margin-left: -15px;">
-                <a href="#" data-toggle="tooltip" 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') }}"><i class="fas fa-info-circle" aria-hidden="true"></i>
                 <span class="sr-only">{{ trans('general.min_amt_help') }}</span>
             </a>
 
diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index ee2147cc07..c4607c8662 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -4,7 +4,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-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) ? ' data-validation="required" 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) ? ' data-validation="required" required' : '') !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
             @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 : '' }}
diff --git a/resources/views/partials/forms/edit/notes.blade.php b/resources/views/partials/forms/edit/notes.blade.php
index dfac566334..f6b08ea1aa 100644
--- a/resources/views/partials/forms/edit/notes.blade.php
+++ b/resources/views/partials/forms/edit/notes.blade.php
@@ -1,8 +1,8 @@
 <!-- Notes -->
-<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
+<div class="form-group{{ $errors->has('notes') ? ' has-error' : '' }}">
     <label for="notes" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
     <div class="col-md-7 col-sm-12">
-        <textarea class="col-md-6 form-control" id="notes" aria-label="notes" name="notes">{{ old('notes', $item->notes) }}</textarea>
+        <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>') !!}
     </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 a3d95b2c50..a6a6abf9e0 100644
--- a/resources/views/partials/forms/edit/permissions-base.blade.php
+++ b/resources/views/partials/forms/edit/permissions-base.blade.php
@@ -4,7 +4,7 @@
     <tbody class="permissions-group">
     <tr class="header-row permissions-row">
       <td class="col-md-5 tooltip-base permissions-item"
-        data-toggle="tooltip"
+        data-tooltip="true"
         data-placement="right"
         title="{{ $localPermission['note'] }}"
       >
@@ -18,11 +18,11 @@
       <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", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
         @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin')))
-          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
         @else
-          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'class'=>'minimal',  'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant",  'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
         @endif
 
         
@@ -30,22 +30,22 @@
       <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", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
         @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin')))
-          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
         @else
-          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'class'=>'minimal',  'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny",   'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
         @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",'class'=>'minimal',  'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
         @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin')))
-          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled",'class'=>'minimal',  'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
         @else
-          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'class'=>'minimal',  'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
+          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit",   'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
         @endif
       </td>
     </tr>
@@ -59,15 +59,15 @@
       </td>
       <td class="col-md-1 permissions-item">
         <label for="{{ $area }}" class="sr-only">{{ $area }}</label>
-        {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
+        {{ Form::radio("$area", '1',false,['value'=>"grant", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
       </td>
       <td class="col-md-1 permissions-item">
         <label for="{{ $area }}" class="sr-only">{{ $area }}</label>
-        {{ Form::radio("$area", '-1',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
+        {{ Form::radio("$area", '-1',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
       </td>
       <td class="col-md-1 permissions-item">
         <label for="{{ $area }}" class="sr-only">{{ $area }}</label>
-        {{ Form::radio("$area", '0',false,['value'=>"inherit", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label' => $area] ) }}
+        {{ Form::radio("$area", '0',false,['value'=>"inherit", 'data-checker-group' => str_slug($area), 'aria-label' => $area] ) }}
       </td>
     </tr>
 
@@ -76,7 +76,7 @@
         @if ($permission['display'])
           <td
             class="col-md-5 tooltip-base permissions-item"
-            data-toggle="tooltip"
+            data-tooltip="true"
             data-placement="right"
             title="{{ $permission['note'] }}"
           >
@@ -86,23 +86,23 @@
             <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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
+              {{ 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'=>'minimal radiochecker-'.str_slug($area), 'aria-label' =>'permission['.$permission['permission'].']']) }}
+              {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'radiochecker-'.str_slug($area), 'aria-label' =>'permission['.$permission['permission'].']']) }}
             @endif
           </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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
+              {{ 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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
+              {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
             @endif
           </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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
+              {{ 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'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
+              {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
             @endif
           </td>
         @endif
diff --git a/resources/views/partials/forms/edit/quantity.blade.php b/resources/views/partials/forms/edit/quantity.blade.php
index 14f96aecac..1e8296903f 100644
--- a/resources/views/partials/forms/edit/quantity.blade.php
+++ b/resources/views/partials/forms/edit/quantity.blade.php
@@ -3,7 +3,7 @@
 <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-2" style="padding-left:0px">
+       <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')) ? ' data-validation="required" required' : '' !!}/>
        </div>
        {!! $errors->first('qty', '<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/requestable.blade.php b/resources/views/partials/forms/edit/requestable.blade.php
index 570f1de50d..6da86149d0 100644
--- a/resources/views/partials/forms/edit/requestable.blade.php
+++ b/resources/views/partials/forms/edit/requestable.blade.php
@@ -1,8 +1,8 @@
 <!-- Requestable -->
 <div class="form-group">
-    <div class="col-sm-offset-3 col-sm-10">
-        <label>
-        <input type="checkbox" value="1" name="requestable" id="requestable" class="minimal" {{ Request::old('requestable', $item->requestable) == '1' ? ' checked="checked"' : '' }}> {{ $requestable_text }}
+    <div class="col-sm-offset-3 col-md-9">
+        <label class="form-control" for="requestable">
+        <input type="checkbox" value="1" name="requestable" id="requestable" {{ old('requestable', $item->requestable) == '1' ? ' checked="checked"' : '' }}> {{ $requestable_text }}
         </label>
 
     </div>
diff --git a/resources/views/partials/forms/edit/serial.blade.php b/resources/views/partials/forms/edit/serial.blade.php
index 7a7bb8b8e2..483b425846 100644
--- a/resources/views/partials/forms/edit/serial.blade.php
+++ b/resources/views/partials/forms/edit/serial.blade.php
@@ -2,7 +2,7 @@
 <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('serial', $item->serial) }}" />
+        <input class="form-control" type="text" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old((isset($old_val_name) ? $old_val_name : $fieldname), $item->serial) }}" />
         {!! $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
new file mode 100644
index 0000000000..c55f36e455
--- /dev/null
+++ b/resources/views/partials/forms/edit/status-select.blade.php
@@ -0,0 +1,29 @@
+<!-- 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')) }}
+
+    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
+        <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))) ? ' data-validation="required" required' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+            @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>
+    </div>
+
+    <div class="col-md-1 col-sm-1 text-left">
+        @can('create', \App\Models\Statuslabel::class)
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
+                <a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal"  data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
+            @endif
+        @endcan
+    </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>
diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php
index 54f17e854c..4c87c7bb21 100644
--- a/resources/views/partials/forms/edit/submit.blade.php
+++ b/resources/views/partials/forms/edit/submit.blade.php
@@ -1,7 +1,7 @@
 <!-- partials/forms/edit/submit.blade.php -->
 
-<div class="box-footer text-right">
-    <a class="btn btn-link text-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+<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>
 </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 829d0a9c27..35c5165e59 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -2,14 +2,14 @@
 
     {{ 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="suppliers" data-placeholder="{{ trans('general.select_supplier') }}" name="{{ $fieldname }}" style="width: 100%" id="supplier_select" aria-label="{{ $fieldname }}">
+    <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'" : '' }}>
             @if ($supplier_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $supplier_id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                <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>
+                <option value="" role="option">{{ trans('general.select_supplier') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 7237d7b817..5c48d9b3c4 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -1,57 +1,66 @@
-<div class="form-group {{ $errors->has($logoVariable) ? 'has-error' : '' }}">
+<!-- {{ $logoVariable }}logo image upload -->
+
+<div class="form-group">
     <div class="col-md-3">
-        <strong>{{ $logoLabel }}</strong>
+        <label {!! $errors->has($logoVariable) ? 'class="alert-msg"' : '' !!} for="{{ $logoVariable }}">
+        {{ ucwords(str_replace('_', ' ', $logoVariable)) }}
+        </label>
     </div>
-
-        @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
-        <div class="col-md-9">
-
-            <label for="{{ $logoClearVariable }}" style="font-weight: normal">
-                {{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable),array('class' => 'minimal')) }}
-                Remove current {{ str_replace('_', ' ', $logoVariable) }} image
-
-            </label>
-
-
-                <br>
-                @if ($logoVariable!='favicon')
-                    <a href="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}" data-toggle="lightbox">
-                        <img style="max-height: 60px; padding-top: 10px; padding-bottom: 10px; " alt="" src="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}">
-                    </a>
-                @else
-                    <img style="max-height: 50px; padding-top: 10px; padding-bottom: 10px; " alt="" src="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}">
-                @endif
-
-        </div>
-        <div class="col-md-9 col-md-offset-3">
-            @else
-                <div class="col-md-9">
-        @endif
-
-
-
-
+    <div class="col-md-9">
         <label class="btn btn-default">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}"
-                data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
-                accept="{{ $allowedTypes ?? 'image/gif,image/jpeg,image/png,image/svg,image/svg+xml'}}" style="display:none; max-width: 90%">
+            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
+                   style="display:none; max-width: 90%">
         </label>
+
         <span class='label label-default' id="{{ $logoId }}-info"></span>
 
-        <p class="help-block" id="{{ $logoId }}-status">
+        {!! $errors->first($logoVariable, '<span class="alert-msg">:message</span>') !!}
+
+
+        <p class="help-block" style="!important" id="{{ $logoId }}-status">
             {{ $helpBlock }}
         </p>
 
         @if (config('app.lock_passwords')===true)
             <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
         @endif
-        {!! $errors->first($logoVariable, '<span class="alert-msg">:message</span>') !!}
+    </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>
+            @endif
+
+            <div id="{{ $logoId }}-previewContainer" style="display: none;">
+                <img id="{{ $logoId }}-imagePreview" style="height: 80px;">
+            </div>
+
+
 
     </div>
+    @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
+
     <div class="col-md-9 col-md-offset-3">
-        <img id="{{ $logoId }}-imagePreview" style="max-width: 500px; max-height: 50px;">
+        <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
+        </label>
     </div>
+    @endif
+
 
 
 </div>
+
+
+
+
+
+
+
diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
index 016f549214..cf22fde03d 100644
--- a/resources/views/partials/users-bulk-actions.blade.php
+++ b/resources/views/partials/users-bulk-actions.blade.php
@@ -9,9 +9,10 @@
     @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="width: 200px;" aria-label="bulk_actions">
+            <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>
diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index 49db62c7f6..997e5fedff 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -27,6 +27,7 @@
                                 data-sort-order="asc"
                                 id="accessoriesReport"
                                 class="table table-striped snipe-table"
+                                data-url="{{ route('api.accessories.index') }}"
                                 data-export-options='{
                         "fileName": "accessory-report-{{ date('Y-m-d') }}",
                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
@@ -34,27 +35,17 @@
 
                             <thead>
                             <tr>
-                                <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
-                                <th class="col-sm-1">{{ trans('admin/accessories/table.title') }}</th>
-                                <th class="col-sm-1">{{ trans('general.model_no') }}</th>
-                                <th class="col-sm-1">{{ trans('admin/accessories/general.total') }}</th>
-                                <th class="col-sm-1">{{ trans('admin/accessories/general.remaining') }}</th>
+                                <th class="col-sm-1" data-field="company.name">{{ trans('admin/companies/table.title') }}</th>
+                                <th class="col-sm-1" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
+                                <th class="col-sm-1" data-field="model_number">{{ trans('general.model_no') }}</th>
+                                <th class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
+                                <th class="col-sm-1" data-field="remaining_qty">{{ trans('admin/accessories/general.remaining') }}</th>
                             </tr>
                             </thead>
                             <tbody>
-                            @foreach ($accessories as $accessory)
-                                <tr>
-                                    <td>{{ is_null($accessory->company) ? '' : $accessory->company->name }}</td>
-                                    <td>{{ $accessory->name }}</td>
-                                    <td>{{ $accessory->model_number }}</td>
-                                    <td>{{ $accessory->qty }}</td>
-                                    <td>{{ $accessory->numRemaining() }}</td>
-                                </tr>
-                            @endforeach
                             </tbody>
                         </table>
 
-                        </table>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index b4b9933094..9845553363 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -46,6 +46,9 @@
                     <th data-searchable="true" data-sortable="true" data-field="completion_date" data-formatter="dateDisplayFormatter">{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_time">{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.cost') }}</th>
+                    <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="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
                 </tr>
diff --git a/resources/views/reports/audit.blade.php b/resources/views/reports/audit.blade.php
index 15ad80964d..3d16b0714b 100644
--- a/resources/views/reports/audit.blade.php
+++ b/resources/views/reports/audit.blade.php
@@ -34,7 +34,7 @@
 
                         <thead>
                         <tr>
-                            <th class="col-sm-1" data-field="image" data-visible="false" data-formatter="imageFormatter">{{ trans('admin/hardware/table.image') }}</th>
+                            <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>
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 455b87dd02..ff78f21686 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -28,276 +28,228 @@
         </div><!-- /.box-header -->
 
         <div class="box-body">
-          <div class="col-md-4">
 
+            <div class="col-md-4">
 
-            <div class="checkbox col-md-12">
-              <label>
-                <input type="checkbox" class="all minimal" checked="checked">
+              <label class="form-control">
+                <input type="checkbox" id="checkAll" checked="checked">
                {{ trans('general.select_all') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('id', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('id', '1', '1') }}
                 {{ trans('general.id') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('company', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('company', '1', '1') }}
                 {{ trans('general.company') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-              {{ Form::checkbox('asset_tag', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+              {{ Form::checkbox('asset_tag', '1', '1') }}
                 {{ trans('general.asset_tag') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('asset_name', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('asset_name', '1', '1') }}
                 {{ trans('admin/hardware/form.name') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('manufacturer', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('manufacturer', '1', '1') }}
                 {{ trans('general.manufacturer') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('model', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('model', '1', '1') }}
                 {{ trans('general.asset_models') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('category', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('category', '1', '1') }}
                 {{ trans('general.category') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('serial', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('serial', '1', '1') }}
                 {{ trans('admin/hardware/table.serial') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('purchase_date', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('purchase_date', '1', '1') }}
                 {{ trans('admin/licenses/table.purchase_date') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('purchase_cost', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('purchase_cost', '1', '1') }}
                 {{ trans('admin/hardware/form.cost') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('eol', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('eol', '1', '1') }}
                 {{ trans('admin/hardware/table.eol') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('order', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('order', '1', '1') }}
                 {{ trans('admin/hardware/form.order') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('supplier', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('supplier', '1', '1') }}
                 {{ trans('general.suppliers') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('location', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('location', '1', '1') }}
                 {{ trans('general.location') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('location_address', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('location_address', '1', '1') }}
                 - {{ trans('general.address') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('rtd_location', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('rtd_location', '1', '1') }}
                 {{ trans('admin/hardware/form.default_location') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('rtd_location_address', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('rtd_location_address', '1', '1') }}
                 - {{ trans('general.address') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('status', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('status', '1', '1') }}
                 {{ trans('general.status') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('warranty', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('warranty', '1', '1') }}
                 {{ trans('admin/hardware/form.warranty') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('depreciation', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('depreciation', '1', '1') }}
                 {{ trans('general.depreciation') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('checkout_date', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('checkout_date', '1', '1') }}
                 {{ trans('admin/hardware/table.checkout_date') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('expected_checkin', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('expected_checkin', '1', '1') }}
                 {{ trans('admin/hardware/form.expected_checkin') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('created_at', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('created_at', '1', '1') }}
                 {{ trans('general.created_at') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('updated_at', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('updated_at', '1', '1') }}
                 {{ trans('general.updated_at') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('deleted_at', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('deleted_at', '1', '1') }}
                 {{ trans('general.deleted') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('last_audit_date', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('last_audit_date', '1', '1') }}
                 {{ trans('general.last_audit') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('next_audit_date', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('next_audit_date', '1', '1') }}
                 {{ trans('general.next_audit_date') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('notes', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('notes', '1', '1') }}
                 {{ trans('general.notes') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('url', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('url', '1', '1') }}
                 - {{ trans('admin/manufacturers/table.url') }}
               </label>
-            </div>
+
 
             <!-- User fields -->
-            <div class="checkbox col-md-12">
+
               <h2>{{ trans('general.checked_out_to') }} {{ trans('general.fields') }}:</h2>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('assigned_to', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('assigned_to', '1', '1') }}
                 {{ trans('admin/licenses/table.assigned_to') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('username', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('username', '1', '1') }}
                 {{ trans('admin/users/table.username') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('employee_num', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('employee_num', '1', '1') }}
                 {{ trans('general.employee_number') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('manager', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('manager', '1', '1') }}
                 {{ trans('admin/users/table.manager') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('department', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('department', '1', '1') }}
                 {{ trans('general.department') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('title', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('title', '1', '1') }}
                 {{ trans('admin/users/table.title') }}
               </label>
-            </div>
+
 
 
             @if ($customfields->count() > 0)
-              <div class="checkbox col-md-12">
-                <h2>{{ trans('admin/custom_fields/general.custom_fields') }}</h>:</h4>
-              </div>
+
+                <h2>{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
+
               @foreach ($customfields as $customfield)
-                <div class="checkbox col-md-12">
-                  <label>
-                    {{ Form::checkbox($customfield->db_column_name(), '1', '1', ['class' => 'minimal']) }}
+
+                  <label class="form-control">
+                    {{ Form::checkbox($customfield->db_column_name(), '1', '1') }}
                     {{ $customfield->name }}
                   </label>
-                </div>
+
               @endforeach
             @endif
-
-          </div> <!-- /.col-md-3-->
+          </div> <!-- /.col-md-4-->
 
           <div class="col-md-8">
 
-            {!! trans('general.report_fields_info') !!}
+            <p>
+                {!! trans('general.report_fields_info') !!}
+            </p>
 
-            @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'by_company_id', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'by_location_id', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), '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', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.model-select', ['translated_name' => trans('general.asset_model'), 'fieldname' => 'by_model_id', 'hide_new' => 'true'])
+              <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'])
-
-          <!-- Status -->
-            <div class="form-group">
-              <label for="by_status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
-              <div class="col-md-7 col-sm-11">
-                {{ Form::select('by_status_id', Helper::statusLabelList() , old('by_status_id'), array('class'=>'select2', 'style'=>'width:100%', 'aria-label'=>'by_status_id')) }}
-              </div>
-            </div>
-
+              @include ('partials.forms.edit.status-select', ['translated_name' => trans('admin/hardware/form.status'), 'fieldname' => 'by_status_id[]', 'multiple' => 'true', 'hide_new' => 'true'])
 
             <!-- Order Number -->
             <div class="form-group">
@@ -311,9 +263,9 @@
             <div class="form-group purchase-range">
               <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-6" id="datepicker">
-                <input type="text" class="input-sm form-control" name="purchase_start" aria-label="purchase_start">
+                <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" name="purchase_end" aria-label="purchase_end">
+                <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end">
               </div>
             </div>
 
@@ -321,19 +273,29 @@
             <div class="form-group purchase-range">
               <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-6" id="datepicker">
-                <input type="text" class="input-sm form-control" name="created_start" aria-label="created_start">
+                <input type="text" class="form-control" name="created_start" aria-label="created_start">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" name="created_end" aria-label="created_end">
+                <input type="text" class="form-control" name="created_end" aria-label="created_end">
               </div>
             </div>
 
+          <!-- Checkout Date -->
+          <div class="form-group checkout-range">
+              <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-6" id="datepicker">
+                  <input type="text" class="form-control" name="checkout_date_start" aria-label="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">
+              </div>
+          </div>
+
             <!-- Expected Checkin Date -->
             <div class="form-group expected_checkin-range">
               <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-6" id="datepicker">
-                <input type="text" class="input-sm form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
+                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
+                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
               </div>
             </div>
 
@@ -341,9 +303,9 @@
               <div class="form-group last_audit-range">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
                   <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="input-sm form-control" name="last_audit_start" aria-label="last_audit_start">
+                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="input-sm form-control" name="last_audit_end" aria-label="last_audit_end">
+                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end">
                   </div>
               </div>
 
@@ -351,43 +313,50 @@
               <div class="form-group next_audit-range">
                   <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-6" id="datepicker">
-                      <input type="text" class="input-sm form-control" name="next_audit_start" aria-label="nex_audit_start">
+                      <input type="text" class="form-control" name="next_audit_start" aria-label="nex_audit_start">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="input-sm form-control" name="next_audit_end" aria-label="next_audit_end">
+                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end">
                   </div>
               </div>
 
             <div class="col-md-9 col-md-offset-3">
-            <label>
-              {{ Form::checkbox('exclude_archived', '1', old('exclude_archived'), ['class' => 'minimal']) }}
+            <label class="form-control">
+              {{ Form::checkbox('exclude_archived', '1', old('exclude_archived')) }}
               {{ trans('general.exclude_archived') }}
             </label>
             </div>
             <div class="col-md-9 col-md-offset-3">
-              <label>
-                {{ Form::checkbox('use_bom', '1', old('use_bom'), ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('use_bom', '1', old('use_bom')) }}
                 {{ trans('general.bom_remark') }}
               </label>
             </div>
 
               <div class="col-md-9 col-md-offset-3">
-                <br>
-                  {{ Form::radio('deleted_assets', '', true, ['aria-label'=>'deleted_assets', 'class'=>'minimal', 'id'=>'deleted_assets_exclude_deleted'])}}
-                  <label for="deleted_assets_exclude_deleted">{{ trans('general.exclude_deleted') }}</label>
-                  <br>
-                  {{ Form::radio('deleted_assets', '1', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal', 'id'=>'deleted_assets_include_deleted']) }}
-                  <label for="deleted_assets_include_deleted">{{ trans('general.include_deleted') }}</label>
-                  <br>
-                  {{ Form::radio('deleted_assets', '0', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal','id'=>'deleted_assets_only_deleted']) }}
-                <label for="deleted_assets_only_deleted">{{ trans('general.only_deleted') }}</label>
-              </div>
 
+                  <label class="form-control">
+                    {{ Form::radio('deleted_assets', '', true, ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_exclude_deleted'])}}
+                    {{ trans('general.exclude_deleted') }}
+                  </label>
+                  <label class="form-control">
+                    {{ Form::radio('deleted_assets', '1', old('deleted_assets'), ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_include_deleted']) }}
+                    {{ trans('general.include_deleted') }}
+                  </label>
+                  <label class="form-control">
+                  {{ Form::radio('deleted_assets', '0', old('deleted_assets'), ['aria-label'=>'deleted_assets','id'=>'deleted_assets_only_deleted']) }}
+                    {{ 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>
+          <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() }}
@@ -405,6 +374,12 @@
           endDate: '0d',
           format: 'yyyy-mm-dd'
       });
+      $('.checkout-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate: '0d',
+          format: 'yyyy-mm-dd'
+      });
 
       $('.expected_checkin-range .input-daterange').datepicker({
           clearBtn: true,
@@ -425,28 +400,9 @@
           format: 'yyyy-mm-dd'
       });
 
-    // Check-all / Uncheck all
-      $(function () {
-          var checkAll = $('input.all');
-          var checkboxes = $('input.minimal');
-
-
-          checkAll.on('ifChecked ifUnchecked', function(event) {
-              if (event.type == 'ifChecked') {
-                  checkboxes.iCheck('check');
-              } else {
-                  checkboxes.iCheck('uncheck');
-              }
-          });
-
-          checkboxes.on('ifChanged', function(event){
-              if(checkboxes.filter(':checked').length == checkboxes.length) {
-                  checkAll.prop('checked', 'checked');
-              } else {
-                  checkAll.removeProp('checked');
-              }
-              checkAll.iCheck('update');
-          });
+      $("#checkAll").change(function () {
+        $("input:checkbox").prop('checked', $(this).prop("checked"));
       });
+
   </script>
 @stop
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index aa6f94f672..9b2f57a1c6 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -42,23 +42,21 @@
 
                         <!-- Alerts Enabled -->
                         <div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('alerts_enabled', trans('admin/settings/general.alerts_enabled')) }}
-                            </div>
-                            <div class="col-md-5">
-                                {{ Form::checkbox('alerts_enabled', '1', Request::old('alerts_enabled', $setting->alerts_enabled),array('class' => 'minimal')) }}
-                                {{ trans('general.yes') }}
+                            <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>
                             </div>
                         </div>
 
                         <!-- Menu Alerts Enabled -->
                         <div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('show_alerts_in_menu', trans('admin/settings/general.show_alerts_in_menu')) }}
-                            </div>
-                            <div class="col-md-5">
-                                {{ Form::checkbox('show_alerts_in_menu', '1', Request::old('show_alerts_in_menu', $setting->show_alerts_in_menu),array('class' => 'minimal')) }}
-                                {{ trans('general.yes') }}
+                            <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>
 
diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index ec11053e9f..858ad718cb 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -43,11 +43,13 @@
                         <!-- auto ids -->
                         <div class="form-group">
                             <div class="col-md-5">
-                                {{ Form::label('auto_increment_assets', trans('admin/settings/general.auto_increment_assets')) }}
+                                <strong>{{  trans('admin/settings/general.auto_increment_assets') }}</strong>
                             </div>
                             <div class="col-md-7">
-                                {{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('class' => 'minimal', 'aria-label'=>'auto_increment_assets')) }}
-                                {{ trans('admin/settings/general.enabled') }}
+                                <label class="form-control">
+                                    {{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('aria-label'=>'auto_increment_assets')) }}
+                                    {{ trans('admin/settings/general.enabled') }}
+                                </label>
                             </div>
                         </div>
 
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index 94733141c0..ea074d45af 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -49,7 +49,7 @@
               <th data-sortable="true" data-field="modified_display" data-sort-name="modified_value">{{ trans('admin/settings/table.created') }}</th>
               <th data-field="modified_value" data-visible="false"></th>
               <th data-sortable="true">{{ trans('admin/settings/table.size') }}</th>
-              <th><span class="sr-only">{{ trans('general.delete') }}</span></th>
+              <th>{{ trans('table.actions') }}</th>
               </tr>
             </thead>
             <tbody>
@@ -71,7 +71,7 @@
                          class="btn delete-asset btn-danger btn-sm {{ (config('app.lock_passwords')) ? ' disabled': '' }}" 
                          data-toggle="modal" href="{{ route('settings.backups.destroy', $file['filename']) }}" 
                          data-content="{{ trans('admin/settings/message.backup.delete_confirm') }}" 
-                         data-title="{{ trans('general.delete') }}  {{ e($file['filename']) }} ?" 
+                         data-title="{{ trans('general.delete') }}  {{ e($file['filename']) }}?"
                          onClick="return false;">
                           <i class="fas fa-trash icon-white" aria-hidden="true"></i>
                           <span class="sr-only">{{ trans('general.delete') }}</span>
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php
index 4a421eec74..2d79ef484d 100644
--- a/resources/views/settings/barcodes.blade.php
+++ b/resources/views/settings/barcodes.blade.php
@@ -43,12 +43,11 @@
                     @if ($is_gd_installed)
                         <!-- qr code -->
                             <div class="form-group">
-                                <div class="col-md-3">
-                                    {{ Form::label('qr_code', trans('admin/settings/general.display_qr')) }}
-                                </div>
-                                <div class="col-md-9">
-                                    {{ Form::checkbox('qr_code', '1', old('qr_code', $setting->qr_code),array('class' => 'minimal', 'aria-label'=>'qr_code')) }}
-                                    {{ trans('general.yes') }}
+                                <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>
 
@@ -65,12 +64,12 @@
 
                             <!-- barcode -->
                             <div class="form-group">
-                                <div class="col-md-3">
-                                    {{ Form::label('alt_barcode_enabled', trans('admin/settings/general.display_alt_barcode')) }}
-                                </div>
-                                <div class="col-md-9">
-                                    {{ Form::checkbox('alt_barcode_enabled', '1', old('alt_barcode_enabled', $setting->alt_barcode_enabled),array('class' => 'minimal', 'aria-label'=>'alt_barcode_enabled')) }}
-                                    {{ trans('general.yes') }}
+
+                                <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>
 
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 104e426a7c..56865d451f 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -112,11 +112,13 @@
                     <!-- Include logo in print assets -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('logo_print_assets', trans('admin/settings/general.logo_print_assets')) }}
+                                <strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('logo_print_assets', '1', old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal', 'aria-label'=>'logo_print_assets')) }}
+                                <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>
@@ -125,11 +127,13 @@
                         <!-- show urls in emails-->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }}
+                                <strong>{{ trans('admin/settings/general.show_url_in_emails') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('show_url_in_emails', '1', old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal', 'aria-label'=>'show_url_in_emails')) }}
-                                {{ trans('general.yes') }}
+                                <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>
@@ -164,11 +168,13 @@
                         <!-- Allow User Skin -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('allow_user_skin', trans('admin/settings/general.allow_user_skin')) }}
+                                <strong>{{ trans('admin/settings/general.allow_user_skin') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('allow_user_skin', '1', old('allow_user_skin', $setting->allow_user_skin),array('class' => 'minimal')) }}
-                                {{ trans('general.yes') }}
+                                <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>
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 6c0655abd5..433f6c8123 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -45,11 +45,13 @@
                     <!-- Full Multiple Companies Support -->
                     <div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }}
+                            <strong>{{ trans('admin/settings/general.full_multiple_companies_support_text') }}</strong>
                         </div>
                         <div class="col-md-9">
-                            {{ Form::checkbox('full_multiple_companies_support', '1', old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal', 'aria-label'=>'full_multiple_companies_support')) }}
-                            {{ trans('admin/settings/general.full_multiple_companies_support_text') }}
+                            <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') }}
@@ -62,12 +64,13 @@
                     <!-- Require signature for acceptance -->
                     <div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('require_accept_signature',
-                                           trans('admin/settings/general.require_accept_signature')) }}
+                           <strong> {{ trans('admin/settings/general.require_accept_signature') }}</strong>
                         </div>
                         <div class="col-md-9">
-                            {{ Form::checkbox('require_accept_signature', '1', Request::old('require_accept_signature', $setting->require_accept_signature),array('class' => 'minimal')) }}
-                            {{ trans('general.yes') }}
+                            <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>
@@ -117,12 +120,14 @@
                        <!-- Load images in emails -->
                        <div class="form-group {{ $errors->has('show_images_in_email') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_images_in_email', trans('admin/settings/general.show_images_in_email')) }}
+                               <strong>{{ trans('admin/settings/general.show_images_in_email') }}</strong>
                            </div>
                            <div class="col-md-9">
-                               {{ Form::checkbox('show_images_in_email', '1', Request::old('show_images_in_email', $setting->show_images_in_email),array('class' => 'minimal')) }}
-                               {{ trans('general.yes') }}
-                               {!! $errors->first('show_images_in_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                               <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>
@@ -130,11 +135,13 @@
                        <!-- unique serial -->
                        <div class="form-group">
                            <div class="col-md-3">
-                               {{ Form::label('unique_serial', trans('admin/settings/general.unique_serial')) }}
+                               <strong>{{ trans('admin/settings/general.unique_serial') }}</strong>
                            </div>
                            <div class="col-md-9">
-                               {{ Form::checkbox('unique_serial', '1', Request::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
-                               {{ trans('general.yes') }}
+                               <label class="form-control">
+                                   {{ Form::checkbox('unique_serial', '1', Request::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
+                                   {{ trans('general.yes') }}
+                               </label>
                                {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                <p class="help-block">
                                {{ trans('admin/settings/general.unique_serial_help_text') }}
@@ -277,14 +284,20 @@
                        <!-- Model List prefs -->
                        <div class="form-group {{ $errors->has('show_in_model_list') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_in_model_list',
-                                              trans('admin/settings/general.show_in_model_list')) }}
+                               <strong>{{ trans('admin/settings/general.show_in_model_list') }}</strong>
                            </div>
                            <div class="col-md-9">
-                               {{ 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') }} <br>
-                               {{ 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') }} <br>
-                               {{ 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') }} <br>
-                               {{ 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') }}<br>
+                               <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>
 
diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
new file mode 100644
index 0000000000..d9a4c4c622
--- /dev/null
+++ b/resources/views/settings/google.blade.php
@@ -0,0 +1,117 @@
+@extends('layouts/default')
+
+{{-- Page title --}}
+@section('title')
+    {{ trans('admin/settings/general.google_login') }}
+    @parent
+@stop
+
+@section('header_right')
+    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
+@stop
+
+
+{{-- Page content --}}
+@section('content')
+
+
+
+    {{ 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="fa-brands fa-google"></i> {{ trans('admin/settings/general.google_login') }}
+                    </h2>
+                </div>
+                <div class="box-body">
+
+
+                    <div class="col-md-12">
+
+                        <!-- Google Redirect URL -->
+                        <div class="form-group">
+                            <div class="col-md-3 text-right">
+                                <strong>Redirect URL</strong>
+                            </div>
+                            <div class="col-md-8">
+                                <p class="form-control-static" style="margin-top: -5px"><code>{{ config('app.url') }}/google/callback</code></p>
+                                <p class="help-block">{!! trans('admin/settings/general.google_callback_help') !!}</p>
+                            </div>
+                        </div>
+
+
+                        <!-- Google login -->
+                        <div class="form-group {{ $errors->has('google') ? 'error' : '' }}">
+
+                            <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': '')) }}
+                                    {{ trans('admin/settings/general.enable_google_login') }}
+                                </label>
+                                <p class="help-block">{{ trans('admin/settings/general.enable_google_login_help') }}</p>
+                            </div>
+                        </div>
+
+
+                        <!-- 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') }}
+                            </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': '']) }}
+                                {!! $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>
+                                @endif
+                            </div>
+                        </div>
+
+                        <!-- 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') }}
+                            </div>
+                            <div class="col-md-8">
+
+                                @if (config('app.lock_passwords')===true)
+                                    {{ Form::text('google_client_secret', 'XXXXXXXXXXXXXXXXXXXXXXX', ['class' => 'form-control', 'disabled']) }}
+                                @else
+                                    {{ Form::text('google_client_secret', old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX']) }}
+                                @endif
+
+                                {!! $errors->first('google_client_secret', '<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>
+                                @endif
+                            </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"{{ (config('app.lock_passwords')===true) ? ' disabled': '' }}><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
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index f425dabd4e..fd1e9b630a 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -164,12 +164,12 @@
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.slack.index') }}" class="settings_button">
-                  <i class="fab fa-slack fa-4x" aria-hidden="true"></i>
+                  <i class="fa-solid fa-hashtag fa-4x" aria-hidden="true"></i>
                   <br><br>
-                  <span class="name">{{ trans('admin/settings/general.slack') }}</span>
+                  <span class="name">{{ trans('admin/settings/general.integrations') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.slack_help') }}</p>
+              <p class="help-block">{{ trans('admin/settings/general.webhook_help') }}</p>
             </div>
           </div>
         </div>
@@ -235,6 +235,21 @@
           </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.google.index') }}" class="settings_button">
+                <i class="fa-brands fa-google fa-4x" aria-hidden="true"></i>
+                <br><br>
+                <span class="name">Google</span>
+              </a>
+            </h5>
+            <p class="help-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="box-body text-center">
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 5b398c8d6a..ae9bfc3a61 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -261,7 +261,7 @@
                                 <div class="col-md-3">
                                     {{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize')) }}
                                 </div>
-                                <div class="col-md-2 form-group">
+                                <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']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.text_pt') }}</div>
@@ -276,13 +276,13 @@
                                 <div class="col-md-3">
                                     {{ Form::label('labels_width', trans('admin/settings/general.label_dimensions')) }}
                                 </div>
-                                <div class="col-md-3 form-group">
+                                <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']) }}
                                         <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="col-md-3">
                                     <div class="input-group">
                                         {{ Form::text('labels_height', old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
@@ -298,13 +298,13 @@
                                 <div class="col-md-3">
                                     {{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }}
                                 </div>
-                                <div class="col-md-3 form-group">
+                                <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']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
                                     </div>
                                 </div>
-                                <div class="col-md-3 form-group" style="margin-left: 10px">
+                                <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']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
@@ -320,7 +320,7 @@
                                 <div class="col-md-3">
                                     {{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }}
                                 </div>
-                                <div class="col-md-3 form-group">
+                                <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']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
@@ -330,7 +330,7 @@
                                         <div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div>
                                     </div>
                                 </div>
-                                <div class="col-md-3 form-group" style="margin-left: 10px; ">
+                                <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']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.bottom') }}</div>
@@ -351,7 +351,7 @@
                                 <div class="col-md-3">
                                     {{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions')) }}
                                 </div>
-                                <div class="col-md-3 form-group">
+                                <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']) }}
                                         <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
@@ -371,31 +371,30 @@
 
                             <div class="form-group">
                                 <div class="col-md-3">
-                                    {{ Form::label('labels_display', trans('admin/settings/general.label_fields')) }}
+                                {{ Form::label('labels_display', trans('admin/settings/general.label_fields')) }}
                                 </div>
                                 <div class="col-md-9">
-                                    <div class="checkbox">
-                                        <label for="labels_display_name">
+                                        <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']) }}
                                             {{ trans('admin/hardware/form.name') }}
                                         </label>
-                                        <label for="labels_display_serial">
+                                        <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']) }}
                                             {{ trans('admin/hardware/form.serial') }}
                                         </label>
-                                        <label for="labels_display_tag">
+                                        <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']) }}
                                             {{ trans('admin/hardware/form.tag') }}
                                         </label>
-                                        <label for="labels_display_model">
+                                        <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']) }}
                                             {{ trans('admin/hardware/form.model') }}
                                         </label>
-                                        <label for="labels_display_company_name">
+                                        <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']) }}
                                             {{ trans('admin/companies/table.name') }}
                                         </label>
-                                    </div> <!--/.CHECKBOX-->
+
                                 </div> <!--/.col-md-9-->
                             </div> <!--/.form-group-->
 
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 19153a0bb2..b3070e13e1 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -60,12 +60,33 @@
                         <!-- Enable LDAP -->
                         <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_integration', trans('admin/settings/general.ldap_integration')) }}
+                                {{ Form::label('ldap_enabled', trans('admin/settings/general.ldap_integration')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
 
-                                {{ Form::checkbox('ldap_enabled', '1', Request::old('ldap_enabled', $setting->ldap_enabled), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                <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]) }}
                                 {{ 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>
+                                @endif
+                            </div>
+                        </div>
+
+
+                        <!-- AD Flag -->
+                        <div class="form-group">
+                            <div class="col-md-3">
+                                {{ Form::label('is_ad', trans('admin/settings/general.ad')) }}
+                            </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]) }}
+                                {{ trans('admin/settings/general.is_ad') }}
+                                </label>
+                                {!! $errors->first('is_ad', '<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>
                                 @endif
@@ -77,10 +98,11 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_pw_sync', trans('admin/settings/general.ldap_pw_sync')) }}
                             </div>
-                            <div class="col-md-9">
-
+                            <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]) }}
                                 {{ 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>') !!}
@@ -91,75 +113,12 @@
                             </div>
                         </div>
 
-                        <!--  Default LDAP Permissions Group Select -->
-
-                        <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')) }}
-                            </div>
-
-                            <div class="col-md-9">
-
-                                @if ($groups->count())
-                                    @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
-                                        <ul>
-                                            @foreach ($groups as $id => $group)
-                                                {!! '<li>'.e($group).'</li>' !!}
-                                            @endforeach
-                                        </ul>
-
-
-                                        <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
-                                    @else
-                                        <div class="controls">
-                                            <select
-                                                    name="ldap_default_group"
-                                                    aria-label="ldap_default_group"
-                                                    id="ldap_default_group"
-                                                    class="form-control select2"
-                                            >
-                                                <option value="">{{ trans('admin/settings/general.no_default_group') }}</option>
-                                                @foreach ($groups as $id => $group)
-                                                    <option value="{{ $id }}" {{ $setting->ldap_default_group == $id ? 'selected' : '' }}>
-                                                        {{ $group }}
-                                                    </option>
-                                                @endforeach
-                                            </select>
-
-                                            <span class="help-block">
-                                      {{ trans('admin/settings/general.ldap_default_group_info') }}
-                                    </span>
-                                        </div>
-                                    @endif
-                                @else
-                                    <p>No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.</p>
-                                @endif
-
-                            </div>
-                        </div>
-
-                        <!-- AD Flag -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                {{ Form::label('is_ad', trans('admin/settings/general.ad')) }}
-                            </div>
-                            <div class="col-md-9">
-                                {{ Form::checkbox('is_ad', '1', Request::old('is_ad', $setting->is_ad), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.is_ad') }}
-                                {!! $errors->first('is_ad', '<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>
-                                @endif
-                            </div>
-                        </div>
-
                         <!-- 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')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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]) }}
                                 <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>') !!}
@@ -174,7 +133,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ad_append_domain', trans('admin/settings/general.ad_append_domain_label')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>
@@ -190,7 +149,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_client_tls_key', trans('admin/settings/general.ldap_client_tls_key')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
@@ -205,7 +164,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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]) }}
                                 <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>') !!}
@@ -220,7 +179,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_server', trans('admin/settings/general.ldap_server')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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]) }}
                                 <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>') !!}
@@ -235,9 +194,11 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_tls', trans('admin/settings/general.ldap_tls')) }}
                             </div>
-                            <div class="col-md-9">
-                                {{ Form::checkbox('ldap_tls', '1', Request::old('ldap_tls', $setting->ldap_tls),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.ldap_tls_help') }}
+                            <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]) }}
+                                    {{ trans('admin/settings/general.ldap_tls_help') }}
+                                </label>
                                 {!! $errors->first('ldap_tls', '<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>
@@ -250,9 +211,11 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_server_cert_ignore', trans('admin/settings/general.ldap_server_cert')) }}
                             </div>
-                            <div class="col-md-9">
-                                {{ Form::checkbox('ldap_server_cert_ignore', '1', Request::old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.ldap_server_cert_ignore') }}
+                            <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]) }}
+                                    {{ 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>
                                 @if (config('app.lock_passwords')===true)
@@ -266,7 +229,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_uname', trans('admin/settings/general.ldap_uname')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 {{ Form::text('ldap_uname', Request::old('ldap_uname', $setting->ldap_uname), ['class' => 'form-control','placeholder' => trans('general.example') .'binduser@example.com', $setting->demoMode]) }}
                                 {!! $errors->first('ldap_uname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -280,7 +243,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 {{ Form::password('ldap_pword', ['class' => 'form-control','placeholder' => trans('general.example') .' binduserpassword', $setting->demoMode]) }}
                                 {!! $errors->first('ldap_pword', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -294,7 +257,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_basedn', trans('admin/settings/general.ldap_basedn')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -308,7 +271,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_filter', trans('admin/settings/general.ldap_filter')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -322,7 +285,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_username_field', trans('admin/settings/general.ldap_username_field')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -336,7 +299,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_lname_field', trans('admin/settings/general.ldap_lname_field')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -350,7 +313,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_fname_field', trans('admin/settings/general.ldap_fname_field')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -364,7 +327,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_auth_filter_query', trans('admin/settings/general.ldap_auth_filter_query')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -373,17 +336,45 @@
                             </div>
                         </div>
 
-                        <!-- LDAP Version -->
-                        <div class="form-group {{ $errors->has('ldap_version') ? 'error' : '' }}">
+                        <!--  Default LDAP Permissions Group Select -->
+
+                        <div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_version', trans('admin/settings/general.ldap_version')) }}
+                                {{ Form::label('ldap_default_group', trans('admin/settings/general.ldap_default_group')) }}
                             </div>
-                            <div class="col-md-9">
-                                {{ Form::text('ldap_version', Request::old('ldap_version', $setting->ldap_version), ['class' => 'form-control','placeholder' => '3', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_version', '<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>
+
+                            <div class="col-md-8">
+
+                                @if ($groups->count())
+                                    @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
+                                        <ul>
+                                            @foreach ($groups as $id => $group)
+                                                {!! '<li>'.e($group).'</li>' !!}
+                                            @endforeach
+                                        </ul>
+
+
+                                        <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
+                                    @else
+                                        <div class="controls">
+                                            <select name="ldap_default_group" aria-label="ldap_default_group" id="ldap_default_group" class="form-control select2">
+                                                <option value="">{{ trans('admin/settings/general.no_default_group') }}</option>
+                                                @foreach ($groups as $id => $group)
+                                                    <option value="{{ $id }}" {{ $setting->ldap_default_group == $id ? 'selected' : '' }}>
+                                                        {{ $group }}
+                                                    </option>
+                                                @endforeach
+                                            </select>
+
+                                            <span class="help-block">
+                                                {{ trans('admin/settings/general.ldap_default_group_info') }}
+                                            </span>
+                                        </div>
+                                    @endif
+                                @else
+                                    <p>No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.</p>
                                 @endif
+
                             </div>
                         </div>
 
@@ -392,7 +383,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_active_flag', trans('admin/settings/general.ldap_active_flag')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 {{ Form::text('ldap_active_flag', Request::old('ldap_active_flag', $setting->ldap_active_flag), ['class' => 'form-control', $setting->demoMode]) }}
 
                                 <p class="help-block">{!! trans('admin/settings/general.ldap_activated_flag_help') !!}</p>
@@ -409,7 +400,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -422,7 +413,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_dept')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -435,7 +426,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -449,7 +440,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -463,7 +454,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_phone', trans('admin/settings/general.ldap_phone')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -477,7 +468,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_jobtitle', trans('admin/settings/general.ldap_jobtitle')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -491,7 +482,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('ldap_country', trans('admin/settings/general.ldap_country')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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>') !!}
                                 @if (config('app.lock_passwords')===true)
@@ -499,6 +490,20 @@
                                 @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')) }}
+                            </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]) }}
+                                <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>') !!}
+                                @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>
                         @if ($setting->ldap_enabled)
 
                             <!-- LDAP test -->
@@ -506,14 +511,14 @@
                                 <div class="col-md-3">
                                     {{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
                                 </div>
-                                <div class="col-md-9" id="ldaptestrow">
+                                <div class="col-md-8" id="ldaptestrow">
                                     <a {{ $setting->demoMode }} class="btn btn-default btn-sm pull-left" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
                                 </div>
-                                <div class="col-md-9 col-md-offset-3">
+                                <div class="col-md-8 col-md-offset-3">
                                     <br />
                                     <div id="ldapad_test_results" class="hidden well well-sm"></div>
                                 </div>
-                                <div class="col-md-9 col-md-offset-3">
+                                <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>
@@ -527,7 +532,7 @@
                                 <div class="col-md-3">
                                     {{ Form::label('test_ldap_login', 'Test LDAP Login') }}
                                 </div>
-                                <div class="col-md-9">
+                                <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">
@@ -542,12 +547,12 @@
 
                                 </div>
                                 </div>
-                                <div class="col-md-9 col-md-offset-3">
+                                <div class="col-md-8 col-md-offset-3">
                                     <span id="ldaptestloginicon"></span>
                                     <span id="ldaptestloginresult"></span>
                                     <span id="ldaptestloginstatus"></span>
                                 </div>
-                                <div class="col-md-9 col-md-offset-3">
+                                <div class="col-md-8 col-md-offset-3">
                                     <p class="help-block">{{ trans('admin/settings/general.ldap_login_test_help') }}</p>
                                 </div>
 
@@ -561,7 +566,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('custom_forgot_pass_url', trans('admin/settings/general.custom_forgot_pass_url')) }}
                             </div>
-                            <div class="col-md-9">
+                            <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]) }}
                                 <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>') !!}
@@ -596,6 +601,8 @@
 @push('js')
     <script nonce="{{ csrf_token() }}">
 
+
+
         /**
          * Check to see if is_ad is checked, if not disable the ad_domain field
          */
@@ -607,6 +614,15 @@
             }
         });
 
+        $("#is_ad").change(function() {
+            $('#ad_domain').prop('disabled', 'disabled');
+
+            if (this.checked) {
+                $('#ad_domain').toggleDisabled();
+            }
+
+        });
+
         /**
          * Toggle the server info based on the is_ad checkbox
          */
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 09990db2e9..020124af56 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -43,31 +43,33 @@
                 </div>
                 <div class="box-body">
 
-
-                    <div class="col-md-11 col-md-offset-1">
-
                         <!-- Enable SAML -->
-                        <div class="form-group {{ $errors->has('saml_integration') ? 'error' : '' }}">
+                        <div class="form-group{{ $errors->has('saml_integration') ? ' error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('saml_integration', trans('admin/settings/general.saml_integration')) }}
+                                <strong>{{ trans('admin/settings/general.saml_integration') }}</strong>
                             </div>
                             <div class="col-md-9">
 
-                                {{ Form::checkbox('saml_enabled', '1', Request::old('saml_enabled', $setting->saml_enabled), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.saml_enabled') }}
-                                {!! $errors->first('saml_integration', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}<br>
-                                @if (config('app.lock_passwords')===true)
-                                <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                <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 ': '', ]) }}
+                                    {{ trans('admin/settings/general.saml_enabled') }}
+                                </label>
+
+                                {!! $errors->first('saml_integration', '<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>
 
 
 
 
                                 @if ($setting->saml_enabled)
+                                    <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', url('/'), ['class' => 'form-control', 'readonly']) }}
+                                    {{ Form::text('saml_sp_entitiyid', config('app.url'), ['class' => 'form-control', 'readonly']) }}
                                     <br>
                                     <!-- SAML SP ACS -->
                                     {{ Form::label('saml_sp_acs_url', trans('admin/settings/general.saml_sp_acs_url')) }}
@@ -90,11 +92,13 @@
                                     <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>
                                     </p>
+                                    </div>
                                 @endif
                                 {!! $errors->first('saml_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
+
                         </div>
 
+
                         <!-- SAML IdP Metadata -->
                         <div class="form-group {{ $errors->has('saml_idp_metadata') ? 'error' : '' }}">
                         <div class="col-md-3">
@@ -103,10 +107,10 @@
                         <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]) }}
                             {!! $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">{{ trans('button.select_file') }}</button>
+                            <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"
                                 data-maxsize="{{ Helper::file_upload_max_size() }}"
-                                accept="text/xml,application/xml" style="display:none; max-width: 90%">
+                                accept="text/xml,application/xml" style="display:none; max-width: 90%" {{ $setting->demoMode }}>
                             
                             <p class="help-block">{{ trans('admin/settings/general.saml_idp_metadata_help') }}</p>
                         </div>
@@ -118,7 +122,7 @@
                                 {{ Form::label('saml_attr_mapping_username', trans('admin/settings/general.saml_attr_mapping_username')) }}
                             </div>
                             <div class="col-md-9">
-                                {{ Form::text('saml_attr_mapping_username', Request::old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
+                                {{ Form::text('saml_attr_mapping_username', old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
                                 <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>
@@ -127,11 +131,13 @@
                         <!-- SAML Force Login -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('saml_forcelogin', trans('admin/settings/general.saml_forcelogin_label')) }}
+                                <strong>{{  trans('admin/settings/general.saml_forcelogin_label') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('saml_forcelogin', '1', Request::old('saml_forcelogin', $setting->saml_forcelogin),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.saml_forcelogin') }}
+                                <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]) }}
+                                    {{ trans('admin/settings/general.saml_forcelogin') }}
+                                </label>
                                 <p class="help-block">{{ trans('admin/settings/general.saml_forcelogin_help') }}</p>
                                 <p class="help-block">{{ route('login', ['nosaml']) }}</p>
                                 {!! $errors->first('saml_forcelogin', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -141,11 +147,13 @@
                         <!-- SAML Single Log Out -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('saml_slo', trans('admin/settings/general.saml_slo_label')) }}
+                                <strong>{{ trans('admin/settings/general.saml_slo_label') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('saml_slo', '1', Request::old('saml_slo', $setting->saml_slo),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.saml_slo') }}
+                                <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]) }}
+                                    {{ trans('admin/settings/general.saml_slo') }}
+                                </label>
                                 <p class="help-block">{{ trans('admin/settings/general.saml_slo_help') }}</p>
                                 {!! $errors->first('saml_slo', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -161,17 +169,15 @@
                             <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>
-                        </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-primary"><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': '' }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index cf223b5537..a23b8cece9 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -72,25 +72,6 @@
                         </div>
 
 
-                        <!-- Common Passwords -->
-                        <div class="form-group {{ $errors->has('pwd_secure_uncommon') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('pwd_secure_text_label',
-                                              trans('admin/settings/general.pwd_secure_uncommon')) }}
-
-                            </div>
-                            <div class="col-md-9">
-                                <label for="pwd_secure_uncommon"><span class="sr-only">Prevent common insecure passwords</span>
-                                {{ Form::checkbox('pwd_secure_uncommon', '1', old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array('class' => 'minimal', 'aria-label'=>'pwd_secure_uncommon')) }}
-                                    {{ trans('general.yes') }}
-                                </label>
-                                {!! $errors->first('pwd_secure_uncommon', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.pwd_secure_uncommon_help') }}
-                                </p>
-                            </div>
-                        </div>
-                        <!-- /.form-group -->
 
                         <!-- Common Passwords -->
                         <div class="form-group">
@@ -99,21 +80,31 @@
                             </div>
                             <div class="col-md-9">
 
-                                {{ 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('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_disallow_same_pwd_as_user_fields') }}<br>
-
-
-                                {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_letters') }}<br>
-
-                                {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_numbers') }}<br>
-
-                                {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_symbols') }}<br>
-
-                                {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_case_diff') }}
+                                <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>
 
                                 <p class="help-block">
                                     {{ trans('admin/settings/general.pwd_secure_complexity_help') }}
@@ -125,7 +116,7 @@
                         <!-- Remote User Authentication -->
                         <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('login_remote_user_label', trans('admin/settings/general.login_remote_user_text')) }}
+                                <strong>{{ trans('admin/settings/general.login_remote_user_text') }}</strong>
                             </div>
                             <div class="col-md-9">
                                 <!--  Enable Remote User Login -->
@@ -133,8 +124,11 @@
                                 @if (config('app.lock_passwords'))
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {{ Form::checkbox('login_remote_user_enabled', '1', old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal', 'aria-label'=>'login_remote_user')) }}
-                                    {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
+                                    <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')) }}
+                                    </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') }}
@@ -155,9 +149,9 @@
                                         {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
                                     </p>
                                     <!--  Disable other logins mechanism -->
-                                    <label>
+                                    <label class="form-control">
 
-                                        {{ Form::checkbox('login_common_disabled', '1', old('login_common_disabled', $setting->login_common_disabled),array('class' => 'minimal', 'aria-label'=>'login_common_disabled')) }}
+                                        {{ 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>') !!}
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 705510ab8e..43b6456111 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -1,263 +1,9 @@
 @extends('layouts/default')
-
-{{-- Page title --}}
-@section('title')
-    {{ trans('admin/settings/general.slack_title') }}
-    @parent
-@stop
-
-@section('header_right')
-    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
+    @livewire('slack-settings-form')
 @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="fab fa-slack"></i> {{ trans('admin/settings/general.slack') }}
-                    </h2>
-                </div>
-                <div class="box-body">
-
-
-                    <p style="padding: 20px;">
-                        {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
-
-                    @if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))
-                           {{ trans('admin/settings/general.slack_integration_help_button') }}
-                    @endif
-                    </p>
-
-
-                    <div class="col-md-12" style="border-top: 0px;">
-
-
-                        <!-- slack endpoint -->
-                        <div class="form-group required {{ $errors->has('slack_endpoint') ? 'error' : '' }}">
-                            <div class="col-md-2">
-                                {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
-                            </div>
-                            <div class="col-md-10">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-
-                                @else
-                                    {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
-                                @endif
-                                {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- slack channel -->
-                        <div class="form-group required {{ $errors->has('slack_channel') ? 'error' : '' }}">
-                            <div class="col-md-2">
-                                {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
-                            </div>
-                            <div class="col-md-10">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_channel', old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-
-                                @else
-                                    {{ Form::text('slack_channel', old('slack_channel', $setting->slack_channel), array('class' => 'form-control','placeholder' => '#IT-Ops')) }}
-                                @endif
-                                {!! $errors->first('slack_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- slack botname -->
-                        <div class="form-group required {{ $errors->has('slack_botname') ? 'error' : '' }}">
-                            <div class="col-md-2">
-                                {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
-                            </div>
-                            <div class="col-md-10">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-
-                                @else
-                                    {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','placeholder' => 'Snipe-Bot')) }}
-                                @endif
-                                {!! $errors->first('slack_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <div class="form-group" id="slacktestcontainer" style="display: none">
-                            <div class="col-md-2">
-                                {{ Form::label('test_slack', 'Test Slack') }}
-                            </div>
-                            <div class="col-md-10" id="slacktestrow">
-                                <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">{!! trans('admin/settings/general.slack_test') !!}</a>
-                            </div>
-                            <div class="col-md-10 col-md-offset-2">
-                                <span id="slacktesticon"></span>
-                                <span id="slacktestresult"></span>
-                                <span id="slackteststatus"></span>
-                            </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" id="save_slack" class="btn btn-primary" disabled><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() }}">
-        var fieldcheck = function (event) {
-            if($('#slack_endpoint').val() != "" && $('#slack_channel').val() != "" && $('#slack_botname').val() != "") {
-                //enable test button *only* if all three fields are filled in
-                $('#slacktestcontainer').fadeIn(500);
-            } else {
-                //otherwise it's hidden
-                $('#slacktestcontainer').fadeOut(500);
-            }
-
-            if(event) { //on 'initial load' we don't *have* an 'event', but in the regular keyup callback, we *do*. So this only fires on 'real' callback events, not on first load
-                if($('#slack_endpoint').val() == "" && $('#slack_channel').val() == "" && $('#slack_botname').val() == "") {
-                    // if all three fields are blank, the user may want to disable Slack integration; enable the Save button
-                    $('#save_slack').removeAttr('disabled');
-                }
-            }
-        };
-
-        fieldcheck(); //run our field-checker once on page-load to set the initial state correctly.
-
-        $('input:text').keyup(fieldcheck); // if *any* text field changes, we recalculate button states
-
-        $("#slacktest").click(function() {
-
-            $("#slacktestrow").removeClass('text-success');
-            $("#slacktestrow").removeClass('text-danger');
-            $("#slackteststatus").removeClass('text-danger');
-            $("#slackteststatus").html('');
-            $("#slacktesticon").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/message.slack.sending') }}');
-            $.ajax({
-                
-                // If I comment this back in, I always get a success (200) message
-                // Without it, I get 
-                    //  beforeSend: function (xhr) { 
-                    //  xhr.setRequestHeader("Content-Type","application/json");
-                    // xhr.setRequestHeader("Accept","text/json");
-                    // },
-            
-                
-                url: '{{ route('api.settings.slacktest') }}',
-                type: 'POST',
-                headers: {
-                    "X-Requested-With": 'XMLHttpRequest',
-                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content'),
-                //    'Accept': 'application/json',
-                //    'Content-Type': 'application/json',
-                },
-                data: {
-                    'slack_endpoint': $('#slack_endpoint').val(),
-                    'slack_channel': $('#slack_channel').val(),
-                    'slack_botname': $('#slack_botname').val(),
-
-                },
-
-                dataType: 'json',
-
-                accepts: {
-                    text: "application/json"
-                },
-
-                success: function (data) {
-                    $('#save_slack').removeAttr('disabled');
-                    $("#slacktesticon").html('');
-                    $("#slacktestrow").addClass('text-success');
-                    $("#slackteststatus").addClass('text-success');
-                    //TODO: This is a bit hacky...Might need some cleanup
-                    $("#slackteststatus").html('<i class="fas fa-check text-success"></i> {{ trans('admin/settings/message.slack.success_pt1') }} ' + $('#slack_channel').val() + '{{ trans('admin/settings/message.slack.success_pt2') }}');
-                },
-
-                error: function (data) {
-
-
-                    if (data.responseJSON) {
-                        var errors = data.responseJSON.errors;
-                        var error_msg = data.responseJSON.message;
-                    } else {
-                        var errors;
-                        var error_msg = trans('admin/settings/message.slack.error');
-                    }
-
-                    var error_text = '';
-
-                    $('#save_slack').attr("disabled", true);
-                    $("#slacktesticon").html('');
-                    $("#slackteststatus").addClass('text-danger');
-                    $("#slacktesticon").html('<i class="fas fa-exclamation-triangle text-danger"></i><span class="text-danger">' + error_msg+ '</span>');
-
-                    
-                    if (data.status == 500) {
-                        $('#slackteststatus').html('{{  trans('admin/settings/message.slack.500') }}');
-                    } else if ((data.status == 400) || (data.status == 422)) {
-                        console.log('Type of errors is '+ typeof errors);
-                        console.log('Data status was 400 or 422');
-
-                        if (typeof errors != 'string') {
-                        
-                            console.log(errors.length);
-
-                            for (i in errors) {
-                                if (errors[i]) {
-                                    error_text += '<li>Error: ' + errors[i];
-                                }
-
-                            }
-
-                        } else {
-
-                            error_text = errors;
-                        }
-
-                        $('#slackteststatus').html(error_text);
-
-                    } else {
-                        $('#slackteststatus').html(data.responseText.message);
-                    }
-                }
-
-
-            });
-            return false;
-        });
-
-    </script>
-
-@endpush
diff --git a/resources/views/setup/done.blade.php b/resources/views/setup/done.blade.php
index 470c4b0b10..f0a0b48509 100644
--- a/resources/views/setup/done.blade.php
+++ b/resources/views/setup/done.blade.php
@@ -14,6 +14,6 @@
             {{ trans('general.create_admin_success') }}
         </div>
     </div>
-    <p>{{ trans('general.create_admin_redirect') }} <a href="{{ url('/') }}">{{ url('/') }}</a></p>
+    <p>{{ trans('general.create_admin_redirect') }} <a href="{{ config('app.url') }}">{{ config('app.url') }}</a></p>
 </div>
 @stop
diff --git a/resources/views/setup/migrate.blade.php b/resources/views/setup/migrate.blade.php
index fb9f50e17c..816ae61491 100644
--- a/resources/views/setup/migrate.blade.php
+++ b/resources/views/setup/migrate.blade.php
@@ -32,7 +32,7 @@
 
 @section('button')
   <form action="{{ route('setup.user') }}" method="GET">
-    <button class="btn btn-primary">{{ trans('general.setup_migrations_create_user') }}</button>
+    <button class="btn btn-primary">{{ trans('general.setup_migration_create_user') }}</button>
   </form>
 @parent
 @stop
diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index eaa74fb857..04c5dfb82c 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -1,15 +1,14 @@
 @extends('layouts/setup')
-{{-- TODO: Translate --}}
-{{-- Page title --}}
+{{ trans('admin/users/table.createuser') }}
 @section('title')
-Create a User ::
+{{ trans('admin/users/general.create_user') }} ::
 @parent
 @stop
 
 {{-- Page content --}}
 @section('content')
 
-<p> This is the account information you'll use to access the site for the first time.  </p>
+<p>{{ trans('admin/users/general.create_user_page_explanation') }}</p>
 
 <form action="{{ route('setup.user.save') }}" method="POST">
   {{ csrf_field() }}
@@ -157,10 +156,10 @@ Create a User ::
 
     <!-- Email credentials -->
     <div class="form-group col-lg-12">
-      <label>Email credentials</label>
+      <label>{{ trans('admin/users/general.email_credentials') }}</label>
       <div class="checkbox">
         <label>
-          <input type="checkbox" value="1" name="email_creds">Email my credentials to the email address above
+          <input type="checkbox" value="1" name="email_creds">{{ trans('admin/users/general.email_credentials_text') }}
         </label>
       </div>
     </div>
@@ -168,7 +167,7 @@ Create a User ::
 @stop
 
 @section('button')
-  <button class="btn btn-primary">Next: Save User</button>
+  <button class="btn btn-primary">{{ trans('admin/users/general.next_save_user') }}</button>
 </form>
 @parent
 @stop
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 37f15a98b9..363409ce3b 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -23,9 +23,11 @@
 
 <!-- Label type -->
 <div class="form-group{{ $errors->has('statuslabel_types') ? ' has-error' : '' }}">
-    <label for="statuslabel_types" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.status_type') }} </label>
+    <label for="statuslabel_types" class="col-md-3 control-label">
+        {{ 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'=>'min-width:400px', 'aria-label'=>'statuslabel_types')) }}
+        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', '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>
@@ -33,12 +35,12 @@
 <!-- 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']) }}
-    <div class="col-md-2">
+    <div class="col-md-9">
         <div class="input-group color">
-            {{ Form::text('color', Request::old('color', $item->color), array('class' => 'form-control', 'style' => 'width: 100px;', 'maxlength'=>'10')) }}
+            {{ Form::text('color', Request::old('color', $item->color), array('class' => 'form-control col-md-10', 'maxlength'=>'20')) }}
             <div class="input-group-addon"><i></i></div>
         </div><!-- /.input group -->
-        {!! $errors->first('header_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+        {!! $errors->first('color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 </div>
 
@@ -46,19 +48,23 @@
 
 <!-- Show in Nav -->
 <div class="form-group{{ $errors->has('notes') ? ' has-error' : '' }}">
-
-    <label class="col-md-offset-3" style="padding-left: 15px;">
-        <input type="checkbox" value="1" name="show_in_nav" id="show_in_nav" class="minimal" {{ Request::old('show_in_nav', $item->show_in_nav) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.show_in_nav') }}
-    </label>
+    <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') }}
+        </label>
+    </div>
 </div>
 
 <!-- Set as Default -->
 <div class="form-group{{ $errors->has('default_label') ? ' has-error' : '' }}">
 
-    <label class="col-md-offset-3" style="padding-left: 15px;">
-        <input type="checkbox" value="1" name="default_label" id="default_label" class="minimal" {{ Request::old('default_label', $item->default_label) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.default_label') }}
-    </label>
-    <p class="col-md-offset-3 help-block"> {{ trans('admin/statuslabels/table.default_label_help') }}</p>
+    <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"' : '' }}>
+             {{ trans('admin/statuslabels/table.default_label') }}
+        </label>
+        <p class="help-block"> {{ trans('admin/statuslabels/table.default_label_help') }}</p>
+    </div>
 </div>
 
 @stop
@@ -66,8 +72,14 @@
 @section('moar_scripts')
     <!-- bootstrap color picker -->
     <script nonce="{{ csrf_token() }}">
-        //color picker with addon
-        $(".color").colorpicker();
+
+        $(function() {
+            $('.color').colorpicker({
+                color: `{{ old('color', $item->color) ?: '#AA3399' }}`,
+                format: 'hex'
+            });
+        });
+
     </script>
 
 @stop
diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php
index 77858b4da4..1f24d32d9a 100755
--- a/resources/views/statuslabels/index.blade.php
+++ b/resources/views/statuslabels/index.blade.php
@@ -106,7 +106,7 @@
 
       function statuslabelsAssetLinkFormatter(value, row) {
           if ((row) && (row.name)) {
-              return '<a href="{{ url('/') }}/hardware/?status_id=' + row.id + '"> ' + row.name + '</a>';
+              return '<a href="{{ config('app.url') }}/hardware/?status_id=' + row.id + '"> ' + row.name + '</a>';
           }
       }
 
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 8a9014f708..2f5c7c236f 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -22,15 +22,7 @@
 </div>
 
 @include ('partials.forms.edit.phone')
-
-<div class="form-group {{ $errors->has('fax') ? ' has-error' : '' }}">
-    {{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
-        {{Form::text('fax', old('fax', $item->fax), array('class' => 'form-control')) }}
-        {!! $errors->first('fax', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
-
+@include ('partials.forms.edit.fax')
 @include ('partials.forms.edit.email')
 
 <div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
@@ -42,23 +34,6 @@
 </div>
 
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('suppliers_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
-            </label>
-            <br>
-            <img src="{{ url('/') }}/uploads/suppliers/{{ $item->image }}" alt="Image for {{ $item->name }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
-        </div>
-    </div>
-
-
-@endif
-
-@include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index 894a6f459a..aa1577a371 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -54,6 +54,8 @@
             <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>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 1cf95cfe44..4edfda1885 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -65,6 +65,30 @@
             </a>
           </li>
 
+            <li>
+                <a href="#components" data-toggle="tab">
+                    <span class="hidden-lg hidden-md">
+                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                    </span>
+                    <span class="hidden-xs hidden-sm">
+                          {{ trans('general.components') }}
+                        {!! (($supplier->components) && ($supplier->components->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($supplier->components->count()).'</badge>' : '' !!}
+                    </span>
+                </a>
+            </li>
+
+            <li>
+                <a href="#consumables" data-toggle="tab">
+                    <span class="hidden-lg hidden-md">
+                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                    </span>
+                    <span class="hidden-xs hidden-sm">
+                          {{ trans('general.consumables') }}
+                        {!! (($supplier->consumables) && ($supplier->consumables->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($supplier->consumables->count()).'</badge>' : '' !!}
+                    </span>
+                </a>
+            </li>
+
           <li>
             <a href="#maintenances" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
@@ -173,6 +197,59 @@
             </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
+                            data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
+                            data-cookie-id-table="componentsListingTable"
+                            data-pagination="true"
+                            data-id-table="componentsListingTable"
+                            data-search="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="accessoriesListingTable"
+                            class="table table-striped snipe-table"
+                            data-url="{{route('api.components.index', ['supplier_id' => $supplier->id]) }}"
+                            data-export-options='{
+                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-components-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                    </table>
+                </div><!-- /.table-responsive -->
+            </div><!-- /.tab-pane -->
+
+            <div class="tab-pane" id="consumables">
+            <h2 class="box-title">{{ trans('general.consumables') }}</h2>
+            <div class="table table-responsive">
+                <table
+                        data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
+                        data-cookie-id-table="consumablesListingTable"
+                        data-pagination="true"
+                        data-id-table="consumablesListingTable"
+                        data-search="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="accessoriesListingTable"
+                        class="table table-striped snipe-table"
+                        data-url="{{route('api.consumables.index', ['supplier_id' => $supplier->id]) }}"
+                        data-export-options='{
+                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-consumables-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                </table>
+            </div><!-- /.table-responsive -->
+        </div><!-- /.tab-pane -->
+
+
           <div class="tab-pane" id="maintenances">
             <h2 class="box-title">{{ trans('admin/asset_maintenances/general.asset_maintenances') }}</h2>
             <div class="table table-responsive">
@@ -261,7 +338,7 @@
               @endif
 
               @if ($supplier->notes!='')
-                  <li><i class="fa fa-comment"></i> {{ $supplier->notes }}</li>
+                  <li><i class="fa fa-comment"></i> {!! nl2br(Helper::parseEscapedMarkedownInline($supplier->notes)) !!}</li>
               @endif
 
           </ul>
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 302ce66505..bdc1ad9289 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -42,6 +42,15 @@
                         <!-- Location -->
                         @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 
+                        <div class="form-group">
+                            <div class=" col-md-9 col-md-offset-3">
+                                <label class="form-control">
+                                    {{ Form::checkbox('null_location_id', '1', false) }}
+                                    {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.location'), 'user_count' => count($users)]) }}
+                                </label>
+                            </div>
+                        </div>
+
 
                         <!-- Company -->
                         @if (\App\Models\Company::canManageUsersCompanies())
@@ -75,14 +84,21 @@
                                 {{ trans('admin/users/general.remote') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="radio">
-                                    <label for="remote">
-                                        {{ Form::radio('remote', '', true, ['aria-label'=>'remote', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }}   {{ trans('admin/users/general.remote_label') }}<br>
-                                        {{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }}   {{ trans('admin/users/general.not_remote_label') }}
 
+                                    <label for="no_change" class="form-control">
+                                        {{ Form::radio('remote', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                        {{  trans('general.do_not_change') }}
                                     </label>
-                                </div>
+                                    <label for="remote" class="form-control">
+                                        {{ Form::radio('remote', '1', old('remote'), ['id' => 'remote', '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']) }}
+                                        {{ trans('admin/users/general.not_remote_label') }}
+                                    </label>
+
+
                             </div>
                         </div> <!--/form-group-->
 
@@ -92,12 +108,37 @@
                                 {{ trans('general.ldap_sync') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="radio">
-                                    <label for="ldap_import">
-                                        {{ Form::radio('ldap_import', '', true, ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('ldap_import', '0', old('ldap_import'), ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{ trans('general.ldap_import') }}
+                                    <label for="no_change" class="form-control">
+                                        {{ Form::radio('ldap_import', '', true, ['id' => 'no_change', 'aria-label'=>'ldap_import']) }}
+                                        {{  trans('general.do_not_change') }}
                                     </label>
-                                </div>
+                                    <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') }}
+                                    </label>
+                            </div>
+                        </div> <!--/form-group-->
+
+                        <!-- activated -->
+                        <div class="form-group">
+                            <div class="col-sm-3 control-label">
+                                {{ trans('general.autoassign_licenses') }}
+                            </div>
+                            <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']) }}
+                                    {{  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']) }}
+                                    {{  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']) }}
+                                    {{  trans('general.no_autoassign_licenses_help')}}
+                                </label>
+
                             </div>
                         </div> <!--/form-group-->
 
@@ -107,14 +148,20 @@
                                 {{ trans('general.login_enabled') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="radio">
-                                    <label for="activated">
-                                        {{ Form::radio('activated', '', true, ['aria-label'=>'activated', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }}  {{  trans('admin/users/general.user_activated')}} <br>
-                                        {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }}  {{  trans('admin/users/general.user_deactivated')}}
 
+                                    <label for="no_change" class="form-control">
+                                        {{ Form::radio('activated', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                        {{  trans('general.do_not_change') }}
                                     </label>
-                                </div>
+                                    <label for="activated" class="form-control">
+                                        {{ Form::radio('activated', '1', old('activated'), ['id' => 'activated', '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']) }}
+                                        {{  trans('admin/users/general.user_deactivated')}}
+                                    </label>
+
                             </div>
                         </div> <!--/form-group-->
 
@@ -149,9 +196,15 @@
                         @endforeach
                     </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>
-                    </div>
+                    <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' : '') }}>
+                            <i class="fas fa-check icon-white" aria-hidden="true"></i>
+                            {{ trans('general.update') }}
+                        </button>
+
+                    </div><!-- /.box-footer -->
                 </div> <!--/.box.box-default-->
             </form>
         </div> <!--/.col-md-8-->
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 663602bd36..a3a37d4a35 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -18,8 +18,8 @@
           <div class="col-md-12">
             <div class="callout callout-danger">
               <i class="fas fa-exclamation-triangle"></i>
-              <strong>{{ trans('admin/users/general.warning_deletion') }} </strong>
-              {{ trans('admin/users/general.warning_deletion_information', array('count' => count($users))) }}
+              <strong>{{ trans('admin/users/general.warning_deletion_information', array('count' => count($users))) }} </strong>
+
             </div>
           </div>
 
@@ -36,7 +36,9 @@
               <table class="display table table-hover">
                 <thead>
                   <tr>
-                    <th class="col-md-1"></th>
+                    <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>
@@ -50,9 +52,9 @@
                   <tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
                     <td>
                       @if (Auth::id()!=$user->id)
-                      <input type="checkbox" name="ids[]" value="{{ $user->id }}" class="minimal" checked="checked">
+                      <input type="checkbox" name="ids[]" value="{{ $user->id }}"  checked="checked">
                       @else
-                      <input type="checkbox" name="ids[]" value="{{ $user->id }}" class="minimal" disabled>
+                      <input type="checkbox" name="ids[]" class="cannot_delete" value="{{ $user->id }}" disabled>
                       @endif
                     </td>
 
@@ -93,10 +95,10 @@
                     </td>
                   </tr>
                   <tr>
-                    <td colspan="7" class="text-danger">
-                      <label>
-                        <input type="checkbox" name="delete_user" value="1" class="minimal">
-                        <i class="fa fa-warning text-danger"></i> {{ trans('general.bulk_soft_delete') }}
+                    <td colspan="7" 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>
                       </label>
                     </td>
                   </tr>
@@ -106,8 +108,10 @@
           </div><!--/col-md-12-->
         </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-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
+          <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>
+
         </div><!-- /.box-footer -->
       </form>
     </div>
@@ -118,7 +122,15 @@
 
 @section('moar_scripts')
 <script>
-    $(":submit").attr("disabled", "disabled");
+
+
+  // TODO: include a class that excludes certain checkboxes by class to not be select-all'd
+  // $("#checkAll").change(function () {
+  //   $("input:checkbox").prop('checked', $(this).prop("checked"));
+  // });
+
+
+  $(":submit").attr("disabled", "disabled");
     $("[name='status_id']").on('select2:select', function (e) {
         if (e.params.data.id != ""){
             console.log(e.params.data.id);
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
new file mode 100644
index 0000000000..ce033acaed
--- /dev/null
+++ b/resources/views/users/confirm-merge.blade.php
@@ -0,0 +1,148 @@
+@extends('layouts/default')
+{{-- Page title --}}
+@section('title')
+    {!! trans('general.merge_users') !!}
+    @parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+    
+    <div class="row">
+        <div class="col-md-10 col-md-offset-1">
+            <div class="box box-default">
+                <form class="form-horizontal" role="form" method="post" action="{{ route('users.merge.save') }}">
+                    <div class="box-body">
+
+                        <div class="col-md-12">
+                            <p style="padding:10px">
+                                {{ trans('general.merge_information', array('count' => count($users))) }}
+                            </p>
+                        </div>
+                        <!-- CSRF Token -->
+                        {{csrf_field()}}
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="callout callout-danger">
+                                    <i class="fas fa-exclamation-triangle"></i>
+                                    {{ trans('general.warning_merge_information') }}
+                                </div>
+                            </div>
+                        </div>
+
+                        @if (config('app.lock_passwords'))
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="callout callout-info">
+                                        <p>{{ trans('general.feature_disabled') }}</p>
+                                    </div>
+                                </div>
+                            </div>
+                        @endif
+
+                        <div class="col-md-12">
+                            <div class="table-responsive">
+                                <table class="display table table-hover">
+                                    <thead>
+                                    <tr>
+                                        <th class="col-md-3">{{ trans('general.name') }}</th>
+                                        <th class="col-md-3">{{ trans('general.email') }}</th>
+                                        <th class="col-md-3">{{ trans('general.username') }}</th>
+                                        <th class="col-md-3">{{ trans('general.groups') }}</th>
+                                        <th class="col-md-1 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="col-md-1 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="col-md-1 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="col-md-1 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>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    @foreach ($users as $user)
+                                        <tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
+                                            <td>
+                                                <label class="form-control" for="{{ $user->id }}"><input type="radio" name="merge_into_id" id="{{ $user->id }}" value="{{ $user->id }}">  {{ $user->present()->fullName() }}</label>
+                                            </td>
+                                            <td>
+                                                {{ $user->email }}
+
+                                            </td>
+                                            <td>
+                                                {{ $user->username }}
+                                            </td>
+
+                                            <td>
+                                                @foreach ($user->groups as $group)
+                                                    <a href=" {{ route('groups.update', $group->id) }}" class="label  label-default">
+                                                        {{ $group->name  }}
+                                                    </a>&nbsp;
+                                                @endforeach
+                                            </td>
+                                            <td class="text-right">
+                                                {{ number_format($user->assets()->count())  }}
+                                            </td>
+                                            <td class="text-right">
+                                                {{ number_format($user->accessories()->count())  }}
+                                            </td>
+                                            <td class="text-right">
+                                                {{ number_format($user->licenses()->count())  }}
+                                            </td>
+                                            <td class="text-right">
+                                                {{ number_format($user->consumables()->count())  }}
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                    </tbody>
+
+                                </table>
+                            </div> <!--/table-responsive-->
+                        </div><!--/col-md-12-->
+                    </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>
+                    </div><!-- /.box-footer -->
+
+                    @foreach ($users as $user)
+                        <input type="hidden" name="ids_to_merge[]" value="{{ $user->id }}">
+                    @endforeach
+
+                </form>
+            </div>
+        </div>
+    </div>
+
+@stop
+
+@section('moar_scripts')
+
+    @if (!(config('app.lock_passwords')))
+
+    <script>
+
+        $('button[type="submit"]').prop("disabled", true);
+
+        $("input[type='radio']").click(function () {
+            if($(this).is(':enabled')) {
+                $("button[type='submit']").prop("disabled", false);
+                $("button[type='submit']").removeAttr("disabled");
+            }
+        });
+
+
+
+
+    </script>
+    @endif
+
+@stop
\ No newline at end of file
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 93b8fb7a21..a8b5ddf05e 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -75,12 +75,12 @@
         <!-- Custom Tabs -->
       <div class="nav-tabs-custom">
         <ul class="nav nav-tabs">
-          <li class="active"><a href="#tab_1" data-toggle="tab">{{ trans('general.information') }} </a></li>
+          <li class="active"><a href="#info" data-toggle="tab">{{ trans('general.information') }} </a></li>
           <li><a href="#permissions" data-toggle="tab">{{ trans('general.permissions') }} </a></li>
         </ul>
 
         <div class="tab-content">
-          <div class="tab-pane active" id="tab_1">
+          <div class="tab-pane active" id="info">
             <div class="row">
               <div class="col-md-12">
                 <!-- First Name -->
@@ -104,6 +104,7 @@
                 <!-- 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' : '' }}">
                     @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone'))
                       <input
@@ -111,24 +112,35 @@
                         type="text"
                         name="username"
                         id="username"
-                        value="{{ Request::old('username', $user->username) }}"
+                        value="{{ old('username', $user->username) }}"
                         autocomplete="off"
                         maxlength="191"
                         readonly
                         onfocus="this.removeAttribute('readonly');"
                         {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}
                       >
-                      @if (config('app.lock_passwords') && ($user->id))
-                        <p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
-                      @endif
-                    @else
-                      {{ trans('general.managed_ldap') }}
-                          <input type="hidden" name="username" value="{{ Request::old('username', $user->username) }}">
 
+                    @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) }}">
+                    @endif
+                  </div>
+
+
+                    @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>
+                        </div>
+                    @endif
+
+                    @if ($errors->first('username'))
+                        <div class="col-md-8 col-md-offset-3">
+                            {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                        </div>
                     @endif
 
-                    {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                  </div>
                 </div>
 
                 <!-- Password -->
@@ -191,42 +203,36 @@
                 </div>
                 @endif
 
-              <!-- Activation Status -->
+              <!-- Activation Status (Can the user login?) -->
                   <div class="form-group {{ $errors->has('activated') ? 'has-error' : '' }}">
+                          <div class="col-md-9 col-md-offset-3">
 
-                      <div class="form-group">
-                          <div class="col-md-3 control-label">
-                              {{ Form::label('activated', trans('general.login_enabled')) }}
-                          </div>
-                          <div class="col-md-9">
+                              <!-- checkbox($name, $value = 1, $checked = null, $options = array() -->
                               @if (config('app.lock_passwords'))
-                                  <div class="icheckbox disabled" style="padding-left: 10px;">
-                                      <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled" aria-label="activated">
-                                      <!-- this is necessary because the field is disabled and will reset -->
-                                      <input type="hidden" name="activated" value="{{ (int)$user->activated }}">
+                                  <!-- demo mode - disallow changes -->
+                                  <label class="form-control form-control--disabled">
+                                      <input type="checkbox" value="1" name="activated" class="disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled" aria-label="activated">
                                       {{ trans('admin/users/general.activated_help_text') }}
-                                      <p class="help-block">{{ trans('general.feature_disabled') }}</p>
 
-                                  </div>
+                                  </label>
+                                  <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+
                               @elseif ($user->id === Auth::user()->id)
-                                  <div class="icheckbox disabled" style="padding-left: 10px;">
-                                      <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
-                                      <!-- this is necessary because the field is disabled and will reset -->
-                                      <input type="hidden" name="activated" value="1" aria-label="activated">
+                                  <!-- 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']) }}
                                       {{ trans('admin/users/general.activated_help_text') }}
-                                      <p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
-                                  </div>
+                                  </label>
+                                  <p class="text-warning">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
                               @else
-                                  <div style="padding-left: 10px;">
-                                      <input type="checkbox" value="1" id="activated" name="activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
+                                  <!-- everything is normal - as you were -->
+                                  <label class="form-control">
+                                      <input type="checkbox" value="1" name="activated"{{ ((old('activated') == '1') || ($user->activated) == '1') ? ' checked="checked"' : '' }} aria-label="activated" id="activated">
                                       {{ trans('admin/users/general.activated_help_text') }}
-                                  </div>
+                                  </label>
                               @endif
 
-                              {!! $errors->first('activated', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-
                           </div>
-                      </div>
                   </div>
 
 
@@ -256,35 +262,23 @@
                   <!-- Email user -->
                   @if (!$user->id)
                       <div class="form-group" id="email_user_row">
-                          <div class="col-sm-3">
-                          </div>
-                          <div class="col-md-9">
-                              <div class="icheckbox disabled" id="email_user_div">
-                                  {{ Form::checkbox('email_user', '1', Request::old('email_user'),['class' => 'minimal', 'disabled'=>true, 'id' => 'email_user_checkbox']) }}
-                                  Email this user their credentials?
 
-                              </div>
-                              <p class="help-block">
-                                  {{ trans('admin/users/general.send_email_help') }}
-                              </p>
+                          <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']) }}
+
+                                  {{ trans('admin/users/general.email_user_creds_on_create') }}
+                              </label>
+
+                              <p class="help-block"> {{ trans('admin/users/general.send_email_help') }}</p>
 
                           </div>
                       </div> <!--/form-group-->
                   @endif
-                  <!-- Image -->
-                  @if ($user->avatar)
-                      <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-                          <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-                          <div class="col-md-5">
-                              {{ Form::checkbox('image_delete') }}
-                              <img src="{{ Storage::disk('public')->url(app('users_upload_path').e($user->avatar)) }}" class="img-responsive" />
-                              {!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!}
-                          </div>
-                      </div>
-                  @endif
 
-                  @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar'])
+                  @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar', 'image_path' => app('users_upload_path')])
+
 
                   <!-- begin optional disclosure arrow stuff -->
                   <div class="form-group">
@@ -362,20 +356,48 @@
 
                           @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">
-                                      <input type="checkbox" value="1" name="remote" class="minimal" {{ (old('remote', $user->remote)) == '1' ? ' checked="checked"' : '' }} aria-label="remote">
+                                  <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'])
 
@@ -419,7 +441,7 @@
                           <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="3" />
+                                  <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>
@@ -427,8 +449,8 @@
                           <!-- 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-6 select2') !!}
+                              <div class="col-md-9">
+                                  {!! 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>
@@ -454,17 +476,21 @@
                           @if ($snipeSettings->two_factor_enabled!='')
                               @if ($snipeSettings->two_factor_enabled=='1')
                                   <div class="form-group">
-                                      <div class="col-md-3 control-label">
-                                          {{ Form::label('two_factor_optin', trans('admin/settings/general.two_factor')) }}
-                                      </div>
-                                      <div class="col-md-9">
+                                      <div class="col-md-9 col-md-offset-3">
+
                                           @if (config('app.lock_passwords'))
-                                              <div class="icheckbox disabled">
-                                                  {{ Form::checkbox('two_factor_optin', '1', Request::old('two_factor_optin', $user->two_factor_optin),['class' => 'minimal', 'disabled'=>'disabled']) }} {{ trans('admin/settings/general.two_factor_enabled_text') }}
-                                                  <p class="help-block">{{ trans('general.feature_disabled') }}</p>
-                                              </div>
+
+                                              <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
-                                              {{ Form::checkbox('two_factor_optin', '1', Request::old('two_factor_optin', $user->two_factor_optin),['class' => 'minimal']) }} {{ trans('admin/settings/general.two_factor_enabled_text') }}
+
+                                              <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
@@ -579,33 +605,51 @@
 @section('moar_scripts')
 
 <script nonce="{{ csrf_token() }}">
+
 $(document).ready(function() {
 
-    $('#activated').on('ifChecked', function(event){
-        console.log('user activated is checked');
-        $("#email_user_row").show();
-	});
 
-    $('#activated').on('ifUnchecked', function(event){
-        $("#email_user_row").hide();
-    });
-
-    $('#email').on('keyup',function(){
-        event.preventDefault();
-
-        if(this.value.length > 5){
-            $('#email_user_checkbox').iCheck('enable');
+    // If the "user can login" check box is checked, show them the ability to email the user credentials
+    $("#activated").change(function() {
+        if (this.checked) {
+            $("#email_user_row").show();
         } else {
-            $('#email_user_checkbox').iCheck('disable').iCheck('uncheck');
+            $("#email_user_row").hide();
         }
     });
 
 
+    // Set some defaults
+    $('#email_user_checkbox').prop("disabled", true);
+    $('#email_user_checkbox').prop("checked", false);
+    $("#email_user_checkbox").removeAttr('checked');
+
+    // If the email address is longer than 5 characters, enable the "send email" checkbox
+    $('#email').on('keyup',function(){
+        //event.preventDefault();
+
+        @if (!config('app.lock_passwords'))
+
+        if (this.value.length > 5){
+            console.log('email field is ' + this.value.length + ' - enable the checkbox');
+            $('#email_user_checkbox').prop("disabled", false);
+            $("#email_user_checkbox").parent().removeClass("form-control--disabled");
+        } else {
+            console.log('email field is ' + this.value.length + ' - DISABLE the checkbox');
+            $('#email_user_checkbox').prop("disabled", true);
+            $('#email_user_checkbox').prop("checked", false);
+            $("#email_user_checkbox").parent().addClass("form-control--disabled");
+        }
+
+        @endif
+    });
+
+
 	// Check/Uncheck all radio buttons in the group
-    $('tr.header-row input:radio').on('ifClicked', function () {
+    $('tr.header-row input:radio').change(function() {
         value = $(this).attr('value');
         area = $(this).data('checker-group');
-        $('.radiochecker-'+area+'[value='+value+']').iCheck('check');
+        $('.radiochecker-'+area+'[value='+value+']').prop('checked', true);
     });
 
     $('.header-name').click(function() {
@@ -665,7 +709,7 @@ $(document).ready(function() {
             data: {},
             headers: {
                 "X-Requested-With": 'XMLHttpRequest',
-                 "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                 "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content') // TODO` - we should do this in ajaxSetup
             },
             dataType: 'json',
 
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 08ff7baf73..0f1e8a9097 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -2,7 +2,7 @@
 <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()]) }}</title>
+    <title>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} - {{ date('Y-m-d H:i', time()) }}</title>
     <style>
         body {
             font-family: "Arial, Helvetica", sans-serif;
@@ -36,21 +36,21 @@
 
         <h2>
             @if ($snipeSettings->logo!='')
-                <img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+                <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
             @endif
             {{ $snipeSettings->site_name }}
         </h2>
     @elseif ($snipeSettings->brand == '2')
         @if ($snipeSettings->logo!='')
-            <img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
         @endif
     @else
         <h2>{{ $snipeSettings->site_name }}</h2>
     @endif
 @endif
 
-<h3>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}</h3>
-
+<h3>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
+</h3>
     @if ($assets->count() > 0)
         @php
             $counter = 1;
@@ -243,6 +243,8 @@
 
     <br>
     <br>
+    {{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}
+    <br>
     <br>
     <table>
         <tr>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 5d959589e6..83c624f36b 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -122,7 +122,8 @@
         @endcan
 
         @can('update', \App\Models\User::class)
-          <li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
+          <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 hidden-sm">{{ trans('button.upload') }}</span>
@@ -519,13 +520,23 @@
                     </div>
                     @endif
 
-                     <!-- login enabled -->
+                    <!-- vip -->
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ 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')  !!}
+                      </div>
+                    </div> 
+                    
+                    <!-- remote -->
                      <div class="row">
                       <div class="col-md-3">
                         {{ trans('admin/users/general.remote') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->remote=='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')  !!}
+                        {!! ($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')  !!}
                       </div>
                     </div>
 
@@ -535,17 +546,28 @@
                         {{ trans('general.login_enabled') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->activated=='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')  !!}
+                        {!! ($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')  !!}
                       </div>
                     </div>
 
-                    <!-- LDAP -->
+                   <!-- auto assign license -->
+                   <div class="row">
+                       <div class="col-md-3">
+                           {{ 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')  !!}
+                       </div>
+                   </div>
+
+
+                   <!-- LDAP -->
                     <div class="row">
                       <div class="col-md-3">
                           LDAP
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->ldap_import=='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')  !!}
+                        {!! ($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')  !!}
 
                       </div>
                     </div>
@@ -559,7 +581,7 @@
                             </div>
                             <div class="col-md-9">
                           
-                              {!! ($user->two_factor_active()) ? '<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')  !!}
+                              {!! ($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')  !!}
                           
                             </div>
                           </div>
@@ -570,7 +592,7 @@
                               {{ 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 text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                              {!! ($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')  !!}
 
                             </div>
                           </div>
@@ -580,11 +602,11 @@
                             <!-- 2FA reset -->
                             <div class="row">
                               <div class="col-md-3">
-                          
+
                               </div>
-                              <div class="col-md-9" style="margin-top: 10px;">
+                              <div class="col-md-9">
                                 
-                                <a class="btn btn-default btn-sm pull-left" id="two_factor_reset" style="margin-right: 10px;"> 
+                                <a class="btn btn-default btn-sm" id="two_factor_reset" style="margin-right: 10px; margin-top: 10px;">
                                   {{ trans('admin/settings/general.two_factor_reset') }}
                                 </a>
                                 <span id="two_factor_reseticon">
@@ -611,7 +633,7 @@
                         {{ trans('admin/users/table.notes') }}
                       </div>
                       <div class="col-md-9">
-                        {{ $user->notes }}
+                          {!! nl2br(Helper::parseEscapedMarkedownInline($user->notes)) !!}
                       </div>
 
                     </div>
@@ -868,17 +890,22 @@
 
                             </td>
                             <td>
-                                @if ($file->filename)
-                                    @if ( Helper::checkUploadIsImage($file->get_src('users')))
+                                @if (($file->filename) && (Storage::exists('private_uploads/users/'.$file->filename)))
+                                   @if (Helper::checkUploadIsImage($file->get_src('users')))
                                         <a href="{{ route('show/userfile', ['userId' => $user->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show/userfile', ['userId' => $user->id, 'fileId' => $file->id]) }}" 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>
-                                {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/users/'.$file->filename)) }}
+                            <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>
@@ -888,10 +915,12 @@
                             </td>
                             <td>
                                 @if ($file->filename)
-                                    <a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-default">
-                                        <i class="fas fa-download" aria-hidden="true"></i>
-                                        <span class="sr-only">{{ trans('general.download') }}</span>
-                                    </a>
+                                    @if (Storage::exists('private_uploads/users/'.$file->filename))
+                                        <a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-default">
+                                            <i class="fas fa-download" aria-hidden="true"></i>
+                                            <span class="sr-only">{{ trans('general.download') }}</span>
+                                        </a>
+                                    @endif
                                 @endif
                             </td>
                             <td>{{ $file->created_at }}</td>
@@ -941,15 +970,18 @@
               <thead>
               <tr>
                 <th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">Icon</th>
-                <th class="col-sm-3" data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true">{{ trans('general.date') }}</th>
-                <th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
+                <th data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true">{{ trans('general.date') }}</th>
+                  <th data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+                  <th data-field="action_type">{{ trans('general.action') }}</th>
+                  <th data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
+                  <th data-field="note">{{ trans('general.notes') }}</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>
+                      <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
                   @endif
-                  <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.target') }}</th>
+                  <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>
+
+
               </tr>
               </thead>
             </table>
@@ -1011,9 +1043,9 @@ $(function () {
       dataType: 'json',
 
       success: function (data) {
-        $("#two_factor_reset_toggle").html('').html('<i class="fas fa-times text-danger" aria-hidden="true"></i> {{ trans('general.no') }}');
+        $("#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_reseticon").html('');
-        $("#two_factor_resetstatus").html('<i class="fas fa-check text-success"></i>' + data.message);
+        $("#two_factor_resetstatus").html('<span class="text-success"><i class="fas fa-check"></i> ' + data.message + '</span>');
 
       },
 
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
index 0fcfba938c..e2f953e2a6 100644
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -6,13 +6,13 @@
 
 @if ($snipeSettings->brand == '3')
 @if ($snipeSettings->logo!='')
-<img class="navbar-brand-img logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+<img class="navbar-brand-img logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
 @endif
 {{ $snipeSettings->site_name }}
 
 @elseif ($snipeSettings->brand == '2')
 @if ($snipeSettings->logo!='')
-<img class="navbar-brand-img logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+<img class="navbar-brand-img logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
 @endif
 @else
 {{ $snipeSettings->site_name }}
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 0147ef40d7..905dc25296 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -86,13 +86,13 @@ $style = [
 
                                 @if ($snipeSettings->brand == '3')
                                     @if ($logo!='')
-                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
+                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ config('app.url') }}/uploads/{{ $logo }}">
                                     @endif
                                     {{ $snipeSettings->site_name }}
 
                                 @elseif ($snipeSettings->brand == '2')
                                     @if ($logo!='')
-                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
+                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ config('app.url') }}/uploads/{{ $logo }}">
                                     @endif
                                 @else
                                     {{ $snipeSettings->site_name }}
@@ -203,8 +203,8 @@ $style = [
                                     <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
                                         <p style="{{ $style['paragraph-sub'] }}">
                                             &copy; {{ date('Y') }}
-                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ $snipeSettings->site_name }}</a>.
-                                            All rights reserved.
+                                            <a style="{{ $style['anchor'] }}" href="{{ config('app.url') }}" target="_blank">{{ $snipeSettings->site_name }}</a>.
+                                            {{ trans('mail.rights_reserved') }}
                                         </p>
 
                                         @if ($snipeSettings->privacy_policy_link!='')
diff --git a/routes/api.php b/routes/api.php
index 9c51626256..4b8866dc2f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -114,8 +114,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
     Route::resource('accessories',
         Api\AccessoriesController::class,
-        ['names' =>
-            [
+        ['names' => [
                 'index' => 'api.accessories.index',
                 'show' => 'api.accessories.show',
                 'update' => 'api.accessories.update',
@@ -144,8 +143,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
     Route::resource('categories', 
         Api\CategoriesController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.categories.index',
                 'show' => 'api.categories.show',
                 'update' => 'api.categories.update',
@@ -173,8 +171,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
       Route::resource('companies', 
         Api\CompaniesController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.companies.index',
                 'show' => 'api.companies.show',
                 'update' => 'api.companies.update',
@@ -203,8 +200,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
       Route::resource('departments', 
         Api\DepartmentsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.departments.index',
                 'show' => 'api.departments.show',
                 'update' => 'api.departments.update',
@@ -254,8 +250,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
       Route::resource('components', 
         Api\ComponentsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.components.index',
                 'show' => 'api.components.show',
                 'update' => 'api.components.update',
@@ -308,8 +303,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
       Route::resource('consumables', 
         Api\ConsumablesController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.consumables.index',
                 'show' => 'api.consumables.show',
                 'update' => 'api.consumables.update',
@@ -328,8 +322,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         */
         Route::resource('depreciations', 
         Api\DepreciationsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.depreciations.index',
                 'show' => 'api.depreciations.show',
                 'update' => 'api.depreciations.update',
@@ -416,8 +409,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
         Route::resource('fieldsets', 
         Api\CustomFieldsetsController::class,
-            ['names' => 
-                [
+            ['names' => [
                     'index' => 'api.fieldsets.index',
                     'show' => 'api.fieldsets.show',
                     'update' => 'api.fieldsets.update',
@@ -436,8 +428,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         */
         Route::resource('groups', 
         Api\GroupsController::class,
-            ['names' => 
-                [
+            ['names' => [
                     'index' => 'api.groups.index',
                     'show' => 'api.groups.show',
                     'update' => 'api.groups.update',
@@ -491,6 +482,20 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             ]
         )->name('api.assets.checkout.bytag');
 
+        Route::post('bytag/{any}/checkin',
+            [
+                Api\AssetsController::class,
+                'checkinbytag'
+            ]
+        )->name('api.asset.checkinbytagPath');
+
+        Route::post('checkinbytag',
+            [
+                Api\AssetsController::class,
+                'checkinbytag'
+            ]
+        )->name('api.asset.checkinbytag');
+
         Route::get('byserial/{any}',
             [
                 Api\AssetsController::class, 
@@ -520,13 +525,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         ]
         )->name('api.asset.checkin');
 
-        Route::post('checkinbytag',
-            [
-                Api\AssetsController::class,
-                'checkinbytag'
-            ]
-        )->name('api.asset.checkinbytag');
-
         Route::post('{id}/checkout',
         [
             Api\AssetsController::class, 
@@ -549,8 +547,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
         Route::resource('hardware', 
         Api\AssetsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.assets.index',
                 'show' => 'api.assets.show',
                 'update' => 'api.assets.update',
@@ -567,8 +564,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
          */
         Route::resource('maintenances', 
         Api\AssetMaintenancesController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.maintenances.index',
                 'show' => 'api.maintenances.show',
                 'update' => 'api.maintenances.update',
@@ -597,8 +593,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
       Route::resource('imports', 
         Api\ImportController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.imports.index',
                 'show' => 'api.imports.show',
                 'update' => 'api.imports.update',
@@ -638,8 +633,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
         Route::resource('licenses', 
         Api\LicensesController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.licenses.index',
                 'show' => 'api.licenses.show',
                 'update' => 'api.licenses.update',
@@ -654,8 +648,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
 
         Route::resource('licenses.seats', 
         Api\LicenseSeatsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.licenses.seats.index',
                 'show' => 'api.licenses.seats.show',
                 'update' => 'api.licenses.seats.update',
@@ -696,8 +689,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
     
         Route::resource('locations', 
         Api\LocationsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.locations.index',
                 'show' => 'api.locations.show',
                 'update' => 'api.locations.update',
@@ -726,8 +718,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
     
         Route::resource('manufacturers', 
         Api\ManufacturersController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.manufacturers.index',
                 'show' => 'api.manufacturers.show',
                 'update' => 'api.manufacturers.update',
@@ -763,8 +754,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
     
         Route::resource('models', 
         Api\AssetModelsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.models.index',
                 'show' => 'api.models.show',
                 'update' => 'api.models.update',
@@ -843,8 +833,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         
         Route::resource('settings', 
         Api\SettingsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.settings.index',
                 'show' => 'api.settings.show',
                 'update' => 'api.settings.update',
@@ -897,12 +886,18 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ]
             )->name('api.statuslabels.deployable');
 
+            Route::get('selectlist',
+                [
+                    Api\StatuslabelsController::class,
+                    'selectlist'
+                ]
+            )->name('api.statuslabels.selectlist');
+
         }); 
     
         Route::resource('statuslabels', 
         Api\StatuslabelsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.statuslabels.index',
                 'show' => 'api.statuslabels.show',
                 'update' => 'api.statuslabels.update',
@@ -931,8 +926,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
     
         Route::resource('suppliers', 
         Api\SuppliersController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.suppliers.index',
                 'show' => 'api.suppliers.show',
                 'update' => 'api.suppliers.update',
@@ -1025,8 +1019,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
     
         Route::resource('users', 
         Api\UsersController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.users.index',
                 'show' => 'api.users.show',
                 'update' => 'api.users.update',
@@ -1044,8 +1037,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         */
         Route::resource('kits', 
         Api\PredefinedKitsController::class,
-        ['names' => 
-            [
+        ['names' => [
                 'index' => 'api.kits.index',
                 'show' => 'api.kits.show',
                 'update' => 'api.kits.update',
@@ -1194,6 +1186,17 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             )->name('api.activity.index');
         }); // end reports api routes
 
+        /**
+         * Version API routes
+         */
+
+        Route::get('/version', function () {
+            return response()->json(
+                [
+                    'version' => config('version.app_version'),
+                ], 200);
+        }); // end version api routes
+
 
         Route::fallback(function () {
             return response()->json(
@@ -1204,5 +1207,4 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ], 404);
         }); // end fallback routes
 
-
 }); // end API routes
diff --git a/routes/console.php b/routes/console.php
index a4c876ae04..2413e4b189 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -20,7 +20,7 @@ Artisan::command('inspire', function () {
 
 Artisan::command('snipeit:travisci-install', function () {
     if (! Setting::setupCompleted()) {
-        $settings = new Setting;
+        $settings = new Setting();
         $settings->site_name = 'test-ci';
         $settings->alert_email = 'test@example.com';
         $settings->alerts_enabled = 1;
diff --git a/routes/web.php b/routes/web.php
index ca7a5beac2..4bc8b3bb58 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -40,7 +40,7 @@ Route::group(['middleware' => 'auth'], function () {
     Route::resource('categories', CategoriesController::class, [
         'parameters' => ['category' => 'category_id'],
     ]);
-
+  
     /*
     * Labels
     */
@@ -50,21 +50,30 @@ Route::group(['middleware' => 'auth'], function () {
     )->where('labelName', '.*')->name('labels.show');
 
     /*
-    * Locations
-    */
+     * Locations
+     */
+
+    Route::group(['prefix' => 'locations', 'middleware' => ['auth']], function () {
+        
+        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'],
     ]);
 
-    Route::get(
-        'locations/{locationId}/printassigned',
-        [LocationsController::class, 'print_assigned']
-    )->name('locations.print_assigned');
-
-    Route::get(
-        'locations/{locationId}/printallassigned',
-        [LocationsController::class, 'print_all_assigned']
-    )->name('locations.print_all_assigned');
 
     /*
     * Manufacturers
@@ -187,6 +196,9 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
 
     Route::get('oauth', [SettingsController::class, 'api'])->name('settings.oauth.index');
 
+    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');
 
@@ -231,11 +243,10 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
 |
 |
 */
-Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () {
-    Route::get('/', 
-       [ImportsController::class, 'index']
-    )->name('imports.index');
-});
+
+Route::get('/import',
+    \App\Http\Livewire\Importer::class
+)->middleware('auth')->name('imports.index');
 
 /*
 |--------------------------------------------------------------------------
@@ -274,7 +285,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
     )->name('account/request-asset');
 
     Route::post(
-        'request/{itemType}/{itemId}',
+        'request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}',
         [ViewAssetsController::class, 'getRequestItem']
     )->name('account/request-item');
 
@@ -287,7 +298,8 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
     Route::get('accept/{id}', [Account\AcceptanceController::class, 'create'])
         ->name('account.accept.item');
 
-    Route::post('accept/{id}', [Account\AcceptanceController::class, 'store']);
+    Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])
+        ->name('account.store-acceptance');
 
     Route::get(
         'print',
@@ -448,8 +460,6 @@ Route::group(['middleware' => 'web'], function () {
         [LoginController::class, 'postTwoFactorAuth']
     );
 
-
-
     Route::post(
         'password/email',
         [ForgotPasswordController::class, 'sendResetLinkEmail']
@@ -478,7 +488,9 @@ Route::group(['middleware' => 'web'], function () {
     )->name('password.email')->middleware('throttle:forgotten_password');
 
 
-
+     // Socialite Google login
+    Route::get('google', 'App\Http\Controllers\GoogleAuthController@redirectToGoogle')->name('google.redirect');
+    Route::get('google/callback', 'App\Http\Controllers\GoogleAuthController@handleGoogleCallback')->name('google.callback');
 
 
     Route::get(
diff --git a/routes/web/accessories.php b/routes/web/accessories.php
index 3166b36cd9..35ec73e7df 100644
--- a/routes/web/accessories.php
+++ b/routes/web/accessories.php
@@ -42,6 +42,14 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
         [Accessories\AccessoriesFilesController::class, 'show']
     )->name('show.accessoryfile');
 
+    Route::get('{accessoryId}/clone',
+            [Accessories\AccessoriesController::class, 'getClone']
+        )->name('clone/accessories');
+
+    Route::post('{accessoryId}/clone', 
+        [Accessories\AccessoriesController::class, 'postCreate']
+    );
+
 });
 
 Route::resource('accessories', Accessories\AccessoriesController::class, [
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 9f28434107..1643e5794e 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -160,6 +160,11 @@ Route::group(
             [BulkAssetsController::class, 'destroy']
         )->name('hardware/bulkdelete');
 
+        Route::post(
+            'bulkrestore',
+            [BulkAssetsController::class, 'restore']
+        )->name('hardware/bulkrestore');
+
         Route::post(
             'bulksave',
             [BulkAssetsController::class, 'update']
@@ -185,4 +190,4 @@ Route::resource('hardware',
 
 Route::get('ht/{any?}',
     [AssetsController::class, 'getAssetByTag']
-)->where('any', '.*')->name('ht/assetTag');
\ No newline at end of file
+)->where('any', '.*')->name('ht/assetTag');
diff --git a/routes/web/licenses.php b/routes/web/licenses.php
index ebcb5a2b2b..b70347793c 100644
--- a/routes/web/licenses.php
+++ b/routes/web/licenses.php
@@ -25,10 +25,21 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
         [Licenses\LicenseCheckinController::class, 'store']
     )->name('licenses.checkin.save');
 
+    Route::post(
+        '{licenseId}/bulkcheckin',
+        [Licenses\LicenseCheckinController::class, 'bulkCheckin']
+    )->name('licenses.bulkcheckin');
+
+    Route::post(
+        '{licenseId}/bulkcheckout',
+        [Licenses\LicenseCheckoutController::class, 'bulkCheckout']
+    )->name('licenses.bulkcheckout');
+
     Route::post(
     '{licenseId}/upload',
         [Licenses\LicenseFilesController::class, 'store']
     )->name('upload/license');
+
     Route::delete(
     '{licenseId}/deletefile/{fileId}',
         [Licenses\LicenseFilesController::class, 'destroy']
diff --git a/routes/web/users.php b/routes/web/users.php
index 0183d48dc6..95de200638 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -120,6 +120,14 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
         ]
     )->name('users/bulkedit');
 
+    Route::post(
+        'merge',
+        [
+            Users\BulkUsersController::class,
+            'merge'
+        ]
+    )->name('users.merge.save');
+
 
     Route::post(
         'bulksave',
diff --git a/sample_csvs/MOCK_ACCESSORIES.csv b/sample_csvs/MOCK_ACCESSORIES.csv
deleted file mode 100644
index f7e490a104..0000000000
--- a/sample_csvs/MOCK_ACCESSORIES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Item Name,Purchase Date,Purchase Cost,Location,Company,Order Number,Category,Requestable,Quantity
-Walter Carter,09/01/2006,,metus. Vivamus,Macromedia,J935H60W,Customers,False,278
diff --git a/sample_csvs/MOCK_ASSETS.csv b/sample_csvs/MOCK_ASSETS.csv
deleted file mode 100644
index ed6fe7b50a..0000000000
--- a/sample_csvs/MOCK_ASSETS.csv
+++ /dev/null
@@ -1 +0,0 @@
-Full Name,Email,Username,item Name,Category,Model name,Manufacturer,Model Number,Serial Number,Asset Tag,Location,Notes,Purchase Date,Purchase Cost,Company,Status,Warranty Months,Supplier
Bonnie Nelson,bnelson0@cdbaby.com,bnelson0,eget nunc donec quis,quam,massa id,Linkbridge,6.37702E+15,27aa8378-b0f4-4289-84a4-405da95c6147,970882174-8,Daping,"Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.",4/5/16,133289.59,Alpha,Undeployable,14,Blogspan
Judith Ferguson,jferguson1@state.tx.us,jferguson1,mi in porttitor,justo,congue diam id,Flipstorm,5.02E+18,4bc7fc90-5a97-412f-8eed-77ecacc643fc,544574073-0,Cirangga Kidul,,3/8/16,763.46,,Undeployable,12,Oyope
Mildred Gibson,mgibson2@wiley.com,mgibson2,morbi quis tortor id,nunc nisl duis,convallis tortor risus,Lajo,3.74623E+14,2837ab20-8f0d-4935-8a52-226392f2b1b0,710141467-2,Shekou,In congue. Etiam justo. Etiam pretium iaculis justo.,8/9/15,233.57,Konklab,Lost,,
Brandon Lee,blee3@quantcast.com,blee3,amet cursus id turpis,sed,in faucibus orci,Zoomlounge,3.54962E+15,18d6e6a4-d362-4de9-beb4-7f62fb93de6f,103538064-1,Leksand,Integer ac leo. Pellentesque ultrices mattis odio. Donec vitae nisi.,10/11/15,,,Pending Diagnostics,,
Betty Powell,bpowell4@tuttocitta.it,bpowell4,ipsum praesent,condimentum curabitur,et ultrices,Kazu,3.56708E+15,f9b473c6-c810-42f2-8335-27ce468889a8,118753405-6,Dresi Wetan,,6/16/15,324.8,,Ready to Deploy,,
Anthony Wheeler,awheeler5@cocolog-nifty.com,awheeler5,dictumst maecenas ut,sem praesent,accumsan felis,Layo,3.00525E+13,4751495c-cee0-4961-b788-94a545b5643e,998233705-X,Dante Delgado,,4/16/16,261.79,,Archived,15,Ntag
Dennis Reynolds,dreynolds6@ustream.tv,dreynolds6,libero nam,risus,interdum mauris,Twiyo,3.58544E+15,17b3cf8d-fead-46f5-a8b0-49906bb90a00,177687256-8,Pingle,"Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.",5/24/15,,,Pending Diagnostics,,
Andrea Arnold,aarnold7@cbc.ca,aarnold7,mauris morbi non,ante vel,sapien dignissim,Cogibox,3.54851E+15,7a6a2fdb-160c-4d91-8e05-a0337a90d9db,129556040-2,Zhuli,Duis aliquam convallis nunc. Proin at turpis a pede posuere nonummy. Integer non velit.,9/15/15,434.86,,Archived,14,Kwilith
Anna Butler,abutler8@wikia.com,abutler8,eleifend pede libero,sapien a libero,et ultrices posuere cubilia,Flipbug,6.76E+17,c1a57909-3b2e-47fe-ab2f-843401b2a7de,117517007-0,Niopanda,"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.",4/13/16,89.53,,Archived,15,Linkbridge
Mark Bennett,mbennett9@diigo.com,mbennett9,convallis nulla neque,eu sapien,duis mattis egestas metus aenean,Centimia,3.78343E+14,07540238-fb3c-4c8a-8e11-d43883ee4268,007968217-0,Zoumaling,,7/4/15,,,Lost,,
Emily Wheeler,ewheelera@google.de,ewheelera,in felis,leo odio,quam sapien varius,Roombo,2.01954E+14,527b2445-2c67-4f76-912f-6ec42400a584,441402118-9,Luts�۪k,Suspendisse potenti. In eleifend quam a odio. In hac habitasse platea dictumst.,5/18/16,,Bitwolf,Lost,36,Wikizz
Wanda Fox,wfoxb@virginia.edu,wfoxb,vel ipsum praesent,potenti nullam porttitor,augue vestibulum rutrum rutrum neque,Yakijo,3.56764E+15,,863829558-8,Pravdinsk,"Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.",11/10/15,,,Lost,14,Linkbridge
,,,odio elementum,posuere cubilia curae,ante vel ipsum praesent blandit,Oyope,3.52946E+15,9a863968-180e-451d-a723-dc85e2d5d8ff,742114860-4,Panay,Pellentesque at nulla. Suspendisse potenti. Cras in purus eu magna vulputate luctus.,3/20/16,881.4,,,30,Tagcat
Janet Grant,jgrantd@cpanel.net,jgrantd,viverra diam vitae,semper sapien,dapibus dolor vel,Flashset,3.55979E+15,e287bb64-ff4f-434c-88ab-210ad433c77b,927820758-6,Achiaman,,3/5/16,675.3,,Archived,22,Meevee
Antonio Larson,alarsone@tripod.com,alarsone,felis sed interdum venenatis,id lobortis,dui proin,Chatterbridge,4.071E+12,90bcab28-ffd4-48c9-ba5d-c2eeb1400698,789757925-5,Oemanu,Phasellus sit amet erat. Nulla tempus. Vivamus in felis eu sapien cursus vestibulum.,7/25/15,,,Ready to Deploy,30,Shuffledrive
Lois Powell,lpowellf@com.com,lpowellf,id consequat,justo nec,odio porttitor id consequat in,Skipstorm,3.63091E+13,08e440f7-bd0b-47a7-a577-4a3ce3c7dfe7,202652281-2,Qiaolin,"Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.",8/13/15,446.22,,Lost,,
Mildred Allen,malleng@com.com,malleng,porta volutpat quam pede,in hac habitasse,donec vitae nisi nam,Devpulse,3.54378E+15,5f900903-0ffe-4405-b5ad-aa4aa59d911c,210119288-8,Accha,"Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.",12/24/15,923.9,,Lost,20,Quamba
Clarence Austin,caustinh@bigcartel.com,caustinh,libero nam dui proin,aliquet at feugiat,eget tincidunt eget tempus,Photobug,2.01967E+14,bde85740-f103-4b49-a691-a60c7f6859a8,022102715-7,Kerkrade,In hac habitasse platea dictumst. Etiam faucibus cursus urna. Ut tellus.,3/29/16,,,Undeployable,22,Browsedrive
Walter Chavez,wchavezi@blogs.com,wchavezi,sociis natoque penatibus,vel est,at diam nam,Photofeed,3.53302E+15,bf4a2a92-6f29-4d24-be90-8126d4dcbd64,610672722-8,Villa Regina,,5/13/16,442.51,,Archived,28,Tekfly
Marie Elliott,melliottj@constantcontact.com,melliottj,sed tristique in,rutrum,luctus et ultrices,Riffpath,4.5473E+12,9a02817e-de79-4850-a212-84c9ae3dd1a2,898880851-7,Tibro,Integer ac leo. Pellentesque ultrices mattis odio. Donec vitae nisi.,9/10/15,906.39,,Undeployable,,
,,,dui luctus rutrum,sapien ut nunc,dictumst morbi vestibulum,Aivee,4.40538E+15,514aca2a-9080-4c49-8695-7ba4c78edc65,466008300-4,Menglie,Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus.,12/21/15,151.27,,,,
,,,ut massa volutpat,sed,quis odio consequat varius integer,Abatz,3.53725E+15,b99208e2-b8d8-4f7a-8a06-366a27733b97,313295582-5,Solidaridad,"Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",2/15/16,211.07,,,,
Benjamin Ford,bfordm@woothemes.com,bfordm,habitasse platea dictumst,primis in faucibus,quam a odio in,Blogtag,5.0183E+15,c8680b36-a13c-427f-a6a1-1b9b351eb129,552327520-4,Sorinomo,In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet.,11/25/15,112.11,,Ready to Deploy,18,Quatz
Timothy Warren,twarrenn@printfriendly.com,twarrenn,leo pellentesque ultrices,vestibulum,in sapien iaculis congue vivamus,Brightdog,3.03551E+13,6c1e7556-063f-4c71-87ce-e46b06e8c238,446504693-6,Tamel,"Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.",8/19/15,221.03,,Undeployable,26,Mydeo
Carlos Kelley,ckelleyo@1und1.de,ckelleyo,suspendisse potenti nullam,magnis dis parturient,at nibh in hac,Voolia,5.02E+17,95605fc3-f82e-4472-a2b0-93acd5e255ed,860990227-7,Tu��epi,,6/8/15,443.05,,Archived,35,Aimbu
Marilyn Bryant,mbryantp@uiuc.edu,mbryantp,nam nulla integer,praesent,turpis adipiscing lorem vitae,Divape,5.02E+16,53d9eef2-e0f8-4c81-9a31-8c12e4f52ab0,536251475-X,Peddie,Phasellus in felis. Donec semper sapien a libero. Nam dui.,6/8/15,79.2,Zaam-Dox,Ready to Deploy,,
Douglas Marshall,dmarshallq@cdc.gov,dmarshallq,cras mi pede malesuada,odio,aliquam augue quam sollicitudin,Thoughtsphere,5.61048E+15,50d3ba91-06d6-4453-84ff-5ed801d3faa5,148599723-2,Betafo,,3/6/16,321.96,,Archived,,
Ruth Cunningham,rcunninghamr@biglobe.ne.jp,rcunninghamr,duis faucibus accumsan,ipsum aliquam,metus vitae ipsum,Jabbertype,4.01795E+15,d4f93ed0-5010-4026-9d3f-0e59e0efee15,416706302-6,Margate,"Duis bibendum, felis sed interdum venenatis, turpis enim blandit mi, in porttitor pede justo eu massa. Donec dapibus. Duis at velit eu est congue elementum.",8/6/15,211.17,,Ready to Deploy,,
,,,non ligula pellentesque ultrices,arcu adipiscing molestie,vestibulum ante ipsum,Shuffletag,3.57525E+15,657a313a-361c-4733-b444-ec26dc02fdfe,065976674-4,Igurubi,"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.",4/15/16,,,,26,Wikido
Jose Freeman,jfreemant@free.fr,jfreemant,duis aliquam convallis,potenti cras in,enim blandit,Twitterlist,6.04924E+14,98080972-ad72-4581-8aee-ec78a6b3f528,712283421-2,Kuala Lumpur,Phasellus sit amet erat. Nulla tempus. Vivamus in felis eu sapien cursus vestibulum.,9/5/15,744.98,,Lost,,
Wayne Woods,wwoodsu@tuttocitta.it,wwoodsu,massa id nisl,est,sit amet erat nulla,Browsecat,3.55318E+15,fb146f1d-b0ed-4ffc-8653-3ad0afe99dd0,666189117-3,Saint-��tienne,,3/14/16,,,Undeployable,14,Jabbersphere
Frank Butler,fbutlerv@reuters.com,fbutlerv,arcu adipiscing,duis faucibus accumsan,nisi venenatis,Shuffledrive,3.74623E+14,7820e851-362b-4187-b64a-c1ef8800fbce,323903931-1,Jinxiang,"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.",8/5/15,697.01,,Pending Diagnostics,17,Vipe
,,,eget eros,sapien varius,morbi non quam nec,Eamia,3.74283E+14,9c67b528-2389-4733-92e7-a09415649c72,172486278-2,Neuzina,"Duis bibendum, felis sed interdum venenatis, turpis enim blandit mi, in porttitor pede justo eu massa. Donec dapibus. Duis at velit eu est congue elementum.",10/7/15,541.17,,,,
Christina Hunt,chuntx@businessinsider.com,chuntx,ut suscipit a feugiat,in faucibus,neque vestibulum eget,Quamba,5.55378E+15,,620738847-X,Agpangi,"In sagittis dui vel nisl. Duis ac nibh. Fusce lacus purus, aliquet at, feugiat non, pretium quis, lectus.",5/31/15,199.6,,Pending Diagnostics,,
Cynthia Gordon,cgordony@livejournal.com,cgordony,morbi non quam nec,faucibus,eu orci mauris lacinia,Meevee,3.74284E+14,1a67f546-8de4-4d2d-b32f-6c1605cac858,786105964-2,Dallas,,4/1/16,19.94,,Archived,33,Meembee
Jose Hicks,jhicksz@behance.net,jhicksz,habitasse platea dictumst etiam,fermentum donec ut,diam vitae quam suspendisse,Jaxspan,3.72302E+14,71a5bd14-ba88-4cda-860d-9ca62347ba8d,539439867-4,Jo��eva,Duis bibendum. Morbi non quam nec dui luctus rutrum. Nulla tellus.,4/9/16,,,Ready to Deploy,22,Zoombeat
Anna Turner,aturner10@opensource.org,aturner10,sed tristique in tempus,sodales scelerisque mauris,nullam porttitor,Oozz,4.50806E+15,2b9c723e-e530-44c5-ab95-72f3ad50a631,526130314-1,Tawau,Sed ante. Vivamus tortor. Duis mattis egestas metus.,3/10/16,815,Flexidy,Pending Diagnostics,36,Bluejam
Patricia Lawson,plawson11@businessinsider.com,plawson11,proin at,justo in,sed magna at nunc commodo,Nlounge,3.56797E+15,f2c0248d-b6f6-42bf-a9a2-49c54372c01c,558108071-2,Valejas,,7/27/15,,,Lost,35,Quire
Marilyn Gilbert,mgilbert12@comcast.net,mgilbert12,in hac habitasse platea,semper porta volutpat,proin eu,Rhyloo,6.30E+17,6e9c56b8-5266-47f1-86bc-f73a0d42b05e,562820613-X,Bulacnin,,7/5/15,665.67,,Lost,,
Anne Lynch,alynch13@biglobe.ne.jp,alynch13,tincidunt nulla,turpis elementum,lobortis convallis tortor,Divavu,5.10277E+15,db9913ae-d9ba-4653-aae5-590c2a3b5a69,943970793-3,Mayenne,Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.,1/9/16,468.49,,Pending Diagnostics,33,Dynava
Lois Morgan,lmorgan14@wired.com,lmorgan14,imperdiet et commodo,vel,quis odio consequat varius,Camido,3.04539E+13,a6f3372c-73f1-4857-8ae6-432a2bdfd1c2,372636920-1,Shuiying,,8/15/15,,,Archived,,
Lois Johnson,ljohnson15@japanpost.jp,ljohnson15,nulla suscipit ligula,eros elementum,felis fusce posuere,Zoomcast,3.54561E+15,1c0928ec-2ef7-430b-a556-18b33451612b,903861200-1,Kahuripan,Integer tincidunt ante vel ipsum. Praesent blandit lacinia erat. Vestibulum sed magna at nunc commodo placerat.,3/29/16,721.77,,Pending Diagnostics,,
Jennifer Jones,jjones16@fda.gov,jjones16,primis in faucibus orci,porttitor pede justo,lorem quisque ut erat curabitur,Myworks,5.12749E+15,3efa8d3c-01b2-408e-b592-f8cf18a510f4,413846137-X,Charneca,,11/9/15,293.99,Trippledex,Pending Diagnostics,29,Devify
,,,aliquet pulvinar,tincidunt,rutrum at lorem,Meembee,5.42813E+15,ef71ff15-fae8-4f6b-a19c-9277d5a29df9,762391548-7,Szyd��owo,Pellentesque at nulla. Suspendisse potenti. Cras in purus eu magna vulputate luctus.,12/23/15,15,,,,
David Jackson,djackson18@gravatar.com,djackson18,pede venenatis,magna,id pretium,Shuffledrive,2.01495E+14,eab62ffe-2e0b-4c77-8aa2-133d27bb90ab,309187247-5,Jinglongqiao,,8/12/15,572.92,,Undeployable,21,Twimbo
Janice Ford,jford19@dmoz.org,jford19,nibh ligula,nibh in,lobortis vel dapibus,Brightbean,3.56745E+15,42ec7b7d-5a37-4587-a3a7-e038ed650e94,741760231-2,Waenenda,Cras non velit nec nisi vulputate nonummy. Maecenas tincidunt lacus at velit. Vivamus vel nulla eget eros elementum pellentesque.,11/1/15,,,Pending Diagnostics,,
Todd Boyd,tboyd1a@nsw.gov.au,tboyd1a,metus vitae ipsum aliquam,in felis,sapien non mi,Jabbertype,3.57862E+15,70e99274-5df6-4f1f-b2cc-3f9cffd3a828,387700497-0,Siedlce,,6/7/15,983.85,,Ready to Deploy,,
,,,semper est,primis in faucibus,justo in hac habitasse platea,Dabvine,4.94E+18,e8aa6b0f-8f69-45cd-972c-b2b1e0415061,286742654-5,Minggang,"Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",8/10/15,,,,,
Andrea Brooks,abrooks1c@shareasale.com,abrooks1c,non ligula,fusce posuere,ac enim in tempor,Youtags,5.61003E+15,,226358965-1,Santa Gertrudes,Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis.,3/5/16,387.62,,Lost,29,Zava
,,,nisl venenatis,sodales,varius nulla facilisi cras non,Realbuzz,2.01497E+14,2952e308-122a-45ea-ac49-a836ca71a597,403999355-1,Huanxi,"Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.",4/10/16,925.87,,,,
Anne Butler,abutler1e@elpais.com,abutler1e,sapien ut nunc,ultrices posuere cubilia,rhoncus mauris enim,Skibox,6.77E+18,3c1b4617-2219-419e-87fb-d654a0dab45e,756532468-X,Vyshniy Voloch��k,In congue. Etiam justo. Etiam pretium iaculis justo.,9/21/15,271.56,,Pending Diagnostics,,
,,,congue etiam justo,potenti nullam,congue risus semper porta,Oba,3.57135E+15,9637ee81-b7ae-4465-8d19-61eec98ddf7f,577368722-4,Mostovskoy,"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.",7/27/15,,,,24,Edgeblab
Cynthia Stevens,cstevens1g@dyndns.org,cstevens1g,cursus vestibulum proin,ut volutpat,vel est donec odio justo,Skinte,6.33E+17,0bd330d0-3bde-4c47-a156-06a34435d8b4,058534741-7,Santa Rosa del Sara,"Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.",4/26/16,,,Archived,36,Wikizz
,,,sapien urna,habitasse,eget semper rutrum nulla nunc,Browsecat,5.01013E+15,bf03e70c-fb5d-4164-ab40-9b96d5465e6c,629074247-7,Bonneuil-sur-Marne,Phasellus in felis. Donec semper sapien a libero. Nam dui.,3/21/16,810.91,,,12,Brainlounge
Donald Richardson,drichardson1i@over-blog.com,drichardson1i,eros vestibulum ac,nulla justo,natoque penatibus et magnis dis,Feedmix,3.58802E+15,f0d7f3c9-dfea-4bb6-a401-571fffbf3090,984987793-6,Palue,,10/2/15,718.94,,Ready to Deploy,34,Midel
,,,erat vestibulum sed magna,ipsum,eget eleifend luctus ultricies,Skipfire,3.53169E+15,343daa1a-d1f8-4ffb-8368-a26670381a40,604121509-0,Medicine Hat,"Praesent blandit. Nam nulla. Integer pede justo, lacinia eget, tincidunt eget, tempus vel, pede.",1/4/16,,,,,
Chris Ellis,cellis1k@squidoo.com,cellis1k,eros viverra,velit nec,mauris laoreet ut rhoncus aliquet,Jaxnation,5.00235E+15,f66bce43-fccf-49d9-94d1-cb0b8fe56472,546719356-2,Qigzhi,,11/21/15,585.87,,Pending Diagnostics,,
,,,non velit nec nisi,orci luctus et,sed vestibulum,Katz,3.0501E+13,e3d0a6ac-024b-4c21-ac30-536e6c3d5959,404764262-2,Mojokerto,"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.",2/3/16,605.49,,,32,Shufflester
Timothy Greene,tgreene1m@npr.org,tgreene1m,massa id lobortis,mattis pulvinar nulla,suscipit a feugiat et,Ainyx,3.53528E+15,3c11f36f-e17b-4392-890b-35e5bc0bdffa,552778185-6,Chongqing,"Maecenas leo odio, condimentum id, luctus nec, molestie sed, justo. Pellentesque viverra pede ac diam. Cras pellentesque volutpat dui.",7/22/15,115.77,,Lost,34,Vinte
Doris Taylor,dtaylor1n@mapy.cz,dtaylor1n,magnis dis,neque aenean auctor,primis in faucibus orci luctus,Vipe,5.04837E+15,bc134863-84be-4421-9938-d8ce0525ef1e,360343994-5,Xinbao,Duis aliquam convallis nunc. Proin at turpis a pede posuere nonummy. Integer non velit.,11/18/15,,,Pending Diagnostics,33,Flashdog
Melissa Day,mday1o@archive.org,mday1o,justo sollicitudin,vestibulum velit id,tellus semper,Fivechat,3.53579E+15,996499bc-968c-4ecc-a7d6-07e9348d552b,077200127-8,Nancheng,"Proin leo odio, porttitor id, consequat in, consequat ut, nulla. Sed accumsan felis. Ut at dolor quis odio consequat varius.",8/1/15,166.87,,Ready to Deploy,35,Trudeo
Laura Watkins,lwatkins1p@quantcast.com,lwatkins1p,quam pharetra,imperdiet,ut massa,Oyondu,4.91E+18,a7db733b-732c-4b54-901e-1ad28e145cb0,177033838-1,Wuhu,"Fusce posuere felis sed lacus. Morbi sem mauris, laoreet ut, rhoncus aliquet, pulvinar sed, nisl. Nunc rhoncus dui vel sem.",12/4/15,406.96,,Lost,14,Devpoint
Donna Kelley,dkelley1q@dailymotion.com,dkelley1q,sapien placerat,nulla elit ac,tincidunt eu felis,Aimbo,5.61082E+15,fed4c9f9-8b0d-4d6a-ac43-c7929a31bb72,952276162-1,Arnhem,"Morbi non lectus. Aliquam sit amet diam in magna bibendum imperdiet. Nullam orci pede, venenatis non, sodales sed, tincidunt eu, felis.",1/24/16,,,Pending Diagnostics,17,Kayveo
Adam Marshall,amarshall1r@marketwatch.com,amarshall1r,etiam faucibus cursus,cubilia curae mauris,massa id nisl venenatis,Skajo,3.55036E+15,e7c5e464-9bbd-4d86-b549-3d3883b3139e,224555307-1,Dachang,Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis.,2/13/16,,,Lost,27,Skidoo
Peter Mills,pmills1s@instagram.com,pmills1s,diam id,dolor sit,ligula vehicula consequat,Gabtune,3.56656E+15,efdf785c-a484-4454-8be0-d3b598c77a8d,269508722-5,Voi,"Morbi non lectus. Aliquam sit amet diam in magna bibendum imperdiet. Nullam orci pede, venenatis non, sodales sed, tincidunt eu, felis.",5/23/16,312.07,,Archived,,
Christina George,cgeorge1t@163.com,cgeorge1t,vivamus vestibulum,quisque,id mauris vulputate elementum nullam,Yabox,6.70934E+15,1a4d5946-1539-4ff1-921b-c442eef8c28b,596138325-3,Campamento,,4/3/16,221.14,,Archived,,
Theresa Cunningham,tcunningham1u@infoseek.co.jp,tcunningham1u,nisl aenean lectus pellentesque,fermentum,nisl ut,Skimia,3.57585E+15,70d0b5d4-8569-421c-912c-9ee11c565b62,769779519-1,Plei K̢��n,"In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo.",3/22/16,,Konklab,Ready to Deploy,13,Wordify
Stephanie Burke,sburke1v@unicef.org,sburke1v,ac neque duis bibendum,duis consequat,rhoncus aliquam lacus morbi,Centizu,3.57606E+15,,709282846-5,Donghui,,6/23/15,29.7,,Pending Diagnostics,,
Lillian Ferguson,lferguson1w@go.com,lferguson1w,elementum eu interdum,arcu libero rutrum,viverra pede,Muxo,5.60E+16,29de084a-9376-48dc-a310-cd01b1baf715,603152718-9,Camp Diable,,2/9/16,,,Ready to Deploy,,
Bonnie Graham,bgraham1x@hexun.com,bgraham1x,mauris morbi non,tristique in tempus,ipsum aliquam non,Devpoint,6.30E+18,d8a596a6-f59a-4423-b424-b3d132c06791,297281098-8,Vlachovice,"Proin eu mi. Nulla ac enim. In tempor, turpis nec euismod scelerisque, quam turpis adipiscing lorem, vitae mattis nibh ligula nec sem.",2/10/16,553.28,,Archived,,
Michael Lawrence,mlawrence1y@addtoany.com,mlawrence1y,nonummy maecenas,nec euismod scelerisque,a suscipit nulla elit,Katz,3.58866E+15,e95115b8-b45e-4a89-b271-c46732934394,740776342-9,Babica,"Cras mi pede, malesuada in, imperdiet et, commodo vulputate, justo. In blandit ultrices enim. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",3/18/16,552.55,,Lost,,
Martin Scott,mscott1z@list-manage.com,mscott1z,sodales scelerisque mauris sit,ut erat,sem fusce consequat nulla,Linklinks,3.74284E+14,9a108aa1-568c-4141-a8d8-92a451f68e22,915137664-4,Reshetikha,Nullam porttitor lacus at turpis. Donec posuere metus vitae ipsum. Aliquam non mauris.,8/26/15,,,Archived,16,Kanoodle
Kelly Mitchell,kmitchell20@google.it,kmitchell20,vestibulum ante,quam sapien varius,morbi odio odio,Edgeclub,5.60E+18,319bf374-753a-49ef-885a-03a27dca4275,225439463-0,Lere,"Fusce posuere felis sed lacus. Morbi sem mauris, laoreet ut, rhoncus aliquet, pulvinar sed, nisl. Nunc rhoncus dui vel sem.",7/25/15,,,Ready to Deploy,34,Kwilith
Carol Hunter,chunter21@prnewswire.com,chunter21,phasellus in,est congue,tortor eu,Ozu,5.60223E+15,a8be5948-b765-4f5d-9f1f-0f26952842d0,001757218-5,Tanabi,Pellentesque at nulla. Suspendisse potenti. Cras in purus eu magna vulputate luctus.,3/11/16,81.15,,Lost,20,Skynoodle
Michelle Simpson,msimpson22@discuz.net,msimpson22,amet sapien dignissim,luctus nec molestie,mauris non ligula pellentesque,Mudo,3.578E+15,b8098077-560e-4a12-8bc1-220d83291032,815922090-1,Aegela,In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet.,11/21/15,664.35,,Lost,28,Edgeblab
Pamela Martin,pmartin23@ca.gov,pmartin23,mollis molestie lorem quisque,ut,donec semper sapien a libero,Zoombeat,5.04838E+15,cb7572bc-d7ca-4b5b-903e-fc567c337e32,057863524-0,Empangeni,"Proin leo odio, porttitor id, consequat in, consequat ut, nulla. Sed accumsan felis. Ut at dolor quis odio consequat varius.",4/6/16,711.1,Transcof,Ready to Deploy,,
Johnny Burke,jburke24@va.gov,jburke24,eros suspendisse,arcu,justo eu massa donec dapibus,Skipfire,5.60E+17,,155395513-7,Half Way Tree,In congue. Etiam justo. Etiam pretium iaculis justo.,5/25/15,538.84,,Pending Diagnostics,,
Adam Stevens,astevens25@feedburner.com,astevens25,justo maecenas rhoncus,sed,in consequat ut nulla,Jetwire,3.55875E+15,,296612694-9,Xinjian,Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.,11/1/15,,,Undeployable,19,Minyx
Gloria Black,gblack26@samsung.com,gblack26,pharetra magna,et ultrices posuere,habitasse platea dictumst morbi,Bubbletube,3.5813E+15,271065e6-f1fe-4d2b-aa47-76234656e29b,515439385-6,Santiago del Estero,,5/12/16,948.04,,Lost,,
Christine Jenkins,cjenkins27@pbs.org,cjenkins27,justo morbi ut odio,sagittis,auctor gravida sem praesent id,Mynte,6.76E+18,30f840cb-acfd-4797-82ad-14c6ccad4d03,790003898-1,Ban Phan Don,,1/19/16,89.14,,Archived,,
Michelle Riley,mriley28@networkadvertising.org,mriley28,justo maecenas,nulla tellus in,ligula in lacus,Izio,4.94E+18,b695a1c5-c4af-493e-8851-63aa41032c01,524481245-9,Munggang,,11/21/15,895.08,,Undeployable,29,Feednation
Diana Torres,dtorres29@sciencedaily.com,dtorres29,nulla pede ullamcorper augue,rutrum rutrum neque,enim in tempor turpis,Jabberbean,3.5662E+15,,743088297-8,Bromma,"In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo.",2/29/16,833.54,,Archived,,
Dorothy Simmons,dsimmons2a@adobe.com,dsimmons2a,amet sem fusce,id,hendrerit at vulputate vitae,Gabtype,5.4075E+15,c6144e5d-0b64-44d1-bba5-0a7b0e3e78dc,998959453-8,Tawau,"Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.",8/25/15,,,Lost,,
Michelle Hunt,mhunt2b@t-online.de,mhunt2b,orci vehicula,odio,eleifend luctus ultricies eu,Dazzlesphere,3.54493E+15,9e1a7fdc-e410-4369-8203-f170e5e749b0,118824344-6,North Vancouver,Pellentesque at nulla. Suspendisse potenti. Cras in purus eu magna vulputate luctus.,2/29/16,663.19,,Undeployable,30,Twiyo
,,,eu mi nulla ac,bibendum,ridiculus mus vivamus vestibulum,Skiptube,5.60226E+15,659b0fc6-7107-4be4-8478-836366c4e23c,867984064-5,Hekou,Duis aliquam convallis nunc. Proin at turpis a pede posuere nonummy. Integer non velit.,5/6/16,,,,16,Ntags
Andrew White,awhite2d@a8.net,awhite2d,a nibh,amet cursus id,curabitur in,Ooba,3.53628E+15,f2cfaa82-b40f-4119-81c0-f5a8eeb06a38,222270511-8,Angeghakot�۪,"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.",6/8/15,651.3,,Pending Diagnostics,,
Brian Franklin,bfranklin2e@dot.gov,bfranklin2e,nisi eu orci mauris,hendrerit at vulputate,tortor duis mattis egestas metus,Jazzy,3.74622E+14,638497c0-4690-4872-b241-c15545806c8a,255225792-5,Durayk��sh,"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.",10/8/15,141.33,,Ready to Deploy,,
Martha Carter,mcarter2f@soundcloud.com,mcarter2f,posuere cubilia curae mauris,quis turpis,in magna bibendum imperdiet nullam,Demizz,6.76E+18,b3c36765-d42a-4c83-bc62-300bb07fde98,361952926-4,Opatov,,7/8/15,599.89,,Ready to Deploy,,
Joe Stone,jstone2g@shinystat.com,jstone2g,ut at,dapibus,ultrices aliquet,Wikibox,3.54711E+15,,100773046-3,Atbasar,"Praesent blandit. Nam nulla. Integer pede justo, lacinia eget, tincidunt eget, tempus vel, pede.",1/31/16,16.78,,Pending Diagnostics,20,Gigazoom
Todd Brooks,tbrooks2h@nbcnews.com,tbrooks2h,sed sagittis nam,lacinia eget tincidunt,porta volutpat erat,Wikibox,3.6954E+13,,703472241-2,Oslo,Duis aliquam convallis nunc. Proin at turpis a pede posuere nonummy. Integer non velit.,6/28/15,573.06,Solarbreeze,Ready to Deploy,31,Buzzshare
Janet Cox,jcox2i@virginia.edu,jcox2i,tristique est et tempus,sociis natoque penatibus,auctor sed,Dynazzy,6.38918E+15,54316132-26aa-4bf0-9e1b-6dcd2afda6ce,715414385-1,Saidpur,"Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.",9/15/15,,,Lost,,
Henry Richardson,hrichardson2j@shinystat.com,hrichardson2j,enim leo rhoncus,eros,dolor sit,Blogpad,3.55007E+15,7d1c8d21-7a56-4c23-8649-061ddd708893,764086552-2,Momanalu,"Morbi porttitor lorem id ligula. Suspendisse ornare consequat lectus. In est risus, auctor sed, tristique in, tempus sit amet, sem.",8/29/15,,,Pending Diagnostics,,
Rose Thompson,rthompson2k@goo.gl,rthompson2k,in faucibus,vitae ipsum aliquam,quam sollicitudin vitae consectetuer eget,Yakitri,5.60223E+15,7bd1251a-ea8c-46dc-93d2-93f62d90a969,509026038-9,Rennes,In hac habitasse platea dictumst. Etiam faucibus cursus urna. Ut tellus.,4/18/16,551.23,,Pending Diagnostics,,
Julie Hunter,jhunter2l@delicious.com,jhunter2l,morbi odio odio,sociis natoque,in sapien,Jatri,6.70628E+15,ea523cc9-6428-4a4b-aed9-c470703891f1,900328219-6,Quevedo,"Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.",9/7/15,291.69,Otcom,Undeployable,25,Jazzy
Dorothy Reed,dreed2m@dedecms.com,dreed2m,donec posuere metus,ut,tellus nisi,Kazio,3.54535E+15,3772945a-1148-4051-8443-0ee8a92c5b17,328780394-8,Grujugan,,9/19/15,488.83,,Pending Diagnostics,,
Phyllis Foster,pfoster2n@indiegogo.com,pfoster2n,amet erat nulla tempus,sit amet,aenean auctor,Shufflebeat,3.53311E+15,db9552e3-13f9-40c4-9c2c-8bff3c4c0a89,611870818-5,Oepula,,6/13/15,,Vagram,Ready to Deploy,,
Marie Henry,mhenry2o@accuweather.com,mhenry2o,odio consequat varius,pede justo lacinia,posuere cubilia curae nulla,Rhybox,3.56755E+15,d6289b7b-4ed2-4ec8-a486-4cdd3591da21,277787832-3,Kotabaru,Etiam vel augue. Vestibulum rutrum rutrum neque. Aenean auctor gravida sem.,7/3/15,157.31,,Undeployable,25,Bluejam
Linda Crawford,lcrawford2p@ocn.ne.jp,lcrawford2p,adipiscing elit proin,lobortis sapien sapien,blandit non,Jetpulse,6.77112E+15,79bfd454-34f7-4eb5-8873-aaf43cc63856,982547121-2,Efeng,,6/27/15,287.02,,Ready to Deploy,21,Babbleset
Thomas Dean,tdean2q@prnewswire.com,tdean2q,pede posuere nonummy,at nulla suspendisse,interdum in ante vestibulum,Demimbu,3.57035E+15,11515f0c-7d36-4938-9656-ae35be5aad59,847767021-8,���Ayn al Bay��Ԁ�,"Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla. Quisque arcu libero, rutrum ac, lobortis vel, dapibus at, diam.",3/15/16,,,Ready to Deploy,20,Devcast
George Sanchez,gsanchez2r@photobucket.com,gsanchez2r,cras in purus,sed tristique in,consequat varius integer ac,Feedfire,6.33405E+15,354f339d-547d-4b10-8753-a8e5cb18e1d9,408291765-9,Lakatnik,Suspendisse potenti. In eleifend quam a odio. In hac habitasse platea dictumst.,1/1/16,,,Lost,25,Edgewire
Kathleen Alvarez,kalvarez2s@amazonaws.com,kalvarez2s,duis faucibus,mauris ullamcorper,orci luctus,Wikizz,6.30E+18,edb67bfb-ef81-44e7-a9fe-ee496816f7bc,134054338-9,Longsha,Praesent id massa id nisl venenatis lacinia. Aenean sit amet justo. Morbi ut odio.,7/6/15,,,Archived,,
Joan Rodriguez,jrodriguez2t@sohu.com,jrodriguez2t,morbi porttitor lorem id,leo,sem duis aliquam convallis,Janyx,6.30496E+15,30a3b488-c5db-4569-ac68-46cb86424ff1,145564427-7,Arlington,"Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla. Quisque arcu libero, rutrum ac, lobortis vel, dapibus at, diam.",7/17/15,,,Archived,28,Trunyx
Jean Russell,jrussell2u@shop-pro.jp,jrussell2u,nulla tempus vivamus,eu felis fusce,cubilia curae nulla dapibus,Yata,3.57887E+15,f285b067-6992-4a07-b34d-ed174dc73611,761164290-1,Gamut,Sed ante. Vivamus tortor. Duis mattis egestas metus.,1/11/16,27.46,,Ready to Deploy,,
Henry Chapman,hchapman2v@usa.gov,hchapman2v,erat nulla,morbi non,varius ut,Avamba,6.75964E+15,d1f90868-5e42-46c3-aba7-7de3e3d74091,415061883-6,Ondoy,Duis bibendum. Morbi non quam nec dui luctus rutrum. Nulla tellus.,7/7/15,,,Archived,,
Rebecca Nichols,rnichols2w@who.int,rnichols2w,praesent blandit lacinia,eu sapien cursus,lacinia sapien quis libero,Camimbo,3.00774E+13,cb932a82-1853-40cc-b6c0-28bf3b4ea677,194809534-3,Foundiougne,In hac habitasse platea dictumst. Etiam faucibus cursus urna. Ut tellus.,12/3/15,,,Lost,29,Edgeblab
Norma Harper,nharper2x@histats.com,nharper2x,nisi vulputate nonummy,justo in,ornare consequat,Twinder,3.74623E+14,,875593621-0,Pruchnik,,6/19/15,,,Lost,,
Henry Jacobs,hjacobs2y@tamu.edu,hjacobs2y,fermentum donec ut mauris,augue luctus,suspendisse ornare consequat lectus,Realcube,3.52863E+15,88a71d08-c42b-43c7-bdb8-973a2e0efe47,112308770-9,Cabugao,"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.",3/5/16,787.63,,Undeployable,15,Tagpad
Matthew Walker,mwalker2z@shareasale.com,mwalker2z,vel augue,ipsum dolor sit,ante ipsum primis in faucibus,Tazz,5.02E+16,84198bfa-740b-4ff9-907e-05a9ef1bece4,160413103-9,Gwanda,In hac habitasse platea dictumst. Etiam faucibus cursus urna. Ut tellus.,11/13/15,899.41,,Lost,18,Photobug
Diana Wells,dwells30@upenn.edu,dwells30,lobortis convallis,maecenas tincidunt,morbi non,Meevee,3.57096E+15,5e030a75-f9b4-42fc-9958-f3dba0b7fc0a,171773317-4,Sokod̩,Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.,5/25/15,243.93,,Undeployable,,
Keith Barnes,kbarnes31@prnewswire.com,kbarnes31,dui vel sem,iaculis,justo maecenas rhoncus aliquam,Topicstorm,4.0416E+12,60e9678e-026b-47c7-b7cb-dc00677aaed7,501758906-6,Goz B̩��da,,7/18/15,706.29,,Ready to Deploy,29,Jaxspan
Julia Romero,jromero32@youku.com,jromero32,lacinia sapien quis libero,ante vestibulum,at feugiat non pretium quis,Dabtype,3.56025E+15,147b19d6-1712-4435-aa35-07de51b13306,647505330-9,Ishurdi,"Morbi non lectus. Aliquam sit amet diam in magna bibendum imperdiet. Nullam orci pede, venenatis non, sodales sed, tincidunt eu, felis.",3/6/16,993.95,,Archived,,
Catherine Gonzales,cgonzales33@apache.org,cgonzales33,suscipit nulla,aliquet massa,viverra dapibus nulla suscipit ligula,Mudo,3.01086E+13,aa2e2be0-9f07-4311-a402-a11b2a6ca0d8,650783961-2,Xianxi,Integer tincidunt ante vel ipsum. Praesent blandit lacinia erat. Vestibulum sed magna at nunc commodo placerat.,1/25/16,669.89,,Undeployable,20,Yabox
,,,ultrices enim lorem,leo rhoncus sed,cras non velit,Npath,5.04838E+15,7fa57f76-d4fe-4871-8296-20ecd1627acb,192573987-2,Zhongzhai,Duis bibendum. Morbi non quam nec dui luctus rutrum. Nulla tellus.,11/9/15,352.64,,,,
Arthur Carter,acarter35@time.com,acarter35,pede lobortis,suspendisse accumsan tortor,lacus curabitur at,Dynabox,2.01898E+14,7ae2a979-52f8-4ce4-ab76-3c0f336589ae,613690706-2,Mangunjaya,Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.,9/24/15,,Alphazap,Archived,35,Tekfly
Jack Henderson,jhenderson36@skype.com,jhenderson36,ut erat id,sapien,etiam pretium,Zoombox,4.91E+18,80744318-59a6-4be4-8876-428bb2eb6182,122507763-X,Lieqiao,"In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo.",1/3/16,91.35,,Pending Diagnostics,,
Janice Mills,jmills37@sphinn.com,jmills37,cubilia curae donec pharetra,non,pede libero quis,Oyondu,3.56465E+15,51df7750-55b9-43ee-ba42-4baf70209c96,113885169-8,El Crucero,"Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.",1/4/16,475.07,,Lost,,
Janet Burke,jburke38@home.pl,jburke38,tincidunt nulla mollis,vulputate ut,nibh in quis,Zooveo,6.38719E+15,,244101401-3,Cuijiamatou,"Fusce posuere felis sed lacus. Morbi sem mauris, laoreet ut, rhoncus aliquet, pulvinar sed, nisl. Nunc rhoncus dui vel sem.",7/25/15,900.01,,Archived,12,Npath
Rose Smith,rsmith39@nymag.com,rsmith39,pede venenatis non,pellentesque quisque porta,cursus id turpis integer,Buzzshare,3.57336E+15,c8de4be3-fdc8-4d57-b1d8-26414ad341bf,691575472-5,Berdyans�۪k,,10/9/15,708.94,,Undeployable,14,Topiclounge
Rachel Rice,rrice3a@blogs.com,rrice3a,in hac habitasse platea,nulla,odio odio,Bubbletube,3.03279E+13,6388f77f-cc36-41ca-8482-2cfc5c0e6bdf,007983155-9,Cibeusi,"Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla. Quisque arcu libero, rutrum ac, lobortis vel, dapibus at, diam.",6/25/15,532.83,,Pending Diagnostics,16,Shuffletag
Judith Morrison,jmorrison3b@nhs.uk,jmorrison3b,ut rhoncus,quam fringilla rhoncus,neque libero convallis,Jamia,6.76E+18,b8186328-c3b6-479b-bec9-3613ce9698d1,977093557-3,Ramada,,12/7/15,,,Pending Diagnostics,,
Kathy Peterson,kpeterson3c@weebly.com,kpeterson3c,nulla ultrices,ac est lacinia,est quam pharetra magna ac,Flashpoint,5.10014E+15,02bead54-767b-4f61-a085-5439aeaf1712,349567419-5,Chonghe,,9/8/15,,,Pending Diagnostics,,
,,,tortor duis,dictumst morbi,quam a odio in,Avavee,5.51839E+15,2fb047a6-ff89-4d9d-bfe6-304acad6ef17,145992551-3,Strelitsa,Praesent id massa id nisl venenatis lacinia. Aenean sit amet justo. Morbi ut odio.,12/22/15,741.63,,,,
Richard Howell,rhowell3e@msu.edu,rhowell3e,venenatis non,et,vehicula condimentum,Tagcat,6.33E+17,8bbd2e80-6a66-4210-926d-6f45c896143a,957728455-8,R��wand��z,Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis.,7/17/15,205.46,,Pending Diagnostics,26,Youtags
Mark Evans,mevans3f@businessweek.com,mevans3f,dolor quis odio,imperdiet,viverra diam vitae quam,Plambee,3.5589E+15,,871649171-8,Klukeng,Sed ante. Vivamus tortor. Duis mattis egestas metus.,5/9/16,413.07,,Archived,22,Izio
Joan Wagner,jwagner3g@earthlink.net,jwagner3g,adipiscing elit,fusce,suspendisse ornare consequat,Kamba,2.01485E+14,4571c470-5dce-40b5-8b2f-1262071ec940,747966524-5,Moll��s�、n��,,3/8/16,,,Pending Diagnostics,26,Wikibox
Lillian Simmons,lsimmons3h@icio.us,lsimmons3h,ac enim in tempor,in tempor turpis,lacinia erat,Chatterbridge,5.10015E+15,9a43a613-f009-4dd8-94ac-8af4a67b4dd0,178043767-6,��oan H�_ng,"Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.",5/2/16,181.91,,Archived,18,Voomm
,,,amet diam,consectetuer eget,et magnis dis,Trupe,2.01622E+14,2947a0fc-1cae-4838-b315-df505ae4a9d6,808569614-2,Mweka,Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis.,11/9/15,966.58,,,,
Arthur Morgan,amorgan3j@google.ca,amorgan3j,vestibulum eget,ut odio cras,vel nisl,Tanoodle,3.53227E+15,fa077cd0-ba8d-4225-8eb4-84033ed235fc,863693363-3,Zb��ch,,9/23/15,,,Archived,31,Blognation
,,,tempus vivamus,cras,nonummy maecenas tincidunt lacus,Zoomzone,3.53063E+15,a37407ca-e6af-408c-9b9a-1aa9f90f7681,009595242-X,Sanzhang,Nulla ut erat id mauris vulputate elementum. Nullam varius. Nulla facilisi.,3/27/16,,,,18,Layo
Joan Matthews,jmatthews3l@ca.gov,jmatthews3l,ultrices aliquet maecenas,pretium iaculis,mus vivamus vestibulum,Bubblemix,3.53055E+15,1e99a09a-06ab-4ba2-a98d-785f7c64ebe2,827817985-9,Jalasenga,"Praesent blandit. Nam nulla. Integer pede justo, lacinia eget, tincidunt eget, tempus vel, pede.",3/19/16,784.52,It,Undeployable,,
Jose Larson,jlarson3m@blogspot.com,jlarson3m,dolor morbi vel lectus,cum sociis,fringilla rhoncus mauris enim,Thoughtmix,3.58259E+15,4c75547e-5c7a-45be-b532-ec13873b5ddd,179689579-2,Jaboaṭo,,7/15/15,638.29,,Archived,24,Meejo
Eric James,ejames3n@nbcnews.com,ejames3n,nulla integer,aliquam augue,sem duis aliquam,Trudeo,3.58469E+15,,059264762-5,Suwa,"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.",2/14/16,,,Ready to Deploy,34,Zoonder
Sara George,sgeorge3o@thetimes.co.uk,sgeorge3o,leo odio,pretium quis,varius nulla facilisi,Babbleblab,3.37942E+14,ccf578a6-e39c-45cf-a656-3a948922aee1,133207649-1,Krajan Puru,"Duis bibendum, felis sed interdum venenatis, turpis enim blandit mi, in porttitor pede justo eu massa. Donec dapibus. Duis at velit eu est congue elementum.",4/13/16,604.35,,Lost,14,Tagfeed
,,,dapibus at diam,morbi,ante ipsum primis in faucibus,Lazz,2.01999E+14,b15d20dc-eed3-47a4-a83f-67229d154e95,041974769-9,Kengkou,Suspendisse potenti. In eleifend quam a odio. In hac habitasse platea dictumst.,12/29/15,662.67,,,,
Ashley Torres,atorres3q@google.ru,atorres3q,eu interdum eu,eleifend,orci nullam molestie nibh in,Yacero,6.30E+18,bfdad967-af1e-4bbf-b456-eca3259120de,184953647-3,Tosontsengel,"Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.",4/10/16,330.47,,Ready to Deploy,18,Trilith
Andrea Owens,aowens3r@digg.com,aowens3r,eget congue,congue,purus eu,Realmix,3.56262E+15,d3b995cd-cc81-4761-b7bd-5b160bb199b8,795122803-6,Middelburg,"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.",7/11/15,925.85,,Archived,15,Mydeo
,,,pede justo eu,pellentesque volutpat dui,consectetuer adipiscing elit proin,Riffpedia,3.74283E+14,b16407a3-9d08-421e-b386-ab93a838a67d,892497373-8,Zaragoza,Aenean lectus. Pellentesque eget nunc. Donec quis orci eget orci vehicula condimentum.,4/3/16,187.77,,,,
Evelyn Wright,ewright3t@gmpg.org,ewright3t,ut suscipit,sit,tortor id nulla ultrices aliquet,Browseblab,3.5669E+15,c698ba68-bc82-4aff-acb3-5884c9f80296,162198086-3,Fuchun,,10/29/15,718.76,,Pending Diagnostics,21,Edgeblab
,,,velit donec diam neque,augue,non velit,Jabberbean,3.57722E+15,89a8527c-f296-4146-b4c0-81bf896f8af6,653699580-5,Crumlin,Aenean lectus. Pellentesque eget nunc. Donec quis orci eget orci vehicula condimentum.,10/18/15,648.77,,,,
Melissa Rogers,mrogers3v@army.mil,mrogers3v,id ornare imperdiet sapien,a ipsum,libero nam dui proin,Rhynoodle,4.02626E+15,fb87796a-6f51-4dd8-af0c-c079423a0364,356963504-X,Verkhnyaya Belka,"Fusce posuere felis sed lacus. Morbi sem mauris, laoreet ut, rhoncus aliquet, pulvinar sed, nisl. Nunc rhoncus dui vel sem.",2/23/16,646.41,,Pending Diagnostics,35,Yambee
Susan Palmer,spalmer3w@tiny.cc,spalmer3w,montes nascetur ridiculus,ut,sed justo,Jabbersphere,3.58413E+15,216ce7c7-3bc1-446a-b240-9ee34dbbf605,333143943-6,Raoshi,,1/5/16,469.31,,Undeployable,,
Joseph Mason,jmason3x@scribd.com,jmason3x,volutpat dui maecenas,sed vestibulum sit,eu est congue,Photobean,3.53136E+15,1dd924ac-243a-42f7-af03-18e7074d2d8a,657518473-1,Lyon,Fusce consequat. Nulla nisl. Nunc nisl.,3/4/16,908.76,,Lost,30,Yamia
Christina Wood,cwood3y@digg.com,cwood3y,eget nunc donec,potenti cras in,lorem id ligula,Topicware,6.7632E+15,d2170b43-c046-4189-88a0-0f3b3b4ab636,499571423-5,Pengfang,,11/24/15,562.82,,Pending Diagnostics,15,Camido
Dennis Chavez,dchavez3z@senate.gov,dchavez3z,nisi vulputate nonummy maecenas,dictumst aliquam augue,duis ac,Blogspan,5.04837E+15,1bba6cc4-b7fd-4614-82a1-058a6dcf5cff,340219850-9,Carmen de Viboral,,8/31/15,764.65,,Undeployable,,
Emily Roberts,eroberts40@privacy.gov.au,eroberts40,sed lacus morbi,est,nibh fusce lacus purus,Skyba,6.77E+17,79a0ca4b-0cfc-450b-8b99-91995e017d06,393164024-8,Syamzha,"Cras mi pede, malesuada in, imperdiet et, commodo vulputate, justo. In blandit ultrices enim. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",9/26/15,129.34,,Lost,,
Christine Cooper,ccooper41@buzzfeed.com,ccooper41,rutrum nulla nunc,vulputate,commodo vulputate justo,Skyba,2.01991E+14,0dcd299f-f6ad-448e-8ee2-9366b2c6fab1,634821306-4,Vyerkhnyadzvinsk,"Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla. Quisque arcu libero, rutrum ac, lobortis vel, dapibus at, diam.",7/10/15,970.05,,Undeployable,13,Kare
Lois Sanders,lsanders42@nps.gov,lsanders42,elementum eu,donec,purus aliquet at feugiat,Ntags,2.01887E+14,da4f2d20-d589-4d67-99a5-ba1a91f89c67,696680010-4,Kwali,,1/23/16,592.32,,Lost,,
Jonathan Carroll,jcarroll43@microsoft.com,jcarroll43,ut nunc vestibulum ante,nec,maecenas tincidunt lacus at velit,Zoomzone,5.02E+18,f2721951-674f-42a6-a318-ebc4c2ad01d6,767022282-4,Hukou,Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.,7/25/15,100.04,,Lost,,
,,,sagittis nam congue,neque vestibulum eget,lorem vitae mattis nibh,Rhynoodle,3.53699E+15,fd38d1eb-46bc-438c-a1f1-e3d46c7ab7ff,446825369-X,Pogag,"Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.",9/14/15,282.91,,,,
Heather Welch,hwelch45@cyberchimps.com,hwelch45,lorem id,quis odio,ullamcorper augue a suscipit nulla,Dynabox,3.58492E+15,2b8a3a33-23e4-4f7c-bfa2-cda5a4f161a7,453899036-1,Bulqiz��,"In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo.",5/22/16,937.05,,Undeployable,,
Paul Allen,pallen46@gravatar.com,pallen46,mus etiam,consequat varius,non ligula,Youopia,3.57959E+15,8c118547-498c-4c9a-bb7c-38bf34c948f6,059415701-3,Niederanven,,4/10/16,528.2,,Archived,,
Sarah Cox,scox47@nih.gov,scox47,venenatis tristique fusce congue,ultrices aliquet maecenas,quam turpis adipiscing lorem,Tagchat,5.40236E+15,,907635086-8,�_wi��tajno,"Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.",5/28/15,136.71,,Undeployable,29,Rooxo
Sara Hayes,shayes48@boston.com,shayes48,lobortis est phasellus sit,at,at velit eu,Ozu,3.52902E+15,f6dfecd8-6e31-4f7a-ac69-7d78288b3c50,924210851-0,Las Trojes,,6/10/15,239.46,,Lost,,
Marilyn Hunt,mhunt49@dagondesign.com,mhunt49,pulvinar nulla pede ullamcorper,vel nulla eget,justo aliquam quis turpis eget,Mycat,3.57982E+15,,052859686-1,La Mesa,,11/21/15,665.35,,Lost,,
Antonio Jordan,ajordan4a@joomla.org,ajordan4a,tempus semper est,massa volutpat convallis,id ligula suspendisse ornare,Babblestorm,3.5639E+15,bad2fb72-05bf-4bd1-928e-4474f41bf61e,937286949-X,San Mariano,,3/8/16,738.25,,Lost,,
Doris Russell,drussell4b@utexas.edu,drussell4b,nunc donec,varius,ut dolor morbi vel lectus,Skyble,5.10017E+15,d028c3fb-74ea-4e2f-a4ff-86b869f88f7a,523965895-1,Fenghuanglu,"Cras mi pede, malesuada in, imperdiet et, commodo vulputate, justo. In blandit ultrices enim. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",9/19/15,433.76,,Pending Diagnostics,,
Gary Gutierrez,ggutierrez4c@washington.edu,ggutierrez4c,quam pharetra magna ac,ullamcorper augue a,platea dictumst,Realfire,4.91E+18,6c1b81d0-0b44-4cfd-9a29-1abb81d6dd8b,624477386-1,Wuyanquan,,12/27/15,783.9,,Ready to Deploy,,
Mary Long,mlong4d@springer.com,mlong4d,dolor morbi vel,sit amet cursus,ante ipsum primis in faucibus,Shuffledrive,3.56333E+15,6d8835b2-8241-4b4d-afff-95f6aa252ef4,737509813-1,Freiria,"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.",2/11/16,139.88,Solarbreeze,Undeployable,16,Chatterpoint
Martha Olson,molson4e@myspace.com,molson4e,nulla dapibus,orci luctus,felis sed,Vinder,5.5235E+15,10ce22fe-38b7-4329-92a7-bd6dd7a35779,140866058-X,Rangah,"In sagittis dui vel nisl. Duis ac nibh. Fusce lacus purus, aliquet at, feugiat non, pretium quis, lectus.",3/21/16,493.73,,Archived,,
Willie Crawford,wcrawford4f@chronoengine.com,wcrawford4f,ac nibh,pharetra magna,non interdum,Jamia,3.53346E+15,bb5962ec-37e3-4e87-93ae-e748aad36f0d,564625708-5,H��rna,"Cras mi pede, malesuada in, imperdiet et, commodo vulputate, justo. In blandit ultrices enim. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",9/7/15,,,Undeployable,,
Shirley Butler,sbutler4g@google.fr,sbutler4g,augue luctus tincidunt,nibh in,nulla justo aliquam quis,Skyble,3.54387E+15,61ea2737-22f0-40c9-b1d0-8c8bcb49024c,510924762-5,Bradag,Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis.,6/4/15,232.69,,Lost,,
Amanda Perkins,aperkins4h@facebook.com,aperkins4h,magna ac,leo,eu orci mauris,Gigashots,3.534E+15,723cb029-3cc3-4fa1-ae81-46897e1b0cd5,992799439-7,Charneca da Cotovia,,6/2/15,185.11,,Undeployable,17,Yoveo
Jason Mendoza,jmendoza4i@studiopress.com,jmendoza4i,est quam pharetra magna,vestibulum sagittis,vehicula condimentum curabitur in libero,Browseblab,3.53364E+15,fa051420-1c81-4f0d-a5d4-0d966801ac92,943747227-0,Yunzhong,"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.",3/3/16,,,Pending Diagnostics,,
Ernest Spencer,espencer4j@skyrock.com,espencer4j,id pretium,fringilla,porttitor id consequat in consequat,Devshare,6.76E+16,b04f9655-5453-4003-b4ff-a2c04fb7cc14,187554544-1,Sukasenang,"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.",5/15/16,,,Undeployable,,
Roy Burton,rburton4k@uiuc.edu,rburton4k,sed tristique in,sit amet cursus,id massa id nisl venenatis,Tagtune,3.54727E+15,,492976895-0,Pakuranga,Integer tincidunt ante vel ipsum. Praesent blandit lacinia erat. Vestibulum sed magna at nunc commodo placerat.,7/14/15,44.95,,Archived,14,Meembee
Edward Palmer,epalmer4l@lulu.com,epalmer4l,enim blandit mi,ipsum praesent,lectus pellentesque at,Roomm,3.37941E+14,5039582c-b5cf-4b9e-8f07-6341560cae04,007320130-8,Vanves,"In sagittis dui vel nisl. Duis ac nibh. Fusce lacus purus, aliquet at, feugiat non, pretium quis, lectus.",1/23/16,610.68,,Archived,,
Christine Gonzales,cgonzales4m@gmpg.org,cgonzales4m,pede ac diam cras,nec nisi,tincidunt lacus at velit vivamus,Dynava,3.57398E+15,22bac401-b902-4fa6-987c-27238e4982f1,169662058-9,Xianglong,,7/2/15,742.54,,Lost,,
Samuel Snyder,ssnyder4n@spiegel.de,ssnyder4n,rhoncus aliquet pulvinar,suscipit a feugiat,sed tristique in tempus,Centizu,3.55406E+15,a53ca64f-9589-4c14-9f1f-9fbd7c130bf1,134899168-2,Kopang Satu,,8/24/15,,,Undeployable,,
Craig Powell,cpowell4o@fda.gov,cpowell4o,adipiscing lorem vitae,at diam nam,vivamus metus arcu adipiscing,Wikivu,3.53021E+15,74d45443-31f9-4149-bdbd-b81a49a8fc26,841640422-4,Valkeakoski,Etiam vel augue. Vestibulum rutrum rutrum neque. Aenean auctor gravida sem.,5/8/16,617.19,,Archived,16,InnoZ
Shawn Vasquez,svasquez4p@a8.net,svasquez4p,erat vestibulum,ullamcorper augue,adipiscing molestie hendrerit at vulputate,Blogspan,3.53787E+15,b05201f2-5fca-4c51-804c-c5690272809b,981888153-2,Kazinka,,4/4/16,814.56,,Undeployable,27,Ooba
,,,fringilla rhoncus mauris,pretium,orci mauris lacinia,Brightbean,3.74284E+14,f3317f7a-8b58-4e6e-9c98-bb0990b48de2,364170641-6,Abashiri,"Quisque porta volutpat erat. Quisque erat eros, viverra eget, congue eget, semper rutrum, nulla. Nunc purus.",1/23/16,977.48,,,,
,,,in imperdiet,lectus,in congue etiam,Topdrive,5.60E+18,6264ae5b-7977-4a7c-80e0-6fb69ee37bb6,356456589-2,Songdong,"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.",4/7/16,782.48,,,19,Eayo
Jane Mason,jmason4s@ask.com,jmason4s,nisl ut volutpat sapien,amet consectetuer,nec sem duis aliquam,InnoZ,3.58176E+15,bbf6c2d3-f538-411d-b3ca-07f87eb514c9,215895129-X,Lincheng,"Duis bibendum, felis sed interdum venenatis, turpis enim blandit mi, in porttitor pede justo eu massa. Donec dapibus. Duis at velit eu est congue elementum.",8/18/15,,,Archived,14,Voolia
Jeremy Ross,jross4t@state.gov,jross4t,neque libero convallis,volutpat quam,sagittis nam,Agivu,5.60E+18,85cebfbc-d8ef-4f12-a56c-52d920daff55,533951910-4,Shangtianba,In hac habitasse platea dictumst. Etiam faucibus cursus urna. Ut tellus.,2/22/16,814.64,,Archived,,
Anthony Cruz,acruz4u@ycombinator.com,acruz4u,sapien placerat ante,justo sit,lectus pellentesque,Fivechat,6.77E+18,a61d9de9-aee4-41e5-b923-c9f0b6af353f,516270880-1,Bangolo,,6/15/15,748.03,,Archived,,
Janice Kim,jkim4v@tmall.com,jkim4v,feugiat et eros vestibulum,id ligula,dapibus dolor vel,Vitz,3.52804E+15,6f58dc1c-1eec-4a6a-89ce-54c0ca6d7ace,906786221-5,Stepove,Pellentesque at nulla. Suspendisse potenti. Cras in purus eu magna vulputate luctus.,2/5/16,245.24,,Ready to Deploy,,
Cheryl Schmidt,cschmidt4w@mac.com,cschmidt4w,amet nulla quisque,eget massa tempor,in hac habitasse platea dictumst,Topiczoom,3.55701E+15,242df59e-540c-4ae4-9574-b2a1cf0c328f,946770951-1,Bara Datu,,10/14/15,101.41,,Archived,,
Betty Long,blong4x@is.gd,blong4x,congue diam id,hac habitasse,quis turpis sed,Linktype,3.53195E+15,806c60b9-0518-48b4-88e7-e0f7d37db7f4,714515414-5,Richmond,"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.",7/14/15,48.61,,Pending Diagnostics,28,Buzzster
Joe Foster,jfoster4y@hao123.com,jfoster4y,elementum ligula,varius nulla facilisi,ante ipsum primis in faucibus,Twitterwire,3.553E+15,004beb8c-6350-4a5a-bc0a-63ae792afe54,109876345-9,Union,"Morbi non lectus. Aliquam sit amet diam in magna bibendum imperdiet. Nullam orci pede, venenatis non, sodales sed, tincidunt eu, felis.",3/18/16,,,Archived,,
Lisa Black,lblack4z@elpais.com,lblack4z,aenean fermentum,eget nunc donec,faucibus orci luctus,Ailane,6.77E+16,5f17fc64-ef57-4884-a55f-eb573d697df3,441234671-4,Nurota Shahri,"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.",7/13/15,179.08,,Archived,22,Yodoo
Katherine Frazier,kfrazier50@jimdo.com,kfrazier50,nulla nisl nunc nisl,nascetur,justo eu,Edgetag,3.55239E+15,fc437480-f186-49fa-87d3-bbea40c6f142,446611490-0,Reguengos de Monsaraz,Duis bibendum. Morbi non quam nec dui luctus rutrum. Nulla tellus.,5/18/16,960.59,,Pending Diagnostics,,
Lois Sanchez,lsanchez51@yellowbook.com,lsanchez51,consectetuer adipiscing elit proin,in felis,purus sit amet nulla quisque,Gabtune,5.00236E+15,9c0affc9-3c66-4516-aea7-b1d847590c64,242378972-6,Bang Lamung,,6/10/15,,,Lost,,
,,,consectetuer adipiscing elit,eros,ligula vehicula consequat morbi,Oodoo,4.40529E+15,b321fffc-88c6-4223-a4c7-e7b513ca12ea,869734139-6,Hongjiang,"Curabitur gravida nisi at nibh. In hac habitasse platea dictumst. Aliquam augue quam, sollicitudin vitae, consectetuer eget, rutrum at, lorem.",10/12/15,136.67,,,,
Carl Vasquez,cvasquez53@github.io,cvasquez53,sapien urna,congue etiam,nulla facilisi cras,Katz,5.10018E+15,54ca7672-f4a9-46d1-8842-a4f5b3ef8a61,172650221-X,Hechun,"Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla. Quisque arcu libero, rutrum ac, lobortis vel, dapibus at, diam.",8/4/15,29.63,,Archived,14,Thoughtworks
Gary Myers,gmyers54@omniture.com,gmyers54,fusce consequat nulla nisl,amet consectetuer adipiscing,rutrum neque aenean auctor gravida,Eamia,5.60E+16,59f8f748-c09d-4511-a5b2-85fd469ded76,288508590-8,Azun Atme,Suspendisse potenti. In eleifend quam a odio. In hac habitasse platea dictumst.,11/19/15,872.99,,Pending Diagnostics,,
Julie Watkins,jwatkins55@hatena.ne.jp,jwatkins55,sed sagittis nam congue,vehicula,vel dapibus at diam nam,Jabbercube,6.76E+18,d48acb86-3a62-42cc-a88f-75a3a458a2b3,602874973-7,Tonghu,"Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.",12/22/15,517.54,,Ready to Deploy,27,Livetube
,,,ante ipsum,in quis justo,quam fringilla rhoncus,Topiczoom,6.71E+18,57e10cfb-8811-4b3b-ac41-5af69cab6d31,851596451-1,Aoluguya Ewenke Minzu,In congue. Etiam justo. Etiam pretium iaculis justo.,8/2/15,992.72,,,17,Skiptube
Harry Carter,hcarter57@icio.us,hcarter57,pulvinar nulla pede,potenti in eleifend,convallis nulla neque libero convallis,Linktype,3.0452E+13,bca3bec1-cd84-4e44-adf9-2d266bfe0507,943283235-X,Cachoeiro de Itapemirim,,8/30/15,633.31,,Lost,31,Dabjam
,,,dolor quis odio consequat,diam erat fermentum,proin leo odio porttitor,Edgewire,3.56354E+15,1685ce6c-7936-4563-925f-7f3b3b9c0a3d,040550980-4,Nusajaya,"Proin leo odio, porttitor id, consequat in, consequat ut, nulla. Sed accumsan felis. Ut at dolor quis odio consequat varius.",2/4/16,,,,,
Harold Rice,hrice59@si.edu,hrice59,congue etiam justo,justo sit,id massa id,Innojam,4.91307E+15,291a2ce5-c22e-4782-b4aa-ef147fccef40,103809062-8,Chornyanka,Etiam vel augue. Vestibulum rutrum rutrum neque. Aenean auctor gravida sem.,6/10/15,289.46,Konklux,Undeployable,,
Cheryl Owens,cowens5a@friendfeed.com,cowens5a,tincidunt nulla mollis,platea dictumst,ut massa quis,Kwimbee,6.33E+18,abe4c9e3-aeb2-407b-8545-3c2e5c29b942,698953325-0,Bula,"Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.",12/25/15,,,Undeployable,,
Patricia Nelson,pnelson5b@unicef.org,pnelson5b,vel augue,iaculis justo in,primis in faucibus orci luctus,Camimbo,3.74289E+14,8873831c-2370-4fcc-bc23-a66a2a379151,147321108-5,Novoarkhanhel�۪s�۪k,Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus.,8/9/15,,,Pending Diagnostics,27,Tazz
,,,justo sit amet,convallis,nunc viverra dapibus,Meevee,3.55183E+15,d6ff99f7-3f70-4cd1-8835-12fb324783bb,404043143-X,Santiaoshi,,5/31/15,613.59,,,24,Flipstorm
Jonathan Dixon,jdixon5d@dailymotion.com,jdixon5d,consequat varius integer ac,amet,pellentesque at nulla suspendisse,Realcube,3.54835E+15,52e75c85-f2dc-4346-8615-c4bef2675fb5,759833466-8,Verin Artashat,"Praesent blandit. Nam nulla. Integer pede justo, lacinia eget, tincidunt eget, tempus vel, pede.",12/8/15,854.21,,Pending Diagnostics,12,Skiptube
Linda Fernandez,lfernandez5e@zimbio.com,lfernandez5e,pede lobortis ligula,fusce,pede ac,Kwideo,3.54468E+15,a385ede0-c8e6-45cc-b125-be149bbc0271,697050795-5,Porsgrunn,Praesent id massa id nisl venenatis lacinia. Aenean sit amet justo. Morbi ut odio.,7/4/15,412.28,,Ready to Deploy,,
Louis Ortiz,lortiz5f@w3.org,lortiz5f,aliquam erat volutpat in,nibh,vel sem,Jabbertype,3.5772E+15,0b44ec74-81de-4421-baec-1fd1f497bedd,492892856-3,Sionogan,,11/23/15,462.04,,Ready to Deploy,34,Thoughtworks
Donald Lynch,dlynch5g@lycos.com,dlynch5g,vestibulum ante ipsum primis,lectus vestibulum,ut dolor morbi vel lectus,Mycat,3.52864E+15,86b60c4e-9a98-47b4-92db-466162306529,234535580-8,Tokonou,Cras non velit nec nisi vulputate nonummy. Maecenas tincidunt lacus at velit. Vivamus vel nulla eget eros elementum pellentesque.,2/3/16,,,Undeployable,13,Skynoodle
Ernest Dixon,edixon5h@rakuten.co.jp,edixon5h,nulla neque,molestie lorem,mi in porttitor,Bluejam,6.33E+18,45e9100c-17a9-4806-a7ee-b731162718f4,321912329-5,Bayasgalant,"Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",6/26/15,302.69,,Lost,,
Carlos Hart,chart5i@imdb.com,chart5i,lectus pellentesque,lorem ipsum dolor,leo odio porttitor,Plambee,3.53758E+15,44a1e395-adfa-4097-a356-2caf29f31458,679447867-6,W��d�� as S��r,"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.",8/5/15,590.47,,Undeployable,36,Jayo
,,,dui maecenas,pulvinar sed,pede ullamcorper augue,Lazz,5.10014E+15,,524105876-1,Nab��nagar,Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.,2/4/16,,,,,
\ No newline at end of file
diff --git a/sample_csvs/MOCK_CONSUMABLES.csv b/sample_csvs/MOCK_CONSUMABLES.csv
deleted file mode 100644
index b975e31999..0000000000
--- a/sample_csvs/MOCK_CONSUMABLES.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-Item Name,Purchase Date,Purchase Cost,Location,Company,Order Number,Category,Requestable,Quantity
-eget,01/03/2011,85.91,mauris blandit mattis.,Lycos,T295T06V,Triamterene/Hydrochlorothiazide,No,322
-Morbi,10/24/2016,87.42,iaculis,Lavasoft,W787T62Q,Ranitidine HCl,1,374
-arcu.,09/22/2007,48.34,ornare,Google,N961E50A,Amoxicillin,False,252
-nec,08/16/2009,8.71,lectus,Apple Systems,X624N14C,Lantus Solostar,1,30
-Nam,03/30/2017,24.07,"a,",Macromedia,N618A20S,Hydrocodone/APAP,True,551
-Nullam,12/16/2003,73.23,"Donec est mauris,",Yahoo,B386I67L,Fluticasone Propionate,No,395
-erat,08/03/2010,17.49,Proin,Borland,G606H92I,Amlodipine Besylate,1,297
-purus,10/12/2004,63.52,tellus justo sit,Chami,R660Z45O,Omeprazole (Rx),Yes,557
-dignissim,11/10/2010,77.94,nibh vulputate mauris,Lavasoft,G230Z67X,Risperidone,1,47
-Nam,01/25/2015,64.33,taciti sociosqu ad,Microsoft,B613L84C,Suboxone,No,310
-Nunc,04/13/2017,81.02,nec orci.,Borland,O367N55N,Fluoxetine HCl,No,404
-Phasellus,12/23/2005,70.67,"quis, tristique ac,",Borland,K941C02T,Alendronate Sodium,0,590
-Nulla,07/21/2017,99.04,augue malesuada malesuada.,Lycos,D663L90H,Allopurinol,No,48
-at,10/31/2007,58.42,"dolor sit amet,",Lavasoft,Y229E62I,Simvastatin,No,181
-Sed,04/14/2011,48.86,"lectus convallis est,",Cakewalk,T666E70K,Fluconazole,True,169
-quis,01/08/2014,55.64,"varius orci,",Lycos,T767G07U,Advair Diskus,False,264
-viverra.,01/07/2013,93.48,"cursus et, magna.",Sibelius,T276L44H,Loestrin 24 Fe,No,293
-Sed,03/20/2008,64.75,arcu. Sed,Cakewalk,A933E55V,Pantoprazole Sodium,No,407
-iaculis,07/17/2015,56.74,nec,Borland,N568F73C,Venlafaxine HCl ER,No,115
-leo.,12/09/2012,96.88,Aenean,Altavista,H283Z42U,Cephalexin,True,208
-leo.,04/24/2007,40.87,tincidunt adipiscing. Mauris,Lycos,T054Q83U,Lyrica,0,486
-pede.,09/29/2010,19.64,nec enim. Nunc,Chami,L842O70A,Simvastatin,Yes,214
-massa,05/18/2015,18.43,nisi magna sed,Adobe,V029Q52K,Meloxicam,0,131
-urna,10/22/2014,7.41,ac,Sibelius,Z708U15X,Flovent HFA,Yes,15
-sapien,03/23/2017,50.94,penatibus et,Google,D258T89Z,Zolpidem Tartrate,True,48
-non,05/14/2005,71.71,dui. Fusce,Borland,C021V01R,Amphetamine Salts,True,593
-"et,",10/18/2014,94.56,natoque penatibus et,Lavasoft,L351F80J,Gianvi,1,305
-pede,02/18/2004,10.04,felis,Yahoo,D516U60J,Pravastatin Sodium,1,302
-lobortis,06/08/2011,31.17,"luctus,",Yahoo,D088E82H,Azithromycin,Yes,380
-placerat,06/19/2005,5.38,eget,Adobe,V472U75G,Nexium,0,-2
-leo,10/03/2014,17.00,justo,Lycos,F944A58V,Ibuprofen (Rx),True,294
-dictum,11/24/2015,92.11,tellus faucibus,Apple Systems,U938K61D,Oxycontin,Yes,368
-bibendum.,05/01/2010,22.45,elit erat vitae,Lavasoft,Z326Q13R,Tramadol HCl,Yes,12
-"facilisis,",01/02/2011,85.42,purus,Finale,Z475L99M,Alprazolam,True,359
-bibendum,08/20/2009,44.68,et pede. Nunc,Google,N039W21L,Fluticasone Propionate,True,569
-eleifend,03/17/2006,22.92,velit. Cras,Lavasoft,H339Z61T,Doxycycline Hyclate,Yes,219
-rhoncus.,03/17/2009,82.52,"feugiat non, lobortis",Altavista,R524N72A,Atenolol,0,176
-a,04/03/2016,4.35,nunc,Sibelius,V055S56Y,Simvastatin,Yes,326
-enim.,05/15/2014,20.18,lectus justo,Google,I747M47J,Atenolol,1,101
-molestie,06/19/2012,11.30,sem ut cursus,Apple Systems,F888J26K,Amoxicillin,Yes,405
-dui.,05/16/2010,72.42,consectetuer euismod,Cakewalk,U999A42H,Atenolol,False,253
-tortor.,08/02/2017,38.51,ultrices iaculis odio.,Lavasoft,J465G08H,Tri-Sprintec,False,577
-natoque,04/15/2010,28.88,magnis,Sibelius,N813P74X,Lipitor,0,562
-mollis,05/07/2011,89.36,Donec,Yahoo,O113X38K,Lexapro,Yes,179
-ultrices.,10/20/2013,73.45,"orci,",Lycos,N587Y98N,Benicar HCT,No,185
-dui,12/10/2011,0.57,Mauris eu turpis.,Yahoo,S354F65P,Levothyroxine Sodium,No,78
-sagittis.,04/06/2014,38.55,"elementum sem, vitae",Google,R931X11B,Loestrin 24 Fe,Yes,386
-"dui,",10/08/2010,52.52,natoque penatibus,Adobe,J615B52I,Clonazepam,0,563
-eros,06/25/2015,45.90,"aliquam, enim",Microsoft,S216N79D,Amoxicillin,True,371
-"et,",05/16/2008,4.42,nulla. In tincidunt,Adobe,Z906A47A,Sulfamethoxazole/Trimethoprim,No,507
-est,12/14/2004,16.79,amet,Yahoo,P540P32Z,Doxycycline Hyclate,True,188
-"montes,",02/23/2008,52.98,ante,Lavasoft,C140R27G,Lisinopril,True,401
-mollis,07/09/2004,83.26,Curabitur dictum. Phasellus,Cakewalk,U620A61Z,Glipizide,No,278
-dolor.,07/01/2004,50.94,"non, vestibulum",Lavasoft,F625L82E,Singulair,No,475
-aliquet,03/18/2014,56.23,erat,Altavista,L193Q72S,Clonazepam,No,3
-nonummy,09/13/2004,89.86,enim.,Apple Systems,U466F15U,Atenolol,No,218
-natoque,11/09/2015,72.14,ridiculus,Altavista,U295O53M,Cyclobenzaprin HCl,No,50
-tincidunt,01/05/2011,84.90,Cras,Cakewalk,C373S25Y,Paroxetine HCl,0,104
-tristique,03/04/2010,64.59,ipsum leo elementum,Macromedia,U140F94P,Atenolol,False,486
-eleifend.,07/11/2010,45.06,"a, arcu. Sed",Macromedia,G544Z82L,Zyprexa,1,100
-sem,04/18/2008,44.81,"magna, malesuada vel,",Chami,G143Q64L,Lorazepam,No,440
-facilisi.,06/13/2005,65.36,"ut, molestie in,",Google,N391E28J,Januvia,False,536
-arcu.,09/24/2012,21.27,"parturient montes, nascetur",Finale,Z720K67H,Furosemide,False,308
-hendrerit,01/26/2013,27.11,"eget varius ultrices,",Borland,P865K75O,Metformin HCl,False,590
-Aliquam,03/18/2010,64.99,ridiculus,Borland,K003G26G,Ibuprofen (Rx),0,412
-eu,08/27/2016,99.62,Sed eu eros.,Microsoft,H049R07D,Atenolol,False,498
-Morbi,02/13/2008,30.86,"Sed nulla ante,",Altavista,U852E06G,Fluticasone Propionate,Yes,243
-malesuada,08/17/2010,58.50,tellus. Phasellus,Sibelius,T695G73P,Ibuprofen (Rx),Yes,591
-"ut,",11/16/2006,46.64,Sed molestie.,Microsoft,T589M93D,Gianvi,True,-5
-odio.,12/09/2011,51.19,"montes, nascetur ridiculus",Chami,J311Q19L,Gabapentin,True,517
-tortor.,03/21/2017,7.11,Morbi neque,Finale,W293Z75X,Loestrin 24 Fe,Yes,242
-penatibus,12/02/2015,81.51,ipsum ac mi,Borland,U565B49H,Loestrin 24 Fe,False,220
-"et,",10/11/2013,56.41,ut nisi a,Google,G623M74Q,Triamterene/Hydrochlorothiazide,True,98
-"ut,",11/17/2007,74.85,consequat purus.,Sibelius,Q247W03U,Tramadol HCl,Yes,484
-luctus,09/30/2016,23.87,euismod,Lavasoft,T838L77W,Lisinopril,Yes,295
-gravida,12/04/2010,80.12,a neque.,Sibelius,U542S63O,Vytorin,0,188
-hymenaeos.,01/16/2015,13.19,In scelerisque scelerisque,Sibelius,V375P80B,Zyprexa,False,255
-mi,06/07/2010,17.75,libero. Proin,Google,I728A71W,APAP/Codeine,False,435
-"a,",12/19/2006,12.35,"montes,",Lavasoft,X885A67N,Metformin HCl,True,333
-ornare,09/09/2015,34.13,taciti,Lavasoft,Q602X92G,Lyrica,Yes,447
-"tellus,",09/05/2007,92.17,"lorem,",Microsoft,D008R07S,Vyvanse,0,256
-eget,07/10/2008,5.71,a odio semper,Altavista,L996D22J,Triamcinolone Acetonide,1,89
-sodales,01/26/2017,67.43,"at,",Microsoft,B922B33B,Glipizide,False,406
-"amet,",09/19/2011,5.34,Cum sociis natoque,Yahoo,C735B01G,Amoxicillin,No,85
-tempus,02/14/2017,19.18,felis,Macromedia,P379N42S,Simvastatin,False,427
-laoreet,06/25/2017,73.61,Sed,Apple Systems,N838F62B,Alendronate Sodium,No,405
-laoreet,03/28/2015,40.48,fames ac,Cakewalk,A503X28X,Ibuprofen (Rx),0,430
-sit,09/08/2013,41.23,"aliquet vel,",Sibelius,F381B10B,Nexium,No,359
-Aenean,06/10/2010,97.61,massa,Altavista,X179G33K,Doxycycline Hyclate,1,136
-non,10/13/2013,46.02,Duis,Microsoft,F567P51A,Metformin HCl,1,104
-Curabitur,02/10/2016,49.59,et magnis,Borland,A902B81X,Diovan,No,270
-risus,06/23/2014,6.22,"eu,",Apple Systems,J458L03X,Crestor,1,577
-sem,04/29/2006,36.75,orci luctus,Apple Systems,I390X10D,Lisinopril,False,131
-"eu,",08/06/2013,96.39,diam dictum sapien.,Microsoft,P937M90J,Lisinopril/Hydrochlorothiazide,Yes,229
-ultricies,01/13/2013,18.64,auctor,Microsoft,Q793S72Y,Amphetamine Salts,0,153
-et,09/04/2005,30.87,sagittis placerat. Cras,Microsoft,S427Q43E,Alprazolam,False,571
-sit,02/26/2006,80.53,non justo.,Finale,Y646A59W,Omeprazole (Rx),True,193
-eget,01/10/2014,71.57,dolor,Borland,V101B17W,Sertraline HCl,No,103
-"a,",06/02/2016,44.56,nascetur ridiculus,Lycos,O796A98J,Alprazolam,1,505
-"ante,",12/20/2013,46.04,eleifend,Lycos,K375B97M,Plavix,0,296
\ No newline at end of file
diff --git a/sample_csvs/MOCK_USERS.csv b/sample_csvs/MOCK_USERS.csv
deleted file mode 100644
index aae13a9dce..0000000000
--- a/sample_csvs/MOCK_USERS.csv
+++ /dev/null
@@ -1,1001 +0,0 @@
-First Name,Last Name,email,User name,Location,Phone Num,Job Title For User,Employee Number,Company
-Blanche,O'Collopy,bocollopy0@livejournal.com,bocollopy0,Hinapalanan,63-(199)661-2186,Clinical Specialist,7080919053,Morar-Ward
-Jessie,Primo,jprimo1@newsvine.com,jprimo1,Korenovsk,7-(885)578-0266,Paralegal,6284292031,Jast-Stiedemann
-Nelia,Coughtrey,ncoughtrey2@geocities.com,ncoughtrey2,Zhexiao,86-(366)635-5884,Nurse Practicioner,7242692202,Goldner-Cremin
-Pascale,Wimpeney,pwimpeney3@mtv.com,pwimpeney3,Kuče,385-(688)644-8322,Senior Sales Associate,9173736066,"Paucek, Schmitt and Hagenes"
-Alec,Twidle,atwidle4@ovh.net,atwidle4,Shi’ao,86-(163)912-1915,Human Resources Manager,4692183691,Schimmel and Sons
-Karalee,Carroll,kcarroll5@devhub.com,kcarroll5,Huaidian,86-(303)287-0739,Civil Engineer,1530903416,Schuster LLC
-Danny,Yeiles,dyeiles6@wikipedia.org,dyeiles6,Koundara,224-(953)650-5363,Software Engineer II,7026212001,"Ebert, Windler and Hessel"
-Taffy,Benson,tbenson7@mit.edu,tbenson7,Nanying,86-(152)931-1194,Dental Hygienist,4576525239,Jerde Inc
-Hall,Tonepohl,htonepohl8@bandcamp.com,htonepohl8,Primorsko-Akhtarsk,7-(743)929-2565,Computer Systems Analyst III,6187297644,Kohler and Sons
-Gus,Tomczykowski,gtomczykowski9@hostgator.com,gtomczykowski9,Arrah,225-(926)325-4040,Executive Secretary,9237527535,"Luettgen, Kshlerin and Carroll"
-Casandra,Retchford,cretchforda@gizmodo.com,cretchforda,Lasi Dua,62-(813)604-3660,Teacher,0068486472,Rempel Inc
-Judie,Fowler,jfowlerb@virginia.edu,jfowlerb,Ōgaki,81-(521)313-4757,Occupational Therapist,1692241737,Bins Inc
-Willy,Walters,wwaltersc@cloudflare.com,wwaltersc,Mungkin,62-(114)187-7377,Electrical Engineer,1185027149,Toy-Hyatt
-Trace,Tingly,ttinglyd@issuu.com,ttinglyd,Esigodini,263-(795)699-2623,Office Assistant II,9588821797,Satterfield LLC
-Rustin,Withrington,rwithringtone@purevolume.com,rwithringtone,Xinjie,86-(703)213-0549,Marketing Manager,8707099886,O'Conner-Hoeger
-Loria,McKendry,lmckendryf@imgur.com,lmckendryf,Eiriz,351-(660)417-9204,Administrative Assistant II,2622958684,Oberbrunner and Sons
-Blancha,Carlesso,bcarlessog@bravesites.com,bcarlessog,Helsingborg,46-(218)729-2556,Account Representative I,1864046597,Stroman-Marks
-Whitney,Olman,wolmanh@slashdot.org,wolmanh,Lisia Góra,48-(907)614-5768,Speech Pathologist,7143970867,Keebler-Wintheiser
-Bond,McBain,bmcbaini@hc360.com,bmcbaini,Lesnoye,7-(515)172-7238,Social Worker,6816673581,Cassin LLC
-Raeann,Kubach,rkubachj@a8.net,rkubachj,Saray,994-(690)524-2937,Electrical Engineer,1829082000,"Kiehn, Dicki and O'Reilly"
-Feodor,Kersey,fkerseyk@hibu.com,fkerseyk,Salam,62-(530)992-3129,Financial Advisor,0027333248,Kassulke-Wuckert
-Boyd,Delamere,bdelamerel@europa.eu,bdelamerel,Starigrad,385-(464)217-6673,Quality Control Specialist,7362162391,Marquardt Group
-Terrijo,Spaducci,tspaduccim@yale.edu,tspaduccim,Pereiras,351-(169)619-5395,Health Coach II,9383160780,"Reynolds, Bins and Wunsch"
-Brandtr,Rollings,brollingsn@java.com,brollingsn,Palencia,502-(601)904-4191,Assistant Professor,9604788698,Farrell LLC
-Diane,Bernaciak,dbernaciako@senate.gov,dbernaciako,Bitin,63-(465)596-5888,Human Resources Assistant II,1297195655,Orn Inc
-Bertie,Sreenan,bsreenanp@japanpost.jp,bsreenanp,Muzambinho,55-(991)980-2128,VP Accounting,9614791969,Wiza-Quitzon
-Marylinda,Hanlon,mhanlonq@sourceforge.net,mhanlonq,San José de Río Tinto,504-(312)801-5239,Associate Professor,4247222201,Heller and Sons
-Darrin,MacPhaden,dmacphadenr@berkeley.edu,dmacphadenr,Radlje ob Dravi,386-(696)423-3227,Community Outreach Specialist,8724422533,Bradtke and Sons
-Kizzee,Pilmer,kpilmers@mlb.com,kpilmers,Soio,244-(244)226-8720,Software Engineer I,7351560250,"Hauck, Gottlieb and Roberts"
-Murdoch,Heijne,mheijnet@unblog.fr,mheijnet,Pukë,355-(994)349-7229,Mechanical Systems Engineer,9123797894,"Bailey, Collier and Labadie"
-Maryann,Labat,mlabatu@mozilla.com,mlabatu,Skhira,216-(174)936-3617,Human Resources Assistant III,7255325211,"Feil, Kozey and Goldner"
-Carolus,Dombrell,cdombrellv@forbes.com,cdombrellv,Pāvilosta,371-(908)875-7818,Account Executive,2616418460,Hammes LLC
-Sheena,Goede,sgoedew@samsung.com,sgoedew,Bitkine,235-(312)893-5822,Professor,9784543257,Wolf Inc
-Dottie,Leare,dlearex@surveymonkey.com,dlearex,Pugeran,62-(693)693-0486,Analog Circuit Design manager,5256401955,"Cole, Fisher and Spinka"
-Jess,Stammer,jstammery@bloglines.com,jstammery,Margherita,256-(648)534-6980,Account Representative I,3022569831,Keeling Group
-Izabel,Wix,iwixz@latimes.com,iwixz,Shatian,86-(812)279-4898,Physical Therapy Assistant,5047185605,Feil-Gutkowski
-Corrinne,Lowrie,clowrie10@noaa.gov,clowrie10,Dongyuan,86-(567)116-4092,Programmer I,4016980801,Dickens and Sons
-Ralph,Brabbs,rbrabbs11@desdev.cn,rbrabbs11,Lokea,62-(733)726-2227,Staff Scientist,3126986722,Pouros LLC
-Wally,Boanas,wboanas12@deviantart.com,wboanas12,Garhi Khairo,92-(983)138-6735,Senior Developer,9121792674,Bauch-Hodkiewicz
-Willyt,Poxton,wpoxton13@eepurl.com,wpoxton13,Ciénaga,57-(530)166-8558,Account Coordinator,5226358938,Orn-Grady
-Sanderson,Colledge,scolledge14@mozilla.com,scolledge14,Capalonga,63-(228)896-9731,Dental Hygienist,2367310122,"Kessler, Bechtelar and Fisher"
-Marshal,Dillet,mdillet15@sakura.ne.jp,mdillet15,Camperdown,27-(887)538-9433,Social Worker,9119456573,Heller-Baumbach
-Dario,Osler,dosler16@slideshare.net,dosler16,Fulong,86-(686)394-2367,Human Resources Assistant I,0834912236,Strosin Inc
-Porter,Whitehall,pwhitehall17@economist.com,pwhitehall17,Alīpur,92-(345)545-1627,Programmer Analyst I,9907315249,Thiel-Schinner
-Cyrille,Lough,clough18@foxnews.com,clough18,Jiukeng,86-(720)297-5199,Marketing Assistant,4745558287,Bailey-Hauck
-Brina,Ashwell,bashwell19@cmu.edu,bashwell19,Três Pontas,55-(437)327-8074,VP Marketing,8645272598,Blick Group
-Ki,Freeborn,kfreeborn1a@hhs.gov,kfreeborn1a,Pisz,48-(490)682-6629,Office Assistant I,6953353384,"Larson, Becker and Reinger"
-Gaye,Hillam,ghillam1b@creativecommons.org,ghillam1b,Lazaro Cardenas,52-(744)187-7616,Senior Cost Accountant,5489719737,"Abernathy, Zulauf and Davis"
-Herculie,Seage,hseage1c@photobucket.com,hseage1c,Careva Ćuprija,387-(372)396-4601,Environmental Tech,4880024112,"Wintheiser, Luettgen and Jerde"
-Inessa,Baldack,ibaldack1d@marriott.com,ibaldack1d,Tirah,972-(148)288-3311,Environmental Tech,4012420682,"Carter, Hoppe and Mertz"
-Sherline,Alliston,salliston1e@cnet.com,salliston1e,Prado Siongco,63-(641)703-7801,VP Sales,1648555802,Glover LLC
-Kristin,Pitson,kpitson1f@sogou.com,kpitson1f,Las Flores,52-(755)660-4401,Financial Advisor,3629602851,Denesik-Schuster
-Portia,Winspur,pwinspur1g@imdb.com,pwinspur1g,Cibolang,62-(194)231-7712,Engineer II,8827050418,"Osinski, Emard and Jast"
-Benedict,Churchard,bchurchard1h@dell.com,bchurchard1h,Xinglong,86-(452)414-0407,Human Resources Assistant IV,1155598784,Hane and Sons
-Mariya,Bahlmann,mbahlmann1i@npr.org,mbahlmann1i,Wuyanquan,86-(898)637-0482,GIS Technical Architect,1627870318,Abernathy Group
-Harri,McAleese,hmcaleese1j@theglobeandmail.com,hmcaleese1j,Nularan,62-(717)480-2343,Accounting Assistant I,0181278391,Senger and Sons
-Roda,McGriffin,rmcgriffin1k@symantec.com,rmcgriffin1k,Raduzhnyy,7-(513)767-6738,Sales Associate,7142006153,Mosciski Group
-Carolyn,Jurges,cjurges1l@berkeley.edu,cjurges1l,Rotterdam,31-(827)912-2109,Senior Developer,8573938994,Terry and Sons
-Darnell,Lettuce,dlettuce1m@google.com.au,dlettuce1m,Solnechnogorsk,7-(165)514-6628,Sales Associate,3973069883,Volkman-Abbott
-Johan,Herche,jherche1n@w3.org,jherche1n,Krzeszów,48-(981)281-5260,Librarian,8066763190,Larkin-Emard
-Ginelle,Digle,gdigle1o@4shared.com,gdigle1o,Alukama,62-(819)194-6623,Account Executive,0227839102,Sipes-Bauch
-Bunny,Macconaghy,bmacconaghy1p@huffingtonpost.com,bmacconaghy1p,Huangqiao,86-(206)588-4549,Quality Engineer,6517079629,"Dach, Marquardt and Lubowitz"
-Olivette,Tomczykiewicz,otomczykiewicz1q@eventbrite.com,otomczykiewicz1q,Sigayevo,7-(309)891-2091,Desktop Support Technician,3998906258,Schamberger Group
-Kerwinn,Le Brom,klebrom1r@smh.com.au,klebrom1r,Lestijärvi,358-(747)269-4952,Compensation Analyst,1348822481,Kub Inc
-Obidiah,Radke,oradke1s@imdb.com,oradke1s,Xinhua,86-(381)923-1757,Accounting Assistant II,1145530044,Prosacco Inc
-Jermaine,Joire,jjoire1t@sun.com,jjoire1t,Huangpi,86-(814)411-4884,Developer IV,4849811027,"Schuppe, Jaskolski and Jones"
-Bobine,Jessope,bjessope1u@sbwire.com,bjessope1u,Nàng Mau,84-(454)818-4039,Budget/Accounting Analyst I,3193701467,"Gislason, Batz and Kub"
-Brinn,Calam,bcalam1v@dedecms.com,bcalam1v,Anan,81-(795)861-8389,Administrative Officer,2724742117,Shanahan Inc
-Ax,Briiginshaw,abriiginshaw1w@shop-pro.jp,abriiginshaw1w,Bantay,63-(158)907-3803,Senior Sales Associate,1449794491,"Beer, Hoppe and Walsh"
-Sher,Wylam,swylam1x@cisco.com,swylam1x,Dmitrov,7-(454)562-7954,Health Coach IV,1778479766,"Bogisich, Gerhold and Dooley"
-Rodger,Mecco,rmecco1y@oakley.com,rmecco1y,Bulahblangaro,62-(698)245-6039,GIS Technical Architect,6679143640,Kulas Group
-Gilly,Coggon,gcoggon1z@merriam-webster.com,gcoggon1z,Ramana,994-(225)981-5577,Statistician II,8663020252,Bogan-Swaniawski
-Buffy,Kemsley,bkemsley20@discuz.net,bkemsley20,Tucupido,58-(595)308-1288,Dental Hygienist,9810617755,"Jacobi, Kuhn and Hills"
-Tamra,Whether,twhether21@privacy.gov.au,twhether21,Dedenëvo,7-(568)725-8281,Librarian,0938798367,Doyle-Schowalter
-Alleyn,Hedworth,ahedworth22@nbcnews.com,ahedworth22,Bweyogerere,256-(885)716-8723,Information Systems Manager,7806845402,Herman-Kuphal
-Baldwin,Ruggieri,bruggieri23@acquirethisname.com,bruggieri23,Famões,351-(152)434-9871,Database Administrator I,6285015228,Rohan-Spinka
-Edi,Womersley,ewomersley24@soundcloud.com,ewomersley24,Topolovgrad,359-(281)202-4851,VP Product Management,5480937758,Heaney Group
-Vally,Condy,vcondy25@mediafire.com,vcondy25,Kovářská,420-(698)690-1129,Staff Accountant III,6354747148,Dach-Sporer
-Addie,Kobisch,akobisch26@instagram.com,akobisch26,Ninove,32-(630)476-7548,Web Developer II,7289347471,MacGyver-Becker
-Levi,Florey,lflorey27@umn.edu,lflorey27,Dębowa Łąka,48-(297)281-6919,Operator,1052832121,Wolf Group
-Jolie,Niles,jniles28@goodreads.com,jniles28,Annopol,48-(783)717-5946,Quality Control Specialist,1756247129,"Batz, Spencer and Zemlak"
-Gwynne,Blaydes,gblaydes29@seattletimes.com,gblaydes29,Chervone,380-(130)591-1017,Junior Executive,7514288414,Metz Group
-Andee,Hazard,ahazard2a@usatoday.com,ahazard2a,Bringinanom,62-(752)996-9280,Business Systems Development Analyst,0463793501,O'Hara Group
-Cristine,Cordero,ccordero2b@shop-pro.jp,ccordero2b,Cireundang,62-(647)231-1238,Associate Professor,0206916523,"Bradtke, Breitenberg and Konopelski"
-Adelice,Sparhawk,asparhawk2c@google.fr,asparhawk2c,Barbacoas,58-(288)306-1967,Business Systems Development Analyst,4263563638,Reinger Group
-Arnuad,Yirrell,ayirrell2d@indiatimes.com,ayirrell2d,Guanagazapa,502-(996)833-1054,Research Associate,4248670135,"Zemlak, Murphy and Altenwerth"
-Etta,Manuelli,emanuelli2e@webeden.co.uk,emanuelli2e,Onzaga,57-(627)371-5859,GIS Technical Architect,5140237679,Wiza LLC
-Anetta,Demann,ademann2f@nhs.uk,ademann2f,Songhu,86-(886)244-1201,Engineer III,7383594029,"Lind, Rodriguez and Luettgen"
-Rivi,Geck,rgeck2g@wikia.com,rgeck2g,Santa Iria de Azóia,351-(351)837-4156,GIS Technical Architect,7680553459,"Kuhic, Boyle and Kozey"
-Zsa zsa,Boynes,zboynes2h@upenn.edu,zboynes2h,Cerava,355-(375)816-3821,Occupational Therapist,5933003034,Weimann and Sons
-Carlen,Minillo,cminillo2i@sohu.com,cminillo2i,Łącko,48-(206)819-7182,Engineer III,9864914502,"Brown, Carroll and Sporer"
-Jae,McMinn,jmcminn2j@geocities.jp,jmcminn2j,Yandang,86-(754)609-9065,VP Marketing,9052957681,Parker Inc
-Daune,Holberry,dholberry2k@imageshack.us,dholberry2k,Daleszyce,48-(780)132-9574,Software Engineer III,5828276875,"Bartell, Casper and Kerluke"
-Thacher,Jahnisch,tjahnisch2l@nbcnews.com,tjahnisch2l,Ýpsonas,357-(881)407-6533,Research Associate,6648113243,Metz-Schimmel
-Egon,Dumphy,edumphy2m@tiny.cc,edumphy2m,Gonābād,98-(873)558-8082,Nurse,1757406042,Von and Sons
-Aridatha,Matessian,amatessian2n@salon.com,amatessian2n,Zhenziliang,86-(691)551-3380,Structural Engineer,8930185770,Reichel-Powlowski
-Gabby,Margett,gmargett2o@yellowpages.com,gmargett2o,Wenfu,86-(602)463-0478,Financial Advisor,5815266353,Bosco Inc
-Andrei,Dowle,adowle2p@slashdot.org,adowle2p,Zykovo,7-(567)311-6007,Graphic Designer,6594557408,Terry Inc
-Zack,Balsellie,zbalsellie2q@alibaba.com,zbalsellie2q,Kiihtelysvaara,358-(789)977-9884,Data Coordiator,8470986120,Wiegand-Heathcote
-Tanny,Liccardi,tliccardi2r@scientificamerican.com,tliccardi2r,Majāz al Bāb,216-(900)448-3810,Occupational Therapist,8509563896,Moore and Sons
-Eda,Petren,epetren2s@go.com,epetren2s,Mina de São Domingos,351-(647)661-1537,Registered Nurse,1326684930,Hagenes-Franecki
-Fifine,Appleby,fappleby2t@prlog.org,fappleby2t,Sokol’skoye,7-(897)976-5440,Nurse Practicioner,6949941218,"Hilll, Wiza and Connelly"
-Suki,Quilligan,squilligan2u@virginia.edu,squilligan2u,Lenešice,420-(484)575-9887,Internal Auditor,1102845078,Eichmann and Sons
-Brinn,Seldon,bseldon2v@dedecms.com,bseldon2v,Valerik,7-(364)838-7251,Environmental Specialist,5496253098,Schiller Inc
-Cristie,Treadaway,ctreadaway2w@histats.com,ctreadaway2w,Vichuga,7-(809)167-3685,Dental Hygienist,0743112563,Bogisich LLC
-Kendall,Vidgeon,kvidgeon2x@ted.com,kvidgeon2x,Şānūr,970-(462)447-8191,Analog Circuit Design manager,5299583540,Brekke-Ziemann
-Osborn,Fritschel,ofritschel2y@kickstarter.com,ofritschel2y,Bayt Maqdūm,970-(366)314-6696,Quality Control Specialist,3107157244,"Schultz, Runolfsson and Hauck"
-Olenolin,Spore,ospore2z@about.me,ospore2z,Kissimmee,1-(407)958-2939,Information Systems Manager,1377154629,"Bashirian, Eichmann and Bednar"
-Sherlock,O'Carmody,socarmody30@flickr.com,socarmody30,Xuhang,86-(402)403-7851,VP Product Management,4691963855,Nikolaus-Homenick
-Pincus,Stamps,pstamps31@dagondesign.com,pstamps31,Old City,970-(348)690-7659,Analog Circuit Design manager,9573629984,"Ullrich, Halvorson and Hammes"
-Sallee,Clover,sclover32@google.it,sclover32,Tuymazy,7-(344)530-7082,Information Systems Manager,1064925987,O'Hara-Zulauf
-Jillane,Moyes,jmoyes33@shutterfly.com,jmoyes33,Faratsiho,261-(956)463-6161,Information Systems Manager,1015767532,Ruecker LLC
-Sully,Baugh,sbaugh34@about.com,sbaugh34,Xidajie,86-(864)668-1887,Administrative Officer,7779016676,Cormier-Zieme
-Woodman,Filipczynski,wfilipczynski35@reference.com,wfilipczynski35,Chinú,57-(984)445-3303,Payment Adjustment Coordinator,8833195139,Abshire-Upton
-Donia,Tayspell,dtayspell36@abc.net.au,dtayspell36,Jacarezinho,55-(631)500-4755,Cost Accountant,0515630330,"Von, Paucek and DuBuque"
-Cordula,Gelling,cgelling37@berkeley.edu,cgelling37,Ipoh,60-(392)990-3252,Geologist III,0539485020,Walsh and Sons
-Cory,Franciskiewicz,cfranciskiewicz38@indiatimes.com,cfranciskiewicz38,Grand Rapids,1-(616)238-1561,Software Test Engineer I,0739184717,O'Kon-Windler
-Merrielle,Ringe,mringe39@xinhuanet.com,mringe39,Široki Brijeg,387-(905)648-3989,Actuary,1561596175,Lemke-Fay
-Janka,Mahoney,jmahoney3a@newyorker.com,jmahoney3a,Lethem,592-(205)736-1572,Environmental Tech,1359840486,Hammes Group
-Fleur,Arno,farno3b@thetimes.co.uk,farno3b,Santo Domingo,63-(244)461-5127,Research Nurse,2070821277,Baumbach LLC
-Feliza,Kitchingman,fkitchingman3c@dailymotion.com,fkitchingman3c,Gunungbatu,62-(305)737-3215,Payment Adjustment Coordinator,3717140175,Crooks Inc
-Brooks,Abrey,babrey3d@loc.gov,babrey3d,Nongba,86-(631)179-1441,Database Administrator III,1495770435,Ryan Inc
-Domenico,Leeder,dleeder3e@toplist.cz,dleeder3e,Stobreč,385-(588)803-2783,Occupational Therapist,7517254553,Gislason-Dickens
-Gracie,Leggs,gleggs3f@posterous.com,gleggs3f,Anchorage,1-(907)739-1009,Account Representative IV,9894304044,"Auer, Fay and Kutch"
-Burton,Girodin,bgirodin3g@flavors.me,bgirodin3g,Tambo Grande,51-(473)237-9513,Teacher,2586053230,Swaniawski-O'Connell
-Rutger,Fortnum,rfortnum3h@ucsd.edu,rfortnum3h,Zhen’an,86-(520)440-6913,Desktop Support Technician,9664475106,Stehr-Satterfield
-Callie,Gaymar,cgaymar3i@yandex.ru,cgaymar3i,Cempaka,62-(632)111-7548,Software Consultant,9554343590,"Collins, Marvin and Predovic"
-Roslyn,Giron,rgiron3j@mashable.com,rgiron3j,Cartagena,34-(478)145-7341,Operator,4796666060,Spencer-Altenwerth
-Lindsey,Cabera,lcabera3k@upenn.edu,lcabera3k,Tostado,54-(284)861-1251,Paralegal,8728268571,"Schulist, Nitzsche and Hettinger"
-Alfonse,Odom,aodom3l@technorati.com,aodom3l,Hägersten,46-(947)105-7610,Graphic Designer,4698060613,Windler and Sons
-Chalmers,Carwithim,ccarwithim3m@livejournal.com,ccarwithim3m,Eslöv,46-(442)928-3035,Internal Auditor,2949190553,Fritsch Inc
-Rosa,Totterdill,rtotterdill3n@jiathis.com,rtotterdill3n,Guoduwan,86-(359)340-9833,Legal Assistant,3214937413,Dibbert-Jacobs
-Lionel,Tomlin,ltomlin3o@elpais.com,ltomlin3o,Montbéliard,33-(836)419-9346,Information Systems Manager,2638534692,"Greenfelder, Boyer and Pollich"
-Mireielle,Edmands,medmands3p@washington.edu,medmands3p,Kafir Qala,93-(929)432-7754,Design Engineer,9816600269,Littel-Durgan
-Maryellen,Cordrey,mcordrey3q@networksolutions.com,mcordrey3q,Aganan,63-(246)228-0609,Associate Professor,1918577528,Goldner Inc
-Hilario,Wadforth,hwadforth3r@npr.org,hwadforth3r,Obninsk,7-(856)647-8958,Physical Therapy Assistant,3701886741,"Raynor, Larkin and Bergstrom"
-Vanda,Gradley,vgradley3s@psu.edu,vgradley3s,København,45-(345)469-6826,Safety Technician II,2103662962,Dietrich Group
-Portia,Guillond,pguillond3t@youtube.com,pguillond3t,Verbivka,380-(633)231-9128,General Manager,1175524999,Goodwin-O'Keefe
-Amabel,Jestico,ajestico3u@samsung.com,ajestico3u,Palama,62-(610)896-0940,Editor,2152070887,McClure-Oberbrunner
-Gillie,Cafferty,gcafferty3v@netvibes.com,gcafferty3v,Zátor,420-(663)207-1814,Programmer Analyst I,1345410255,"Schamberger, Cassin and Walsh"
-Dorri,Artis,dartis3w@oakley.com,dartis3w,Sam Khok,66-(547)684-7107,Registered Nurse,8689941193,"Mayert, Huel and Kshlerin"
-Gearard,Mills,gmills3x@quantcast.com,gmills3x,Iitti,358-(148)528-5126,Nurse Practicioner,2353507719,Smith-Conn
-Brinna,Andrasch,bandrasch3y@icq.com,bandrasch3y,Karangtalun,62-(700)442-1707,Senior Quality Engineer,3147866394,"Larson, Renner and Goldner"
-Mohammed,Garthshore,mgarthshore3z@washingtonpost.com,mgarthshore3z,Janas,351-(802)307-8630,Pharmacist,2137372886,McClure-Bruen
-Alta,Jeacocke,ajeacocke40@reuters.com,ajeacocke40,Bcharré,961-(429)530-2191,Librarian,2747388336,"Weimann, Yundt and Jerde"
-Denys,Fonzone,dfonzone41@fotki.com,dfonzone41,Kidodi,255-(569)842-8531,Programmer II,5530705758,Prohaska Inc
-Kin,Godthaab,kgodthaab42@usatoday.com,kgodthaab42,Dongzhou,86-(738)848-9111,Developer IV,6520160466,Mueller LLC
-Alida,Jallin,ajallin43@imageshack.us,ajallin43,Croix,33-(392)554-0240,Graphic Designer,6970422224,Donnelly Group
-Domeniga,Pawling,dpawling44@economist.com,dpawling44,Cergy-Pontoise,33-(808)258-6123,Information Systems Manager,2752070268,Lakin and Sons
-Teddie,Pund,tpund45@cnet.com,tpund45,Åkersberga,46-(594)668-9870,Sales Representative,3679850239,Gerlach-Kohler
-Hubert,Staniland,hstaniland46@t-online.de,hstaniland46,Huanggang,86-(605)920-8337,Nurse,3003691309,Crooks and Sons
-Valentijn,Doughton,vdoughton47@vk.com,vdoughton47,La Montañita,57-(547)938-5819,Community Outreach Specialist,5005398791,Gleichner-Ward
-Dunstan,McTurk,dmcturk48@t-online.de,dmcturk48,Cereté,57-(431)362-8281,VP Sales,3378279060,"Kuhic, Crooks and Bergnaum"
-Ervin,Tungay,etungay49@tripadvisor.com,etungay49,Monte,351-(118)918-9096,VP Quality Control,4816619569,"Homenick, Kihn and Sporer"
-Nevil,Kelemen,nkelemen4a@mapy.cz,nkelemen4a,Cha-am,66-(292)424-3669,Programmer Analyst I,4729507800,"Armstrong, Bauch and Doyle"
-Hildegarde,Joffe,hjoffe4b@squarespace.com,hjoffe4b,Sājir,966-(816)671-3309,Developer IV,5371857133,"Quitzon, Lakin and Koss"
-Virgil,Latchmore,vlatchmore4c@europa.eu,vlatchmore4c,Bahorí,992-(626)965-2780,Electrical Engineer,4331295168,Hackett-Ortiz
-Shurwood,Kennon,skennon4d@trellian.com,skennon4d,Shimen,86-(122)424-6837,Actuary,5908185647,Feil-Flatley
-Coretta,Robe,crobe4e@huffingtonpost.com,crobe4e,Paltashaco,51-(430)483-8211,Help Desk Technician,3927212415,Ortiz Inc
-Roddie,Frudd,rfrudd4f@dion.ne.jp,rfrudd4f,Khombole,221-(980)728-8902,Legal Assistant,6679829933,Turcotte-Aufderhar
-Geraldine,Pershouse,gpershouse4g@4shared.com,gpershouse4g,Pinheiro,55-(810)396-6565,Account Representative II,9339033949,Bradtke and Sons
-Rex,Winterburn,rwinterburn4h@earthlink.net,rwinterburn4h,Konibodom,992-(285)759-4482,Engineer I,4013574306,Harvey-Hirthe
-Bride,MacCawley,bmaccawley4i@skype.com,bmaccawley4i,Głubczyce,48-(645)682-7840,Information Systems Manager,3136570391,"Swaniawski, Gerlach and Gibson"
-Nikkie,Freund,nfreund4j@freewebs.com,nfreund4j,Gusang,86-(298)352-9050,Product Engineer,9725922840,"Purdy, Rice and Fahey"
-Henrieta,Creavin,hcreavin4k@wired.com,hcreavin4k,Maoming,86-(203)885-7331,Quality Engineer,6377468806,"Weber, Tillman and Frami"
-Freddie,Irce,firce4l@narod.ru,firce4l,Koszyce Wielkie,48-(793)133-0472,Professor,8965612748,Kunde Inc
-Erin,Thomton,ethomton4m@com.com,ethomton4m,Punta Cana,1-(194)646-6108,Speech Pathologist,8529365445,"Pfannerstill, Berge and Keebler"
-Stu,Grabiec,sgrabiec4n@desdev.cn,sgrabiec4n,Bagé,55-(658)679-1980,Senior Financial Analyst,9818636597,"Murray, Hessel and Considine"
-Marlo,Hay,mhay4o@si.edu,mhay4o,Bojonglarang,62-(342)321-9267,Systems Administrator I,9669756170,Skiles-Mueller
-Ruthe,Rainforth,rrainforth4p@lycos.com,rrainforth4p,Zhangcheng,86-(103)571-9123,Human Resources Manager,0110467094,Treutel-Schroeder
-Nanette,Marvell,nmarvell4q@themeforest.net,nmarvell4q,Candelaria,63-(677)283-7853,Help Desk Operator,0831047453,Johnston-Hayes
-Gwendolen,Kettleson,gkettleson4r@lycos.com,gkettleson4r,Curahkalak Tengah,62-(324)997-7422,Compensation Analyst,3942331365,Russel-Satterfield
-Whittaker,Gregh,wgregh4s@behance.net,wgregh4s,Głowno,48-(285)750-6950,Automation Specialist II,0264496159,Hamill-Kemmer
-Shay,Ramelet,sramelet4t@techcrunch.com,sramelet4t,San Pedro,54-(301)601-8361,Staff Accountant I,8224288722,Aufderhar LLC
-Adrienne,Villar,avillar4u@list-manage.com,avillar4u,Shuangjie,86-(951)513-0325,Automation Specialist II,7072078703,"O'Keefe, Lowe and Stroman"
-Alyda,Gillford,agillford4v@tinypic.com,agillford4v,Fengxian,86-(660)158-1836,Structural Engineer,6986236239,"Moen, Mraz and Heidenreich"
-Biron,Rajchert,brajchert4w@e-recht24.de,brajchert4w,Niort,33-(207)497-8305,Quality Control Specialist,5556782318,Conn LLC
-Drake,Foran,dforan4x@wisc.edu,dforan4x,Fort Pierce,1-(772)401-1527,Nurse Practicioner,2174876256,"Brakus, Schimmel and Turner"
-Madella,Flew,mflew4y@amazon.de,mflew4y,Haodi,86-(156)758-1712,Structural Engineer,2630355349,Abbott Group
-Jermain,Lintot,jlintot4z@linkedin.com,jlintot4z,Koszyce Wielkie,48-(712)513-8339,Electrical Engineer,5316574915,Bruen Inc
-Malvina,Cherrison,mcherrison50@dell.com,mcherrison50,Belung Satu,62-(983)260-7407,Geologist III,0459539647,"Nader, Davis and Spinka"
-Nesta,Darell,ndarell51@sina.com.cn,ndarell51,Vostochnyy,7-(216)191-7642,Dental Hygienist,9912630998,"Aufderhar, Krajcik and Lemke"
-Valery,Sharpus,vsharpus52@cnn.com,vsharpus52,Checca,51-(325)577-5349,Budget/Accounting Analyst II,9257058077,"Koch, Keeling and Kihn"
-Ramona,Cahill,rcahill53@networksolutions.com,rcahill53,Bailieborough,353-(653)588-5654,VP Marketing,6559784584,Welch-Gleason
-Calv,Studdeard,cstuddeard54@dion.ne.jp,cstuddeard54,Babakan,62-(727)232-5040,Geological Engineer,3900347034,"Nitzsche, Mohr and Simonis"
-Malia,Jacobssen,mjacobssen55@e-recht24.de,mjacobssen55,Aldeia do Bispo,351-(313)100-4305,Cost Accountant,3428666267,Mayer Group
-Laural,Izon,lizon56@icq.com,lizon56,Gaoqiao,86-(275)782-1267,Assistant Media Planner,6392728392,Wintheiser Inc
-Morgan,Caukill,mcaukill57@storify.com,mcaukill57,Torres Novas,351-(450)639-8416,Analog Circuit Design manager,2316388078,"Schiller, Kris and Farrell"
-Marlane,Palek,mpalek58@miibeian.gov.cn,mpalek58,San Isidro de Lules,54-(873)665-9102,Design Engineer,1418632929,Lubowitz and Sons
-Broderick,Ugo,bugo59@hud.gov,bugo59,Silodakon,62-(378)217-9779,Recruiter,4977155548,Steuber-Dietrich
-Norry,Arzu,narzu5a@oakley.com,narzu5a,Timashëvsk,7-(943)185-9478,Paralegal,8088001102,"Hettinger, Gutkowski and Bechtelar"
-Benedikta,Meininking,bmeininking5b@macromedia.com,bmeininking5b,Jiucheng,86-(218)617-0476,Legal Assistant,0611180774,Douglas Inc
-Edan,Velasquez,evelasquez5c@sitemeter.com,evelasquez5c,Juncheng,86-(623)794-4358,Associate Professor,3556333899,"Marks, Jakubowski and Boyer"
-Shea,Ernke,sernke5d@freewebs.com,sernke5d,Korniyivka,380-(988)667-0972,Senior Quality Engineer,3318216801,Huel Inc
-Bekki,Fesby,bfesby5e@irs.gov,bfesby5e,Lille,33-(510)850-2554,Desktop Support Technician,2228160431,Ullrich LLC
-Sean,Oda,soda5f@tinyurl.com,soda5f,Furukawa,81-(267)487-5524,Office Assistant I,2265020354,Spinka-Auer
-Jerry,Bakster,jbakster5g@sina.com.cn,jbakster5g,Hołoby,380-(683)792-0125,Staff Scientist,2528271107,D'Amore and Sons
-Wendi,Imlen,wimlen5h@amazon.co.uk,wimlen5h,Takatsuki,81-(641)449-9730,Internal Auditor,8591255291,Hermann-Reinger
-Cristina,McCarry,cmccarry5i@weibo.com,cmccarry5i,Banturkrajan,62-(200)913-3412,Help Desk Technician,8664973989,"Skiles, Russel and Wisoky"
-Viviana,Selman,vselman5j@360.cn,vselman5j,Huayan,86-(681)662-3285,Research Assistant III,6262769528,Wuckert Inc
-Shanie,Uppett,suppett5k@webeden.co.uk,suppett5k,Lac du Bonnet,1-(543)646-5383,Operator,4572433119,Fadel Inc
-Suzie,Bridgeman,sbridgeman5l@dmoz.org,sbridgeman5l,Kamo,81-(897)485-9748,Environmental Specialist,1977897401,"Denesik, Okuneva and Bernier"
-Eudora,Casterot,ecasterot5m@psu.edu,ecasterot5m,Zonghan,86-(764)968-7549,Help Desk Operator,2008858634,"Jaskolski, Huels and Dibbert"
-Penn,Viant,pviant5n@linkedin.com,pviant5n,Andir,62-(390)901-5564,Senior Sales Associate,2238319271,"Cummings, Beatty and Hudson"
-Berne,Hannan,bhannan5o@shareasale.com,bhannan5o,Krajan Kerjo,62-(278)571-4046,Data Coordiator,7942202852,Auer-Bartoletti
-Oralee,Malyj,omalyj5p@admin.ch,omalyj5p,Kotayk’,374-(542)956-6172,Engineer IV,4819135880,"Pacocha, Kertzmann and Rempel"
-Fifi,Small,fsmall5q@amazon.de,fsmall5q,Voznesenskoye,7-(821)863-5914,Physical Therapy Assistant,6908304248,"Rippin, Reichel and White"
-Loise,Pilger,lpilger5r@smh.com.au,lpilger5r,Hénin-Beaumont,33-(686)647-9059,Information Systems Manager,0967841968,Wiza and Sons
-Derward,Dupoy,ddupoy5s@latimes.com,ddupoy5s,Itami,81-(903)990-0489,Quality Engineer,3564905782,Dare-Kautzer
-Chelsea,Lergan,clergan5t@youtu.be,clergan5t,Jiagao,86-(320)644-8775,Research Assistant III,9361206621,Kirlin-Effertz
-Rosene,Flitcroft,rflitcroft5u@free.fr,rflitcroft5u,Inírida,57-(248)911-2377,Clinical Specialist,9685341567,"Dietrich, Wyman and Shanahan"
-Chariot,Barok,cbarok5v@blogspot.com,cbarok5v,Căuşeni,373-(632)605-6648,Speech Pathologist,4694900498,Legros LLC
-Elita,von Nassau,evonnassau5w@digg.com,evonnassau5w,Kutacane,62-(213)303-2731,Executive Secretary,0347148085,Green Inc
-Gael,Marjanovic,gmarjanovic5x@marriott.com,gmarjanovic5x,Huacapampa,51-(186)661-9148,Occupational Therapist,6726485387,"Stamm, Kris and Farrell"
-Gaspard,Ummfrey,gummfrey5y@t.co,gummfrey5y,Buenavista,63-(497)452-5987,Speech Pathologist,4575944572,Bradtke-Hegmann
-Bent,Trenam,btrenam5z@auda.org.au,btrenam5z,Cerrito,57-(251)296-9228,Payment Adjustment Coordinator,1352694905,Robel Inc
-Allie,Cardo,acardo60@nba.com,acardo60,Sayama,81-(136)328-3578,Administrative Assistant II,1953155472,Franecki Inc
-Kendricks,Lawes,klawes61@wikimedia.org,klawes61,Kýria,30-(629)572-9182,Automation Specialist III,3013335882,Cremin and Sons
-Israel,Earwicker,iearwicker62@latimes.com,iearwicker62,Naga,63-(980)734-2130,Help Desk Technician,9262358857,Predovic Group
-Olivie,Haskett,ohaskett63@biblegateway.com,ohaskett63,Sadská,420-(267)684-5843,General Manager,0341903078,"Ritchie, Thiel and Crona"
-Lorette,Jupp,ljupp64@eventbrite.com,ljupp64,Kalety,48-(905)755-9085,Senior Financial Analyst,6902201358,"Larson, Mann and Denesik"
-Huberto,Fieldsend,hfieldsend65@hibu.com,hfieldsend65,Rostokino,7-(885)545-7151,Sales Representative,7583497507,Buckridge-Crist
-Galvan,Ruslen,gruslen66@biblegateway.com,gruslen66,Tomaszów Lubelski,48-(738)856-8800,Executive Secretary,7689061370,Marquardt Group
-Lucine,Dillway,ldillway67@netlog.com,ldillway67,Nobres,55-(588)142-5888,Data Coordiator,3143583223,Morissette Group
-Bogey,Lloyd,blloyd68@clickbank.net,blloyd68,Maskinongé,1-(480)421-6369,Recruiter,8019916377,Schmidt-Okuneva
-Lana,Osorio,losorio69@theguardian.com,losorio69,Shuiyuesi,86-(368)799-2866,Financial Advisor,0845918354,Murazik-Spinka
-April,Shrimpton,ashrimpton6a@yahoo.co.jp,ashrimpton6a,Jurh,86-(945)443-7757,Budget/Accounting Analyst I,6199988221,"Willms, Marquardt and Kautzer"
-Thea,Brunelleschi,tbrunelleschi6b@boston.com,tbrunelleschi6b,Belovo,7-(379)764-3239,Speech Pathologist,3924467498,Feil Inc
-Sunshine,Pymer,spymer6c@sakura.ne.jp,spymer6c,Tsibulev,380-(446)992-3711,Technical Writer,0673563766,Price-Kuhic
-Neddie,Westoll,nwestoll6d@dailymail.co.uk,nwestoll6d,Tatebayashi,81-(379)112-1552,Software Consultant,5692786702,"Lind, Schoen and Harris"
-Godfrey,Shiliton,gshiliton6e@economist.com,gshiliton6e,Caucaia,55-(324)521-2916,Assistant Media Planner,3640782380,"White, Sipes and Macejkovic"
-Bonnibelle,Meys,bmeys6f@hud.gov,bmeys6f,Barengkok Hilir,62-(132)233-0164,VP Marketing,6576141343,Greenfelder and Sons
-Biddie,Hazart,bhazart6g@privacy.gov.au,bhazart6g,Lyubimets,359-(539)214-9362,Research Nurse,2110251921,Beatty Inc
-Mariette,Arnoud,marnoud6h@upenn.edu,marnoud6h,Chonglou,86-(367)745-8032,Chemical Engineer,6279421910,Bailey-Flatley
-Ralph,Ronan,rronan6i@soup.io,rronan6i,Villa del Rosario,54-(472)473-2834,Media Manager III,0898611601,Conroy-Schultz
-Kristopher,Byrth,kbyrth6j@ucoz.com,kbyrth6j,Vyselki,7-(553)161-3317,GIS Technical Architect,8368786673,"Feest, Cremin and Goodwin"
-Juliette,Peckett,jpeckett6k@desdev.cn,jpeckett6k,Dublin,353-(547)169-7510,Registered Nurse,4289815278,Jakubowski-Lueilwitz
-Lauretta,Edgeler,ledgeler6l@instagram.com,ledgeler6l,Tarragona,63-(650)302-6149,Biostatistician IV,6817860377,"Jakubowski, Steuber and Tillman"
-Scot,Calvert,scalvert6m@blinklist.com,scalvert6m,Condong,62-(732)380-9120,Sales Associate,7437515962,Doyle-Breitenberg
-Elyssa,Tibbles,etibbles6n@last.fm,etibbles6n,Neftobod,992-(777)638-8129,Analyst Programmer,9445635612,"Fahey, Champlin and Dietrich"
-Brander,Harmer,bharmer6o@bloglovin.com,bharmer6o,Gardēz,93-(358)973-4287,Librarian,1276314027,"Hauck, Simonis and Rosenbaum"
-Brennen,Springthorpe,bspringthorpe6p@salon.com,bspringthorpe6p,Mobaye,236-(308)628-4824,Safety Technician II,3086629398,Yundt-Ziemann
-Bren,Kleynermans,bkleynermans6q@phpbb.com,bkleynermans6q,Weifang,86-(292)267-2145,Developer III,5400207502,"Treutel, Stoltenberg and Johnston"
-Candy,Tooze,ctooze6r@friendfeed.com,ctooze6r,Vlachovo Březí,420-(676)807-2495,Nurse Practicioner,5388144038,"Russel, Blanda and Rogahn"
-Fairleigh,Diamant,fdiamant6s@blinklist.com,fdiamant6s,Sainte-Anne-de-Bellevue,1-(568)570-3951,Quality Engineer,3663658481,Armstrong-Johns
-Basil,Howsden,bhowsden6t@ovh.net,bhowsden6t,Xylotymbou,357-(214)824-3004,Tax Accountant,3403316513,"Langosh, Bartell and Stoltenberg"
-Dora,Dobbin,ddobbin6u@amazon.co.jp,ddobbin6u,Lamovita,387-(768)310-0952,Office Assistant I,8679431729,Leannon-Kiehn
-Demetra,Brownill,dbrownill6v@over-blog.com,dbrownill6v,Bagou,86-(713)477-6708,Sales Representative,5659782310,Johns-Kerluke
-Dasi,Dumini,ddumini6w@patch.com,ddumini6w,Punta del Este,598-(886)595-6322,Human Resources Assistant II,1332065767,Schowalter-Altenwerth
-Lenette,Geaveny,lgeaveny6x@pcworld.com,lgeaveny6x,Gaoqiao,86-(467)357-1181,Programmer IV,6397889467,"Will, Rath and Jenkins"
-Colin,Treace,ctreace6y@wikimedia.org,ctreace6y,Nanjiao,86-(675)354-6909,Chief Design Engineer,7751575638,"Ferry, Runolfsdottir and Yost"
-Corabelle,Clow,cclow6z@hexun.com,cclow6z,Sovetskaya Gavan’,7-(120)976-8309,Software Consultant,7813300394,Doyle Group
-Linda,Sebborn,lsebborn70@ucoz.ru,lsebborn70,Knoxville,1-(865)117-5458,General Manager,9692754766,Reichert-O'Reilly
-Hector,Halbeard,hhalbeard71@about.me,hhalbeard71,Batanovtsi,359-(442)822-8483,Physical Therapy Assistant,9078172762,Conn Group
-Abbe,Mobberley,amobberley72@ucsd.edu,amobberley72,Kinna,46-(293)901-8731,Administrative Assistant II,9620491815,Hahn-Batz
-Jasmina,Wickliffe,jwickliffe73@google.it,jwickliffe73,Mercier,1-(345)768-6426,Web Designer IV,9241731699,Wunsch Inc
-Cissy,Saill,csaill74@google.ru,csaill74,Cifuentes,53-(247)403-7379,Analog Circuit Design manager,1682507572,Oberbrunner Group
-Sharlene,Ozintsev,sozintsev75@google.com.br,sozintsev75,Gornji Milanovac,381-(814)830-4698,Associate Professor,2798596351,Lockman-Abbott
-Padraic,Alyukin,palyukin76@chicagotribune.com,palyukin76,Ouricuri,55-(251)839-4014,Recruiter,6246014852,Weimann-Fay
-Rowney,Bamblett,rbamblett77@shop-pro.jp,rbamblett77,Saint-Étienne,33-(689)956-1538,Director of Sales,2164832523,Gulgowski Inc
-Ertha,Carayol,ecarayol78@aol.com,ecarayol78,Kanoni,256-(965)621-0576,Assistant Professor,7485417517,"Hoppe, Windler and Stiedemann"
-Jodie,Ramsdell,jramsdell79@ezinearticles.com,jramsdell79,Xingxi,86-(209)444-2347,Geological Engineer,1645038890,Padberg LLC
-Jessie,Febre,jfebre7a@lulu.com,jfebre7a,Glugur Krajan,62-(476)504-7372,Editor,7484180890,Dickinson Group
-Xymenes,Rihanek,xrihanek7b@mapy.cz,xrihanek7b,Tiemen,86-(815)399-0300,Tax Accountant,7418639295,Rogahn Group
-Ynes,Castagneri,ycastagneri7c@army.mil,ycastagneri7c,Majiang,86-(109)725-0679,Web Developer IV,9966232281,Veum-Block
-Meade,Josovich,mjosovich7d@instagram.com,mjosovich7d,Dumalinao,63-(220)787-8879,Chief Design Engineer,9532892052,Dach LLC
-Starla,Baglan,sbaglan7e@kickstarter.com,sbaglan7e,Tucson,1-(520)306-4486,Geological Engineer,3924286000,White LLC
-Cecil,Ditchfield,cditchfield7f@merriam-webster.com,cditchfield7f,Bouillon,32-(153)814-1718,Safety Technician II,3049249757,Wehner-Schultz
-Albina,Caile,acaile7g@sourceforge.net,acaile7g,Limanowa,48-(598)134-6137,Statistician IV,2887139231,Gleichner LLC
-Myrtia,Topling,mtopling7h@timesonline.co.uk,mtopling7h,Weichanglu,86-(679)742-0020,Account Coordinator,8708521727,Skiles-Rempel
-Jillian,Parnall,jparnall7i@plala.or.jp,jparnall7i,Lobito,244-(170)955-1350,Environmental Specialist,4004831083,McCullough-Gislason
-Martita,Gallamore,mgallamore7j@fotki.com,mgallamore7j,Watubuku,62-(829)363-5055,Food Chemist,0332452107,Cummerata Group
-Gareth,Bourchier,gbourchier7k@biblegateway.com,gbourchier7k,Benito Juarez,52-(692)902-9439,Senior Editor,2717344314,Mueller-McDermott
-Cristine,Lydiard,clydiard7l@hubpages.com,clydiard7l,Puzi,86-(502)679-6404,Tax Accountant,2847297839,Rau-Gerhold
-Tamar,Grishagin,tgrishagin7m@ft.com,tgrishagin7m,Singkup,62-(368)986-3322,Pharmacist,4974827138,Waters-Volkman
-Kassandra,McGarva,kmcgarva7n@ucsd.edu,kmcgarva7n,Tunal,51-(683)835-8456,Statistician II,8446317222,Tremblay-Jacobi
-Lulita,Millard,lmillard7o@biglobe.ne.jp,lmillard7o,Charlemagne,1-(334)407-8112,Software Engineer IV,7906208463,Nicolas-Harber
-Deanna,Guly,dguly7p@cbslocal.com,dguly7p,Barda,994-(610)562-3650,Business Systems Development Analyst,3995952712,Bailey Group
-Latia,Lerer,llerer7q@acquirethisname.com,llerer7q,Dykan’ka,380-(537)386-5412,Quality Control Specialist,1410485773,Daugherty and Sons
-Jessika,Constantine,jconstantine7r@twitter.com,jconstantine7r,Parang,62-(598)114-0602,VP Marketing,1477207635,Schowalter-Becker
-Fianna,Garz,fgarz7s@posterous.com,fgarz7s,Västerås,46-(169)490-0251,Paralegal,2065474785,"Osinski, Stark and Wisoky"
-Georgina,McGown,gmcgown7t@va.gov,gmcgown7t,Lianghekou,86-(580)598-5939,Database Administrator IV,8574862584,Schmidt-Stark
-Libbey,Hatto,lhatto7u@parallels.com,lhatto7u,Saint-Pierre,262-(621)379-5079,Compensation Analyst,3663439984,Wintheiser-Tromp
-Melosa,Varvell,mvarvell7v@msu.edu,mvarvell7v,Canta,51-(384)731-8458,Executive Secretary,1754007481,Lind-Weissnat
-Caspar,Cutbirth,ccutbirth7w@nifty.com,ccutbirth7w,Makoko,234-(315)758-3899,Senior Sales Associate,7648950596,"Kertzmann, Muller and McClure"
-Ward,Pryor,wpryor7x@xinhuanet.com,wpryor7x,Pitangui,55-(228)519-9720,Research Assistant I,7596446612,Ondricka-Murray
-Judon,Orhrt,jorhrt7y@friendfeed.com,jorhrt7y,Rancakuya,62-(835)959-6252,Senior Financial Analyst,0862524326,Ratke-Powlowski
-Isa,Gudgin,igudgin7z@bizjournals.com,igudgin7z,Paojan,62-(130)105-8528,Administrative Assistant IV,6567173823,Hyatt and Sons
-Jacquetta,Heinrici,jheinrici80@latimes.com,jheinrici80,Pitanga,55-(768)218-0323,Clinical Specialist,7383258630,McCullough LLC
-Gris,Demonge,gdemonge81@eventbrite.com,gdemonge81,Sevsk,7-(385)990-5642,Software Consultant,7319470772,Prosacco Inc
-Anna,Cordova,acordova82@vistaprint.com,acordova82,Horodnya,380-(403)720-3982,Research Associate,8382416985,Witting Inc
-Garek,Paver,gpaver83@reddit.com,gpaver83,Baumata,62-(857)457-3277,Systems Administrator IV,5548424025,Homenick-Cummings
-Lyndsey,Penrose,lpenrose84@amazonaws.com,lpenrose84,Xinning,86-(478)975-1877,Account Executive,2521617024,"Beier, Wolf and Rutherford"
-Vivyanne,Garment,vgarment85@hc360.com,vgarment85,Abonnema,234-(630)147-0664,Compensation Analyst,3170876961,Gibson Inc
-Diandra,Alfonso,dalfonso86@so-net.ne.jp,dalfonso86,São Joaquim da Barra,55-(958)915-7472,Recruiter,9244448580,"Walker, Ryan and Gutmann"
-Germana,Filippi,gfilippi87@virginia.edu,gfilippi87,Bořitov,420-(677)675-6041,Quality Engineer,4733992351,Rice Group
-Huntington,Jaffa,hjaffa88@jigsy.com,hjaffa88,Puerto Padre,53-(811)758-9909,Research Associate,3705515845,Kerluke-Durgan
-Julius,Scrace,jscrace89@sohu.com,jscrace89,Vilnius,370-(437)863-9804,Senior Financial Analyst,8560462449,"Wunsch, Wilkinson and Bernier"
-Orin,Donnersberg,odonnersberg8a@lycos.com,odonnersberg8a,Posadas,54-(799)614-8488,Assistant Manager,6525056810,"Barrows, Prohaska and Raynor"
-Nicole,Alberts,nalberts8b@businessinsider.com,nalberts8b,Circa,51-(793)830-7780,Internal Auditor,6648971908,Kihn Inc
-Noami,Coast,ncoast8c@blogs.com,ncoast8c,Bengga,62-(245)836-9414,VP Accounting,1384386025,"Reilly, Feest and Armstrong"
-Trev,Coil,tcoil8d@nyu.edu,tcoil8d,Ol Kalou,254-(686)258-2913,Mechanical Systems Engineer,6873910341,Goyette Inc
-Isiahi,Bingall,ibingall8e@histats.com,ibingall8e,Raleigh,1-(919)707-3481,Legal Assistant,7848853918,"Stark, Thompson and Wintheiser"
-Dasi,Balsdon,dbalsdon8f@paginegialle.it,dbalsdon8f,Douala,237-(853)665-9676,Administrative Officer,5137205664,"Olson, Mayert and Renner"
-Allx,Towl,atowl8g@wordpress.com,atowl8g,Kosti,249-(267)322-7346,Human Resources Assistant III,4848260302,Walker LLC
-Mead,Bunton,mbunton8h@linkedin.com,mbunton8h,Zhukovskiy,7-(479)702-5593,General Manager,9816135388,Durgan-Steuber
-Felipe,Cremen,fcremen8i@tinyurl.com,fcremen8i,Tualangcut,62-(457)527-3731,Software Consultant,0960922245,Glover-Vandervort
-Maryanne,Bevir,mbevir8j@devhub.com,mbevir8j,Petrolina,55-(430)943-6831,Analog Circuit Design manager,8076246016,Schumm-Hoppe
-Rice,Bangley,rbangley8k@tinyurl.com,rbangley8k,San Francisco,1-(415)451-6262,Legal Assistant,2931538566,Wisoky-Hettinger
-Rockey,Jewell,rjewell8l@printfriendly.com,rjewell8l,Mistrató,57-(273)159-4757,Marketing Manager,2358326909,Kohler-Crooks
-Andrei,Busk,abusk8m@trellian.com,abusk8m,Shevchenkove,380-(471)522-4941,Software Test Engineer III,5139581752,Kemmer Group
-Boyce,Colwill,bcolwill8n@google.fr,bcolwill8n,Paço de Arcos,351-(169)576-4617,Database Administrator I,8239907938,"Carter, Connelly and Turcotte"
-Rosalia,Kilcullen,rkilcullen8o@tmall.com,rkilcullen8o,Skellefteå,46-(497)227-6314,Research Nurse,7802328411,Marvin Inc
-Wang,Howcroft,whowcroft8p@usa.gov,whowcroft8p,Seixo de Manhoses,351-(878)241-1916,Engineer I,4169975723,"Quitzon, Jacobson and Hoeger"
-Pauletta,MacFadden,pmacfadden8q@yellowbook.com,pmacfadden8q,Guanabacoa,53-(414)148-3660,Senior Cost Accountant,4033591168,"Bernhard, Greenholt and Kovacek"
-Anetta,Kikke,akikke8r@xrea.com,akikke8r,Pines,63-(455)105-7090,Staff Scientist,3797345658,"Upton, Walter and Champlin"
-Doy,Von Oertzen,dvonoertzen8s@soundcloud.com,dvonoertzen8s,Trancas,54-(227)790-7863,Quality Control Specialist,7347709652,Rogahn-Robel
-Evania,Ettery,eettery8t@woothemes.com,eettery8t,Batuidu,62-(958)487-1137,Environmental Tech,6712438047,"McCullough, Brown and White"
-Dorothy,Burchfield,dburchfield8u@com.com,dburchfield8u,Buenos Aires,57-(104)461-3034,Structural Engineer,1232163627,"Bergnaum, Mann and Denesik"
-Marnia,Pates,mpates8v@cdc.gov,mpates8v,Wanzu,86-(584)655-8767,Structural Analysis Engineer,9486437602,"Vandervort, Reilly and Torp"
-Sherlocke,Sundin,ssundin8w@bloglovin.com,ssundin8w,Lubumbashi,242-(894)433-3030,Database Administrator I,8350287896,"Denesik, Prohaska and Jacobson"
-Cathe,Perell,cperell8x@wordpress.com,cperell8x,Kruty,380-(115)837-1904,VP Sales,0042397316,"Wilkinson, Schulist and Macejkovic"
-Pennie,Gerault,pgerault8y@geocities.jp,pgerault8y,Placencia,501-(575)329-0306,Social Worker,7431658591,"Torphy, Bailey and Reilly"
-Mitchell,Crambie,mcrambie8z@privacy.gov.au,mcrambie8z,Xiamao,86-(265)196-0470,Nuclear Power Engineer,1526344351,Ritchie-Morissette
-Melisent,Gosneye,mgosneye90@freewebs.com,mgosneye90,Yōkaichiba,81-(118)826-5920,VP Product Management,2373235900,Homenick and Sons
-Jordain,Gheorghe,jgheorghe91@bandcamp.com,jgheorghe91,Ljungby,46-(108)213-7069,Pharmacist,2339386128,"Lubowitz, Witting and Trantow"
-Ezekiel,Winpenny,ewinpenny92@aboutads.info,ewinpenny92,Uttaradit,66-(502)534-3772,Analyst Programmer,9863270415,"Satterfield, Yost and Cruickshank"
-Alaric,Coal,acoal93@rambler.ru,acoal93,Piła,48-(110)978-3089,Senior Editor,1002792959,Schmeler Group
-Sigvard,Durnill,sdurnill94@senate.gov,sdurnill94,Jiuzihe,86-(285)652-3541,Desktop Support Technician,6259022751,Hodkiewicz-Treutel
-Pauletta,Jacob,pjacob95@blog.com,pjacob95,Lillehammer,47-(466)710-7316,Budget/Accounting Analyst IV,8012816342,Kub-Streich
-Genevieve,Easson,geasson96@gmpg.org,geasson96,Litian,86-(690)700-3316,Chemical Engineer,9267475002,Krajcik-Berge
-Chad,Wellings,cwellings97@geocities.com,cwellings97,Corozal,57-(599)397-8105,Technical Writer,1234875780,Lang Inc
-Constantia,Andor,candor98@angelfire.com,candor98,Luxi,86-(981)190-7061,Tax Accountant,2171737387,Kunze-Cummerata
-Nathanil,Kennett,nkennett99@salon.com,nkennett99,Kushnytsya,380-(964)412-7626,Operator,2201713081,Auer LLC
-Marilyn,Lambden,mlambden9a@ca.gov,mlambden9a,Sūq al Khamīs,967-(606)751-1510,Social Worker,9824776443,"Kuhic, Wolf and Runte"
-Sol,Trownson,strownson9b@t.co,strownson9b,Venado Tuerto,54-(387)454-8901,Paralegal,4748088125,Reichert-Nitzsche
-Marybeth,Sturney,msturney9c@163.com,msturney9c,Agassiz,1-(357)754-2461,Data Coordiator,3593006383,Spinka-Ebert
-Tyler,Kightly,tkightly9d@ed.gov,tkightly9d,Kunčice pod Ondřejníkem,420-(222)601-1668,General Manager,5778670230,Brown Group
-Godart,Izakoff,gizakoff9e@jimdo.com,gizakoff9e,San Agustin,63-(658)848-5052,Junior Executive,3147182215,Schaden and Sons
-Cherie,MacAndrew,cmacandrew9f@jigsy.com,cmacandrew9f,Topeka,1-(785)270-8606,Software Engineer IV,5443654527,Schuster-Windler
-Giorgia,Cinderey,gcinderey9g@php.net,gcinderey9g,Setúbal,351-(730)743-5865,Account Representative I,6484043175,Johns Inc
-Kasper,Deuss,kdeuss9h@myspace.com,kdeuss9h,Ostrogozhsk,7-(336)124-5046,Nurse,6142898304,"Smith, Hamill and Beatty"
-Leroy,Foord,lfoord9i@timesonline.co.uk,lfoord9i,Kijang,82-(585)819-8722,Analog Circuit Design manager,4569642292,Leffler-Casper
-Urson,Fludder,ufludder9j@mac.com,ufludder9j,Lumbardhi,383-(659)644-8699,Programmer II,2608105793,Wisoky-Lesch
-Victoir,Sainer,vsainer9k@4shared.com,vsainer9k,Mocoa,57-(566)759-9576,Senior Cost Accountant,4891001224,Gerlach Inc
-Nestor,Gray,ngray9l@paginegialle.it,ngray9l,Vallauris,33-(405)253-6375,Help Desk Operator,7391899399,Rutherford-Fisher
-Benedetto,Sebrens,bsebrens9m@quantcast.com,bsebrens9m,Hüremt,976-(937)675-7706,Health Coach I,5492941666,Rosenbaum Inc
-Alis,Crittal,acrittal9n@fema.gov,acrittal9n,Xia’ertai,86-(808)528-2343,Nurse,9616882783,Waters LLC
-Tanitansy,Deighan,tdeighan9o@ovh.net,tdeighan9o,Ketitang Wetan,62-(807)439-9181,Account Coordinator,5918139109,Schultz-Quigley
-Park,Allbon,pallbon9p@topsy.com,pallbon9p,Mértola,351-(457)676-3664,Recruiter,7432415315,Franecki-Lind
-Bridget,Houlden,bhoulden9q@telegraph.co.uk,bhoulden9q,Busay,63-(327)378-8551,Teacher,5534661836,Kutch Inc
-Timi,Winnett,twinnett9r@wiley.com,twinnett9r,Foros de Salvaterra,351-(750)913-7504,VP Marketing,0956508278,"Pagac, Wisozk and Powlowski"
-Garey,Berends,gberends9s@nasa.gov,gberends9s,Villa Nueva,54-(466)900-2563,Community Outreach Specialist,2649689285,Cruickshank Group
-Maurise,Sabathe,msabathe9t@umn.edu,msabathe9t,Porto Alto,351-(826)409-0224,Environmental Tech,4375179112,O'Kon and Sons
-Waiter,Newport,wnewport9u@cdc.gov,wnewport9u,Balibago,63-(808)564-2341,Media Manager I,3383596125,Frami-Kassulke
-Clarissa,Snuggs,csnuggs9v@moonfruit.com,csnuggs9v,Weitang,86-(376)106-1168,Account Representative IV,2195207272,Harris Inc
-Florance,Littlejohns,flittlejohns9w@tumblr.com,flittlejohns9w,Bunigeulis,62-(587)466-3755,Legal Assistant,3318922927,Marquardt-Howe
-Gail,Skechley,gskechley9x@prweb.com,gskechley9x,Meixi,86-(203)873-6865,Web Developer I,6076144513,Nolan-Dickinson
-Skippy,Biss,sbiss9y@prweb.com,sbiss9y,Dongshi,86-(723)211-0742,Structural Analysis Engineer,6615870533,"Connelly, Durgan and Block"
-Haskell,Ring,hring9z@bluehost.com,hring9z,Želiv,420-(641)544-3995,Financial Advisor,4876809534,"Lynch, Sipes and Rodriguez"
-Germaine,Nugent,gnugenta0@netscape.com,gnugenta0,Żyrardów,48-(730)293-9054,Senior Editor,3174803845,"Schimmel, Zulauf and Koepp"
-Karel,Lokier,klokiera1@ow.ly,klokiera1,Dolinsk,7-(925)530-5945,Safety Technician II,4154581473,"Hirthe, Lindgren and Aufderhar"
-Helena,Jeeves,hjeevesa2@sphinn.com,hjeevesa2,Cimanggu,62-(941)630-4312,Product Engineer,7546527988,"Gusikowski, Leannon and Jacobs"
-Alberik,Dillingstone,adillingstonea3@columbia.edu,adillingstonea3,Zelenoborskiy,7-(836)258-0010,Dental Hygienist,7362248229,Mosciski-Runte
-Carly,Linnett,clinnetta4@exblog.jp,clinnetta4,Pringgabaya,62-(246)753-9319,Administrative Officer,8092146349,Bashirian-Lebsack
-Mortimer,Brando,mbrandoa5@upenn.edu,mbrandoa5,Vestmannaeyjar,354-(926)712-7652,Account Executive,3018918487,Kreiger Group
-Filbert,Ablett,fabletta6@ycombinator.com,fabletta6,Mýki,30-(705)811-5277,Tax Accountant,6539074042,"Ziemann, Welch and Farrell"
-Faith,Braven,fbravena7@reuters.com,fbravena7,Thessaloníki,30-(722)343-0087,Electrical Engineer,9811784329,Daniel Inc
-Frannie,Davidov,fdavidova8@themeforest.net,fdavidova8,Palayan City,63-(745)265-1044,Web Designer II,6579399848,Denesik and Sons
-Lucien,Tabner,ltabnera9@xinhuanet.com,ltabnera9,Mulyosari,62-(239)594-7444,Librarian,1502298732,"Rosenbaum, Reichert and Kunze"
-Wally,Enever,weneveraa@bloglines.com,weneveraa,Satrejan,62-(645)352-9402,Office Assistant III,3527730311,Grady-Koelpin
-Nedda,Gorke,ngorkeab@networkadvertising.org,ngorkeab,Stanišić,381-(108)441-3898,Research Associate,3014819530,Turner LLC
-Bobby,Froggatt,bfroggattac@soup.io,bfroggattac,Platičevo,381-(674)755-5107,Quality Control Specialist,0737880740,"Goodwin, Gislason and Deckow"
-Stace,Acaster,sacasterad@discovery.com,sacasterad,Macia,258-(104)153-7107,Health Coach IV,6201062777,Jones-Pollich
-Oswald,Moulder,omoulderae@goo.gl,omoulderae,Khvastovichi,7-(214)819-4396,Social Worker,0394690478,Nikolaus-Erdman
-Wanda,Glossop,wglossopaf@infoseek.co.jp,wglossopaf,Pinyug,7-(114)659-2688,Internal Auditor,2523327775,"Frami, Leffler and Schulist"
-Drucy,Le Count,dlecountag@1und1.de,dlecountag,Skalat,380-(388)706-1735,Accountant III,1408462974,"Zieme, Terry and Runolfsdottir"
-Jaclyn,Dohrmann,jdohrmannah@is.gd,jdohrmannah,Dongshan,86-(100)568-9635,GIS Technical Architect,3924999996,McKenzie-Hermiston
-Yvonne,Sansun,ysansunai@omniture.com,ysansunai,El Progreso,507-(224)379-6931,Staff Accountant IV,8276625738,Sporer-Trantow
-Vonny,Skipp,vskippaj@sbwire.com,vskippaj,Paokmotong Utara,62-(835)335-0196,Payment Adjustment Coordinator,5895390900,"Treutel, Brown and Brekke"
-Karyl,Wadman,kwadmanak@imgur.com,kwadmanak,Yanjiao,86-(360)378-3302,Staff Scientist,1910238406,"Hansen, Pagac and Deckow"
-Kippie,Bradden,kbraddenal@marriott.com,kbraddenal,Jönköping,46-(543)587-0300,Staff Scientist,9176800180,Kirlin Inc
-Paddy,Kettlesing,pkettlesingam@cornell.edu,pkettlesingam,Oslo,47-(849)145-5733,Structural Engineer,8705223008,Jaskolski-Harber
-Kane,Wennington,kwenningtonan@ucsd.edu,kwenningtonan,Lukashin,374-(349)354-4479,Staff Scientist,7435531871,Schneider Inc
-Sherill,Williamson,swilliamsonao@earthlink.net,swilliamsonao,Mafang,86-(496)852-1140,Accounting Assistant III,1506840779,Dooley-Olson
-Audre,Inglish,ainglishap@ehow.com,ainglishap,Minian,62-(250)963-0003,Business Systems Development Analyst,4065598095,"Stoltenberg, Wisozk and Weimann"
-Berri,Fedorski,bfedorskiaq@umich.edu,bfedorskiaq,Norcasia,57-(162)449-5682,Safety Technician IV,0098301586,Maggio LLC
-Ursulina,Whitehurst,uwhitehurstar@wikipedia.org,uwhitehurstar,Solna,46-(377)784-6117,Operator,0650376811,Bogan Inc
-Alidia,Torr,atorras@fastcompany.com,atorras,Sandaohezi,86-(949)545-6861,Account Executive,4811145070,Lehner LLC
-Kaye,Beane,kbeaneat@economist.com,kbeaneat,Nglojo,62-(355)846-4503,Systems Administrator III,9744419083,Fay-Schultz
-Clywd,Rentz,crentzau@howstuffworks.com,crentzau,Yuguan,86-(368)395-3026,Community Outreach Specialist,8482525794,"Daugherty, Hammes and Grant"
-Loella,Golledge,lgolledgeav@xing.com,lgolledgeav,Sangba,86-(997)138-0005,Computer Systems Analyst IV,3818896577,Kassulke Group
-Berty,Shankle,bshankleaw@blog.com,bshankleaw,Bailai,86-(811)447-2940,Web Designer IV,1381483984,"Rutherford, Weissnat and Stoltenberg"
-Elysha,Wormell,ewormellax@cornell.edu,ewormellax,Heshi,86-(459)905-4935,Engineer II,6903217533,Reynolds and Sons
-Emelda,Kienl,ekienlay@edublogs.org,ekienlay,Szelków,48-(150)608-0093,Civil Engineer,0403741254,Ryan-Braun
-Nanete,Shatliffe,nshatliffeaz@wikipedia.org,nshatliffeaz,Wongsorejo,62-(801)201-7190,Social Worker,9561076268,Corkery-Davis
-Krisha,Luddy,kluddyb0@about.me,kluddyb0,Pulau Pinang,60-(664)235-5600,Research Assistant IV,5908588660,"Beier, Daniel and Johns"
-Aloin,Bagnal,abagnalb1@webnode.com,abagnalb1,Јегуновце,389-(396)343-8442,Software Engineer IV,1870806077,Konopelski-Graham
-Elna,Cockburn,ecockburnb2@goodreads.com,ecockburnb2,Trần Văn Thời,84-(508)784-0206,Dental Hygienist,3976709638,Monahan-Greenholt
-Cointon,Leggan,clegganb3@ox.ac.uk,clegganb3,Biryulëvo Zapadnoye,7-(592)382-0444,Electrical Engineer,2202518185,Dibbert and Sons
-Danila,Goldsbrough,dgoldsbroughb4@marriott.com,dgoldsbroughb4,Dowsk,375-(360)424-7789,Account Executive,9726332923,Bartoletti Group
-Gigi,Philimore,gphilimoreb5@typepad.com,gphilimoreb5,Changxingbao,86-(393)226-0359,Physical Therapy Assistant,5418292374,Mayert-Casper
-Adolf,Vakhlov,avakhlovb6@indiegogo.com,avakhlovb6,Cárdenas,53-(723)559-5803,VP Sales,6257773652,"Hamill, Okuneva and Hettinger"
-Rozelle,Ivanchenkov,rivanchenkovb7@moonfruit.com,rivanchenkovb7,Paris 12,33-(806)491-2642,Nuclear Power Engineer,8868636387,Mante-Wolf
-Kai,Orr,korrb8@cisco.com,korrb8,Osby,46-(498)794-8561,Sales Associate,3395375684,Lemke-Bednar
-Collie,Yakunin,cyakuninb9@edublogs.org,cyakuninb9,Nanpu,86-(352)102-7244,Health Coach I,6101887901,Medhurst-Langosh
-Fae,Cahill,fcahillba@reuters.com,fcahillba,Krzeszów,48-(622)530-7313,Food Chemist,6503968477,"Friesen, Sanford and Mayer"
-Cyndie,Aslet,casletbb@scientificamerican.com,casletbb,Saint-Constant,1-(771)528-2913,Cost Accountant,4843499684,"Hamill, Sauer and Torphy"
-Patrizius,Twyford,ptwyfordbc@weather.com,ptwyfordbc,Lagoa,351-(291)253-5463,Business Systems Development Analyst,0994297475,Mosciski Inc
-Mattias,Streight,mstreightbd@yahoo.co.jp,mstreightbd,Skutskär,46-(177)125-2012,Actuary,5440187510,"Farrell, Sanford and Corkery"
-Carlene,Vanni,cvannibe@themeforest.net,cvannibe,Mahates,57-(796)357-4709,Food Chemist,2337222705,Roob Inc
-Ron,Durrance,rdurrancebf@wp.com,rdurrancebf,Mapalacsiao,63-(369)788-7340,Analyst Programmer,5457066193,Mitchell LLC
-Carina,Edwardes,cedwardesbg@mapquest.com,cedwardesbg,Valinhos,55-(577)612-0116,Recruiting Manager,5227826919,Mosciski Inc
-Maddalena,Salerg,msalergbh@umich.edu,msalergbh,Novopodrezkovo,7-(697)647-8581,Health Coach I,1557006229,Brekke Group
-Philippe,Packington,ppackingtonbi@hp.com,ppackingtonbi,Wenshao,86-(707)622-9285,Accounting Assistant II,6329239517,Pacocha-Blick
-Izzy,Nias,iniasbj@soundcloud.com,iniasbj,Miami,1-(786)311-2515,Help Desk Operator,1152831127,"Block, Altenwerth and Stanton"
-Merwin,Parsell,mparsellbk@nba.com,mparsellbk,Gayny,7-(547)203-8806,Staff Scientist,7479993129,"Reinger, Quitzon and Vandervort"
-Jessi,Dunkerly,jdunkerlybl@umn.edu,jdunkerlybl,Gaizhou,86-(909)634-5462,Recruiter,2986553141,"O'Reilly, Dicki and Hahn"
-Eldon,Farndon,efarndonbm@aboutads.info,efarndonbm,Wolbrom,48-(909)281-4054,Speech Pathologist,5184371176,"Emmerich, Lehner and Yundt"
-Oates,Elham,oelhambn@mozilla.com,oelhambn,Grand Bank,1-(194)436-8497,Desktop Support Technician,1596660937,"Wehner, Abbott and O'Connell"
-Fanechka,Whyler,fwhylerbo@adobe.com,fwhylerbo,Matelândia,55-(892)769-4322,Biostatistician IV,7668303200,"Donnelly, Gerhold and Schaefer"
-Huntington,Fernant,hfernantbp@ask.com,hfernantbp,Karabas,7-(750)276-8060,Senior Developer,1332953263,Pfeffer-Hills
-Gregorius,St. Ledger,gstledgerbq@wp.com,gstledgerbq,Vlycháda,30-(743)197-1226,Software Test Engineer III,0656158816,Schaden and Sons
-Cheri,Sainteau,csainteaubr@blinklist.com,csainteaubr,Hengtanggang,86-(187)273-0898,Data Coordiator,5175657151,"Larkin, Weber and Heathcote"
-Christophorus,Poone,cpoonebs@amazonaws.com,cpoonebs,Were Īlu,251-(931)591-8988,Analyst Programmer,8910813008,Flatley and Sons
-Waite,Castelletto,wcastellettobt@adobe.com,wcastellettobt,Cajamarca,57-(693)677-0164,VP Quality Control,1291883037,Rohan-Goodwin
-Garth,Legion,glegionbu@mozilla.com,glegionbu,Heihe,86-(941)380-5673,Human Resources Manager,2515034527,"Nitzsche, Pfeffer and Braun"
-Esta,Kerwin,ekerwinbv@networkadvertising.org,ekerwinbv,Mirpur Khas,92-(117)950-2082,Project Manager,8928828589,Glover Inc
-Chloris,Beare,cbearebw@hhs.gov,cbearebw,Willowmore,27-(985)824-0594,Desktop Support Technician,8563826506,Feil-Reichel
-Randell,Cancellieri,rcancellieribx@prnewswire.com,rcancellieribx,Bekwai,233-(905)301-0573,Human Resources Assistant I,0730372995,Kutch Inc
-Kip,Ramsdale,kramsdaleby@arstechnica.com,kramsdaleby,Somerset East,27-(218)205-0925,Senior Quality Engineer,0802215807,Stehr and Sons
-Codi,Sutherley,csutherleybz@163.com,csutherleybz,Monaghan,353-(394)919-0981,Account Representative I,6776632693,Stroman and Sons
-Ichabod,Softley,isoftleyc0@networksolutions.com,isoftleyc0,Gorshechnoye,7-(857)425-7927,Junior Executive,0503472247,"Huel, Kunze and Grant"
-Darnall,Menicomb,dmenicombc1@dyndns.org,dmenicombc1,Pisão,351-(603)152-7936,Nuclear Power Engineer,0704521695,"Jenkins, Bins and Bosco"
-Hermie,Tripony,htriponyc2@state.tx.us,htriponyc2,Dahe,86-(695)324-3438,Staff Scientist,1453231722,Sauer Group
-Rouvin,Brahms,rbrahmsc3@flickr.com,rbrahmsc3,Hyesan-dong,850-(373)849-6582,Speech Pathologist,1399653598,"Schumm, Willms and Kovacek"
-Eva,Ausiello,eausielloc4@ted.com,eausielloc4,Las Flores,52-(522)676-7887,VP Product Management,2984517733,Doyle-Hackett
-Homerus,Benz,hbenzc5@scribd.com,hbenzc5,Karangboyo,62-(463)880-8699,Geological Engineer,9502247396,Pacocha-Rath
-Orelia,Cardoo,ocardooc6@theatlantic.com,ocardooc6,Huai Mek,66-(562)635-6374,Administrative Officer,2407522354,Sawayn LLC
-Andy,Whyke,awhykec7@marketwatch.com,awhykec7,Melaka,60-(619)443-9740,Cost Accountant,7266501369,Stiedemann Group
-Wendell,Charlot,wcharlotc8@weibo.com,wcharlotc8,Shanmu,86-(399)817-3579,Legal Assistant,1929334834,Hudson and Sons
-Zaria,Rickert,zrickertc9@phoca.cz,zrickertc9,Sukamulya,62-(489)801-0441,Actuary,6151868455,McClure-Cormier
-Liane,Bugbird,lbugbirdca@soup.io,lbugbirdca,Jiuchenggong,86-(742)484-7736,Director of Sales,5015471092,Dickinson Group
-Hailee,Jackalin,hjackalincb@t.co,hjackalincb,Baziqiao,86-(348)628-0372,Engineer I,9824969918,"Schuster, Balistreri and Kiehn"
-Sarina,Gretton,sgrettoncc@youtu.be,sgrettoncc,Kafr ash Shaykh,20-(570)759-6531,Programmer III,0761625356,Ruecker-Cronin
-Nedi,Raiman,nraimancd@dailymotion.com,nraimancd,Pohang,82-(100)445-2527,Geologist II,5896756089,Ratke Inc
-Flossie,O'Keenan,fokeenance@shutterfly.com,fokeenance,Ryjewo,48-(120)425-5167,Software Consultant,4109493390,"Macejkovic, Ziemann and Medhurst"
-Cosette,Bodiam,cbodiamcf@apple.com,cbodiamcf,Falkenberg,46-(660)179-8368,Administrative Officer,1051595991,"Jast, Johnson and Eichmann"
-Wylma,Risbridger,wrisbridgercg@infoseek.co.jp,wrisbridgercg,Villa Paula de Sarmiento,54-(727)419-0510,Nurse,7423041831,"Kuphal, Lind and Smith"
-Anabal,Shuard,ashuardch@hexun.com,ashuardch,Nglojo,62-(150)961-7237,Business Systems Development Analyst,4136441134,"Lemke, Walter and Torp"
-Bill,Bortoluzzi,bbortoluzzici@drupal.org,bbortoluzzici,São Miguel da Carreira,351-(302)874-8797,Payment Adjustment Coordinator,4539837109,Trantow Group
-Arlena,Rosenbarg,arosenbargcj@com.com,arosenbargcj,Ingarö,46-(337)343-6677,Teacher,7371988523,McDermott-Pollich
-Kaye,Olsson,kolssonck@sciencedaily.com,kolssonck,Shawan,86-(420)204-5708,Sales Representative,7882023620,"Willms, Maggio and Ebert"
-Brady,Esmead,besmeadcl@cbsnews.com,besmeadcl,Dhahi,967-(539)198-8938,Senior Financial Analyst,3305446706,"Senger, Rau and White"
-Beulah,De Cruz,bdecruzcm@shareasale.com,bdecruzcm,Menghe,86-(695)441-1949,Budget/Accounting Analyst I,1010118013,"Stoltenberg, Gaylord and Kuhn"
-Hart,Pignon,hpignoncn@so-net.ne.jp,hpignoncn,Xishan,86-(796)134-7259,Senior Sales Associate,3487451824,Eichmann LLC
-Gaultiero,Yapp,gyappco@gov.uk,gyappco,Silveiros,351-(968)335-1115,Editor,8432845973,Torphy-Pfeffer
-Leonora,Camier,lcamiercp@i2i.jp,lcamiercp,Niebylec,48-(837)941-0248,Payment Adjustment Coordinator,3362041817,Tremblay-Bogan
-Elsy,Barhem,ebarhemcq@howstuffworks.com,ebarhemcq,Baimi,86-(478)746-4408,Geologist III,3636465074,"Kling, Rempel and Schuppe"
-Ludovika,Freemantle,lfreemantlecr@biblegateway.com,lfreemantlecr,Saint Catherine,20-(525)822-1176,Computer Systems Analyst IV,2508567590,Bartell Group
-Niki,Bartoszewski,nbartoszewskics@geocities.jp,nbartoszewskics,Toyós,504-(285)333-3663,VP Product Management,8170495997,"Labadie, Schuster and Bailey"
-Jasper,Scardifield,jscardifieldct@wordpress.org,jscardifieldct,Botoh,62-(908)487-6165,Mechanical Systems Engineer,4706641020,"Lindgren, Miller and Reilly"
-Blondie,Korda,bkordacu@jimdo.com,bkordacu,Sayama,81-(550)261-8768,Safety Technician II,3613863448,"Beier, Hodkiewicz and Labadie"
-Mari,Wildey,mwildeycv@earthlink.net,mwildeycv,Las Vegas,1-(702)780-0013,Community Outreach Specialist,6081899675,Ritchie Group
-Rania,Caulier,rcauliercw@google.es,rcauliercw,Hongqiao,86-(135)941-5093,Recruiting Manager,9767170790,Sipes Group
-Carmita,Balk,cbalkcx@nydailynews.com,cbalkcx,Radenković,381-(489)896-5035,Assistant Media Planner,3192007451,Rau Group
-Raye,Rodwell,rrodwellcy@redcross.org,rrodwellcy,Ibusuki,81-(371)210-6897,Programmer IV,7817437106,Halvorson-Considine
-Jeanelle,Gaunt,jgauntcz@chicagotribune.com,jgauntcz,Guajará Mirim,55-(942)383-5866,Environmental Tech,5293445545,"Cummings, Rohan and Olson"
-Marten,Achromov,machromovd0@google.com.br,machromovd0,Carapicuíba,55-(150)839-0871,Professor,5673414536,Grady and Sons
-Zebadiah,Ashton,zashtond1@aboutads.info,zashtond1,Liangwangzhuang,86-(533)605-8366,Assistant Media Planner,5660743293,O'Kon Inc
-Nikolos,Rominov,nrominovd2@livejournal.com,nrominovd2,Wulingyuan,86-(988)701-4303,Administrative Officer,9339583396,McCullough Group
-Abel,Brockley,abrockleyd3@usgs.gov,abrockleyd3,Cortiços,351-(655)931-9613,Computer Systems Analyst IV,4253152929,Schiller Group
-Flss,Totaro,ftotarod4@slashdot.org,ftotarod4,Kolaka,62-(103)182-1362,Chief Design Engineer,1468159798,Bruen-Torp
-Shaine,Tellenbach,stellenbachd5@pen.io,stellenbachd5,Gllogjan,383-(183)169-1139,VP Quality Control,5580264399,"Conroy, Bradtke and Huel"
-Vanni,Zuanazzi,vzuanazzid6@sitemeter.com,vzuanazzid6,Astypálaia,30-(580)574-2168,Account Representative I,9464258799,Lakin LLC
-Courtney,Dimitrie,cdimitried7@google.co.uk,cdimitried7,Houmt Souk,216-(733)765-8980,Associate Professor,1685573266,Paucek LLC
-Cymbre,Footitt,cfootittd8@tiny.cc,cfootittd8,Leuwayang,62-(318)778-1877,VP Quality Control,3946614353,Hermann and Sons
-Kaye,Jessope,kjessoped9@flavors.me,kjessoped9,Kalety,48-(845)480-1707,Senior Quality Engineer,3355884294,"Cremin, Olson and Sawayn"
-Cornie,Limmer,climmerda@state.tx.us,climmerda,Guisser,212-(384)879-2239,Automation Specialist III,7826225280,Balistreri-Wiegand
-Brenden,Verma,bvermadb@disqus.com,bvermadb,Sulengwaseng,62-(138)357-9869,Web Designer I,6172390155,"Waters, Streich and Abbott"
-Lem,Benedikt,lbenediktdc@wunderground.com,lbenediktdc,Katoro,255-(482)187-5657,Engineer IV,0497224445,"Little, Mohr and Wilderman"
-Lowell,Sichardt,lsichardtdd@globo.com,lsichardtdd,Camachile,63-(706)673-3182,Biostatistician I,2575941288,"Lemke, Lesch and Leannon"
-Reine,Delgardillo,rdelgardillode@microsoft.com,rdelgardillode,Neob,62-(936)764-5075,Desktop Support Technician,1513506838,Spencer LLC
-Thane,Sarchwell,tsarchwelldf@instagram.com,tsarchwelldf,Porto Seguro,55-(660)356-9567,Human Resources Manager,3527153179,Runolfsdottir-Cartwright
-Danika,Elnor,delnordg@state.tx.us,delnordg,Niimi,81-(547)958-0387,Senior Developer,5050722578,Parisian-Towne
-Gasparo,Stranio,gstraniodh@diigo.com,gstraniodh,Lezhu,86-(206)787-4960,Financial Analyst,4348687307,Goldner-Schmitt
-Garnette,Calyton,gcalytondi@vimeo.com,gcalytondi,Karang,62-(950)627-5151,Human Resources Manager,0641236301,Prosacco-Ankunding
-Justinn,Feakins,jfeakinsdj@mozilla.org,jfeakinsdj,Kalampáka,30-(795)552-9647,Engineer IV,8626479360,Nolan LLC
-Linoel,Kibard,lkibarddk@bravesites.com,lkibarddk,Langpas,63-(644)213-0258,Database Administrator III,3377644679,Langworth-Veum
-Gan,Lowde,glowdedl@issuu.com,glowdedl,Henan’an,86-(900)591-4847,Actuary,1207495840,"Pagac, White and Stroman"
-Fleurette,Wolland,fwollanddm@dagondesign.com,fwollanddm,Vellinge,46-(300)800-9559,Structural Analysis Engineer,0953978931,Kirlin-Kozey
-Wye,Duplan,wduplandn@qq.com,wduplandn,Ponong,63-(313)355-0869,Project Manager,5336314064,Shanahan-Bradtke
-Benn,Mayo,bmayodo@oracle.com,bmayodo,Valdivia,56-(963)663-9803,Biostatistician IV,8306385837,Gaylord LLC
-Benedict,Mannock,bmannockdp@techcrunch.com,bmannockdp,Adorjan,381-(876)163-1457,Account Coordinator,5751702727,"Ernser, Runte and Keebler"
-Eloise,Cleverly,ecleverlydq@4shared.com,ecleverlydq,Colima,506-(165)753-5527,Technical Writer,3792802872,Muller Inc
-Francesco,Egalton,fegaltondr@woothemes.com,fegaltondr,Taboão da Serra,55-(809)764-2655,Civil Engineer,5044892408,"Crist, Davis and Hirthe"
-Jannelle,Ruddy,jruddyds@barnesandnoble.com,jruddyds,Golden,1-(272)196-2918,Assistant Media Planner,1533733090,Tromp-Emard
-Dill,Raubenheimers,draubenheimersdt@state.tx.us,draubenheimersdt,Koumac,687-(276)528-4767,Engineer IV,0221672184,"Cole, Stamm and Lynch"
-Norine,Sex,nsexdu@angelfire.com,nsexdu,Saint-Eustache,1-(297)748-3708,Nuclear Power Engineer,8545476949,Tromp LLC
-Fernandina,Loraine,florainedv@zdnet.com,florainedv,Pojok,62-(678)818-1034,Operator,5968941170,Stark and Sons
-Lincoln,Headly,lheadlydw@pinterest.com,lheadlydw,Rukem,62-(721)761-5670,Desktop Support Technician,1353588335,Mohr Group
-Sibylle,Duplan,sduplandx@cloudflare.com,sduplandx,Saronída,30-(898)200-2504,Engineer II,1318020735,Nitzsche Inc
-Durante,Plews,dplewsdy@engadget.com,dplewsdy,Quintela,351-(400)772-1387,Editor,2706273801,Jerde-Johnson
-Simmonds,Weadick,sweadickdz@bbb.org,sweadickdz,Clisson,33-(449)808-9903,Statistician II,1395682046,Koss and Sons
-Jinny,Southcoat,jsouthcoate0@imgur.com,jsouthcoate0,Kontiolahti,358-(307)727-1150,Director of Sales,8612730686,Glover Group
-Tobias,Jedrys,tjedryse1@nifty.com,tjedryse1,Coalaque,51-(352)815-4498,Assistant Media Planner,3241037983,"Daugherty, Lowe and MacGyver"
-Lyndsey,Beasant,lbeasante2@usgs.gov,lbeasante2,Quiñota,51-(893)499-0636,Civil Engineer,1638165475,"Bosco, Farrell and Kuvalis"
-Morganica,Insole,minsolee3@bloglines.com,minsolee3,Alarobia,261-(772)192-7435,Software Consultant,8608912546,"Hodkiewicz, Dare and Treutel"
-Terza,Sangster,tsangstere4@sourceforge.net,tsangstere4,Jagistay,86-(384)596-5400,Editor,8754711339,"Gleason, Luettgen and Dietrich"
-Russell,Crewther,rcrewthere5@webs.com,rcrewthere5,Khiwa,998-(651)198-4172,Tax Accountant,0566254271,"Grimes, Koelpin and Koepp"
-Lizabeth,Edmeads,ledmeadse6@facebook.com,ledmeadse6,Tsinandali,995-(180)383-8027,Budget/Accounting Analyst I,9980383631,Bode LLC
-Karee,O'Feeny,kofeenye7@microsoft.com,kofeenye7,Berezayka,7-(584)773-4095,Senior Sales Associate,2984805720,"Kirlin, Bosco and Jaskolski"
-Adelbert,Ahrenius,aahreniuse8@businessweek.com,aahreniuse8,Trollhättan,46-(560)840-1787,Accountant II,6318469885,Grimes-Rippin
-Imogene,Ahern,iaherne9@biblegateway.com,iaherne9,Binalbagan,63-(324)343-0387,Senior Cost Accountant,5597923358,"Kemmer, Wyman and Borer"
-Bethanne,Olrenshaw,bolrenshawea@feedburner.com,bolrenshawea,Veiga,351-(737)841-1999,Marketing Manager,6637045683,Stiedemann-Nader
-Morey,Rabjohns,mrabjohnseb@google.ru,mrabjohnseb,Buang,63-(598)261-6461,Analog Circuit Design manager,4124185693,Champlin LLC
-Bert,Shiel,bshielec@examiner.com,bshielec,Pignon,509-(674)488-9175,Programmer Analyst II,7670176377,Frami-Senger
-Justinian,Worters,jwortersed@hp.com,jwortersed,Shanjeev Home,94-(667)505-1821,Pharmacist,0380071401,Schmitt LLC
-Isabeau,Bumpus,ibumpusee@reverbnation.com,ibumpusee,Åkersberga,46-(384)641-5637,Structural Engineer,3748433670,Casper Inc
-Saunderson,Fucher,sfucheref@wikia.com,sfucheref,Tianchi,86-(579)480-2053,VP Marketing,1518810926,Grimes-Harber
-Bernard,Nanni,bnannieg@taobao.com,bnannieg,Smimou,212-(309)174-5946,Nurse Practicioner,2559240513,Mueller-Kuhic
-Vivie,Deerness,vdeernesseh@bbc.co.uk,vdeernesseh,Puerta de Corral Quemado,54-(623)114-6422,Systems Administrator I,6638453319,Crona LLC
-Lyn,Portinari,lportinariei@wix.com,lportinariei,Amqui,1-(265)894-9823,Design Engineer,6404381532,Krajcik LLC
-Netta,Tubble,ntubbleej@wikispaces.com,ntubbleej,Lentisqueira,351-(888)721-3359,Sales Associate,7584772129,"Fay, Smith and Boyle"
-Kerrill,Coultous,kcoultousek@gizmodo.com,kcoultousek,Ḩarf al Musaytirah,963-(663)978-3503,Statistician III,2943721670,Haley-Eichmann
-Linzy,Yglesias,lyglesiasel@bizjournals.com,lyglesiasel,Anse Boileau,248-(902)643-6897,Operator,2871357994,"Abernathy, Schuppe and Nienow"
-Allison,Harden,ahardenem@jiathis.com,ahardenem,Cishangang,86-(457)230-2552,Research Associate,0614061776,Barrows Group
-Carlos,Freemantle,cfreemantleen@techcrunch.com,cfreemantleen,Ylämaa,358-(714)766-2393,Professor,6268473329,Leuschke LLC
-Annice,Roubottom,aroubottomeo@google.ca,aroubottomeo,Herceg-Novi,382-(172)374-0117,Help Desk Operator,3869023244,Herman and Sons
-Madeleine,Joincey,mjoinceyep@businesswire.com,mjoinceyep,Mělník,420-(175)226-2829,Programmer II,3947098820,Osinski Inc
-Berke,Rojas,brojaseq@webeden.co.uk,brojaseq,Oemollo,62-(656)492-8444,Analyst Programmer,3830440014,"Goyette, Farrell and Gleason"
-Samuele,Tassaker,stassakerer@github.io,stassakerer,Vyksa,7-(544)516-7710,Media Manager III,5627912308,Howe Inc
-Edy,Makeswell,emakeswelles@mapquest.com,emakeswelles,København,45-(567)897-5052,VP Sales,1349041246,Schultz and Sons
-Zebulen,Lukovic,zlukovicet@independent.co.uk,zlukovicet,Garawati,62-(251)559-0462,General Manager,0684692104,Emard Group
-Robby,Walles,rwalleseu@deliciousdays.com,rwalleseu,Dongfeng,86-(344)516-7422,Account Executive,1069939455,Klein and Sons
-Priscilla,Rowthorn,prowthornev@yellowpages.com,prowthornev,Chodów,48-(766)379-8879,Developer I,2612438270,Cassin Group
-Rutger,Heynen,rheynenew@ed.gov,rheynenew,Barbaza,63-(998)385-4724,Geological Engineer,0716980800,Conn Group
-Silvano,Oloman,solomanex@who.int,solomanex,Wenping,86-(729)929-2019,Executive Secretary,6206962660,"Becker, Waelchi and Rowe"
-Costanza,Flaune,cflauneey@ameblo.jp,cflauneey,Lianyun,86-(703)407-6420,Project Manager,8356088984,Runolfsdottir-Glover
-Bronson,Espine,bespineez@ucla.edu,bespineez,Longonjo,244-(866)340-1198,Programmer IV,9275318654,"Langworth, Stracke and Littel"
-Tessy,Warman,twarmanf0@un.org,twarmanf0,Kuala Terengganu,60-(979)185-5701,Structural Analysis Engineer,7047075690,O'Kon Group
-Dewain,Gravestone,dgravestonef1@noaa.gov,dgravestonef1,Ludvika,46-(235)721-0297,Analog Circuit Design manager,0691001715,Nolan Inc
-Rourke,Denty,rdentyf2@naver.com,rdentyf2,Molinos,51-(784)178-5510,Community Outreach Specialist,7734182216,Bartoletti-Durgan
-Carmela,Say,csayf3@salon.com,csayf3,Zubtsov,7-(534)684-8554,Junior Executive,9517395299,"Rosenbaum, Jenkins and Zboncak"
-Hurleigh,Strongitharm,hstrongitharmf4@google.com,hstrongitharmf4,Tver,7-(506)278-6475,Analyst Programmer,6615367807,Simonis-Swift
-Bondon,Lambregts,blambregtsf5@g.co,blambregtsf5,Xingzhen,86-(440)798-6899,Staff Accountant II,4751010697,Okuneva-Kuhn
-Isiahi,Beard,ibeardf6@wired.com,ibeardf6,Zhavoronki,7-(974)299-4320,Tax Accountant,2230870122,"Wiza, Pfannerstill and Hyatt"
-Remy,Rzehorz,rrzehorzf7@pcworld.com,rrzehorzf7,Ketanggi,62-(750)848-8321,Research Assistant IV,1606199781,"Hegmann, Yundt and Schoen"
-Charles,Vivash,cvivashf8@livejournal.com,cvivashf8,Hantai,86-(114)123-5243,VP Sales,5008348752,Langworth and Sons
-Angel,Coda,acodaf9@webs.com,acodaf9,Hexi,86-(364)879-7511,Programmer III,1157097758,"O'Conner, Bartell and O'Reilly"
-Althea,Threader,athreaderfa@blogger.com,athreaderfa,Sviblovo,7-(521)978-2163,Financial Analyst,0343346095,"Barton, Kling and Ullrich"
-Auberta,MacKeever,amackeeverfb@com.com,amackeeverfb,Taldyqorghan,7-(663)142-7914,Administrative Officer,0191723436,Kertzmann LLC
-Jerrie,Reucastle,jreucastlefc@eepurl.com,jreucastlefc,Ondoy,63-(160)870-2513,Biostatistician IV,2763802451,Koelpin Group
-Maible,Youll,myoullfd@soup.io,myoullfd,Alivéri,30-(400)482-8650,Computer Systems Analyst IV,2572163950,Abshire Inc
-Donica,Hamments,dhammentsfe@xrea.com,dhammentsfe,Nida,370-(354)730-7273,Biostatistician II,5210866432,Windler Group
-Miquela,Worman,mwormanff@shareasale.com,mwormanff,Foso,233-(566)694-7353,Dental Hygienist,3549652224,Reichel-Zieme
-Uriah,Surcomb,usurcombfg@blogger.com,usurcombfg,La Soledad,52-(603)246-8965,Accounting Assistant III,1599078163,"Sipes, Nader and Keeling"
-Roddie,Esilmon,resilmonfh@ehow.com,resilmonfh,Palestina,57-(708)985-3162,Electrical Engineer,0363630694,O'Hara LLC
-Corinna,Geffen,cgeffenfi@usnews.com,cgeffenfi,Jastrowie,48-(332)296-1446,Budget/Accounting Analyst II,5462938233,Dickens and Sons
-Gonzales,Muckloe,gmuckloefj@cornell.edu,gmuckloefj,Fatumuti,62-(643)699-2477,Geologist II,7192127329,Marquardt Group
-Sharon,Chidwick,schidwickfk@unc.edu,schidwickfk,Foxton,64-(588)279-0414,Biostatistician IV,3192402563,Reynolds Inc
-Vern,LeEstut,vleestutfl@abc.net.au,vleestutfl,Las Palmas,52-(921)609-1168,Senior Financial Analyst,5113676810,Marvin and Sons
-Bob,Hof,bhoffm@theglobeandmail.com,bhoffm,Rama,505-(907)179-2015,Geological Engineer,0120147319,"Willms, Kling and Hand"
-Nobie,Gerbl,ngerblfn@cbc.ca,ngerblfn,Daugavgrīva,371-(698)955-4899,Desktop Support Technician,9420600106,Bahringer and Sons
-Antons,Exrol,aexrolfo@china.com.cn,aexrolfo,Shizuishan,86-(784)172-4409,Help Desk Operator,8368132096,Ferry-Conn
-Wye,Hayward,whaywardfp@phoca.cz,whaywardfp,Espinal,57-(245)501-5469,Accountant IV,2488307750,Hammes-Lubowitz
-Son,Falconer-Taylor,sfalconertaylorfq@github.io,sfalconertaylorfq,‘Amrān,967-(212)195-4767,Product Engineer,6404706520,McDermott-Ledner
-Pavlov,Reek,preekfr@typepad.com,preekfr,Thị Trấn Thất Khê,84-(333)510-3759,Desktop Support Technician,9682249406,"Ruecker, Lowe and Maggio"
-Amabel,Iannazzi,aiannazzifs@shop-pro.jp,aiannazzifs,Karangpari,62-(156)856-7713,Environmental Tech,0594104572,Hodkiewicz Inc
-Anselm,Pickworth,apickworthft@earthlink.net,apickworthft,Kukës,355-(384)728-4155,Professor,6571348071,Rowe Group
-Hildegarde,Gleder,hglederfu@vistaprint.com,hglederfu,Pancheng,86-(840)213-5262,Geological Engineer,0195510852,Carroll Inc
-Benita,Marvell,bmarvellfv@tripadvisor.com,bmarvellfv,Malakwāl,92-(801)819-9067,Account Coordinator,3394329107,Bernier and Sons
-Willdon,Stanlack,wstanlackfw@ucoz.ru,wstanlackfw,Trảng Bàng,84-(463)410-2718,Project Manager,6933652521,"Labadie, Lehner and Gusikowski"
-Almira,Bartens,abartensfx@who.int,abartensfx,Lac-Brome,1-(112)440-7909,VP Accounting,1810818982,"Hilll, Hane and Langworth"
-Berenice,Broschke,bbroschkefy@about.me,bbroschkefy,Na Di,66-(281)869-0575,Senior Cost Accountant,2630118150,Schaden-Schaden
-Melony,Rosenfelt,mrosenfeltfz@nih.gov,mrosenfeltfz,Huitang,86-(373)267-4793,Food Chemist,1356491731,"Langosh, Altenwerth and Johnson"
-Matias,Casaccia,mcasacciag0@t.co,mcasacciag0,Astghadzor,374-(558)741-2748,Librarian,6078806653,Gulgowski and Sons
-Godfrey,Dorran,gdorrang1@gnu.org,gdorrang1,Longde Chengguanzhen,86-(621)856-4764,Programmer III,5779767149,"Bosco, Moen and Bosco"
-Ynes,Gonin,ygoning2@huffingtonpost.com,ygoning2,Jacksonville,1-(904)987-7870,Human Resources Assistant III,8997890921,Purdy Inc
-Erasmus,Catterick,ecatterickg3@mozilla.com,ecatterickg3,Shanghu,86-(554)629-1624,Senior Financial Analyst,1930579853,Rohan-Romaguera
-Alfred,Pickton,apicktong4@mapquest.com,apicktong4,Sŭedinenie,359-(979)995-4685,Professor,0814432573,Hayes-Windler
-Stacia,Mordy,smordyg5@apple.com,smordyg5,Springfield,1-(217)733-3909,VP Sales,4240850924,Beier-Wisozk
-Kimberli,Keymer,kkeymerg6@tuttocitta.it,kkeymerg6,Borås,46-(203)476-9733,Paralegal,1853533335,"Fahey, Hudson and Jones"
-Vivienne,McGeoch,vmcgeochg7@chron.com,vmcgeochg7,Campraksanta,62-(302)790-3621,VP Product Management,2746698242,"Kassulke, Wilderman and Kassulke"
-Ezmeralda,Gutteridge,egutteridgeg8@moonfruit.com,egutteridgeg8,Motema,232-(245)252-3308,Chief Design Engineer,4899196601,Graham-Emard
-Beitris,Andino,bandinog9@disqus.com,bandinog9,Brailiv,380-(777)219-2795,Senior Cost Accountant,9458256909,Mosciski Group
-Maury,Bonick,mbonickga@comcast.net,mbonickga,Ubrub,62-(119)279-1772,Recruiting Manager,5647159451,"D'Amore, Nitzsche and Leffler"
-Verene,Leatherland,vleatherlandgb@miitbeian.gov.cn,vleatherlandgb,Jaroměřice nad Rokytnou,420-(156)711-3140,Internal Auditor,3971930999,"Pollich, Turner and Bergstrom"
-Hewett,Dent,hdentgc@tripod.com,hdentgc,Gaoyi,86-(921)190-0405,Administrative Assistant III,4114980911,Marks and Sons
-Rozina,Seeds,rseedsgd@ox.ac.uk,rseedsgd,Nàng Mau,84-(207)987-9555,Administrative Officer,5612798245,"Nicolas, Schamberger and Stoltenberg"
-Emmalee,Billany,ebillanyge@elegantthemes.com,ebillanyge,Santo André,351-(578)791-9024,Account Executive,3066103560,Howe-Kuphal
-Jeniffer,Salan,jsalangf@devhub.com,jsalangf,Sete Lagoas,55-(474)631-1789,Marketing Manager,1699081859,Schaden-Fadel
-Welbie,Palmby,wpalmbygg@nymag.com,wpalmbygg,Payaman,62-(397)816-2725,Programmer Analyst II,9993174750,Price Group
-Ossie,Machans,omachansgh@bravesites.com,omachansgh,Libas,63-(840)761-5683,Nuclear Power Engineer,1326272306,Sanford-Wolf
-Cristobal,Binne,cbinnegi@jiathis.com,cbinnegi,Arcoverde,55-(521)304-2880,Desktop Support Technician,7531238543,McLaughlin-Stracke
-Annissa,McLice,amclicegj@tinypic.com,amclicegj,Selce,389-(892)609-3070,Recruiting Manager,4860531817,"Swift, Koelpin and Mohr"
-Kalle,Betty,kbettygk@earthlink.net,kbettygk,Yasenskaya,7-(832)933-4153,Executive Secretary,7077128954,Hartmann-Rempel
-Sinclair,Cattrall,scattrallgl@aol.com,scattrallgl,Ipuh,62-(543)627-2201,Quality Engineer,8290193610,Dicki-Prohaska
-Laure,Meatcher,lmeatchergm@bizjournals.com,lmeatchergm,Tarsouat,212-(795)252-4345,Chief Design Engineer,5305354692,"Farrell, Morissette and Armstrong"
-Jacquelyn,Kidman,jkidmangn@youku.com,jkidmangn,Bwizibwera,256-(558)763-0287,Design Engineer,3633113959,Mann-Goyette
-Marcos,Boulger,mboulgergo@nbcnews.com,mboulgergo,Kalinkavichy,375-(595)296-8756,Environmental Specialist,2167764766,"Parisian, Abernathy and Jakubowski"
-Conchita,Brunnstein,cbrunnsteingp@nsw.gov.au,cbrunnsteingp,Iturama,55-(102)637-6336,Help Desk Operator,1423412257,"Kovacek, Pfeffer and Carter"
-Moyra,Metcalfe,mmetcalfegq@facebook.com,mmetcalfegq,Huangmao,86-(656)348-7372,Professor,7600769646,"Sipes, Pollich and Maggio"
-Nikolia,Eastope,neastopegr@1688.com,neastopegr,Viçosa,55-(184)114-8152,Nuclear Power Engineer,4776960494,"Lemke, Mayer and Fisher"
-Gabey,Charteris,gcharterisgs@hugedomains.com,gcharterisgs,Sidi Yahya Ou Saad,212-(198)542-6078,VP Accounting,3560342406,Renner and Sons
-Kirbie,Claxton,kclaxtongt@php.net,kclaxtongt,Gualán,502-(814)325-5193,Nurse,2826332090,Kiehn Group
-Hinze,Snoddin,hsnoddingu@google.pl,hsnoddingu,Kastélli,30-(288)788-8171,Web Developer I,6651023586,"Padberg, Runolfsson and Torphy"
-Costa,Rix,crixgv@taobao.com,crixgv,Pueblo Nuevo,504-(962)252-2773,Assistant Professor,8691814632,Cartwright Group
-Abdul,Doodney,adoodneygw@icq.com,adoodneygw,San Esteban,63-(872)929-4757,Senior Financial Analyst,5370482837,"Strosin, Runolfsson and Steuber"
-Martyn,Stanyland,mstanylandgx@moonfruit.com,mstanylandgx,Folques,351-(942)195-7146,Geological Engineer,9248462006,"Rice, Connelly and Murray"
-Erda,Shewring,eshewringgy@php.net,eshewringgy,Gostivar,389-(117)756-5444,Paralegal,1798073269,Schamberger-Luettgen
-Kerry,Yeaman,kyeamangz@elpais.com,kyeamangz,Gongju,82-(786)382-2951,Marketing Assistant,4905126673,"Schulist, Fadel and Emard"
-Shirley,Wholesworth,swholesworthh0@opensource.org,swholesworthh0,Abuko,220-(724)675-0904,Software Consultant,0321418409,Heller and Sons
-Ennis,Abrahmovici,eabrahmovicih1@wiley.com,eabrahmovicih1,Bambas,51-(472)197-9673,Developer IV,8962080176,Considine-Gibson
-Sharla,Sutherley,ssutherleyh2@behance.net,ssutherleyh2,Tabuadelo,351-(811)635-6156,VP Quality Control,6808874077,Runolfsdottir LLC
-Gunther,Brandsen,gbrandsenh3@i2i.jp,gbrandsenh3,Buayan,63-(375)213-4457,Paralegal,5717407505,"Hane, Gutmann and Franecki"
-Kaylee,Enocksson,kenockssonh4@t-online.de,kenockssonh4,Qingshi,86-(192)784-2084,Environmental Specialist,2870295510,Hayes and Sons
-Peyton,Dearnaly,pdearnalyh5@storify.com,pdearnalyh5,Mulyosari,62-(688)290-2297,Speech Pathologist,4872281845,"Champlin, Miller and Mueller"
-Angelle,Kindread,akindreadh6@sciencedaily.com,akindreadh6,Gīdolē,251-(603)654-7849,Assistant Professor,0831351950,Gorczany-Hayes
-Leonerd,Lardez,llardezh7@deliciousdays.com,llardezh7,Herāt,93-(513)328-2863,Tax Accountant,7061036621,"Renner, Schamberger and Ryan"
-Louise,Veltman,lveltmanh8@elegantthemes.com,lveltmanh8,Kluki,48-(852)795-6465,General Manager,2227283882,Nolan-Labadie
-Daryle,Peacey,dpeaceyh9@answers.com,dpeaceyh9,Lenart v Slov. Goricah,386-(848)241-2826,Nuclear Power Engineer,6994450376,Weissnat Inc
-Petey,Atyeo,patyeoha@yahoo.com,patyeoha,Osa,7-(360)966-8784,Systems Administrator I,1033908479,Bartoletti Group
-Ely,Jessope,ejessopehb@issuu.com,ejessopehb,Sidoaji,62-(919)917-3443,Internal Auditor,7107889222,"Padberg, Kshlerin and Skiles"
-Susie,Wyleman,swylemanhc@feedburner.com,swylemanhc,Zaječí,420-(235)631-9169,Technical Writer,1491248297,Wisoky Inc
-Shari,Byne,sbynehd@hao123.com,sbynehd,Portela,351-(260)826-4437,Quality Control Specialist,7458232994,"Hyatt, Ward and Collier"
-Rosanna,Chasles,rchasleshe@elegantthemes.com,rchasleshe,Bombon,63-(602)353-2130,Health Coach III,1370246951,Dibbert-Wuckert
-Trista,Twydell,ttwydellhf@sfgate.com,ttwydellhf,Magdug,63-(267)213-3595,Technical Writer,3196286061,Goodwin-Walsh
-Alisun,Harvatt,aharvatthg@miibeian.gov.cn,aharvatthg,Hongcao,86-(527)384-1497,Editor,1503083594,Herzog-Koch
-Corenda,Keijser,ckeijserhh@163.com,ckeijserhh,Laguna,55-(197)776-6176,Professor,9644133080,Crooks-Bergstrom
-Osbourn,Kilmurry,okilmurryhi@icq.com,okilmurryhi,Horní Suchá,420-(955)543-1671,Analog Circuit Design manager,0179532030,Leffler-Towne
-Laurel,Standell,lstandellhj@wired.com,lstandellhj,Lysyanka,380-(164)654-2407,Research Nurse,0063563037,"Lehner, Carroll and Miller"
-Patrizius,Hayworth,phayworthhk@usgs.gov,phayworthhk,Khao Yoi,66-(417)147-7061,Research Associate,8831310038,"Lynch, Bergnaum and Breitenberg"
-Mellie,Begent,mbegenthl@time.com,mbegenthl,Longtan,86-(227)445-3953,Senior Developer,4637997372,Bernhard and Sons
-Genny,Belderfield,gbelderfieldhm@imgur.com,gbelderfieldhm,Kotaagung,62-(726)439-6434,Geological Engineer,1472967216,Lueilwitz and Sons
-Kurt,Laminman,klaminmanhn@blogspot.com,klaminmanhn,Vellinge,46-(774)244-0032,Physical Therapy Assistant,8906345453,Mertz and Sons
-Sherye,Hoff,shoffho@dyndns.org,shoffho,Jiang’an,86-(860)511-6274,Technical Writer,7175131356,"Stroman, Hermann and Boyle"
-Lauren,Burroughes,lburrougheshp@tinyurl.com,lburrougheshp,Molchanovo,7-(213)371-4675,Senior Editor,4118331314,Lockman LLC
-Arlin,Tatteshall,atatteshallhq@imdb.com,atatteshallhq,Nashville,1-(615)299-5360,Senior Quality Engineer,5243521639,"Stracke, Fadel and Emard"
-Simon,McGruar,smcgruarhr@soup.io,smcgruarhr,Koroyo,62-(952)895-9075,Analyst Programmer,4293044027,Pagac and Sons
-Butch,Spieght,bspieghths@51.la,bspieghths,Alupay,63-(195)738-7403,Senior Cost Accountant,3544033011,"Jones, Hudson and Strosin"
-Ernestus,Wayte,ewayteht@pagesperso-orange.fr,ewayteht,Tmourghout,212-(185)849-2999,Community Outreach Specialist,4620300438,"Macejkovic, Luettgen and Hilll"
-Melania,Danis,mdanishu@shinystat.com,mdanishu,Tubigan,63-(155)678-5743,Cost Accountant,0700955313,Smitham-Walter
-Fanechka,Snookes,fsnookeshv@biglobe.ne.jp,fsnookeshv,Periyiáli,30-(948)845-5272,Engineer I,8597224908,"Zieme, Mante and Stokes"
-Tasha,Perche,tperchehw@zimbio.com,tperchehw,"Coruña, A",34-(281)688-2390,Senior Developer,2704074135,"Volkman, Conn and Orn"
-Devi,Jadczak,djadczakhx@statcounter.com,djadczakhx,Carrigtwohill,353-(169)296-6030,Data Coordiator,8972860239,Ferry Group
-Giraldo,Klouz,gklouzhy@irs.gov,gklouzhy,Garešnica,385-(653)814-6119,Computer Systems Analyst IV,6329487731,Leannon-Becker
-Kania,Camacke,kcamackehz@weebly.com,kcamackehz,Dingbao,86-(241)334-0377,Structural Engineer,2689561948,Witting-Vandervort
-Arv,Neads,aneadsi0@so-net.ne.jp,aneadsi0,Ueno,81-(627)675-4358,Chemical Engineer,8213531027,Nitzsche Inc
-Buck,Dumbar,bdumbari1@techcrunch.com,bdumbari1,Tawun,62-(229)591-2099,Internal Auditor,0884547655,Mraz and Sons
-Britte,O'Downe,bodownei2@amazon.com,bodownei2,Hājīganj,880-(992)543-4663,Staff Accountant I,0305047736,Hickle-Hand
-Vinson,Guislin,vguislini3@cbc.ca,vguislini3,Cernik,385-(362)625-9868,Software Consultant,2429844117,Bosco LLC
-Clem,Foulcher,cfoulcheri4@who.int,cfoulcheri4,Kuala Lumpur,60-(583)708-9044,Design Engineer,5142570715,"Marvin, Hirthe and Buckridge"
-Marijn,Doe,mdoei5@cmu.edu,mdoei5,Stetseva,380-(786)296-7914,Business Systems Development Analyst,2327586224,Borer Group
-Franky,Harmar,fharmari6@eventbrite.com,fharmari6,Imperatriz,55-(402)985-2787,Research Nurse,2751212336,Hessel-Borer
-Melanie,Lanston,mlanstoni7@lycos.com,mlanstoni7,Kebloran,62-(547)549-5683,Environmental Tech,6385884392,Weissnat-Torphy
-Myrta,Clyburn,mclyburni8@networksolutions.com,mclyburni8,Rukunlima Bawah,62-(779)426-2396,Staff Scientist,5509025476,"McLaughlin, Osinski and Collier"
-Morley,Daunter,mdaunteri9@wordpress.com,mdaunteri9,Luebo,242-(881)386-7556,Community Outreach Specialist,5450221975,Erdman-Lang
-Sergei,McLachlan,smclachlania@mit.edu,smclachlania,Lipka,48-(694)410-6816,Dental Hygienist,4778154002,Stracke Group
-Cris,Madner,cmadnerib@t.co,cmadnerib,Cibitungmasjid,62-(256)723-0358,Account Representative IV,0864545916,Altenwerth Group
-Kare,Kusick,kkusickic@booking.com,kkusickic,Shaogongzhuang,86-(248)651-0611,Account Coordinator,9219229250,Koelpin Group
-Pepi,Gibbie,pgibbieid@tripod.com,pgibbieid,Simeykyne,380-(307)793-5872,Operator,7579392461,"Kuvalis, Fadel and Grady"
-Edgar,Howieson,ehowiesonie@princeton.edu,ehowiesonie,San Rafael,52-(867)635-2442,Mechanical Systems Engineer,4239028027,Kiehn and Sons
-Athena,Rackstraw,arackstrawif@sina.com.cn,arackstrawif,Baoquan,86-(211)673-0672,Engineer IV,9897657584,Vandervort Inc
-Caryn,McLaughlin,cmclaughlinig@example.com,cmclaughlinig,Menara,62-(517)611-9675,Media Manager II,5101719706,Baumbach and Sons
-Erminie,MacVaugh,emacvaughih@about.me,emacvaughih,Wuying,86-(982)324-4880,Sales Representative,7268375182,Jaskolski-Hodkiewicz
-Christian,O'Corhane,cocorhaneii@uiuc.edu,cocorhaneii,Lianghe,86-(280)250-8522,Professor,4233331798,Doyle-Rogahn
-Adeline,McPeice,amcpeiceij@vinaora.com,amcpeiceij,Kilifarevo,359-(467)886-3465,Assistant Professor,9912656946,Abernathy-Ritchie
-Gibby,Cable,gcableik@nydailynews.com,gcableik,Belsh,355-(430)161-7493,Compensation Analyst,4006105606,Brown and Sons
-Jaime,Kilpin,jkilpinil@ihg.com,jkilpinil,Agbor,234-(550)573-5938,Quality Control Specialist,9442626183,"Gutmann, Gutmann and Hahn"
-Melinda,Murkus,mmurkusim@telegraph.co.uk,mmurkusim,Pensacola,1-(850)183-4895,Media Manager II,1475423861,"Gutkowski, Bernhard and Hoppe"
-Aharon,Gierhard,agierhardin@jugem.jp,agierhardin,Donnybrook,353-(865)934-3131,Compensation Analyst,3658785446,"Boyle, Rogahn and Orn"
-Dulcia,Gilham,dgilhamio@slate.com,dgilhamio,Butere,254-(251)327-8937,Senior Editor,4146349249,"Sawayn, Paucek and Schroeder"
-Lyman,Juniper,ljuniperip@ft.com,ljuniperip,Hässleholm,46-(383)546-4101,Automation Specialist III,0767169050,Yost Inc
-Darbie,Fintoph,dfintophiq@lulu.com,dfintophiq,Hepu,86-(187)731-4385,Developer III,4370176271,"Schmeler, Cassin and Schoen"
-Rufus,Ollerhead,rollerheadir@berkeley.edu,rollerheadir,Ban Mai,66-(642)265-2874,Community Outreach Specialist,3832984623,"Dietrich, Rice and Reichel"
-Norby,Matthensen,nmatthensenis@google.com.au,nmatthensenis,Tranca,63-(890)438-0411,General Manager,5299514352,Morar Inc
-Burch,Boys,bboysit@time.com,bboysit,Guomaying,86-(713)916-0654,Assistant Professor,3655303270,Zboncak-Padberg
-Helge,Bexley,hbexleyiu@dedecms.com,hbexleyiu,Beiwenquan,86-(409)408-7860,Administrative Officer,8185761264,"Bergstrom, Wisozk and Runolfsson"
-Michelle,Sommerlin,msommerliniv@cdbaby.com,msommerliniv,Jīsh,972-(622)160-0841,Structural Engineer,7599030719,Durgan-Rodriguez
-Isabelita,Wolstenholme,iwolstenholmeiw@stumbleupon.com,iwolstenholmeiw,Azinhal,351-(223)866-1661,Director of Sales,7664763312,"Tromp, Dibbert and Zieme"
-Krispin,O'Fergus,kofergusix@wikispaces.com,kofergusix,Banturkrajan,62-(483)542-1518,Physical Therapy Assistant,8741838637,"Strosin, Turner and Quigley"
-Meredeth,Budd,mbuddiy@biblegateway.com,mbuddiy,Svetlogorsk,7-(415)890-6602,Project Manager,9331158890,"Rippin, Bartoletti and Hermann"
-Babbette,Dunsleve,bdunsleveiz@thetimes.co.uk,bdunsleveiz,Maddela,63-(210)680-5698,Chemical Engineer,0144827441,Wilderman Inc
-Bar,Reiners,breinersj0@sun.com,breinersj0,Caldas Novas,55-(971)994-8220,Quality Control Specialist,3672681563,McClure-Moen
-Dalt,McKellar,dmckellarj1@163.com,dmckellarj1,Thị Trấn Hà Trung,84-(749)471-2636,Senior Quality Engineer,4697508440,Kautzer and Sons
-Ronalda,Gentric,rgentricj2@umich.edu,rgentricj2,Bahe,86-(924)710-4685,Office Assistant II,6446558430,Pouros and Sons
-Gill,Matthessen,gmatthessenj3@shop-pro.jp,gmatthessenj3,Nangka,63-(915)902-5478,Web Developer I,3664671848,Blick-Terry
-Hailey,Danet,hdanetj4@bbb.org,hdanetj4,Xuebu,86-(655)642-0475,Dental Hygienist,7854730350,Moore Group
-Donalt,Lynnett,dlynnettj5@ucla.edu,dlynnettj5,Pingshan,86-(712)618-8254,Community Outreach Specialist,3037055472,"Gleichner, Heathcote and McKenzie"
-Oralla,Clausius,oclausiusj6@state.gov,oclausiusj6,Villa del Rosario,57-(671)722-4375,Director of Sales,5376445232,Kemmer Inc
-Nance,Deware,ndewarej7@twitter.com,ndewarej7,Ibusuki,81-(617)941-4064,Software Engineer III,2028791357,"Yundt, Corwin and Quitzon"
-Aloysia,Friman,afrimanj8@edublogs.org,afrimanj8,Gambalidio,63-(313)382-0374,General Manager,8838662975,"Rau, Wolff and Kovacek"
-Elga,Starkey,estarkeyj9@salon.com,estarkeyj9,Gävle,46-(645)607-0229,Marketing Manager,7385675786,Hirthe-Thiel
-Jeannine,Annett,jannettja@so-net.ne.jp,jannettja,Burayevo,7-(461)292-8366,Account Coordinator,7989157179,Rippin Group
-Dulci,Sparkwell,dsparkwelljb@lulu.com,dsparkwelljb,Abóboda,351-(425)960-3179,Sales Associate,8042244673,"Will, Williamson and Bogisich"
-Gisela,Skoughman,gskoughmanjc@hao123.com,gskoughmanjc,Huashixia,86-(933)889-2829,Actuary,3828915523,Langosh LLC
-Cosme,Pryer,cpryerjd@amazon.com,cpryerjd,Belle-Anse,509-(582)842-9287,Tax Accountant,6487901008,Upton and Sons
-Thurstan,Pringle,tpringleje@indiegogo.com,tpringleje,Dongchen,86-(943)729-3038,Account Coordinator,5562817837,"Satterfield, Mraz and Reichel"
-Ebeneser,Longworthy,elongworthyjf@furl.net,elongworthyjf,Patquía,54-(789)253-7217,Registered Nurse,1170122795,Schulist-Braun
-Johnette,Wildes,jwildesjg@answers.com,jwildesjg,Frederiksberg,45-(869)821-2650,Automation Specialist I,3643331975,"Effertz, Parisian and Bergnaum"
-Allan,Raecroft,araecroftjh@hud.gov,araecroftjh,Sapele,234-(501)388-9974,Senior Developer,7938194387,"Dicki, White and Harber"
-Appolonia,Aizikov,aaizikovji@marriott.com,aaizikovji,Toukh,20-(857)889-1761,Technical Writer,4754105559,Green LLC
-Yevette,Songist,ysongistjj@google.it,ysongistjj,Dallas,1-(214)546-6784,Staff Accountant IV,0401661873,Erdman Group
-Tandy,Abeau,tabeaujk@aboutads.info,tabeaujk,Denver,1-(720)737-3543,Librarian,8505630270,Bashirian-Koepp
-Marsh,Pencost,mpencostjl@constantcontact.com,mpencostjl,Buenaventura,57-(263)213-3776,Analyst Programmer,0310343887,Hoeger LLC
-Dan,Reignard,dreignardjm@squidoo.com,dreignardjm,Tanahedang,62-(883)790-2315,Financial Analyst,3648884352,"Parisian, Barrows and Osinski"
-Nerta,Ruffler,nrufflerjn@wikispaces.com,nrufflerjn,Jincheng,886-(342)705-8378,Internal Auditor,8567561698,"Wintheiser, VonRueden and Lowe"
-Zed,Bolsover,zbolsoverjo@omniture.com,zbolsoverjo,Matão,55-(339)205-0401,Recruiting Manager,4399340495,Crist-Will
-Gonzalo,Paddington,gpaddingtonjp@phpbb.com,gpaddingtonjp,Montelíbano,57-(405)589-5804,Product Engineer,8554752384,"Lubowitz, Sanford and Lehner"
-Lucas,Elington,lelingtonjq@utexas.edu,lelingtonjq,Anding,86-(960)550-4751,Web Designer III,2740694938,Davis Group
-Leoine,Lovett,llovettjr@multiply.com,llovettjr,Pittsburgh,1-(412)586-0854,Electrical Engineer,8541351939,Hoppe-Romaguera
-Kara,McGeagh,kmcgeaghjs@cyberchimps.com,kmcgeaghjs,Kubang,62-(768)313-0005,Software Engineer IV,0452302706,Huel-Zemlak
-Jabez,Saylor,jsaylorjt@blogger.com,jsaylorjt,Luhans’ke,380-(559)819-5482,Food Chemist,7450835533,"Bergstrom, Stoltenberg and Satterfield"
-Debor,Vautre,dvautreju@lycos.com,dvautreju,Zhuangbu,86-(936)413-2474,Teacher,3855224137,"Emmerich, Muller and Yundt"
-Odille,Simonou,osimonoujv@blogtalkradio.com,osimonoujv,Łęki Szlacheckie,48-(989)791-3951,Senior Cost Accountant,0849963257,"Doyle, Abbott and Lind"
-Abraham,Chalfont,achalfontjw@stumbleupon.com,achalfontjw,Bang Kaeo,66-(342)372-0269,Pharmacist,7010972532,Powlowski Group
-Willy,Ives,wivesjx@squarespace.com,wivesjx,Cimenga,62-(444)941-8150,Analyst Programmer,1782184376,"Spencer, Oberbrunner and Daniel"
-Reinald,Worley,rworleyjy@cnn.com,rworleyjy,Sumberpandan,62-(148)705-1796,Junior Executive,2076403906,Feeney-Cruickshank
-Leone,Borris,lborrisjz@desdev.cn,lborrisjz,Tisco,51-(892)888-9517,Technical Writer,3611286087,Schumm-Christiansen
-Jethro,Ede,jedek0@cbc.ca,jedek0,Auch,33-(947)670-3513,Senior Developer,5503574176,Senger Group
-Netti,Hallford,nhallfordk1@bloomberg.com,nhallfordk1,Falāvarjān,98-(501)345-1506,Engineer IV,8529835794,"Bruen, Funk and Thompson"
-Tiffi,Potapczuk,tpotapczukk2@xinhuanet.com,tpotapczukk2,Castanheira de Pêra,351-(462)484-6335,Tax Accountant,8392227476,Mertz-Runolfsdottir
-Garald,Doddrell,gdoddrellk3@comcast.net,gdoddrellk3,Ketawang,62-(195)332-5729,Senior Financial Analyst,3328544089,Mohr-Jast
-Haze,MacGillacolm,hmacgillacolmk4@123-reg.co.uk,hmacgillacolmk4,Langgen,62-(754)132-9274,Administrative Assistant IV,9044438050,"Brekke, Strosin and Berge"
-Emili,Coon,ecoonk5@youtube.com,ecoonk5,Nzérékoré,224-(495)776-5371,Information Systems Manager,1695217985,O'Conner Inc
-Padriac,Alvy,palvyk6@ted.com,palvyk6,Biryulëvo Zapadnoye,7-(421)373-0762,Graphic Designer,3669986006,"Schiller, Willms and Feeney"
-Hamnet,Layman,hlaymank7@desdev.cn,hlaymank7,Ifon,234-(343)694-2565,Programmer Analyst II,6185480751,Hahn-Weber
-Redd,Calvie,rcalviek8@google.cn,rcalviek8,Ambar,51-(774)884-7397,Senior Sales Associate,0185044085,Bashirian Inc
-Kerrie,Kenrick,kkenrickk9@samsung.com,kkenrickk9,Al Manāqil,249-(655)472-4763,Software Consultant,9046610284,Wuckert-Farrell
-Nara,Innwood,ninnwoodka@sbwire.com,ninnwoodka,Chadi,86-(547)693-2410,Budget/Accounting Analyst III,3718838753,"Kertzmann, Funk and Tremblay"
-Bernice,Deftie,bdeftiekb@rediff.com,bdeftiekb,Charleston,1-(304)936-1410,Senior Developer,9632166434,Ward-Senger
-Cletus,Minor,cminorkc@mapy.cz,cminorkc,Suraż,48-(241)331-0004,Junior Executive,4560795215,Wilderman Inc
-Clerkclaude,Knighton,cknightonkd@bigcartel.com,cknightonkd,Haoyi,86-(660)290-9882,Account Executive,2632094100,Barton-Bechtelar
-Burtie,Bowen,bbowenke@booking.com,bbowenke,Avallon,33-(509)681-5577,Structural Engineer,0588974048,"Hudson, Kautzer and Senger"
-Cris,Cody,ccodykf@miibeian.gov.cn,ccodykf,Saskatoon,1-(865)113-1166,Analyst Programmer,2698386916,MacGyver-Kessler
-Wainwright,Aylen,waylenkg@microsoft.com,waylenkg,San Martín de los Andes,54-(334)143-7746,Electrical Engineer,9984965074,Nicolas-Kassulke
-Clare,Calbreath,ccalbreathkh@independent.co.uk,ccalbreathkh,Pará de Minas,55-(147)835-8826,Research Nurse,6199708253,"Runte, Stanton and Nitzsche"
-Fenelia,Brewood,fbrewoodki@uiuc.edu,fbrewoodki,Agra,351-(684)979-6665,Data Coordiator,0051836793,"Schmidt, O'Connell and Treutel"
-Hans,Chiese,hchiesekj@reference.com,hchiesekj,Kamieniec Wrocławski,48-(988)578-1699,Data Coordiator,4667259698,Gibson-Barrows
-Tabina,Janauschek,tjanauschekkk@berkeley.edu,tjanauschekkk,Río Grande,1-(470)119-5478,Human Resources Assistant II,6083625874,Keebler Group
-Bridgette,Nisuis,bnisuiskl@theatlantic.com,bnisuiskl,Baie-Saint-Paul,1-(702)724-5290,Geological Engineer,9705430446,Kihn Group
-Syd,Leahair,sleahairkm@wiley.com,sleahairkm,Guarabira,55-(457)962-6675,Community Outreach Specialist,4844140248,Bernier and Sons
-Gannie,Vennard,gvennardkn@macromedia.com,gvennardkn,Kayapa,63-(909)747-4808,Web Designer II,3698363402,"Schimmel, Friesen and Witting"
-Avictor,Ligertwood,aligertwoodko@bigcartel.com,aligertwoodko,Ustrzyki Dolne,48-(416)290-1849,Nurse Practicioner,4174955700,Ernser-Kihn
-Heidi,Castelijn,hcastelijnkp@apache.org,hcastelijnkp,Ilihan,63-(500)806-5161,Administrative Officer,1259802647,"Osinski, Sanford and Ritchie"
-Ida,Barday,ibardaykq@spotify.com,ibardaykq,Tourcoing,33-(795)533-7343,Clinical Specialist,5206989193,"Jerde, Douglas and Rodriguez"
-Melodee,Valek,mvalekkr@samsung.com,mvalekkr,Shichuan,86-(456)232-9420,Financial Analyst,4251707303,Lakin-Dooley
-Mellie,Blois,mbloisks@vinaora.com,mbloisks,Cagliari,39-(810)963-1749,Recruiting Manager,3769720873,"Strosin, Wuckert and Mann"
-Marabel,Chester,mchesterkt@delicious.com,mchesterkt,Si Bun Rueang,66-(161)732-1476,Geologist III,6339789307,Williamson-Witting
-Gertrud,Keats,gkeatsku@tripadvisor.com,gkeatsku,Lam Plai Mat,66-(582)827-0005,Recruiter,0297472623,Farrell and Sons
-Orsola,Adriaens,oadriaenskv@hibu.com,oadriaenskv,Shaguotun,86-(820)144-0827,Paralegal,5854900106,"Ledner, Murazik and McGlynn"
-Kendricks,Livesley,klivesleykw@yelp.com,klivesleykw,Palilula,381-(321)472-2578,Junior Executive,7051295772,Robel and Sons
-Randall,Denkel,rdenkelkx@about.me,rdenkelkx,Spånga,46-(892)234-6007,Recruiter,8622374491,"McDermott, Cartwright and Beatty"
-Edythe,Boundey,eboundeyky@simplemachines.org,eboundeyky,Al Qaţīf,966-(760)484-2393,Editor,8633506122,Medhurst-Miller
-Dillon,Piesing,dpiesingkz@bluehost.com,dpiesingkz,Qiucun,86-(543)608-4097,Account Coordinator,7448756443,"Kunze, Medhurst and Grant"
-Constancia,Eagland,ceaglandl0@photobucket.com,ceaglandl0,Staryy Dobrotvir,380-(868)809-9720,Desktop Support Technician,6850975951,Zulauf Group
-Tressa,Bourne,tbournel1@odnoklassniki.ru,tbournel1,Aulnay-sous-Bois,33-(523)199-1041,Programmer IV,7844943165,Hamill Group
-Iolande,Tunnicliffe,itunnicliffel2@artisteer.com,itunnicliffel2,Síkinos,30-(238)211-8025,Associate Professor,4285351382,"Mills, Romaguera and Anderson"
-Nalani,Bignall,nbignalll3@ftc.gov,nbignalll3,Itapipoca,55-(365)774-4231,GIS Technical Architect,7259801018,Dicki-Schroeder
-Horatio,Vanner,hvannerl4@apple.com,hvannerl4,Laohugang,86-(312)980-2632,Marketing Assistant,0784848610,VonRueden-Feil
-Felice,Jenken,fjenkenl5@fda.gov,fjenkenl5,San Francisco de Coray,504-(252)407-9161,Software Test Engineer III,7301006063,Stanton Inc
-Fax,Critchard,fcritchardl6@posterous.com,fcritchardl6,Feilaixia,86-(530)993-0259,Research Assistant I,1837505667,"Halvorson, Rodriguez and Murray"
-Eberto,Matzeitis,ematzeitisl7@tinypic.com,ematzeitisl7,Paris 08,33-(813)124-1255,Physical Therapy Assistant,3214003879,"Schimmel, Pouros and Yost"
-Gamaliel,Yakebowitch,gyakebowitchl8@dyndns.org,gyakebowitchl8,Zhendeqiao,86-(902)945-5865,Health Coach IV,3858926728,Morissette-Hand
-Flor,Boarer,fboarerl9@i2i.jp,fboarerl9,Laventure,230-(655)375-4043,Quality Control Specialist,3619658951,Casper Group
-Deeanne,Burghill,dburghillla@smugmug.com,dburghillla,Safotu,685-(601)390-5584,Software Engineer I,3672399876,"Conroy, Kerluke and Steuber"
-Brant,Greenstead,bgreensteadlb@toplist.cz,bgreensteadlb,Adelaide,61-(892)926-0595,Systems Administrator IV,6507194689,Stanton Group
-Edita,Stanes,estaneslc@ning.com,estaneslc,Asikkala,358-(104)994-3852,Compensation Analyst,6256493079,Schaefer-Mayer
-Audie,Suche,asucheld@ed.gov,asucheld,Xinjian,86-(928)968-5707,Community Outreach Specialist,7207127251,Heaney Group
-Phelia,de Amaya,pdeamayale@ovh.net,pdeamayale,Comagascas,63-(548)192-2681,Tax Accountant,6804167333,Moen-Medhurst
-Brodie,Capelow,bcapelowlf@google.es,bcapelowlf,San Miguel,52-(505)227-1532,Help Desk Operator,0321116399,"Block, Hirthe and Lemke"
-Darelle,Hickin,dhickinlg@addtoany.com,dhickinlg,Tonghu,86-(429)741-1635,Recruiting Manager,9703631940,"Boyer, Ullrich and Hirthe"
-Gabriell,Priestley,gpriestleylh@topsy.com,gpriestleylh,Szeged,36-(890)962-0345,Compensation Analyst,9074958451,Weber-Bins
-Ainsley,Batchelar,abatchelarli@adobe.com,abatchelarli,Plast,7-(909)894-8943,Staff Accountant III,3774125082,"Parker, Bechtelar and Mosciski"
-Carole,Hammett,chammettlj@deliciousdays.com,chammettlj,Shchukino,7-(234)811-0491,VP Marketing,7633646497,"Beer, Veum and Lowe"
-Alfie,Duffett,aduffettlk@cam.ac.uk,aduffettlk,Krajan Dua Putukrejo,62-(959)919-5850,Project Manager,2080467263,Durgan-Fritsch
-Arley,Gillman,agillmanll@cdbaby.com,agillmanll,Karangori,62-(707)970-1378,Financial Advisor,0893767778,Stamm Group
-Khalil,Goodboddy,kgoodboddylm@zimbio.com,kgoodboddylm,Dijon,33-(369)847-3482,Geological Engineer,6558979381,Goyette and Sons
-Halimeda,Gowman,hgowmanln@cam.ac.uk,hgowmanln,Krasni Okny,380-(937)249-4520,Senior Financial Analyst,1911763253,Howe Inc
-Ardis,Benardet,abenardetlo@nytimes.com,abenardetlo,Concepción del Uruguay,54-(567)429-0565,Account Representative IV,4637416302,"Feil, Bartoletti and Adams"
-Ivory,Lawlie,ilawlielp@thetimes.co.uk,ilawlielp,Schroeder,55-(878)697-6010,Senior Cost Accountant,9431774984,"King, Crona and Von"
-Barb,Derisley,bderisleylq@mashable.com,bderisleylq,Tangyu,86-(708)194-0125,Marketing Assistant,6826292726,Deckow-Lemke
-Malissia,Sharer,msharerlr@java.com,msharerlr,Jinghai,86-(252)422-3886,Human Resources Manager,8382713882,Grimes-Hansen
-Jessamine,Lichfield,jlichfieldls@businesswire.com,jlichfieldls,Micoud,1-(934)806-6515,VP Product Management,6093340430,Kozey Inc
-Rogerio,Tindall,rtindalllt@biblegateway.com,rtindalllt,Vistino,7-(527)696-9343,Actuary,2542803676,Ritchie-Marquardt
-Averyl,Garratt,agarrattlu@instagram.com,agarrattlu,Lamovita,387-(200)844-4864,Senior Quality Engineer,1885568886,Ernser-Hartmann
-Becki,Edelmann,bedelmannlv@gmpg.org,bedelmannlv,Mawlamyine,95-(718)995-2413,Actuary,2746351579,Schamberger LLC
-Micky,Smitherman,msmithermanlw@chicagotribune.com,msmithermanlw,Belén,598-(243)420-8445,Civil Engineer,2781994006,"Ward, Harris and Nader"
-Barbabra,Cork,bcorklx@nytimes.com,bcorklx,Tanzhesi,86-(229)632-7950,Research Associate,8772167009,Hane Group
-Erastus,Cauldfield,ecauldfieldly@friendfeed.com,ecauldfieldly,Nglojo,62-(962)330-7466,Senior Developer,5790337376,"Leuschke, Jaskolski and Jaskolski"
-Hube,Rowaszkiewicz,hrowaszkiewiczlz@tinypic.com,hrowaszkiewiczlz,Ventanas,593-(568)247-0181,Software Engineer IV,6793591614,Littel-Deckow
-Justis,Ickov,jickovm0@tripod.com,jickovm0,Issy-les-Moulineaux,33-(574)130-0058,Software Test Engineer II,2573983161,Hintz Inc
-Wilie,Mawditt,wmawdittm1@wordpress.org,wmawdittm1,Zlatar,385-(148)463-0786,Mechanical Systems Engineer,1825804036,Kerluke-O'Connell
-Henriette,Early,hearlym2@cisco.com,hearlym2,Salcedo,63-(859)802-4167,Quality Engineer,9157866023,Rowe and Sons
-Kaycee,Nattriss,knattrissm3@ning.com,knattrissm3,Pindangan Centro,63-(749)241-7828,Chemical Engineer,1628687517,Rutherford-Kihn
-Hart,Petran,hpetranm4@cnbc.com,hpetranm4,Pampas,51-(195)539-5625,Information Systems Manager,1793147906,"McKenzie, Weimann and Crona"
-Holt,Kernock,hkernockm5@hhs.gov,hkernockm5,Dasiping,86-(729)481-1150,Recruiting Manager,3841216129,Lindgren Inc
-Friedrick,Yurchenko,fyurchenkom6@cyberchimps.com,fyurchenkom6,Uppsala,46-(881)710-7992,Quality Control Specialist,8282139564,"Durgan, Simonis and Hilll"
-Maybelle,Tapenden,mtapendenm7@cafepress.com,mtapendenm7,Guadalupe,52-(698)116-6571,Professor,4954283094,Goodwin Inc
-Francesco,Hyatt,fhyattm8@blog.com,fhyattm8,Vänersborg,46-(590)336-4962,Systems Administrator IV,0752649760,Dach LLC
-Marlene,Shevlan,mshevlanm9@independent.co.uk,mshevlanm9,København,45-(461)205-7636,Tax Accountant,5683419905,Gleichner-Schoen
-Ignatius,Seals,isealsma@4shared.com,isealsma,Chimboy Shahri,998-(740)447-9648,Analog Circuit Design manager,0331255189,Kovacek-Bednar
-Jasmina,Huggins,jhugginsmb@harvard.edu,jhugginsmb,Kulotino,7-(439)872-4789,Programmer Analyst IV,5646721199,"Koss, Bode and Halvorson"
-Arther,Bisseker,abissekermc@redcross.org,abissekermc,Ad Dimnah,967-(145)760-6372,Web Designer IV,0238046222,"Fay, Reynolds and Schultz"
-Brita,Cleynman,bcleynmanmd@scribd.com,bcleynmanmd,Joliet,1-(815)856-8278,Mechanical Systems Engineer,2016930195,"Hickle, Hagenes and Bode"
-Danita,Aubry,daubryme@fema.gov,daubryme,Somanda,255-(761)470-0112,Food Chemist,2405625261,Kuphal-Littel
-Hilton,Kyrkeman,hkyrkemanmf@sphinn.com,hkyrkemanmf,Linxia Chengguanzhen,86-(933)120-9575,Chief Design Engineer,9953149593,Sanford-Kiehn
-Blondie,Heinrich,bheinrichmg@harvard.edu,bheinrichmg,Ban Lam Luk Ka,66-(919)563-5992,Nurse Practicioner,8391355985,Farrell-Stroman
-Nathalia,Bettleson,nbettlesonmh@lulu.com,nbettlesonmh,Weston,44-(284)766-3674,Assistant Media Planner,7451462927,Schumm Inc
-Nap,Croxford,ncroxfordmi@mapy.cz,ncroxfordmi,Liugou,86-(814)399-2809,Mechanical Systems Engineer,1028596766,"Vandervort, Howe and Schulist"
-Matthieu,Pitney,mpitneymj@sourceforge.net,mpitneymj,Lulindi,255-(965)744-8651,Senior Sales Associate,9954867694,Stehr-Stehr
-Bernadina,Batiste,bbatistemk@theglobeandmail.com,bbatistemk,Jinping,86-(805)406-0826,Marketing Assistant,0681175303,"Kemmer, Bednar and Schmidt"
-Jo,Vasin,jvasinml@yandex.ru,jvasinml,Suchań,48-(719)533-4494,Social Worker,0672565900,McKenzie Group
-Isabeau,Josovich,ijosovichmm@shutterfly.com,ijosovichmm,Detroit,1-(313)728-3071,Quality Engineer,9522586072,Stark Group
-Hyacinth,Streatley,hstreatleymn@va.gov,hstreatleymn,Hanam,82-(962)234-8098,Assistant Professor,4446717154,Littel-Wisozk
-Margarita,Roller,mrollermo@php.net,mrollermo,Itapevi,55-(849)570-9451,Teacher,4015506529,Kuhic Inc
-Gottfried,Mawdsley,gmawdsleymp@hatena.ne.jp,gmawdsleymp,Duraznopampa,51-(850)770-5042,Teacher,4615844786,Sauer Inc
-Colline,Tanner,ctannermq@squarespace.com,ctannermq,Osilnica,386-(375)123-4522,Accounting Assistant IV,4307546075,"Heaney, Prohaska and Treutel"
-Toiboid,Slyman,tslymanmr@geocities.jp,tslymanmr,Niort,33-(246)445-0387,Safety Technician II,0876852541,Marquardt Group
-Franky,Willden,fwilldenms@mlb.com,fwilldenms,Nanyaojie,86-(772)392-4262,Web Developer III,4615626932,"Botsford, Mante and Lind"
-Cory,Sexti,csextimt@ft.com,csextimt,Smiths Falls,1-(856)759-7718,Senior Developer,8931416504,"Herman, Buckridge and Wehner"
-Nevsa,Paoloni,npaolonimu@ox.ac.uk,npaolonimu,Songjiang,86-(861)892-4735,Registered Nurse,9011403533,Mosciski-Dietrich
-Rosabelle,Harkess,rharkessmv@hexun.com,rharkessmv,Tambo,51-(320)850-5323,Geological Engineer,3284443002,Howe LLC
-Bibbye,Maleham,bmalehammw@ifeng.com,bmalehammw,Dakoro,227-(563)968-9242,Programmer Analyst IV,1459020774,"Kuhlman, Bogan and Kshlerin"
-Marcela,Houlston,mhoulstonmx@ebay.co.uk,mhoulstonmx,Ngedhusuba,62-(645)344-7228,Social Worker,8322158963,"Trantow, Kassulke and Lebsack"
-Allen,Trembley,atrembleymy@goodreads.com,atrembleymy,Mānānwāla,92-(715)605-9507,Design Engineer,5813315675,"Miller, Yost and Stamm"
-Wallas,Stansfield,wstansfieldmz@networkadvertising.org,wstansfieldmz,Xiongguan,86-(361)169-6974,Structural Engineer,8350979879,Hills-Waters
-Alasdair,Konerding,akonerdingn0@msu.edu,akonerdingn0,Rennes,33-(354)767-4981,Web Designer III,6590238693,Nitzsche LLC
-Kendell,Garvan,kgarvann1@quantcast.com,kgarvann1,Yong’an,86-(763)605-1170,Senior Developer,8673840058,Harris-Smith
-Sayre,Orthmann,sorthmannn2@linkedin.com,sorthmannn2,Yabuli,86-(956)184-5074,Sales Associate,3238931334,Kozey-Kulas
-Holt,Francillo,hfrancillon3@sciencedirect.com,hfrancillon3,Jiangcheng,86-(517)345-2568,Software Consultant,8031543178,Runolfsdottir Group
-Gusella,Kinig,gkinign4@xing.com,gkinign4,Fastiv,380-(645)966-9040,Account Representative II,0511641788,MacGyver-Treutel
-Otis,Reinhard,oreinhardn5@answers.com,oreinhardn5,Qiancang,86-(285)544-2263,Environmental Specialist,3357295903,Jerde Group
-Carlin,MacAne,cmacanen6@samsung.com,cmacanen6,Yahotyn,380-(892)306-8669,Desktop Support Technician,5175081594,Hackett LLC
-Berny,Ferri,bferrin7@prnewswire.com,bferrin7,Jimenez,63-(103)580-5845,Junior Executive,4749556203,Kuhn-Ullrich
-Warren,Fulks,wfulksn8@wufoo.com,wfulksn8,Jose Maria Morelos,52-(886)281-8268,Statistician IV,0434789003,"West, Kuphal and Hills"
-Barnett,Bane,bbanen9@arizona.edu,bbanen9,Namerikawa,81-(412)158-7515,Administrative Assistant III,1843810425,Wiegand LLC
-Arin,Trimming,atrimmingna@constantcontact.com,atrimmingna,Nārāyanganj,880-(506)140-6037,Mechanical Systems Engineer,6579691301,"Trantow, Franecki and Huel"
-Vinnie,Bruce,vbrucenb@economist.com,vbrucenb,Los Frentones,54-(143)653-9690,Occupational Therapist,7266214238,"Collins, Parker and Volkman"
-Leandra,Jerdon,ljerdonnc@barnesandnoble.com,ljerdonnc,Mqabba,356-(828)530-5167,Cost Accountant,2421177081,Schimmel and Sons
-Maurise,McRuvie,mmcruviend@cisco.com,mmcruviend,Takeo,855-(719)155-4461,VP Marketing,1603639632,Cassin-Gislason
-Galen,Clutterham,gclutterhamne@reddit.com,gclutterhamne,Tantu,86-(856)743-6023,Developer IV,6406520327,"Pagac, Abbott and Renner"
-Orsa,Faulkener,ofaulkenernf@51.la,ofaulkenernf,Guoyuan,86-(353)293-0614,Nurse,2168428441,Schamberger-Moore
-Chas,Gaylard,cgaylardng@msn.com,cgaylardng,Ambat,62-(316)304-0070,Speech Pathologist,0230204961,Rodriguez Inc
-Erek,Kilius,ekiliusnh@mapy.cz,ekiliusnh,Karakol,996-(757)549-4010,Account Representative III,8914898016,Champlin-Parker
-Torrence,Dallow,tdallowni@livejournal.com,tdallowni,Rumat Heib,972-(551)251-4133,Payment Adjustment Coordinator,7839003737,Macejkovic LLC
-Son,Nowakowski,snowakowskinj@home.pl,snowakowskinj,Pasirpengarayan,62-(403)683-3142,Media Manager IV,9394032258,"Weissnat, Bergnaum and Paucek"
-Osbert,Nuscha,onuschank@bluehost.com,onuschank,San Antonio de Los Altos,58-(278)228-1044,Statistician II,9263802645,Wolff-Hudson
-Kaspar,Smullin,ksmullinnl@ebay.co.uk,ksmullinnl,Hihyā,20-(858)200-1173,Operator,1352488523,Boyer and Sons
-Temp,Palk,tpalknm@irs.gov,tpalknm,Llorente,63-(559)417-0912,Safety Technician II,5716467989,Rutherford-Dare
-Julie,Poad,jpoadnn@webeden.co.uk,jpoadnn,Lajeosa,351-(229)448-4862,Office Assistant IV,3869073314,Jones-Pollich
-Blanche,Schonfeld,bschonfeldno@umn.edu,bschonfeldno,Fresno,1-(209)844-2209,Desktop Support Technician,4348050724,Hand LLC
-Tremaine,Wicks,twicksnp@ted.com,twicksnp,Tiglauigan,63-(592)251-6057,Executive Secretary,9357962085,Hessel LLC
-Jessamyn,Mauro,jmauronq@ucsd.edu,jmauronq,Shuangpu,86-(782)336-1634,Senior Developer,2073896022,"Tillman, Schowalter and Kertzmann"
-Morris,Pedro,mpedronr@wunderground.com,mpedronr,Fort Worth,1-(682)403-1808,Human Resources Assistant I,2418447138,Wiza-Lynch
-Rossie,Lindblom,rlindblomns@flavors.me,rlindblomns,Espera Feliz,55-(354)448-5176,Senior Developer,9846657803,"D'Amore, Morar and Lubowitz"
-Kelcie,Woolner,kwoolnernt@histats.com,kwoolnernt,Sainyabuli,856-(703)619-9373,Senior Cost Accountant,9679866378,Farrell-Windler
-Brittaney,O' Bee,bobeenu@linkedin.com,bobeenu,Mombaça,55-(107)230-7103,Information Systems Manager,4366497247,Stroman-Blick
-Kassie,Questier,kquestiernv@imageshack.us,kquestiernv,Bielsk Podlaski,48-(127)626-9904,Web Developer I,7973903593,O'Keefe-Altenwerth
-Wilhelmina,Baldacco,wbaldacconw@yahoo.co.jp,wbaldacconw,Dasha,86-(814)517-9700,Actuary,0898566878,"Grant, Pollich and O'Keefe"
-Griz,Jagels,gjagelsnx@alexa.com,gjagelsnx,Druzhny,375-(873)367-3588,Cost Accountant,5688512105,Hoeger Inc
-Nikolaos,Abrahamowitcz,nabrahamowitczny@google.ca,nabrahamowitczny,Wawrzeńczyce,48-(788)215-2200,Community Outreach Specialist,3376050767,Champlin and Sons
-Cesare,Kelf,ckelfnz@friendfeed.com,ckelfnz,Lucaya,1-(362)126-9927,Business Systems Development Analyst,4434280716,Turner-Conn
-Olympia,McCaughey,omccaugheyo0@toplist.cz,omccaugheyo0,Soio,244-(652)536-5008,Senior Editor,2665247380,Swaniawski-Kihn
-Magdalen,Wadhams,mwadhamso1@patch.com,mwadhamso1,Köping,46-(202)987-2026,Automation Specialist II,7922502885,Fahey LLC
-Laughton,Charrette,lcharretteo2@plala.or.jp,lcharretteo2,El Paso,1-(915)296-9008,Software Engineer II,3832140409,Ferry-Hettinger
-Antonin,McGaughey,amcgaugheyo3@technorati.com,amcgaugheyo3,Guanyao,86-(385)294-7834,Graphic Designer,4413617177,"Stoltenberg, Anderson and Schroeder"
-Douglas,Peploe,dpeploeo4@paypal.com,dpeploeo4,Bala Murghab,93-(552)750-0409,Compensation Analyst,6584465276,Will and Sons
-Saloma,Halcro,shalcroo5@biglobe.ne.jp,shalcroo5,Yongjiu,86-(663)473-4515,Assistant Media Planner,5412294472,Upton and Sons
-Genia,Dockree,gdockreeo6@ed.gov,gdockreeo6,K’ulashi,995-(693)621-4145,Sales Representative,6311406926,Murazik-Gerlach
-Ulysses,Vigne,uvigneo7@wisc.edu,uvigneo7,Bosobolo,242-(869)770-6551,Payment Adjustment Coordinator,6121045191,"Kuphal, Smith and Becker"
-Amaleta,Hellcat,ahellcato8@com.com,ahellcato8,Paamiut,299-(827)658-4181,VP Marketing,9930317341,Sanford Group
-Marys,Stobo,mstoboo9@addthis.com,mstoboo9,Fraga,351-(646)681-5809,Programmer Analyst IV,8215542689,"Conroy, Luettgen and Haag"
-Carmelia,Cantillion,ccantillionoa@prweb.com,ccantillionoa,Sumberpucung,62-(715)732-9346,Structural Analysis Engineer,5743542775,Marquardt LLC
-Jenifer,Ondrus,jondrusob@vinaora.com,jondrusob,Banos,63-(887)517-5901,Accounting Assistant III,1196707006,"Bruen, Paucek and Fisher"
-Gillian,Espadas,gespadasoc@microsoft.com,gespadasoc,Brejoeira,351-(160)844-3330,Research Associate,1027647391,Weissnat-Blick
-Vonni,Corley,vcorleyod@feedburner.com,vcorleyod,Melaka,60-(193)177-1978,Civil Engineer,5905339317,Lubowitz-Morar
-Phillip,Ivanchin,pivanchinoe@addthis.com,pivanchinoe,Sasaguri,81-(145)417-6376,Account Coordinator,3636969412,Turcotte-Wisozk
-Klarrisa,Letessier,kletessierof@wordpress.com,kletessierof,Gostyń,48-(126)737-5592,VP Quality Control,1411646746,Ankunding-Pfannerstill
-Gasparo,Agron,gagronog@etsy.com,gagronog,Nangka,63-(410)186-8167,Senior Sales Associate,5644040968,Rippin-Goyette
-Joni,Burnard,jburnardoh@timesonline.co.uk,jburnardoh,Ilām,977-(207)827-4512,Analyst Programmer,5890418432,Krajcik Inc
-Kim,Kytter,kkytteroi@weibo.com,kkytteroi,Mojokerto,62-(279)874-2608,Environmental Specialist,1343560179,"Schulist, Weber and Paucek"
-Lora,Elms,lelmsoj@narod.ru,lelmsoj,Cầu Gồ,84-(800)294-5849,VP Marketing,1493946587,Schamberger Group
-Arlena,Paullin,apaullinok@reddit.com,apaullinok,Örebro,46-(532)455-1043,Senior Editor,4085398636,Grant and Sons
-Richard,Darcy,rdarcyol@seesaa.net,rdarcyol,Batarasa,63-(298)338-2430,Community Outreach Specialist,7860234254,Bahringer LLC
-Felizio,Padginton,fpadgintonom@gmpg.org,fpadgintonom,Nanzhen,86-(584)560-0295,Research Assistant III,3766611003,Spencer Group
-Antonina,Kilpin,akilpinon@alexa.com,akilpinon,Schieren,352-(152)223-8179,Chemical Engineer,8146664725,"Labadie, Goyette and Jacobson"
-Erika,Geator,egeatoroo@bloglovin.com,egeatoroo,Retorta,351-(404)826-3743,Assistant Professor,4828740651,Lakin Group
-Ali,Straffon,astraffonop@hexun.com,astraffonop,Babiak,48-(388)809-9155,Actuary,5262099386,Reichel-Hand
-Amabel,Board,aboardoq@shareasale.com,aboardoq,Diancun,86-(214)304-0961,Information Systems Manager,6355389466,Upton-Jaskolski
-Gabie,Bradwell,gbradwellor@yandex.ru,gbradwellor,Gobō,81-(496)451-0957,Analog Circuit Design manager,8680375713,Nienow-Hermiston
-Claretta,Finlaison,cfinlaisonos@trellian.com,cfinlaisonos,Chatturat,66-(920)250-8360,Database Administrator III,4852140383,Wiza-Predovic
-Kippie,Panting,kpantingot@geocities.jp,kpantingot,Tojeira,351-(648)874-8790,Recruiter,7921358802,"Kunze, Jaskolski and Stoltenberg"
-Linell,Croysdale,lcroysdaleou@buzzfeed.com,lcroysdaleou,Orós,55-(435)669-9483,Help Desk Technician,1212044088,Ledner-Johnston
-Vasilis,Goublier,vgoublierov@altervista.org,vgoublierov,Caujul,51-(101)425-0809,Structural Analysis Engineer,4372624972,Bayer-Heller
-Brocky,Gianiello,bgianielloow@flickr.com,bgianielloow,Huoxian,86-(427)267-9428,Developer IV,6023283195,Witting-Howe
-Roland,Blowes,rblowesox@apache.org,rblowesox,Padej,381-(688)750-4717,Business Systems Development Analyst,7378441384,Bashirian-Wiegand
-Garv,Peerman,gpeermanoy@a8.net,gpeermanoy,Yolöten,993-(132)948-7743,Cost Accountant,8711924012,Quigley Group
-Damaris,Amberson,dambersonoz@noaa.gov,dambersonoz,Uchaly,7-(891)257-7839,Social Worker,0871438763,Cummerata and Sons
-Reba,Laudham,rlaudhamp0@uiuc.edu,rlaudhamp0,Mendefera,291-(385)541-4183,Cost Accountant,9459415148,Gleichner LLC
-Dill,Teligin,dteliginp1@telegraph.co.uk,dteliginp1,Garango,226-(818)796-5422,Tax Accountant,2544502487,Abbott-Thiel
-Greta,Lewsam,glewsamp2@psu.edu,glewsamp2,Rostov-na-Donu,7-(207)756-1434,Staff Accountant I,3029138410,Schmitt-Bogisich
-Norah,Jeremaes,njeremaesp3@netvibes.com,njeremaesp3,Xiakouyi,86-(488)113-1826,Office Assistant III,6252335258,Rempel-Abshire
-Datha,Lenahan,dlenahanp4@unicef.org,dlenahanp4,Kuzhu,86-(851)353-6927,Sales Representative,1680930990,Lubowitz and Sons
-Sophey,Phlipon,sphliponp5@behance.net,sphliponp5,Jiaoziya,86-(315)182-8625,Account Coordinator,5389921747,Effertz Group
-Alix,Schirach,aschirachp6@lulu.com,aschirachp6,San Marcos,503-(169)421-0329,Electrical Engineer,2023606950,"Herzog, Funk and Gottlieb"
-Mignon,Paddington,mpaddingtonp7@sogou.com,mpaddingtonp7,Panikian,63-(636)557-0276,Legal Assistant,2892389844,Cormier-Hudson
-Darn,Elfleet,delfleetp8@blogtalkradio.com,delfleetp8,Dubravica,387-(878)576-7012,Mechanical Systems Engineer,2839634538,Olson-Bogan
-Monique,Harmon,mharmonp9@admin.ch,mharmonp9,Roissy Charles-de-Gaulle,33-(545)532-7958,Associate Professor,9092943010,Hickle LLC
-Tull,Infante,tinfantepa@tinyurl.com,tinfantepa,Xiaoruo,86-(387)599-5542,Marketing Assistant,9863380032,"Sanford, Bradtke and Farrell"
-Nyssa,Madoc-Jones,nmadocjonespb@epa.gov,nmadocjonespb,Puerto Quellón,56-(955)181-7227,Assistant Manager,1890626058,Littel-Toy
-Florence,Solomon,fsolomonpc@bbc.co.uk,fsolomonpc,Blois,33-(767)315-1932,VP Quality Control,3079951077,Eichmann Inc
-Vanya,Schermick,vschermickpd@berkeley.edu,vschermickpd,Kunvald,420-(153)357-8683,Staff Accountant I,0920565719,Quigley-Bergstrom
-Danita,Juanico,djuanicope@ca.gov,djuanicope,Cluny,230-(619)594-7589,Human Resources Manager,3146677113,"Kassulke, Ruecker and Hane"
-Shelagh,Shelley,sshelleypf@marriott.com,sshelleypf,Sabaneta,58-(196)295-4803,Paralegal,7166846496,"Koelpin, Cremin and Langosh"
-Kerk,Dufer,kduferpg@google.com.au,kduferpg,Rukem,62-(346)971-3292,Executive Secretary,2386201910,"Simonis, Johnson and Fay"
-Ab,Davidde,adaviddeph@prnewswire.com,adaviddeph,Daxing,86-(500)810-4696,Community Outreach Specialist,5805532379,Boyer and Sons
-Billye,Betteson,bbettesonpi@redcross.org,bbettesonpi,Longos,351-(101)580-5428,Physical Therapy Assistant,1479316938,Frami-Lesch
-Harley,Brewer,hbrewerpj@upenn.edu,hbrewerpj,Dadoupu,86-(480)441-7751,Community Outreach Specialist,0039146294,"Corkery, Schaefer and Marks"
-Wynnie,Solano,wsolanopk@zdnet.com,wsolanopk,Laidian,86-(253)399-5610,Assistant Professor,2137078449,"McClure, Satterfield and Barton"
-Darn,Haffard,dhaffardpl@ask.com,dhaffardpl,Horton,44-(564)751-3439,Financial Advisor,5938631068,Pollich-Hermann
-Howey,Stallan,hstallanpm@uol.com.br,hstallanpm,Anhai,86-(567)926-3005,VP Sales,3450645838,"Lockman, Crona and Abernathy"
-King,Cicculini,kcicculinipn@devhub.com,kcicculinipn,Bolekhiv,380-(723)375-7883,VP Sales,1728709016,"Murazik, Yundt and Hane"
-Kaela,Crispe,kcrispepo@fc2.com,kcrispepo,Sundsvall,46-(597)539-5689,Actuary,3188646194,Gleichner-Lindgren
-Stearne,Wardingley,swardingleypp@about.me,swardingleypp,Shirgjan,355-(356)611-0499,Librarian,2611445389,Schmidt LLC
-Devan,Swait,dswaitpq@flavors.me,dswaitpq,Yilan,86-(426)167-0401,Nuclear Power Engineer,0436813416,"Prosacco, Muller and Gleason"
-Arline,Cunradi,acunradipr@samsung.com,acunradipr,San Luis,63-(588)882-9972,Speech Pathologist,6075640940,Beatty-Watsica
-Cordi,Barkway,cbarkwayps@g.co,cbarkwayps,Gävle,46-(676)140-3109,Budget/Accounting Analyst I,6375200660,Balistreri-Collier
-Carma,Radcliffe,cradcliffept@mit.edu,cradcliffept,Mineralni Bani,359-(527)871-2652,Programmer Analyst II,8264713580,Quigley Inc
-Camila,Capehorn,ccapehornpu@sfgate.com,ccapehornpu,Oguma,234-(989)667-0635,Statistician I,7343647008,Gutkowski-Ullrich
-Gerri,Molen,gmolenpv@bloglines.com,gmolenpv,Zhoukou,86-(924)447-1128,Professor,0195842693,"Howe, Bogisich and Stroman"
-Maurizio,Cacacie,mcacaciepw@mit.edu,mcacaciepw,Ostrogozhsk,7-(519)339-7578,Data Coordiator,9811795614,"Johnson, Schinner and Pagac"
-Jerrine,Sancias,jsanciaspx@cpanel.net,jsanciaspx,Hayan Hudong,86-(285)373-2471,Graphic Designer,3440547981,Littel-Feeney
-Willie,Worlock,wworlockpy@omniture.com,wworlockpy,Campina Grande,55-(796)613-7498,Staff Scientist,8176496995,"Walsh, Jakubowski and Ernser"
-Page,Salvadori,psalvadoripz@netscape.com,psalvadoripz,Kota Kinabalu,60-(507)527-2407,Account Coordinator,9922888610,"Kertzmann, Funk and Jenkins"
-Alvie,Howsan,ahowsanq0@omniture.com,ahowsanq0,Parion,63-(234)698-7388,Operator,8071753939,Thompson-Keebler
-Emera,Stout,estoutq1@craigslist.org,estoutq1,Dahu,86-(284)198-0386,Quality Control Specialist,7804586396,"Muller, Murazik and Zieme"
-Lois,Gladdifh,lgladdifhq2@instagram.com,lgladdifhq2,Lleida,34-(715)382-4713,Database Administrator II,3633654518,Schumm LLC
-Doug,Lamerton,dlamertonq3@si.edu,dlamertonq3,Villa Alemana,56-(149)630-1570,Research Nurse,2253131156,Hilpert Group
-Theda,Ebbing,tebbingq4@craigslist.org,tebbingq4,Alung,62-(738)502-4534,Analyst Programmer,4591819175,"Farrell, Murazik and Mayert"
-Kassandra,Swalwel,kswalwelq5@amazon.co.jp,kswalwelq5,Sacapulas,502-(884)290-1622,Senior Editor,7185464110,Gibson-Leffler
-Livvy,Burroughes,lburroughesq6@amazonaws.com,lburroughesq6,Bailianhe,86-(458)619-0316,Librarian,1535422378,O'Hara Inc
-Temp,Wardington,twardingtonq7@craigslist.org,twardingtonq7,Ngozi,257-(217)180-8803,Junior Executive,0848046633,"Waelchi, Schamberger and Huels"
-Rhetta,Petrishchev,rpetrishchevq8@irs.gov,rpetrishchevq8,Tsinandali,995-(430)243-4289,Statistician I,7791803836,Pacocha LLC
-Anastassia,Edgar,aedgarq9@cmu.edu,aedgarq9,Labuhansumbawa,62-(644)719-6905,General Manager,1184092605,"Cartwright, Bergstrom and Monahan"
-Giana,Giacobazzi,ggiacobazziqa@jimdo.com,ggiacobazziqa,Tambac,63-(579)835-6229,Quality Control Specialist,6363216184,"Kuhic, Monahan and McGlynn"
-Teriann,Dafydd,tdafyddqb@vistaprint.com,tdafyddqb,Babakanloa,62-(482)920-2072,Human Resources Assistant III,5821778638,"Ritchie, Herman and Lindgren"
-Willa,Tacker,wtackerqc@bigcartel.com,wtackerqc,Ḩurayḑah,967-(806)911-9319,Health Coach II,9135157542,Kunze-Bahringer
-Lucila,Sabater,lsabaterqd@apache.org,lsabaterqd,Humen,86-(614)109-2198,Software Engineer I,5293367323,Dach Group
-Dael,Ondrak,dondrakqe@stumbleupon.com,dondrakqe,Marxog,86-(260)249-8251,Health Coach II,4372560729,Daugherty-Weber
-Wait,St Pierre,wstpierreqf@wordpress.com,wstpierreqf,Biru,86-(860)639-5320,Programmer Analyst III,8047175459,Gaylord-Ebert
-Rasla,Godlonton,rgodlontonqg@altervista.org,rgodlontonqg,Balgatay,976-(232)485-2320,Programmer Analyst III,3673385615,Veum-Braun
-Kristine,Heersema,kheersemaqh@ft.com,kheersemaqh,Choibalsan,976-(538)269-3674,Structural Analysis Engineer,8626952910,Hilpert LLC
-Sly,Causnett,scausnettqi@mozilla.com,scausnettqi,Krajan Gebangan,62-(773)388-2291,Occupational Therapist,7422892277,"Tromp, Ziemann and Grant"
-Cecilius,Sully,csullyqj@mysql.com,csullyqj,Meukek,62-(638)624-8698,Quality Control Specialist,6934177193,Doyle Inc
-Adelaida,Stickford,astickfordqk@washingtonpost.com,astickfordqk,Khoa,856-(931)334-2132,Account Coordinator,7872285312,"Dicki, Bailey and Ratke"
-Rochelle,Reynish,rreynishql@indiatimes.com,rreynishql,Fāryāb,98-(957)306-8416,Media Manager IV,1676544003,Lang Inc
-Odie,Ianniello,oiannielloqm@independent.co.uk,oiannielloqm,La Cumbre,54-(979)726-7040,Account Representative III,7068196918,"Bernhard, Rau and Marvin"
-Haskel,Ladloe,hladloeqn@timesonline.co.uk,hladloeqn,George Town,1-(687)711-7923,Quality Control Specialist,5936963217,"Ryan, Parisian and Swaniawski"
-Olympie,Vassall,ovassallqo@samsung.com,ovassallqo,Vannes,33-(222)237-4683,Media Manager II,8854580236,Koepp-Boehm
-Noll,Beech,nbeechqp@plala.or.jp,nbeechqp,Bloemfontein,27-(804)795-7592,Food Chemist,4394656052,Purdy and Sons
-Konstanze,Thon,kthonqq@google.ru,kthonqq,Tīrān,98-(846)964-8726,Payment Adjustment Coordinator,1904564429,Simonis and Sons
-Leonid,Kerford,lkerfordqr@un.org,lkerfordqr,Dzüünbulag,976-(101)272-5436,Administrative Officer,2082237710,"Swaniawski, Steuber and Runte"
-Reeva,Dyka,rdykaqs@geocities.com,rdykaqs,Mstów,48-(190)592-9280,Environmental Specialist,9030963425,Rippin-Waters
-Galvin,Lumbley,glumbleyqt@reuters.com,glumbleyqt,Feodosiya,380-(562)472-4251,Chemical Engineer,0083583572,"Hilpert, Satterfield and Walker"
-Chet,Spinozzi,cspinozziqu@marriott.com,cspinozziqu,Det Udom,66-(457)173-1407,Data Coordiator,7957694462,Bashirian LLC
-Ryann,Wimlett,rwimlettqv@free.fr,rwimlettqv,Paniówki,48-(203)574-3233,Actuary,6548690974,Nienow and Sons
-Craggie,McCotter,cmccotterqw@feedburner.com,cmccotterqw,Portela,351-(482)524-3475,Pharmacist,4298812022,Abernathy-Kuhic
-Ulberto,Heifer,uheiferqx@yandex.ru,uheiferqx,Omaha,1-(402)346-5913,Software Engineer I,0187278784,Yundt LLC
-Billie,Franchi,bfranchiqy@etsy.com,bfranchiqy,Yinping,86-(788)959-3511,Web Designer I,4035720887,Nolan LLC
-Norbie,Goundsy,ngoundsyqz@fda.gov,ngoundsyqz,São José dos Campos,55-(914)752-8310,Senior Editor,9192798357,Feeney LLC
-Barde,Emlen,bemlenr0@infoseek.co.jp,bemlenr0,Pétange,352-(762)627-9841,Software Consultant,2432326261,"Rice, Eichmann and Will"
-Shelagh,Zemler,szemlerr1@mayoclinic.com,szemlerr1,Filiátes,30-(866)635-4243,Geological Engineer,3958946542,"Hansen, Bernier and Goldner"
-Isidro,Ciani,icianir2@yahoo.co.jp,icianir2,Serednye,380-(288)355-3486,Tax Accountant,1506003982,Torp-Bogisich
-Vivia,Lapworth,vlapworthr3@joomla.org,vlapworthr3,Malino,63-(291)269-3418,Environmental Specialist,0157700771,Jast-Kuhlman
-Roshelle,Churn,rchurnr4@berkeley.edu,rchurnr4,Lingqiao,86-(997)692-6158,Geological Engineer,2603479822,Marquardt and Sons
-Bentley,Vanshin,bvanshinr5@ehow.com,bvanshinr5,Stockholm,46-(653)768-6050,Information Systems Manager,7297467227,"King, Tillman and Nicolas"
-Lois,Mynett,lmynettr6@reuters.com,lmynettr6,Nantes,33-(554)638-9803,Speech Pathologist,1603340408,Veum LLC
-Charity,Krzyzowski,ckrzyzowskir7@archive.org,ckrzyzowskir7,Masebewa,62-(958)826-5880,Staff Scientist,4975412993,"Brakus, Gusikowski and Padberg"
-Clemente,Pottage,cpottager8@census.gov,cpottager8,Tenggun Dajah,62-(506)558-9919,Associate Professor,6455213033,"Purdy, Vandervort and Douglas"
-Kurt,Cowap,kcowapr9@jugem.jp,kcowapr9,Kutao,86-(358)991-3144,Nurse,0616313527,White-Goyette
-Chrissy,Finey,cfineyra@irs.gov,cfineyra,Ningzhong,86-(138)301-0438,Professor,9107665083,Davis and Sons
-Clarinda,Hallgate,challgaterb@linkedin.com,challgaterb,Zinder,227-(332)911-9324,Product Engineer,7179109576,"Lesch, Balistreri and Morissette"
-Carmelle,Chatelain,cchatelainrc@woothemes.com,cchatelainrc,Monte Branco,351-(468)889-1359,Tax Accountant,6018619938,Adams-Harris
-Erskine,Bonin,eboninrd@redcross.org,eboninrd,Sabang,63-(956)745-4358,Actuary,1793329427,"Farrell, White and Bednar"
-Linnet,Castelot,lcastelotre@1688.com,lcastelotre,Jintun,86-(448)985-9715,Senior Sales Associate,6843609481,Pagac and Sons
-Aurthur,Thomke,athomkerf@whitehouse.gov,athomkerf,Głuchów,48-(339)416-4557,Engineer I,7088789183,"Roob, Runolfsdottir and Leffler"
-Donni,Salomon,dsalomonrg@japanpost.jp,dsalomonrg,Forninho,351-(549)953-6906,Account Executive,4908221146,"Wisozk, Greenholt and Hamill"
-Skip,Edensor,sedensorrh@alexa.com,sedensorrh,Victoria,503-(808)383-0356,Project Manager,0126141614,Mayer-Mante
-Albrecht,Ellam,aellamri@businessweek.com,aellamri,La Roche-sur-Yon,33-(857)717-9828,Actuary,4743554497,Parisian-Ankunding
-Loutitia,Simson,lsimsonrj@plala.or.jp,lsimsonrj,Tamontaka,63-(423)893-7361,Assistant Media Planner,6240594598,Schamberger LLC
-Ariel,Cockarill,acockarillrk@amazonaws.com,acockarillrk,Santa Quitéria,55-(584)271-7334,VP Sales,9593299637,"Lang, Bednar and Mayer"
-Nonie,Paulton,npaultonrl@cbslocal.com,npaultonrl,Kladno,420-(149)126-3944,Senior Developer,7724518181,"Bruen, Murray and Kunde"
-Yasmin,Rilston,yrilstonrm@gizmodo.com,yrilstonrm,Petoa,504-(697)889-4705,Environmental Specialist,9003612854,McKenzie and Sons
-Izaak,Gowthrop,igowthroprn@webmd.com,igowthroprn,Ancasti,54-(334)952-0828,Account Executive,9924782984,Cartwright LLC
-Jelene,Badman,jbadmanro@shinystat.com,jbadmanro,Asunción,595-(802)109-9845,Electrical Engineer,3501920857,"Cremin, Heaney and Morissette"
-Staffard,Clausius,sclausiusrp@yellowbook.com,sclausiusrp,Sampao,63-(733)481-2381,Junior Executive,6139413206,Herzog-Beer
-Lilia,Dalliwatr,ldalliwatrrq@deviantart.com,ldalliwatrrq,Hengshan,86-(225)596-7008,Operator,2989513345,Mante-Funk
-Karlotta,Altamirano,kaltamiranorr@vistaprint.com,kaltamiranorr,Ajax,1-(705)315-7495,Legal Assistant,1030691320,Carroll Group
diff --git a/sample_csvs/accessories-sample.csv b/sample_csvs/accessories-sample.csv
new file mode 100644
index 0000000000..6c203ec5a0
--- /dev/null
+++ b/sample_csvs/accessories-sample.csv
@@ -0,0 +1,51 @@
+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
diff --git a/sample_csvs/MOCK_ASSETS_BAD.csv b/sample_csvs/assets-sample-BAD.csv
similarity index 100%
rename from sample_csvs/MOCK_ASSETS_BAD.csv
rename to sample_csvs/assets-sample-BAD.csv
diff --git a/sample_csvs/MOCK_ASSETS_BLANKS.csv b/sample_csvs/assets-sample-BLANKS.csv
similarity index 100%
rename from sample_csvs/MOCK_ASSETS_BLANKS.csv
rename to sample_csvs/assets-sample-BLANKS.csv
diff --git a/sample_csvs/assets-sample.csv b/sample_csvs/assets-sample.csv
new file mode 100644
index 0000000000..329c76d5eb
--- /dev/null
+++ b/sample_csvs/assets-sample.csv
@@ -0,0 +1,151 @@
+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
+Abshire and Sons,Backhoe,ICC-2065556,Ornamental Railings,"Kunde, Doyle and Kozey",Berge Inc,"Wilkinson, Waters and Kerluke",3271901481,Nial,,1786VM80X07,at nulla suspendisse potenti cras in purus eu magna vulputate luctus cum sociis natoque penatibus et magnis dis,2023-01-23,2266.13,,"","","","",""
+"Quitzon, Oberbrunner and Dibbert",Dragline,WBH-2841795,Structural and Misc Steel (Fabrication),Krajcik LLC,"Botsford, Boyle and Herzog",Lindgren-Marquardt,5504512275,Chase,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,""
+Boyer and Sons,Excavator,NNH-3656031,Soft Flooring and Base,"Heaney, Altenwerth and Emmerich",Pollich LLC,Pacocha-Kiehn,4861125177,Chase,,9929FR08W85,,2023-03-01,2300.71,Location,"","","","",Pacocha-Kiehn
+Hayes-Rippin,Trencher,BOL-0305383,Prefabricated Aluminum Metal Canopies,"Botsford, Boyle and Herzog",Walker-Towne,Fritsch-Abernathy,2416994639,Mabelle,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,""
+Romaguera-Flatley,Compactor,YVN-3440973,"Temp Fencing, Decorative Fencing and Gates",Ankunding-Ledner,Berge Inc,Roberts-Anderson,6080904229,Sumner,turpis adipiscing lorem vitae mattis nibh ligula nec sem duis aliquam convallis nunc proin at turpis a pede,0910VB28Q61,,2022-07-24,2967.97,,"","","","",""
+Auer LLC,Bulldozer,YOO-5936907,Electrical,Berge Inc,"Heaney, Altenwerth and Emmerich",Roberts-Anderson,8204459090,Mabelle,,7375EM02N97,proin eu mi nulla ac enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem,2022-10-01,3819.73,,"","","","",""
+Olson Group,Skid-Steer,EJS-7488052,Roofing (Metal),"Fritsch, Sauer and Conn","Romaguera, Goldner and Crooks",Lindgren-Marquardt,1252634576,Flo,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"
+"Powlowski, Monahan and Reichel",Bulldozer,HNY-7340937,Ornamental Railings,"Botsford, Boyle and Herzog",Watsica LLC,Roberts-Anderson,7294510907,Ward,sapien urna pretium nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in,2828XJ28E95,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,""
+Harris LLC,Grader,JHN-0598394,Curb & Gutter,"Heaney, Altenwerth and Emmerich","Fritsch, Sauer and Conn",Waters LLC,0709494209,Nial,orci luctus et ultrices posuere cubilia curae duis faucibus accumsan odio curabitur,2534KR53Y73,vestibulum vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere,2023-04-11,3263.79,User,mbaudy2b,Mickie,Baudy,mbaudy2b@intel.com,""
+Boyer-Okuneva,Backhoe,GEX-7216431,Prefabricated Aluminum Metal Canopies,Pollich LLC,"Upton, Feil and Jast","Jenkins, Goldner and Cruickshank",4030738107,Jere,velit vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat,7055KO63K62,,2022-08-25,2448.17,Location,"","","","",Lynch and Sons
+Ebert-Reilly,Scraper,DWM-3752227,Construction Clean and Final Clean,Watsica LLC,Berge Inc,"Mills, Gleichner and Schamberger",9381884673,Nobe,sed nisl nunc rhoncus dui vel sem sed sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit,0535QM19F37,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,Nial,curae mauris viverra diam vitae quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus vitae ipsum aliquam non,7520IT24T23,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,Bale,molestie hendrerit at vulputate vitae nisl aenean lectus pellentesque eget nunc donec quis orci,2427CL03K39,,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,Karry,egestas metus aenean fermentum donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend,1075JB25N09,,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,Tommy,,9621CJ23Y35,,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,Rolland,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,Kizzee,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,Jeana,,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,Sumner,,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,Mabelle,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,Illa,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,""
+"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,""
+"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,,"","","","",""
+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,""
+"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,""
+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,""
+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,,"","","","",""
+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,""
+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,""
+"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
+Klein Inc,Excavator,IOC-4424021,Elevator,Watsica LLC,Pacocha-Goodwin,Treutel Inc,9408196701,Beverly,,4124VH09F17,,2022-09-12,3321.66,,"","","","",""
+"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,""
+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,""
+"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,""
+"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,,"","","","",""
+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,""
+"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,""
+Cruickshank-Blanda,Grader,CUD-4868409,Electrical and Fire Alarm,Watsica LLC,Ankunding-Ledner,Treutel Inc,7859007380,Kizzee,,0709PI47U54,,2023-01-19,484.12,,"","","","",""
+"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,,"","","","",""
+"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,""
+"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,,"","","","",""
+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,""
+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"
+"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
+"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
+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
+"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,""
+"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,""
+"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,""
+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"
+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,""
+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,""
+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
+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,""
+"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,""
+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,""
+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,,"","","","",""
+"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
+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,""
+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,""
+"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,,"","","","",""
+"Lueilwitz, Herzog and Runte",Skid-Steer,OTH-2531332,HVAC,Mosciski Inc,Ankunding-Ledner,Ledner-Barrows,7517530461,Paloma,,1256WA18C94,,2023-01-14,531.46,,"","","","",""
+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,,"","","","",""
+"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,,"","","","",""
+"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"
+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
+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
+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"
+"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,""
+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,,"","","","",""
+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,""
+"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,""
+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,,"","","","",""
+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,""
+"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,,"","","","",""
+"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,,"","","","",""
+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,,"","","","",""
+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,,"","","","",""
+"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,,"","","","",""
+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,""
+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,""
+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,,"","","","",""
+Borer-Aufderhar,Scraper,OOY-9898294,Electrical,Pacocha-Goodwin,Berge Inc,"Nitzsche, Gislason and Douglas",4556315148,Karry,,0187NT56E91,,2022-08-21,390.85,,"","","","",""
+"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,""
diff --git a/sample_csvs/consumables-sample.csv b/sample_csvs/consumables-sample.csv
new file mode 100644
index 0000000000..962f55ebdd
--- /dev/null
+++ b/sample_csvs/consumables-sample.csv
@@ -0,0 +1,51 @@
+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
diff --git a/sample_csvs/MOCK_LICENSES.csv b/sample_csvs/licenses-sample.csv
similarity index 100%
rename from sample_csvs/MOCK_LICENSES.csv
rename to sample_csvs/licenses-sample.csv
diff --git a/sample_csvs/locations-sample.csv b/sample_csvs/locations-sample.csv
new file mode 100644
index 0000000000..42285f2168
--- /dev/null
+++ b/sample_csvs/locations-sample.csv
@@ -0,0 +1,20 @@
+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
diff --git a/sample_csvs/users-sample.csv b/sample_csvs/users-sample.csv
new file mode 100644
index 0000000000..8ee2359cbc
--- /dev/null
+++ b/sample_csvs/users-sample.csv
@@ -0,0 +1,101 @@
+First Name,Last Name,Email,Username,Activated,Location,Address,City,State,Country,Postal Code,Website,Phone,Job Title,Notes,Employee Number,Company,Manager,Remote,VIP,Start Date,End Date,Gravatar
+Reagen,Tenant,rtenant0@istockphoto.com,rtenant0,true,"Braun, Ullrich and O'Hara",0406 Emmet Drive,,,,,https://netvibes.com,895-137-2034,Nurse Practicioner,ac tellus semper interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum,"",,Reagen Tenant,true,true,2022-03-18,2022-12-04,rtenant0@soup.io
+Kenneth,Lefeuvre,klefeuvre1@woothemes.com,klefeuvre1,false,Mueller LLC,404 Dennis Alley,,,,,,,Senior Quality Engineer,lacus at turpis donec posuere metus vitae ipsum,"",,,true,,,,
+Kiel,Eland,keland2@tinyurl.com,keland2,false,"Mayer, Jacobi and Gibson",3058 Declaration Park,,,,,,,Web Developer I,eu est congue elementum in hac habitasse platea dictumst morbi vestibulum velit id,"",,,true,,,,
+Susana,Kinneally,skinneally3@purevolume.com,skinneally3,false,Block Inc,1 Chive Alley,,,,,,,Software Consultant,phasellus in felis donec semper sapien a libero nam dui proin leo odio porttitor id consequat,"",,,true,,,,
+Wallis,Hadcock,whadcock4@abc.net.au,whadcock4,false,Roob-Bartoletti,496 Hazelcrest Terrace,,,,,,,Information Systems Manager,nam congue risus semper porta volutpat quam pede lobortis ligula sit amet eleifend,"","Hand, Rohan and Oberbrunner",,false,,,,
+Audry,Piell,apiell5@china.com.cn,apiell5,false,Schoen-Hilpert,3136 Talmadge Circle,,,,,,,Chemical Engineer,congue risus semper porta volutpat quam pede lobortis ligula sit amet eleifend pede libero quis orci nullam,"",,,false,,,,
+Veronike,Poytress,vpoytress6@scribd.com,vpoytress6,false,"D'Amore, Schoen and Rogahn",3 Northwestern Hill,,,,,http://acquirethisname.com,198-980-1723,Compensation Analyst,non mattis pulvinar nulla pede ullamcorper augue a suscipit nulla elit ac nulla sed vel enim sit amet,"",,Veronike Poytress,true,true,2022-05-10,2022-08-14,vpoytress6@ed.gov
+Sibel,Serris,sserris7@mayoclinic.com,sserris7,true,Swaniawski and Sons,090 Summit Road,,,,,,,,,,,,false,,,,
+Aldis,Smardon,asmardon8@ifeng.com,asmardon8,false,Huels-Reinger,2 Brown Trail,,,,,,,,,,,,true,,,,
+Juan,,,jlowseley9,true,Nicolas and Sons,0 Village Pass,,,,,,,Cost Accountant,phasellus id sapien in sapien,"",,,true,,,,
+Thaine,Coger,tcogera@naver.com,tcogera,false,Zieme-Davis,31 Little Fleur Park,,,,,,,,,,,,true,,,,
+Adrien,Ciotti,aciottib@ucoz.ru,aciottib,true,"Ward, Wolff and King",61 Graedel Hill,,,,,,,,,,,,false,,,,
+Harmony,Vanetti,hvanettic@wordpress.com,hvanettic,true,"Kulas, Heller and Cormier",35 Hintze Drive,,,,,,,,,,Wyman-Jenkins,,true,,,,
+Pansie,Morston,pmorstond@ebay.com,pmorstond,false,Mosciski-Graham,73222 Walton Street,,,,,,,,,,,,false,,,,
+Court,Halse,chalsee@walmart.com,chalsee,true,"O'Reilly, Hilll and Stokes",61514 Pepper Wood Trail,,,,,,,,,,,,false,,,,
+Gerardo,Scrowby,gscrowbyf@multiply.com,gscrowbyf,false,Cruickshank-Kling,18314 Schlimgen Point,,,,,,,,,,,,false,,,,
+Imojean,Veare,iveareg@chronoengine.com,iveareg,false,Schultz-Lakin,9 Blaine Street,,,,,https://soup.io,502-710-6094,Environmental Tech,consequat lectus in est risus auctor sed,"",,Imojean Veare,false,true,2022-01-24,2022-08-06,iveareg@answers.com
+Samuel,Bickley,sbickleyh@gravatar.com,sbickleyh,true,Langworth-Friesen,5891 Bunker Hill Crossing,,,,,,,,,,Corkery and Sons,,false,,,,
+Niall,Ethington,nethingtoni@google.fr,nethingtoni,true,"Ledner, Klocko and Sipes",511 Springs Parkway,,,,,,,,,,,,false,,,,
+Elfreda,Ilyukhov,eilyukhovj@mashable.com,eilyukhovj,false,Spinka-Ortiz,475 Bluestem Point,,,,,,,Clinical Specialist,felis ut at dolor quis odio consequat varius integer ac,"",,,true,,,,
+Serena,Josling,sjoslingk@oracle.com,sjoslingk,false,Wuckert-Schuster,10512 Fuller Avenue,,,,,,,,,,"Cruickshank, Ziemann and Kreiger",,false,,,,
+Sheelah,Dockwray,sdockwrayl@narod.ru,sdockwrayl,true,Orn-Koss,4241 Scofield Circle,,,,,,,Nurse,vestibulum sed magna at nunc commodo placerat praesent blandit nam nulla integer pede,"",Hermann-Anderson,,true,,,,
+Lanette,Remnant,lremnantm@vinaora.com,lremnantm,false,Abshire LLC,8 Buena Vista Junction,,,,,,,General Manager,mauris ullamcorper purus sit amet,"",Bahringer-Lockman,,false,,,,
+Jordan,Pritty,jprittyn@reverbnation.com,jprittyn,false,Stroman LLC,36 Becker Plaza,,,,,,,,,,Durgan-Bosco,,true,,,,
+Lorrin,Boni,lbonio@msn.com,lbonio,true,Bogisich-Nolan,7 Messerschmidt Point,,,,,,,,,,,,false,,,,
+Marie-ann,Waind,mwaindp@ucoz.ru,mwaindp,true,"Hartmann, Weissnat and Cassin",68082 Schmedeman Court,,,,,,,Nurse,duis faucibus accumsan odio curabitur convallis duis consequat,"",,,true,,,,
+Marti,Daens,mdaensq@huffingtonpost.com,mdaensq,false,Robel-Roob,7 Knutson Pass,,,,,http://gov.uk,381-382-8857,Electrical Engineer,sapien a libero nam dui proin leo,"",,Marti Daens,false,true,2021-12-19,2022-12-08,mdaensq@themeforest.net
+Scotti,Gillison,sgillisonr@intel.com,sgillisonr,true,Howe-Collins,44 Elka Terrace,,,,,,,Financial Advisor,viverra eget congue eget semper rutrum nulla nunc purus,"",,,true,,,,
+Bobbe,Alven,balvens@csmonitor.com,balvens,true,Weimann-Bernhard,71 Manley Park,,,,,,,,,,Champlin-Turcotte,,false,,,,
+Ferdy,Kincade,fkincadet@wsj.com,fkincadet,true,Bode Inc,3023 Novick Alley,,,,,,,Statistician IV,amet nulla quisque arcu libero,"",,,true,,,,
+Rachael,Briers,rbriersu@vimeo.com,rbriersu,false,Koch and Sons,71 Shoshone Court,,,,,,,,,,,,true,,,,
+Ado,Bartholin,abartholinv@ft.com,abartholinv,false,"Buckridge, Klein and Johnston",11 Jenna Avenue,,,,,,,,,,,,false,,,,
+Tessy,,,tsailerw,false,Parker-Beer,0964 Vidon Way,,,,,,,Structural Engineer,aliquet ultrices erat tortor sollicitudin,"",,,true,,,,
+Chloe,Gebbie,cgebbiex@cam.ac.uk,cgebbiex,false,Smith Inc,8 5th Alley,,,,,,,,,,,,true,,,,
+Emlyn,Cusick,ecusicky@homestead.com,ecusicky,true,Dickens LLC,43 Canary Point,,,,,,,Health Coach II,eu tincidunt in leo maecenas pulvinar lobortis est phasellus sit amet erat nulla tempus vivamus in,"",,,true,,,,
+Kenneth,McGuire,kmcguirez@scribd.com,kmcguirez,true,"Torphy, Bednar and Davis",2 Stone Corner Park,,,,,,,Nurse Practicioner,tortor duis mattis egestas metus aenean fermentum donec ut mauris eget massa,"",,,false,,,,
+Berri,Forson,bforson10@pcworld.com,bforson10,true,"D'Amore, Larkin and O'Keefe",266 Alpine Road,,,,,,,Tax Accountant,in purus eu magna vulputate luctus cum sociis natoque penatibus et,"",,,true,,,,
+Bree,Jiru,bjiru11@gravatar.com,bjiru11,true,Altenwerth LLC,58 4th Alley,,,,,,,,,,Farrell and Sons,,true,,,,
+Kathie,Dignan,kdignan12@bbb.org,kdignan12,true,"Pagac, Effertz and Padberg",973 Banding Point,,,,,,,,,,"Marquardt, Cummings and Bosco",,true,,,,
+Filbert,Van Der Straaten,fvanderstraaten13@sourceforge.net,fvanderstraaten13,false,"Cronin, Mante and Klein",0 Stuart Junction,,,,,,,Research Assistant I,ut massa volutpat convallis morbi odio odio elementum eu interdum eu tincidunt in leo maecenas,"",Bauch-Kling,,true,,,,
+Miguel,Farbrace,mfarbrace14@barnesandnoble.com,mfarbrace14,false,O'Keefe Inc,1 Mallory Avenue,,,,,,,Assistant Manager,a libero nam dui proin leo odio porttitor id consequat in consequat ut nulla sed accumsan felis,"",Schmeler-Krajcik,,false,,,,
+Em,,,ekittley15,false,Schuppe-Barrows,9946 Canary Pass,,,,,,,Nuclear Power Engineer,odio curabitur convallis duis consequat dui nec nisi,"","Abshire, Goyette and Spinka",,true,,,,
+Bill,Morales,bmorales16@addtoany.com,bmorales16,true,Leannon Inc,0 Hudson Circle,,,,,,,,,,,,true,,,,
+Spenser,Branca,sbranca17@tripod.com,sbranca17,false,Halvorson Inc,7904 Green Road,,,,,,,,,,,,false,,,,
+Dawna,Ainslee,dainslee18@nifty.com,dainslee18,true,"Strosin, Collier and O'Connell",17 Granby Center,,,,,,,,,,,,false,,,,
+Lind,Fontanet,lfontanet19@lycos.com,lfontanet19,false,Bins-Kunde,84 Kenwood Junction,,,,,,,,,,"Romaguera, Adams and Schoen",,false,,,,
+Ashli,Gheorghie,agheorghie1a@blogtalkradio.com,agheorghie1a,false,Hauck Inc,8 Warrior Drive,,,,,,,,,,Wisozk Inc,,false,,,,
+Janice,Freddi,jfreddi1b@behance.net,jfreddi1b,true,"Stoltenberg, Aufderhar and Schaden",0 Esch Alley,,,,,,,,,,,,false,,,,
+Reinwald,Ivakhin,rivakhin1c@ask.com,rivakhin1c,false,Jacobson-Mosciski,24 New Castle Alley,,,,,,,,,,Welch and Sons,,true,,,,
+Lindsey,Trevance,ltrevance1d@prnewswire.com,ltrevance1d,true,Hansen-Luettgen,17443 Lindbergh Plaza,,,,,,,Web Designer II,interdum eu tincidunt in leo maecenas pulvinar lobortis est phasellus,"",,,false,,,,
+Cordi,Frostdyke,cfrostdyke1e@weather.com,cfrostdyke1e,false,Kohler Inc,53066 Merchant Plaza,,,,,,,,,,,,false,,,,
+Jayme,Piatto,jpiatto1f@slate.com,jpiatto1f,true,Johnson and Sons,5598 Fuller Avenue,,,,,,,Graphic Designer,accumsan felis ut at dolor quis odio consequat varius integer,"",,,true,,,,
+Henriette,Glanvill,hglanvill1g@ifeng.com,hglanvill1g,true,"Mills, Kautzer and Stiedemann",6461 Stang Center,,,,,,,,,,Gibson and Sons,,true,,,,
+Izak,Legen,ilegen1h@berkeley.edu,ilegen1h,true,"Schiller, Runolfsson and Gottlieb",86874 Hovde Avenue,,,,,,,,,,,,false,,,,
+Silas,Vallentin,svallentin1i@zdnet.com,svallentin1i,false,Wolff Inc,15041 Graceland Park,,,,,,,,,,,,true,,,,
+Ansel,Augustus,aaugustus1j@oaic.gov.au,aaugustus1j,true,"Rippin, Frami and Parker",843 Nova Alley,,,,,,,Assistant Media Planner,ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae donec,"",Morissette and Sons,,false,,,,
+Annemarie,Reburn,areburn1k@networksolutions.com,areburn1k,true,Dach Group,05 Crowley Avenue,,,,,,,Administrative Assistant IV,vivamus tortor duis mattis egestas metus aenean fermentum donec,"","Murazik, Wyman and Yost",,false,,,,
+Fee,Bissell,fbissell1l@comsenz.com,fbissell1l,true,Braun Group,678 Nelson Hill,,,,,,,Health Coach IV,sed augue aliquam erat volutpat in congue etiam justo etiam pretium iaculis justo in,"","Lindgren, Quitzon and Heathcote",,true,,,,
+Zenia,Kordt,zkordt1m@com.com,zkordt1m,true,"Harvey, Fay and Yundt",6337 Mayer Trail,,,,,,,Associate Professor,congue etiam justo etiam pretium iaculis justo in hac habitasse platea dictumst etiam faucibus cursus urna,"",,,true,,,,
+Winthrop,Eales,weales1n@stanford.edu,weales1n,true,Johns-Kshlerin,79780 Helena Lane,,,,,,,Accountant I,platea dictumst etiam faucibus cursus urna ut,"",,,false,,,,
+Davis,,,dnatalie1o,false,Tillman-Marquardt,3893 Express Junction,,,,,https://answers.com,266-409-9118,Teacher,suspendisse accumsan tortor quis turpis sed ante vivamus tortor,"",Casper-Grimes,Davis Natalie,false,false,2022-04-08,2022-09-24,dnatalie1o@altervista.org
+Massimiliano,Fardo,mfardo1p@imgur.com,mfardo1p,true,Kozey Group,72 Hauk Terrace,,,,,,,Account Coordinator,parturient montes nascetur ridiculus mus etiam vel augue vestibulum rutrum rutrum neque aenean auctor gravida sem praesent id,"",Bednar Inc,,false,,,,
+Dacey,Larrie,dlarrie1q@digg.com,dlarrie1q,false,Jerde-Ullrich,70371 Del Mar Center,,,,,,,,,,,,true,,,,
+Pattie,Melvin,pmelvin1r@discovery.com,pmelvin1r,false,"McDermott, Mayert and Kemmer",845 Anderson Point,,,,,,,Safety Technician II,sit amet erat nulla tempus vivamus in felis eu sapien cursus vestibulum proin,"",,,true,,,,
+Franny,Laughlin,flaughlin1s@blogspot.com,flaughlin1s,false,Renner-Terry,94 Northfield Pass,,,,,,,,,,"Parisian, Hudson and Bahringer",,false,,,,
+Mariel,Roelvink,mroelvink1t@timesonline.co.uk,mroelvink1t,true,Russel-Blanda,434 Crest Line Road,,,,,http://amazon.de,429-401-0847,Quality Engineer,vel pede morbi porttitor lorem id ligula suspendisse ornare consequat lectus in est risus auctor sed tristique in tempus,"",,Mariel Roelvink,true,false,2022-02-21,2022-09-01,mroelvink1t@feedburner.com
+Josee,Ghirardi,jghirardi1u@arizona.edu,jghirardi1u,true,Koss-Schmitt,96 Kingsford Avenue,,,,,,,,,,,,true,,,,
+Felix,Pheasant,fpheasant1v@soundcloud.com,fpheasant1v,true,Rogahn Group,43 Northridge Place,,,,,,,,,,Hoppe-O'Reilly,,false,,,,
+Stearne,Gwatkins,sgwatkins1w@jugem.jp,sgwatkins1w,false,"Koch, Ferry and Marks",6 Victoria Circle,,,,,,,,,,,,false,,,,
+Nathaniel,Parkinson,nparkinson1x@springer.com,nparkinson1x,true,Harber Group,4589 Clarendon Way,,,,,,,Software Consultant,non mattis pulvinar nulla pede ullamcorper augue a suscipit nulla elit ac nulla sed vel enim sit amet nunc viverra,"",Koepp LLC,,true,,,,
+Blondelle,Crawley,bcrawley1y@ezinearticles.com,bcrawley1y,true,"Hirthe, Bashirian and Feeney",17149 Ridge Oak Park,,,,,,,Help Desk Technician,sit amet cursus id turpis integer aliquet massa id lobortis convallis tortor risus dapibus augue vel accumsan tellus nisi eu,"",,,true,,,,
+Pammi,Yair,pyair1z@virginia.edu,pyair1z,true,"Pfeffer, Schmeler and Dibbert",541 Beilfuss Alley,,,,,,,,,,,,true,,,,
+Tremain,Lattimer,tlattimer20@go.com,tlattimer20,true,"Kuvalis, Kris and Howell",19 Red Cloud Parkway,,,,,,,,,,Gutkowski LLC,,true,,,,
+Moreen,Fermin,mfermin21@w3.org,mfermin21,false,"Romaguera, Spinka and Bayer",50 Eagle Crest Circle,,,,,,,,,,,,true,,,,
+Jena,Taborre,jtaborre22@pinterest.com,jtaborre22,true,Raynor Group,97 Helena Center,,,,,,,Dental Hygienist,vel enim sit amet nunc viverra dapibus nulla suscipit ligula in lacus curabitur at ipsum ac tellus semper interdum mauris,"",,,false,,,,
+Odille,Stede,ostede23@biglobe.ne.jp,ostede23,true,"Boyle, Schowalter and Mayer",88993 Sunbrook Street,,,,,http://live.com,464-815-6024,,,,,Odille Stede,true,false,2021-12-12,2022-06-27,ostede23@lycos.com
+Kori,Fulk,kfulk24@tiny.cc,kfulk24,true,Konopelski and Sons,43 Mockingbird Avenue,,,,,,,,,,"Nikolaus, Cassin and Streich",,true,,,,
+Pollyanna,Cardon,pcardon25@infoseek.co.jp,pcardon25,false,Hickle Group,52088 Almo Junction,,,,,,,,,,"Cronin, Cummerata and Tromp",,false,,,,
+Austin,McGeneay,amcgeneay26@tmall.com,amcgeneay26,true,Yundt-Howell,021 4th Park,,,,,,,Social Worker,est phasellus sit amet erat nulla tempus vivamus in felis eu sapien cursus vestibulum proin eu mi nulla,"",,,true,,,,
+Imogen,Hamill,ihamill27@w3.org,ihamill27,false,Herman-Schulist,802 Sunbrook Place,,,,,http://vistaprint.com,344-665-1217,Registered Nurse,curabitur convallis duis consequat dui nec nisi volutpat,"",,Imogen Hamill,false,false,2021-12-03,2023-04-16,ihamill27@over-blog.com
+Hershel,Bielfeld,hbielfeld28@soup.io,hbielfeld28,true,Kreiger and Sons,6944 Buell Trail,,,,,,,Actuary,curae donec pharetra magna vestibulum aliquet ultrices erat,"",Schmitt-Abbott,,true,,,,
+Korry,,,ksteckings29,true,Bogan Inc,800 Ilene Parkway,,,,,,,,,,,,true,,,,
+Cookie,Warret,cwarret2a@sakura.ne.jp,cwarret2a,false,Murphy-Yost,9 Vera Terrace,,,,,,,Mechanical Systems Engineer,semper rutrum nulla nunc purus phasellus in felis donec semper sapien a libero nam dui proin leo odio,"","Lueilwitz, Beahan and Raynor",,false,,,,
+Wynne,Gonnely,wgonnely2b@facebook.com,wgonnely2b,true,"Frami, Erdman and Mayert",051 Kenwood Junction,,,,,,,,,,,,true,,,,
+Ethelred,Bogey,ebogey2c@infoseek.co.jp,ebogey2c,true,Christiansen and Sons,7414 2nd Pass,,,,,,,Media Manager II,donec odio justo sollicitudin ut suscipit a feugiat et eros vestibulum ac est lacinia,"",,,false,,,,
+Alvera,Tunuy,atunuy2d@bizjournals.com,atunuy2d,false,"Vandervort, Veum and Walker",152 Division Park,,,,,,,,,,"Bartell, Hartmann and Jerde",,false,,,,
+Martino,Rosenbusch,mrosenbusch2e@seesaa.net,mrosenbusch2e,true,Parisian-Romaguera,130 Westridge Alley,,,,,http://bravesites.com,626-888-4072,,,,"Keebler, Walter and Senger",Martino Rosenbusch,false,false,2022-01-20,2022-09-11,mrosenbusch2e@about.me
+Susi,Trapp,strapp2f@ft.com,strapp2f,false,"Rogahn, Volkman and McDermott",72958 Vahlen Avenue,,,,,,,,,,Nitzsche-Langosh,,true,,,,
+Gordon,Alflatt,galflatt2g@marriott.com,galflatt2g,false,Effertz-Howell,0681 International Plaza,,,,,,,Research Associate,duis aliquam convallis nunc proin,"","Farrell, Hoeger and O'Keefe",,true,,,,
+Derrick,Braidon,dbraidon2h@blogs.com,dbraidon2h,false,Prosacco-Walker,8760 Del Sol Circle,,,,,,,,,,Koss-Bogisich,,true,,,,
+Minnnie,Bonar,mbonar2i@biglobe.ne.jp,mbonar2i,true,Daniel LLC,5424 Karstens Alley,,,,,,,Web Designer III,faucibus orci luctus et ultrices posuere cubilia curae mauris,"",,,true,,,,
+Casper,Sinnatt,csinnatt2j@hc360.com,csinnatt2j,true,Barrows-Mertz,79 Melvin Center,,,,,,,,,,,,false,,,,
+Chloe,Fist,cfist2k@auda.org.au,cfist2k,false,"Kling, Streich and Kertzmann",47064 Glacier Hill Court,,,,,,,,,,Altenwerth-Leuschke,,true,,,,
+Elysha,Gosenell,egosenell2l@ft.com,egosenell2l,true,Hirthe LLC,70 Old Gate Alley,,,,,,,Nuclear Power Engineer,amet cursus id turpis integer aliquet massa id lobortis convallis tortor risus dapibus augue vel accumsan tellus,"",Macejkovic and Sons,,false,,,,
+Gerianna,Feirn,gfeirn2m@bing.com,gfeirn2m,true,"Collier, Kirlin and Armstrong",881 Summer Ridge Circle,,,,,,,,,,,,false,,,,
+Lucas,Mulvany,lmulvany2n@deliciousdays.com,lmulvany2n,false,Bahringer Group,639 La Follette Circle,,,,,,,,,,,,true,,,,
+Lenore,Menendez,lmenendez2o@cdbaby.com,lmenendez2o,true,"Nader, Harvey and Casper",02 Springs Avenue,,,,,https://a8.net,926-526-1742,Community Outreach Specialist,ut odio cras mi pede malesuada in imperdiet et commodo vulputate justo in blandit ultrices enim lorem ipsum dolor,"",,Lenore Menendez,true,false,2022-01-11,2022-07-29,lmenendez2o@ifeng.com
+Collete,Brandes,cbrandes2p@accuweather.com,cbrandes2p,true,Koepp-Parisian,5 Haas Way,,,,,,,,,,,,false,,,,
+Osborne,Gummory,ogummory2q@1und1.de,ogummory2q,false,Mertz and Sons,91749 Haas Alley,,,,,,,,,,,,true,,,,
+Emiline,Grossman,egrossman2r@dmoz.org,egrossman2r,true,Parisian and Sons,3872 Eagle Crest Court,,,,,https://uiuc.edu,338-830-8647,Food Chemist,dolor vel est donec odio justo sollicitudin ut suscipit a feugiat et eros vestibulum ac est lacinia nisi venenatis,"",Williamson-Casper,Emiline Grossman,true,true,2021-11-10,2022-10-01,egrossman2r@spiegel.de
diff --git a/stubs/test.stub b/stubs/test.stub
new file mode 100644
index 0000000000..06b35d3e19
--- /dev/null
+++ b/stubs/test.stub
@@ -0,0 +1,13 @@
+<?php
+
+namespace {{ namespace }};
+
+use Tests\TestCase;
+
+class {{ class }} extends TestCase
+{
+    public function testExample()
+    {
+        //
+    }
+}
diff --git a/stubs/test.unit.stub b/stubs/test.unit.stub
new file mode 100644
index 0000000000..06b35d3e19
--- /dev/null
+++ b/stubs/test.unit.stub
@@ -0,0 +1,13 @@
+<?php
+
+namespace {{ namespace }};
+
+use Tests\TestCase;
+
+class {{ class }} extends TestCase
+{
+    public function testExample()
+    {
+        //
+    }
+}
diff --git a/tests/Browser/LoginTest.php b/tests/Browser/LoginTest.php
index 5ed055cda9..18f5172f15 100644
--- a/tests/Browser/LoginTest.php
+++ b/tests/Browser/LoginTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Browser;
 
+use App\Models\Setting;
 use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Laravel\Dusk\Browser;
 use Tests\DuskTestCase;
 
@@ -26,6 +26,9 @@ class LoginTest extends DuskTestCase
         $user->permissions = '{"superuser": 1}';
 
         $user->save();
+
+        Setting::factory()->create();
+
         $this->browse(function (Browser $browser) {
             $browser->visitRoute('login')
                 ->assertSee(trans('auth/general.login_prompt'));
@@ -37,10 +40,7 @@ class LoginTest extends DuskTestCase
                     ->type('password', 'password')
                     ->press(trans('auth/general.login'))
                     ->assertPathIs('/');
-            $browser->screenshot('dashboard'); 
+            $browser->screenshot('dashboard');
         });
-
-        // Delete the user afterwards
-        $user->delete();
     }
 }
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
index ac750d9efc..af46d0e3dc 100644
--- a/tests/DuskTestCase.php
+++ b/tests/DuskTestCase.php
@@ -5,11 +5,14 @@ namespace Tests;
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Laravel\Dusk\TestCase as BaseTestCase;
+use RuntimeException;
 
 abstract class DuskTestCase extends BaseTestCase
 {
     use CreatesApplication;
+    use DatabaseMigrations;
 
     /**
      * Prepare for Dusk test execution.
@@ -19,6 +22,12 @@ abstract class DuskTestCase extends BaseTestCase
      */
     public static function prepare()
     {
+        if (!file_exists(realpath(__DIR__ . '/../') . '/.env.dusk.local')) {
+            throw new RuntimeException(
+                '.env.dusk.local file does not exist. Aborting to avoid wiping your local database'
+            );
+        }
+
         if (! static::runningInSail()) {
             static::startChromeDriver();
         }
diff --git a/tests/Feature/Api/Assets/AssetIndexTest.php b/tests/Feature/Api/Assets/AssetIndexTest.php
new file mode 100644
index 0000000000..778483c1c9
--- /dev/null
+++ b/tests/Feature/Api/Assets/AssetIndexTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Feature\Api\Assets;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class AssetIndexTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testAssetIndexReturnsExpectedAssets()
+    {
+        Asset::factory()->count(3)->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.assets.index', [
+                    'sort' => 'name',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('rows', 3)->etc());
+    }
+
+    public function testAssetIndexAdheresToCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $assetA = Asset::factory()->for($companyA)->create();
+        $assetB = Asset::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewAssets()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewAssets()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.assets.index'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.assets.index'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.assets.index'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.assets.index'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.assets.index'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseDoesNotContainInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.assets.index'))
+            ->assertResponseDoesNotContainInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+    }
+}
diff --git a/tests/Feature/Api/Assets/AssetsForSelectListTest.php b/tests/Feature/Api/Assets/AssetsForSelectListTest.php
new file mode 100644
index 0000000000..cccae38d38
--- /dev/null
+++ b/tests/Feature/Api/Assets/AssetsForSelectListTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Feature\Api\Assets;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class AssetsForSelectListTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testAssetsCanBeSearchedForByAssetTag()
+    {
+        Asset::factory()->create(['asset_tag' => '0001']);
+        Asset::factory()->create(['asset_tag' => '0002']);
+
+        $response = $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertOk();
+
+        $results = collect($response->json('results'));
+
+        $this->assertEquals(2, $results->count());
+        $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, '0001')));
+        $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, '0002')));
+    }
+
+    public function testAssetsAreScopedToCompanyWhenMultipleCompanySupportEnabled()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $assetA = Asset::factory()->for($companyA)->create(['asset_tag' => '0001']);
+        $assetB = Asset::factory()->for($companyB)->create(['asset_tag' => '0002']);
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewAssets()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewAssets()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertResponseContainsInResults($assetA)
+            ->assertResponseContainsInResults($assetB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertResponseContainsInResults($assetA)
+            ->assertResponseContainsInResults($assetB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertResponseContainsInResults($assetA)
+            ->assertResponseContainsInResults($assetB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertResponseContainsInResults($assetA)
+            ->assertResponseContainsInResults($assetB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertResponseContainsInResults($assetA)
+            ->assertResponseDoesNotContainInResults($assetB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('assets.selectlist', ['search' => '000']))
+            ->assertResponseDoesNotContainInResults($assetA)
+            ->assertResponseContainsInResults($assetB);
+    }
+}
diff --git a/tests/Feature/Api/Assets/RequestableAssetsTest.php b/tests/Feature/Api/Assets/RequestableAssetsTest.php
new file mode 100644
index 0000000000..8649b1b00b
--- /dev/null
+++ b/tests/Feature/Api/Assets/RequestableAssetsTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Tests\Feature\Api\Assets;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class RequestableAssetsTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testViewingRequestableAssetsRequiresCorrectPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.assets.requestable'))
+            ->assertForbidden();
+    }
+
+    public function testReturnsRequestableAssets()
+    {
+        $requestableAsset = Asset::factory()->requestable()->create(['asset_tag' => 'requestable']);
+        $nonRequestableAsset = Asset::factory()->nonrequestable()->create(['asset_tag' => 'non-requestable']);
+
+        $this->actingAsForApi(User::factory()->viewRequestableAssets()->create())
+            ->getJson(route('api.assets.requestable'))
+            ->assertOk()
+            ->assertResponseContainsInRows($requestableAsset, 'asset_tag')
+            ->assertResponseDoesNotContainInRows($nonRequestableAsset, 'asset_tag');
+    }
+
+    public function testRequestableAssetsAreScopedToCompanyWhenMultipleCompanySupportEnabled()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $assetA = Asset::factory()->requestable()->for($companyA)->create(['asset_tag' => '0001']);
+        $assetB = Asset::factory()->requestable()->for($companyB)->create(['asset_tag' => '0002']);
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewRequestableAssets()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewRequestableAssets()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.assets.requestable'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.assets.requestable'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.assets.requestable'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.assets.requestable'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.assets.requestable'))
+            ->assertResponseContainsInRows($assetA, 'asset_tag')
+            ->assertResponseDoesNotContainInRows($assetB, 'asset_tag');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.assets.requestable'))
+            ->assertResponseDoesNotContainInRows($assetA, 'asset_tag')
+            ->assertResponseContainsInRows($assetB, 'asset_tag');
+    }
+}
diff --git a/tests/Feature/Api/Components/ComponentIndexTest.php b/tests/Feature/Api/Components/ComponentIndexTest.php
new file mode 100644
index 0000000000..ee83b7a46d
--- /dev/null
+++ b/tests/Feature/Api/Components/ComponentIndexTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Api\Components;
+
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class ComponentIndexTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testComponentIndexAdheresToCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $componentA = Component::factory()->for($companyA)->create();
+        $componentB = Component::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewComponents()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewComponents()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.components.index'))
+            ->assertResponseContainsInRows($componentA)
+            ->assertResponseContainsInRows($componentB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.components.index'))
+            ->assertResponseContainsInRows($componentA)
+            ->assertResponseContainsInRows($componentB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.components.index'))
+            ->assertResponseContainsInRows($componentA)
+            ->assertResponseContainsInRows($componentB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.components.index'))
+            ->assertResponseContainsInRows($componentA)
+            ->assertResponseContainsInRows($componentB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.components.index'))
+            ->assertResponseContainsInRows($componentA)
+            ->assertResponseDoesNotContainInRows($componentB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.components.index'))
+            ->assertResponseDoesNotContainInRows($componentA)
+            ->assertResponseContainsInRows($componentB);
+    }
+}
diff --git a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php b/tests/Feature/Api/Consumables/ConsumablesIndexTest.php
new file mode 100644
index 0000000000..33c10ed078
--- /dev/null
+++ b/tests/Feature/Api/Consumables/ConsumablesIndexTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Api\Consumables;
+
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class ConsumablesIndexTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testConsumableIndexAdheresToCompanyScoping()
+    {
+        [$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.index'))
+            ->assertResponseContainsInRows($consumableA)
+            ->assertResponseContainsInRows($consumableB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.consumables.index'))
+            ->assertResponseContainsInRows($consumableA)
+            ->assertResponseContainsInRows($consumableB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.consumables.index'))
+            ->assertResponseContainsInRows($consumableA)
+            ->assertResponseContainsInRows($consumableB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.consumables.index'))
+            ->assertResponseContainsInRows($consumableA)
+            ->assertResponseContainsInRows($consumableB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.consumables.index'))
+            ->assertResponseContainsInRows($consumableA)
+            ->assertResponseDoesNotContainInRows($consumableB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.consumables.index'))
+            ->assertResponseDoesNotContainInRows($consumableA)
+            ->assertResponseContainsInRows($consumableB);
+    }
+}
diff --git a/tests/Feature/Api/Licenses/LicensesIndexTest.php b/tests/Feature/Api/Licenses/LicensesIndexTest.php
new file mode 100644
index 0000000000..a21a27da73
--- /dev/null
+++ b/tests/Feature/Api/Licenses/LicensesIndexTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Api\Licenses;
+
+use App\Models\Company;
+use App\Models\License;
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class LicensesIndexTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testLicensesIndexAdheresToCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $licenseA = License::factory()->for($companyA)->create();
+        $licenseB = License::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewLicenses()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewLicenses()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.licenses.index'))
+            ->assertResponseContainsInRows($licenseA)
+            ->assertResponseContainsInRows($licenseB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.licenses.index'))
+            ->assertResponseContainsInRows($licenseA)
+            ->assertResponseContainsInRows($licenseB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.licenses.index'))
+            ->assertResponseContainsInRows($licenseA)
+            ->assertResponseContainsInRows($licenseB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.licenses.index'))
+            ->assertResponseContainsInRows($licenseA)
+            ->assertResponseContainsInRows($licenseB);
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.licenses.index'))
+            ->assertResponseContainsInRows($licenseA)
+            ->assertResponseDoesNotContainInRows($licenseB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.licenses.index'))
+            ->assertResponseDoesNotContainInRows($licenseA)
+            ->assertResponseContainsInRows($licenseB);
+    }
+}
diff --git a/tests/Feature/Api/Locations/LocationsForSelectListTest.php b/tests/Feature/Api/Locations/LocationsForSelectListTest.php
new file mode 100644
index 0000000000..4170cfc7f7
--- /dev/null
+++ b/tests/Feature/Api/Locations/LocationsForSelectListTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Feature\Api\Locations;
+
+use App\Models\Location;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class LocationsForSelectListTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testGettingLocationListRequiresProperPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.locations.selectlist'))
+            ->assertForbidden();
+    }
+
+    public function testLocationsReturned()
+    {
+        Location::factory()->create();
+
+        // see the where the "view.selectlists" is defined in the AuthServiceProvider
+        // for info on why "createUsers()" is used here.
+        $this->actingAsForApi(User::factory()->createUsers()->create())
+            ->getJson(route('api.locations.selectlist'))
+            ->assertOk()
+            ->assertJsonStructure([
+                'results',
+                'pagination',
+                'total_count',
+                'page',
+                'page_count',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('results', 1)->etc());
+    }
+
+    public function testLocationsAreReturnedWhenUserIsUpdatingTheirProfileAndHasPermissionToUpdateLocation()
+    {
+        $this->actingAsForApi(User::factory()->canEditOwnLocation()->create())
+            ->withHeader('referer', route('profile'))
+            ->getJson(route('api.locations.selectlist'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php
new file mode 100644
index 0000000000..8cdf700f04
--- /dev/null
+++ b/tests/Feature/Api/Users/UsersForSelectListTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Tests\Feature\Api\Users;
+
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Laravel\Passport\Passport;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class UsersForSelectListTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testUsersAreReturned()
+    {
+        $users = User::factory()->superuser()->count(3)->create();
+
+        Passport::actingAs($users->first());
+        $this->getJson(route('api.users.selectlist'))
+            ->assertOk()
+            ->assertJsonStructure([
+                'results',
+                'pagination',
+                'total_count',
+                'page',
+                'page_count',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('results', 3)->etc());
+    }
+
+    public function testUsersCanBeSearchedByFirstAndLastName()
+    {
+        User::factory()->create(['first_name' => 'Luke', 'last_name' => 'Skywalker']);
+
+        Passport::actingAs(User::factory()->create());
+        $response = $this->getJson(route('api.users.selectlist', ['search' => 'luke sky']))->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();
+
+        $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'],
+        ))->create();
+
+        $sith = Company::factory()
+            ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader']))
+            ->create();
+
+        Passport::actingAs($jedi->users->first());
+        $response = $this->getJson(route('api.users.selectlist'))->assertOk();
+
+        $results = collect($response->json('results'));
+
+        $this->assertEquals(3, $results->count());
+        $this->assertTrue(
+            $results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke'))
+        );
+        $this->assertFalse(
+            $results->pluck('text')->contains(fn($text) => str_contains($text, 'Darth'))
+        );
+    }
+
+    public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySupportEnabled()
+    {
+        $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'],
+        ))->create();
+
+        Company::factory()
+            ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader']))
+            ->create();
+
+        Passport::actingAs($jedi->users->first());
+        $response = $this->getJson(route('api.users.selectlist', ['search' => 'a']))->assertOk();
+
+        $results = collect($response->json('results'));
+
+        $this->assertEquals(3, $results->count());
+        $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();
+        $this->assertEquals(0, collect($response->json('results'))->count());
+    }
+}
diff --git a/tests/Feature/Api/Users/UsersSearchTest.php b/tests/Feature/Api/Users/UsersSearchTest.php
new file mode 100644
index 0000000000..f14d704b0f
--- /dev/null
+++ b/tests/Feature/Api/Users/UsersSearchTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Tests\Feature\Api\Users;
+
+use App\Models\User;
+use Laravel\Passport\Passport;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class UsersSearchTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testCanSearchByUserFirstAndLastName()
+    {
+        User::factory()->create(['first_name' => 'Luke', 'last_name' => 'Skywalker']);
+        User::factory()->create(['first_name' => 'Darth', 'last_name' => 'Vader']);
+
+        Passport::actingAs(User::factory()->viewUsers()->create());
+        $response = $this->getJson(route('api.users.index', ['search' => 'luke sky']))->assertOk();
+
+        $results = collect($response->json('rows'));
+
+        $this->assertEquals(1, $results->count());
+        $this->assertTrue($results->pluck('name')->contains(fn($text) => str_contains($text, 'Luke')));
+        $this->assertFalse($results->pluck('name')->contains(fn($text) => str_contains($text, 'Darth')));
+    }
+
+    public function testResultsWhenSearchingForActiveUsers()
+    {
+        User::factory()->create(['first_name' => 'Active', 'last_name' => 'User']);
+        User::factory()->create(['first_name' => 'Deleted', 'last_name' => 'User'])->delete();
+
+        $response = $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'deleted' => 'false',
+                'company_id' => '',
+                'search' => 'user',
+                'order' => 'asc',
+                'offset' => '0',
+                'limit' => '20',
+            ]))
+            ->assertOk();
+
+        $firstNames = collect($response->json('rows'))->pluck('first_name');
+
+        $this->assertTrue(
+            $firstNames->contains('Active'),
+            'Expected user does not appear in results'
+        );
+
+        $this->assertFalse(
+            $firstNames->contains('Deleted'),
+            'Unexpected deleted user appears in results'
+        );
+    }
+
+    public function testResultsWhenSearchingForDeletedUsers()
+    {
+        User::factory()->create(['first_name' => 'Active', 'last_name' => 'User']);
+        User::factory()->create(['first_name' => 'Deleted', 'last_name' => 'User'])->delete();
+
+        $response = $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'deleted' => 'true',
+                'company_id' => '',
+                'search' => 'user',
+                'order' => 'asc',
+                'offset' => '0',
+                'limit' => '20',
+            ]))
+            ->assertOk();
+
+        $firstNames = collect($response->json('rows'))->pluck('first_name');
+
+        $this->assertFalse(
+            $firstNames->contains('Active'),
+            'Unexpected active user appears in results'
+        );
+
+        $this->assertTrue(
+            $firstNames->contains('Deleted'),
+            'Expected deleted user does not appear in results'
+        );
+    }
+}
diff --git a/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php
new file mode 100644
index 0000000000..a49b1167cb
--- /dev/null
+++ b/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Feature\CheckoutAcceptances;
+
+use App\Models\Accessory;
+use App\Models\CheckoutAcceptance;
+use App\Notifications\AcceptanceAssetAcceptedNotification;
+use App\Notifications\AcceptanceAssetDeclinedNotification;
+use Notification;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class AccessoryAcceptanceTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    /**
+     * This can be absorbed into a bigger test
+     */
+    public function testUsersNameIsIncludedInAccessoryAcceptedNotification()
+    {
+        Notification::fake();
+
+        $this->settings->enableAlertEmail();
+
+        $acceptance = CheckoutAcceptance::factory()
+            ->pending()
+            ->for(Accessory::factory()->appleMouse(), 'checkoutable')
+            ->create();
+
+        $this->actingAs($acceptance->assignedTo)
+            ->post(route('account.store-acceptance', $acceptance), ['asset_acceptance' => 'accepted'])
+            ->assertSessionHasNoErrors();
+
+        $this->assertNotNull($acceptance->fresh()->accepted_at);
+
+        Notification::assertSentTo(
+            $acceptance,
+            function (AcceptanceAssetAcceptedNotification $notification) use ($acceptance) {
+                $this->assertStringContainsString(
+                    $acceptance->assignedTo->present()->fullName,
+                    $notification->toMail()->render()
+                );
+
+                return true;
+            }
+        );
+    }
+
+    /**
+     * This can be absorbed into a bigger test
+     */
+    public function testUsersNameIsIncludedInAccessoryDeclinedNotification()
+    {
+        Notification::fake();
+
+        $this->settings->enableAlertEmail();
+
+        $acceptance = CheckoutAcceptance::factory()
+            ->pending()
+            ->for(Accessory::factory()->appleMouse(), 'checkoutable')
+            ->create();
+
+        $this->actingAs($acceptance->assignedTo)
+            ->post(route('account.store-acceptance', $acceptance), ['asset_acceptance' => 'declined'])
+            ->assertSessionHasNoErrors();
+
+        $this->assertNotNull($acceptance->fresh()->declined_at);
+
+        Notification::assertSentTo(
+            $acceptance,
+            function (AcceptanceAssetDeclinedNotification $notification) use ($acceptance) {
+                $this->assertStringContainsString(
+                    $acceptance->assignedTo->present()->fullName,
+                    $notification->toMail($acceptance)->render()
+                );
+
+                return true;
+            }
+        );
+    }
+}
diff --git a/tests/Feature/DashboardTest.php b/tests/Feature/DashboardTest.php
new file mode 100644
index 0000000000..4e9459fb06
--- /dev/null
+++ b/tests/Feature/DashboardTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class DashboardTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testUsersWithoutAdminAccessAreRedirected()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('home'))
+            ->assertRedirect(route('view-assets'));
+    }
+}
diff --git a/tests/Feature/Notifications/AccessoryWebhookTest.php b/tests/Feature/Notifications/AccessoryWebhookTest.php
new file mode 100644
index 0000000000..a1db59b985
--- /dev/null
+++ b/tests/Feature/Notifications/AccessoryWebhookTest.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Tests\Feature\Notifications;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Events\CheckoutableCheckedOut;
+use App\Models\Accessory;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\CheckinAccessoryNotification;
+use App\Notifications\CheckoutAccessoryNotification;
+use Illuminate\Notifications\AnonymousNotifiable;
+use Illuminate\Support\Facades\Notification;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class AccessoryWebhookTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testAccessoryCheckoutSendsWebhookNotificationWhenSettingEnabled()
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            Accessory::factory()->appleBtKeyboard()->create(),
+            User::factory()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckoutAccessoryNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    public function testAccessoryCheckoutDoesNotSendWebhookNotificationWhenSettingDisabled()
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            Accessory::factory()->appleBtKeyboard()->create(),
+            User::factory()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckoutAccessoryNotification::class);
+    }
+
+    public function testAccessoryCheckinSendsWebhookNotificationWhenSettingEnabled()
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            Accessory::factory()->appleBtKeyboard()->create(),
+            User::factory()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckinAccessoryNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    public function testAccessoryCheckinDoesNotSendWebhookNotificationWhenSettingDisabled()
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            Accessory::factory()->appleBtKeyboard()->create(),
+            User::factory()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckinAccessoryNotification::class);
+    }
+}
diff --git a/tests/Feature/Notifications/AssetWebhookTest.php b/tests/Feature/Notifications/AssetWebhookTest.php
new file mode 100644
index 0000000000..ae45a4caa4
--- /dev/null
+++ b/tests/Feature/Notifications/AssetWebhookTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Tests\Feature\Notifications;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Events\CheckoutableCheckedOut;
+use App\Models\Asset;
+use App\Models\Location;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\CheckinAssetNotification;
+use App\Notifications\CheckoutAssetNotification;
+use Illuminate\Notifications\AnonymousNotifiable;
+use Illuminate\Support\Facades\Notification;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class AssetWebhookTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function targets(): array
+    {
+        return [
+            'Asset checked out to user' => [fn() => User::factory()->create()],
+            'Asset checked out to asset' => [fn() => $this->createAsset()],
+            'Asset checked out to location' => [fn() => Location::factory()->create()],
+        ];
+    }
+
+    /** @dataProvider targets */
+    public function testAssetCheckoutSendsWebhookNotificationWhenSettingEnabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            $this->createAsset(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckoutAssetNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    /** @dataProvider targets */
+    public function testAssetCheckoutDoesNotSendWebhookNotificationWhenSettingDisabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            $this->createAsset(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckoutAssetNotification::class);
+    }
+
+    /** @dataProvider targets */
+    public function testAssetCheckinSendsWebhookNotificationWhenSettingEnabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            $this->createAsset(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckinAssetNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    /** @dataProvider targets */
+    public function testAssetCheckinDoesNotSendWebhookNotificationWhenSettingDisabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            $this->createAsset(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckinAssetNotification::class);
+    }
+
+    private function createAsset()
+    {
+        return Asset::factory()->laptopMbp()->create();
+    }
+}
diff --git a/tests/Feature/Notifications/ComponentWebhookTest.php b/tests/Feature/Notifications/ComponentWebhookTest.php
new file mode 100644
index 0000000000..8f3a51b15d
--- /dev/null
+++ b/tests/Feature/Notifications/ComponentWebhookTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Feature\Notifications;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Events\CheckoutableCheckedOut;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\User;
+use Illuminate\Support\Facades\Notification;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class ComponentWebhookTest extends TestCase
+{
+
+    use InteractsWithSettings;
+
+    public function testComponentCheckoutDoesNotSendWebhookNotification()
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            Component::factory()->ramCrucial8()->create(),
+            Asset::factory()->laptopMbp()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNothingSent();
+    }
+
+    public function testComponentCheckinDoesNotSendWebhookNotification()
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            Component::factory()->ramCrucial8()->create(),
+            Asset::factory()->laptopMbp()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNothingSent();
+    }
+}
diff --git a/tests/Feature/Notifications/ConsumableWebhookTest.php b/tests/Feature/Notifications/ConsumableWebhookTest.php
new file mode 100644
index 0000000000..854fdf5341
--- /dev/null
+++ b/tests/Feature/Notifications/ConsumableWebhookTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Feature\Notifications;
+
+use App\Events\CheckoutableCheckedOut;
+use App\Models\Consumable;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\CheckoutConsumableNotification;
+use Illuminate\Notifications\AnonymousNotifiable;
+use Illuminate\Support\Facades\Notification;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class ConsumableWebhookTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testConsumableCheckoutSendsWebhookNotificationWhenSettingEnabled()
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            Consumable::factory()->cardstock()->create(),
+            User::factory()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckoutConsumableNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    public function testConsumableCheckoutDoesNotSendWebhookNotificationWhenSettingDisabled()
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            Consumable::factory()->cardstock()->create(),
+            User::factory()->create(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckoutConsumableNotification::class);
+    }
+}
diff --git a/tests/Feature/Notifications/LicenseWebhookTest.php b/tests/Feature/Notifications/LicenseWebhookTest.php
new file mode 100644
index 0000000000..4313ff69d4
--- /dev/null
+++ b/tests/Feature/Notifications/LicenseWebhookTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Tests\Feature\Notifications;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Events\CheckoutableCheckedOut;
+use App\Models\Asset;
+use App\Models\LicenseSeat;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\CheckinLicenseSeatNotification;
+use App\Notifications\CheckoutLicenseSeatNotification;
+use Illuminate\Notifications\AnonymousNotifiable;
+use Illuminate\Support\Facades\Notification;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class LicenseWebhookTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function targets(): array
+    {
+        return [
+            'License checked out to user' => [fn() => User::factory()->create()],
+            'License checked out to asset' => [fn() => Asset::factory()->laptopMbp()->create()],
+        ];
+    }
+
+    /** @dataProvider targets */
+    public function testLicenseCheckoutSendsWebhookNotificationWhenSettingEnabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            LicenseSeat::factory()->create(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckoutLicenseSeatNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    /** @dataProvider targets */
+    public function testLicenseCheckoutDoesNotSendWebhookNotificationWhenSettingDisabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedOut(
+            LicenseSeat::factory()->create(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckoutLicenseSeatNotification::class);
+    }
+
+    /** @dataProvider targets */
+    public function testLicenseCheckinSendsWebhookNotificationWhenSettingEnabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->enableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            LicenseSeat::factory()->create(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertSentTo(
+            new AnonymousNotifiable,
+            CheckinLicenseSeatNotification::class,
+            function ($notification, $channels, $notifiable) {
+                return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
+            }
+        );
+    }
+
+    /** @dataProvider targets */
+    public function testLicenseCheckinDoesNotSendWebhookNotificationWhenSettingDisabled($checkoutTarget)
+    {
+        Notification::fake();
+
+        $this->settings->disableWebhook();
+
+        event(new CheckoutableCheckedIn(
+            LicenseSeat::factory()->create(),
+            $checkoutTarget(),
+            User::factory()->superuser()->create(),
+            ''
+        ));
+
+        Notification::assertNotSentTo(new AnonymousNotifiable, CheckinLicenseSeatNotification::class);
+    }
+}
diff --git a/tests/Feature/Users/UpdateUserTest.php b/tests/Feature/Users/UpdateUserTest.php
new file mode 100644
index 0000000000..9ddb323625
--- /dev/null
+++ b/tests/Feature/Users/UpdateUserTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Users;
+
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class UpdateUserTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testUsersCanBeActivated()
+    {
+        $admin = User::factory()->superuser()->create();
+        $user = User::factory()->create(['activated' => false]);
+
+        $this->actingAs($admin)
+            ->put(route('users.update', $user), [
+                'first_name' => $user->first_name,
+                'username' => $user->username,
+                'activated' => 1,
+            ]);
+
+        $this->assertTrue($user->refresh()->activated);
+    }
+
+    public function testUsersCanBeDeactivated()
+    {
+        $admin = User::factory()->superuser()->create();
+        $user = User::factory()->create(['activated' => true]);
+
+        $this->actingAs($admin)
+            ->put(route('users.update', $user), [
+                'first_name' => $user->first_name,
+                'username' => $user->username,
+                // checkboxes that are not checked are
+                // not included in the request payload
+                // 'activated' => 0,
+            ]);
+
+        $this->assertFalse($user->refresh()->activated);
+    }
+
+    public function testUsersUpdatingThemselvesDoNotDeactivateTheirAccount()
+    {
+        $admin = User::factory()->superuser()->create(['activated' => true]);
+
+        $this->actingAs($admin)
+            ->put(route('users.update', $admin), [
+                'first_name' => $admin->first_name,
+                'username' => $admin->username,
+                // checkboxes that are disabled are not
+                // included in the request payload
+                // even if they are checked
+                // 'activated' => 0,
+            ]);
+
+        $this->assertTrue($admin->refresh()->activated);
+    }
+}
diff --git a/tests/Support/CustomTestMacros.php b/tests/Support/CustomTestMacros.php
new file mode 100644
index 0000000000..0a30d7c243
--- /dev/null
+++ b/tests/Support/CustomTestMacros.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Support;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Assert;
+use RuntimeException;
+
+trait CustomTestMacros
+{
+    protected function registerCustomMacros()
+    {
+        $guardAgainstNullProperty = function (Model $model, string $property) {
+            if (is_null($model->{$property})) {
+                throw new RuntimeException(
+                    "The property ({$property}) either does not exist or is null on the model which isn't helpful for comparison."
+                );
+            }
+        };
+
+        TestResponse::macro(
+            'assertResponseContainsInRows',
+            function (Model $model, string $property = 'name') use ($guardAgainstNullProperty) {
+                $guardAgainstNullProperty($model, $property);
+
+                Assert::assertTrue(collect($this['rows'])->pluck($property)->contains($model->{$property}));
+
+                return $this;
+            }
+        );
+
+        TestResponse::macro(
+            'assertResponseDoesNotContainInRows',
+            function (Model $model, string $property = 'name') use ($guardAgainstNullProperty) {
+                $guardAgainstNullProperty($model, $property);
+
+                Assert::assertFalse(collect($this['rows'])->pluck($property)->contains($model->{$property}));
+
+                return $this;
+            }
+        );
+
+        TestResponse::macro(
+            'assertResponseContainsInResults',
+            function (Model $model, string $property = 'id') use ($guardAgainstNullProperty) {
+                $guardAgainstNullProperty($model, $property);
+
+                Assert::assertTrue(collect($this->json('results'))->pluck('id')->contains($model->{$property}));
+
+                return $this;
+            }
+        );
+
+        TestResponse::macro(
+            'assertResponseDoesNotContainInResults',
+            function (Model $model, string $property = 'id') use ($guardAgainstNullProperty) {
+                $guardAgainstNullProperty($model, $property);
+
+                Assert::assertFalse(collect($this->json('results'))->pluck('id')->contains($model->{$property}));
+
+                return $this;
+            }
+        );
+    }
+}
diff --git a/tests/Support/InteractsWithAuthentication.php b/tests/Support/InteractsWithAuthentication.php
new file mode 100644
index 0000000000..27b20e382b
--- /dev/null
+++ b/tests/Support/InteractsWithAuthentication.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Support;
+
+use Illuminate\Contracts\Auth\Authenticatable;
+use Laravel\Passport\Passport;
+
+trait InteractsWithAuthentication
+{
+    protected function actingAsForApi(Authenticatable $user)
+    {
+        Passport::actingAs($user);
+
+        return $this;
+    }
+}
diff --git a/tests/Support/InteractsWithSettings.php b/tests/Support/InteractsWithSettings.php
new file mode 100644
index 0000000000..a8c0070188
--- /dev/null
+++ b/tests/Support/InteractsWithSettings.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Setting;
+
+trait InteractsWithSettings
+{
+    protected Settings $settings;
+
+    public function initializeSettings()
+    {
+        $this->settings = Settings::initialize();
+
+        $this->beforeApplicationDestroyed(fn() => Setting::$_cache = null);
+    }
+}
diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
new file mode 100644
index 0000000000..17f8af23d2
--- /dev/null
+++ b/tests/Support/Settings.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Setting;
+
+class Settings
+{
+    private Setting $setting;
+
+    private function __construct()
+    {
+        $this->setting = Setting::factory()->create();
+    }
+
+    public static function initialize(): Settings
+    {
+        return new self();
+    }
+
+    public function enableAlertEmail(string $email = 'notifications@afcrichmond.com'): Settings
+    {
+        return $this->update(['alert_email' => $email]);
+    }
+
+    public function disableAlertEmail(): Settings
+    {
+        return $this->update(['alert_email' => null]);
+    }
+
+    public function enableMultipleFullCompanySupport(): Settings
+    {
+        return $this->update(['full_multiple_companies_support' => 1]);
+    }
+
+    public function disableMultipleFullCompanySupport(): Settings
+    {
+        return $this->update(['full_multiple_companies_support' => 0]);
+    }
+
+    public function enableWebhook(): Settings
+    {
+        return $this->update([
+            'webhook_botname' => 'SnipeBot5000',
+            'webhook_endpoint' => 'https://hooks.slack.com/services/NZ59/Q446/672N',
+            'webhook_channel' => '#it',
+        ]);
+    }
+
+    public function disableWebhook(): Settings
+    {
+        return $this->update([
+            'webhook_botname' => '',
+            'webhook_endpoint' => '',
+            'webhook_channel' => '',
+        ]);
+    }
+
+    public function enableAutoIncrement(): Settings
+    {
+        return $this->update([
+            'auto_increment_assets' => 1,
+            'auto_increment_prefix' => 'ABCD',
+            'next_auto_tag_base' => '123',
+            'zerofill_count' => 5
+        ]);
+
+    }
+
+    /**
+     * @param array $attributes Attributes to modify in the application's settings.
+     */
+    public function set(array $attributes): Settings
+    {
+        return $this->update($attributes);
+    }
+
+    private function update(array $attributes): Settings
+    {
+        Setting::unguarded(fn() => $this->setting->update($attributes));
+        Setting::$_cache = null;
+
+        return $this;
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2932d4a69d..03f273ad6f 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,9 +2,41 @@
 
 namespace Tests;
 
+use App\Http\Middleware\SecurityHeaders;
+use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use RuntimeException;
+use Tests\Support\CustomTestMacros;
+use Tests\Support\InteractsWithAuthentication;
+use Tests\Support\InteractsWithSettings;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
+    use CustomTestMacros;
+    use InteractsWithAuthentication;
+    use LazilyRefreshDatabase;
+
+    private array $globallyDisabledMiddleware = [
+        SecurityHeaders::class,
+    ];
+
+    protected function setUp(): void
+    {
+        if (!file_exists(realpath(__DIR__ . '/../') . '/.env.testing')) {
+            throw new RuntimeException(
+                '.env.testing file does not exist. Aborting to avoid wiping your local database'
+            );
+        }
+
+        parent::setUp();
+
+        $this->withoutMiddleware($this->globallyDisabledMiddleware);
+
+        if (collect(class_uses_recursive($this))->contains(InteractsWithSettings::class)) {
+            $this->initializeSettings();
+        }
+
+        $this->registerCustomMacros();
+    }
 }
diff --git a/tests/Unit/AccessoryTest.php b/tests/Unit/AccessoryTest.php
index dafcce663f..ec931fad6e 100644
--- a/tests/Unit/AccessoryTest.php
+++ b/tests/Unit/AccessoryTest.php
@@ -6,20 +6,10 @@ use App\Models\Manufacturer;
 use App\Models\Location;
 use App\Models\Category;
 use App\Models\Company;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
-class AccessoryTest extends BaseTest
+class AccessoryTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-    
-
     public function testAnAccessoryBelongsToACompany()
     {
         $accessory = Accessory::factory()
@@ -57,12 +47,10 @@ class AccessoryTest extends BaseTest
 
     public function testAnAccessoryHasAManufacturer()
     {
-        $this->createValidManufacturer('apple');
-        $this->createValidCategory('accessory-keyboard-category');
         $accessory = Accessory::factory()->appleBtKeyboard()->create(
             [
                 'category_id' => Category::factory()->create(),
-                'category_id' => Manufacturer::factory()->apple()->create()
+                'manufacturer_id' => Manufacturer::factory()->apple()->create()
             ]);
         $this->assertInstanceOf(Manufacturer::class, $accessory->manufacturer);
     }
diff --git a/tests/Unit/AssetMaintenanceTest.php b/tests/Unit/AssetMaintenanceTest.php
index ccae46ed76..b5ee25cf2b 100644
--- a/tests/Unit/AssetMaintenanceTest.php
+++ b/tests/Unit/AssetMaintenanceTest.php
@@ -2,20 +2,15 @@
 namespace Tests\Unit;
 
 use App\Models\AssetMaintenance;
-use Tests\Unit\BaseTest;
 use Carbon\Carbon;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-class AssetMaintenanceTest extends BaseTest
+class AssetMaintenanceTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
+    use InteractsWithSettings;
 
-    /**
-     * @test
-     */
-    public function it_zeros_out_warranty_if_blank()
+    public function testZerosOutWarrantyIfBlank()
     {
         $c = new AssetMaintenance;
         $c->is_warranty = '';
@@ -24,10 +19,7 @@ class AssetMaintenanceTest extends BaseTest
         $this->assertTrue($c->is_warranty == 4);
     }
 
-    /**
-     * @test
-     */
-    public function it_sets_costs_appropriately()
+    public function testSetsCostsAppropriately()
     {
         $c = new AssetMaintenance();
         $c->cost = '0.00';
@@ -38,10 +30,7 @@ class AssetMaintenanceTest extends BaseTest
         $this->assertTrue($c->cost === 9.5);
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_out_notes_if_blank()
+    public function testNullsOutNotesIfBlank()
     {
         $c = new AssetMaintenance;
         $c->notes = '';
@@ -50,10 +39,7 @@ class AssetMaintenanceTest extends BaseTest
         $this->assertTrue($c->notes === 'This is a long note');
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_out_completion_date_if_blank_or_invalid()
+    public function testNullsOutCompletionDateIfBlankOrInvalid()
     {
         $c = new AssetMaintenance;
         $c->completion_date = '';
diff --git a/tests/Unit/AssetModelTest.php b/tests/Unit/AssetModelTest.php
index d7c18dc9a7..8771187b2a 100644
--- a/tests/Unit/AssetModelTest.php
+++ b/tests/Unit/AssetModelTest.php
@@ -4,17 +4,12 @@ namespace Tests\Unit;
 use App\Models\Asset;
 use App\Models\Category;
 use App\Models\AssetModel;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-class AssetModelTest extends BaseTest
+class AssetModelTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
+    use InteractsWithSettings;
 
     public function testAnAssetModelZerosOutBlankEols()
     {
@@ -42,6 +37,4 @@ class AssetModelTest extends BaseTest
             );
         $this->assertEquals(1, $model->assets()->count());
     }
-
-
 }
diff --git a/tests/Unit/AssetTest.php b/tests/Unit/AssetTest.php
index 0cc27d80db..7670d10753 100644
--- a/tests/Unit/AssetTest.php
+++ b/tests/Unit/AssetTest.php
@@ -1,50 +1,142 @@
 <?php
 namespace Tests\Unit;
 
-use App\Exceptions\CheckoutNotAllowed;
 use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\Company;
-use App\Models\Location;
-use App\Models\User;
 use App\Models\Category;
 use Carbon\Carbon;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
-use App\Models\Component;
-use App\Models\ActionLog;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-
-class AssetTest extends BaseTest
+class AssetTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
+    use InteractsWithSettings;
 
-    // public function testAutoIncrementMixed()
-    // {
-    //     $expected = '123411';
-    //     $next = Asset::nextAutoIncrement(
-    //         collect([
-    //             ['asset_tag' => '0012345'],
-    //             ['asset_tag' => 'WTF00134'],
-    //             ['asset_tag' => 'WTF-745'],
-    //             ['asset_tag' => '0012346'],
-    //             ['asset_tag' => '00123410'],
-    //             ['asset_tag' => 'U8T7597h77'],
-    //         ])
-    //     );
+    public function testAutoIncrement()
+    {
+        $this->settings->enableAutoIncrement();
 
-    //     \Log::debug('Next: '.$next);
-    //     $this->assertEquals($expected, $next);
-    // }
+        $a = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset() ]);
+        $b = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset() ]);
 
+        $this->assertModelExists($a);
+        $this->assertModelExists($b);
+
+    }
+    public function testAutoIncrementCollision()
+    {
+        $this->settings->enableAutoIncrement();
+
+        // we have to do this by hand to 'simulate' two web pages being open at the same time
+        $a = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset() ]);
+        $b = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset() ]);
+
+        $this->assertTrue($a->save());
+        $this->assertFalse($b->save());
+    }
+
+    public function testAutoIncrementDouble()
+    {
+        // make one asset with the autoincrement *ONE* higher than the next auto-increment
+        // make sure you can then still make another
+        $this->settings->enableAutoIncrement();
+
+        $gap_number = Asset::autoincrement_asset(1);
+        $final_number = Asset::autoincrement_asset(2);
+        $a = Asset::factory()->make(['asset_tag' => $gap_number]); //make an asset with an ID that is one *over* the next increment
+        $b = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset()]); //but also make one with one that is *at* the next increment
+        $this->assertTrue($a->save());
+        $this->assertTrue($b->save());
+
+        //and ensure a final asset ends up at *two* over what would've been the next increment at the start
+        $c = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset()]);
+        $this->assertTrue($c->save());
+        $this->assertEquals($c->asset_tag, $final_number);
+    }
+
+    public function testAutoIncrementGapAndBackfill()
+    {
+        // make one asset 3 higher than the next auto-increment
+        // manually make one that's 1 lower than that
+        // make sure the next one is one higher than the 3 higher one.
+        $this->settings->enableAutoIncrement();
+
+        $big_gap = Asset::autoincrement_asset(3);
+        $final_result = Asset::autoincrement_asset(4);
+        $backfill_one = Asset::autoincrement_asset(0);
+        $backfill_two = Asset::autoincrement_asset(1);
+        $backfill_three = Asset::autoincrement_asset(2);
+        $a = Asset::factory()->create(['asset_tag' => $big_gap]);
+        $this->assertModelExists($a);
+
+        $b = Asset::factory()->create(['asset_tag' => $backfill_one]);
+        $this->assertModelExists($b);
+
+        $c = Asset::factory()->create(['asset_tag' => $backfill_two]);
+        $this->assertModelExists($c);
+
+        $d = Asset::factory()->create(['asset_tag' => $backfill_three]);
+        $this->assertModelExists($d);
+
+        $final = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset()]);
+        $this->assertModelExists($final);
+        $this->assertEquals($final->asset_tag, $final_result);
+    }
+
+    public function testPrefixlessAutoincrementBackfill()
+    {
+        // TODO: COPYPASTA FROM above, is there a way to still run this test but not have it be so duplicative?
+        $this->settings->enableAutoIncrement()->set(['auto_increment_prefix' => '']);
+
+        $big_gap = Asset::autoincrement_asset(3);
+        $final_result = Asset::autoincrement_asset(4);
+        $backfill_one = Asset::autoincrement_asset(0);
+        $backfill_two = Asset::autoincrement_asset(1);
+        $backfill_three = Asset::autoincrement_asset(2);
+        $a = Asset::factory()->create(['asset_tag' => $big_gap]);
+        $this->assertModelExists($a);
+
+        $b = Asset::factory()->create(['asset_tag' => $backfill_one]);
+        $this->assertModelExists($b);
+
+        $c = Asset::factory()->create(['asset_tag' => $backfill_two]);
+        $this->assertModelExists($c);
+
+        $d = Asset::factory()->create(['asset_tag' => $backfill_three]);
+        $this->assertModelExists($d);
+
+        $final = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset()]);
+        $this->assertModelExists($final);
+        $this->assertEquals($final->asset_tag, $final_result);
+    }
+
+    public function testUnzerofilledPrefixlessAutoincrementBackfill()
+    {
+        // TODO: COPYPASTA FROM above (AGAIN), is there a way to still run this test but not have it be so duplicative?
+        $this->settings->enableAutoIncrement()->set(['auto_increment_prefix' => '','zerofill_count' => 0]);
+
+        $big_gap = Asset::autoincrement_asset(3);
+        $final_result = Asset::autoincrement_asset(4);
+        $backfill_one = Asset::autoincrement_asset(0);
+        $backfill_two = Asset::autoincrement_asset(1);
+        $backfill_three = Asset::autoincrement_asset(2);
+        $a = Asset::factory()->create(['asset_tag' => $big_gap]);
+        $this->assertModelExists($a);
+
+        $b = Asset::factory()->create(['asset_tag' => $backfill_one]);
+        $this->assertModelExists($b);
+
+        $c = Asset::factory()->create(['asset_tag' => $backfill_two]);
+        $this->assertModelExists($c);
+
+        $d = Asset::factory()->create(['asset_tag' => $backfill_three]);
+        $this->assertModelExists($d);
+
+        $final = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset()]);
+        $this->assertModelExists($final);
+        $this->assertEquals($final->asset_tag, $final_result);
+    }
 
-    /**
-     * @test
-     */
     public function testWarrantyExpiresAttribute()
     {
 
@@ -54,7 +146,7 @@ class AssetTest extends BaseTest
                 'model_id' => AssetModel::factory()
                     ->create(
                         [
-                            'category_id' => Category::factory()->assetLaptopCategory()->id
+                            'category_id' => Category::factory()->assetLaptopCategory()->create()->id
                         ]
                 )->id,   
                 'warranty_months' => 24,
@@ -66,5 +158,4 @@ class AssetTest extends BaseTest
         $this->assertEquals(Carbon::createFromDate(2019, 1, 1)->format('Y-m-d'), $asset->warranty_expires->format('Y-m-d'));
 
     }
-
 }
diff --git a/tests/Unit/BaseTest.php b/tests/Unit/BaseTest.php
deleted file mode 100644
index 83f1181083..0000000000
--- a/tests/Unit/BaseTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-namespace Tests\Unit;
-
-use App\Models\User;
-use App\Models\Setting;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\TestCase; 
-use Auth;
-use Artisan;
-
-class BaseTest extends TestCase
-{
-    use DatabaseTransactions;
-
-    protected function _before()
-    {
-        Artisan::call('migrate');
-        Setting::factory()->create();
-    }
-
-    protected function signIn($user = null)
-    {
-        if (! $user) {
-            $user = User::factory()->superuser()->create([
-                'location_id' => $this->createValidLocation()->id,
-            ]);
-        }
-        Auth::login($user);
-        return $user;
-    }
-
-    protected function createValidAssetModel()
-    {
-        return \App\Models\AssetModel::factory()->create([
-            'category_id' => $this->createValidCategory(),
-            'manufacturer_id' => $this->createValidManufacturer(),
-            'depreciation_id' => $this->createValidDepreciation(),
-        ]);
-    }
-
-    protected function createValidCategory()
-    {
-        return \App\Models\Category::factory()->make();
-    }
-
-    protected function createValidCompany()
-    {
-        return \App\Models\Company::factory()->create();
-    }
-
-    protected function createValidDepartment($state = 'engineering', $overrides = [])
-    {
-        return \App\Models\Department::factory()->create(array_merge([
-            'location_id' => $this->createValidLocation()->id,
-        ], $overrides));
-    }
-
-    protected function createValidDepreciation()
-    {
-        return \App\Models\Depreciation::factory()->create();
-    }
-
-    protected function createValidLocation($overrides = [])
-    {
-        return \App\Models\Location::factory()->create($overrides);
-    }
-
-    protected function createValidManufacturer()
-    {
-        return \App\Models\Manufacturer::factory()->create();
-    }
-
-    protected function createValidSupplier($overrides = [])
-    {
-        return \App\Models\Supplier::factory()->create($overrides);
-    }
-
-    protected function createValidStatuslabel($state = 'rtd', $overrides = [])
-    {
-        return \App\Models\Statuslabel::factory()->state()->create($overrides);
-    }
-
-    protected function createValidUser($overrides = [])
-    {
-        return \App\Models\User::factory()->create(
-            array_merge([
-                'location_id'=>$this->createValidLocation()->id,
-            ], $overrides)
-        );
-    }
-
-    protected function createValidAsset($overrides = [])
-    {
-        $locId = $this->createValidLocation()->id;
-        $this->createValidAssetModel();
-
-        return \App\Models\Asset::factory()->laptopMbp()->create(
-            array_merge([
-                'rtd_location_id' => $locId,
-                'location_id' => $locId,
-                'supplier_id' => $this->createValidSupplier()->id,
-            ], $overrides)
-        );
-    }
-}
diff --git a/tests/Unit/CategoryTest.php b/tests/Unit/CategoryTest.php
index eb1c06e696..c74597b1b4 100644
--- a/tests/Unit/CategoryTest.php
+++ b/tests/Unit/CategoryTest.php
@@ -2,20 +2,14 @@
 namespace Tests\Unit;
 
 use App\Models\Category;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
 use App\Models\AssetModel;
 use App\Models\Asset;
-use App\Models\Accessory;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-class CategoryTest extends BaseTest
+class CategoryTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
+    use InteractsWithSettings;
 
     public function testFailsEmptyValidation()
     {
@@ -35,7 +29,7 @@ class CategoryTest extends BaseTest
 
     public function testACategoryCanHaveAssets()
     {
-       $category = Category::factory()->assetDesktopCategory();
+       $category = Category::factory()->assetDesktopCategory()->create();
 
        // Generate 5 models via factory
        $models =  AssetModel::factory()
diff --git a/tests/Unit/CompanyScopingTest.php b/tests/Unit/CompanyScopingTest.php
new file mode 100644
index 0000000000..669dd5ed41
--- /dev/null
+++ b/tests/Unit/CompanyScopingTest.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class CompanyScopingTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function models(): array
+    {
+        return [
+            'Accessories' => [Accessory::class],
+            'Assets' => [Asset::class],
+            'Components' => [Component::class],
+            'Consumables' => [Consumable::class],
+            'Licenses' => [License::class],
+        ];
+    }
+
+    /** @dataProvider models */
+    public function testCompanyScoping($model)
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $modelA = $model::factory()->for($companyA)->create();
+        $modelB = $model::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAs($superUser);
+        $this->assertCanSee($modelA);
+        $this->assertCanSee($modelB);
+
+        $this->actingAs($userInCompanyA);
+        $this->assertCanSee($modelA);
+        $this->assertCanSee($modelB);
+
+        $this->actingAs($userInCompanyB);
+        $this->assertCanSee($modelA);
+        $this->assertCanSee($modelB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($superUser);
+        $this->assertCanSee($modelA);
+        $this->assertCanSee($modelB);
+
+        $this->actingAs($userInCompanyA);
+        $this->assertCanSee($modelA);
+        $this->assertCannotSee($modelB);
+
+        $this->actingAs($userInCompanyB);
+        $this->assertCannotSee($modelA);
+        $this->assertCanSee($modelB);
+    }
+
+    public function testAssetMaintenanceCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $assetMaintenanceForCompanyA = AssetMaintenance::factory()->for(Asset::factory()->for($companyA))->create();
+        $assetMaintenanceForCompanyB = AssetMaintenance::factory()->for(Asset::factory()->for($companyB))->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAs($superUser);
+        $this->assertCanSee($assetMaintenanceForCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyB);
+
+        $this->actingAs($userInCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyB);
+
+        $this->actingAs($userInCompanyB);
+        $this->assertCanSee($assetMaintenanceForCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($superUser);
+        $this->assertCanSee($assetMaintenanceForCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyB);
+
+        $this->actingAs($userInCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyA);
+        $this->assertCannotSee($assetMaintenanceForCompanyB);
+
+        $this->actingAs($userInCompanyB);
+        $this->assertCannotSee($assetMaintenanceForCompanyA);
+        $this->assertCanSee($assetMaintenanceForCompanyB);
+    }
+
+    public function testLicenseSeatCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $licenseSeatA = LicenseSeat::factory()->for(Asset::factory()->for($companyA))->create();
+        $licenseSeatB = LicenseSeat::factory()->for(Asset::factory()->for($companyB))->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAs($superUser);
+        $this->assertCanSee($licenseSeatA);
+        $this->assertCanSee($licenseSeatB);
+
+        $this->actingAs($userInCompanyA);
+        $this->assertCanSee($licenseSeatA);
+        $this->assertCanSee($licenseSeatB);
+
+        $this->actingAs($userInCompanyB);
+        $this->assertCanSee($licenseSeatA);
+        $this->assertCanSee($licenseSeatB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($superUser);
+        $this->assertCanSee($licenseSeatA);
+        $this->assertCanSee($licenseSeatB);
+
+        $this->actingAs($userInCompanyA);
+        $this->assertCanSee($licenseSeatA);
+        $this->assertCannotSee($licenseSeatB);
+
+        $this->actingAs($userInCompanyB);
+        $this->assertCannotSee($licenseSeatA);
+        $this->assertCanSee($licenseSeatB);
+    }
+
+    private function assertCanSee(Model $model)
+    {
+        $this->assertTrue(
+            get_class($model)::all()->contains($model),
+            'User was not able to see expected model'
+        );
+    }
+
+    private function assertCannotSee(Model $model)
+    {
+        $this->assertFalse(
+            get_class($model)::all()->contains($model),
+            'User was able to see model from a different company'
+        );
+    }
+}
diff --git a/tests/Unit/CompanyTest.php b/tests/Unit/CompanyTest.php
index c5c7600290..6e04504843 100644
--- a/tests/Unit/CompanyTest.php
+++ b/tests/Unit/CompanyTest.php
@@ -2,23 +2,11 @@
 namespace Tests\Unit;
 
 use App\Models\Company;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
-use App\Models\Component;
-use App\Models\Asset;
-use App\Models\Consumable;
 use App\Models\User;
+use Tests\TestCase;
 
-class CompanyTest extends BaseTest
+class CompanyTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-
     public function testACompanyCanHaveUsers()
     {
         $company = Company::factory()->create();
diff --git a/tests/Unit/ComponentTest.php b/tests/Unit/ComponentTest.php
index bca8f3e67c..8f71057bfc 100644
--- a/tests/Unit/ComponentTest.php
+++ b/tests/Unit/ComponentTest.php
@@ -5,19 +5,12 @@ use App\Models\Category;
 use App\Models\Company;
 use App\Models\Component;
 use App\Models\Location;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-class ComponentTest extends BaseTest
+class ComponentTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-
+    use InteractsWithSettings;
 
     public function testAComponentBelongsToACompany()
     {
diff --git a/tests/Unit/ConsumableTest.php b/tests/Unit/ConsumableTest.php
deleted file mode 100644
index cbe89b13bb..0000000000
--- a/tests/Unit/ConsumableTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace Tests\Unit;
-
-use App\Models\Consumable;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
-
-class ConsumableTest extends BaseTest
-{
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-
-    
-}
diff --git a/tests/Unit/CustomFieldTest.php b/tests/Unit/CustomFieldTest.php
index 7df281fe1d..d5704d8aa3 100644
--- a/tests/Unit/CustomFieldTest.php
+++ b/tests/Unit/CustomFieldTest.php
@@ -2,33 +2,17 @@
 namespace Tests\Unit;
 
 use App\Models\CustomField;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
 /*
  * Test strings for db column names  gathered from
  * http://www.omniglot.com/language/phrases/hovercraft.htm
  */
-class CustomFieldTest extends BaseTest
+class CustomFieldTest extends TestCase
 {
-    protected $tester;
-
-    public function testConstructor()
-    {
-        $customfield = new CustomField();
-    }
-
     public function testFormat()
     {
         $customfield = CustomField::factory()->make(['format' => 'IP']);
-        $values = [
-            'name' => $customfield->name,
-            'format' => $customfield->format,
-            'element' => $customfield->element,
-        ];
-
         $this->assertEquals($customfield->getAttributes()['format'], CustomField::PREDEFINED_FORMATS['IP']); //this seems undocumented...
         $this->assertEquals($customfield->format, 'IP');
     }
diff --git a/tests/Unit/DepreciationTest.php b/tests/Unit/DepreciationTest.php
index abe11d7f85..ed033cf442 100644
--- a/tests/Unit/DepreciationTest.php
+++ b/tests/Unit/DepreciationTest.php
@@ -2,23 +2,18 @@
 namespace Tests\Unit;
 
 use App\Models\Depreciation;
-use Tests\Unit\BaseTest;
 use App\Models\Category;
 use App\Models\License;
 use App\Models\AssetModel;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-class DepreciationTest extends BaseTest
+class DepreciationTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-
+    use InteractsWithSettings;
 
     public function testADepreciationHasModels()
     {
-        $this->createValidAssetModel();
         $depreciation = Depreciation::factory()->create();
 
         AssetModel::factory()
@@ -26,7 +21,7 @@ class DepreciationTest extends BaseTest
                     ->count(5)
                     ->create(
                         [
-                            'category_id' => Category::factory()->assetLaptopCategory(),
+                            'category_id' => Category::factory()->assetLaptopCategory()->create(),
                             'depreciation_id' => $depreciation->id               
                         ]);
 
@@ -43,7 +38,7 @@ class DepreciationTest extends BaseTest
                     ->photoshop()
                     ->create(
                         [
-                            'category_id' => Category::factory()->licenseGraphicsCategory(),
+                            'category_id' => Category::factory()->licenseGraphicsCategory()->create(),
                             'depreciation_id' => $depreciation->id               
                         ]);
 
diff --git a/tests/Unit/ImporterTest.php b/tests/Unit/ImporterTest.php
index dcd7927c2a..b3d5da8b38 100644
--- a/tests/Unit/ImporterTest.php
+++ b/tests/Unit/ImporterTest.php
@@ -13,19 +13,11 @@ use App\Models\Category;
 use App\Models\CustomField;
 use App\Models\Location;
 use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Support\Facades\Notification;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
-class ImporterTest extends BaseTest
+class ImporterTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-//     protected $tester;
-
 //     public function testDefaultImportAssetWithCustomFields()
 //     {
 //         $this->signIn();
diff --git a/tests/Unit/LocationTest.php b/tests/Unit/LocationTest.php
index eda9c6a896..3fded9e568 100644
--- a/tests/Unit/LocationTest.php
+++ b/tests/Unit/LocationTest.php
@@ -2,24 +2,16 @@
 namespace Tests\Unit;
 
 use App\Models\Location;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
-
-class LocationTest extends BaseTest
+class LocationTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     public function testPassesIfNotSelfParent()
     {
-        $this->createValidLocation(['id' => 10]);
-
         $a = Location::factory()->make([
             'name' => 'Test Location',
             'id' => 1,
-            'parent_id' => 10,
+            'parent_id' => Location::factory()->create(['id' => 10])->id,
         ]);
 
         $this->assertTrue($a->isValid());
diff --git a/tests/Unit/NotificationTest.php b/tests/Unit/NotificationTest.php
index 509aee6845..64cf8afb0a 100644
--- a/tests/Unit/NotificationTest.php
+++ b/tests/Unit/NotificationTest.php
@@ -8,19 +8,16 @@ use App\Models\Category;
 use Carbon\Carbon;
 use App\Notifications\CheckoutAssetNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Unit\BaseTest;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-
-class NotificationTest extends BaseTest
+class NotificationTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
+    use InteractsWithSettings;
 
     public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA()
     {
-
+        $admin = User::factory()->superuser()->create();
         $user = User::factory()->create();
         $asset = Asset::factory()
         ->create(
@@ -28,16 +25,15 @@ class NotificationTest extends BaseTest
                 'model_id' => AssetModel::factory()
                     ->create(
                         [
-                            'category_id' => Category::factory()->assetLaptopCategory()->id
+                            'category_id' => Category::factory()->assetLaptopCategory()->create()->id
                         ]
-                )->id,   
+                )->id,
                 'warranty_months' => 24,
-                'purchase_date' =>   Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0)                  
+                'purchase_date' =>   Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0)->format('Y-m-d')
             ]);
 
-        //dd($asset);
         Notification::fake();
-        $asset->checkOut($user, $asset->id);
+        $asset->checkOut($user, $admin->id);
         Notification::assertSentTo($user, CheckoutAssetNotification::class);
     }
 }
diff --git a/tests/Unit/PermissionsTest.php b/tests/Unit/PermissionsTest.php
index 86d40de866..e788585dd2 100644
--- a/tests/Unit/PermissionsTest.php
+++ b/tests/Unit/PermissionsTest.php
@@ -7,12 +7,9 @@ use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\License;
 use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
-class PermissionsTest extends BaseTest
+class PermissionsTest extends TestCase
 {
     // public function _before()
     // {
diff --git a/tests/Unit/SnipeModelTest.php b/tests/Unit/SnipeModelTest.php
index 8884ecf6d3..ad4231010f 100644
--- a/tests/Unit/SnipeModelTest.php
+++ b/tests/Unit/SnipeModelTest.php
@@ -2,21 +2,14 @@
 namespace Tests\Unit;
 
 use App\Models\SnipeModel;
-use Tests\Unit\BaseTest;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
 
-class SnipeModelTest extends BaseTest
+class SnipeModelTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
+    use InteractsWithSettings;
 
-    // tests
-
-    /**
-     * @test
-     */
-    public function it_sets_purchase_dates_appropriately()
+    public function testSetsPurchaseDatesAppropriately()
     {
         $c = new SnipeModel;
         $c->purchase_date = '';
@@ -25,10 +18,7 @@ class SnipeModelTest extends BaseTest
         $this->assertTrue($c->purchase_date === '2016-03-25 12:35:50');
     }
 
-    /**
-     * @test
-     */
-    public function it_sets_purchase_costs_appropriately()
+    public function testSetsPurchaseCostsAppropriately()
     {
         $c = new SnipeModel;
         $c->purchase_cost = '0.00';
@@ -39,10 +29,7 @@ class SnipeModelTest extends BaseTest
         $this->assertTrue($c->purchase_cost === 9.5);
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_blank_location_ids_but_not_others()
+    public function testNullsBlankLocationIdsButNotOthers()
     {
         $c = new SnipeModel;
         $c->location_id = '';
@@ -51,10 +38,7 @@ class SnipeModelTest extends BaseTest
         $this->assertTrue($c->location_id == 5);
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_blank_categories_but_not_others()
+    public function testNullsBlankCategoriesButNotOthers()
     {
         $c = new SnipeModel;
         $c->category_id = '';
@@ -63,10 +47,7 @@ class SnipeModelTest extends BaseTest
         $this->assertTrue($c->category_id == 1);
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_blank_suppliers_but_not_others()
+    public function testNullsBlankSuppliersButNotOthers()
     {
         $c = new SnipeModel;
         $c->supplier_id = '';
@@ -75,10 +56,7 @@ class SnipeModelTest extends BaseTest
         $this->assertTrue($c->supplier_id == 4);
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_blank_depreciations_but_not_others()
+    public function testNullsBlankDepreciationsButNotOthers()
     {
         $c = new SnipeModel;
         $c->depreciation_id = '';
@@ -87,10 +65,7 @@ class SnipeModelTest extends BaseTest
         $this->assertTrue($c->depreciation_id == 4);
     }
 
-    /**
-     * @test
-     */
-    public function it_nulls_blank_manufacturers_but_not_others()
+    public function testNullsBlankManufacturersButNotOthers()
     {
         $c = new SnipeModel;
         $c->manufacturer_id = '';
diff --git a/tests/Unit/StatuslabelTest.php b/tests/Unit/StatuslabelTest.php
index 5ec209af1b..fe5f3cacc0 100644
--- a/tests/Unit/StatuslabelTest.php
+++ b/tests/Unit/StatuslabelTest.php
@@ -2,18 +2,10 @@
 namespace Tests\Unit;
 
 use App\Models\Statuslabel;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
-class StatuslabelTest extends BaseTest
+class StatuslabelTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     public function testRTDStatuslabelAdd()
     {
         $statuslabel = Statuslabel::factory()->rtd()->create();
diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php
index d5891a8323..e089fc4023 100644
--- a/tests/Unit/UserTest.php
+++ b/tests/Unit/UserTest.php
@@ -2,18 +2,10 @@
 namespace Tests\Unit;
 
 use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Tests\Unit\BaseTest;
+use Tests\TestCase;
 
-class UserTest extends BaseTest
+class UserTest extends TestCase
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     public function testFirstNameSplit()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
diff --git a/upgrade.php b/upgrade.php
index 892e92e46c..a287e3d1de 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1,7 +1,9 @@
 <?php
 (PHP_SAPI !== 'cli' || isset($_SERVER['HTTP_USER_AGENT'])) && die('Access denied.');
 
-$required_php_min = '7.4.0';
+$php_min_works = '7.4.0';
+$php_max_wontwork = '8.2.0';
+
 
 if ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') || (!function_exists('posix_getpwuid'))) {
 	echo "Skipping user check as it is not supported on Windows or Posix is not installed on this server. \n";
@@ -43,7 +45,6 @@ echo "--------------------------------------------------------\n\n";
 
 // Check the .env looks ok
 $env = file('.env');
-$env_error_count = 0;
 $env_good = '';
 $env_bad = '';
 
@@ -85,7 +86,7 @@ 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 .= "✘ 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";
             }
@@ -93,8 +94,6 @@ foreach ($env as $line_num => $line) {
 
         if ($env_key == 'APP_URL') {
 
-            $app_url_length = strlen($env_value);
-
             if (($env_value!="null") && ($env_value!="")) {
                 $env_good .= '√ Your APP_URL is not null or blank. It is set to '.$env_value."\n";
 
@@ -126,12 +125,12 @@ echo $env_good;
 
 if ($env_bad !='') {
 
-    echo "\n--------------------- !! ERROR !! ----------------------\n";
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!! .ENV FILE ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!\n";
     echo "Your .env file is misconfigured. Upgrade cannot continue.\n";
     echo "--------------------------------------------------------\n\n";
     echo $env_bad;
     echo "\n\n--------------------------------------------------------\n";
-    echo "ABORTING THE INSTALLER  \n";
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n";
     echo "Please correct the issues above in ".getcwd()."/.env and try again.\n";
     echo "--------------------------------------------------------\n";
     exit;
@@ -139,22 +138,23 @@ if ($env_bad !='') {
 
 
 echo "\n--------------------------------------------------------\n";
-echo "STEP 2: Checking PHP requirements: \n";
+echo "STEP 2: Checking PHP requirements: (Required PHP >=". $php_min_works. " - <".$php_max_wontwork.") \n";
 echo "--------------------------------------------------------\n\n";
 
-if (version_compare(PHP_VERSION, $required_php_min, '<')) {
-    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
-    echo "This version of PHP (".PHP_VERSION.") is not compatible with Snipe-IT.\n";
-    echo "Snipe-IT requires PHP version ".$required_php_min." or greater. Please upgrade \n";
-    echo "your version of PHP (web/php-fcgi and cli) and try running this script again.\n\n\n";
-    exit;
+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 sprintf("FYI: The php.ini used by this PHP is: %s\n\n", get_cfg_var('cfg_file_path'));
 
 } else {
-    echo "Current PHP version: (" . PHP_VERSION . ") is at least ".$required_php_min." - continuing... \n";
-    echo sprintf("FYI: The php.ini used by this PHP is: %s\n\n", get_cfg_var('cfg_file_path'));
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!! 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";
+    exit;
 }
 
-
 echo "Checking Required PHP extensions... \n\n";
 
 // Get the list of installed extensions
@@ -179,6 +179,10 @@ $required_exts_array =
         'zip',
     ];
 
+$recommended_exts_array =
+    [
+        'sodium', //note that extensions need to be in BOTH the $required_exts_array and this one to be 'optional'
+    ];
 $ext_missing = '';
 $ext_installed = '';
 
@@ -208,8 +212,10 @@ foreach ($required_exts_array as $required_ext) {
             }
 
         // If this isn't an either/or option, just add it to the string of errors conventionally
-        } else {
+        } elseif (!in_array($required_ext, $recommended_exts_array)){
             $ext_missing .=  '✘ 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!
@@ -452,11 +458,11 @@ echo "--------------------------------------------------------\n\n";
 
 
 function str_begins($haystack, $needle) {
-    return 0 === substr_compare($haystack, $needle, 0, strlen($needle));
+    return (substr_compare($haystack, $needle, 0, strlen($needle)) === 0);
 }
 
 function str_ends($haystack,  $needle) {
-    return 0 === substr_compare($haystack, $needle, -strlen($needle));
+    return (substr_compare($haystack, $needle, -strlen($needle)) === 0);
 }
 
 
diff --git a/webpack.mix.js b/webpack.mix.js
index 79208834a9..babab0fad6 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,8 +18,6 @@ mix
       "./node_modules/@fortawesome/fontawesome-free/css/all.css",
       "./public/css/build/AdminLTE.css",
       "./node_modules/jquery-ui-bundle/jquery-ui.css",
-      "./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
-      "./node_modules/icheck/skins/minimal/minimal.css",
       "./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css",
       "./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
       "./node_modules/blueimp-file-upload/css/jquery.fileupload.css",
@@ -34,13 +32,6 @@ mix
   )
   .version();
 
-mix.copy(
-  [
-    "./node_modules/icheck/skins/minimal/blue.png",
-    "./node_modules/icheck/skins/minimal/blue@2x.png",
-  ],
-  "./public/css"
-);
 
 /**
  * Copy, minify and version signature-pad.css
@@ -174,7 +165,6 @@ mix.combine(
     "./node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js",
     "./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
     "./node_modules/ekko-lightbox/dist/ekko-lightbox.js",
-    "./node_modules/icheck/icheck.js", //definite problem here :(
     "./resources/assets/js/extensions/pGenerator.jquery.js",
     "./node_modules/chart.js/dist/Chart.js",
     "./resources/assets/js/signature_pad.js",