Updated translations

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Bate is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Die bate is suksesvol nagegaan.',
         'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.',
-        'not_available' => 'Die bate is nie beskikbaar vir die kassa nie!'
+        'not_available' => 'Die bate is nie beskikbaar vir die kassa nie!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Tik die teks "DELETE" in die onderstaande blokkie om jou geskrapde rekords te verwyder. Hierdie handeling kan nie ongedaan gemaak word nie.',
 	'custom_css'				=> 'Aangepaste CSS',
 	'custom_css_help'			=> 'Voer enige aangepaste CSS-oortredings in wat u graag wil gebruik. Moenie die <style></style>-etikette insluit nie.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Verstek Geld',
 	'default_eula_text'			=> 'Standaard EULA',
   'default_language'					=> 'Verstek taal',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP aangeskakel',
     'ldap_integration'          => 'LDAP-integrasie',
     'ldap_settings'             => 'LDAP-instellings',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP-bediener',
     'ldap_server_help'          => 'Dit moet begin met ldap: // (vir unencrypted of TLS) of ldaps: // (vir SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL-sertifikaat-validering',

resources/lang/af/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Verskaffer bestaan ​​nie.',
-    'assoc_users'	 => 'Hierdie verskaffer is tans geassosieer met ten minste een model en kan nie uitgevee word nie. Dateer asseblief jou modelle op om nie langer hierdie verskaffer te verwys nie en probeer weer.',
+
 
     'create' => array(
         'error'   => 'Verskaffer is nie geskep nie, probeer asseblief weer.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Is jy seker jy wil hierdie verskaffer uitvee?',
         'error'   => 'Daar was \'n probleem met die verwydering van die verskaffer. Probeer asseblief weer.',
-        'success' => 'Verskaffer is suksesvol verwyder.'
+        'success' => 'Verskaffer is suksesvol verwyder.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/af/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Uitteken',
     'city'  				=> 'Stad',
 	'click_here'			=> 'Klik hier',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'maatskappye',
     'company'				=> 'maatskappy',
     'component'			    => 'komponent',
@@ -89,6 +90,7 @@
     'history'  			    => 'Geskiedenis',
     'history_for'  			=> 'Geskiedenis vir',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Vee prent uit',
     'image_upload'         	=> 'Laai prent op',
     'import'         	    => 'invoer',

resources/lang/af/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'Die: Attribuut is reeds geneem.',
     'uploaded'             => 'Die: kenmerk kon nie opgelaai word nie.',
     'url'                  => 'Die: Attribuutformaat is ongeldig.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Jou huidige wagwoord is verkeerd",
         'dumbpwd'          => 'Daardie wagwoord is te algemeen.',
         "statuslabel_type" => "U moet 'n geldige statusetiket tipe kies",
-        "unique_undeleted" => "Die: Attribuut moet uniek wees.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'لم يتم سحب مادة العرض، يرجى إعادة المحاولة',
         'success' 		=> 'تم التحقق من الأصول بنجاح.',
         'user_does_not_exist' => 'هذا المستخدم غير صالح. حاول مرة اخرى.',
-        'not_available' => 'هذا الأصل غير متاح للخروج!'
+        'not_available' => 'هذا الأصل غير متاح للخروج!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'أدخل النص "ديليت" في المربع أدناه لتطهير السجلات المحذوفة. لا يمكن التراجع عن هذا الإجراء.',
 	'custom_css'				=> 'CSS مخصص',
 	'custom_css_help'			=> 'أدخل أي كس مخصص يلغي رغبتك في استخدامه. لا تضمن علامات <style></style>.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'العملة الافتراضية',
 	'default_eula_text'			=> 'اتفاقية ترخيص المستخدم النهائي',
   'default_language'					=> 'اللغة الافتراضية',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'تم تمكين لداب',
     'ldap_integration'          => 'دمج لداب',
     'ldap_settings'             => 'إعدادات لداب',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'خادم لداب',
     'ldap_server_help'          => 'يجب أن يبدأ هذا مع لداب: // (لغير مشفرة أو تلس) أو لدابس: // (ل سل)',
 	'ldap_server_cert'			=> 'التحقق من صحة شهادة سل لداب',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'المورد غير مجود.',
-    'assoc_users'	 => 'هذا المورد مرتبط حاليا بنموذج واحد على الأقل ولا يمكن حذفه. يرجى تحديث النماذج لم تعد تشير إلى هذا المورد ثم أعد المحاولة.',
+
 
     'create' => array(
         'error'   => 'لم يتم إنشاء المورد، الرجاء المحاولة مرة أخرى.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'هل أنت متأكد من رغبتك في حذف هذا المورد؟',
         'error'   => 'حدثت مشكلة أثناء حذف المورد. حاول مرة اخرى.',
-        'success' => 'تم حذف المورد بنجاح.'
+        'success' => 'تم حذف المورد بنجاح.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/ar/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'ترجيع',
     'city'  				=> 'المدينة',
 	'click_here'			=> 'انقر هنا',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'الشركات',
     'company'				=> 'شركة',
     'component'			    => 'مكون',
@@ -89,6 +90,7 @@
     'history'  			    => 'التاريخ',
     'history_for'  			=> 'السجل لـ',
     'id'  					=> 'الرقم',
+    'image'                 => 'Image',
     'image_delete'         	=> 'حذف الصورة',
     'image_upload'         	=> 'رفع صورة',
     'import'         	    => 'استيراد',

resources/lang/ar/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'تم أخذ السمة: بالفعل.',
     'uploaded'             => 'أخفق تحميل السمة:.',
     'url'                  => 'تنسيق السمة: غير صالح.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "كلمة المرور الحالية غير صحيحة",
         'dumbpwd'          => 'كلمة المرور هذه شائعة جدا.',
         "statuslabel_type" => "يجب تحديد نوع تصنيف حالة صالح",
-        "unique_undeleted" => "يجب أن تكون السمة فريدة.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Активът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Активът изписан успешно.',
         'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
-        'not_available' => 'Този актив не е наличен за отписване!'
+        'not_available' => 'Този актив не е наличен за отписване!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Въдете текста "DELETE" в клетката отдолу за да пречистите изтритите записи. Това действие не може да бъде отменено.',
 	'custom_css'				=> 'Потребителски CSS',
 	'custom_css_help'			=> 'Включете вашите CSS правила тук. Не използвайте <style></style> тагове.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Валута по подразбиране',
 	'default_eula_text'			=> 'EULA по подразбиране',
   'default_language'					=> 'Език по подразбиране',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP включен',
     'ldap_integration'          => 'LDAP интеграция',
     'ldap_settings'             => 'LDAP настройки',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP сървър',
     'ldap_server_help'          => 'Това трябва да започва с Idap:// (for unencrypted or TLS) или Idaps:// (for SSL)',
 	'ldap_server_cert'			=> 'Валидация на LDAP SSL сертификата',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Несъществуващ доставчик.',
-    'assoc_users'	 => 'Този доставчик е асоцииран с поне един от моделите и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този доставчик и опитайте отново. ',
+
 
     'create' => array(
         'error'   => 'Доставчикът не беше създаден. Моля, опитайте отново.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Сигурни ли сте, че искате да изтриете този доставчик?',
         'error'   => 'Възникна проблем при изтриване на доставчика. Моля, опитайте отново.',
-        'success' => 'Доставчикът е изтрит.'
+        'success' => 'Доставчикът е изтрит.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/bg/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Изписване',
     'city'  				=> 'Град',
 	'click_here'			=> 'Натиснете тук',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Компании',
     'company'				=> 'Компания',
     'component'			    => 'Компонент',
@@ -89,6 +90,7 @@
     'history'  			    => 'История',
     'history_for'  			=> 'История за',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Изтриване на изображението',
     'image_upload'         	=> 'Качване на изображение',
     'import'         	    => 'Зареждане',

resources/lang/bg/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute вече е вписан.',
     'uploaded'             => 'Атрибутът: не успя да качи.',
     'url'                  => 'Форматът на :attribute е невалиден.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Текущата ви парола е неправилна",
         'dumbpwd'          => 'Тази парола е твърде често срещана.',
         "statuslabel_type" => "Трябва да изберете валиден тип етикет на състоянието",
-        "unique_undeleted" => "Атрибутът: трябва да е уникален.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Majetek nebyl předán, zkuste to prosím znovu',
         'success' 		=> 'Majetek byl v pořádku předán.',
         'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.',
-        'not_available' => 'Tento majetek není k dispozici pro výdej!'
+        'not_available' => 'Tento majetek není k dispozici pro výdej!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Do rámečku níže zadejte text "DELETE", čímž odstraníte odstraněné záznamy. Tuto akci nelze vrátit zpět.',
 	'custom_css'				=> 'Vlastní CSS',
 	'custom_css_help'			=> 'Zadejte libovolné vlastní CSS, které chcete použít. Nezahrnujte <style></style> tagy.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Výchozí měna',
 	'default_eula_text'			=> 'Výchozí EULA',
   'default_language'					=> 'Výchozí jazyk',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP povoleno',
     'ldap_integration'          => 'LDAP integrace',
     'ldap_settings'             => 'Nastavení LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP server',
     'ldap_server_help'          => 'Toto by mělo začít s ldap: // (pro nešifrované nebo TLS) nebo ldaps: // (pro SSL)',
 	'ldap_server_cert'			=> 'Validace certifikátů LDAP SSL',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Dodavatel neexistuje.',
-    'assoc_users'	 => 'Tento dodavatel je právě přiřazena alespoň k jednomu modelu majetku a nemůže tak být odstraněn. Odeberte jeho vazbu z patřičných modelů a akci opakujte. ',
+
 
     'create' => array(
         'error'   => 'Dodavatel nebyl vytvořen, zkuste to prosím znovu.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Opravdu si přejete odstranit tohoto dodavatele?',
         'error'   => 'Vyskytl se problém při mazání dodavatele. Zkuste to prosím znovu.',
-        'success' => 'Dodavatel byl úspěšně smazán.'
+        'success' => 'Dodavatel byl úspěšně smazán.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/cs/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Výdej',
     'city'  				=> 'Město',
 	'click_here'			=> 'Klikněte zde',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Firmy',
     'company'				=> 'Společnost',
     'component'			    => 'Komponent',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historie',
     'history_for'  			=> 'Historie uživatele',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Smazat obrázek',
     'image_upload'         	=> 'Nahrát obrázek',
     'import'         	    => 'Import',

resources/lang/cs/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute byl již vybrán.',
     'uploaded'             => 'Atribut: se nepodařilo nahrát.',
     'url'                  => 'Formát :attribute je neplatný.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Vaše současné heslo je nesprávné",
         'dumbpwd'          => 'Toto heslo je příliš běžné.',
         "statuslabel_type" => "Musíte vybrat platný typ štítku stavu",
-        "unique_undeleted" => "Atribut musí být jedinečný.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Akten blev ikke tjekket ud, prøv igen',
         'success' 		=> 'Asset tjekket ud med succes.',
         'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.',
-        'not_available' => 'Det aktiv er ikke tilgængeligt for kassen!'
+        'not_available' => 'Det aktiv er ikke tilgængeligt for kassen!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Indtast teksten "DELETE" i boksen nedenfor for at rense dine slettede poster. Denne handling kan ikke fortrydes.',
 	'custom_css'				=> 'Brugerdefineret CSS',
 	'custom_css_help'			=> 'Indtast eventuelle brugerdefinerede CSS overskridelser, du gerne vil bruge. Indsæt ikke de <style></style> tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Standardvaluta',
 	'default_eula_text'			=> 'Standard EULA',
   'default_language'					=> 'Standard sprog',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP aktiveret',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP-indstillinger',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP-server',
     'ldap_server_help'          => 'Dette skal starte med ldap: // (for ukrypteret eller TLS) eller ldaps: // (for SSL)',
 	'ldap_server_cert'			=> 'Validering af LDAP SSL-certifikat',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Leverandør findes ikke.',
-    'assoc_users'	 => 'Denne leverandør er i øjeblikket forbundet med mindst en model og kan ikke slettes. Opdater dine modeller for ikke længere at henvise til denne leverandør, og prøv igen.',
+
 
     'create' => array(
         'error'   => 'Leverandøren blev ikke oprettet, prøv igen.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Er du sikker på, at du ønsker at slette denne leverandør?',
         'error'   => 'Der opstod et problem ved at slette leverandøren. Prøv igen.',
-        'success' => 'Leverandøren blev slettet med succes.'
+        'success' => 'Leverandøren blev slettet med succes.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/da/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Tjek Ud',
     'city'  				=> 'By',
 	'click_here'			=> 'Klik her',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Selskaber',
     'company'				=> 'Selskab',
     'component'			    => 'Komponent',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historik',
     'history_for'  			=> 'Historie for',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Slet billede',
     'image_upload'         	=> 'Upload billede',
     'import'         	    => 'Importér',

resources/lang/da/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute er allerede taget.',
     'uploaded'             => 'Attributtet kunne ikke uploades.',
     'url'                  => ':attribute formatet er ugyldigt.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Din nuværende adgangskode er forkert",
         'dumbpwd'          => 'Denne adgangskode er for almindelig.',
         "statuslabel_type" => "Du skal vælge en gyldig statusetiketype",
-        "unique_undeleted" => "Attributten skal være unik.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Asset konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
         'success' 		=> 'Asset wurde erfolgreich herausgegeben.',
         'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.',
-        'not_available' => 'Dieses Asset kann nicht herausgegeben werden!'
+        'not_available' => 'Dieses Asset kann nicht herausgegeben werden!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Geben Sie das Wort "DELETE" in das untere Feld ein um die gelöschten Einträge zu bereinigen. Dies kann nicht rückgängig gemacht werden.',
 	'custom_css'				=> 'Eigenes CSS',
 	'custom_css_help'			=> 'Füge eigenes CSS hinzu. Benutze keine <style></style> tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Standardwährung',
 	'default_eula_text'			=> 'Standard EULA',
   'default_language'					=> 'Standardsprache',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP aktiviert',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Einstellungen',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'Sollte mit ldap:// (für unencrypted oder TLS) oder ldaps:// (für SSL) starten',
 	'ldap_server_cert'			=> 'LDAP SSL Zertifikatsüberprüfung',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Lieferant ist nicht vorhanden.',
-    'assoc_users'	 => 'Diese Lieferant ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diesen Lieferant zu verweisen und versuchen Sie es erneut. ',
+
 
     'create' => array(
         'error'   => 'Lieferant wurde nicht erstellt, bitte versuchen Sie es erneut.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Sind Sie sicher, dass Sie diesen Lieferanten löschen möchten?',
         'error'   => 'Beim löschen des Lieferanten ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
-        'success' => 'Lieferant wurde erfolgreich gelöscht.'
+        'success' => 'Lieferant wurde erfolgreich gelöscht.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/de/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
 	'click_here'			=> 'Hier klicken',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Firmen',
     'company'				=> 'Firma',
     'component'			    => 'Komponente',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historie',
     'history_for'  			=> 'Verlauf für',
     'id'  					=> 'Id',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
     'import'         	    => 'Import',

resources/lang/de/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute schon benutzt.',
     'uploaded'             => ':attribute konnte nicht hochgeladen werden.',
     'url'                  => ':attribute Format ist ungültig.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Ihr derzeitiges Passwort ist nicht korrekt",
         'dumbpwd'          => 'Das Passwort ist zu gebräuchlich.',
         "statuslabel_type" => "Sie müssen einen gültigen Statuslabel-Typ auswählen",
-        "unique_undeleted" => ":attribute muss eindeutig sein.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Το περιουσιακό στοιχείο δεν έχει ελεγχθεί, δοκιμάστε ξανά',
         'success' 		=> 'Το ενεργητικό ολοκληρώθηκε με επιτυχία.',
         'user_does_not_exist' => 'Αυτός ο χρήστης είναι άκυρος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
-        'not_available' => 'Αυτό το πάγιο δεν είναι διαθέσιμο για την ολοκλήρωση της παραγγελίας!'
+        'not_available' => 'Αυτό το πάγιο δεν είναι διαθέσιμο για την ολοκλήρωση της παραγγελίας!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Εισάγετε το κείμενο «Διαγραφή» στο πλαίσιο παρακάτω για να καθαρίσει τις διαγραμμένες εγγραφές σας. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.',
 	'custom_css'				=> 'Προσαρμοσμένο CSS',
 	'custom_css_help'			=> 'Εισαγάγετε τυχόν προσαρμοσμένες επικαλύψεις CSS που θέλετε να χρησιμοποιήσετε. Μην συμπεριλάβετε τις ετικέτες <style></style>.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Προεπιλεγμένο νόμισμα',
 	'default_eula_text'			=> 'Προεπιλογή EULA',
   'default_language'					=> 'Προκαθορισμένη γλώσσα',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'Ενεργό LDAP',
     'ldap_integration'          => 'Ενσωμάτωση LDAP',
     'ldap_settings'             => 'Ρυθμίσεις LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'Αυτό θα πρέπει να ξεκινά με το ldap: // (για μη κρυπτογραφημένο ή TLS) ή ldaps: // (για SSL)',
 	'ldap_server_cert'			=> 'Πιστοποίηση πιστοποιητικού SSL για LDAP',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Προμηθευτής δεν υπάρχει.',
-    'assoc_users'	 => 'Αυτός ο προμηθευτ σχετίζεται με τουλάχιστον ένα χρήστη και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τους χρήστες σας να μην αναφέρονται σε αυτήν τη θέση και δοκιμάστε ξανά. ',
+
 
     'create' => array(
         'error'   => 'Ο προμηθευτής δεν δημιουργήθηκε, δοκιμάστε ξανά.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό τον προμηθευτή;',
         'error'   => 'Υπήρξε ένα ζήτημα διαγράφοντας τον προμηθευτή. Παρακαλώ δοκιμάστε ξανά.',
-        'success' => 'Ο προμηθευτής διαγράφηκε επιτυχώς.'
+        'success' => 'Ο προμηθευτής διαγράφηκε επιτυχώς.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/el/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Ολοκλήρωση αγοράς',
     'city'  				=> 'Πόλη',
 	'click_here'			=> 'Κάντε κλικ ΕΔΩ',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Εταιρείες',
     'company'				=> 'Εταιρεία',
     'component'			    => 'Συστατικό',
@@ -89,6 +90,7 @@
     'history'  			    => 'Ιστορία',
     'history_for'  			=> 'Ιστορικό για',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Διαγραφή εικόνας',
     'image_upload'         	=> 'Μεταφόρτωση εικόνας',
     'import'         	    => 'Εισαγωγή',

resources/lang/el/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'Το χαρακτηριστικό: έχει ήδη ληφθεί.',
     'uploaded'             => 'Το χαρακτηριστικό:: απέτυχε να μεταφορτωθεί.',
     'url'                  => 'Η μορφή του χαρακτηριστικού είναι μη έγκυρη.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Ο τρέχων κωδικός πρόσβασης είναι εσφαλμένος",
         'dumbpwd'          => 'Αυτός ο κωδικός πρόσβασης είναι πολύ συνηθισμένος.',
         "statuslabel_type" => "Πρέπει να επιλέξετε έναν έγκυρο τύπο ετικέτας κατάστασης",
-        "unique_undeleted" => "Το χαρακτηριστικό: πρέπει να είναι μοναδικό.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
         'user_does_not_exist' => 'That user is invalid. Please try again.',
-        'not_available' => 'That asset is not available for checkout!'
+        'not_available' => 'That asset is not available for checkout!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
 	'custom_css'				=> 'Custom CSS',
 	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
   'default_language'					=> 'Default Language',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP enabled',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Settings',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL certificate validation',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Supplier does not exist.',
-    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+
 
     'create' => array(
         'error'   => 'Supplier was not created, please try again.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this supplier?',
         'error'   => 'There was an issue deleting the supplier. Please try again.',
-        'success' => 'Supplier was deleted successfully.'
+        'success' => 'Supplier was deleted successfully.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/en-GB/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
 	'click_here'			=> 'Click here',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Companies',
     'company'				=> 'Company',
     'component'			    => 'Component',
@@ -89,6 +90,7 @@
     'history'  			    => 'History',
     'history_for'  			=> 'History for',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',

resources/lang/en-GB/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'The :attribute has already been taken.',
     'uploaded'             => 'The :attribute failed to upload.',
     'url'                  => 'The :attribute format is invalid.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Your current password is incorrect",
         'dumbpwd'          => 'That password is too common.',
         "statuslabel_type" => "You must select a valid status label type",
-        "unique_undeleted" => "The :attribute must be unique.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
         'user_does_not_exist' => 'That user is invalid. Please try again.',
-        'not_available' => 'That asset is not available for checkout!'
+        'not_available' => 'That asset is not available for checkout!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
 	'custom_css'				=> 'Custom CSS',
 	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
   'default_language'					=> 'Default Language',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP enabled',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Settings',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL certificate validation',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Supplier does not exist.',
-    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+
 
     'create' => array(
         'error'   => 'Supplier was not created, please try again.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this supplier?',
         'error'   => 'There was an issue deleting the supplier. Please try again.',
-        'success' => 'Supplier was deleted successfully.'
+        'success' => 'Supplier was deleted successfully.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/en-ID/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
 	'click_here'			=> 'Click here',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Companies',
     'company'				=> 'Company',
     'component'			    => 'Component',
@@ -89,6 +90,7 @@
     'history'  			    => 'History',
     'history_for'  			=> 'History for',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',

resources/lang/en-ID/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'The :attribute has already been taken.',
     'uploaded'             => 'The :attribute failed to upload.',
     'url'                  => 'The :attribute format is invalid.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Your current password is incorrect",
         'dumbpwd'          => 'That password is too common.',
         "statuslabel_type" => "You must select a valid status label type",
-        "unique_undeleted" => "The :attribute must be unique.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ 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' => '¡Ese artículo no está disponible para retirada!'
+        'not_available' => '¡Ese artículo no está disponible para retirada!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Introduzca el texto "Borrar" en el cuadro a continuación para depurar sus registros eliminados. Esta acción no se puede deshacer.',
 	'custom_css'				=> 'CSS Personalizado',
 	'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: <style></style&gt.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Moneda Predeterminada',
 	'default_eula_text'			=> 'EULA por defecto',
   'default_language'					=> 'Idioma predeterminado',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'Servidor LDAP',
     'ldap_server_help'          => 'Esto debería empezar con ldap:// (sin codificar o TLS) o ldaps:// (para SSL)',
 	'ldap_server_cert'			=> 'Certificado de validación SSL LDAP',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Proveedor does not exist.',
-    'assoc_users'	 => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ',
+
 
     'create' => array(
         'error'   => 'Proveedor no creado, Intentalo de nuevo.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Estás seguro de querer eliminar este Proveedor?',
         'error'   => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.',
-        'success' => 'Proveedor eliminado.'
+        'success' => 'Proveedor eliminado.',
+        'assoc_assets'	 => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/es-CO/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Asignar a un usuario',
     'city'  				=> 'Ciudad',
 	'click_here'			=> 'Pulsa aquí',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Empresas',
     'company'				=> 'Empresa',
     'component'			    => 'Componente',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historial',
     'history_for'  			=> 'Historial de',
     'id'  					=> 'Id',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
     'import'         	    => 'Importar',

resources/lang/es-CO/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute ya ha sido introducido.',
     'uploaded'             => 'El atributo: no se pudo cargar.',
     'url'                  => ':attribute formato incorrecto.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Tu contraseña actual es incorrecta",
         'dumbpwd'          => 'Esa contraseña es muy común.',
         "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido.",
-        "unique_undeleted" => "El atributo debe ser único.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ 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' => '¡Ese artículo no está disponible para retirada!'
+        'not_available' => '¡Ese artículo no está disponible para retirada!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Introduzca el texto "Borrar" en el cuadro a continuación para depurar sus registros eliminados. Esta acción no se puede deshacer.',
 	'custom_css'				=> 'CSS Personalizado',
 	'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: <style></style&gt.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Moneda Predeterminada',
 	'default_eula_text'			=> 'EULA por defecto',
   'default_language'					=> 'Idioma predeterminado',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'Servidor LDAP',
     'ldap_server_help'          => 'Esto debería empezar con ldap:// (sin codificar o TLS) o ldaps:// (para SSL)',
 	'ldap_server_cert'			=> 'Certificado de validación SSL LDAP',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Proveedor does not exist.',
-    'assoc_users'	 => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ',
+
 
     'create' => array(
         'error'   => 'Proveedor no creado, Intentalo de nuevo.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Estás seguro de querer eliminar este Proveedor?',
         'error'   => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.',
-        'success' => 'Proveedor eliminado.'
+        'success' => 'Proveedor eliminado.',
+        'assoc_assets'	 => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/es-ES/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Asignar a un usuario',
     'city'  				=> 'Ciudad',
 	'click_here'			=> 'Pulsa aquí',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Empresas',
     'company'				=> 'Empresa',
     'component'			    => 'Componente',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historial',
     'history_for'  			=> 'Historial de',
     'id'  					=> 'Id',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
     'import'         	    => 'Importar',

resources/lang/es-ES/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute ya ha sido introducido.',
     'uploaded'             => 'El atributo: no se pudo cargar.',
     'url'                  => ':attribute formato incorrecto.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Tu contraseña actual es incorrecta",
         'dumbpwd'          => 'Esa contraseña es muy común.',
         "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido.",
-        "unique_undeleted" => "El atributo debe ser único.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Varasid ei kontrollitud, proovige uuesti',
         'success' 		=> 'Varad võeti edukalt välja.',
         'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.',
-        'not_available' => 'See vara pole kontrollimiseks saadaval!'
+        'not_available' => 'See vara pole kontrollimiseks saadaval!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Kustutatavate dokumentide puhastamiseks sisestage allpool olevasse kasti tekst "DELETE". Seda toimingut ei saa tagasi võtta.',
 	'custom_css'				=> 'Kohandatud CSS',
 	'custom_css_help'			=> 'Sisestage kõik kohandatud CSS-i muudatused, mida soovite kasutada. Ärge lisage silte <style></style>.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Valuuta vaikimisi',
 	'default_eula_text'			=> 'EULA vaikimisi',
   'default_language'					=> 'Vaikimisi keel',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP on lubatud',
     'ldap_integration'          => 'LDAP-i integreerimine',
     'ldap_settings'             => 'LDAP seaded',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP server',
     'ldap_server_help'          => 'See peaks algama ldap: // (krüpteerimata või TLS-i puhul) või ldaps: // (SSL-i puhul)',
 	'ldap_server_cert'			=> 'LDAP SSL-sertifikaadi valideerimine',

resources/lang/et/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Tarnijat ei eksisteeri.',
-    'assoc_users'	 => 'Selle tarnijaga on seotud vähemalt üks mudel ja seda ei saa kustutada. Palun uuenda oma mudeleid, et need ei kasutaks seda tarnijat ning seejärel proovi uuesti. ',
+
 
     'create' => array(
         'error'   => 'Tarnijat ei loodud, palun proovi uuesti.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Kas oled kindel, et soovid selle tarnija kustutada?',
         'error'   => 'Tarnija kustutamisel tekkis probleem. Palun proovi uuesti.',
-        'success' => 'Tarnija kustutamine õnnestus.'
+        'success' => 'Tarnija kustutamine õnnestus.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/et/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Checkout',
     'city'  				=> 'Linn',
 	'click_here'			=> 'Kliki siia',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Ettevõtted',
     'company'				=> 'Ettevõte',
     'component'			    => 'Komponent',
@@ -89,6 +90,7 @@
     'history'  			    => 'Ajalugu',
     'history_for'  			=> 'Ajalugu jaoks',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Kustuta pilt',
     'image_upload'         	=> 'Laadi pilt üles',
     'import'         	    => 'Impordi',

resources/lang/et/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'Atribuut: on juba võetud.',
     'uploaded'             => 'Atribuut ei õnnestunud üles laadida.',
     'url'                  => 'Atribuudivorming on vale.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Teie praegune parool on vale",
         'dumbpwd'          => 'See parool on liiga levinud.',
         "statuslabel_type" => "Peate valima kehtiva olekutüübi tüübi",
-        "unique_undeleted" => "Atribuut peab olema ainulaadne.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید',
         'success' 		=> 'دارایی را بررسی کنید موفقیت.',
         'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.',
-        'not_available' => 'این دارایی برای پرداخت در دسترس نیست!'
+        'not_available' => 'این دارایی برای پرداخت در دسترس نیست!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'متن "حذف" در کادر زیر برای پاکسازی پرونده حذف شده خود را وارد کنید. این دستور قابل بازگشت نیست.',
 	'custom_css'				=> 'سفارشی CSS',
 	'custom_css_help'			=> 'هر ابطال CSS سفارشی می خواهید استفاده کنید را وارد کنید.از  برچسب های <style></style> استفاده نکنید.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'ارز پیش فرض',
 	'default_eula_text'			=> 'EULA پیش فرض',
   'default_language'					=> 'زبان پیش فرض',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP فعال شد.',
     'ldap_integration'          => 'ادغام LDAP',
     'ldap_settings'             => 'تنظیمات LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'سرویس دهنده LDAP',
     'ldap_server_help'          => 'این باید با ldap: // (برای رمزگذاری نشده یا TLS) یا ldaps: ((برای SSL)',
 	'ldap_server_cert'			=> 'اعتبار گواهی نامه LDAP SSL',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'تامین کننده وجود ندارد.',
-    'assoc_users'	 => 'این شرکت در حال حاضر همراه با حداقل یک مدل است و قادر به حذف نمی شود. لطفا بروز مدل های خود را به دیگر تامین کننده این مرجع و دوباره امتحان کنید. ',
+
 
     'create' => array(
         'error'   => 'تامین کننده ایجاد نشد, لطفا دوباره سعی کنید.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'آیا شما مطمئن هستید که می خواهید این کارپرداز را حذف کنید؟',
         'error'   => 'در حذف کردن این کارپرداز مشکلی وجود داشت. لطفا دوباره تلاش کنید.',
-        'success' => 'کارپرداز با موفقیت حذف شد.'
+        'success' => 'کارپرداز با موفقیت حذف شد.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/fa/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'پرداخت',
     'city'  				=> 'شهر',
 	'click_here'			=> 'اینجا کلیک کنید',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'شرکت ها',
     'company'				=> 'شرکت',
     'component'			    => 'کامپوننت',
@@ -91,6 +92,7 @@
     'history'  			    => 'پيشينه',
     'history_for'  			=> 'پیشینه برای ',
     'id'  					=> 'شناسه',
+    'image'                 => 'Image',
     'image_delete'         	=> 'عکس های پاک شده',
     'image_upload'         	=> 'آپلود تصویر',
     'import'         	    => 'واردات',

resources/lang/fa/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'ویژگی در حال حاضر گرفته شده است.',
     'uploaded'             => 'ویژگی: attribute failed to upload.',
     'url'                  => 'شکل ویژگی نامعتبر است.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "رمز عبور فعلی شما اشتباه است",
         'dumbpwd'          => 'این رمز عبور خیلی رایج است',
         "statuslabel_type" => "شما باید نوع برچسب معتبر را انتخاب کنید",
-        "unique_undeleted" => ": attribute باید منحصر به فرد باشد.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Laitteen luovutus epäonnistui, yritä uudelleen',
         'success' 		=> 'Laite luovutettu onnistuneesti.',
         'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.',
-        'not_available' => 'Tätä omaisuutta ei ole saatavilla kassalle!'
+        'not_available' => 'Tätä omaisuutta ei ole saatavilla kassalle!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Kirjoita alla olevaan kohtaan "DELETE" teksti tyhjentääksesi poistetut tietueet. Tätä toimintoa ei voi kumota.',
 	'custom_css'				=> 'Oma CSS',
 	'custom_css_help'			=> 'Anna haluamasi mukautetut CSS-ohitukset. Älä lisää <style></style> tunnisteita.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Oletusvaluutta',
 	'default_eula_text'			=> 'Oletus EULA',
   'default_language'					=> 'Oletuskieli',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP käytössä',
     'ldap_integration'          => 'LDAP integraatio',
     'ldap_settings'             => 'LDAP Asetukset',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP Palvelin',
     'ldap_server_help'          => 'Tämän pitäisi alkaa ldap: // (salaamaton tai TLS) tai ldaps: // (SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL Varmenteen varmennus',

resources/lang/fi/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Toimittajaa ei löydy.',
-    'assoc_users'	 => 'Toimittaja on määritettynä yhdelle tai useammalle mallille eikä sitä voida poistaa. Poista toimittaja käytöstä kaikilta malleilta ja yritä uudelleen. ',
+
 
     'create' => array(
         'error'   => 'Toimittajaa ei luotu, yritä uudelleen.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Oletko varma että haluat poistaa tämän toimittajan?',
         'error'   => 'Toimittajan poistossa tapahtui virhe. Yritä uudelleen.',
-        'success' => 'Toimittaja poistettiin onnistuneesti.'
+        'success' => 'Toimittaja poistettiin onnistuneesti.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/fi/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Luovuta',
     'city'  				=> 'Kaupunki',
 	'click_here'			=> 'Klikkaa tästä',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Yritykset',
     'company'				=> 'Yritys',
     'component'			    => 'Komponentti',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historia',
     'history_for'  			=> 'Laitehistoria käyttäjälle',
     'id'  					=> 'Tunnus',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Poista Kuva',
     'image_upload'         	=> 'Lähetä Kuva',
     'import'         	    => 'Tuo tiedot',

resources/lang/fi/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute on jo käytössä.',
     'uploaded'             => 'Attribuutti ei onnistunut lataamaan.',
     'url'                  => ':attribute muotoilu on virheellinen.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Nykyinen salasanasi on virheellinen",
         'dumbpwd'          => 'Salasana on liian yleinen.',
         "statuslabel_type" => "Sinun on valittava kelvollinen tilamerkintyyppi",
-        "unique_undeleted" => "Ominaisuuden on oltava ainutlaatuinen.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Ce bien n\'a pas été sorti, veuillez réessayer',
         'success' 		=> 'Ce bien a été sorti correctement.',
         'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.',
-        'not_available' => 'Ce bien n\'est pas disponible pour être sorti!'
+        'not_available' => 'Ce bien n\'est pas disponible pour être sorti!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Entrer le texte "DELETE" dans la boite ci-dessous pour purger les enregistrements supprimés. Cette action est irréversible.',
 	'custom_css'				=> 'CSS personnalisé',
 	'custom_css_help'			=> 'Entrez les codes CSS personnalisé que vous souhaitez utiliser . Ne pas inclure les balises <style></style>.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Devise par défaut',
 	'default_eula_text'			=> 'Licence d\'utilisation par défaut',
   'default_language'					=> 'Langue par défaut',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP activé',
     'ldap_integration'          => 'Intégration LDAP',
     'ldap_settings'             => 'Paramètres LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'Serveur LDAP',
     'ldap_server_help'          => 'Ca devrait commencer par ldap:// (non crypté ou TLS) ou ldaps:// (SSL)',
 	'ldap_server_cert'			=> 'Validation du certificat SSL LDAP',

resources/lang/fr/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Le fournisseur n\'existe pas.',
-    'assoc_users'	 => 'Ce fournisseur est actuellement associé à au moins un modèle et ne peut être supprimé. Veuillez actualiser vos modèles pour ne plus référencer cette catégorie et réessayer. ',
+
 
     'create' => array(
         'error'   => 'Le fournisseur n\'a pas été créé, veuillez essayer à nouveau.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Êtes-vous sûr de vouloir supprimer ce fournisseur ?',
         'error'   => 'Un problème a eu lieu pendant la suppression du fournisseur. Veuillez essayer à nouveau.',
-        'success' => 'Le fournisseur a été supprimé avec succès.'
+        'success' => 'Le fournisseur a été supprimé avec succès.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/fr/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Associer',
     'city'  				=> 'Ville',
 	'click_here'			=> 'Cliquez ici',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Compagnies',
     'company'				=> 'Compagnie',
     'component'			    => 'Composant',
@@ -89,6 +90,7 @@
     'history'  			    => 'Historique',
     'history_for'  			=> 'Historique pour',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Supprimer l\'image',
     'image_upload'         	=> 'Charger une image',
     'import'         	    => 'Importer',

resources/lang/fr/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'Cet-te :attribute a déjà été pris-e.',
     'uploaded'             => 'L\'attribut: n\'a pas pu télécharger.',
     'url'                  => 'Le format de cet-te :attribute est invalide.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Votre mot de passe actuel est incorrect",
         'dumbpwd'          => 'Ce mot de passe est trop commun.',
         "statuslabel_type" => "Vous devez sélectionner un type d'étiquette de statut valide",
-        "unique_undeleted" => "L'attribut: doit être unique.",
     ],
 
     /*

resources/lang/ga-IE/admin/hardware/message.php

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Níor sheiceáil amach an tsócmhainn, déan iarracht arís',
         'success' 		=> 'Seiceáil sheiceáil amach go rathúil.',
         'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.',
-        'not_available' => 'Níl an tsócmhainn sin ar fáil le haghaidh seiceáil!'
+        'not_available' => 'Níl an tsócmhainn sin ar fáil le haghaidh seiceáil!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

resources/lang/ga-IE/admin/settings/general.php

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Cuir isteach an téacs "DELETE" sa bhosca thíos chun do thaifid a scriosadh. Ní féidir an gníomh seo a dhíbirt.',
 	'custom_css'				=> 'CSS saincheaptha',
 	'custom_css_help'			=> 'Cuir isteach aon scriosadh CSS saincheaptha ar mhaith leat a úsáid. Ná cuir na clibeanna <style></style> san áireamh.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Réamhshocrú Airgeadra',
 	'default_eula_text'			=> 'Réamhshocrú EULA',
   'default_language'					=> 'Teanga Réamhshocraithe',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP cumasaithe',
     'ldap_integration'          => 'Comhtháthú LDAP',
     'ldap_settings'             => 'Socruithe LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'Freastalaí LDAP',
     'ldap_server_help'          => 'Ba chóir go dtosódh sé seo le ldap: // (le haghaidh neamhchriptithe nó TLS) nó ldaps: // (do SSL)',
 	'ldap_server_cert'			=> 'Bailíochtú deimhnithe SSL LDAP',

resources/lang/ga-IE/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Níl an soláthraí ann.',
-    'assoc_users'	 => 'Tá an soláthraí seo bainteach le múnla amháin ar a laghad agus ní féidir é a scriosadh. Déan do mhúnlaí a thabhairt cothrom le dáta gan tagairt a dhéanamh don soláthraí seo agus déan iarracht arís.',
+
 
     'create' => array(
         'error'   => 'Níor cruthaíodh an tsoláthraí, déan iarracht arís.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'An bhfuil tú cinnte gur mian leat an soláthraí seo a scriosadh?',
         'error'   => 'Bhí ceist ann a scriosadh an soláthraí. Arís, le d\'thoil.',
-        'success' => 'Scriosadh an tsoláthraí go rathúil.'
+        'success' => 'Scriosadh an tsoláthraí go rathúil.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/ga-IE/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Seiceáil',
     'city'  				=> 'Cathair',
 	'click_here'			=> 'Cliceáil anseo',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Cuideachtaí',
     'company'				=> 'Cuideachta',
     'component'			    => 'Comhpháirt',
@@ -89,6 +90,7 @@
     'history'  			    => 'Stair',
     'history_for'  			=> 'Stair do',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Scrios Íomhá',
     'image_upload'         	=> 'Íomhá Uaslódáil',
     'import'         	    => 'Iompórtáil',

resources/lang/ga-IE/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'An: tá tréith déanta cheana féin.',
     'uploaded'             => 'The: theip ar an tréith a uaslódáil.',
     'url'                  => 'Tá an fhormáid tréithbhail neamhbhailí.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Tá do phasfhocal reatha mícheart",
         'dumbpwd'          => 'Tá an focal faire sin ró-choitianta.',
         "statuslabel_type" => "Ní mór duit cineál lipéad stádas bailí a roghnú",
-        "unique_undeleted" => "An: Ní mór tréith a bheith uathúil.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'הנכס לא נבדק, נסה שוב',
         'success' 		=> 'הנכס הוצא בהצלחה.',
         'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.',
-        'not_available' => 'הנכס הזה אינו זמין לקופה!'
+        'not_available' => 'הנכס הזה אינו זמין לקופה!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'הזן את הטקסט "DELETE" בתיבה למטה כדי לנקות את הרשומות שנמחקו. לא ניתן לבטל פעולה זו.',
 	'custom_css'				=> 'CSS מותאם אישית',
 	'custom_css_help'			=> 'הזן כל דריסת CSS מותאמת אישית שבה תרצה להשתמש. אל תכלול את התגים <style></style>.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'מטבע ברירת מחדל',
 	'default_eula_text'			=> 'ברירת מחדל ל- EULA',
   'default_language'					=> 'שפת ברירת מחדל',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP מופעל',
     'ldap_integration'          => 'שילוב LDAP',
     'ldap_settings'             => 'הגדרות LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'שרת LDAP',
     'ldap_server_help'          => 'זה צריך להתחיל עם ldap: // (עבור לא מוצפן או TLS) או ldaps: // (עבור SSL)',
 	'ldap_server_cert'			=> 'אימות תעודת SSL של LDAP',

resources/lang/he/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'הספק אינו קיים.',
-    'assoc_users'	 => 'ספק זה מחובר כרגע עם לפחות מודל אחד ולא ניתן למחוק אותו. אנא עדכן את המודלים שלך כדי לא להפנות עוד הספק הזה ונסה שוב.',
+
 
     'create' => array(
         'error'   => 'הספק לא נוצר, נסה שוב.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'האם אתה בטוח שברצונך למחוק ספק זה?',
         'error'   => 'היתה בעיה במחיקת הספק. בבקשה נסה שוב.',
-        'success' => 'הספק נמחק בהצלחה.'
+        'success' => 'הספק נמחק בהצלחה.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/he/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'לבדוק',
     'city'  				=> 'עִיר',
 	'click_here'			=> 'לחץ כאן',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'חברות',
     'company'				=> 'חֶברָה',
     'component'			    => 'רְכִיב',
@@ -89,6 +90,7 @@
     'history'  			    => 'הִיסטוֹרִיָה',
     'history_for'  			=> 'היסטוריה עבור',
     'id'  					=> 'תְעוּדַת זֶהוּת',
+    'image'                 => 'Image',
     'image_delete'         	=> 'מחק תמונה',
     'image_upload'         	=> 'העלאת תמונה',
     'import'         	    => 'יְבוּא',

resources/lang/he/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'התכונה: כבר נלקחה.',
     'uploaded'             => 'התכונה: נכשלה.',
     'url'                  => 'תבנית התכונה: אינה חוקית.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "הסיסמה הנוכחית שלך שגויה",
         'dumbpwd'          => 'סיסמה זו נפוצה מדי.',
         "statuslabel_type" => "עליך לבחור סוג תווית סטטוס חוקי",
-        "unique_undeleted" => "התכונה: חייבת להיות ייחודית.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Imovina nije odjavljena, pokušajte ponovo',
         'success' 		=> 'Asset je uspješno provjeren.',
         'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.',
-        'not_available' => 'Taj materijal nije dostupan za naplatu!'
+        'not_available' => 'Taj materijal nije dostupan za naplatu!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Unesite tekst "DELETE" u donji okvir kako biste očistili brisane zapise. Ta se radnja ne može poništiti.',
 	'custom_css'				=> 'Prilagođeni CSS',
 	'custom_css_help'			=> 'Unesite bilo koji prilagođeni CSS nadjačaj koji biste željeli koristiti. Ne uključujte oznake <style></style>.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Zadana valuta',
 	'default_eula_text'			=> 'Zadana EULA',
   'default_language'					=> 'Zadani jezik',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP je omogućen',
     'ldap_integration'          => 'LDAP integracija',
     'ldap_settings'             => 'LDAP postavke',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP poslužitelj',
     'ldap_server_help'          => 'To bi trebalo započeti s ldap: // (za neispisane ili TLS) ili ldaps: // (za SSL)',
 	'ldap_server_cert'			=> 'Provjera LDAP SSL certifikata',

resources/lang/hr/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Dobavljač ne postoji.',
-    'assoc_users'	 => 'Ovaj dobavljač trenutno je povezan s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da više ne referiraju ovog dobavljača i pokušajte ponovno.',
+
 
     'create' => array(
         'error'   => 'Dobavljač nije izrađen, pokušajte ponovo.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Jeste li sigurni da želite izbrisati ovog dobavljača?',
         'error'   => 'Došlo je do problema s brisanjem dobavljača. Molim te pokušaj ponovno.',
-        'success' => 'Dobavljač je uspješno izbrisan.'
+        'success' => 'Dobavljač je uspješno izbrisan.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/hr/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Provjeri',
     'city'  				=> 'Grad',
 	'click_here'			=> 'Kliknite ovdje',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Tvrtke',
     'company'				=> 'Društvo',
     'component'			    => 'sastavni dio',
@@ -89,6 +90,7 @@
     'history'  			    => 'Povijest',
     'history_for'  			=> 'Povijest za',
     'id'  					=> 'iskaznica',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Izbriši sliku',
     'image_upload'         	=> 'Prenesite sliku',
     'import'         	    => 'Uvoz',

resources/lang/hr/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'The: atribut je već snimljen.',
     'uploaded'             => 'Atribut nije prenesen.',
     'url'                  => 'Format atributa nije važeći.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Vaša trenutačna zaporka nije točna",
         'dumbpwd'          => 'Ta je lozinka prečestna.',
         "statuslabel_type" => "Morate odabrati valjanu vrstu oznake statusa",
-        "unique_undeleted" => "Atribut mora biti jedinstven.",
     ],
 
     /*

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

@@ -61,7 +61,8 @@ return array(
         'error'   		=> 'Az eszköz nem lett kijelölve, próbáld újra',
         'success' 		=> 'A készlet sikeresen ki lett állítva.',
         'user_does_not_exist' => 'Ez a felhasználó érvénytelen. Kérlek próbáld újra.',
-        'not_available' => 'Ez az eszköz nem áll rendelkezésre pénztárnál!'
+        'not_available' => 'Ez az eszköz nem áll rendelkezésre pénztárnál!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Az alábbi mezőbe írja be a "DELETE" szöveget a törölt rekordok törléséhez. Ez a művelet nem vonható vissza.',
 	'custom_css'				=> 'Egyéni CSS',
 	'custom_css_help'			=> 'Adjon meg olyan egyedi CSS felülírást, amelyet használni szeretne. Ne tüntesse fel a <style></style> címkéket.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Alapértelmezett pénznem',
 	'default_eula_text'			=> 'Alapértelmezett EULA',
   'default_language'					=> 'Alapértelmezett nyelv',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP bekapcsolva',
     'ldap_integration'          => 'LDAP integráció',
     'ldap_settings'             => 'LDAP beállítások',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP szerver',
     'ldap_server_help'          => 'Ezt az ldap: // (titkosítatlan vagy TLS) vagy az ldaps:',
 	'ldap_server_cert'			=> 'LDAP SSL tanúsítvány érvényesítés',

resources/lang/hu/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Beszállító nem létezik.',
-    'assoc_users'	 => 'Ez a beszállító jelenleg legalább egy modellel társítva van, így nem lehet törölni. Kérjük, frissítse a modellt úgy, hogy ne hivatkozzon erre a beszállítóra, és próbálkozzon újra. ',
+
 
     'create' => array(
         'error'   => 'Beszállító nem lett létrehozva, próbálja meg újra.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Biztosan törölni szeretné ezt a szállítót?',
         'error'   => 'A szállító törlését okozta. Kérlek próbáld újra.',
-        'success' => 'A szállító sikeresen törölve lett.'
+        'success' => 'A szállító sikeresen törölve lett.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/hu/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Kiadás',
     'city'  				=> 'Város',
 	'click_here'			=> 'Kattints ide',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Cégek',
     'company'				=> 'Cég',
     'component'			    => 'Alkatrész',
@@ -89,6 +90,7 @@
     'history'  			    => 'Történelem',
     'history_for'  			=> 'Előzmények:',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Kép törlése',
     'image_upload'         	=> 'Kép feltöltése',
     'import'         	    => 'Importálás',

resources/lang/hu/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => 'A :attribute már foglalt.',
     'uploaded'             => 'A: attribútum nem sikerült feltölteni.',
     'url'                  => 'Az :attribute formátuma érvénytelen.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "A jelenlegi jelszava helytelen",
         'dumbpwd'          => 'Ez a jelszó túl gyakori.',
         "statuslabel_type" => "Meg kell határoznia egy érvényes állapotcímke típust",
-        "unique_undeleted" => "A: attribútumnak egyedinek kell lennie.",
     ],
 
     /*

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

@@ -62,7 +62,8 @@ return array(
         'error'   		=> 'Aset gagal di berikan, silahkan coba kembali',
         'success' 		=> 'Sukses memberikan aset.',
         'user_does_not_exist' => 'Pengguna tersebut tidak terdaftar. Silahkan coba kembali.',
-        'not_available' => 'Aset tersebut tidak tersedia untuk checkout!'
+        'not_available' => 'Aset tersebut tidak tersedia untuk checkout!',
+        'no_assets_selected' => 'You must select at least one asset from the list'
     ),
 
     'checkin' => array(

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

@@ -23,6 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Masukan tulisan "DELETE" di kolom bawah untuk membersihkan dokumen anda. Tindakan ini tidak dapat dibatalkan.',
 	'custom_css'				=> 'Custom CSS',
 	'custom_css_help'			=> 'Masukan modifikasi CSS yang hendak anda gunakan. Jangan sertakan <style></style> tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
 	'default_currency'  		=> 'Mata uang utama',
 	'default_eula_text'			=> 'EULA utama',
   'default_language'					=> 'Bahasa utama',
@@ -44,6 +46,8 @@ return array(
     'ldap_enabled'              => 'Aktifkan LDAP',
     'ldap_integration'          => 'Integrasi LDAP',
     'ldap_settings'             => 'Konfigurasi LDAP',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'Ini harus dimulai dengan ldap: / / (untuk tidak terenkripsi atau TLS) atau ldaps: / / (untuk SSL)',
 	'ldap_server_cert'			=> 'Validasi sertifikat LDAP SSL',

resources/lang/id/admin/suppliers/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Pemasok tidak ada.',
-    'assoc_users'	 => 'Saat ini pemasok tersebut terhubung dengan satu model dan tidak dapat di hapus. Silahkan perbarui model anda sehingga tidak terhubung dengan pemasok tersebut dan coba kembali. ',
+
 
     'create' => array(
         'error'   => 'Pemasok gagal di buat, silahkan coba kembali.',
@@ -18,7 +18,10 @@ return array(
     'delete' => array(
         'confirm'   => 'Apakah Anda yakin untuk menghapus pemasok ini?',
         'error'   => 'Terdapat masalah ketika menghapus pemasok. Silahkan coba kembali.',
-        'success' => 'Sukses menghapus pemasok.'
+        'success' => 'Sukses menghapus pemasok.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );

resources/lang/id/general.php

@@ -40,6 +40,7 @@
     'checkout'  			=> 'Check-out',
     'city'  				=> 'Kota',
 	'click_here'			=> 'Klik disini',
+    'clear_selection'		=> 'Clear Selection',
     'companies'			    => 'Perusahaan',
     'company'				=> 'Perusahaan',
     'component'			    => 'Komponen',
@@ -89,6 +90,7 @@
     'history'  			    => 'Riwayat',
     'history_for'  			=> 'Riwayat untuk',
     'id'  					=> 'ID',
+    'image'                 => 'Image',
     'image_delete'         	=> 'Menghapus gambar',
     'image_upload'         	=> 'Unggah gambar',
     'import'         	    => 'Impor',

resources/lang/id/validation.php

@@ -87,6 +87,7 @@ return array(
     'unique'               => ':attribute sudah digunakan.',
     'uploaded'             => 'Atribut: gagal diupload.',
     'url'                  => 'Format :attribute tidak benar.',
+    "unique_undeleted"     => "The :attribute must be unique.",
 
     /*
     |--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
         "hashed_pass"      => "Kata sandi Anda saat ini salah",
         'dumbpwd'          => 'Password itu terlalu umum',
         "statuslabel_type" => "Anda harus memilih jenis label status yang valid",
-        "unique_undeleted" => "Atribut: harus unik.",
     ],
 
     /*