Merge branch 'develop'

docker/docker.env

@@ -32,6 +32,8 @@ MAIL_PASSWORD=${MAIL_ENV_PASSWORD}
 MAIL_ENCRYPTION=${MAIL_ENV_ENCRYPTION}
 MAIL_FROM_ADDR=${MAIL_ENV_FROM_ADDR}
 MAIL_FROM_NAME=${MAIL_ENV_FROM_NAME}
+MAIL_REPLYTO_ADDR=${MAIL_ENV_FROM_ADDR}
+MAIL_REPLYTO_NAME=${MAIL_ENV_FROM_NAME}
 
 
 # --------------------------------------------

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'element',
     'field_format'            => 'formaat',
     'field_custom_format'     => 'Gepasmaakte formaat',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'vereis',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Gebruik deur modelle',

resources/lang/af/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Die gekose: attribuut is ongeldig.',
     'numeric'              => 'Die: Attribuut moet \'n nommer wees.',
     'present'              => 'Die: attribuut veld moet teenwoordig wees.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Die: Attribuutformaat is ongeldig.',
     'required'             => 'Die: attribuut veld is nodig.',
     'required_if'          => 'Die: attribuut veld is nodig wanneer: ander is: waarde.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'عنصر',
     'field_format'            => 'صيغة',
     'field_custom_format'     => 'صيغة مخصصة',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'مطلوب',
     'req'   		              => 'مطلوب',
     'used_by_models'   		    => 'مستخدم في الموديلات',

resources/lang/ar/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'السمة المحددة: غير صالحة.',
     'numeric'              => 'يجب أن تكون السمة رقم.',
     'present'              => 'يجب أن يكون حقل السمة موجود.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'تنسيق السمة: غير صالح.',
     'required'             => 'حقل السمة: مطلوب.',
     'required_if'          => 'حقل السمة: مطلوب عند: أوثر إس: فالو.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Елемент',
     'field_format'            => 'Формат',
     'field_custom_format'     => 'Персонализиран формат',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Задължителен',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Използвани от модели ',

resources/lang/bg/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Избраният :attribute е невалиден.',
     'numeric'              => ':attribute трябва да бъде число.',
     'present'              => 'Полето на атрибута трябва да е налице.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Форматът на :attribute е невалиден.',
     'required'             => 'Полето :attribute е задължително.',
     'required_if'          => 'Полето :attribute е задължително, когато :other е :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Typ',
     'field_format'            => 'Formát',
     'field_custom_format'     => 'Vlastní formát',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Povinné',
     'req'   		              => 'Pov.',
     'used_by_models'   		    => 'Užito u modelů',

resources/lang/cs/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Zvolený :attribute je neplatný.',
     'numeric'              => ':attribute musí být číslo.',
     'present'              => 'Pole atributu musí být přítomno.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Formát :attribute je neplatný.',
     'required'             => 'Pole :attribute je požadováno.',
     'required_if'          => 'Položka :attribute je vyžadována, když :other je :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Brugerdefineret Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Påkrævet',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Bruges af modeller',

resources/lang/da/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Den valgte :attribute er ugyldig.',
     'numeric'              => ':attribute skal være et tal.',
     'present'              => 'Attributfeltet skal være til stede.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute formatet er ugyldigt.',
     'required'             => ':attribute feltet er krævet.',
     'required_if'          => ':attribute feltet er krævet når :other er :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Benutzerdefiniertes Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Erforderlich',
     'req'   		              => 'Erf.',
     'used_by_models'   		    => 'Von Modellen benutzt',

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

@@ -63,7 +63,7 @@ return array(
         '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!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Mind. 1 Eintrag muss ausgewählt werden'
     ),
 
     'checkin' => array(

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

@@ -23,8 +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'	=> 'Benutzerdefinierte Passwort 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.',
+    'custom_forgot_pass_url_help'	=> 'Dadurch wird die integrierte URL für vergessene Passwörter auf dem Anmeldebildschirm ersetzt. Dies ist nützlich, um Benutzer zur internen oder gehosteten Funktion zum Zurücksetzen von LDAP-Passwörtern zu leiten. Es wird effektiv die Funktionalität des lokalen, vergessenen Passworts deaktiviert.',
 	'default_currency'  		=> 'Standardwährung',
 	'default_eula_text'			=> 'Standard EULA',
   'default_language'					=> 'Standardsprache',
@@ -46,8 +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_test_help'      => 'Geben Sie einen gültigen LDAP-Benutzernamen und ein Passwort von der oben angegebenen Basis-DN ein, um zu testen, ob Ihre LDAP-Anmeldung korrekt konfiguriert ist. SIE MÜSSEN IHRE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
-    '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_login_sync_help'      => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Wenn Ihre LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. SIE MÜSSEN IHRE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
     '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

@@ -19,9 +19,9 @@ return 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.',
-        '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_assets'	 => 'Dieser Lieferant ist derzeit :asset_count Asset(s) zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Assets so, dass sie nicht mehr auf diesen Lieferant verweisen und versuchen Sie es erneut. ',
-        '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_licenses'	 => 'Dieser Lieferant ist derzeit mit :licenses_count Lizenze(n) verknüpft und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Lizenzen so, dass sie nicht mehr auf diesen Lieferant verweisen und versuchen Sie es erneut. ',
-        '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. ',
+        'assoc_maintenances'	 => '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. ',
     )
 
 );

resources/lang/de/general.php

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

resources/lang/de/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Auswahl :attribute ist ungültig.',
     'numeric'              => ':attribute muss eine Zahl sein.',
     'present'              => 'Das Attributfeld muss vorhanden sein.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute Format ungültig.',
     'required'             => ':attribute Feld muss ausgefüllt sein.',
     'required_if'          => ':attribute wird benötigt wenn :other :value entspricht.',
@@ -87,7 +88,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.",
+    "unique_undeleted"     => "Die Variable :attribute muss eindeutig sein.",
 
     /*
     |--------------------------------------------------------------------------

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Στοιχείο',
     'field_format'            => 'Τύπος',
     'field_custom_format'     => 'Προσαρμοσμένος τύπος',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Απαιτείται',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Χρησιμοποιήθηκε από τα μοντέλα',

resources/lang/el/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
     'numeric'              => 'Το χαρακτηριστικό πρέπει να είναι ένας αριθμός.',
     'present'              => 'Πρέπει να υπάρχει το πεδίο ιδιοτήτων: attribute.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Η μορφή του χαρακτηριστικού είναι μη έγκυρη.',
     'required'             => 'Το πεδίο ιδιοτήτων: απαιτείται.',
     'required_if'          => 'Το πεδίο ιδιοτήτων: απαιτείται όταν: το άλλο είναι: τιμή.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Custom Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Required',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Used By Models',

resources/lang/en-GB/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'The :attribute format is invalid.',
     'required'             => 'The :attribute field is required.',
     'required_if'          => 'The :attribute field is required when :other is :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Custom Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Required',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Used By Models',

resources/lang/en-ID/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'The :attribute format is invalid.',
     'required'             => 'The :attribute field is required.',
     'required_if'          => 'The :attribute field is required when :other is :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
     'field_custom_format'     => 'Formato personalizado',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorio',
     'req'   		              => 'Obl.',
     'used_by_models'   		    => 'Usado Por Modelos',

resources/lang/es-CO/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'El :attribute seleccionado no es correcto.',
     'numeric'              => ':attribute debe ser un número.',
     'present'              => 'El campo: atributo debe estar presente.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute formato incorrecto.',
     'required'             => ':attribute es obligatorio.',
     'required_if'          => ':attribute es obligatrio cuando :other es :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
     'field_custom_format'     => 'Formato personalizado',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorio',
     'req'   		              => 'Obl.',
     'used_by_models'   		    => 'Usado Por Modelos',

resources/lang/es-ES/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'El :attribute seleccionado no es correcto.',
     'numeric'              => ':attribute debe ser un número.',
     'present'              => 'El campo: atributo debe estar presente.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute formato incorrecto.',
     'required'             => ':attribute es obligatorio.',
     'required_if'          => ':attribute es obligatrio cuando :other es :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Vorming',
     'field_custom_format'     => 'Kohandatud vorming',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Nõutud',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Kasutatud mudelite järgi',

resources/lang/et/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Valitud atribuut on kehtetu.',
     'numeric'              => 'Atribuut peab olema number.',
     'present'              => 'Atribuudiväli peab olema kohal.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Atribuudivorming on vale.',
     'required'             => 'Atribuudiväljandus on kohustuslik.',
     'required_if'          => 'Atribuudiväljastus on vajalik, kui: muu on: väärtus.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'عنصر',
     'field_format'            => 'شکل دادن',
     'field_custom_format'     => 'شکل دادن سفارشی',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'نیازمندی',
     'req'   		              => 'نیازمندی',
     'used_by_models'   		    => 'استفاده شده توسط مدل ها',

resources/lang/fa/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'ویژگی انتخاب شده نامعتبر است.',
     'numeric'              => 'ویژگی باید عدد باشد.',
     'present'              => 'فیلد attribute باید باشد.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'شکل ویژگی نامعتبر است.',
     'required'             => 'فیلد ویژگی ضروری است.',
     'required_if'          => 'فیلد ویژگی ضروری است، وقتی که دیگری ارزش است.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'elementti',
     'field_format'            => 'Muoto',
     'field_custom_format'     => 'Mukautettu muoto',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Edellytetään',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Käytetään mallien mukaan',

resources/lang/fi/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Valittu :attribute on virheellinen.',
     'numeric'              => ':attribute tulee olla numero.',
     'present'              => 'Attribuutti-kentän on oltava läsnä.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute muotoilu on virheellinen.',
     'required'             => ':attribute on vaadittu.',
     'required_if'          => ':attribute on vaadittu kun :other on :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elément',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Format personnalisé',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Requis',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Utilisé par les modèles',

resources/lang/fr/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'L\'attribut ":attribute" est invalide.',
     'numeric'              => 'L\'attribut ":attribute" doit être un nombre.',
     'present'              => 'Le champ d\'attribut: doit être présent.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Le format de l\'attribut ":attribute" est invalide.',
     'required'             => 'Le champs :attribute est nécessaire.',
     'required_if'          => 'Le champ :attribute est nécessaire quand :other vaut :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Eilimint',
     'field_format'            => 'Formáid',
     'field_custom_format'     => 'Formáid Chustaim',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Riachtanach',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Úsáidte trí Mhúnlaí',

resources/lang/ga-IE/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'An roghnaithe: tá tréith neamhbhailí.',
     'numeric'              => 'An: Ní mór tréith a bheith ina líon.',
     'present'              => 'Ní mór an réimse tréith a bheith i láthair.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Tá an fhormáid tréithbhail neamhbhailí.',
     'required'             => 'An: Tá réimse tréith ag teastáil.',
     'required_if'          => 'An: Tá réimse tréith ag teastáil nuair: eile é: luach.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'אֵלֵמֶנט',
     'field_format'            => 'פוּרמָט',
     'field_custom_format'     => 'פורמט מותאם אישית',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'נדרש',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'דגמים משומשים',

resources/lang/he/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'התכונה שנבחרה: אינה חוקית.',
     'numeric'              => 'התכונה: חייבת להיות מספר.',
     'present'              => 'שדה התכונה: חייב להיות נוכח.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'תבנית התכונה: אינה חוקית.',
     'required'             => 'שדה התכונה: נדרש.',
     'required_if'          => 'שדה התכונה: נדרש כאשר: other is: value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Prilagođeni format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Potreban',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Koristi se po modelu',

resources/lang/hr/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Odabrani: atribut nije važeći.',
     'numeric'              => 'Atribut mora biti broj.',
     'present'              => 'Polje atributa mora biti prisutno.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Format atributa nije važeći.',
     'required'             => 'Potrebno je: polje atributa.',
     'required_if'          => 'Polje atributa je obavezno kada: druga vrijednost: vrijednost.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elem',
     'field_format'            => 'Formátum',
     'field_custom_format'     => 'Egyéni formátum',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Kötelező',
     'req'   		              => 'Kötelező.',
     'used_by_models'   		    => 'Modellek szerint ',

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

@@ -62,7 +62,7 @@ return array(
         '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!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Ki kell választania legalább egy elemet a listából'
     ),
 
     'checkin' => array(

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

@@ -23,8 +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'	=> 'Egyéni jelszó visszaállítási 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.',
+    'custom_forgot_pass_url_help'	=> 'Ez felváltja a beépített elfelejtett jelszó URL-jét a bejelentkezési képernyőn, amely hasznos lehet arra, hogy az embereket belső vagy hosztolt LDAP jelszó-visszaállítási funkciókra irányítsa. Hatékonyan kikapcsolja a helyi felhasználók elfelejtett jelszavát.',
 	'default_currency'  		=> 'Alapértelmezett pénznem',
 	'default_eula_text'			=> 'Alapértelmezett EULA',
   'default_language'					=> 'Alapértelmezett nyelv',
@@ -46,8 +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_test_help'      => 'Adjon meg egy érvényes LDAP felhasználónevet és jelszót a fenti alapszintű DN-ből, hogy ellenőrizze, hogy az LDAP-bejelentkezés megfelelően van-e beállítva. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
-    '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_login_sync_help'      => 'Ez csak azt teszteli, hogy az LDAP helyesen szinkronizálható. Ha az LDAP hitelesítési lekérdezése nem megfelelő, a felhasználók még mindig nem tudnak bejelentkezni. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
     '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

@@ -19,9 +19,9 @@ return 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.',
-        '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_assets'	 => 'Ez a beszállító jelenleg :asset_count eszközhöz van társítva és nem törölhető. Kérem frissítse az eszközeit hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ',
-        '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_licenses'	 => 'Ez a beszállító jelenleg :asset_count licenszhez van társítva és nem törölhető. Kérem frissítse az licenszeit hogy ne hivatkozzonak erre a beszállítóra és próbálja újra. ',
-        '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. ',
+        'assoc_maintenances'	 => 'Ez a beszállító jelenleg :asset_maintenances_count eszköz karbantartáshoz van társítva és nem törölhető. Kérem frissítse az eszköz karbantartásait hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ',
     )
 
 );

resources/lang/hu/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'A kiválasztott :attribute étvénytelen.',
     'numeric'              => 'A :attribute csak szám lehet.',
     'present'              => 'A: attribútum mezőnek jelen kell lennie.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Az :attribute formátuma érvénytelen.',
     'required'             => 'A :attribute mező kötelező.',
     'required_if'          => 'A :attribute mező kötelező ha :other egy :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemen',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Format Ubahan',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Harus diisi',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Digunakan oleh Model',

resources/lang/id/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => ':attribute yang di pilih tidak benar.',
     'numeric'              => ':attribute harus dalam angka.',
     'present'              => 'Bidang atribut: harus ada.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Format :attribute tidak benar.',
     'required'             => 'Kolom :attribute wajib di-isi.',
     'required_if'          => 'Kolom :attribute wajib di-isi ketika :other nya :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
     'field_custom_format'     => 'Formato personalizzato',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obbligatorio',
     'req'   		              => 'Obbl.',
     'used_by_models'   		    => 'Usato dai Modelli',

resources/lang/it/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'L\' :attribute selezionato è invalido.',
     'numeric'              => 'L\' :attribute deve essere un numero.',
     'present'              => 'Il campo attributo deve essere presente.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Il formato dell\' :attribute è invalido.',
     'required'             => 'Il campo :attribute è obblogatorio.',
     'required_if'          => 'L\' :attribute è richiesto quando :other è :value.',

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

@@ -21,6 +21,7 @@ return array(
     'field_element_short'     => 'エレメント',
     'field_format'            => 'フォーマット',
     'field_custom_format'     => 'カスタム形式：',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => '必須',
     'req'   		              => '必須',
     'used_by_models'   		    => '型番で使用',

resources/lang/ja/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => '選択された :attribute は不正です。',
     'numeric'              => ':attribute は数字にして下さい。',
     'present'              => ':attribute フィールドは必須です。',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute フォーマットが不正です。',
     'required'             => ':attribute フィールドは、必須です。',
     'required_if'          => ':other が :value の時、:attribute フィールドは必須です。',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => '성분',
     'field_format'            => '형식',
     'field_custom_format'     => '사용자 형식',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => '필수사항',
     'req'   		              => '필수',
     'used_by_models'   		    => '적용 모델',

resources/lang/ko/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => '선택한 :attribute 가 부정확 합니다.',
     'numeric'              => ':attribute 는 숫자만 가능합니다.',
     'present'              => ':attribute 항목이 있어야 합니다.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute 형식이 부정확 합니다.',
     'required'             => ':attribute 항목을 입력해 주세요.',
     'required_if'          => ':attribute 항목은 :other가 :value 일때 필요합니다.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elementas',
     'field_format'            => 'Formatas',
     'field_custom_format'     => 'Pritaikomas formatas',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Privalomas',
     'req'   		              => 'Privaloma.',
     'used_by_models'   		    => 'Naudojama modelių',

resources/lang/lt/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Pasirinktas :attribute neteisingas.',
     'numeric'              => ':attribute privalo būti skaičius.',
     'present'              => 'Atributo laukas turi būti.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute formatas neteisingas.',
     'required'             => ':attribute laukelis privalomas.',
     'required_if'          => ':attribute laukelis yra privalomas kai :other yra :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elements',
     'field_format'            => 'Formāts',
     'field_custom_format'     => 'Pielāgotais formāts',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligāts',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Izmantoti modeļi',

resources/lang/lv/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Atlasītais: atribūts nav derīgs.',
     'numeric'              => 'Atribūts ir jābūt skaitlim.',
     'present'              => 'Atribūta laukam jābūt klāt.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Atribūta formāts nav derīgs.',
     'required'             => 'Atribūta lauks ir nepieciešams.',
     'required_if'          => 'Atribūta lauks ir nepieciešams, ja: cits ir: vērtība.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Tuhinga',
     'field_format'            => 'Whakahōputu',
     'field_custom_format'     => 'Whakaritenga Ritenga',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'E hiahiatia ana',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Kua Whakamahia Ma Nga Tauira',

resources/lang/mi/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Ko te mea i tīpakohia: he muhu te huanga.',
     'numeric'              => 'Ko te: me tohu he huanga.',
     'present'              => 'Ko te: ko te waahi tohu kia noho.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Ko te: ko te hōputu huanga he muhu.',
     'required'             => 'Ko te: e hiahiatia ana te waahi huanga.',
     'required_if'          => 'Ko te: ka hiahiatia te waahi huanga ina: ko etahi atu: te uara.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Бүрэлдэхүүн',
     'field_format'            => 'Формат',
     'field_custom_format'     => 'Гаалийн формат',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Шаардлагатай',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Загвар ашиглана',

resources/lang/mn/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Сонгосон: шинж чанар буруу байна.',
     'numeric'              => 'Үүнд: атрибут нь тоо байх ёстой.',
     'present'              => 'Үүнд: атрибутын талбар байх ёстой.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Агуулга формат буруу байна.',
     'required'             => 'Үүнд: атрибутын талбар шаардлагатай.',
     'required_if'          => 'Үүнд: аттрибутын талбар шаардлагатай үед: бусад нь: утга.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemen',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Format Tersuai',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Diperlukan',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Digunakan Oleh Model',

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

@@ -62,7 +62,7 @@ return array(
         'success' 		=> 'Harta berjaya diagihkan.',
         'user_does_not_exist' => 'Pengguna tak sah. Sila cuba lagi.',
         'not_available' => 'Aset itu tidak tersedia untuk checkout!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Anda mesti memilih sekurang-kurangnya satu aset dari senarai'
     ),
 
     'checkin' => array(

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

@@ -23,8 +23,8 @@ return array(
     'confirm_purge_help'		=> 'Masukkan teks "DELETE" dalam kotak di bawah untuk membersihkan rekod anda yang dihapuskan. Tindakan ini tidak dapat dibatalkan.',
 	'custom_css'				=> 'CSS tersuai',
 	'custom_css_help'			=> 'Masukkan mana-mana CSS ubah khas yang anda mahu gunakan. Jangan masukkan tag <style></style>.',
-    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url'	=> 'URL Khas untuk Penetapan Semula Kata Laluan',
-    '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.',
+    'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL terlupa kata laluan terbina pada skrin log masuk, berguna untuk mengarahkan pengguna ke fungsi semula kata laluan LDAP dalaman atau dihoskan. Ia secara langsung akan melumpuhkan fungsi kata laluan terlupa pengguna tempatan.',
 	'default_currency'  		=> 'Mata Wang Default',
 	'default_eula_text'			=> 'EULA lalai',
   'default_language'					=> 'Bahasa Lalai',
@@ -46,8 +46,8 @@ return array(
     'ldap_enabled'              => 'LDAP diaktifkan',
     'ldap_integration'          => 'Integrasi LDAP',
     'ldap_settings'             => 'Tetapan 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_test_help'      => 'Masukkan nama pengguna dan kata laluan LDAP yang sah dari pangkalan DN yang anda tentukan di atas untuk menguji sama ada log masuk LDAP anda dikonfigurasi dengan betul. ANDA MESTI SIMPAN KONFIGURASI LDAP TERKINI DAHULU.',
-    '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_login_sync_help'      => 'Ini hanya ujian bahawa LDAP boleh diselaraskan dengan betul. Jika pertanyaan Pengesahan LDAP anda tidak betul, pengguna mungkin masih tidak boleh log masuk. ANDA MESTI SIMPAN KONFIGURASI LDAP TERKINI DAHULU.',
     'ldap_server'               => 'Pelayan LDAP',
     'ldap_server_help'          => 'Ini harus bermula dengan ldap: // (untuk tidak disulitkan atau TLS) atau ldaps: // (untuk SSL)',
 	'ldap_server_cert'			=> 'Pengesahan sijil LDAP SSL',

resources/lang/ms/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Piliah :attribute tidak sah.',
     'numeric'              => ':attribute mesti nombor.',
     'present'              => 'Yang: bidang atribut mesti ada.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute format tidak sah.',
     'required'             => ':attribute ruangan diperlukan.',
     'required_if'          => ':attribute rungan diperlukan bila :other adalah :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Stijl',
     'field_custom_format'     => 'Aangepaste stijl',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Verplicht',
     'req'   		              => 'Ndz.',
     'used_by_models'   		    => 'Gebruikt door modellen',

resources/lang/nl/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Het geselecteerde kenmerk :attribute is ongeldig.',
     'numeric'              => ':attribute moet een getal zijn.',
     'present'              => ':attribute veld moet aanwezig zijn.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Het formaat van :attribute is ongeldig.',
     'required'             => 'Het veld :attribute is verplicht.',
     'required_if'          => 'het veld :attribute is verplicht als :other gelijk is aan :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Egendefinert Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorisk',
     'req'   		              => 'Obl.',
     'used_by_models'   		    => 'Brukes av modeller',

resources/lang/no/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Attributtet :attribute er ugyldig.',
     'numeric'              => 'Attributtet :attribute må være et nummer.',
     'present'              => 'Atributtfeltet :attribute må ha en verdi.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Attributt-formatet til :attribute er ugyldig.',
     'required'             => 'Attributt-feltet :attribute er påkrevd.',
     'required_if'          => 'Attributt-feltet :attribute er påkrevd når :oher er :value.',

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

@@ -2,7 +2,7 @@
 
 return array(
     'about_accessories_title' 			=> 'O Akcesoriach',
-    'about_accessories_text'  			=> 'Akcesoria to coś co wydajesz dla użytkowników, a które nie mają numerów seryjny ch(lub nie zależy Ci na śledzeniu ich niepowtarzalności). Na przykład, myszy i klawiatury komputerowe.',
+    'about_accessories_text'  			=> 'Akcesoria to rzeczy, które wydajesz użytkownikom, a które nie mają numerów seryjnych (lub nie zależy Ci na śledzeniu ich niepowtarzalności). Na przykład, myszy i klawiatury komputerowe.',
     'accessory_category' 				=> 'Kategorie Akcesoriów',
     'accessory_name'  					=> 'Nazwa akcesoriów',
     'checkout'  							=> 'Wydanie akcesoriów',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Format niestandardowy',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Wymagane',
     'req'   		              => 'Wymagane',
     'used_by_models'   		    => 'Używane przez modele',

resources/lang/pl/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Wybrany :attribute jest nieprawidłowy.',
     'numeric'              => ':attribute musi być liczbą.',
     'present'              => ':attribute nie może być puste.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Format :attribute jest niewłaściwy.',
     'required'             => ':attribute nie może być puste.',
     'required_if'          => 'Pole :attribute jest wymagane gdy :other jest :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
     'field_custom_format'     => 'Formato personalizado',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Requerido',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Usado por modelos',

resources/lang/pt-BR/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'O :attribute selecionado é inválido.',
     'numeric'              => 'O :attribute deve ser um número.',
     'present'              => 'O campo: atributo deve estar presente.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'O formato de :attribute é inválido.',
     'required'             => 'O campo de :attribute é requerido.',
     'required_if'          => 'O campo de :attribute é requerido quando :other é :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
     'field_custom_format'     => 'Formato personalizado',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Requerido',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Usado por modelos',

resources/lang/pt-PT/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'O :attribute selecionado é inválido.',
     'numeric'              => ':attribute tem que ser um número.',
     'present'              => 'O campo: atributo deve estar presente.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'O formato do :attribute é inválido.',
     'required'             => ':attribute é obrigatório.',
     'required_if'          => 'O :attribute é obrigatório quando :other é :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Format personalizat',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Necesar',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Folosit de modele',

resources/lang/ro/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => ':attribute selectat nu e valid.',
     'numeric'              => ':attribute trebuie sa fie un numar.',
     'present'              => 'Câmpul atributului trebuie să fie prezent.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Formatul :attribute nu este valid.',
     'required'             => 'Campul :attribute este obligatoriu.',
     'required_if'          => ':attribute este obligatoriu atunci cand :other este :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Элемент',
     'field_format'            => 'Формат',
     'field_custom_format'     => 'Пользовательский формат',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Обязательно',
     'req'   		              => 'Треб.',
     'used_by_models'   		    => 'Использован в моделях',

resources/lang/ru/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Выбранный :attribute неправильный.',
     'numeric'              => ':attribute должно быть числом.',
     'present'              => 'Поле атрибута: должно присутствовать.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Неправильный формат :attribute.',
     'required'             => ':attribute обязательное поле.',
     'required_if'          => ':attribute обязательное поле, когда :other :value.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Anpassat format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Krävs',
     'req'   		              => 'Obl.',
     'used_by_models'   		    => 'Används av modeller',

resources/lang/sv-SE/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'Det valda: attributet är ogiltigt.',
     'numeric'              => 'Attributet måste vara ett nummer.',
     'present'              => 'Attributfältet måste vara närvarande.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Attributet formatet är ogiltigt.',
     'required'             => 'Fältet: Attribut är obligatoriskt.',
     'required_if'          => 'Attributfältet krävs när: annat är: värde.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'உறுப்பு',
     'field_format'            => 'வடிவம்',
     'field_custom_format'     => 'விருப்ப வடிவமைப்பு',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'தேவையான',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'மாதிரிகள் பயன்படுத்தப்படுகிறது',

resources/lang/ta/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
     'numeric'              => 'பண்புக்கூறு: ஒரு எண் இருக்க வேண்டும்.',
     'present'              => ': பண்புக்கூறு களஞ்சியம் இருக்க வேண்டும்.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'பண்புக்கூறு வடிவமைப்பு தவறானது.',
     'required'             => ': பண்புக்கூறு தேவைப்படுகிறது.',
     'required_if'          => ': பண்புக்கூறு புலம் தேவை: மற்றது: மதிப்பு.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'ธาตุ',
     'field_format'            => 'รูป',
     'field_custom_format'     => 'รูปแบบที่กำหนดเอง',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'จำเป็นต้องใช้',
     'req'   		              => 'req',
     'used_by_models'   		    => 'ใช้ตามโมเดล',

resources/lang/th/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => ':attribute ที่เลือกไม่ถูกต้อง',
     'numeric'              => ':attribute ต้องเป็นตัวเลขเท่านั้น',
     'present'              => 'ฟิลด์แอ็ตทริบิวต์: ต้องมีอยู่',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'รูปแบบของ :attribute ไม่ถูกต้อง',
     'required'             => 'กรุณากรอกข้อมูลในฟิลด์ :attribute',
     'required_if'          => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :other เป็น :value',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Öğe',
     'field_format'            => 'Düzen',
     'field_custom_format'     => 'Özel biçim',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Gerekli',
     'req'   		              => 'Talep.',
     'used_by_models'   		    => 'Modellerle Kullanılmıştır',

resources/lang/tr/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => ':attribute geçersiz.',
     'numeric'              => ':attribute sayı olmalıdır.',
     'present'              => ': Attribute alanı bulunmalıdır.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute formatı geçersiz.',
     'required'             => ':attribute alanı zorunludur.',
     'required_if'          => ':attribute :other :value geçersiz.',

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'Thành phần',
     'field_format'            => 'định dạng',
     'field_custom_format'     => 'Định dạng Tuỳ chỉnh',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Cần thiết',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Được sử dụng theo mô hình',

resources/lang/vi/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => ':attribute đã chọn không hợp lý.',
     'numeric'              => ':attribute phải là một số.',
     'present'              => 'Trường thuộc tính: phải có mặt.',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'Định dạng :attribute thì không hợp lý.',
     'required'             => 'Trường :attribute thì bắt buộc.',
     'required_if'          => 'Trường :attribute thì bắt buộc khi :other là :value.',

resources/lang/zh-CN/admin/custom_fields/general.php

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => '表单元素',
     'field_format'            => '格式',
     'field_custom_format'     => '自定义格式',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => '必填',
     'req'   		              => '必填',
     'used_by_models'   		    => '引用模板',

resources/lang/zh-CN/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => '选择的 :attribute 无效',
     'numeric'              => ':attribute 必须是数字',
     'present'              => '：属性字段必须存在。',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute 格式不对',
     'required'             => ':attribute 字段必填',
     'required_if'          => ':attribute 字段在 :other 是 :value 时是必须的',

resources/lang/zh-TW/admin/custom_fields/general.php

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => '表單元素',
     'field_format'            => '格式',
     'field_custom_format'     => '自訂格式',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => '必填',
     'req'   		              => '必填',
     'used_by_models'   		    => '引用型號',

resources/lang/zh-TW/admin/hardware/message.php

@@ -62,7 +62,7 @@ return array(
         'success' 		=> '借出資產成功。',
         'user_does_not_exist' => '無效使用者，請重試。',
         'not_available' => '此資產無法借出',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => '你必須至少選擇一項資產。'
     ),
 
     'checkin' => array(

resources/lang/zh-TW/admin/settings/general.php

@@ -23,8 +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'	=> '自訂密碼重置網址',
-    '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.',
+    'custom_forgot_pass_url_help'	=> '這將替換登錄屏幕上的忘記密碼URL，有助於將用戶引導至內部或託管的LDAP密碼重置功能。它將禁用本地用戶遺忘密的碼功能。',
 	'default_currency'  		=> '預設貨幣',
 	'default_eula_text'			=> '預設EULA',
   'default_language'					=> '預設語言',
@@ -46,8 +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_test_help'      => '從上方指定的 DN 中輸入有效的 LDAP 使用者名和密碼, 以測試是否正確配置了 LDAP 登錄。您必須先保存更新的 LDAP 設置。',
-    '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_login_sync_help'      => '這僅測試 LDAP 可以正確同步。如果 LDAP 身份驗證查詢不正確, 使用者可能仍無法登錄。您必須先保存更新的 LDAP 設置。',
     'ldap_server'               => 'LDAP伺服器',
     'ldap_server_help'          => '這應以 ldap:// (未加密或TLS加密) 或 ldaps:// (SSL加密) 開頭',
 	'ldap_server_cert'			=> '檢查LDAP的SSL憑證',

resources/lang/zh-TW/admin/suppliers/message.php

@@ -19,9 +19,9 @@ return array(
         'confirm'   => '您確定要刪除此供應商嗎？',
         'error'   => '刪除供應商失敗，請重試',
         '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_assets'	 => '至少還有 :asset_count 個樣板與此供應商關聯，目前不能被刪除，請檢查後重試。 ',
-        '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_licenses'	 => '至少還有 :licenses_count 個授權與此供應商關聯，目前不能被刪除，請檢查後重試。 ',
-        '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. ',
+        'assoc_maintenances'	 => '至少還有 :asset_maintenances_count 個資產維護與此供應商關聯，目前不能被刪除，請檢查後重試。 ',
     )
 
 );

resources/lang/zh-TW/general.php

@@ -40,7 +40,7 @@
     'checkout'  			=> '借出',
     'city'  				=> '城市',
 	'click_here'			=> '點擊這裡',
-    'clear_selection'		=> 'Clear Selection',
+    'clear_selection'		=> '清除選擇',
     'companies'			    => '公司',
     'company'				=> '公司',
     'component'			    => '組件',
@@ -90,7 +90,7 @@
     'history'  			    => '歷史記錄',
     'history_for'  			=> '歷史記錄',
     'id'  					=> 'ID',
-    'image'                 => 'Image',
+    'image'                 => '影像',
     'image_delete'         	=> '刪除圖片',
     'image_upload'         	=> '上傳圖片',
     'import'         	    => '匯入',

resources/lang/zh-TW/validation.php

@@ -67,6 +67,7 @@ return array(
     'not_in'               => '選擇的 :attribute 無效',
     'numeric'              => ':attribute 必須是數字',
     'present'              => '：屬性字段必須存在。',
+    'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => ':attribute 格式不正確',
     'required'             => ':attribute 欄位必填',
     'required_if'          => ':attribute 欄位在 :other 是 :value 時是必填的',
@@ -87,7 +88,7 @@ return array(
     'unique'               => ':attribute 已被採用',
     'uploaded'             => ':attribute 上傳失敗',
     'url'                  => ':attribute 格式不正確',
-    "unique_undeleted"     => "The :attribute must be unique.",
+    "unique_undeleted"     => ":attribute 必須是唯一值",
 
     /*
     |--------------------------------------------------------------------------

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

@@ -20,6 +20,7 @@ return array(
     'field_element_short'     => 'I-Element',
     'field_format'            => 'Fometha',
     'field_custom_format'     => 'Ifomethi Yokwezifiso',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Kudingeka',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Isetshenziswe ngamamodeli',