Updated language strings

Fixes #2029
2016-06-02 19:02:33 -07:00 · 2016-06-02 11:23:36 -07:00
308 changed files with 2867 additions and 1476 deletions
@@ -49,7 +49,7 @@ class UsersController extends AdminController {
      'username' => 'required|min:2|unique:users,deleted_at,NULL',
      'email' => 'email|unique:users,email',
      'password' => 'required|min:6',
-      'password_confirm' => 'required|min:6|same:password',
+      'password_confirm' => 'required|same:password',
      'company_id' => 'integer',
    );

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'about_components_title' 			=> 'حول المكونات',
+    'about_components_text'  			=> 'المكونات هي العناصر التي تشكل جزءا من الأصل، على سبيل المثال القرص الصلب، ذاكرة الوصول العشوائي، إلخ.',
+    'component_name'                  => 'اسم المكون',
+    'checkin'                             => 'ادخالات المكونات',
+    'checkout'                             => 'مخرجات المكونات',
+    'cost'				=> 'تكلفة الشراء',
+    'create'                             => 'إنشاء مكون',
+    'edit'                             => 'تعديل مكون',
+    'date'					=> 'تاريخ الشراء',
+    'order'					=> 'رقم طلب الشراء',
+    'remaining' 			             => 'المتبقية',
+    'total' 			                 => 'المجموع',
+    'update'                            => 'تحديث مكون',
+);
@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'المكون غير موجود.',
+
+    'create' => array(
+        'error'   => 'لم يتم إنشاء المكون، الرجاء المحاولة مرة أخرى.',
+        'success' => 'تم إنشاء المكون بنجاح.'
+    ),
+
+    'update' => array(
+        'error'   => 'لم يتم تحديث المكون، الرجاء المحاولة مرة أخرى',
+        'success' => 'تم تحديث المكون بنجاح.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'هل أنت متأكد من رغبتك في حذف هذا المكون؟',
+        'error'   => 'حدثت مشكلة اثناء عملية حذف المكون. رجاءً المحاولة مرة اُخرى.',
+        'success' => 'تم حذف المكون بنجاح.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'لم تتم عملة اخراج المكون، الرجاء المحاولة مرة اخرى',
+        'success' 		=> 'تم إخراج المكون بنجاح.',
+        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'لم تتم عملية اخراج المكون، الرجاء المحاولة مرة اخرى',
+        'success' 		=> 'تم إدخال المكون بنجاح.',
+        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
+    )
+
+
+);
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'اسم المكون',
+);
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'الإستهلاك',
    'editprofile'  			=> 'تعديل الملف الشخصي',
    'eol'					=> 'الحياة',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'الإسم الأول',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'File',
    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
@@ -88,6 +94,7 @@
    'location'              => 'الموقع',
    'locations'				=> 'المواقع',
    'logout'				=> 'تسجيل خروج',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
    'manufacturer'			=> 'الشركة المصنعة',
    'manufacturers'			=> 'الشركات المصنعة',
    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'غير قابلة للتوزيع',
    'unknown_admin'			=> 'إداري غير معروف',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'المستخدم',
@@ -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',
+];
+
@@ -35,6 +35,12 @@ return array(
        'invalidfiles' => 'Един или повече файлове са твърде големи или с непозволен тип. Разрешените файлови типове за качване са png, gif, jpg, doc, docx, pdf и txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Сигурни ли сте, че желаете изтриване на актива?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Изпращане на нотификации към',
-	'alerts_enabled'			=> 'Алармите включени',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'ID на активи',
 	'auto_increment_assets'		=> 'Автоматично генериране на инвентарни номера на активите',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Визуализиране на актив',
    'display_checkout_date'     => 'Визуализиране на дата на изписване',
    'display_eol'               => 'Визуализиране на EOL в таблиците',
-    'display_qr'                => 'Визуализиране на QR кодове',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'Общи настройки',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'Относно настройките',
    'about_settings_text'       => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Местоположението не съществува.',
-    'assoc_users'	 => 'Местоположението е свързано с поне един потребител и не може да бъде изтрито. Моля, актуализирайте потребителите, така че да не са свързани с това местоположение и опитайте отново. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Местоположението не беше създадено. Моля опитайте отново.',
-        'success' => 'Местоположението създадено успешно.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Местоположението не беше обновено. Моля опитайте отново.',
-        'success' => 'Местоположението обновено успешно.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Сигурни ли сте, че желаете изтриване на този статус етикет?',
-        'error'   => 'Проблем при изтриване на местоположението. Моля опитайте отново.',
-        'success' => 'Местоположението изтрито успешно.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Амортизация',
    'editprofile'  			=> 'Редакция на профила',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'Първа',
    'first_name'			=> 'Собствено име',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'Файл',
    'file_uploads'			=> 'Качени файлове',
    'generate'				=> 'Генериране',
@@ -88,6 +94,7 @@
    'location'              => 'Местоположение',
    'locations'				=> 'Местоположения',
    'logout'				=> 'Изход',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
    'manufacturer'			=> 'Производител',
    'manufacturers'			=> 'Производители',
    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Тип',
    'undeployable'			=> 'Не може да бъде предоставян',
    'unknown_admin'			=> 'Непознат администратор',
+    'username_format'		=> 'Username Format',
    'update'                => 'Обновяване',
    'uploaded'              => 'Качен',
    'user'					=> 'Потребител',
@@ -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',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Zasílat upozornění na',
-	'alerts_enabled'			=> 'Upozornění zapnuta',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'ID majetku',
 	'auto_increment_assets'		=> 'Vygenerovat zvyšující se ID majetku',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Zobrazit název majetku',
    'display_checkout_date'     => 'Zobrazit den převzetí',
    'display_eol'               => 'Zobrazit EOL v tabulkovém zobrazení',
-    'display_qr'                => 'Zobrazit QR kódy',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'Obecné nastavení',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Místo neexistuje.',
-    'assoc_users'	 => 'Toto místo je spojeno s alespoň jedním uživatelem a nemůže být smazáno. Aktualizujte uživatele aby nenáleželi k tomuto místu a zkuste to znovu. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Místo nebylo vytvořeno, zkuste to znovu.',
-        'success' => 'Místo úspěšně vytvořeno.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Místo nebylo aktualizováno, zkuste to znovu',
-        'success' => 'Místo aktualizováno.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Opravdu chcete smazat tento typ stavu?',
-        'error'   => 'Vyskytl se problém při mazání místa. Zkuste to znovu.',
-        'success' => 'Místo bylo úspěšně smazáno.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Amortizace',
    'editprofile'  			=> 'Upravit profil',
    'eol'					=> 'Konec životnosti',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'První',
    'first_name'			=> 'Jméno',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'Soubor',
    'file_uploads'			=> 'Nahrání souboru',
    'generate'				=> 'Vytvořit',
@@ -88,6 +94,7 @@
    'location'              => 'Lokalita',
    'locations'				=> 'Umístění',
    'logout'				=> 'Odhlásit',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
    'manufacturer'			=> 'Výrobce',
    'manufacturers'			=> 'Výrobci',
    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Typ',
    'undeployable'			=> 'Ne-přiřaditelné',
    'unknown_admin'			=> 'Neznámy správce',
+    'username_format'		=> 'Username Format',
    'update'                => 'Aktualizace',
    'uploaded'              => 'Nahráno',
    'user'					=> 'Uživatel',
@@ -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',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Afskrivning',
    'editprofile'  			=> 'Ret Din Profil',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'Fornavn',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'Fil',
    'file_uploads'			=> 'Filoverførsel',
    'generate'				=> 'Skab',
@@ -88,6 +94,7 @@
    'location'              => 'Lokation',
    'locations'				=> 'Lokationer',
    'logout'				=> 'Log ud',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
    'manufacturer'			=> 'Producent',
    'manufacturers'			=> 'Producenter',
    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'Ikke implementerbar',
    'unknown_admin'			=> 'Ukendt Admin',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'Bruger',
@@ -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',
+];
+
@@ -3,8 +3,8 @@
 return array(

    'does_not_exist' => 'Diese Kategorie existiert nicht.',
-    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
-    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+    'assoc_models'	 => 'Diese Kategorie kann nicht gelöscht werden da sie bereits mit einem Modell verbunden ist. Bitte trennen Sie diese Kategorie von Ihren Modellen und versuchen Sie es erneut. ',
+    'assoc_items'	 => 'Diese Kategorie kann nicht gelöscht werden da sie bereits mit einem :asset_type verbunden ist. Bitte trennen Sie diese Kategorie von Ihrem :asset_type und versuchen Sie es erneut. ',

    'create' => array(
        'error'   => 'Die Kategorie konnte nicht erstellt werden, bitte versuchen sie es erneut.',
@@ -7,7 +7,7 @@ return array(
    'cost'				=> 'Einkaufspreis',
    'create'                             => 'Verbrauchsmaterial erstellen',
    'date'					=> 'Kaufdatum',
-    'item_no'               => 'Item No.',
+    'item_no'               => 'Artikel Nr.',
    'order'					=> 'Bestellnummer',
    'remaining' 			             => 'übrig',
    'total' 			                 => 'Gesamt',
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'Eine oder mehrere Ihrer Dateien ist zu groß oder deren Dateityp ist nicht zugelassen. Zugelassene Dateitypen sind png, gif, jpg, doc, docx, pdf, und txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Sind Sie sicher, dass Sie dieses Asset entfernen möchten?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Alarme senden an',
-	'alerts_enabled'			=> 'Alarme aktiv',
+	'alerts_enabled'			=> 'Alarme aktiviert',
+	'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
+	'alert_inv_threshold'		=> 'Inventar Alarmschwelle',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Zeige Assetname an',
    'display_checkout_date'     => 'Zeige Herausgabedatum',
    'display_eol'               => 'Zeige EOL in der Tabellenansicht',
-    'display_qr'                => 'Zeige QR-Codes',
+    'display_qr'                => 'Zeige quadratische Codes',
+	'display_alt_barcode'		=> 'Zeige 2D Barcode',
+	'barcode_type'				=> '3D Barcode Typ',
+	'alt_barcode_type'			=> '2D Barcode Typ',
    'eula_settings'				=> 'EULA Einstellungen',
    'eula_markdown'				=> 'Diese EULA <a href="https://help.github.com/articles/github-flavored-markdown/"> erlaubt Github Flavored Markdown</a>.',
    'general_settings'			=> 'Generelle Einstellungen',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'Über Einstellungen',
    'about_settings_text'       => 'Mit diesen Einstellungen können Sie verschiedene Aspekte Ihrer Installation anpassen.',
    'labels_per_page'           => 'Etiketten pro Seite',
-    'label_dimensions'              => 'Etikettengröße (Zoll)',
+    'label_dimensions'          => 'Etikettengröße (Zoll)',
    'page_padding'             => 'Seiten Ränder (Zoll)',
    'purge'                    => 'Gelöschte Einträge bereinigen',
    'labels_display_bgutter'    => 'Ettiketten Spaltenzwischenraum unterhalb',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Standort nicht verfügbar.',
-    'assoc_users'	 => 'Dieser Ort ist mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer updaten, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Ort wurde nicht erstellt, bitte versuchen Sie es erneut.',
-        'success' => 'Ort erfolgreich erstellt.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Ort wurde nicht aktualisiert, bitte erneut versuchen',
-        'success' => 'Ort erfolgreich aktualisiert.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Bist du sicher, dass du diesen Status entfernen möchtest?',
-        'error'   => 'Es gab einen Fehler beim Löschen des Orts. Bitte versuchen Sie es erneut.',
-        'success' => 'Der Ort wurde erfolgreich gelöscht.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'E-Mail zum Zurücksetzen des Passworts senden',
+    'email_reset_password'			=> 'Passwort zurücksetzen',
+    'reset_password'			    => 'Passwort zurücksetzen',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Melden Sie sich bitte an',
+    'forgot_password'               => 'Ich habe mein Passwort vergessen',
+    'remember_me'                   => 'Angemeldet bleiben',
+    ];
+
@@ -5,7 +5,7 @@ return array(
    'actions' 	                => 'Aktionen',
    'add'    	                => 'Hinzufügen',
    'cancel'                    => 'Abbrechen',
-    'checkin_and_delete'  	    => 'Checkin & Delete User',
+    'checkin_and_delete'  	    => 'Einchecken & User löschen',
    'delete'  	                => 'Löschen',
    'edit'    	                => 'Bearbeiten',
    'restore' 	                => 'Wiederherstellen',
@@ -56,14 +56,20 @@
    'depreciation'			=> 'Abschreibung',
    'editprofile'  			=> 'Profil bearbeiten',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'Erstes',
    'first_name'			=> 'Vorname',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'Datei',
    'file_uploads'			=> 'Datei-Uploads',
    'generate'				=> 'Generieren',
    'groups'				=> 'Gruppen',
    'gravatar_email'        => 'Gravatar E-Mail Adresse',
-    'history'  			    => 'History',
+    'history'  			    => 'Historie',
    'history_for'  			=> 'Verlauf für',
    'id'  					=> 'Id',
    'image_delete'         	=> 'Bild löschen',
@@ -88,6 +94,7 @@
    'location'              => 'Standort',
    'locations'				=> 'Standorte',
    'logout'				=> 'Abmelden',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
    'manufacturer'			=> 'Hersteller',
    'manufacturers'			=> 'Hersteller',
    'markdown'				=> 'Dieses Feld erlaubt <a href="https://help.github.com/articles/github-flavored-markdown/"> Github Flavored Markdown</a>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Typ',
    'undeployable'			=> 'Nicht herausgebbar',
    'unknown_admin'			=> 'Unbekannter Administrator',
+    'username_format'		=> 'Username Format',
    'update'                => 'Aktualisieren',
    'uploaded'              => 'Hochgeladen',
    'user'					=> 'Nutzer',
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'Ihr Link wurde verschickt!',
+    'user'			=> 'Dieser Benutzer existiert nicht oder hat keine E-Mail Adresse angegeben',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Depreciation',
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'First Name',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'File',
    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
@@ -88,6 +94,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>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'Un-deployable',
    'unknown_admin'			=> 'Unknown Admin',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'User',
@@ -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',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display 3D Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Depreciation',
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'First Name',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'File',
    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
@@ -88,6 +94,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>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'Un-deployable',
    'unknown_admin'			=> 'Unknown Admin',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'User',
@@ -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',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Depreciation',
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'First Name',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'File',
    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
@@ -88,6 +94,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>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'Un-deployable',
    'unknown_admin'			=> 'Unknown Admin',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'User',
@@ -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',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Depreciation',
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'First Name',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'File',
    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
@@ -88,6 +94,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>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'Un-deployable',
    'unknown_admin'			=> 'Unknown Admin',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'User',
@@ -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',
+];
+
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this asset?',
@@ -2,13 +2,14 @@

 return array(
 	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
+	'alerts_enabled'			=> 'Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Asset IDs',
 	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
 	'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.',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display QR Codes',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'General Settings',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'About Settings',
    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'              => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Label dimensions (inches)',
    'page_padding'             => 'Page margins (inches)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -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',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Depreciation',
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'First',
    'first_name'			=> 'First Name',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'File',
    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
@@ -88,6 +94,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>.',
@@ -142,6 +149,7 @@
    'type'  				=> 'Type',
    'undeployable'			=> 'Un-deployable',
    'unknown_admin'			=> 'Unknown Admin',
+    'username_format'		=> 'Username Format',
    'update'                => 'Update',
    'uploaded'              => 'Uploaded',
    'user'					=> 'User',
@@ -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',
+];
+
@@ -3,7 +3,7 @@
 return array(

    'does_not_exist' => 'Categoría inexistente.',
-    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'assoc_models'	 => 'Esta categoría está asignada al menos a un modelo y no puede ser eliminada. ',
    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',

    'create' => array(
@@ -36,6 +36,12 @@ return array(
        'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
    ),

+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
+    ),
+

    'delete' => array(
        'confirm'   	=> 'Estás seguro que quieres eliminar el equipo?',
@@ -3,15 +3,16 @@
 return array(
 	'alert_email'				=> 'Enviar alertas a',
 	'alerts_enabled'			=> 'Alertas habilitadas',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Umbral de alerta del inventario',
 	'asset_ids'					=> 'IDs de Recurso',
 	'auto_increment_assets'		=> 'Generar IDs de equipo autoincrementales',
 	'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.',
+    'confirm_purge'			    => 'Confirmar la purga',
+    'confirm_purge_help'		=> 'Introduzca el texto "Borrar" en el cuadro a continuación para depurar sus registros eliminados. Esta acción no se puede deshacer.',
 	'custom_css'				=> 'CSS Personalizado',
 	'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: &lt;style&gt;&lt;/style&gt.',
 	'default_currency'  		=> 'Moneda Predeterminada',
@@ -21,7 +22,10 @@ return array(
    'display_asset_name'        => 'Mostrar Nombre Equipo',
    'display_checkout_date'     => 'Mostrar Fecha de Salida',
    'display_eol'               => 'Mostrar EOL',
-    'display_qr'                => 'Mostrar Códigos QR',
+    'display_qr'                => 'Display Square Codes',
+	'display_alt_barcode'		=> 'Display 2D barcode',
+	'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>.',
    'general_settings'			=> 'Configuración General',
@@ -76,7 +80,7 @@ return array(
    'about_settings_title'      => 'Acerca de Ajustes',
    'about_settings_text'       => 'Estos ajustes te permiten personalizar ciertos aspectos de tu instalación.',
    'labels_per_page'           => 'Etiquetas por pàgina',
-    'label_dimensions'              => 'Dimensiones de las etiquetas (pulgadas)',
+    'label_dimensions'          => 'Dimensiones de las etiquetas (pulgadas)',
    'page_padding'             => 'Margenès de pàgina (pulgadas)',
    'purge'                    => 'Purge Deleted Records',
    'labels_display_bgutter'    => 'Label bottom gutter',
@@ -15,8 +15,8 @@ return array(
    ),
    'purge' => array(
        'error'     => 'An error has occurred while purging. ',
-        'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
-        'success'               => 'Deleted records successfully purged.'
+        'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.',
+        'success'               => 'Registros eliminados correctamente purgados.'
    ),

 );
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Localización no existente.',
-    'assoc_users'	 => 'Localización asociada con al menos un usuario, no puede eliminarse. Actualize los usuarios para que no la usen e intente de nuevo. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',


    'create' => array(
-        'error'   => 'Localización no creada, por favor intete de nuevo.',
-        'success' => 'Localización creada correctamente.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
    ),

    'update' => array(
-        'error'   => 'Localización no actualizada, por favor intete de nuevo',
-        'success' => 'Localización actualizada correctamente.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Confirma el borrado de la etiqueta de estado?',
-        'error'   => 'Ha sucedido un error eliminando la localización, inetente de nuevo.',
-        'success' => 'Localización eliminada correctamente.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
    )

 );
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Enviar enlace de restablecimiento de contraseña',
+    'email_reset_password'			=> 'Restaurar contraseña email',
+    'reset_password'			    => 'Restablecer Contraseña',
+    'login'                         => 'Iniciar Sesión',
+    'login_prompt'                  => 'Por favor, inicia sesión',
+    'forgot_password'               => 'He olvidado mi contraseña',
+    'remember_me'                   => 'Recordarme',
+    ];
+
@@ -56,8 +56,14 @@
    'depreciation'			=> 'Amortización',
    'editprofile'  			=> 'Editar Perfil',
    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'email_format'			=> 'Email Format',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
    'first'					=> 'Primero',
    'first_name'			=> 'Nombre',
+    'first_name_format'		=> 'First Name (jane@example.com)',
    'file_name'				=> 'Archivo',
    'file_uploads'			=> 'Carga de Archivos',
    'generate'				=> 'Generar',
@@ -74,7 +80,7 @@
    'asset_maintenances'       => 'Mantenimientos de Equipo',
    'item'  				=> 'Item',
    'insufficient_permissions' => '¡Permisos insuficientes!',
-    'language'				=> 'Language',
+    'language'				=> 'Lenguaje',
    'last'					=> 'Último',
    'last_name'             => 'Apellidos',
    'license'				=> 'Licencia',
@@ -88,6 +94,7 @@
    'location'              => 'Localización',
    'locations'				=> 'Localizaciones',
    'logout'				=> 'Desconexión',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
    'manufacturer'			=> 'Fabricante',
    'manufacturers'			=> 'Fabricantes',
    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -129,7 +136,7 @@
    'select_date'			=> 'Seleccionar fecha',
    'select_statuslabel'	=> 'Seleccionar Estado',
    'select_company'    			=> 'Seleccionar empresa',
-    'select_asset'    			=> 'Select Asset',
+    'select_asset'    			=> 'Seleccionar activos',
    'settings'				=> 'Opciones',
    'sign_in'				=> 'Entrar',
    'site_name'				=> 'Sitio',
@@ -142,6 +149,7 @@
    'type'  				=> 'Tipo',
    'undeployable'			=> 'No Instalable',
    'unknown_admin'			=> 'Admin Desconocido',
+    'username_format'		=> 'Username Format',
    'update'                => 'Actualizar',
    'uploaded'              => 'Subido',
    'user'					=> 'Usuario',
@@ -156,5 +164,5 @@
    'yes' 					=> 'Si',
    'zip'  					=> 'Códio Postal',
    'noimage'					=> 'Imagen no subida o imagen no encontrada.',
-    'token_expired'             => 'Your form session has expired. Please try again.',
+    'token_expired'             => 'Su sesión ha expirado, Intente otra ves.',
    ];
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'sent'	        => 'El link de la contraseña ha sido enviada!',
+    'user'			=> 'El usuario no existe o no tiene un email asociado',
+];
+
@@ -33,7 +33,7 @@ return array(
    "digits_between"   => ":attribute debe tener entre :min y :max dígitos.",
    "email"            => ":attribute formato incorrecto.",
    "exists"           => "El :attribute seleccionado no es correcto.",
-    "email_array"      => "One or more email addresses is invalid.",
+    "email_array"      => "Una o más direcciones de correo electrónico no es válido.",
    "image"            => ":attribute debe ser una imagen.",
    "in"               => "El :attribute seleccionado no es correcto.",
    "integer"          => ":attribute debe ser un número entero.",
@@ -3,8 +3,8 @@
 return array(

    'does_not_exist' => 'دسته بندی موجود نیست.',
-    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
-    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+    'assoc_models'	 => 'این گروه در حال حاضر همراه با حداقل یک مدل است و قادر به حذف نمی شود. لطفا بروز مدل های خود را به دیگر مرجع این رده و دوباره امتحان کنید. ',
+    'assoc_items'	 => 'این گروه در حال حاضر همراه با حداقل یکی است: asset_type و قادر به حذف نمی شود. لطفا به روز رسانی خود را: asset_type دیگر این گروه مرجع و دوباره امتحان کنید. ',

    'create' => array(
        'error'   => 'دسته ایجاد نشد ،دوباره امتحان کنید.',
@@ -1,4 +1,4 @@
 <?php
 return [
-    'select_company' => 'Select Company',
+    'select_company' => 'انتخاب شرکت',
 ];
@@ -1,18 +1,18 @@
 <?php
 return array(
-    'does_not_exist' => 'Company does not exist.',
-    'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+    'does_not_exist' => 'شرکت وجود ندارد.',
+    'assoc_users'    => 'این دسته بندی هم اکنون حداقل با یک مدل شریک است و نمیتوان حذف کرد.لطفا مدل های خود را به روزرسانی کنید تا این دسته بندی را ارجاع ندهند و دوباره امتحان کنید. ',
    'create' => array(
-        'error'   => 'Company was not created, please try again.',
-        'success' => 'Company created successfully.'
+        'error'   => 'شرکت ایجاد نشد،دوباره سعی کنید.',
+        'success' => 'شرکت ایجاد شد.'
    ),
    'update' => array(
-        'error'   => 'Company was not updated, please try again',
-        'success' => 'Company updated successfully.'
+        'error'   => 'شرکت ایجاد نشد،دوباره سعی کنید',
+        'success' => 'شرکت آپدیت شد.'
    ),
    'delete' => array(
-        'confirm' => 'Are you sure you wish to delete this company?',
-        'error'   => 'There was an issue deleting the company. Please try again.',
-        'success' => 'The Company was deleted successfully.'
+        'confirm' => 'آیا مطمعن هستید میخواهید این شرکت را پاک کنید؟',
+        'error'   => 'موضوع شرکت حذف شد. لطفا دوباره سعی کنید.',
+        'success' => 'این شرکت پاک شد.'
    )
 );
@@ -1,9 +1,9 @@
 <?php
 return array(
-    'companies' => 'Companies',
-    'create'    => 'Create Company',
-    'title'     => 'Company',
-    'update'    => 'Update Company',
-    'name'      => 'Company Name',
-    'id'        => 'ID',
+    'companies' => 'شرکت ها',
+    'create'    => 'ایجاد شرکت',
+    'title'     => 'شرکت',
+    'update'    => 'بروزرسانی شرکت',
+    'name'      => 'نام شرکت',
+    'id'        => 'شناسه',
 );
@@ -1,17 +1,17 @@
 <?php

 return array(
-    'about_components_title' 			=> 'About Components',
-    'about_components_text'  			=> 'Components are items that are part of an asset, for example HDD, RAM, etc.',
-    'component_name'                  => 'Component Name',
-    'checkin'                             => 'Checkin Component',
-    'checkout'                             => 'Checkout Component',
-    'cost'				=> 'Purchase Cost',
-    'create'                             => 'Create Component',
-    'edit'                             => 'Edit Component',
-    'date'					=> 'Purchase Date',
-    'order'					=> 'Order Number',
-    'remaining' 			             => 'Remaining',
-    'total' 			                 => 'Total',
-    'update'                            => 'Update Component',
+    'about_components_title' 			=> 'درباره قطعات',
+    'about_components_text'  			=> 'قطعات آیتم هایی هستند که بخشی از یک دارایی، به عنوان مثال HDD، RAM، و غیره',
+    'component_name'                  => 'نام اجزا',
+    'checkin'                             => 'کامپوننت قفل های دسترسی',
+    'checkout'                             => 'کامپیوننت پرداخت',
+    'cost'				=> 'هزینه خرید',
+    'create'                             => 'ایجاد کامپیوننت',
+    'edit'                             => 'تغییر کامپیوننت',
+    'date'					=> 'تاریخ خرید',
+    'order'					=> 'شماره سفارش',
+    'remaining' 			             => 'یاقیمانده',
+    'total' 			                 => 'مجموع',
+    'update'                            => 'بروزرسانی کامپیوننت',
 );
@@ -2,34 +2,34 @@

 return array(

-    'does_not_exist' => 'Component does not exist.',
+    'does_not_exist' => 'جزء وجود ندارد.',

    'create' => array(
-        'error'   => 'Component was not created, please try again.',
-        'success' => 'Component created successfully.'
+        'error'   => 'شرکت ایجاد نشد،دوباره سعی کنید.',
+        'success' => 'کامپیوننت ایجاد شد.'
    ),

    'update' => array(
-        'error'   => 'Component was not updated, please try again',
-        'success' => 'Component updated successfully.'
+        'error'   => 'کامپیوننت ایجاد نشد،دوباره سعی کنید',
+        'success' => 'کامپیوننت ایجاد شد.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this component?',
-        'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'confirm'   => 'آیا مطمعن هستید میخواهید این کامپیوننت را پاک کنید؟?',
+        'error'   => 'موضوع کامپوننت حذف شد. لطفا دوباره سعی کنید.',
+        'success' => 'کامپیوننت حذف شد.'
    ),

     'checkout' => array(
-        'error'   		=> 'Component was not checked out, please try again',
-        'success' 		=> 'Component checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'کامپیوننت پرداخت نشد ، دوباره سعی کنید.',
+        'success' 		=> 'کامپیوننت پرداخت شد.',
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
    ),

    'checkin' => array(
-        'error'   		=> 'Component was not checked in, please try again',
-        'success' 		=> 'Component checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'کامپیوننت بررسی نشد ، دوباره سعی کنید',
+        'success' 		=> 'کامپیوننت بررسی شد.',
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
    )


@@ -1,5 +1,5 @@
 <?php

 return array(
-    'title'      				=> 'Component Name',
+    'title'      				=> 'نام کامپیوننت',
 );
@@ -1,15 +1,15 @@
 <?php

 return array(
-    'about_consumables_title' 			=> 'About Consumables',
-    'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
-    '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',
+    'about_consumables_title' 			=> 'درباره مواد مصرفی',
+    'about_consumables_text'  			=> 'مواد مصرفی هر چیزی خریداری خواهد شد که تا در طول زمان استفاده می شود. به عنوان مثال، جوهر چاپگر کاغذ دستگاه کپی.',
+    'consumable_name'                  => 'نام های مصرفی',
+    'cost'				=> 'هزینه خرید',
+    'create'                             => 'ایجاد مواد مصرفی',
+    'date'					=> 'تاریخ خرید',
+    'item_no'               => 'شماره مورد ',
+    'order'					=> 'شماره سفارش',
+    'remaining' 			             => 'یاقیمانده',
+    'total' 			                 => 'مجموع',
+    'update'                            => 'به روز رسانی لوازم مصرفي',
 );
@@ -2,34 +2,34 @@

 return array(

-    'does_not_exist' => 'Consumable does not exist.',
+    'does_not_exist' => 'مواد مصرفی یافت نشد.',

    'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'لوازم مصرفي ایجاد نشد, لطفا دوباره سعی کنید.',
+        'success' => 'مواد مصرفی ایجاد شد.'
    ),

    'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'لوازم مصرفي بروز رسانی نشد, لطفا دوباره سعی کنید',
+        'success' => 'لوازم مصرفي با موفقیت به روز رسانی شد.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this consumable?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The consumable was deleted successfully.'
+        'confirm'   => 'آیا مطمعنید که می خواهید این ماده مصرفی را حذف کنید؟',
+        'error'   => 'یک مشکل در حذف کردن ماده مصرفی وجود دارد،دوباره سعی کنید.',
+        'success' => 'مواد مصرفی حذف شد.'
    ),

     'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'مواد مصرفی بررسی نشد ، دوباره سعی کنید.',
+        'success' 		=> 'مواد مصرفی بررسی شد.',
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
    ),

    'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'مواد مصرفی بررسی نشد ، دوباره سعی کنید',
+        'success' 		=> 'مواد مصرفی بررسی شد.',
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
    )


@@ -1,5 +1,5 @@
 <?php

 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'نام های مصرفی',
 );
@@ -1,23 +1,23 @@
 <?php

 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 used for specific asset model types.',
-    'fieldset'      	        => 'Fieldset',
-    'qty_fields'      	      => 'Qty Fields',
-    'fieldsets'      	        => 'Fieldsets',
-    'fieldset_name'           => 'Fieldset Name',
-    'field_name'              => 'Field Name',
-    'field_element'           => 'Form Element',
-    'field_element_short'     => 'Element',
-    'field_format'            => 'Format',
-    'field_custom_format'     => 'Custom Format',
-    'required'   		          => 'Required',
-    'req'   		              => 'Req.',
-    'used_by_models'   		    => 'Used By Models',
-    'order'   		            => 'Order',
-    'create_fieldset'         => 'New Fieldset',
-    'create_field'            => 'New Custom Field',
+    'custom_fields'		        => 'فیلدهای سفارشی',
+    'field'		                => 'فیلد',
+    'about_fieldsets_title'		=> 'درباره ی تنظیمات فیلد',
+    'about_fieldsets_text'		=> 'تنظیمات فیلد به شما امکان این را می دهد که گروه های فیلدهای سفارشی ایجاد کنید که مرتبا برای انواع مدل های دارایی خاص مورد استفاده ی مجدد قرار می گیرند.',
+    'fieldset'      	        => 'تنظیمات فیلد',
+    'qty_fields'      	      => 'فیلد های Qty',
+    'fieldsets'      	        => 'تنظیمات فیلد',
+    'fieldset_name'           => 'نام تنظیمات فیلد',
+    'field_name'              => 'نام فیلد',
+    'field_element'           => 'ایجاد یک عنصر',
+    'field_element_short'     => 'عنصر',
+    'field_format'            => 'شکل دادن',
+    'field_custom_format'     => 'شکل دادن سفارشی',
+    'required'   		          => 'نیازمندی',
+    'req'   		              => 'نیازمندی',
+    'used_by_models'   		    => 'استفاده شده توسط مدل ها',
+    'order'   		            => 'سفارش',
+    'create_fieldset'         => 'تنظیمات فیلد جدید',
+    'create_field'            => 'فیلد سفارشی جدید',
 );
@@ -3,25 +3,25 @@
 return array(

    'field' => array(
-        'invalid'   => 'That field does not exist.',
-        'already_added'   => 'Field already added',
+        'invalid'   => 'این زمینه وجود ندارد.',
+        'already_added'   => 'زمینه اضافه شده است',

        'create' => array(
-            'error'   => 'Field was not created, please try again.',
-            'success' => 'Field created successfully.',
-            'assoc_success' => 'Field successfully added to fieldset.'
+            'error'   => 'فیلد ایجاد نشده است، لطفا دوباره تلاش کنید.',
+            'success' => 'فیلد با موفقیت ایجاد شد.',
+            'assoc_success' => 'فیلد با موفقیت به تنظیمات فیلد اضافه شد.'
        ),

        'update' => array(
-            'error'   => 'Field was not updated, please try again',
-            'success' => 'Field updated successfully.'
+            'error'   => 'فیلد به روز رسانی نشده است، لطفا دوباره تلاش کنید',
+            'success' => 'فیلد با موفقیت به روز رسانی شد.'
        ),

        'delete' => array(
-            'confirm'   	=> 'Are you sure you wish to delete this field?',
-            'error'   => 'There was an issue deleting the field. Please try again.',
-            'success' => 'The field was deleted successfully.',
-            'in_use'   => 'Field is still in use.',
+            'confirm'   	=> 'آیا شما مطمئن هستید که می خواهید این فیلد را حذف کنید؟',
+            'error'   => 'در حذف کردن این فیلد مشکلی وجود داشت. لطفا دوباره تلاش کنید.',
+            'success' => 'فیلد با موفقیت حذف شد.',
+            'in_use'   => 'فیلد همچنان در حال استفاده است.',
        )

    ),
@@ -31,20 +31,20 @@ return array(


        'create' => array(
-            'error'   => 'Fieldset was not created, please try again.',
-            'success' => 'Fieldset created successfully.'
+            'error'   => 'تنظیمات فیلد ایجاد نشده است، لطفا دوباره تلاش کنید.',
+            'success' => 'تنظیمات فیلد با موفقیت ایجاد شد.'
        ),

        'update' => array(
-            'error'   => 'Fieldset was not updated, please try again',
-            'success' => 'Fieldset updated successfully.'
+            'error'   => 'تنظیمات فیلد به روز رسانی نشده است، لطفا دوباره تلاش کنید',
+            'success' => 'تنظیمات فیلد به موفقیت به روز رسانی شد.'
        ),

        'delete' => array(
-            'confirm'   	=> 'Are you sure you wish to delete this fieldset?',
-            'error'   => 'There was an issue deleting the fieldset. Please try again.',
-            'success' => 'The fieldset was deleted successfully.',
-            'in_use'   => 'Fieldset is still in use.',
+            'confirm'   	=> 'آیا شما مطمئن هستید که می خواهید این تنظیمات فیلد را حذف کنید؟',
+            'error'   => 'در حذف کردن تنظیمات فیلد مشکلی وجود داشت. لطفا دوباره تلاش کنید.',
+            'success' => 'تنظیمات فیلد با موفقیت حذف شد.',
+            'in_use'   => 'تنظیمات فیلد همچنان در حال استفاده است.',
        )

    ),
@@ -1,12 +1,12 @@
 <?php

 return array(
-    'about_asset_depreciations'  			=> 'About Asset Depreciations',
-    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-    'asset_depreciations'  					=> 'Asset Depreciations',
-    'create_depreciation'  					=> 'Create Depreciation',
-    'depreciation_name'  					=> 'Depreciation Name',
-    'number_of_months'  					=> 'Number of Months',
-    'update_depreciation'  					=> 'Update Depreciation',
+    'about_asset_depreciations'  			=> 'درباره ی استهلاک دارایی',
+    'about_depreciations'  					=> 'شما می توانید استهلاک دارایی را فعال کنید تا دارایی ها را بر اساس استهلاک خطی مستقیم، کم بهاء کنید.',
+    'asset_depreciations'  					=> 'استهلاک دارایی',
+    'create_depreciation'  					=> 'خلق استهلاک',
+    'depreciation_name'  					=> 'نام استهلاک',
+    'number_of_months'  					=> 'تعداد ماه ها',
+    'update_depreciation'  					=> 'به روز رسانی استهلاک',

 );
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Depreciation class does not exist.',
-    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+    'does_not_exist' => 'دسته ی استهلاک وجود ندارد.',
+    'assoc_users'	 => 'این استهلاک در حال حاضر همراه با یک یا چند مدل دیگر است و نمی تواند حذف شود. لطفا یکی از مدل ها را حذف کنید و سپس برای حذف کردن دوباره تلاش کنید. ',


    'create' => array(
-        'error'   => 'Depreciation class was not created, please try again. :(',
-        'success' => 'Depreciation class created successfully. :)'
+        'error'   => 'دسته ی استهلاک ساخته نشده بود، لطفا دوباره تلاش کنید. :(',
+        'success' => 'دسته ی استهلاک با موفقیت ساخته شد :)'
    ),

    'update' => array(
-        'error'   => 'Depreciation class was not updated, please try again',
-        'success' => 'Depreciation class updated successfully.'
+        'error'   => 'دسته ی استهلاک به روز رسانی نشده بود، لطفا دوباره تلاش کنید',
+        'success' => 'دسته ی استهلاک با موفقیت به روز رسانی شد.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
-        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
-        'success' => 'The depreciation class was deleted successfully.'
+        'confirm'   => 'آیا شما مطمئن هستید که می خواهید این دسته ی استهلاک را حذف کنید؟',
+        'error'   => 'در حذف کردن دسته ی استهلاک مشکلی وجود داشت. لطفا دوباره تلاش کنید.',
+        'success' => 'دسته ی استهلاک با موفقیت حذف شد.'
    )

 );
@@ -2,9 +2,9 @@

 return array(

-    'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
-    'title'      => 'Name ',
+    'id'      => 'شناسه',
+    'months'   => 'ماه ها',
+    'term'   => 'مدت زمان',
+    'title'      => 'نام ',

 );
@@ -2,21 +2,21 @@

 return array(

-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'گروه در حال حاضر وجود دارد!',
+    'group_not_found'     => 'گروه [: شناسه] وجود ندارد.',
+    'group_name_required' => 'نام زمینه مورد نیاز است',

    'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'گروه با موفقیت ایجاد شد.',
+        'update' => 'گروه با موفقیت بروز شد.',
+        'delete' => 'گروه با موفقیت حذف شد.',
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
-        'create' => 'There was an issue creating the group. Please try again.',
-        'update' => 'There was an issue updating the group. Please try again.',
-        'delete' => 'There was an issue deleting the group. Please try again.',
+        'confirm'   => 'آیا مطمئن هستید که می خواهید این گروه را حذف کنید؟',
+        'create' => 'اشکال در ایجاد گروه.لطفا دوباره تلاش کنید.',
+        'update' => 'اشکال در به روزرسانی گروه .لطفا دوباره تلاش کنید.',
+        'delete' => 'اشکال در حذف گروه.لطفا دوباره تلاش کنید.',
    ),

 );
@@ -2,8 +2,8 @@

 return array(

-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'شناسه',
+    'name'       => 'نام',
+    'users'      => '# از کاربران',

 );
@@ -2,12 +2,12 @@

 return array(

-    'group_management' 	 	=> 'Group Management',
-    'create_group' 	 		=> 'Create New Group',
-    'edit_group' 	 		=> 'Edit Group',
-    'group_name' 	 		=> 'Group Name',
-    'group_admin' 	 		=> 'Group Admin',
-    'allow' 	 			=> 'Allow',
-    'deny' 	 				=> 'Deny',
+    'group_management' 	 	=> 'مدیریت گروه',
+    'create_group' 	 		=> 'ساخت گروه جدید',
+    'edit_group' 	 		=> 'ویرایش گروه',
+    'group_name' 	 		=> 'نام گروه',
+    'group_admin' 	 		=> 'مدیر گروه',
+    'allow' 	 			=> 'اجازه می دهد',
+    'deny' 	 				=> 'رد کردن',

 );
@@ -1,44 +1,60 @@
 <?php

 return array(
-	'bulk_delete'		=> 'Confrm 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',
-	'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
-	'bulk_update_warn'	=> 'You are about to edit the properties of :asset_count assets.',
-    'checkedout_to'		=> 'Checked Out To',
-    'checkout_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
-    'checkout_to'		=> 'Checkout to',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create Asset',
-    'date'				=> 'Purchase Date',
-    'depreciates_on'	=> 'Depreciates On',
-    'depreciation'		=> 'Depreciation',
-    'default_location'	=> 'Default Location',
-    'eol_date'			=> 'EOL Date',
-    'eol_rate'			=> 'EOL Rate',
-    'expected_checkin'  => 'Expected Checkin Date',
-    'expires'			=> 'Expires',
-    'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
-    'mac_address'		=> 'MAC Address',
-    'manufacturer'		=> 'Manufacturer',
-    'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'select_statustype'	=> 'Select Status Type',
-    'serial'			=> 'Serial',
-    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+	'bulk_delete'		=> 'اعلام حذف دسته ای دارایی ها',
+  'bulk_delete_help'	=> 'بررسی دارایی برای حذف فله زیر کلیک کنید. به محض حذف این دارایی ها را می توان ترمیم کرد، اما ان ها دیگر قابل دسترسی با یوزر های دیگر نیستند.',
+  'bulk_delete_warn'	=> 'شما در حال حذف: دارایی های تعداد دارایی.',
+	'bulk_update'		=> 'به روز رسانی دارایی های فله',
+	'bulk_update_help'	=> 'این فرم برای به روز رسانی دارایی های متعدد در یک بار را به شما اجازه می دهد. تنها قسمت ها نیاز به تغییر را پر کنید. هر زمینه های خالی سمت چپ بدون تغییر باقی می ماند. ',
+	'bulk_update_warn'	=> 'شما در حال ادیت مشخصات : ',
+    'checkedout_to'		=> 'تحویل شده به
+
+',
+    'checkout_date'		=> 'چک کردن تاریخ
+',
+    'checkin_date'		=> 'تاریخ ورود
+',
+    'checkout_to'		=> 'اتمام به
+',
+    'cost'				=> 'هزینه خرید',
+    'create'			=> 'ایجاد دارایی
+',
+    'date'				=> 'تاریخ خرید
+',
+    'depreciates_on'	=> 'مستهلک کردن 
+',
+    'depreciation'		=> 'مستهلک کردن
+',
+    'default_location'	=> ' پیش فرض محل سکونت
+',
+    'eol_date'			=> ' تاریخ EOL
+',
+    'eol_rate'			=> ' نرخ EOL',
+    'expected_checkin'  => ' چک در تاریخ را پر کنید',
+    'expires'			=> 'تاریخ انقضا
+',
+    'fully_depreciated'	=> 'به طور کامل مستهلک شده',
+    'help_checkout'		=> 'اگر شما مایل به اختصاص این دارایی ها هستید بلافاصله، "آماده به استقرار" از لیست وضعیت به بالا انتخاب کنید.',
+    'mac_address'		=> 'مک ادرس',
+    'manufacturer'		=> 'سازنده',
+    'model'				=> 'مدل',
+    'months'			=> 'ماه ها',
+    'name'				=> 'نام دارایی',
+    'notes'				=> 'نت ها',
+    'order'				=> 'شماره سفارش',
+    'qr'				=> 'کیو آر کد',
+    'requestable'		=> 'کاربران ممکن است این دارایی هارا درخواست کنند
+',
+    'select_statustype'	=> 'انتخاب نوع وضعیت',
+    'serial'			=> 'سریال',
+    'status'			=> 'وضعیت',
+    'supplier'			=> 'تامین کننده
+',
+    'tag'				=> 'برچسب دارایی
+',
+    'update'			=> 'به روز رسانی دارایی
+',
+    'warranty'			=> 'گارانتی',
+    'years'				=> 'سال ها',
 )
 ;
@@ -1,19 +1,20 @@
 <?php

 return array(
-	'archived'  				=> 'Archived',
-    'asset'  					=> 'Asset',
-    'checkin'  					=> 'Checkin Asset',
-    'checkout'  				=> 'Checkout Asset to User',
-    'clone'  					=> 'Clone Asset',
-    'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
-    'edit'  					=> 'Edit Asset',
-	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
-    'requestable'				=> 'Requestable',
-    'restore'  					=> 'Restore Asset',
-    'pending'  					=> 'Pending',
-    'undeployable'  			=> 'Undeployable',
-    'view'  					=> 'View Asset',
+	'archived'  				=> 'بایگانی شد',
+    'asset'  					=> 'دارایی',
+    'checkin'  					=> 'دارایی checkin',
+    'checkout'  				=> 'پرداخت سرمایه به کاربر',
+    'clone'  					=> 'دارایی شگرف',
+    'deployable'  				=> 'گسترش',
+    'deleted'  					=> 'این دارایی حذف شده است. <a href="/hardware/:asset_id/restore"> اینجا به بازگرداندن آن کلیک کنید </a>.',
+    'edit'  					=> 'ویرایش دارایی',
+	'filetype_info'				=> 'انواع فایل های مجاز عبارتند از PNG، GIF، JPG، JPEG، DOC، DOCX، PDF، TXT، ZIP و RAR.',
+    'model_deleted'  			=> 'این مدل دارایی حذف شده است. شما باید مدل بازگرداندن قبل از شما می توانید دارایی بازگرداندن کنید. <br/> <a href="/hardware/models/:model_id/restore"> برای بازگرداندن مدل </a> را اینجا را کلیک کنید.',
+    'requestable'				=> 'در خواست شد',
+    'restore'  					=> 'بازیابی دارایی',
+    'pending'  					=> 'در انتظار',
+    'undeployable'  			=> 'غیرقابل گسترش',
+    'view'  					=> 'نمایش دارایی ها
+',
 );
@@ -2,64 +2,69 @@

 return array(

-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'undeployable' 		=> '<strong> اخطار: </ strong> این دارایی به برانگیز گزارش شده است که در حال حاضر undeployable. اگر این وضعیت تغییر کرده است، لطفا به روز رسانی وضعیت دارایی.',
+    'does_not_exist' 	=> 'دارایی وجود ندارد.',
+    'does_not_exist_or_not_requestable' => 'دوباره تلاش کنید . این دارایی وجود ندارد.',
+    'assoc_users'	 	=> 'این دارایی در حال حاضر به یک کاربر چک کردن و پاک نمی شود. لطفا دارایی در اولین بار چک کنید، و سپس سعی کنید دوباره حذف کنید.',

    'create' => array(
-        'error'   		=> 'Asset was not created, please try again. :(',
-        'success' 		=> 'Asset created successfully. :)'
+        'error'   		=> 'دارایی ساخته نشده است، لطفا دوباره تلاش کنید.',
+        'success' 		=> 'دارایی موفقیت ایجاد شده است. :)'
    ),

    'update' => array(
-        'error'   			=> 'Asset was not updated, please try again',
-        'success' 			=> 'Asset updated successfully.',
-        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'error'   			=> 'دارایی به روز نیست، لطفا دوباره امتحان کنید',
+        'success' 			=> 'دارایی ها با موفقیت به روز رسانی.',
+        'nothing_updated'	=>  'هیچ زمینه، انتخاب شدند تا هیچ چیز به روز شد.',
    ),

    'restore' => array(
-        'error'   		=> 'Asset was not restored, please try again',
-        'success' 		=> 'Asset restored successfully.'
+        'error'   		=> 'دارایی بازیابی نشد، لطفا دوباره تلاش کنید',
+        'success' 		=> 'دارایی با موفقیت بازیابی شد.'
    ),

    'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'فایل حذف نمی شود. لطفا دوباره تلاش کنید.',
+        'success' => 'فایل با موفقیت حذف شده است.',
    ),

    'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+        'error'   => 'فایل) آپلود نیست. لطفا دوباره تلاش کنید.',
+        'success' => 'فایل (موفقیت آپلود شد.',
+        'nofiles' => 'شما هر فایل برای آپلود انتخاب کنید، و یا فایل شما در حال تلاش برای آپلود بیش از حد بزرگ است',
+        'invalidfiles' => 'یک یا بیشتر از فایل های خود را بیش از حد بزرگ است یا یک نوع فایل است که مجاز است. انواع فایل های مجاز عبارتند از PNG، GIF، JPG، DOC، DOCX، PDF، TXT و.',
+    ),
+
+    'import' => array(
+        'error'         => 'Some Items did not import Correctly.',
+        'errorDetail'   => 'The Following Items were not imported because of errors.',
+        'success'       => "Your File has been imported",
    ),


    'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this asset?',
-        'error'   		=> 'There was an issue deleting the asset. Please try again.',
-        'success' 		=> 'The asset was deleted successfully.'
+        'confirm'   	=> 'آیا شما مطمئن هستید که می خواهید این تنظیمات دارایی را حذف کنید؟',
+        'error'   		=> 'اشکال در حذف دارایی.لطفا دوباره تلاش کنید.',
+        'success' 		=> 'دارایی با موفقیت حذف شد.'
    ),

    'checkout' => array(
-        'error'   		=> 'Asset was not checked out, please try again',
-        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید',
+        'success' 		=> 'دارایی را بررسی کنید موفقیت.',
+        'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.'
    ),

    'checkin' => array(
-        'error'   		=> 'Asset was not checked in, please try again',
-        'success' 		=> 'Asset checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.',
-        'already_checked_in'  => 'That asset is already checked in.',
+        'error'   		=> 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید',
+        'success' 		=> 'دارایی ها با موفقیت در بررسی.',
+        'user_does_not_exist' => 'آن کاربر نامعتبر است. لطفا دوباره سعی کنید.',
+        'already_checked_in'  => 'دارایی ها که در حال حاضر انتخاب شده است.',

    ),

    'requests' => array(
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
+        'error'   		=> 'دارایی شد درخواست نمی کند، لطفا دوباره امتحان کنید',
+        'success' 		=> 'دارایی موفقیت درخواست شده است.',
    )

 );
@@ -2,23 +2,24 @@

 return array(

-    'asset_tag'   	=> 'Asset Tag',
-    'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
+    'asset_tag'   	=> 'برچسب دارایی',
+    'asset_model'       => 'مدل',
+    'book_value'  	=> 'عنوان آیتم',
+    'change' 		=> '/ خارج',
+    'checkout_date' => 'چک کردن تاریخ',
+    'checkoutto' 	=> 'قفل شده',
+    'diff' 			=> 'دیف',
+    'dl_csv' 		=> 'دانلود CSV',
    'eol' 			=> 'EOL',
-    'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
-    'image'		=> 'Device Image',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'id'      		=> 'شناسه',
+    'location' 		=> 'مکان',
+    'purchase_cost'	=> 'هزینه',
+    'purchase_date'	=> 'خریداری شده',
+    'serial'   		=> 'سریال',
+    'status'   		=> 'وضعیت',
+    'title'      	=> 'دارایی ',
+    'image'		=> 'دستگاه تصویر
+',
+    'days_without_acceptance' => 'روز بدون پذیرش'

 );
@@ -2,27 +2,35 @@

 return array(

-    'asset'             => 'Asset',
-    'checkin'           => 'Checkin',
-    'cost'              => 'Purchase Cost',
-    'create'            => 'Create License',
-    'date'              => 'Purchase Date',
-    'depreciation'      => 'Depreciation',
-    'expiration'        => 'Expiration Date',
-    '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',
-    'update'            => 'Update License',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'asset'             => 'دارایی',
+    'checkin'           => 'چک در',
+    'cost'              => 'هزینه خرید
+',
+    'create'            => 'ایجاد مجوز
+',
+    'date'              => 'تاریخ خرید',
+    'depreciation'      => 'مستهلک کردن',
+    'expiration'        => 'تاریخ انقضا',
+    'maintained'        => 'نگهداری',
+    'name'              => 'نام نرم افزار
+',
+    'no_depreciation'   => 'هنوز مستهلک نشده
+',
+    'notes'             => 'نت ها',
+    'order'             => 'شماره سفارش',
+    'purchase_order'    => 'شماره سفارش خرید',
+    'reassignable'      => 'واگذاری مجدد
+',
+    'remaining_seats'   => 'کرسی های باقی مانده
+',
+    'seats'             => 'صندلی
+',
+    'serial'            => 'سریال',
+    'supplier'          => 'تامین کننده',
+    'termination_date'  => 'تاریخ پایان
+',
+    'to_email'          => ' مجوز به ایمیل',
+    'to_name'           => 'مجوز به نام',
+    'update'            => 'به روز رسانی مجوز',
+    'checkout_help'     => 'شما باید یک مجوز به یک دارایی سخت افزار و یا یک شخص را بررسی کنید. شما می توانید هر دو را انتخاب کنید، اما مالک دارایی باید شخص شما چک کردن دارایی به مطابقت.'
 );
@@ -2,19 +2,20 @@

 return array(

-    'checkin'  					=> 'Checkin License Seat',
-    'checkout_history'  		=> 'Checkout History',
-    'checkout'  				=> 'Checkout License Seat',
-    'edit'  					=> 'Edit License',
-    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
-    'clone'  					=> 'Clone License',
-    'history_for'  				=> 'History for ',
-    'in_out'  					=> 'In/Out',
-    'info'  					=> 'License Info',
-    'license_seats'  			=> 'License Seats',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
-    'software_licenses'  		=> 'Software Licenses',
-    'user'  					=> 'User',
-    'view'  					=> 'View License',
+    'checkin'  					=> 'بررسی صندلی مجوز',
+    'checkout_history'  		=> 'تاریخچه پرداخت',
+    'checkout'  				=> 'صندلی مجوز پرداخت',
+    'edit'  					=> 'ویرایش مجوز',
+    'filetype_info'				=> 'انواع فایل های مجاز عبارتند از PNG، GIF، JPG، JPEG، DOC، DOCX، PDF، TXT، ZIP و RAR.
+',
+    'clone'  					=> 'مجوز شگرف',
+    'history_for'  				=> 'پیشینه برای ',
+    'in_out'  					=> 'داخل / خارج',
+    'info'  					=> 'اطلاعات پروانه',
+    'license_seats'  			=> 'صندلی مجوز',
+    'seat'  					=> 'صندلی',
+    'seats'  					=> 'صندلی ها',
+    'software_licenses'  		=> 'گواهی نامه های نرم افزاری',
+    'user'  					=> 'کاربر',
+    'view'  					=> 'مشاهده توافق‌نامه',
 );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	d47e2aab76	Updated language strings	2016-06-02 19:02:33 -07:00
snipe	c7399b0c4f	Fixes #2029	2016-06-02 11:23:36 -07:00