Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	config/version.php

app/Models/Ldap.php

@@ -219,7 +219,7 @@ class Ldap extends Model
             $user->notes = 'Imported on first login from LDAP';
 
             if ($user->save()) {
-                return true;
+                return $user;
             } else {
                 LOG::debug('Could not create user.'.$user->getErrors());
                 throw new Exception("Could not create user: ".$user->getErrors());

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.0',
+  'app_version' => 'v3.6.1',
-  'build_version' => '71',
+  'build_version' => '5',
-  'hash_version' => 'gd49a1ea',
+  'hash_version' => 'g6f9a82f',
-  'full_hash' => 'v3.6.0-71-gd49a1ea',
+  'full_hash' => 'v3.6.1-5-g6f9a82f',
 );

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

@@ -5,18 +5,14 @@ return array(
     'about_accessories_text'  			=> 'الملحقات هي أي شيء تقوم بتسليمه للمستخدمين لكنه لا يحتوي على رقم تسلسلي (أو أنك لست بحاجة إلى تتبعه بشكل خاص). مثال: فأرة الحاسوب أو لوحة المفاتيح.',
     'accessory_category' 				=> 'فئة الملحق',
     'accessory_name'  					=> 'اسم الملحق',
-    'cost'					=> 'تكلفة شراء',
     'checkout'  							=> 'الملحقات المخرجة',
     'checkin'  							=> 'إدخالات الملحقات',
     'create'  							=> 'إنشاء ملحق',
-    'date'					=> 'تاريخ الشراء',
     'edit'  							=> 'تعديل الملحق',
     'eula_text'							=> 'إنشاء اتفاقية جديدة',
     'eula_text_help'					=> 'يسمح لك هذا الحقل بتخصيص الاتفاقيات لأنواع معينة من الأصول. اذا كنت تمتلك اتفاقية واحدة لجميع أصولك يمكنك أن تقوم بتأشير المربع في الأسفل لاستخدام الاتفاقية الافتراضية.',
     'require_acceptance'				=> 'مطالبة المستخدمين بتأكيد قبولهم الأصول في هذه الفئة.',
     'no_default_eula'					=> 'ليس هناك اتفاقيات. قم باضافة واحدة من "الاعدادات".',
-    'order'					=> 'رقم طلب الشراء',
-    'qty'  								=> 'الكمية',
     'total'  							=> 'المجموع',
     'remaining'  						=> 'المتاح',
     'update'  							=> 'تحديث الملحق',

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

@@ -2,8 +2,7 @@
 
     return [
         'title'         => 'صيانة الاُصل',
-        'asset_name'    => 'الأصل',
+        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'المورد',
         'is_warranty'   => 'الضمان',
         'dl_csv'        => 'التنزيل كملف CSV'
     ];

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

@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'عن تصنيفات الأصول',
+    'about_categories_title' 			=> 'About Categories',
-    'about_categories'  				=> 'تصنيفات الأصول تساعدك على ترتيب الأصول. من الأمثلة على التصنيفات &quot; مكاتب &quot;،  &quot;أجهزة الكمبيوتر المحمولة &quot;،  &quot;الهواتف النقالة &quot;،  &quot;أجهزة لوحية &quot; وهكذا، كما يمكنك استخدام التصنيفات بأي طريقة تناسبك. ',
+    'about_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.',
     'asset_categories' 					=> 'التصنيفات',
     'category_name'  					=> 'اسم التصنيف',
     'checkin_email'                     => 'إرسال إشعار للمستخدم عند الإدخال.',

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

@@ -1,4 +1,6 @@
 <?php
 return [
+    'about_companies_title'            => 'About Companies',
+    'about_companies_text'                  => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
     'select_company' => 'اختر الشركة',
 ];

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

@@ -5,11 +5,8 @@ return array(
     'about_consumables_text'  			=> 'المواد الاستهلاكية هي الأشياء المشتراة والتي ستستخدم مع مرور الوقت. على سبيل المثال، حبر الطابعة أو ورق الناسخة.',
     'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'اسم المادة الإستهلاكية',
-    'cost'              				=> 'تكلفة الشراء',
     'create'                            => 'إنشاء مادة إستهلاكية',
-    'date'					            => 'تاريخ الشراء',
     'item_no'                           => 'رقم القطعة.',
-    'order'					            => 'رقم طلب الشراء',
     'remaining' 			            => 'المتبقية',
     'total' 			                => 'المجموع',
     'update'                            => 'تحديث المادة الإستهلاكية',

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

@@ -6,7 +6,7 @@ return array(
     'about_fieldsets_title'		=> 'حول مجموعة الحقول',
     'about_fieldsets_text'		=> 'مجموعات-الحقول تسمح لك بإنشاء مجموعات من الحقول اللتي يمكن إعادة إستخدامها مع أنواع موديل محدد.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'مجموعة-حقول',
@@ -15,7 +15,7 @@ return array(
     'fieldset_name'           => 'إسم مجموعة-الحقل',
     'field_name'              => 'إسم الحقل',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'عنصر النموذج',
     'field_element_short'     => 'عنصر',
     'field_format'            => 'صيغة',

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

@@ -4,9 +4,9 @@ return array(
     'about_asset_depreciations'  			=> 'عن استهلاك الأصول',
     'about_depreciations'  					=> 'يمكنك ضبط قيمة إستهلاك الأصول لخفض الأصول على أساس القسط الثابت للاستهلاك.',
     'asset_depreciations'  					=> 'استهلاك الأصول',
-    'create_depreciation'  					=> 'إنشاء الاستهلاك',
+    'create'  					            => 'Create Depreciation',
     'depreciation_name'  					=> 'اسم الاستهلاك',
     'number_of_months'  					=> 'عدد الأشهر',
-    'update_depreciation'  					=> 'تحديث الاستهلاك',
+    'update'  					            => 'Update Depreciation',
 
 );

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

@@ -1,10 +1,11 @@
 <?php
 
 return array(
-
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
     'group_management' 	 	=> 'إدارة المجموعة',
-    'create_group' 	 		=> 'إنشاء مجموعة جديدة',
+    'create' 	 	 	    => 'Create New Group',
-    'edit_group' 	 		=> 'تعديل المجموعة',
+    'update' 	 		        => 'Edit Group',
     'group_name' 	 		=> 'اسم المجموعة',
     'group_admin' 	 		=> 'إدارة المجموعة',
     'allow' 	 			=> 'سماح',

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

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'bulk_delete'		=> 'إجراء حذف متعدد للاُصول',
+	'bulk_delete'		=> 'Confirm Bulk Delete 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_delete_warn'	=> 'You are about to delete :asset_count assets.',
 	'bulk_update'		=> 'Bulk Update Assets',
@@ -15,7 +15,6 @@ return array(
     'create'			=> 'Create Asset',
     'date'				=> 'Purchase Date',
     'depreciates_on'	=> 'Depreciates On',
-    'depreciation'		=> 'Depreciation',
     'default_location'	=> 'Default Location',
     'eol_date'			=> 'EOL Date',
     'eol_rate'			=> 'EOL Rate',
@@ -35,7 +34,6 @@ return array(
     'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
     'tag'				=> 'Asset Tag',
     'update'			=> 'Asset Update',
     'warranty'			=> 'Warranty',

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'bulk_checkout'             => 'Checkout Assets to User',

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

@@ -4,23 +4,16 @@ return array(
 
     'asset'             => 'Asset',
     'checkin'           => 'Checkin',
-    'cost'              => 'Purchase Cost',
     'create'            => 'Create License',
-    'date'              => 'Purchase Date',
-    'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
     'license_key'       => 'Product Key',
     'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
-    'notes'             => 'Notes',
-    'order'             => 'Order No.',
     'purchase_order'    => 'Purchase Order Number',
     'reassignable'      => 'Reassignable',
     'remaining_seats'   => 'Remaining Seats',
     'seats'             => 'Seats',
-    'serial'            => 'Serial',
-    'supplier'          => 'Supplier',
     'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',

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

@@ -1,7 +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',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Checkout History',
     'checkout'  				=> 'Checkout License Seat',

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'File(s) not uploaded. Please try again.',
         'success' => 'File(s) successfully uploaded.',
         'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
     ),
 
     'update' => array(

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
     'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Assets Assigned',
     'id'                        => 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_manufacturers_title'     => 'About manufacturers',
+    'about_manufacturers_text'           => 'Manufacturers make all the magic items we consume.',
     'asset_manufacturers'	=> 'Asset Manufacturers',
     'create'				=> 'Create Manufacturer',
     'id'   					=> 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
     'requestable'               => 'Users may request this model',

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

@@ -114,12 +114,15 @@ return array(
     'two_factor_reset_error'          => 'Two factor device reset failed',
     'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
     'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
     'two_factor_required'        => 'Required for all users',
     'two_factor_disabled'        => 'Disabled',
     'two_factor_enter_code'	=> 'Enter Two-Factor Code',
     'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/ar/admin/suppliers/table.php

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
     'address'               => 'Supplier Address',
     'assets'                => 'Assets',
     'city'                  => 'City',

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

@@ -15,4 +15,7 @@ return array(
     'software_user'     => 'البرامج المسجلة لـ :name',
     'view_user'         => 'عرض المستخدم :name',
     'usercsv'           => 'ملف CSV',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
     );

resources/lang/ar/auth/message.php

@@ -7,6 +7,7 @@ return array(
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
     'account_banned'         => 'This user account is banned.',
+    'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',
 
     'signin' => array(
         'error'   => 'There was a problem while trying to log you in, please try again.',

resources/lang/ar/general.php

@@ -49,6 +49,8 @@
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
     'date'					=> 'التاريخ',
+    'debug_warning'         => 'Warning!',
+    'debug_warning_text'         => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'حذف',
     'deleted'  				=> 'تم حذفها',
     'delete_seats'  		=> 'Deleted Seats',
@@ -113,6 +115,7 @@
     'no_results'			=> 'لا يوجد نتائج.',
     'no'  					=> 'لا',
     'notes'  				=> 'مُلاحظات',
+    'order_number'          => 'Order Number',
     'page_menu'				=> 'Showing _MENU_ items',
     'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'في انتظار المراجعة',
@@ -121,6 +124,8 @@
     'previous'				=> 'Previous',
     'processing'			=> 'Processing',
     'profile'				=> 'ملفك الشخصي',
+    'purchase_cost'                              => 'Purchase Cost',
+    'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
     'ready_to_deploy'		=> 'جاهزة للتوزيع',
@@ -145,11 +150,13 @@
     'select_asset'    		=> 'Select Asset',
     'settings'				=> 'الإعدادات',
     'sign_in'				=> 'تسجيل الدخول',
+    'signature'             => 'Signature',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'إسم الموقع',
     'state'  				=> 'المنطقة / الولاية',
     'status_labels'			=> 'بطاقات الحالة',
     'status'    			=> 'الحالة',
+    'supplier'              => 'Supplier',
     'suppliers'  			=> 'الموردون',
     'submit'				=> 'Submit',
     'total_assets'			=> 'إجمالي الأصول',

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

@@ -5,18 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Аксесоарите са всички неща, които се изписват на потребителите, но нямат сериен номер (или няма нужда да бъдат конкретно проследявани). Например, това са мишки, клавиатури и др.',
     'accessory_category' 				=> 'Категория аксесоари',
     'accessory_name'  					=> 'Аксесоар',
-    'cost'					=> 'Стойност на закупуване',
     'checkout'  							=> 'Checkout Accessory',
     'checkin'  							=> 'Checkin Accessory',
     'create'  							=> 'Създаване на аксесоар',
-    'date'					=> 'Дата на закупуване',
     'edit'  							=> 'Edit Accessory',
     'eula_text'							=> 'EULA на категорията',
     'eula_text_help'					=> 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.',
     'require_acceptance'				=> 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.',
     'no_default_eula'					=> 'Няма EULA по подразбиране. Добавете я в Настройки.',
-    'order'					=> 'Номер на поръчка',
-    'qty'  								=> 'Количество',
     'total'  							=> 'Oбщо',
     'remaining'  						=> 'Наличност',
     'update'  							=> 'Обновяване на аксесоар',

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

@@ -2,8 +2,7 @@
 
     return [
         'title'         => 'Поддръжка на активи',
-        'asset_name'    => 'Актив',
+        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Доставчик',
         'is_warranty'   => 'Гаранция',
         'dl_csv'        => 'Сваляне на CSV'
     ];

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

@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'Относно категориите на активи',
+    'about_categories_title' 			=> 'About Categories',
-    'about_categories'  				=> 'Категориите помагат организирането на активите. Примерни категории могат да бъдат &quot;Стационарни PC&quot;, &quot;Лаптопи&quot;, &quot;Мобилни телефони&quot;, &quot;Таблети&quot; и т.н., но можете да използвате всяка категория, имаща смисъл за организацията Ви.',
+    'about_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.',
     'asset_categories' 					=> 'Категории на активи',
     'category_name'  					=> 'Име на категория',
     'checkin_email'                     => 'Изпращане на email до потребителя при вписване на активи.',

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

@@ -1,4 +1,6 @@
 <?php
 return [
+    'about_companies_title'            => 'About Companies',
+    'about_companies_text'                  => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
     'select_company' => 'Изберете компания',
 ];

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

@@ -5,11 +5,8 @@ return array(
     'about_consumables_text'  			=> 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.',
     'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Консуматив',
-    'cost'              				=> 'Стойност на закупуване',
     'create'                            => 'Създаване на консуматив',
-    'date'					            => 'Дата на закупуване',
     'item_no'                           => 'Item No.',
-    'order'					            => 'Номер на поръчка',
     'remaining' 			            => 'Остава',
     'total' 			                => 'Oбщо',
     'update'                            => 'Обновяване на консуматив',

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

@@ -4,9 +4,9 @@ return array(
     'custom_fields'		        => 'Потребителски полета',
     'field'		                => 'Поле',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
@@ -15,7 +15,7 @@ return array(
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

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

@@ -4,9 +4,9 @@ return array(
     'about_asset_depreciations'  			=> 'Относно амортизацията на активи',
     'about_depreciations'  					=> 'Тук можете да конфигурирате линейна амортизация на активи във времето.',
     'asset_depreciations'  					=> 'Амортизация на активи',
-    'create_depreciation'  					=> 'Създаване на амортизация',
+    'create'  					            => 'Create Depreciation',
     'depreciation_name'  					=> 'Амортизация',
     'number_of_months'  					=> 'Брой месеци',
-    'update_depreciation'  					=> 'Обновяване на амортизация',
+    'update'  					            => 'Update Depreciation',
 
 );

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

@@ -1,10 +1,11 @@
 <?php
 
 return array(
-
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
     'group_management' 	 	=> 'Управление на групи',
-    'create_group' 	 		=> 'Нова група',
+    'create' 	 	 	    => 'Create New Group',
-    'edit_group' 	 		=> 'Редакция на група',
+    'update' 	 		        => 'Edit Group',
     'group_name' 	 		=> 'Име на група',
     'group_admin' 	 		=> 'Администратор на група',
     'allow' 	 			=> 'Разрешаване',

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

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'bulk_delete'		=> 'Потвърдете масовото изтриване на активи',
+	'bulk_delete'		=> 'Confirm Bulk Delete Assets',
   'bulk_delete_help'	=> 'Прегледайте активите, маркирани за масово изтриване. Веднъж изтрити, активите могат да бъдат възстановени, но те вече няма да бъдат асоциирани с потребителите, на които са изписани в момента.',
   'bulk_delete_warn'	=> 'Ще бъдат изтрити :asset_count актива.',
 	'bulk_update'		=> 'Масово обновяване на активи',
@@ -15,7 +15,6 @@ return array(
     'create'			=> 'Създаване на актив',
     'date'				=> 'Дата на закупуване',
     'depreciates_on'	=> 'Амортизира се на',
-    'depreciation'		=> 'Амортизация',
     'default_location'	=> 'Местоположение по подразбиране',
     'eol_date'			=> 'EOL дата',
     'eol_rate'			=> 'EOL съотношение',
@@ -35,7 +34,6 @@ return array(
     'select_statustype'	=> 'Избиране на тип на статуса',
     'serial'			=> 'Сериен номер',
     'status'			=> 'Статус',
-    'supplier'			=> 'Доставчик',
     'tag'				=> 'Инвентарен номер',
     'update'			=> 'Обновяване на актив',
     'warranty'			=> 'Гаранция',

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 	'archived'  				=> 'Архивиран',
     'asset'  					=> 'Актив',
     'bulk_checkout'             => 'Checkout Assets to User',

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

@@ -4,23 +4,16 @@ return array(
 
     'asset'             => 'Актив',
     'checkin'           => 'Вписване',
-    'cost'              => 'Стойност на закупуване',
     'create'            => 'Добавяне на лиценз',
-    'date'              => 'Дата на закупуване',
-    'depreciation'      => 'Амортизация',
     'expiration'        => 'Срок на валидност',
     'license_key'       => 'Product Key',
     'maintained'        => 'В поддръжка',
     'name'              => 'Софтуерен продукт',
     'no_depreciation'   => 'Без амортизация',
-    'notes'             => 'Бележки',
-    'order'             => 'Номер на заявка',
     'purchase_order'    => 'Номер на заявка за закупуване',
     'reassignable'      => 'Може да бъде сменян ползвателя',
     'remaining_seats'   => 'Оставащи потребителски лицензи',
     'seats'             => 'Потребителски лицензи',
-    'serial'            => 'Сериен номер',
-    'supplier'          => 'Доставчик',
     'termination_date'  => 'Дата на валидност',
     'to_email'          => 'Лиценз към e-mail',
     'to_name'           => 'Лиценз към име',

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

@@ -1,7 +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',
     'checkin'  					=> 'Вписване на потребителски лиценз',
     'checkout_history'  		=> 'История на изписванията',
     'checkout'  				=> 'Изписване на потребителски лиценз',

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Файлът (файловете) не е качен. Моля, опитайте отново.',
         'success' => 'Файлът (файловете) е качен.',
         'nofiles' => 'Не сте избрали файл за качване или файлът, който се опитвате да качите е твърде голям',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
     ),
 
     'update' => array(

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
     'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Изписани активи',
     'id'                        => 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_manufacturers_title'     => 'About manufacturers',
+    'about_manufacturers_text'           => 'Manufacturers make all the magic items we consume.',
     'asset_manufacturers'	=> 'Производители',
     'create'				=> 'Създаване на производител',
     'id'   					=> 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
     'deleted'  					        => 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
     'restore'                   => 'Възстановяване на модел',
     'requestable'               => 'Users may request this model',

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

@@ -114,12 +114,15 @@ return array(
     'two_factor_reset_error'          => 'Two factor device reset failed',
     'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
     'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
     'two_factor_required'        => 'Required for all users',
     'two_factor_disabled'        => 'Disabled',
     'two_factor_enter_code'	=> 'Enter Two-Factor Code',
     'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/bg/admin/suppliers/table.php

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
     'address'               => 'Адрес на доставчика',
     'assets'                => 'Активи',
     'city'                  => 'Град',

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

@@ -15,4 +15,7 @@ return array(
     'software_user'     => 'Софтуерни продукти, изписани на :name',
     'view_user'         => 'Преглед на потребител :name',
     'usercsv'           => 'CSV файл',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
     );

resources/lang/bg/auth/message.php

@@ -7,6 +7,7 @@ return array(
     'account_not_activated'  => 'Потребителят все още не е активиран.',
     'account_suspended'      => 'Потребителят е временно спрян.',
     'account_banned'         => 'Потребителят е неактивен.',
+    'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',
 
     'signin' => array(
         'error'   => 'Проблем при входа в системата. Моля опитайте отново.',

resources/lang/bg/general.php

@@ -49,6 +49,8 @@
     'custom_report'         => 'Потребителски справки за активи',
     'dashboard'				=> 'Табло',
     'date'					=> 'Дата',
+    'debug_warning'         => 'Warning!',
+    'debug_warning_text'         => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Изтриване',
     'deleted'  				=> 'Изтрито',
     'delete_seats'  		=> 'Изтрити работни места за лиценз',
@@ -113,6 +115,7 @@
     'no_results'			=> 'Няма резултат.',
     'no'  					=> 'Не',
     'notes'  				=> 'Бележки',
+    'order_number'          => 'Order Number',
     'page_menu'				=> 'Показване на _MENU_ записа',
     'pagination_info'		=> 'Показване на _START_ до _END_ от _TOTAL_ елемента',
     'pending'				=> 'Изчакване',
@@ -121,6 +124,8 @@
     'previous'				=> 'Предишен',
     'processing'			=> 'Обработка',
     'profile'				=> 'Вашият профил',
+    'purchase_cost'                              => 'Purchase Cost',
+    'purchase_date'         => 'Purchase Date',
     'qty'		            => 'Количество',
     'quantity'		        => 'Kоличество',
     'ready_to_deploy'		=> 'Готово за предоставяне',
@@ -145,11 +150,13 @@
     'select_asset'    		=> 'Select Asset',
     'settings'				=> 'Настройки',
     'sign_in'				=> 'Вход',
+    'signature'             => 'Signature',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Име на системата',
     'state'  				=> 'Област',
     'status_labels'			=> 'Статус етикети',
     'status'    			=> 'Статус',
+    'supplier'              => 'Supplier',
     'suppliers'  			=> 'Доставчици',
     'submit'				=> 'Submit',
     'total_assets'			=> 'общо активи',

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

@@ -5,18 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Příslušenství je cokoliv, co předáte uživatelům, ale nemá to sérivoé číslo (nebo to neevidujete). Např. myš, klávesnice.',
     'accessory_category' 				=> 'Kategorie příslušenství',
     'accessory_name'  					=> 'Název příslušenství',
-    'cost'					=> 'Pořizovací cena',
     'checkout'  							=> 'Předat příslušenství',
     'checkin'  							=> 'Převzít příslušenství',
     'create'  							=> 'Vytvoř příslušenství',
-    'date'					=> 'Datum pořízení',
     'edit'  							=> 'Upravit Příslušenství',
     'eula_text'							=> 'Kategorie EULA',
     'eula_text_help'					=> 'Toto pole umožňuje upravit EULA pro různé druhy majetku. Pokud máte pouze jeden typ pro všechen majetek, můžete zaškrtnout položku níže pro použití jako výchozí.',
     'require_acceptance'				=> 'Požadovat potvrzení převzetí majetku v této kategorii.',
     'no_default_eula'					=> 'Žádná primární EULA. Přidat novou v Nastavení.',
-    'order'					=> 'Číslo objednávky',
-    'qty'  								=> 'Množství',
     'total'  							=> 'CELKEM',
     'remaining'  						=> 'Dostupný',
     'update'  							=> 'Aktualizace příslušenství',

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

@@ -2,8 +2,7 @@
 
     return [
         'title'         => 'Údržba zařízení',
-        'asset_name'    => 'Název majetku',
+        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Dodavatel',
         'is_warranty'   => 'Záruka',
         'dl_csv'        => 'Stáhnout CSV'
     ];

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

@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'O kategoriích majetku',
+    'about_categories_title' 			=> 'About Categories',
-    'about_categories'  				=> 'Kategorie pomáhají organizovat majetek. Takovou kategorii může být např. &quot;Desktopy&quot;, &quot;Notebooky&quot;, &quot;Mobilní telefony&quot;, &quot;Tablety&quot;, apod., kategorie můžete ale používat jakkoliv Vám to bude dávat smysl. ',
+    'about_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.',
     'asset_categories' 					=> 'Kategorie majetku',
     'category_name'  					=> 'Jméno kategorie',
     'checkin_email'                     => 'Poslat uživateli zprávu při přejímce.',

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

@@ -1,4 +1,6 @@
 <?php
 return [
+    'about_companies_title'            => 'About Companies',
+    'about_companies_text'                  => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
     'select_company' => 'Zvolte společnost',
 ];

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

@@ -5,11 +5,8 @@ return array(
     'about_consumables_text'  			=> 'Spotřební materiál jsou takové položky, které jsou v čase spotřebovávány, jako např. toner, inkoust či papír do tiskáren.',
     'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Název sp. materiálu',
-    'cost'              				=> 'Náklady',
     'create'                            => 'Vytvořit sp. materiál',
-    'date'					            => 'Datum pořízení',
     'item_no'                           => 'Položka č.',
-    'order'					            => 'Číslo objednávky',
     'remaining' 			            => 'Zbývá',
     'total' 			                => 'Celkem',
     'update'                            => 'Upravit sp. materiál',

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

@@ -6,7 +6,7 @@ return array(
     'about_fieldsets_title'		=> 'O sadách polí',
     'about_fieldsets_text'		=> 'Sady polí Vám umožňují vytvořit si vlastní hodnoty, které chcete evidovat u modelů majetku.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Sada',
@@ -15,7 +15,7 @@ return array(
     'fieldset_name'           => 'Název sady',
     'field_name'              => 'Název pole',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Typ pole',
     'field_element_short'     => 'Typ',
     'field_format'            => 'Formát',

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

@@ -4,9 +4,9 @@ return array(
     'about_asset_depreciations'  			=> 'O amortizaci majetku',
     'about_depreciations'  					=> 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.',
     'asset_depreciations'  					=> 'Amortizace majetku',
-    'create_depreciation'  					=> 'Vytvořit amortizaci',
+    'create'  					            => 'Create Depreciation',
     'depreciation_name'  					=> 'Jméno amortizace',
     'number_of_months'  					=> 'Počet měsíců',
-    'update_depreciation'  					=> 'Upravit amortizaci',
+    'update'  					            => 'Update Depreciation',
 
 );

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

@@ -1,10 +1,11 @@
 <?php
 
 return array(
-
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
     'group_management' 	 	=> 'Správa skupin',
-    'create_group' 	 		=> 'Vytvořit novou skupinu',
+    'create' 	 	 	    => 'Create New Group',
-    'edit_group' 	 		=> 'Upravit skupinu',
+    'update' 	 		        => 'Edit Group',
     'group_name' 	 		=> 'Název skupiny',
     'group_admin' 	 		=> 'Správce skupiny',
     'allow' 	 			=> 'Povolit',

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

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'bulk_delete'		=> 'Potvrzení hromadného odstranění majetku',
+	'bulk_delete'		=> 'Confirm Bulk Delete 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_delete_warn'	=> 'Chystáte se odstranit :asset_count položek majetku.',
 	'bulk_update'		=> 'Hromadná aktualizace majetku',
@@ -15,7 +15,6 @@ return array(
     'create'			=> 'Vytvořit záznam majetku',
     'date'				=> 'Datum pořízení',
     'depreciates_on'	=> 'Odepisuje se',
-    'depreciation'		=> 'Amortizace',
     'default_location'	=> 'Výchozí umístění',
     'eol_date'			=> 'Konec životnosti',
     'eol_rate'			=> 'Míra ukončení životnosti',
@@ -35,7 +34,6 @@ return array(
     'select_statustype'	=> 'Zvolte typ stavu',
     'serial'			=> 'Sériové číslo',
     'status'			=> 'Stav',
-    'supplier'			=> 'Dodavatel',
     'tag'				=> 'Označení majetku',
     'update'			=> 'Úprava majetku',
     'warranty'			=> 'Záruka',

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 	'archived'  				=> 'Archivováno',
     'asset'  					=> 'Majetek',
     'bulk_checkout'             => 'Checkout Assets to User',

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

@@ -4,23 +4,16 @@ return array(
 
     'asset'             => 'Majetek',
     'checkin'           => 'Příjem',
-    'cost'              => 'Pořizovací cena',
     'create'            => 'Založ licenci',
-    'date'              => 'Datum pořízení',
-    'depreciation'      => 'Amortizace',
     'expiration'        => 'Expirace',
     'license_key'       => 'Klíč',
     'maintained'        => 'Údržba',
     'name'              => 'Software',
     'no_depreciation'   => 'Neznehodnocovat',
-    'notes'             => 'Poznámky',
-    'order'             => 'Koupeno',
     'purchase_order'    => 'Číslo objednávky',
     'reassignable'      => 'Přeřaditelné',
     'remaining_seats'   => 'Nasazeno',
     'seats'             => 'Počet licencí',
-    'serial'            => 'Sériové číslo',
-    'supplier'          => 'Dodavatel',
     'termination_date'  => 'Platná do',
     'to_email'          => 'Registrováno na Email',
     'to_name'           => 'Registrace na jméno',

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

@@ -1,7 +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',
     'checkin'  					=> 'Převzít jednu licenci',
     'checkout_history'  		=> 'Historie',
     'checkout'  				=> 'Předat jednu licenci',

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Soubor(y) se nepodařilo nahrát. Prosím zkuste to znovu.',
         'success' => 'File(s) successfully uploaded.',
         'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
     ),
 
     'update' => array(

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
     'assets_rtd'                => 'Zařízení', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Předaných zař.',
     'id'                        => 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_manufacturers_title'     => 'About manufacturers',
+    'about_manufacturers_text'           => 'Manufacturers make all the magic items we consume.',
     'asset_manufacturers'	=> 'Výrobci',
     'create'				=> 'Vytvořit výrobce',
     'id'   					=> 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
     'deleted'  					        => 'Model byl vymazán. <a href="/hardware/models/:model_id/restore">Klikněte sem pro jeho obnovení</a>.',
     'restore'                   => 'Obnovení Modelu',
     'requestable'               => 'Users may request this model',

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

@@ -114,12 +114,15 @@ return array(
     'two_factor_reset_error'          => 'Two factor device reset failed',
     'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
     'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
     'two_factor_required'        => 'Required for all users',
     'two_factor_disabled'        => 'Disabled',
     'two_factor_enter_code'	=> 'Enter Two-Factor Code',
     'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/cs/admin/suppliers/table.php

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
     'address'               => 'Adresa dodavatele',
     'assets'                => 'Assets',
     'city'                  => 'Město',

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

@@ -15,4 +15,7 @@ return array(
     'software_user'     => 'Software vydaný pro :name',
     'view_user'         => 'Zobraz uživatele',
     'usercsv'           => 'CSV soubor',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
     );

resources/lang/cs/auth/message.php

@@ -7,6 +7,7 @@ return array(
     'account_not_activated'  => 'Uživatelský účet není aktivován.',
     'account_suspended'      => 'Uživatelský účet je pozastaven.',
     'account_banned'         => 'Uživatelský účet je zablokován.',
+    'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',
 
     'signin' => array(
         'error'   => 'Vyskytl se problém při přihlášení, zkuste to znovu.',

resources/lang/cs/general.php

@@ -49,6 +49,8 @@
     'custom_report'         => 'Vlastní report majetku',
     'dashboard'				=> 'Nástěnka',
     'date'					=> 'Datum',
+    'debug_warning'         => 'Warning!',
+    'debug_warning_text'         => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Odstranit',
     'deleted'  				=> 'Odstraněno',
     'delete_seats'  		=> 'Deleted Seats',
@@ -113,6 +115,7 @@
     'no_results'			=> 'Žádné výsledky.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
+    'order_number'          => 'Order Number',
     'page_menu'				=> 'Zobrazuji _MENU_ položky',
     'pagination_info'		=> 'Zobrazuji  _START_ to _END_ of _TOTAL_ položek',
     'pending'				=> 'Čeká na vyřízení',
@@ -121,6 +124,8 @@
     'previous'				=> 'Předchozí',
     'processing'			=> 'Pracuji',
     'profile'				=> 'Váš profil',
+    'purchase_cost'                              => 'Purchase Cost',
+    'purchase_date'         => 'Purchase Date',
     'qty'		            => 'Množství',
     'quantity'		        => 'Quantity',
     'ready_to_deploy'		=> 'Připraveno k přidělení',
@@ -145,11 +150,13 @@
     'select_asset'    		=> 'Select Asset',
     'settings'				=> 'Nastavení',
     'sign_in'				=> 'Přihlásit se',
+    'signature'             => 'Signature',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Název lokality',
     'state'  				=> 'Stát',
     'status_labels'			=> 'Označení stavu',
     'status'    			=> 'Stav',
+    'supplier'              => 'Supplier',
     'suppliers'  			=> 'Dodavatelé',
     'submit'				=> 'Submit',
     'total_assets'			=> 'celkem zařízení',

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

@@ -5,18 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Tilbehør er alt du udleverer til brugere men som ikke har et serienummer (eller som du er ligeglad med følge præcist). For eksempel, computermus eller tastaturer.',
     'accessory_category' 				=> 'Tilbehør Kategori',
     'accessory_name'  					=> 'Tilbehør Navn',
-    'cost'					=> 'Indkøbspris',
     'checkout'  							=> 'Tjek tilbehør ud',
     'checkin'  							=> 'Tjek tilbehør ind',
     'create'  							=> 'Opret tilbehør',
-    'date'					=> 'Købsdato',
     'edit'  							=> 'Rediger tilbehør',
     'eula_text'							=> 'Slutbrugerlicenskategori',
     'eula_text_help'					=> 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.',
     'require_acceptance'				=> 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.',
     'no_default_eula'					=> 'Ingen primær standard slutbrugerlicens blev fundet. Tilføj en under Indstillinger.',
-    'order'					=> 'Ordrenummer',
-    'qty'  								=> 'STK',
     'total'  							=> 'I alt',
     'remaining'  						=> 'Tilgængelig',
     'update'  							=> 'Opdater tilbehør',

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

@@ -2,8 +2,7 @@
 
     return [
         'title'         => 'Asset Maintenance',
-        'asset_name'    => 'Asset',
+        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Supplier',
         'is_warranty'   => 'Warranty',
         'dl_csv'        => 'Download CSV'
     ];

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

@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'Omkring Aktiver Kategorier',
+    'about_categories_title' 			=> 'About Categories',
-    'about_categories'  				=> 'Aktiver kategorier hjælper dig med at organisere dine aktiver. Eksempler på kategorier kunne være &quot;Stationære coputere&quot;, &quot;Bærbare&quot;, &quot;Mobiltelefoner&quot;, &quot;Tabletter&quot; osv., men du kan bruge aktiver kategorier på en hvilken som helst måde som giver mening for dig.',
+    'about_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.',
     'asset_categories' 					=> 'Aktiver Kategorier',
     'category_name'  					=> 'Kategorinavn',
     'checkin_email'                     => 'Send email til bruger ved tjek ind.',

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

@@ -1,4 +1,6 @@
 <?php
 return [
+    'about_companies_title'            => 'About Companies',
+    'about_companies_text'                  => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
     'select_company' => 'Select Company',
 ];

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

@@ -5,11 +5,8 @@ return array(
     'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
     'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Consumable Name',
-    'cost'              				=> 'Purchase Cost',
     'create'                            => 'Create Consumable',
-    'date'					            => 'Purchase Date',
     'item_no'                           => 'Item No.',
-    'order'					            => 'Order Number',
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',

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

@@ -4,9 +4,9 @@ return array(
     'custom_fields'		        => 'Custom Fields',
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
@@ -15,7 +15,7 @@ return array(
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

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

@@ -4,9 +4,9 @@ return array(
     'about_asset_depreciations'  			=> 'Omkring Aktiv Afskrivninger',
     'about_depreciations'  					=> 'Du kan sætte aktiv afskrivninger til at afskrive aktiver baseret på lineære afskrivninger.',
     'asset_depreciations'  					=> 'Aktiv Afskrivninger',
-    'create_depreciation'  					=> 'Opret Afskrivning',
+    'create'  					            => 'Create Depreciation',
     'depreciation_name'  					=> 'Afskrivningnavn',
     'number_of_months'  					=> 'Antal måneder',
-    'update_depreciation'  					=> 'Opdater Afskrivning',
+    'update'  					            => 'Update Depreciation',
 
 );

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

@@ -1,10 +1,11 @@
 <?php
 
 return array(
-
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
     'group_management' 	 	=> 'Gruppehåndtering',
-    'create_group' 	 		=> 'Opret Ny Gruppe',
+    'create' 	 	 	    => 'Create New Group',
-    'edit_group' 	 		=> 'Rediger Gruppe',
+    'update' 	 		        => 'Edit Group',
     'group_name' 	 		=> 'Gruppenavn',
     'group_admin' 	 		=> 'Gruppeadministrator',
     'allow' 	 			=> 'Tillad',

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

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'bulk_delete'		=> 'Bekræft massesletning af aktiver',
+	'bulk_delete'		=> 'Confirm Bulk Delete 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_delete_warn'	=> 'Du er i gang med at slette :asset_count aktiver.',
 	'bulk_update'		=> 'Masseopdater Aktiver',
@@ -15,7 +15,6 @@ return array(
     'create'			=> 'Opret Aktiv',
     'date'				=> 'Købsdato',
     'depreciates_on'	=> 'Afskrives Den',
-    'depreciation'		=> 'Afskrivning',
     'default_location'	=> 'Standardplacering',
     'eol_date'			=> 'EOL Dato',
     'eol_rate'			=> 'EOL Rate',
@@ -35,7 +34,6 @@ return array(
     'select_statustype'	=> 'Vælg statustype',
     'serial'			=> 'Serienummer',
     'status'			=> 'Status',
-    'supplier'			=> 'Leverandør',
     'tag'				=> 'Aktiv mærkat',
     'update'			=> 'Aktiv Opdatering',
     'warranty'			=> 'Garanti',

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'bulk_checkout'             => 'Checkout Assets to User',

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

@@ -4,23 +4,16 @@ return array(
 
     'asset'             => 'Asset',
     'checkin'           => 'Checkin',
-    'cost'              => 'Indkøbspris',
     'create'            => 'Opret licens',
-    'date'              => 'Købsdato',
-    'depreciation'      => 'Depreciation',
     'expiration'        => 'Udløbsdato',
     'license_key'       => 'Product Key',
     'maintained'        => 'Maintained',
     'name'              => 'Software navn',
     'no_depreciation'   => 'Do Not Depreciate',
-    'notes'             => 'Noter',
-    'order'             => 'Order No.',
     'purchase_order'    => 'Purchase Order Number',
     'reassignable'      => 'Reassignable',
     'remaining_seats'   => 'Remaining Seats',
     'seats'             => 'Seats',
-    'serial'            => 'Serienummer',
-    'supplier'          => 'Leverandør',
     'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',

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

@@ -1,7 +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',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Checkout History',
     'checkout'  				=> 'Checkout License Seat',

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'File(s) not uploaded. Please try again.',
         'success' => 'File(s) successfully uploaded.',
         'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
     ),
 
     'update' => array(

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
     'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Assets Assigned',
     'id'                        => 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_manufacturers_title'     => 'About manufacturers',
+    'about_manufacturers_text'           => 'Manufacturers make all the magic items we consume.',
     'asset_manufacturers'	=> 'Asset Manufacturers',
     'create'				=> 'Create Manufacturer',
     'id'   					=> 'ID',

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
     'requestable'               => 'Users may request this model',

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

@@ -114,12 +114,15 @@ return array(
     'two_factor_reset_error'          => 'Two factor device reset failed',
     'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
     'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
     'two_factor_required'        => 'Required for all users',
     'two_factor_disabled'        => 'Disabled',
     'two_factor_enter_code'	=> 'Enter Two-Factor Code',
     'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/da/admin/suppliers/table.php

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
     'address'               => 'Supplier Address',
     'assets'                => 'Assets',
     'city'                  => 'By',

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

@@ -15,4 +15,7 @@ return array(
     'software_user'     => 'Software Checked out to :name',
     'view_user'         => 'View User :name',
     'usercsv'           => 'CSV file',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
     );

resources/lang/da/auth/message.php

@@ -7,6 +7,7 @@ return array(
     'account_not_activated'  => 'Denne brugerkonto er ikke aktiveret.',
     'account_suspended'      => 'Denne brugerkonto er suspenderet.',
     'account_banned'         => 'Denne brugerkonto er blokeret.',
+    'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',
 
     'signin' => array(
         'error'   => 'Der opstod et problem, ved forsøg på at logge dig ind, prøv igen.',

resources/lang/da/general.php

@@ -49,6 +49,8 @@
     'custom_report'         => 'Tilpasset Aktiv Rapport',
     'dashboard'				=> 'Oversigtspanel',
     'date'					=> 'Dato',
+    'debug_warning'         => 'Warning!',
+    'debug_warning_text'         => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Slet',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Deleted Seats',
@@ -113,6 +115,7 @@
     'no_results'			=> 'Ingen Resultater.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
+    'order_number'          => 'Order Number',
     'page_menu'				=> 'Viser _MENU_ emner',
     'pagination_info'		=> 'Viser _START_ til _END_ af _TOTAL_ emner',
     'pending'				=> 'Afventer',
@@ -121,6 +124,8 @@
     'previous'				=> 'Forrige',
     'processing'			=> 'Behandler',
     'profile'				=> 'Din profil',
+    'purchase_cost'                              => 'Purchase Cost',
+    'purchase_date'         => 'Purchase Date',
     'qty'		            => 'STK',
     'quantity'		        => 'Antal',
     'ready_to_deploy'		=> 'Klar til Implementering',
@@ -145,11 +150,13 @@
     'select_asset'    		=> 'Select Asset',
     'settings'				=> 'Instillinger',
     'sign_in'				=> 'Log ind',
+    'signature'             => 'Signature',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Navn',
     'state'  				=> 'Stat',
     'status_labels'			=> 'Status labels',
     'status'    			=> 'Status',
+    'supplier'              => 'Supplier',
     'suppliers'  			=> 'Leverandører',
     'submit'				=> 'Submit',
     'total_assets'			=> 'totale aktiver',

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

@@ -5,18 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Ein Zubehör ist alles was Sie an einem Benutzer ausgeben können, jedoch keine Seriennummer besitzt (oder wo es keinen Sinn macht eben diese zu verwalten). Zum Beispiel: Computer Mäuse und Tastaturen.',
     'accessory_category' 				=> 'Züberhor Kategorie',
     'accessory_name'  					=> 'Zubehör Name',
-    'cost'					=> 'Einkaufspreis',
     'checkout'  							=> 'Zubehör ausbuchen',
     'checkin'  							=> 'Zubehör einbuchen',
     'create'  							=> 'Zubehör neu erstellen',
-    'date'					=> 'Kaufdatum',
     'edit'  							=> 'Zubehör bearbeiten',
     'eula_text'							=> 'Kategorie EULA',
     'eula_text_help'					=> 'Dieses Feld erlaubt Ihnen die EULA Ihren Bedürfnissen nach Asset Typ anzupassen.Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb um die Standard EULA zu verwenden.',
     'require_acceptance'				=> 'Erfordert die Zustimmung der Assets in dieser Kategorie durch den Benutzer.',
     'no_default_eula'					=> 'Keine Standard EULA gefunden. Fügen Sie eine in den Einstellungen hinzu.',
-    'order'					=> 'Bestellnummer',
-    'qty'  								=> 'Anzahl',
     'total'  							=> 'Gesamt',
     'remaining'  						=> 'Verfügbar',
     'update'  							=> 'Zubehör überarbeiten',

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

@@ -2,8 +2,7 @@
 
     return [
         'title'         => 'Wartungsverträge',
-        'asset_name'    => 'Name des Gegenstandes',
+        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Hersteller',
         'is_warranty'   => 'Garantie',
         'dl_csv'        => 'Als CSV herunterladen'
     ];

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

@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'Über Asset-Kategorien',
+    'about_categories_title' 			=> 'About Categories',
-    'about_categories'  				=> 'Kategorien helfen Ihnen dabei, Ihre Assets zu organisieren. Beispielkategorien sind "Schreibtische", "Laptops", "Handys", "Tablets" usw., jedoch können Sie Kategorien nutzen, wie es für Sie sinnvoll erscheint.',
+    'about_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.',
     'asset_categories' 					=> 'Asset-Kategorien',
     'category_name'  					=> 'Kategoriename',
     'checkin_email'                     => 'Dem Nutzer eine E-Mail beim Anmelden zusenden.',

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

@@ -1,4 +1,6 @@
 <?php
 return [
+    'about_companies_title'            => 'About Companies',
+    'about_companies_text'                  => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
     'select_company' => 'Firma auswählen',
 ];

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

@@ -3,13 +3,10 @@
 return array(
     'about_consumables_title' 			=> 'Details Verbrauchsmaterialien',
     'about_consumables_text'  			=> 'Verbrauchsmaterialien sind alle Dinge, die gekauft und mit der Zeit aufgebraucht werden, wie z.B. Druckerpatronen oder Kopierpapier.',
-    'checkout'                          => 'Verbrauchsmaterial für Benutzer ausbuchen',
+    'checkout'                          => 'Verbrauchsmaterial an Benutzer ausgeben',
     'consumable_name'                   => 'Name des Verbrauchsmaterials',
-    'cost'              				=> 'Einkaufspreis',
     'create'                            => 'Verbrauchsmaterial erstellen',
-    'date'					            => 'Kaufdatum',
     'item_no'                           => 'Artikel Nr.',
-    'order'					            => 'Bestellnummer',
     'remaining' 			            => 'übrig',
     'total' 			                => 'Gesamt',
     'update'                            => 'Verbrauchsmaterial überarbeiten',

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

@@ -6,7 +6,7 @@ return array(
     'about_fieldsets_title'		=> 'Über Feldsätze',
     'about_fieldsets_text'		=> 'Feldsätze erlauben es Gruppen aus benutzerdefinierten Feldern zu erstellen, welche regelmäßig für spezifische Modelltypen benutzt werden.',
     'custom_format'             => 'Benutzerdefiniertes Format...',
-    'encrypt_field'      	        => 'Den Wert dieses Feldes in der Datenbank verschlüsseln',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'Warnung: Ein verschlüsseltes Feld kann nicht durchsucht werden.',
     'encrypted'      	        => 'Verschlüsselt',
     'fieldset'      	        => 'Feldsatz',
@@ -15,7 +15,7 @@ return array(
     'fieldset_name'           => 'Feldsatzname',
     'field_name'              => 'Feldname',
     'field_values'            => 'Feldwerte',
-    'field_values_help'       => 'Füge wählbare Optionen hinzu, eine pro Zeile. Leere Zeilen außer der ersten Zeile werden ignoriert.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Formularelement',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

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

@@ -4,9 +4,9 @@ return array(
     'about_asset_depreciations'  			=> 'Über Asset-Abschreibungen',
     'about_depreciations'  					=> 'Sie können Asset-Abschreibungen einrichten, um Assets linear abzuschreiben.',
     'asset_depreciations'  					=> 'Asset-Abschreibungen',
-    'create_depreciation'  					=> 'Abschreibung erstellen',
+    'create'  					            => 'Create Depreciation',
     'depreciation_name'  					=> 'AfA-Name',
     'number_of_months'  					=> 'Anzahl der Monate',
-    'update_depreciation'  					=> 'Abschreibung aktualisieren',
+    'update'  					            => 'Update Depreciation',
 
 );

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

@@ -1,10 +1,11 @@
 <?php
 
 return array(
-
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
     'group_management' 	 	=> 'Gruppenverwaltung',
-    'create_group' 	 		=> 'Neue Gruppe erstellen',
+    'create' 	 	 	    => 'Create New Group',
-    'edit_group' 	 		=> 'Gruppe editieren',
+    'update' 	 		        => 'Edit Group',
     'group_name' 	 		=> 'Gruppenname',
     'group_admin' 	 		=> 'Gruppenadministrator',
     'allow' 	 			=> 'Zulassen',

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

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'bulk_delete'		=> 'Massenlöschung von Assets bestätigen',
+	'bulk_delete'		=> 'Confirm Bulk Delete Assets',
   '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_delete_warn'	=> 'Sie sind im Begriff :asset_count Assets zu löschen.',
 	'bulk_update'		=> 'Massenaktualisierung von Assets',
@@ -15,7 +15,6 @@ return array(
     'create'			=> 'Asset erstellen',
     'date'				=> 'Kaufdatum',
     'depreciates_on'	=> 'Abschreiben auf',
-    'depreciation'		=> 'Abschreibung',
     'default_location'	=> 'Standard Lagerort',
     'eol_date'			=> 'End of Live Datum (Ende der Nutzungsdauer)',
     'eol_rate'			=> 'EOL Rate',
@@ -35,7 +34,6 @@ return array(
     'select_statustype'	=> 'Status Typ auswählen',
     'serial'			=> 'Seriennummer',
     'status'			=> 'Status',
-    'supplier'			=> 'Lieferant',
     'tag'				=> 'Asset Tag',
     'update'			=> 'Asset Update',
     'warranty'			=> 'Garantie',

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 	'archived'  				=> 'Archiviert',
     'asset'  					=> 'Asset',
     'bulk_checkout'             => 'Assets an Benutzer herausgeben',

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

@@ -4,23 +4,16 @@ return array(
 
     'asset'             => 'Asset',
     'checkin'           => 'Zurücknehmen',
-    'cost'              => 'Kaufpreis',
     'create'            => 'Lizenz erstellen',
-    'date'              => 'Kaufdatum',
-    'depreciation'      => 'Abschreibung',
     'expiration'        => 'Ablaufdatum',
     'license_key'       => 'Produktschlüssel',
     'maintained'        => 'Verwaltet',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Nicht abschreiben',
-    'notes'             => 'Notizen',
-    'order'             => 'Bestellnr.',
     'purchase_order'    => 'Bestellnummer',
     'reassignable'      => 'Zuweisbar',
     'remaining_seats'   => 'Verbleibende Aktivierungen',
     'seats'             => 'Anzahl Aktivierungen',
-    'serial'            => 'Seriennummer',
-    'supplier'          => 'Lieferant',
     'termination_date'  => 'Ablaufdatum',
     'to_email'          => 'E-Mail des Lizenzerwerbers',
     'to_name'           => 'Name des Lizenzerwerbers',

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

@@ -1,7 +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',
     'checkin'  					=> 'Lizenzaktivierung zurücknehmen',
     'checkout_history'  		=> 'Zuweisungsverlauf',
     'checkout'  				=> 'Lizenzaktivierung herausgeben',

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Datei(en) wurden nicht hochgeladen. Bitte versuchen Sie es noch einmal.',
         'success' => 'Datei(en) erfolgreich hochgeladen.',
         'nofiles' => 'Es wurde keine Datei für den Upload ausgewählt, oder die Datei ist zu groß',
-        'invalidfiles' => 'Eine oder mehrere Dateien sind zu groß oder haben einen falschen Dateityp. Erlaubte Dateitypen sind png, gif, jpg, doc, docx, pdf, txt, zip, rar, und rtf.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
     ),
 
     'update' => array(

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

@@ -1,6 +1,8 @@
 <?php
 
 return array(
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
     'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Zugewiesene Assets',
     'id'                        => 'ID',