Updated translations

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'حول المواد الاستهلاكية',
     'about_consumables_text'  			=> 'المواد الاستهلاكية هي الأشياء المشتراة والتي ستستخدم مع مرور الوقت. على سبيل المثال، حبر الطابعة أو ورق الناسخة.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'اسم المادة الإستهلاكية',
     'cost'              				=> 'تكلفة الشراء',
     'create'                            => 'إنشاء مادة إستهلاكية',

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

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

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

@@ -13,6 +13,7 @@ return array(
 	'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',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

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

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

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

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/ar/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'التقارير',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'حفظ',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/ar/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'Относно консумативите',
     'about_consumables_text'  			=> 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Консуматив',
     'cost'              				=> 'Стойност на закупуване',
     'create'                            => 'Създаване на консуматив',

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

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

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

@@ -13,6 +13,7 @@ return array(
 	'filetype_info'				=> 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
     'model_deleted'  			=> 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.<br/> <a href="/hardware/models/:model_id/restore">Възстановяване на модел</a>.',
     'requestable'               => 'Може да бъде изискван',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Възстановяване на актив',
     'pending'  					=> 'Предстоящ',
     'undeployable'  			=> 'Не може да бъде предоставян',

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

@@ -39,6 +39,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -66,6 +68,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Активът не беше изискан. Моля опитайте отново.',
         'success' 		=> 'Активът изискан успешно.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
     'restore'                   => 'Възстановяване на модел',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Визуализиране на поле за MAC адрес в активите за този модел',
     'view_deleted'              => 'Преглед на изтритите',
     'view_models'               => 'Преглед на моделите',

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

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Модели на активи',
     'update'				=> 'Обновяване на модел на актив',
     'view'					=> 'Преглед на модел на актив',
-    'update'				=> 'Обновяване на модел',
+    'update'				=> 'Обновяване на модел на актив',
     'clone'				=> 'Копиране на модел',
     'edit'				=> 'Редакция на модел',
 );

resources/lang/bg/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Премахване на асоциация към компания',
     'reports'				=> 'Справки',
     'requested'				=> 'Изискан',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Запис',
     'select'				=> 'Избор',
     'search'				=> 'Търсене',

resources/lang/bg/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'O spotřebním materiálu',
     'about_consumables_text'  			=> 'Spotřební materiál jsou takové položky, které jsou v čase spotřebovávány, jako např. toner, inkoust či papír do tiskáren.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Název sp. materiálu',
     'cost'              				=> 'Náklady',
     'create'                            => 'Vytvořit sp. materiál',

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

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

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

@@ -13,6 +13,7 @@ return array(
 	'filetype_info'				=> 'Povolené soubory jsou png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, a rar.',
     'model_deleted'  			=> 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, <a href="/hardware/models/:model_id/restore">klepněte zde</a><br/> a obnovte nejdříve jeho model.',
     'requestable'               => 'Lze vyžádat',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Obnovit zařízení',
     'pending'  					=> 'Čekající',
     'undeployable'  			=> 'Nepřiřaditelné',

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

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Majetek nebyl vyžádán, zkuste to prosím znovu',
         'success' 		=> 'Vyžádání majetku proběhlo v pořádku.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Model byl vymazán. <a href="/hardware/models/:model_id/restore">Klikněte sem pro jeho obnovení</a>.',
     'restore'                   => 'Obnovení Modelu',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu',
     'view_deleted'              => 'Zobrazit smazané',
     'view_models'               => 'Zobrazit Modely',

resources/lang/cs/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reporty',
     'requested'				=> 'Požadováno',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Uložit',
     'select'				=> 'Zvolit',
     'search'				=> 'Hledat',

resources/lang/cs/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 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.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Consumable Name',
     'cost'              				=> 'Purchase Cost',
     'create'                            => 'Create Consumable',

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

@@ -4,17 +4,18 @@ 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.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'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',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

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

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

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

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/da/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Fjern association med selskab',
     'reports'				=> 'Rapporter',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Gem',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/da/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'Details Verbrauchsmaterialien',
     'about_consumables_text'  			=> 'Verbrauchsmaterialien sind alle Dinge, die gekauft und mit der Zeit aufgebraucht werden, wie z.B. Druckerpatronen oder Kopierpapier.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Name des Verbrauchsmaterials',
     'cost'              				=> 'Einkaufspreis',
     'create'                            => 'Verbrauchsmaterial erstellen',

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

@@ -8,6 +8,7 @@ return array(
     'custom_format'             => 'Benutzerdefiniertes Format...',
     'encrypt_field'      	        => 'Den Wert dieses Feldes in der Datenbank verschlüsseln',
     'encrypt_field_help'      => 'Warnung: Ein verschlüsseltes Feld kann nicht durchsucht werden.',
+    'encrypted'      	        => 'Verschlüsselt',
     'fieldset'      	        => 'Feldsatz',
     'qty_fields'      	      => 'Anzahl Felder',
     'fieldsets'      	        => 'Feldsätze',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Reihenfolge',
     'create_fieldset'         => 'Neuer Feldsatz',
     'create_field'            => 'Neues benutzerdefiniertes Feld',
+    'value_encrypted'      	        => 'Der Wert dieses Feldes ist in der Datenbank verschlüsselt. Nur Benutzer mit Administratorrechten können den entschlüsselten Wert anzeigen',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'filetype_info'				=> 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, oder rar.',
     'model_deleted'  			=> 'Dieses Asset wurde gelöscht. Sie müssen das Modell Wiederherstellen bevor Sie das Asset Wiederherstellen können <br/><a href="/hardware/models/:model_id/restore">klicken Sie hier um das Modell wiederherzustellen</a>.',
     'requestable'               => 'Anforderbar',
+    'requested'				    => 'Angefordert',
     'restore'  					=> 'Asset wiederherstellen',
     'pending'  					=> 'Ausstehend',
     'undeployable'  			=> 'nicht einsetzbar',

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

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Einige Elemente wurden nicht korrekt importiert.',
         'errorDetail'           => 'Die folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
         'success'               => "Ihre Datei wurde importiert",
+        'file_delete_success'   => "Die Datei wurde erfolgreich gelöscht",
+        'file_delete_error'      => "Die Datei konnte nicht gelöscht werden",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Das Asset wurde nicht angefordert, bitte versuchen Sie es erneut',
         'success' 		=> 'Asset erfolgreich angefordert.',
+        'canceled'      => 'Herausgeben erfolgreich abgebrochen'
     )
 
 );

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Datei(en) wurden nicht hochgeladen. Bitte versuchen Sie es noch einmal.',
         'success' => 'Datei(en) erfolgreich hochgeladen.',
         'nofiles' => 'Es wurde keine Datei für den Upload ausgewählt, oder die Datei ist zu groß',
-        'invalidfiles' => 'Eine oder mehrere Ihrer Datei(en) sind zu groß oder ein Dateityp ist nicht erlaubt. Erlaubte Dateitypen sind png, gif, jpg, doc, docx, pdf, and txt.',
+        'invalidfiles' => 'Eine oder mehrere Dateien sind zu groß oder haben einen falschen Dateityp. Erlaubte Dateitypen sind png, gif, jpg, doc, docx, pdf, txt, zip, rar, und rtf.',
     ),
 
     'update' => array(

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Dieses Modell wurde gelöscht.<a href="/hardware/models/:model_id/restore">klicken Sie hier um es Wiederzuherstellen</a>.',
     'restore'                   => 'Modell wiederherstellen',
+    'requestable'               => 'Benutzer können dieses Modell anfordern',
 	'show_mac_address'			      => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell',
     'view_deleted'              => 'Gelöschte anzeigen',
     'view_models'               => 'Modelle anzeigen',

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

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Modelle',
     'update'				=> 'Asset Modell aktualisieren',
     'view'					=> 'Asset Modell ansehen',
-    'update'				=> 'Modell aktualisieren',
+    'update'				=> 'Asset Modell aktualisieren',
     'clone'				=> 'Modell duplizieren',
     'edit'				=> 'Modell bearbeiten',
 );

resources/lang/de/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Firmenzuordnung entfernen',
     'reports'				=> 'Berichte',
     'requested'				=> 'Angefragt',
+    'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',
     'select'				=> 'auswählen',
     'search'				=> 'Suche',

resources/lang/de/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 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.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Consumable Name',
     'cost'              				=> 'Purchase Cost',
     'create'                            => 'Create Consumable',

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

@@ -4,17 +4,18 @@ 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.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'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',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

resources/lang/el/admin/hardware/message.php

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

resources/lang/el/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/el/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/el/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 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.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Consumable Name',
     'cost'              				=> 'Purchase Cost',
     'create'                            => 'Create Consumable',

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

@@ -8,6 +8,7 @@ return array(
     'custom_format'             => 'Custom format...',
     'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'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',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

resources/lang/en-GB/admin/hardware/message.php

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

resources/lang/en-GB/admin/licenses/message.php

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

resources/lang/en-GB/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/en-GB/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/en-GB/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'Tentang Consumables',
     'about_consumables_text'  			=> 'Consumables adalah sesuatu yang dibeli yang akan digunakan dari waktu ke waktu. Misalnya, tinta printer atau kertas fotokopi.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Nama Consumable',
     'cost'              				=> 'Harga Beli',
     'create'                            => 'Buat Consumable',

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

@@ -4,17 +4,18 @@ 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.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'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',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

resources/lang/en-ID/admin/hardware/message.php

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

resources/lang/en-ID/admin/licenses/message.php

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

resources/lang/en-ID/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/en-ID/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/en-ID/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

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

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

@@ -3,6 +3,7 @@
 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.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Consumable Name',
     'cost'              				=> 'Purchase Cost',
     'create'                            => 'Create Consumable',

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

@@ -4,17 +4,18 @@ 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.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'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',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

resources/lang/es-CO/admin/hardware/message.php

@@ -40,6 +40,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

resources/lang/es-CO/admin/licenses/message.php

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

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

resources/lang/es-CO/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/es-CO/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/es-CO/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'Acerca de los consumibles',
     'about_consumables_text'  			=> 'Consumibles son cualquier cosa comprada que puede ser usada a lo largo del tiempo. Por ejemplo, tinta para impresora o papel para copiadora.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'Nombre del Consumible',
     'cost'              				=> 'Precio de compra',
     'create'                            => 'Crear Consumible',

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

@@ -5,16 +5,17 @@ return array(
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Acerca de los campos personalizados',
     'about_fieldsets_text'		=> 'Los grupos de campos personalizados te permiten agrupar campos que se usan frecuentemente para determinados modelos de equipos.',
-    'custom_format'             => 'Custom format...',
+    'custom_format'             => 'Formato a medida...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encripta el valor de este campo en la base de datos para cada elemento. El valor desencriptado de este campo solo será visible por los administradores.',
-    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypt_field_help'      => 'CUIDADO: Encriptar un campo hace que no se pueda buscar por él.',
+    'encrypted'      	        => 'Encriptado',
     'fieldset'      	        => 'Grupo de campos personalizados',
     'qty_fields'      	      => 'Campos de Cantidad',
     'fieldsets'      	        => 'Grupo de campos personalizados',
     'fieldset_name'           => 'Nombre del grupo',
     'field_name'              => 'Nombre del campo',
-    'field_values'            => 'Field Values',
+    'field_values'            => 'Valores de los Campos',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Añade opciones seleccionables, una por línea. Las líneas en blanco tras la primera serán ignoradas. Separa valores y etiquetas con barras verticales en cada línea (opcional).',
     'field_element'           => 'Elemento de formulario',
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
     'create_field'            => 'Nuevo campo personalizado',
+    'value_encrypted'      	        => 'El valor de este campo está encriptado en la base de datos. Solo los administradores pueden ver el valor desencriptado',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'filetype_info'				=> 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
     'model_deleted'  			=> 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.<br/><a href="/hardware/models/:model_id/restore">Hacer click aquí para restaurar el modelo</a>.',
     'requestable'               => 'Requerible',
+    'requested'				    => 'Solicitado',
     'restore'  					=> 'Restaurar equipo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No desplegable',

resources/lang/es-ES/admin/hardware/message.php

@@ -37,9 +37,11 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some items did not import correctly.',
+        'error'                 => 'Algunos elementos no se pudieron importar correctamente.',
-        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'errorDetail'           => 'Estos elementos no pudieron importarse debido a errores.',
-        'success'       => "Your file has been imported",
+        'success'               => "Tu archivo ha sido importado",
+        'file_delete_success'   => "Tu archivo ha sido eliminado con éxito",
+        'file_delete_error'      => "No pudimos eliminar tu archivo",
     ),
 
 
@@ -53,7 +55,7 @@ return array(
         'error'   		=> 'Equipo no asignado, intentalo de nuevo',
         'success' 		=> 'Equipo asignado.',
         'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.',
-        'not_available' => 'That asset is not available for checkout!'
+        'not_available' => '¡Ese artículo no está disponible para retirada!'
     ),
 
     'checkin' => array(
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Bien no solicitado, por favor inténtelo de nuevo',
         'success' 		=> 'Bien solicitado correctamente.',
+        'canceled'      => 'Solicitud de retirada cancelada con éxito'
     )
 
 );

resources/lang/es-ES/admin/licenses/message.php

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.',
         'success' => 'Archivo(s) cargado correctamente.',
         'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande',
-        'invalidfiles' => 'Uno o más suss archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'invalidfiles' => 'Uno o más de tus ficheros son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar y rtf.',
     ),
 
     'update' => array(

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Este modelo ha sido borrado.<a href="/hardware/models/:model_id/restore">Click aquí para restaurarlo</a>.',
     'restore'                   => 'Restaurar Modelo',
+    'requestable'               => 'Los usuarios pueden solicitar este modelo',
 	'show_mac_address'			      => 'Mostrar el campo de la dirección MAC en los equipos de este modelo',
     'view_deleted'              => 'Ver Borrados',
     'view_models'               => 'Ver Modelos',

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

@@ -51,8 +51,8 @@ return array(
     'ldap_pword'                => 'Enlazar contraseña LDAP',
     'ldap_basedn'               => 'Enlazar base DN',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync'              => 'Sincronización de Contraseña LDAP',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync_help'         => 'Desmarca esta casilla si no quieres mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Desactivar esto significa que tus usuarios no podrán acceder si tu servidor LDAP no está disponible por algún motivo.',
     'ldap_username_field'       => 'Campo de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
@@ -92,8 +92,8 @@ return array(
     'label_dimensions'          => 'Dimensiones de las etiquetas (pulgadas)',
     'page_padding'             => 'Margenès de pàgina (pulgadas)',
     'purge'                    => 'Purgar registros eliminados',
-    'labels_display_bgutter'    => 'Label bottom gutter',
+    'labels_display_bgutter'    => 'Borde inferior de la Etiqueta',
-    'labels_display_sgutter'    => 'Label side gutter',
+    'labels_display_sgutter'    => 'Borde lateral de la Etiqueta',
     'labels_fontsize'           => 'Tamaño de fuente de la etiqueta',
     'labels_pagewidth'          => 'Ancho de la hoja de etiqueta',
     'labels_pageheight'         => 'Altura de la hoja de etiqueta',
@@ -101,8 +101,8 @@ return array(
     'page_dimensions'        => 'Dimensiones de la página (pulgadas)',
     'label_fields'          => 'Campos visibles de la etiqueta',
     'inches'        => 'pulgadas',
-    'width_w'        => 'w',
+    'width_w'        => 'an',
-    'height_h'        => 'h',
+    'height_h'        => 'al',
     'text_pt'        => 'pt',
     'left'        => 'izquierda',
     'right'        => 'derecha',

resources/lang/es-ES/admin/statuslabels/table.php

@@ -4,13 +4,13 @@ return array(
     'about'      	=> 'Info Etiquetas Estado',
     'archived'      	=> 'Archivado',
     'create'      	=> 'Crear Etiqueta Estado',
-    'color'      	=> 'Chart Color',
+    'color'      	=> 'Color de la Gráfica',
     'deployable'      	=> 'Desplegable',
     'info'      	=> 'Las etiquetas de estado se utilizan para describir los diferentes estados en que pueden estar tus equipos. Pueden estar fuera en reparación, perdidos/robados, etc. Puedes crear nuevas etiquetas de estado para equipos desplegables, pendientes o archivados.',
     'name'      	=> 'Estado',
     'pending'      	=> 'Pendiente',
     'status_type'   => 'Tipo de estado',
-    'show_in_nav'   => 'Show in side nav',
+    'show_in_nav'   => 'Mostrar en la barra lateral',
     'title'      	=> 'Etiquetas Estado',
     'undeployable'  => 'No desplegable',
     'update'      	=> 'Actualizar Etiqueta Estado',

resources/lang/es-ES/general.php

@@ -23,7 +23,7 @@
     'avatar_upload'         => 'Subir Avatar',
     'back'      			=> 'Atras',
     'bad_data'      		=> 'Ningún resultado. ¿Quizá un dato incorrecto?',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_checkout'  		=> 'Procesar en Lote',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
     'category'				=> 'Categoría',
@@ -76,7 +76,7 @@
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
     'import'         	    => 'Importar',
-    'import-history'        => 'Import History',
+    'import-history'        => 'Historial de Importación',
     'asset_maintenance'        => 'Mantenimiento de Equipo',
     'asset_maintenance_report' => 'Reporte de Mantenimiento de Equipo',
     'asset_maintenances'       => 'Mantenimientos de Equipo',
@@ -127,6 +127,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'requested'				=> 'Solicitado',
+    'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
     'select'				=> 'Seleccionar',
     'search'				=> 'Buscar',

resources/lang/es-ES/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

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

@@ -3,6 +3,7 @@
 return array(
     'about_consumables_title' 			=> 'درباره مواد مصرفی',
     'about_consumables_text'  			=> 'مواد مصرفی هر چیزی خریداری خواهد شد که تا در طول زمان استفاده می شود. به عنوان مثال، جوهر چاپگر کاغذ دستگاه کپی.',
+    'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'نام های مصرفی',
     'cost'              				=> 'هزینه خرید',
     'create'                            => 'ایجاد مواد مصرفی',

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

@@ -6,15 +6,16 @@ return array(
     'about_fieldsets_title'		=> 'درباره ی تنظیمات فیلد',
     'about_fieldsets_text'		=> 'تنظیمات فیلد به شما امکان این را می دهد که گروه های فیلدهای سفارشی ایجاد کنید که مرتبا برای انواع مدل های دارایی خاص مورد استفاده ی مجدد قرار می گیرند.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'تنظیمات فیلد',
     'qty_fields'      	      => 'فیلد های Qty',
     'fieldsets'      	        => 'تنظیمات فیلد',
     'fieldset_name'           => 'نام تنظیمات فیلد',
     'field_name'              => 'نام فیلد',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'ایجاد یک عنصر',
     'field_element_short'     => 'عنصر',
     'field_format'            => 'شکل دادن',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'سفارش',
     'create_fieldset'         => 'تنظیمات فیلد جدید',
     'create_field'            => 'فیلد سفارشی جدید',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -13,6 +13,7 @@ return array(
 	'filetype_info'				=> 'انواع فایل های مجاز عبارتند از PNG، GIF، JPG، JPEG، DOC، DOCX، PDF، TXT، ZIP و RAR.',
     'model_deleted'  			=> 'این مدل دارایی حذف شده است. شما باید مدل بازگرداندن قبل از شما می توانید دارایی بازگرداندن کنید. <br/> <a href="/hardware/models/:model_id/restore"> برای بازگرداندن مدل </a> را اینجا را کلیک کنید.',
     'requestable'               => 'در خواست شد',
+    'requested'				    => 'Requested',
     'restore'  					=> 'بازیابی دارایی',
     'pending'  					=> 'در انتظار',
     'undeployable'  			=> 'غیرقابل گسترش',

resources/lang/fa/admin/hardware/message.php

@@ -39,6 +39,8 @@ return array(
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -66,6 +68,7 @@ return array(
     'requests' => array(
         'error'   		=> 'دارایی شد درخواست نمی کند، لطفا دوباره امتحان کنید',
         'success' 		=> 'دارایی موفقیت درخواست شده است.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

@@ -24,7 +24,7 @@ return array(
         'error'   => 'فایل) آپلود نیست. لطفا دوباره تلاش کنید.',
         'success' => 'فایل (موفقیت آپلود شد.',
         'nofiles' => 'شما هر فایل برای آپلود انتخاب کنید، و یا فایل شما در حال تلاش برای آپلود بیش از حد بزرگ است',
-        'invalidfiles' => 'یک یا بیشتر از فایل های خود را بیش از حد بزرگ است یا یک نوع فایل است که مجاز است. انواع فایل های مجاز عبارتند از PNG، GIF، JPG، DOC، DOCX، PDF، TXT و.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
     ),
 
     'update' => array(

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'این مدل حذف شده است. <a href="/hardware/models/:model_id/restore"> اینجا برای بازگرداندن کلیک کنید it</a>.',
     'restore'                   => 'بازیابی مدل',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'نمایش قسمت آدرس MAC در دارایی در این مدل',
     'view_deleted'              => 'دیدن پاک شده ها',
     'view_models'               => 'دیدن مدل ها',

resources/lang/fa/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'مدل دارایی',
     'update'				=> 'بروزسانی مدل دارایی',
     'view'					=> 'نمایش مدل دارایی',
-    'update'				=> 'مدل به روز رسانی',
+    'update'				=> 'بروزسانی مدل دارایی',
     'clone'				=> 'مدل شگرف',
     'edit'				=> 'تغییر مدل',
 );

resources/lang/fa/general.php

@@ -131,6 +131,7 @@
     'remove_company'        => 'حذف انجمن شرکت',
     'reports'				=> 'گزارش‌ها',
     'requested'				=> 'در خواست شده',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'ذخیره کردن',
     'select'				=> 'انتخاب',
     'search'				=> 'جستوجو',

resources/lang/fa/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);