Search by asset tag

Compatible with barcode scanners

.env.example

@@ -5,7 +5,7 @@ APP_ENV=production
 APP_DEBUG=false
 APP_KEY=ChangeMe
 APP_URL=null
-APP_TIMEZONE='US/Pacific'
+APP_TIMEZONE='UTC'
 APP_LOCALE=en
 
 

README.md

@@ -19,10 +19,10 @@ __This is web-based software__. This means there there is no executable file (ak
 
 ### Installation
 
-__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__
+__Installation and configuration documentation for this project has been moved to https://snipe-it.readme.io.__
 
 #### Server Requirements
-Please see the [requirements documentation](http://docs.snipeitapp.com/requirements.html) for full requirements.
+Please see the [requirements documentation](https://snipe-it.readme.io/docs/requirements) for full requirements.
 
 -----
 ### Bug Reports & Feature Requests
@@ -31,13 +31,13 @@ Feel free to check out the [GitHub Issues for this project](https://github.com/s
 
 We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
 
-If you're having trouble with the installation, please check the [Common Issues](http://docs.snipeitapp.com/common-issues.html) and [Getting Help](http://docs.snipeitapp.com/getting-help.html) documentation.
+If you're having trouble with the installation, please check the [Common Issues](https://snipe-it.readme.io/docs/common-issues) and [Getting Help](https://snipe-it.readme.io/docs/getting-help) documentation.
 
 -----
 
 ### Upgrading
 
-Please see the [upgrading documentation](http://docs.snipeitapp.com/upgrading.html) for instructions on upgrading Snipe-IT.
+Please see the [upgrading documentation](https://snipe-it.readme.io/docs/upgrading) for instructions on upgrading Snipe-IT.
 
 ------
 ### Announcement List
@@ -48,13 +48,13 @@ To be notified of important news (such as new releases, security advisories, etc
 
 ### Translations!
 
-Please see the [translations documentation](http://docs.snipeitapp.com/translations.html) for information about available languages and how to add translations to Snipe-IT.
+Please see the [translations documentation](https://snipe-it.readme.io/docs/translations) for information about available languages and how to add translations to Snipe-IT.
 
 -----
 
 ### Contributing
 
-Please see the documentation on [contributing and developing for Snipe-IT](http://docs.snipeitapp.com/contributing.html).
+Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing).
 
 [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&title=Ready+for+Development)](http://waffle.io/snipe/snipe-it)
 

app/Http/Controllers/AssetsController.php

@@ -59,7 +59,6 @@ class AssetsController extends Controller
         parent::__construct();
     }
 
-
     /**
     * Returns a view that invokes the ajax tables which actually contains
     * the content for the assets listing, which is generated in getDatatable.
@@ -74,6 +73,21 @@ class AssetsController extends Controller
         return View::make('hardware/index');
     }
 
+    /**
+     * Searches the assets table by asset tag, and redirects if it finds one
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function getAssetByTag() {
+        if ($asset = Asset::where('asset_tag','=',Input::get('assetTag'))->first()) {
+            return redirect()->route('view/hardware', $asset->id);
+        }
+        return redirect()->to('hardware')->with('error',trans('admin/hardware/message.does_not_exist'));
+
+    }
+
     /**
     * Returns a view that presents a form to create a new asset.
     *

app/Http/Controllers/GroupsController.php

@@ -47,11 +47,11 @@ class GroupsController extends Controller
         $group = new Group;
         // Get all the available permissions
         $permissions = config('permissions');
-
-        $selectedPermissions = Input::old('permissions', array());
+        $groupPermissions = array();
+        $selectedPermissions = Input::old('permissions', $groupPermissions);
 
         // Show the page
-        return View::make('groups/edit', compact('permissions', 'selectedPermissions'))->with('group', $group);
+        return View::make('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
     }
 
     /**
@@ -91,9 +91,9 @@ class GroupsController extends Controller
     {
         $group = Group::find($id);
         $permissions = config('permissions');
-        $group->permissions = $group->decodePermissions();
-        $selected_array = Helper::selectedPermissionsArray($permissions, $group->permissions);
-        return View::make('groups/edit', compact('group', 'permissions','selected_array'));
+        $groupPermissions = $group->decodePermissions();
+        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
+        return View::make('groups/edit', compact('group', 'permissions','selected_array','groupPermissions'));
     }
 
     /**

app/Http/routes.php

@@ -194,6 +194,10 @@ Route::group(
                 'as'   => 'update/hardware',
                 'uses' => 'AssetsController@getEdit'
             ]);
+        Route::get('/bytag', [
+            'as'   => 'findbytag/hardware',
+            'uses' => 'AssetsController@getAssetByTag'
+        ]);
 
         Route::get('{assetId}/clone', [ 'as' => 'clone/hardware', 'uses' => 'AssetsController@getClone' ]);
         Route::post('{assetId}/clone', 'AssetsController@postCreate');

database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php

@@ -14,8 +14,8 @@ class RemoveOptionKeysFromSettingsTable extends Migration
     {
         Schema::table('settings', function (Blueprint $table) {
             //
-            $table->dropColumn('option_name');
-            $table->dropColumn('option_value');
+            if(Schema::hasColumn('option_name', 'settings'))
+                $table->dropColumn('option_name');
         });
     }
 
@@ -28,6 +28,7 @@ class RemoveOptionKeysFromSettingsTable extends Migration
     {
         Schema::table('Settings', function (Blueprint $table) {
             //
+            $table->string('option_name')->nullable();
         });
     }
 }

database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveOptionValueFromSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            //
+            if(Schema::hasColumn('option_value', 'settings'))
+                $table->dropColumn('option_value');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('option_value')->nullable();
+        });
+    }
+}

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/ar/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/ar/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Префикс (незадължително)',
 	'auto_incrementing_help'    => 'Първо включете автоматично генериране на инвентарни номера, за да включите тази опция.',
 	'backups'					=> 'Архивиране',
-	'barcode_type'				=> 'Тип на баркод',
 	'barcode_settings'			=> 'Настройки на баркод',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Визуализиране на EOL в таблиците',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Тип на баркод',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Настройки на EULA',
     'eula_markdown'				=> 'Съдържанието на EULA може да бъде форматирано с <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/bg/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/bg/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Předpona (volitnelná)',
 	'auto_incrementing_help'    => 'Nastavte nejdříve automaticky se zvyšující ID majetku pro nastavení tohoto',
 	'backups'					=> 'Zálohy',
-	'barcode_type'				=> 'Tyo čárového kódu',
 	'barcode_settings'			=> 'Nastavení čárového kódu',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Zobrazit EOL v tabulkovém zobrazení',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Tyo čárového kódu',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Nastavení EULA',
     'eula_markdown'				=> 'Tato EULA umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>.',

resources/lang/cs/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/cs/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/da/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/da/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Präfix (optional)',
 	'auto_incrementing_help'    => 'Aktiviere zuerst fortlaufende Asset IDs um dies zu setzen',
 	'backups'					=> 'Sicherungen',
-	'barcode_type'				=> 'Barcode Typ',
 	'barcode_settings'			=> 'Barcode Einstellungen',
     'confirm_purge'			    => 'Bereinigung bestätigen',
     'confirm_purge_help'		=> 'Geben Sie das Wort "Löschen" in das untere Feld ein um die gelöschten Einträge zu bereinigen. Dies kann nicht rückgängig gemacht werden.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Typ',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Einstellungen',
     'eula_markdown'				=> 'Diese EULA <a href="https://help.github.com/articles/github-flavored-markdown/"> erlaubt Github Flavored Markdown</a>.',

resources/lang/de/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/de/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/el/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/el/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -23,9 +22,9 @@ return array(
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 3D Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/en-GB/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/en-GB/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/en-ID/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/en-ID/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> '3D barcode type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/en/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/en/general.php

@@ -88,6 +88,7 @@
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/en/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

resources/lang/es-CO/admin/settings/general.php

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/es-CO/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/es-CO/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

resources/lang/es-ES/admin/settings/general.php

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefijo (opcional)',
 	'auto_incrementing_help'    => 'Activa la generación automática de IDs de equipo antes de configurar esto',
 	'backups'					=> 'Copias de seguridad',
-	'barcode_type'				=> 'Tipo de código de barras',
 	'barcode_settings'			=> 'Configuración de Código de Barras',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Mostrar EOL',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Tipo de código de barras',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Configuración EULA',
     'eula_markdown'				=> 'Este EULS permite <a href="https://help.github.com/articles/github-flavored-markdown/">makrdown estilo Github</a>.',

resources/lang/es-ES/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/es-ES/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'پیشوند (اختیاری)',
 	'auto_incrementing_help'    => 'فعال کردن شناسه دارایی (افزایش خودکار) اول به این مجموعه',
 	'backups'					=> 'پشتیبان گیری',
-	'barcode_type'				=> 'نوع بارکد',
 	'barcode_settings'			=> 'تنظیمات بارکد',
     'confirm_purge'			    => 'تایید پاکسازی',
     'confirm_purge_help'		=> 'متن "حذف" در کادر زیر برای پاکسازی پرونده حذف شده خود را وارد کنید. این دستور قابل بازگشت نیست.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'نمایش EOL در جدول',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'نوع بارکد',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA تنظیمات',
     'eula_markdown'				=> 'این EULA اجازه می دهد تا <a href="https://help.github.com/articles/github-flavored-markdown/">Github با طعم markdown</a>.',

resources/lang/fa/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/fa/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Etuliite (valinnainen)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Varmuuskopiointi',
-	'barcode_type'				=> 'Viivakoodin tyyppi',
 	'barcode_settings'			=> 'Viivakoodi asetukset',
     'confirm_purge'			    => 'Vahvista poisto',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Näytä elinaika listauksessa',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Viivakoodin tyyppi',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/fi/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/fi/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Préfixe (optionnel)',
 	'auto_incrementing_help'    => 'Activer l\'auto-incrémentation des ID d\'actif avant de sélectionner cette option',
 	'backups'					=> 'Sauvegardes',
-	'barcode_type'				=> 'Type de code à bar',
 	'barcode_settings'			=> 'Configuration des codes à barres',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Afficher la fin de vie dans les tables',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Type de code à bar',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Configuration pour les licences d\'utilisation',
     'eula_markdown'				=> 'Cette licence d\'utilisation permet l\'utilisation des <a href="https://help.github.com/articles/github-flavored-markdown/">"Github flavored markdown"</a>.',

resources/lang/fr/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/fr/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/he/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/he/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/hr/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/hr/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/hu/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/hu/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefisso (Opzionale)',
 	'auto_incrementing_help'    => 'Abilita auto-incremento ID beni prima di impostare questa',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Tipo Barcode',
 	'barcode_settings'			=> 'Impostazioni codice a barre',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Visualizzare EOL in vista tabella',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Tipo Barcode',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Impostazioni EULA',
     'eula_markdown'				=> 'Questa EULA consente <a href="https://help.github.com/articles/github aromatizzato-markdown/">Github flavored markdown</a>.',

resources/lang/it/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/it/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'プレフィクス (オプション)',
 	'auto_incrementing_help'    => 'この初期値を使って資産IDの自動採番を有効化',
 	'backups'					=> 'バックアップ',
-	'barcode_type'				=> 'バーコードタイプ',
 	'barcode_settings'			=> 'バーコード設定',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => '表形式でEOLを表示',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'バーコードタイプ',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA設定',
     'eula_markdown'				=> 'この EULA は、<a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>で、利用可能です。',

resources/lang/ja/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/ja/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> '접두사 (부가적)',
 	'auto_incrementing_help'    => '이 것을 설정하려면 자동-증가 자산 ID 사용을 하세요.',
 	'backups'					=> '예비품',
-	'barcode_type'				=> '바코드 형식',
 	'barcode_settings'			=> '바코드 설정',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => '테이블 보기에서 폐기일 표시',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> '바코드 형식',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> '최종 사용 계약 설정',
     'eula_markdown'				=> '이 최종 사용 계약은 <a href="https://help.github.com/articles/github-flavored-markdown/">GFM을 따른다</a>.',

resources/lang/ko/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/ko/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Papilomas priedėlis (pasirinktinai)',
 	'auto_incrementing_help'    => 'Įjungti automatiškai didėjantį įrangos ID pirmajam suteikiant šį nr.',
 	'backups'					=> 'Atsarginė kopija',
-	'barcode_type'				=> 'Prekės kodo tipas',
 	'barcode_settings'			=> 'Prekės kodo nustatymai',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Rodyti įrangos naudojimo pabaigos datas lentelės pavidalu',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Prekės kodo tipas',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA nustatymai',
     'eula_markdown'				=> 'Šis EULA leidžia <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/lt/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/lt/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Papar EOL dalam paparan jadual',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/ms/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/ms/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Voorvoegsel (niet verplicht)',
 	'auto_incrementing_help'    => 'Schakel eerst auto-verhoging voor product ID\'s in',
 	'backups'					=> 'Back-ups',
-	'barcode_type'				=> 'Barcode type',
 	'barcode_settings'			=> 'Barcode instellingen',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Laat EOL in tabel zien',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Gebruikersovereenkomsten instellingen',
     'eula_markdown'				=> 'Deze gebruikersovereenkomst staat <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a> toe.',

resources/lang/nl/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/nl/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefiks (valgfritt)',
 	'auto_incrementing_help'    => 'Aktiver først automatisk øking av eiendels-IDer for å velge dette alternativet',
 	'backups'					=> 'Sikkerhetskopier',
-	'barcode_type'				=> 'Strekkodetype',
 	'barcode_settings'			=> 'Strekkodeinnstillinger',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Vis levetid i tabellvisning',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Strekkodetype',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA-innstillinger',
     'eula_markdown'				=> 'Denne EULAen tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored markdown</a>.',

resources/lang/no/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/no/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (opcjonalnie)',
 	'auto_incrementing_help'    => 'Najpierw aktywuj automatycznie zwiększane ID Aktywa, by móc ustawić te opcje.',
 	'backups'					=> 'Kopie zapasowe',
-	'barcode_type'				=> 'Typ Kodu Kreskowego',
 	'barcode_settings'			=> 'Ustawienia Kodów Kreskowych',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Wyświetl koniec linii w widoku tabeli',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Typ Kodu Kreskowego',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Ustawienia Licencji',
     'eula_markdown'				=> 'Ta licencja zezwala na <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/pl/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/pl/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

resources/lang/pt-BR/admin/settings/general.php

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefixo (opcional)',
 	'auto_incrementing_help'    => 'Permitir auto insercao dessa ID de ativo antes de configurar isso',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Tipo do Código de Barras',
 	'barcode_settings'			=> 'Configuração do código de barras',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Exibir EOL na visualização de tabela',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Tipo do Código de Barras',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Configuração do termo de uso',
     'eula_markdown'				=> 'Este EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/pt-BR/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/pt-BR/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

resources/lang/pt-PT/admin/settings/general.php

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefixo (opcional)',
 	'auto_incrementing_help'    => 'Ative IDs auto-incrementais antes da configuração',
 	'backups'					=> 'Cópias de segurança',
-	'barcode_type'				=> 'Tipo de Código de Barras',
 	'barcode_settings'			=> 'Definições de Código de Barras',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Mostrar EOL na tabela',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Tipo de Código de Barras',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Definições de EULA',
     'eula_markdown'				=> 'Este EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/pt-PT/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/pt-PT/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Arata EOL in tabel',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/ro/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/ro/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Префикс ( не обязательно )',
 	'auto_incrementing_help'    => 'Включить автоматические возрастание ID активов начиная с',
 	'backups'					=> 'Резервные копии',
-	'barcode_type'				=> 'Тип штрихкода',
 	'barcode_settings'			=> 'Настройки штрихкода',
     'confirm_purge'			    => 'Подтвердить удаление',
     'confirm_purge_help'		=> 'Введите "DELETE" в поле ниже для подтверждения удаления. Это действие необратимо.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Отображать дату истечения срока гарантии в таблице',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Тип штрихкода',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'Настройки лицензионного соглашения',
     'eula_markdown'				=> 'Это EULA поддерживает <a href="https://help.github.com/articles/github-flavored-markdown/">форматирование Github flavored markdown</a>.',

resources/lang/ru/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/ru/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

resources/lang/sv-SE/admin/settings/general.php

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (optional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
 	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/sv-SE/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+

resources/lang/sv-SE/passwords.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Your password link has been sent!',
+    'user'			=> 'That user does not exist or does not have an email address associated',
+];
+

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

@@ -10,7 +10,6 @@ return array(
 	'auto_increment_prefix'		=> 'Prefix (ส่วนเสริม)',
 	'auto_incrementing_help'    => 'เปิดใช้งานการเพิ่มรหัสสินทรัพย์อัตโนมัติก่อนตั้งค่าส่วนนี้',
 	'backups'					=> 'สำรอง',
-	'barcode_type'				=> 'ชนิดบาร์โค๊ด',
 	'barcode_settings'			=> 'ตั้งค่าบาร์โค๊ด',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
     'display_eol'               => 'ดู EOL ในแบบตาราง',
     'display_qr'                => 'Display Square Codes',
 	'display_alt_barcode'		=> 'Display 2D barcode',
-	'barcode_type'				=> 'ชนิดบาร์โค๊ด',
+	'barcode_type'				=> '3D Barcode Type',
 	'alt_barcode_type'			=> '2D barcode type',
     'eula_settings'				=> 'ตั้งค่าข้อตกลงการใช้งาน',
     'eula_markdown'				=> 'อนุญาต EULA นี้ <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

resources/lang/th/auth/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'remember_me'                   => 'Remember Me',
+    ];
+