diff --git a/resources/lang/af/admin/hardware/message.php b/resources/lang/af/admin/hardware/message.php
index 07a20390c3..6179ce6bb7 100644
--- a/resources/lang/af/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/af/admin/settings/general.php b/resources/lang/af/admin/settings/general.php
index d82ee04cf1..0726bd6379 100644
--- a/resources/lang/af/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/af/admin/suppliers/message.php b/resources/lang/af/admin/suppliers/message.php
index 5f6aefb919..98805d0d3a 100644
--- a/resources/lang/af/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
index 5e8780b81c..bb3c4922cf 100644
--- a/resources/lang/af/general.php
+++ b/resources/lang/af/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'bykomstighede',
- 'activated' => 'geaktiveer',
+ 'activated' => 'geaktiveer',
'accessory' => 'Bykomstigheid',
- 'accessory_report' => 'Toebehoreverslag',
+ 'accessory_report' => 'Toebehoreverslag',
'action' => 'aksie',
'activity_report' => 'Aktiwiteitsverslag',
'address' => 'adres',
'admin' => 'admin',
- 'add_seats' => 'Bykomende sitplekke',
+ 'add_seats' => 'Bykomende sitplekke',
'all_assets' => 'Alle bates',
'all' => 'Almal',
'archived' => 'argief',
@@ -40,9 +40,10 @@
'checkout' => 'Uitteken',
'city' => 'Stad',
'click_here' => 'Klik hier',
- 'companies' => 'maatskappye',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'maatskappye',
'company' => 'maatskappy',
- 'component' => 'komponent',
+ 'component' => 'komponent',
'components' => 'komponente',
'complete' => 'volledige',
'consumable' => 'verbruikbare',
@@ -58,10 +59,10 @@
'custom_report' => 'Aangepaste bateverslag',
'dashboard' => 'Dashboard',
'days' => 'dae',
- 'days_to_next_audit' => 'Dae na Volgende Oudit',
+ 'days_to_next_audit' => 'Dae na Volgende Oudit',
'date' => 'datum',
'debug_warning' => 'Waarskuwing!',
- 'debug_warning_text' => 'Hierdie program word uitgevoer in die produksiemodus met debugging aangeskakel. Dit kan sensitiewe data blootstel indien u aansoek vir die buitewêreld toeganklik is. Deaktiveer debug-modus deur die APP_DEBUG
-waarde in jou .env
-lêer te stel na false
.',
+ 'debug_warning_text' => 'Hierdie program word uitgevoer in die produksiemodus met debugging aangeskakel. Dit kan sensitiewe data blootstel indien u aansoek vir die buitewêreld toeganklik is. Deaktiveer debug-modus deur die APP_DEBUG
-waarde in jou .env
-lêer te stel na false
.',
'delete' => 'verwyder',
'deleted' => 'geskrap',
'delete_seats' => 'Plekke verwyder',
@@ -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',
diff --git a/resources/lang/af/validation.php b/resources/lang/af/validation.php
index 85fdcf069a..96180e9b6e 100644
--- a/resources/lang/af/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/ar/admin/hardware/message.php b/resources/lang/ar/admin/hardware/message.php
index da212cd90c..6cb43e9421 100644
--- a/resources/lang/ar/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php
index ca9c893f41..fa6036b668 100644
--- a/resources/lang/ar/admin/settings/general.php
+++ b/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' => 'التحقق من صحة شهادة سل لداب',
diff --git a/resources/lang/ar/admin/suppliers/message.php b/resources/lang/ar/admin/suppliers/message.php
index 6e889764ea..22f2b92746 100644
--- a/resources/lang/ar/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
index 0b7742847b..541c3bf673 100644
--- a/resources/lang/ar/general.php
+++ b/resources/lang/ar/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'ملحقات',
- 'activated' => 'مفعل',
+ 'activated' => 'مفعل',
'accessory' => 'ملحق',
- 'accessory_report' => 'تقرير الملحقات',
+ 'accessory_report' => 'تقرير الملحقات',
'action' => 'الإجراء',
'activity_report' => 'تقرير الأنشطة',
'address' => 'العنوان',
'admin' => 'الإدارة',
- 'add_seats' => 'المقاعد المضافة',
+ 'add_seats' => 'المقاعد المضافة',
'all_assets' => 'كل الأصول',
'all' => 'الكل',
'archived' => 'مؤرشف',
@@ -40,9 +40,10 @@
'checkout' => 'ترجيع',
'city' => 'المدينة',
'click_here' => 'انقر هنا',
- 'companies' => 'الشركات',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'الشركات',
'company' => 'شركة',
- 'component' => 'مكون',
+ 'component' => 'مكون',
'components' => 'المكونات',
'complete' => 'اكتمال',
'consumable' => 'مستهلكات',
@@ -58,10 +59,10 @@
'custom_report' => 'تقرير مخصص للأصول',
'dashboard' => 'لوحة القيادة',
'days' => 'أيام',
- 'days_to_next_audit' => 'أيام إلى التدقيق التالي',
+ 'days_to_next_audit' => 'أيام إلى التدقيق التالي',
'date' => 'التاريخ',
'debug_warning' => 'تحذير!',
- 'debug_warning_text' => 'هذا التطبيق يعمل في وضع الإنتاج مع تمكين التصحيح. هذا يمكن أن يعرض البيانات الحساسة إذا كان التطبيق الخاص بك هو في متناول العالم الخارجي. تعطيل وضع التصحيح عن طريق تعيين قيمة APP_DEBUG
في ملف .env
إلى false
.',
+ 'debug_warning_text' => 'هذا التطبيق يعمل في وضع الإنتاج مع تمكين التصحيح. هذا يمكن أن يعرض البيانات الحساسة إذا كان التطبيق الخاص بك هو في متناول العالم الخارجي. تعطيل وضع التصحيح عن طريق تعيين قيمة APP_DEBUG
في ملف .env
إلى false
.',
'delete' => 'حذف',
'deleted' => 'تم حذفها',
'delete_seats' => 'المقاعد المحذوفة',
@@ -89,6 +90,7 @@
'history' => 'التاريخ',
'history_for' => 'السجل لـ',
'id' => 'الرقم',
+ 'image' => 'Image',
'image_delete' => 'حذف الصورة',
'image_upload' => 'رفع صورة',
'import' => 'استيراد',
diff --git a/resources/lang/ar/validation.php b/resources/lang/ar/validation.php
index e1e28c650a..c47484c909 100644
--- a/resources/lang/ar/validation.php
+++ b/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" => "يجب أن تكون السمة فريدة.",
],
/*
diff --git a/resources/lang/bg/admin/hardware/message.php b/resources/lang/bg/admin/hardware/message.php
index 7760c325b5..91d4edb4b0 100644
--- a/resources/lang/bg/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php
index 7b1cc52cd7..70efe4d56e 100644
--- a/resources/lang/bg/admin/settings/general.php
+++ b/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 сертификата',
diff --git a/resources/lang/bg/admin/suppliers/message.php b/resources/lang/bg/admin/suppliers/message.php
index 28d75e9d48..ff0add8970 100644
--- a/resources/lang/bg/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php
index d26a38e04c..daefcac6a8 100644
--- a/resources/lang/bg/general.php
+++ b/resources/lang/bg/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Аксесоари',
- 'activated' => 'Активирано',
+ 'activated' => 'Активирано',
'accessory' => 'Аксесоар',
- 'accessory_report' => 'Справка за аксесоарите',
+ 'accessory_report' => 'Справка за аксесоарите',
'action' => 'Действие',
'activity_report' => 'Справка за дейностите',
'address' => 'Aдрес',
'admin' => 'Администриране',
- 'add_seats' => 'Добавени работни места',
+ 'add_seats' => 'Добавени работни места',
'all_assets' => 'Всички активи',
'all' => 'Всички',
'archived' => 'Архивирани',
@@ -40,9 +40,10 @@
'checkout' => 'Изписване',
'city' => 'Град',
'click_here' => 'Натиснете тук',
- 'companies' => 'Компании',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Компании',
'company' => 'Компания',
- 'component' => 'Компонент',
+ 'component' => 'Компонент',
'components' => 'Компоненти',
'complete' => 'Завърши',
'consumable' => 'Консуматив',
@@ -58,10 +59,10 @@
'custom_report' => 'Потребителски справки за активи',
'dashboard' => 'Табло',
'days' => 'дни',
- 'days_to_next_audit' => 'Дни до следващия одит',
+ 'days_to_next_audit' => 'Дни до следващия одит',
'date' => 'Дата',
'debug_warning' => 'Предупреждение!',
- 'debug_warning_text' => 'Това приложение се изпълнява в режим на производство с разрешено отстраняване на грешки. Това може да изложи чувствителни данни, ако приложението ви е достъпно за външния свят. Забранете режим отстраняване на грешки чрез задаване на стойността APP_DEBUF
.env
във файла false
.',
+ 'debug_warning_text' => 'Това приложение се изпълнява в режим на производство с разрешено отстраняване на грешки. Това може да изложи чувствителни данни, ако приложението ви е достъпно за външния свят. Забранете режим отстраняване на грешки чрез задаване на стойността APP_DEBUF
.env
във файла false
.',
'delete' => 'Изтриване',
'deleted' => 'Изтрито',
'delete_seats' => 'Изтрити работни места за лиценз',
@@ -89,6 +90,7 @@
'history' => 'История',
'history_for' => 'История за',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Изтриване на изображението',
'image_upload' => 'Качване на изображение',
'import' => 'Зареждане',
diff --git a/resources/lang/bg/validation.php b/resources/lang/bg/validation.php
index 0f6c05eae7..41a616fc6b 100644
--- a/resources/lang/bg/validation.php
+++ b/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" => "Атрибутът: трябва да е уникален.",
],
/*
diff --git a/resources/lang/cs/admin/hardware/message.php b/resources/lang/cs/admin/hardware/message.php
index cd8db061fb..0f5fd56e23 100644
--- a/resources/lang/cs/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php
index 64ebf85e97..eade3937df 100644
--- a/resources/lang/cs/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/cs/admin/suppliers/message.php b/resources/lang/cs/admin/suppliers/message.php
index 9f7eb92b86..cb78215f97 100644
--- a/resources/lang/cs/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php
index 76caec135d..2760899ff1 100644
--- a/resources/lang/cs/general.php
+++ b/resources/lang/cs/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Příslušenství',
- 'activated' => 'Aktivováno',
+ 'activated' => 'Aktivováno',
'accessory' => 'Příslušenství',
- 'accessory_report' => 'Zpráva o doplňcích',
+ 'accessory_report' => 'Zpráva o doplňcích',
'action' => 'Akce',
'activity_report' => 'Report aktivity',
'address' => 'Adresa',
'admin' => 'Admin',
- 'add_seats' => 'Přidaná licenční místa',
+ 'add_seats' => 'Přidaná licenční místa',
'all_assets' => 'Všechna zařízení',
'all' => 'Vše',
'archived' => 'Archivováno',
@@ -40,9 +40,10 @@
'checkout' => 'Výdej',
'city' => 'Město',
'click_here' => 'Klikněte zde',
- 'companies' => 'Firmy',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Firmy',
'company' => 'Společnost',
- 'component' => 'Komponent',
+ 'component' => 'Komponent',
'components' => 'Komponenty',
'complete' => 'Dokončit',
'consumable' => 'Spotřební materiál',
@@ -58,10 +59,10 @@
'custom_report' => 'Vlastní report majetku',
'dashboard' => 'Nástěnka',
'days' => 'dnů',
- 'days_to_next_audit' => 'Dny k dalšímu auditu',
+ 'days_to_next_audit' => 'Dny k dalšímu auditu',
'date' => 'Datum',
'debug_warning' => 'Varování!',
- 'debug_warning_text' => 'Tato aplikace běží ve výrobním režimu s povoleným laděním. To znamená že citlivá data mohou být přístupná vnějšímu světu. Deaktivujte režim ladění nastavením hodnoty APP_DEBUG
v souboru .env
na false
.',
+ 'debug_warning_text' => 'Tato aplikace běží ve výrobním režimu s povoleným laděním. To znamená že citlivá data mohou být přístupná vnějšímu světu. Deaktivujte režim ladění nastavením hodnoty APP_DEBUG
v souboru .env
na false
.',
'delete' => 'Odstranit',
'deleted' => 'Odstraněno',
'delete_seats' => 'Vymazaná licenční místa',
@@ -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',
diff --git a/resources/lang/cs/validation.php b/resources/lang/cs/validation.php
index 76c06cb6fc..6b185cd21e 100644
--- a/resources/lang/cs/validation.php
+++ b/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ý.",
],
/*
diff --git a/resources/lang/da/admin/hardware/message.php b/resources/lang/da/admin/hardware/message.php
index 2190ddb370..93dbd7163b 100644
--- a/resources/lang/da/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php
index 80c06b3e50..0a1cbb1c55 100644
--- a/resources/lang/da/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/da/admin/suppliers/message.php b/resources/lang/da/admin/suppliers/message.php
index f42e5a1fe6..652eab1f5a 100644
--- a/resources/lang/da/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php
index ac6943def8..30a3da1982 100644
--- a/resources/lang/da/general.php
+++ b/resources/lang/da/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Tilbehør',
- 'activated' => 'Aktiveret',
+ 'activated' => 'Aktiveret',
'accessory' => 'Tilbehør',
- 'accessory_report' => 'Tilbehørsrapport',
+ 'accessory_report' => 'Tilbehørsrapport',
'action' => 'Handling',
'activity_report' => 'Aktivitetsrapport',
'address' => 'Addresse',
'admin' => 'Admin',
- 'add_seats' => 'Tilføjede pladser',
+ 'add_seats' => 'Tilføjede pladser',
'all_assets' => 'Alle aktiver',
'all' => 'Alle',
'archived' => 'Arkiveret',
@@ -40,9 +40,10 @@
'checkout' => 'Tjek Ud',
'city' => 'By',
'click_here' => 'Klik her',
- 'companies' => 'Selskaber',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Selskaber',
'company' => 'Selskab',
- 'component' => 'Komponent',
+ 'component' => 'Komponent',
'components' => 'Komponenter',
'complete' => 'Komplet',
'consumable' => 'forbrugsmateriale',
@@ -58,10 +59,10 @@
'custom_report' => 'Tilpasset Aktiv Rapport',
'dashboard' => 'Oversigtspanel',
'days' => 'dage',
- 'days_to_next_audit' => 'Dage til næste revision',
+ 'days_to_next_audit' => 'Dage til næste revision',
'date' => 'Dato',
'debug_warning' => 'Advarsel!',
- 'debug_warning_text' => 'Denne applikation kører i produktionstilstand med debugging aktiveret. Dette kan udsætte følsomme data, hvis din ansøgning er tilgængelig for omverdenen. Deaktiver fejlsøgningsmodus ved at indstille værdien APP_DEBUG
i din .env
fil til false
.',
+ 'debug_warning_text' => 'Denne applikation kører i produktionstilstand med debugging aktiveret. Dette kan udsætte følsomme data, hvis din ansøgning er tilgængelig for omverdenen. Deaktiver fejlsøgningsmodus ved at indstille værdien APP_DEBUG
i din .env
fil til false
.',
'delete' => 'Slet',
'deleted' => 'Slettet',
'delete_seats' => 'Slettede pladser',
@@ -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',
diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php
index f5d1839c25..b1be7f311f 100644
--- a/resources/lang/da/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/de/admin/hardware/message.php b/resources/lang/de/admin/hardware/message.php
index 1067b8a045..604f374df6 100644
--- a/resources/lang/de/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php
index 9ff7a2305b..a802dafed5 100644
--- a/resources/lang/de/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/de/admin/suppliers/message.php b/resources/lang/de/admin/suppliers/message.php
index e7bc9249a1..aa442b06dd 100644
--- a/resources/lang/de/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
index be25db9e55..a380835b14 100644
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Zubehör',
- 'activated' => 'Aktiviert',
+ 'activated' => 'Aktiviert',
'accessory' => 'Zubehör',
- 'accessory_report' => 'Zubehör Bericht',
+ 'accessory_report' => 'Zubehör Bericht',
'action' => 'Aktion',
'activity_report' => 'Aktivitätsreport',
'address' => 'Supplier Address',
'admin' => 'Administrator',
- 'add_seats' => 'Lizenzen hinzugefügt',
+ 'add_seats' => 'Lizenzen hinzugefügt',
'all_assets' => 'Alle Assets',
'all' => 'Alle',
'archived' => 'Archiviert',
@@ -40,9 +40,10 @@
'checkout' => 'Checkout Asset to User',
'city' => 'Stadt',
'click_here' => 'Hier klicken',
- 'companies' => 'Firmen',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Firmen',
'company' => 'Firma',
- 'component' => 'Komponente',
+ 'component' => 'Komponente',
'components' => 'Komponenten',
'complete' => 'Vollständig',
'consumable' => 'Verbrauchsmaterial',
@@ -58,10 +59,10 @@
'custom_report' => 'Spezieller Asset Report',
'dashboard' => 'Dashboard',
'days' => 'Tage',
- 'days_to_next_audit' => 'Tage bis zum nächsten Audit',
+ 'days_to_next_audit' => 'Tage bis zum nächsten Audit',
'date' => 'Purchase Date',
'debug_warning' => 'Warnung!',
- 'debug_warning_text' => 'Diese Anwendung läuft im Produktionsmodus mit debugging aktiviert. Dies kann sensible Daten verfügbar machen, wenn Ihre Anwendung öffentlich zugänglich ist. Deaktivieren Sie den Debug-Modus, indem Sie den APP_DEBUG
-Wert in der .env
Datei auf false
setzen.',
+ 'debug_warning_text' => 'Diese Anwendung läuft im Produktionsmodus mit debugging aktiviert. Dies kann sensible Daten verfügbar machen, wenn Ihre Anwendung öffentlich zugänglich ist. Deaktivieren Sie den Debug-Modus, indem Sie den APP_DEBUG
-Wert in der .env
Datei auf false
setzen.',
'delete' => 'Löschen',
'deleted' => 'Gelöscht',
'delete_seats' => 'Gelöschte Lizenzen',
@@ -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',
diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index addacc322b..75cf5ab86e 100644
--- a/resources/lang/de/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/el/admin/hardware/message.php b/resources/lang/el/admin/hardware/message.php
index bac44b8f3c..d8f3192d81 100644
--- a/resources/lang/el/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php
index 6572c934d1..835f87f6a6 100644
--- a/resources/lang/el/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/el/admin/suppliers/message.php b/resources/lang/el/admin/suppliers/message.php
index d72ab489d5..58372529b2 100644
--- a/resources/lang/el/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php
index df1a74435b..b1183de805 100644
--- a/resources/lang/el/general.php
+++ b/resources/lang/el/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Αξεσουάρ',
- 'activated' => 'Ενεργοποιήθηκε',
+ 'activated' => 'Ενεργοποιήθηκε',
'accessory' => 'Αξεσουάρ',
- 'accessory_report' => 'Αναφορά αξεσουάρ',
+ 'accessory_report' => 'Αναφορά αξεσουάρ',
'action' => 'Ενέργεια',
'activity_report' => 'Έκθεση Δραστηριότητας',
'address' => 'Διεύθυνση',
'admin' => 'Διαχειριστής',
- 'add_seats' => 'Προστέθηκαν θέσεις',
+ 'add_seats' => 'Προστέθηκαν θέσεις',
'all_assets' => 'Όλα τα περουσιακά στοιχεία',
'all' => 'Ολα',
'archived' => 'Αρχειοθετημένα',
@@ -40,9 +40,10 @@
'checkout' => 'Ολοκλήρωση αγοράς',
'city' => 'Πόλη',
'click_here' => 'Κάντε κλικ ΕΔΩ',
- 'companies' => 'Εταιρείες',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Εταιρείες',
'company' => 'Εταιρεία',
- 'component' => 'Συστατικό',
+ 'component' => 'Συστατικό',
'components' => 'Συστατικά',
'complete' => 'Πλήρης',
'consumable' => 'Καταναλώσιμος',
@@ -58,10 +59,10 @@
'custom_report' => 'Αναφορά προσαρμοσμένων στοιχείων ενεργητικού',
'dashboard' => 'Πίνακας ελέγχου',
'days' => 'ημέρες',
- 'days_to_next_audit' => 'Ημέρες έως επόμενο έλεγχο',
+ 'days_to_next_audit' => 'Ημέρες έως επόμενο έλεγχο',
'date' => 'Ημερομηνία',
'debug_warning' => 'Προσοχή!',
- 'debug_warning_text' => 'Αυτή η εφαρμογή εκτελείται σε λειτουργία παραγωγής με ενεργοποιημένο τον εντοπισμό σφαλμάτων. Αυτό μπορεί να εκθέσει τα ευαίσθητα δεδομένα, εάν η εφαρμογή σας είναι προσβάσιμη στον έξω κόσμο. Απενεργοποιήσετε την κατάσταση λειτουργίας εντοπισμού σφαλμάτων, ορίζοντας την τιμή APP_DEBUG
στο αρχείο .env
για να false
.',
+ 'debug_warning_text' => 'Αυτή η εφαρμογή εκτελείται σε λειτουργία παραγωγής με ενεργοποιημένο τον εντοπισμό σφαλμάτων. Αυτό μπορεί να εκθέσει τα ευαίσθητα δεδομένα, εάν η εφαρμογή σας είναι προσβάσιμη στον έξω κόσμο. Απενεργοποιήσετε την κατάσταση λειτουργίας εντοπισμού σφαλμάτων, ορίζοντας την τιμή APP_DEBUG
στο αρχείο .env
για να false
.',
'delete' => 'Διαγραφή',
'deleted' => 'Διαγράφηκε',
'delete_seats' => 'Διαγραμμένα καθίσματα',
@@ -89,6 +90,7 @@
'history' => 'Ιστορία',
'history_for' => 'Ιστορικό για',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Διαγραφή εικόνας',
'image_upload' => 'Μεταφόρτωση εικόνας',
'import' => 'Εισαγωγή',
diff --git a/resources/lang/el/validation.php b/resources/lang/el/validation.php
index c8ab2acd90..462e60f0cf 100644
--- a/resources/lang/el/validation.php
+++ b/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" => "Το χαρακτηριστικό: πρέπει να είναι μοναδικό.",
],
/*
diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php
index 112cf77ded..e087cad26f 100644
--- a/resources/lang/en-GB/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index ee169986cd..039d476279 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/en-GB/admin/suppliers/message.php b/resources/lang/en-GB/admin/suppliers/message.php
index df4bc41af3..cea332748f 100644
--- a/resources/lang/en-GB/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 6a375ecfaa..9dcdc5632d 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accessories',
- 'activated' => 'Activated',
+ 'activated' => 'Activated',
'accessory' => 'Accessory',
- 'accessory_report' => 'Accessory Report',
+ 'accessory_report' => 'Accessory Report',
'action' => 'Action',
'activity_report' => 'Activity Report',
'address' => 'Address',
'admin' => 'Admin',
- 'add_seats' => 'Added seats',
+ 'add_seats' => 'Added seats',
'all_assets' => 'All Assets',
'all' => 'All',
'archived' => 'Archived',
@@ -40,9 +40,10 @@
'checkout' => 'Checkout',
'city' => 'City',
'click_here' => 'Click here',
- 'companies' => 'Companies',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Companies',
'company' => 'Company',
- 'component' => 'Component',
+ 'component' => 'Component',
'components' => 'Components',
'complete' => 'Complete',
'consumable' => 'Consumable',
@@ -58,10 +59,10 @@
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
'days' => 'days',
- 'days_to_next_audit' => 'Days to Next Audit',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
- 'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG
value in your .env
file to false
.',
+ 'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG
value in your .env
file to false
.',
'delete' => 'Delete',
'deleted' => 'Deleted',
'delete_seats' => 'Deleted Seats',
@@ -89,6 +90,7 @@
'history' => 'History',
'history_for' => 'History for',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Delete Image',
'image_upload' => 'Upload Image',
'import' => 'Import',
diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
index 1e902ebbbd..ee4ecbda4c 100644
--- a/resources/lang/en-GB/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php
index 112cf77ded..e087cad26f 100644
--- a/resources/lang/en-ID/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 1beed4ea5e..63c3d473f0 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/en-ID/admin/suppliers/message.php b/resources/lang/en-ID/admin/suppliers/message.php
index df4bc41af3..cea332748f 100644
--- a/resources/lang/en-ID/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 669b5eae14..9a827e81b9 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accessories',
- 'activated' => 'Activated',
+ 'activated' => 'Activated',
'accessory' => 'Accessory',
- 'accessory_report' => 'Accessory Report',
+ 'accessory_report' => 'Accessory Report',
'action' => 'Action',
'activity_report' => 'Activity Report',
'address' => 'Address',
'admin' => 'Admin',
- 'add_seats' => 'Added seats',
+ 'add_seats' => 'Added seats',
'all_assets' => 'All Assets',
'all' => 'All',
'archived' => 'Archived',
@@ -40,9 +40,10 @@
'checkout' => 'Checkout',
'city' => 'City',
'click_here' => 'Click here',
- 'companies' => 'Companies',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Companies',
'company' => 'Company',
- 'component' => 'Component',
+ 'component' => 'Component',
'components' => 'Components',
'complete' => 'Complete',
'consumable' => 'Consumable',
@@ -58,10 +59,10 @@
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
'days' => 'days',
- 'days_to_next_audit' => 'Days to Next Audit',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
- 'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG
value in your .env
file to false
.',
+ 'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG
value in your .env
file to false
.',
'delete' => 'Delete',
'deleted' => 'Deleted',
'delete_seats' => 'Deleted Seats',
@@ -89,6 +90,7 @@
'history' => 'History',
'history_for' => 'History for',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Delete Image',
'image_upload' => 'Upload Image',
'import' => 'Import',
diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php
index 1e902ebbbd..ee4ecbda4c 100644
--- a/resources/lang/en-ID/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index 07f31d762d..b633f84be5 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index 1eab29f131..f0bad9367c 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/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>.',
+ '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',
diff --git a/resources/lang/es-CO/admin/suppliers/message.php b/resources/lang/es-CO/admin/suppliers/message.php
index ec02db501a..38b33553b7 100644
--- a/resources/lang/es-CO/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 3380703bd2..7beb8706c0 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accesorios',
- 'activated' => 'Activado',
+ 'activated' => 'Activado',
'accessory' => 'Accesorio',
- 'accessory_report' => 'Reporte de Accesorios',
+ 'accessory_report' => 'Reporte de Accesorios',
'action' => 'Acción',
'activity_report' => 'Reporte de Actividad',
'address' => 'Dirección',
'admin' => 'Admin',
- 'add_seats' => 'Sitios añadidos',
+ 'add_seats' => 'Sitios añadidos',
'all_assets' => 'Todos los Equipos',
'all' => 'Todos los',
'archived' => 'Archivado',
@@ -40,9 +40,10 @@
'checkout' => 'Asignar a un usuario',
'city' => 'Ciudad',
'click_here' => 'Pulsa aquí',
- 'companies' => 'Empresas',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Empresas',
'company' => 'Empresa',
- 'component' => 'Componente',
+ 'component' => 'Componente',
'components' => 'Componentes',
'complete' => 'Completo',
'consumable' => 'Consumible',
@@ -58,10 +59,10 @@
'custom_report' => 'Reporte de Equipos Personalizado',
'dashboard' => 'Tablero',
'days' => 'días',
- 'days_to_next_audit' => 'Días a la próxima auditoría',
+ 'days_to_next_audit' => 'Días a la próxima auditoría',
'date' => 'Fecha Compra',
'debug_warning' => '¡Advertencia!',
- 'debug_warning_text' => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor APP_DEBUG
en su archivo .env
a false
.',
+ 'debug_warning_text' => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor APP_DEBUG
en su archivo .env
a false
.',
'delete' => 'Borrar',
'deleted' => 'Borrado',
'delete_seats' => 'Asientos eliminados',
@@ -89,6 +90,7 @@
'history' => 'Historial',
'history_for' => 'Historial de',
'id' => 'Id',
+ 'image' => 'Image',
'image_delete' => 'Borrar imagen',
'image_upload' => 'Enviar imagen',
'import' => 'Importar',
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index baf35be067..8d0dd515dd 100644
--- a/resources/lang/es-CO/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php
index 07f31d762d..b633f84be5 100644
--- a/resources/lang/es-ES/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index 1eab29f131..f0bad9367c 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/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>.',
+ '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',
diff --git a/resources/lang/es-ES/admin/suppliers/message.php b/resources/lang/es-ES/admin/suppliers/message.php
index ec02db501a..38b33553b7 100644
--- a/resources/lang/es-ES/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 3380703bd2..7beb8706c0 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accesorios',
- 'activated' => 'Activado',
+ 'activated' => 'Activado',
'accessory' => 'Accesorio',
- 'accessory_report' => 'Reporte de Accesorios',
+ 'accessory_report' => 'Reporte de Accesorios',
'action' => 'Acción',
'activity_report' => 'Reporte de Actividad',
'address' => 'Dirección',
'admin' => 'Admin',
- 'add_seats' => 'Sitios añadidos',
+ 'add_seats' => 'Sitios añadidos',
'all_assets' => 'Todos los Equipos',
'all' => 'Todos los',
'archived' => 'Archivado',
@@ -40,9 +40,10 @@
'checkout' => 'Asignar a un usuario',
'city' => 'Ciudad',
'click_here' => 'Pulsa aquí',
- 'companies' => 'Empresas',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Empresas',
'company' => 'Empresa',
- 'component' => 'Componente',
+ 'component' => 'Componente',
'components' => 'Componentes',
'complete' => 'Completo',
'consumable' => 'Consumible',
@@ -58,10 +59,10 @@
'custom_report' => 'Reporte de Equipos Personalizado',
'dashboard' => 'Tablero',
'days' => 'días',
- 'days_to_next_audit' => 'Días a la próxima auditoría',
+ 'days_to_next_audit' => 'Días a la próxima auditoría',
'date' => 'Fecha Compra',
'debug_warning' => '¡Advertencia!',
- 'debug_warning_text' => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor APP_DEBUG
en su archivo .env
a false
.',
+ 'debug_warning_text' => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor APP_DEBUG
en su archivo .env
a false
.',
'delete' => 'Borrar',
'deleted' => 'Borrado',
'delete_seats' => 'Asientos eliminados',
@@ -89,6 +90,7 @@
'history' => 'Historial',
'history_for' => 'Historial de',
'id' => 'Id',
+ 'image' => 'Image',
'image_delete' => 'Borrar imagen',
'image_upload' => 'Enviar imagen',
'import' => 'Importar',
diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php
index baf35be067..8d0dd515dd 100644
--- a/resources/lang/es-ES/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/et/admin/hardware/message.php b/resources/lang/et/admin/hardware/message.php
index cc9a12ab86..bcb38015ea 100644
--- a/resources/lang/et/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/et/admin/settings/general.php b/resources/lang/et/admin/settings/general.php
index eff4e145ab..8f68552967 100644
--- a/resources/lang/et/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/et/admin/suppliers/message.php b/resources/lang/et/admin/suppliers/message.php
index ed27e6538f..db1a9997ec 100644
--- a/resources/lang/et/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php
index dcbae6e569..6bb002c16f 100644
--- a/resources/lang/et/general.php
+++ b/resources/lang/et/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Tarvikud',
- 'activated' => 'Aktiveeritud',
+ 'activated' => 'Aktiveeritud',
'accessory' => 'Tarvik',
- 'accessory_report' => 'Tarvikute aruanne',
+ 'accessory_report' => 'Tarvikute aruanne',
'action' => 'Tegevus',
'activity_report' => 'Tegevuste aruanne',
'address' => 'Aadress',
'admin' => 'Admin',
- 'add_seats' => 'Lisatud istekohad',
+ 'add_seats' => 'Lisatud istekohad',
'all_assets' => 'Kõik vahendid',
'all' => 'Kõik',
'archived' => 'Arhiveeritud',
@@ -40,9 +40,10 @@
'checkout' => 'Checkout',
'city' => 'Linn',
'click_here' => 'Kliki siia',
- 'companies' => 'Ettevõtted',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Ettevõtted',
'company' => 'Ettevõte',
- 'component' => 'Komponent',
+ 'component' => 'Komponent',
'components' => 'Komponendid',
'complete' => 'Tehtud',
'consumable' => 'Kulutatav',
@@ -58,10 +59,10 @@
'custom_report' => 'Kohandatud varade aruanne',
'dashboard' => 'Töölaud',
'days' => 'päeva',
- 'days_to_next_audit' => 'Päevad järgmise auditi juurde',
+ 'days_to_next_audit' => 'Päevad järgmise auditi juurde',
'date' => 'Kuupäev',
'debug_warning' => 'Hoiatus!',
- 'debug_warning_text' => 'See rakendus töötab tootmisrežiimis, kus silumisvõimalused on lubatud. See võib avaldada tundlikke andmeid, kui teie rakendus on välismaailmale juurdepääsetav. Keela debugrežiim, määrates APP_DEBUG
väärtuse oma .env
failis false
.',
+ 'debug_warning_text' => 'See rakendus töötab tootmisrežiimis, kus silumisvõimalused on lubatud. See võib avaldada tundlikke andmeid, kui teie rakendus on välismaailmale juurdepääsetav. Keela debugrežiim, määrates APP_DEBUG
väärtuse oma .env
failis false
.',
'delete' => 'Kustuta',
'deleted' => 'Kustutatud',
'delete_seats' => 'Kustutatud istmed',
@@ -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',
diff --git a/resources/lang/et/validation.php b/resources/lang/et/validation.php
index 683cc42c20..c05b20603c 100644
--- a/resources/lang/et/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/fa/admin/hardware/message.php b/resources/lang/fa/admin/hardware/message.php
index a31d9ad625..65516c7265 100644
--- a/resources/lang/fa/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php
index 0075819cf9..6d239ced0c 100644
--- a/resources/lang/fa/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/fa/admin/suppliers/message.php b/resources/lang/fa/admin/suppliers/message.php
index bea995dac5..b6dc9fd01d 100644
--- a/resources/lang/fa/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php
index 84deac62f5..938d2fd711 100644
--- a/resources/lang/fa/general.php
+++ b/resources/lang/fa/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'تجهیزات جانبی',
- 'activated' => 'فعال شد',
+ 'activated' => 'فعال شد',
'accessory' => 'لوازم جانبی',
- 'accessory_report' => 'گزارش لوازم جانبی',
+ 'accessory_report' => 'گزارش لوازم جانبی',
'action' => 'اقدام',
'activity_report' => 'گزارش فعالیت',
'address' => 'آدرس',
'admin' => 'مدیر',
- 'add_seats' => 'اضافه شدن صندلی',
+ 'add_seats' => 'اضافه شدن صندلی',
'all_assets' => 'تمام دارایی ها',
'all' => 'همه',
'archived' => 'بایگانی شد',
@@ -40,9 +40,10 @@
'checkout' => 'پرداخت',
'city' => 'شهر',
'click_here' => 'اینجا کلیک کنید',
- 'companies' => 'شرکت ها',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'شرکت ها',
'company' => 'شرکت',
- 'component' => 'کامپوننت',
+ 'component' => 'کامپوننت',
'components' => 'کامپوننت ها',
'complete' => 'تکمیل',
'consumable' => 'قابل مصرف',
@@ -59,10 +60,10 @@
',
'dashboard' => 'میز کار',
'days' => 'روزها',
- 'days_to_next_audit' => 'روز به حسابرسی بعدی',
+ 'days_to_next_audit' => 'روز به حسابرسی بعدی',
'date' => 'تاریخ',
'debug_warning' => 'هشدار!',
- 'debug_warning_text' => 'این برنامه در حالت تولید با استفاده از اشکال زدایی فعال است. این می تواند اطلاعات حساس را در صورت درخواست شما برای جهان خارج در دسترس قرار دهد. با تنظیم مقداری APP_DEBUG
در .env
فایل خود را به false
غیرفعال کنید.',
+ 'debug_warning_text' => 'این برنامه در حالت تولید با استفاده از اشکال زدایی فعال است. این می تواند اطلاعات حساس را در صورت درخواست شما برای جهان خارج در دسترس قرار دهد. با تنظیم مقداری APP_DEBUG
در .env
فایل خود را به false
غیرفعال کنید.',
'delete' => 'حذف',
'deleted' => 'حذف شد',
'delete_seats' => 'صندلی ها حذف شده
@@ -91,6 +92,7 @@
'history' => 'پيشينه',
'history_for' => 'پیشینه برای ',
'id' => 'شناسه',
+ 'image' => 'Image',
'image_delete' => 'عکس های پاک شده',
'image_upload' => 'آپلود تصویر',
'import' => 'واردات',
diff --git a/resources/lang/fa/validation.php b/resources/lang/fa/validation.php
index bd6c7a805a..972f6b82c0 100644
--- a/resources/lang/fa/validation.php
+++ b/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 باید منحصر به فرد باشد.",
],
/*
diff --git a/resources/lang/fi/admin/hardware/message.php b/resources/lang/fi/admin/hardware/message.php
index 412f4c0e18..9229ca36c2 100644
--- a/resources/lang/fi/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php
index 0c18852e65..326469e8b6 100644
--- a/resources/lang/fi/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/fi/admin/suppliers/message.php b/resources/lang/fi/admin/suppliers/message.php
index 40ae2d71a0..0f0a6af33e 100644
--- a/resources/lang/fi/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php
index d2c2977d4d..06c19ddd2c 100644
--- a/resources/lang/fi/general.php
+++ b/resources/lang/fi/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Lisätarvikkeet',
- 'activated' => 'Aktivoitu',
+ 'activated' => 'Aktivoitu',
'accessory' => 'lisävaruste',
- 'accessory_report' => 'Lisävarusteluettelo',
+ 'accessory_report' => 'Lisävarusteluettelo',
'action' => 'Toiminto',
'activity_report' => 'Toimintakertomus',
'address' => 'Osoite',
'admin' => 'Ylläpitäjä',
- 'add_seats' => 'Lisäistuimia',
+ 'add_seats' => 'Lisäistuimia',
'all_assets' => 'Kaikki Laitteet',
'all' => 'Kaikki',
'archived' => 'Arkistoitu',
@@ -40,9 +40,10 @@
'checkout' => 'Luovuta',
'city' => 'Kaupunki',
'click_here' => 'Klikkaa tästä',
- 'companies' => 'Yritykset',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Yritykset',
'company' => 'Yritys',
- 'component' => 'Komponentti',
+ 'component' => 'Komponentti',
'components' => 'Komponentit',
'complete' => 'Saattaa loppuun',
'consumable' => 'kuluvia',
@@ -58,10 +59,10 @@
'custom_report' => 'Muokattu Laiteraportti',
'dashboard' => 'Hallintasivu',
'days' => 'päivää',
- 'days_to_next_audit' => 'Päivää seuraavaan tarkastukseen',
+ 'days_to_next_audit' => 'Päivää seuraavaan tarkastukseen',
'date' => 'Päivä',
'debug_warning' => 'Varoitus!',
- 'debug_warning_text' => 'Tämä sovellus on käynnissä tuotantotilassa, jossa virheenkorjaus on käytössä. Tämä voi paljastaa arkaluonteisia tietoja, jos sovellus on ulkomaailman käytettävissä. Poista debug-tilan käytöstä asettamalla APP_DEBUG
-arvo .env
-tiedostoosi false
.',
+ 'debug_warning_text' => 'Tämä sovellus on käynnissä tuotantotilassa, jossa virheenkorjaus on käytössä. Tämä voi paljastaa arkaluonteisia tietoja, jos sovellus on ulkomaailman käytettävissä. Poista debug-tilan käytöstä asettamalla APP_DEBUG
-arvo .env
-tiedostoosi false
.',
'delete' => 'Poista',
'deleted' => 'Poistettu',
'delete_seats' => 'Poistetut istuimet',
@@ -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',
diff --git a/resources/lang/fi/validation.php b/resources/lang/fi/validation.php
index e974b7ea7d..8d706e1723 100644
--- a/resources/lang/fi/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/fr/admin/hardware/message.php b/resources/lang/fr/admin/hardware/message.php
index 1b093a4548..2de7706e57 100644
--- a/resources/lang/fr/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php
index c81d746b3b..6e7e71da18 100644
--- a/resources/lang/fr/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/fr/admin/suppliers/message.php b/resources/lang/fr/admin/suppliers/message.php
index 5365252b6f..f9651ec468 100644
--- a/resources/lang/fr/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php
index 82590f878b..0689654b91 100644
--- a/resources/lang/fr/general.php
+++ b/resources/lang/fr/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accessoires',
- 'activated' => 'Activé',
+ 'activated' => 'Activé',
'accessory' => 'Accessoire',
- 'accessory_report' => 'Rapport sur les accessoires',
+ 'accessory_report' => 'Rapport sur les accessoires',
'action' => 'Action',
'activity_report' => 'Rapport d\'activité',
'address' => 'Adresse',
'admin' => 'Admin',
- 'add_seats' => 'Places ajoutées',
+ 'add_seats' => 'Places ajoutées',
'all_assets' => 'Tous les actifs',
'all' => 'Tous',
'archived' => 'Retiré',
@@ -40,9 +40,10 @@
'checkout' => 'Associer',
'city' => 'Ville',
'click_here' => 'Cliquez ici',
- 'companies' => 'Compagnies',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Compagnies',
'company' => 'Compagnie',
- 'component' => 'Composant',
+ 'component' => 'Composant',
'components' => 'Composants',
'complete' => 'Terminé',
'consumable' => 'Fourniture',
@@ -58,10 +59,10 @@
'custom_report' => 'Rapport d\'actif personnalisé',
'dashboard' => 'Tableau de bord',
'days' => 'journées',
- 'days_to_next_audit' => 'Jours avant la prochaine vérification',
+ 'days_to_next_audit' => 'Jours avant la prochaine vérification',
'date' => 'Date',
'debug_warning' => 'Attention !',
- 'debug_warning_text' => 'Cette application fonctionne en mode de production avec le débogage activé. Cela peut exposer des données sensibles si votre application est accessible au monde extérieur. Désactivez le mode de débogage en définissant la valeur APP_DEBUG code> dans votre fichier .env code> sur false code>.',
+ 'debug_warning_text' => 'Cette application fonctionne en mode de production avec le débogage activé. Cela peut exposer des données sensibles si votre application est accessible au monde extérieur. Désactivez le mode de débogage en définissant la valeur APP_DEBUG code> dans votre fichier .env code> sur false code>.',
'delete' => 'Supprimer',
'deleted' => 'Supprimé',
'delete_seats' => 'Places supprimées',
@@ -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',
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 6d8d13cfc5..c97268322b 100644
--- a/resources/lang/fr/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/ga-IE/admin/hardware/message.php b/resources/lang/ga-IE/admin/hardware/message.php
index 9298fe1053..f8a7ff5f94 100644
--- a/resources/lang/ga-IE/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index 33e067b10e..0cdc3f63ba 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/ga-IE/admin/suppliers/message.php b/resources/lang/ga-IE/admin/suppliers/message.php
index d1bc39c859..a6d944d663 100644
--- a/resources/lang/ga-IE/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index b8179412ce..78f23862a7 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accessories',
- 'activated' => 'Gníomhachtaithe',
+ 'activated' => 'Gníomhachtaithe',
'accessory' => 'Cúlpháirtí',
- 'accessory_report' => 'Tuarascáil Cúlpháirtí',
+ 'accessory_report' => 'Tuarascáil Cúlpháirtí',
'action' => 'Gníomh',
'activity_report' => 'Tuarascáil Ghníomhaíochta',
'address' => 'Seoladh',
'admin' => 'Riarachán',
- 'add_seats' => 'Suíocháin breise',
+ 'add_seats' => 'Suíocháin breise',
'all_assets' => 'Gach Sócmhainn',
'all' => 'Gach',
'archived' => 'Archived',
@@ -40,9 +40,10 @@
'checkout' => 'Seiceáil',
'city' => 'Cathair',
'click_here' => 'Cliceáil anseo',
- 'companies' => 'Cuideachtaí',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Cuideachtaí',
'company' => 'Cuideachta',
- 'component' => 'Comhpháirt',
+ 'component' => 'Comhpháirt',
'components' => 'Comhpháirteanna',
'complete' => 'Comhlánaigh',
'consumable' => 'Inchaite',
@@ -58,10 +59,10 @@
'custom_report' => 'Tuarascáil Sócmhainní Custaim',
'dashboard' => 'Painéal',
'days' => 'lá',
- 'days_to_next_audit' => 'Laethanta go dtí an chéad Iniúchadh',
+ 'days_to_next_audit' => 'Laethanta go dtí an chéad Iniúchadh',
'date' => 'Dáta',
'debug_warning' => 'Rabhadh!',
- 'debug_warning_text' => 'Tá an t-iarratas seo á reáchtáil i mód táirgthe le cumas dífhabhtaithe. Féadfaidh sé seo sonraí íogaire a nochtadh má tá do iarratas inrochtana don domhan lasmuigh. Díchumasaigh an modh dífhabhtaithe trí luachanna APP_DEBUG
a leagan amach i do chomhad .env
chuig false
.',
+ 'debug_warning_text' => 'Tá an t-iarratas seo á reáchtáil i mód táirgthe le cumas dífhabhtaithe. Féadfaidh sé seo sonraí íogaire a nochtadh má tá do iarratas inrochtana don domhan lasmuigh. Díchumasaigh an modh dífhabhtaithe trí luachanna APP_DEBUG
a leagan amach i do chomhad .env
chuig false
.',
'delete' => 'Scrios',
'deleted' => 'Scriosta',
'delete_seats' => 'Suíocháin Scriosta',
@@ -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',
diff --git a/resources/lang/ga-IE/validation.php b/resources/lang/ga-IE/validation.php
index 8bfd9b4f77..63a2bb7ad3 100644
--- a/resources/lang/ga-IE/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/he/admin/hardware/message.php b/resources/lang/he/admin/hardware/message.php
index dad88974cd..64c8ac22d3 100644
--- a/resources/lang/he/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php
index 2a7668283c..79b1ee9b94 100644
--- a/resources/lang/he/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/he/admin/suppliers/message.php b/resources/lang/he/admin/suppliers/message.php
index af9c07f085..3df2684ff7 100644
--- a/resources/lang/he/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php
index c41e1e67c2..f3e30d4bf9 100644
--- a/resources/lang/he/general.php
+++ b/resources/lang/he/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'אביזרים',
- 'activated' => 'מוּפעָל',
+ 'activated' => 'מוּפעָל',
'accessory' => 'אבזר',
- 'accessory_report' => 'דוח אביזר',
+ 'accessory_report' => 'דוח אביזר',
'action' => 'פעולה',
'activity_report' => 'דוח פעילות',
'address' => 'כתובת',
'admin' => 'מנהל מערכת',
- 'add_seats' => 'מושבים נוספים',
+ 'add_seats' => 'מושבים נוספים',
'all_assets' => 'כל הנכסים',
'all' => 'את כל',
'archived' => 'בארכיון',
@@ -40,9 +40,10 @@
'checkout' => 'לבדוק',
'city' => 'עִיר',
'click_here' => 'לחץ כאן',
- 'companies' => 'חברות',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'חברות',
'company' => 'חֶברָה',
- 'component' => 'רְכִיב',
+ 'component' => 'רְכִיב',
'components' => 'רכיבים',
'complete' => 'לְהַשְׁלִים',
'consumable' => 'מתכלים',
@@ -58,10 +59,10 @@
'custom_report' => 'דוח נכס מותאם אישית',
'dashboard' => 'לוּחַ מַחווָנִים',
'days' => 'ימים',
- 'days_to_next_audit' => 'ימים לביקורת',
+ 'days_to_next_audit' => 'ימים לביקורת',
'date' => 'תַאֲרִיך',
'debug_warning' => 'אַזהָרָה!',
- 'debug_warning_text' => 'יישום זה פועל במצב ייצור עם איתור באגים. זה יכול לחשוף נתונים רגישים אם היישום שלך נגיש לעולם החיצון. השבת את מצב איתור הבאגים על ידי הגדרת הערך APP_DEBUG
בקובץ .env
ל false
.',
+ 'debug_warning_text' => 'יישום זה פועל במצב ייצור עם איתור באגים. זה יכול לחשוף נתונים רגישים אם היישום שלך נגיש לעולם החיצון. השבת את מצב איתור הבאגים על ידי הגדרת הערך APP_DEBUG
בקובץ .env
ל false
.',
'delete' => 'לִמְחוֹק',
'deleted' => 'נמחק',
'delete_seats' => 'מושבים שנמחקו',
@@ -89,6 +90,7 @@
'history' => 'הִיסטוֹרִיָה',
'history_for' => 'היסטוריה עבור',
'id' => 'תְעוּדַת זֶהוּת',
+ 'image' => 'Image',
'image_delete' => 'מחק תמונה',
'image_upload' => 'העלאת תמונה',
'import' => 'יְבוּא',
diff --git a/resources/lang/he/validation.php b/resources/lang/he/validation.php
index 4f96dbe755..f0f3d29d91 100644
--- a/resources/lang/he/validation.php
+++ b/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" => "התכונה: חייבת להיות ייחודית.",
],
/*
diff --git a/resources/lang/hr/admin/hardware/message.php b/resources/lang/hr/admin/hardware/message.php
index 2c6044f663..0fd2a6b5a2 100644
--- a/resources/lang/hr/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php
index 81d1cff153..b93b6a6098 100644
--- a/resources/lang/hr/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/hr/admin/suppliers/message.php b/resources/lang/hr/admin/suppliers/message.php
index 6da70495dc..fe0f6be216 100644
--- a/resources/lang/hr/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php
index 7a6eeb2f50..ea8a279da2 100644
--- a/resources/lang/hr/general.php
+++ b/resources/lang/hr/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Pribor',
- 'activated' => 'aktiviran',
+ 'activated' => 'aktiviran',
'accessory' => 'Oprema',
- 'accessory_report' => 'Izvješće o dodatku',
+ 'accessory_report' => 'Izvješće o dodatku',
'action' => 'Akcijski',
'activity_report' => 'Izvješće o aktivnostima',
'address' => 'Adresa',
'admin' => 'Admin',
- 'add_seats' => 'Dodana mjesta',
+ 'add_seats' => 'Dodana mjesta',
'all_assets' => 'Sve imovine',
'all' => 'svi',
'archived' => 'Arhivirano',
@@ -40,9 +40,10 @@
'checkout' => 'Provjeri',
'city' => 'Grad',
'click_here' => 'Kliknite ovdje',
- 'companies' => 'Tvrtke',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Tvrtke',
'company' => 'Društvo',
- 'component' => 'sastavni dio',
+ 'component' => 'sastavni dio',
'components' => 'komponente',
'complete' => 'potpun',
'consumable' => 'potrošni',
@@ -58,10 +59,10 @@
'custom_report' => 'Prilagođeno izvješće o aktivi',
'dashboard' => 'kontrolna ploča',
'days' => 'dana',
- 'days_to_next_audit' => 'Dani za sljedeću reviziju',
+ 'days_to_next_audit' => 'Dani za sljedeću reviziju',
'date' => 'Datum',
'debug_warning' => 'Upozorenje!',
- 'debug_warning_text' => 'Ova se aplikacija izvodi u načinu rada s omogućenim uklanjanjem pogrešaka. To može otkriti osjetljive podatke ako je aplikacija dostupna vanjskom svijetu. Onemogućite način otklanjanja pogrešaka postavljanjem vrijednosti APP_DEBUG
u .env
datoteci na false
.',
+ 'debug_warning_text' => 'Ova se aplikacija izvodi u načinu rada s omogućenim uklanjanjem pogrešaka. To može otkriti osjetljive podatke ako je aplikacija dostupna vanjskom svijetu. Onemogućite način otklanjanja pogrešaka postavljanjem vrijednosti APP_DEBUG
u .env
datoteci na false
.',
'delete' => 'Izbrisati',
'deleted' => 'izbrisana',
'delete_seats' => 'Izbrisana mjesta',
@@ -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',
diff --git a/resources/lang/hr/validation.php b/resources/lang/hr/validation.php
index cd35d885b6..229b37b757 100644
--- a/resources/lang/hr/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/hu/admin/hardware/message.php b/resources/lang/hu/admin/hardware/message.php
index bcbcb31976..16ba7841a0 100644
--- a/resources/lang/hu/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php
index 2d45d47e41..a3eecfeb22 100644
--- a/resources/lang/hu/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/hu/admin/suppliers/message.php b/resources/lang/hu/admin/suppliers/message.php
index cc889e91e0..66c095401f 100644
--- a/resources/lang/hu/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php
index 1ba42738ad..6913c20d4c 100644
--- a/resources/lang/hu/general.php
+++ b/resources/lang/hu/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Tartozékok',
- 'activated' => 'Aktivált',
+ 'activated' => 'Aktivált',
'accessory' => 'Tartozék',
- 'accessory_report' => 'Tartozék riport',
+ 'accessory_report' => 'Tartozék riport',
'action' => 'Művelet',
'activity_report' => 'Tevékenység riport',
'address' => 'Cím',
'admin' => 'Admin',
- 'add_seats' => 'Hozzáadott ülések',
+ 'add_seats' => 'Hozzáadott ülések',
'all_assets' => 'Összes eszköz',
'all' => 'Mind',
'archived' => 'Archivált',
@@ -40,9 +40,10 @@
'checkout' => 'Kiadás',
'city' => 'Város',
'click_here' => 'Kattints ide',
- 'companies' => 'Cégek',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Cégek',
'company' => 'Cég',
- 'component' => 'Alkatrész',
+ 'component' => 'Alkatrész',
'components' => 'Alkatrészek',
'complete' => 'teljes',
'consumable' => 'Fogyóeszköz',
@@ -58,10 +59,10 @@
'custom_report' => 'Egyedi eszköz riport',
'dashboard' => 'Irányítópult',
'days' => 'napok',
- 'days_to_next_audit' => 'Napok a következő ellenőrzéshez',
+ 'days_to_next_audit' => 'Napok a következő ellenőrzéshez',
'date' => 'Dátum',
'debug_warning' => 'Figyelem!',
- 'debug_warning_text' => 'Ez az alkalmazás gyártási módban fut, a hibakeresés engedélyezve. Ez érzékeny adatokat tárhat fel, ha az alkalmazás elérhető a külvilág számára. A hibakeresési mód letiltása a APP_DEBUG
érték .env
fájlban történő false
fájlban történő beállításával.',
+ 'debug_warning_text' => 'Ez az alkalmazás gyártási módban fut, a hibakeresés engedélyezve. Ez érzékeny adatokat tárhat fel, ha az alkalmazás elérhető a külvilág számára. A hibakeresési mód letiltása a APP_DEBUG
érték .env
fájlban történő false
fájlban történő beállításával.',
'delete' => 'Törlés',
'deleted' => 'Törölve',
'delete_seats' => 'Törölt elemek',
@@ -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',
diff --git a/resources/lang/hu/validation.php b/resources/lang/hu/validation.php
index 60554dd264..34ea1270f1 100644
--- a/resources/lang/hu/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/id/admin/hardware/message.php b/resources/lang/id/admin/hardware/message.php
index e1f46f67ef..6a881afed9 100644
--- a/resources/lang/id/admin/hardware/message.php
+++ b/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(
diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php
index a955a4bc61..6389493b91 100644
--- a/resources/lang/id/admin/settings/general.php
+++ b/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',
diff --git a/resources/lang/id/admin/suppliers/message.php b/resources/lang/id/admin/suppliers/message.php
index 6b6619f90d..127d7f7bb8 100644
--- a/resources/lang/id/admin/suppliers/message.php
+++ b/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. ',
)
);
diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php
index 8dd86f2e67..8ab2631aa1 100644
--- a/resources/lang/id/general.php
+++ b/resources/lang/id/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Aksesoris',
- 'activated' => 'Diaktifkan',
+ 'activated' => 'Diaktifkan',
'accessory' => 'Aksesori',
- 'accessory_report' => 'Laporan aksesori',
+ 'accessory_report' => 'Laporan aksesori',
'action' => 'Tindakan',
'activity_report' => 'Laporan kegiatan',
'address' => 'Alamat',
'admin' => 'Admin',
- 'add_seats' => 'Tambahan hak',
+ 'add_seats' => 'Tambahan hak',
'all_assets' => 'Semua aset',
'all' => 'Semua',
'archived' => 'Diarsipkan',
@@ -40,9 +40,10 @@
'checkout' => 'Check-out',
'city' => 'Kota',
'click_here' => 'Klik disini',
- 'companies' => 'Perusahaan',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Perusahaan',
'company' => 'Perusahaan',
- 'component' => 'Komponen',
+ 'component' => 'Komponen',
'components' => 'Komponen',
'complete' => 'Lengkap',
'consumable' => 'Barang Habis Pakai',
@@ -58,10 +59,10 @@
'custom_report' => 'Laporan kustom aset',
'dashboard' => 'Dashboard',
'days' => 'hari',
- 'days_to_next_audit' => 'Hari ke Audit Berikutnya',
+ 'days_to_next_audit' => 'Hari ke Audit Berikutnya',
'date' => 'Tanggal',
'debug_warning' => 'PERINGATAN!',
- 'debug_warning_text' => 'Aplikasi ini berjalan dalam mode produksi dengan debugging diaktifkan. Hal ini dapat mengekspos data sensitif jika aplikasi Anda dapat diakses oleh dunia luar. Nonaktifkan mode debug dengan menetapkan nilai APP_DEBUG
di file .env
Anda ke false
.',
+ 'debug_warning_text' => 'Aplikasi ini berjalan dalam mode produksi dengan debugging diaktifkan. Hal ini dapat mengekspos data sensitif jika aplikasi Anda dapat diakses oleh dunia luar. Nonaktifkan mode debug dengan menetapkan nilai APP_DEBUG
di file .env
Anda ke false
.',
'delete' => 'Hapus',
'deleted' => 'Dihapus',
'delete_seats' => 'Lisensi di hapus',
@@ -89,6 +90,7 @@
'history' => 'Riwayat',
'history_for' => 'Riwayat untuk',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Menghapus gambar',
'image_upload' => 'Unggah gambar',
'import' => 'Impor',
diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php
index a9795b8043..5a35b430a8 100644
--- a/resources/lang/id/validation.php
+++ b/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.",
],
/*
diff --git a/resources/lang/it/admin/hardware/message.php b/resources/lang/it/admin/hardware/message.php
index ea492dedf5..6359fac544 100644
--- a/resources/lang/it/admin/hardware/message.php
+++ b/resources/lang/it/admin/hardware/message.php
@@ -62,7 +62,8 @@ return array(
'error' => 'Il bene non è stato estratto, per favore riprova',
'success' => 'Il bene è stato estratto con successo.',
'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
- 'not_available' => 'Questo prodotto non è disponibile per il checkout!'
+ 'not_available' => 'Questo prodotto non è disponibile per il checkout!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php
index 63256d6c43..d42e6bbe57 100644
--- a/resources/lang/it/admin/settings/general.php
+++ b/resources/lang/it/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Inserire il testo "DELETE" nel campo di seguito per eliminare i tuoi record cancellati. Quest\'operazione non può essere annullata.',
'custom_css' => 'CSS Personalizzato',
'custom_css_help' => 'Inserisci qualsiasi CSS personalizzato che vuoi utilizzare. 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' => 'Valuta predefinita',
'default_eula_text' => 'EULA Predefinita',
'default_language' => 'Lingua predefinita',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP abilitato',
'ldap_integration' => 'Integrazione LDAP',
'ldap_settings' => 'Impostazioni 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' => 'Server LDAP',
'ldap_server_help' => 'Questo dovrebbe iniziare con ldap: // (per unencrypted o TLS) o ldaps: // (per SSL)',
'ldap_server_cert' => 'Validazione certificato SSL di LDAP',
diff --git a/resources/lang/it/admin/suppliers/message.php b/resources/lang/it/admin/suppliers/message.php
index 8f5e68abf0..ed31f9cc2d 100644
--- a/resources/lang/it/admin/suppliers/message.php
+++ b/resources/lang/it/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Il fornitore non esiste.',
- 'assoc_users' => 'Questo fornitore è attualmente associata ad almeno un modello e non può essere eliminato. Si prega di aggiornare i modelli di riferimento riprovare. ',
+
'create' => array(
'error' => 'Il fornitore non è stato creato, si prega di riprovare.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Sei sicuro di voler cancellare questo fornitore?',
'error' => 'C\'è stato un problema nell\'eliminazione del fornitore. Riprova.',
- 'success' => 'Fornitore eliminato con successo.'
+ 'success' => 'Fornitore eliminato con successo.',
+ 'assoc_assets' => 'Questo fornitore è attualmente associato ad almeno un modello e non può essere eliminato. Si prega di aggiornare i modelli di riferimento e riprovare.',
+ '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. ',
)
);
diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php
index 43fafd0ea1..b55684d4d3 100644
--- a/resources/lang/it/general.php
+++ b/resources/lang/it/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accessori',
- 'activated' => 'Attivato',
+ 'activated' => 'Attivato',
'accessory' => 'Accessorio',
- 'accessory_report' => 'Rapporto sugli Accessori',
+ 'accessory_report' => 'Rapporto sugli Accessori',
'action' => 'Azione',
'activity_report' => 'Rapporto sull\'attività',
'address' => 'Indirizzo',
'admin' => 'Amministratore',
- 'add_seats' => 'Aggiunti posti',
+ 'add_seats' => 'Aggiunti posti',
'all_assets' => 'Tutti gli Asset',
'all' => 'Tutti',
'archived' => 'Archiviato',
@@ -40,9 +40,10 @@
'checkout' => 'Scarica',
'city' => 'Città',
'click_here' => 'Clicca qui',
- 'companies' => 'Aziende',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Aziende',
'company' => 'Azienda',
- 'component' => 'Componente',
+ 'component' => 'Componente',
'components' => 'Componenti',
'complete' => 'Completare',
'consumable' => 'Consumabile',
@@ -58,10 +59,10 @@
'custom_report' => 'Report assets personalizzato',
'dashboard' => 'Pannello amministrativo',
'days' => 'giorni',
- 'days_to_next_audit' => 'Giorni per il controllo successivo',
+ 'days_to_next_audit' => 'Giorni per il controllo successivo',
'date' => 'Data',
'debug_warning' => 'Avvertimento!',
- 'debug_warning_text' => 'Questa applicazione è in esecuzione in modalità di produzione con il debug abilitato. Questo può esporre dati sensibili se l\'applicazione è accessibile al mondo esterno. Disabilitare la modalità di debug impostando il valore APP_DEBUG
nel file .env
a false
.',
+ 'debug_warning_text' => 'Questa applicazione è in esecuzione in modalità di produzione con il debug abilitato. Questo può esporre dati sensibili se l\'applicazione è accessibile al mondo esterno. Disabilitare la modalità di debug impostando il valore APP_DEBUG
nel file .env
a false
.',
'delete' => 'elimina',
'deleted' => 'Eliminata',
'delete_seats' => 'Posti Cancellati',
@@ -89,6 +90,7 @@
'history' => 'Storia',
'history_for' => 'Cronologia',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Cancella l\'Immagine',
'image_upload' => 'Carica immagine',
'import' => 'Importa',
diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php
index dbb338ee91..ccd68f6888 100644
--- a/resources/lang/it/validation.php
+++ b/resources/lang/it/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'L\' :attribute è già stato preso.',
'uploaded' => 'L\'attributo: non è riuscito a caricare.',
'url' => 'Il formato dell\' :attribute è invalido.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "La tua password corrente non è corretta",
'dumbpwd' => 'Quella password è troppo comune.',
"statuslabel_type" => "È necessario selezionare un tipo di etichetta di stato valido",
- "unique_undeleted" => "L'attributo: deve essere univoco.",
],
/*
diff --git a/resources/lang/ja/admin/hardware/message.php b/resources/lang/ja/admin/hardware/message.php
index ad3e5ab432..c33328cfbe 100644
--- a/resources/lang/ja/admin/hardware/message.php
+++ b/resources/lang/ja/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(
diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php
index 468fa4734c..12585ec56e 100644
--- a/resources/lang/ja/admin/settings/general.php
+++ b/resources/lang/ja/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 を使用開始 ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
'ldap_server_cert' => 'LDAP SSL 認証',
diff --git a/resources/lang/ja/admin/suppliers/message.php b/resources/lang/ja/admin/suppliers/message.php
index ae73e75320..09e9ca27b3 100644
--- a/resources/lang/ja/admin/suppliers/message.php
+++ b/resources/lang/ja/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' => 'この仕入先は現在:asset_count個の資産に関連付けされているため削除できません。この仕入先を参照しないように更新した上で、もう一度試して下さい。 ',
+ 'assoc_licenses' => 'この仕入先は現在:licences_count個のライセンスに関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ',
+ 'assoc_maintenances' => 'この仕入先は現在:asset_maintenances_count個の資産管理に関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ',
)
);
diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php
index fa0a3b6b3b..e479007a3d 100644
--- a/resources/lang/ja/general.php
+++ b/resources/lang/ja/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => '付属品',
- 'activated' => 'アクティベート',
+ 'activated' => 'アクティベート',
'accessory' => '付属品',
- 'accessory_report' => '付属品レポート',
+ 'accessory_report' => '付属品レポート',
'action' => '操作',
'activity_report' => '操作レポート',
'address' => '住所',
'admin' => '管理',
- 'add_seats' => 'シートを追加',
+ 'add_seats' => 'シートを追加',
'all_assets' => '全ての資産',
'all' => 'All',
'archived' => 'アーカイブ',
@@ -40,9 +40,10 @@
'checkout' => 'チェックアウト',
'city' => '市区町村',
'click_here' => 'ここをクリック',
- 'companies' => '所属',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => '所属',
'company' => '所属',
- 'component' => '構成部品',
+ 'component' => '構成部品',
'components' => '構成部品',
'complete' => '成功',
'consumable' => '消耗品',
@@ -58,10 +59,10 @@
'custom_report' => '資産レポートをカスタム',
'dashboard' => 'ダッシュボード',
'days' => '日間',
- 'days_to_next_audit' => '次の監査日',
+ 'days_to_next_audit' => '次の監査日',
'date' => '日付',
'debug_warning' => '警告!',
- 'debug_warning_text' => 'このアプリケーションはデバッグモードがONのままプロダクションモードで実行されています。もしアプリケーションが外部からアクセス可能な場合、機密データが抜き取られる可能性があります。.env
のAPP_DEBUG
をfalse
にしてください。',
+ 'debug_warning_text' => 'このアプリケーションはデバッグモードがONのままプロダクションモードで実行されています。もしアプリケーションが外部からアクセス可能な場合、機密データが抜き取られる可能性があります。.env
のAPP_DEBUG
をfalse
にしてください。',
'delete' => '削除',
'deleted' => '削除しました。',
'delete_seats' => 'ライセンスを削除',
@@ -89,6 +90,7 @@
'history' => '履歴',
'history_for' => '履歴',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => '画像を削除',
'image_upload' => '画像をアップロード',
'import' => 'インポート',
diff --git a/resources/lang/ja/validation.php b/resources/lang/ja/validation.php
index db4655355c..7ed90eec5d 100644
--- a/resources/lang/ja/validation.php
+++ b/resources/lang/ja/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute は、取得済みです。',
'uploaded' => ':attribute のアップロードに失敗しました。',
'url' => ':attribute フォーマットが不正です。',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "現在のパスワードが正しくありません。",
'dumbpwd' => 'そのパスワードはあまりにも脆弱です。',
"statuslabel_type" => "有効なステータスラベルの種類を選択する必要があります。",
- "unique_undeleted" => ":attribute は 一意の値である必要があります。",
],
/*
diff --git a/resources/lang/ko/admin/hardware/message.php b/resources/lang/ko/admin/hardware/message.php
index 96c43160a1..1ad74f778b 100644
--- a/resources/lang/ko/admin/hardware/message.php
+++ b/resources/lang/ko/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(
diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php
index 39a65ee5d2..5492469ada 100644
--- a/resources/lang/ko/admin/settings/general.php
+++ b/resources/lang/ko/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' => '기본 사용권 계약',
'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' => '이것은 (복호화또는 TLS 용) ldap로 시작합니다:// 또는 (SSL용) ldaps://',
'ldap_server_cert' => 'LDAP SSL 인증서 확인',
diff --git a/resources/lang/ko/admin/suppliers/message.php b/resources/lang/ko/admin/suppliers/message.php
index 6a995e4a14..a4676acb26 100644
--- a/resources/lang/ko/admin/suppliers/message.php
+++ b/resources/lang/ko/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. ',
)
);
diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php
index db9693c9c4..08553e2482 100644
--- a/resources/lang/ko/general.php
+++ b/resources/lang/ko/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => '부속품들',
- 'activated' => '활성화',
+ 'activated' => '활성화',
'accessory' => '부속품',
- 'accessory_report' => '부속품 보고서',
+ 'accessory_report' => '부속품 보고서',
'action' => '작업',
'activity_report' => '활동 보고서',
'address' => '주소',
'admin' => '관리자',
- 'add_seats' => '추가한 Seat',
+ 'add_seats' => '추가한 Seat',
'all_assets' => '모든 자산들',
'all' => '전체',
'archived' => '보관됨',
@@ -40,9 +40,10 @@
'checkout' => '반출',
'city' => '시',
'click_here' => '여기를 클릭',
- 'companies' => '회사들',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => '회사들',
'company' => '회사',
- 'component' => '구성 요소',
+ 'component' => '구성 요소',
'components' => '구성 요소',
'complete' => '완료',
'consumable' => '소모품',
@@ -58,10 +59,10 @@
'custom_report' => '맞춤형 자산 보고서',
'dashboard' => '대시보드',
'days' => '일자',
- 'days_to_next_audit' => '다음 감사까지의 일자',
+ 'days_to_next_audit' => '다음 감사까지의 일자',
'date' => '날짜',
'debug_warning' => '경고!',
- 'debug_warning_text' => '이 프로그램은 디버깅이 가능한 제품 모드에서 구동중입니다. 당신의 프로그램이 외부 환경과 접속이 가능하다면 중요한 자료가 유출될 수 있습니다. .env
파일의 APP_DEBUG
값을 false
로 설정하여 디버깅을 비활성화 하세요.',
+ 'debug_warning_text' => '이 프로그램은 디버깅이 가능한 제품 모드에서 구동중입니다. 당신의 프로그램이 외부 환경과 접속이 가능하다면 중요한 자료가 유출될 수 있습니다. .env
파일의 APP_DEBUG
값을 false
로 설정하여 디버깅을 비활성화 하세요.',
'delete' => '삭제',
'deleted' => '삭제됨',
'delete_seats' => '삭제한 Seat',
@@ -89,6 +90,7 @@
'history' => '기록',
'history_for' => '이력',
'id' => '아이디',
+ 'image' => 'Image',
'image_delete' => '이미지 삭제',
'image_upload' => '이미지 올리기',
'import' => '불러오기',
diff --git a/resources/lang/ko/validation.php b/resources/lang/ko/validation.php
index d6648bd0e8..ec12849113 100644
--- a/resources/lang/ko/validation.php
+++ b/resources/lang/ko/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute 는 이미 획득하였습니다.',
'uploaded' => ':attribute는 업로드 하지 못했습니다.',
'url' => ':attribute 형식이 부정확 합니다.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "현재 비밀번호가 잘못되었습니다.",
'dumbpwd' => '그 비밀번호는 너무 일반적입니다.',
"statuslabel_type" => "유효한 상태 라벨 형식을 선택해 주셔야 합니다",
- "unique_undeleted" => ":attribute 는 고유의 값만 가져야 합니다.",
],
/*
diff --git a/resources/lang/lt/admin/hardware/message.php b/resources/lang/lt/admin/hardware/message.php
index 55d7dde788..165d67931b 100644
--- a/resources/lang/lt/admin/hardware/message.php
+++ b/resources/lang/lt/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Įranga neišduota, prašome bandyti dar kartą',
'success' => 'Įranga išduota sėkmingai.',
'user_does_not_exist' => 'Netinkamas naudotojas. Prašome bandykite dar kartą.',
- 'not_available' => 'Šis turtas negali būti išsiunčiamas!'
+ 'not_available' => 'Šis turtas negali būti išsiunčiamas!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php
index 8eb13162c8..7f616ef955 100644
--- a/resources/lang/lt/admin/settings/general.php
+++ b/resources/lang/lt/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Žemiau esančiame laukelyje įveskite tekstą "DELETE", kad išvalykite ištrintus įrašus. Šis veiksmas negali būti panaikintas.',
'custom_css' => 'Užsakytas CSS',
'custom_css_help' => 'Įveskite bet kokį užsakytą CSS peržiūrėjimo norėtumėte naudoti. Neįtraukite <style></Stilius> žymės.',
+ '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' => 'Numatytoji valiuta',
'default_eula_text' => 'Numatytasis EULA',
'default_language' => 'Numatyta kalba',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP įjungtas',
'ldap_integration' => 'LDAP integracija',
'ldap_settings' => 'LDAP nustatymai',
+ '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 serveris',
'ldap_server_help' => 'Tai turėtų prasidėti su ldap: // (nešifruotam arba TLS) arba ldaps: (jei tai SSL)',
'ldap_server_cert' => 'LDAP SSL sertifikato patvirtinimas',
diff --git a/resources/lang/lt/admin/suppliers/message.php b/resources/lang/lt/admin/suppliers/message.php
index efbea3917b..cca89422ae 100644
--- a/resources/lang/lt/admin/suppliers/message.php
+++ b/resources/lang/lt/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Tokio tiekėjo nėra.',
- 'assoc_users' => 'Šis tiekėjas šiuo metu susietas su bent vienu modeliu ir negali būti ištrintas. Prašome atnaujinkite savo modelius, kad šie nebūtu susieti su šiuo tiekėju ir bandykite dar kartą. ',
+
'create' => array(
'error' => 'Tiekėjas nesukurtas. Prašome bandykite dar kartą.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Ar jūs tikrai norite ištrinti šį tiekėją?',
'error' => 'Nepavyko ištrinti tiekėjo. Prašome bandykite dar kartą.',
- 'success' => 'Tiekėjas ištrintas sėkmingai.'
+ 'success' => 'Tiekėjas ištrintas sėkmingai.',
+ '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. ',
)
);
diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php
index 2eb505fb84..a3d576b4d3 100644
--- a/resources/lang/lt/general.php
+++ b/resources/lang/lt/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Įrangos',
- 'activated' => 'Aktyvuota',
+ 'activated' => 'Aktyvuota',
'accessory' => 'Įranga',
- 'accessory_report' => 'Įrangos ataskaita',
+ 'accessory_report' => 'Įrangos ataskaita',
'action' => 'Veiksmas',
'activity_report' => 'Veiksmų ataskaita',
'address' => 'Adresas',
'admin' => 'Administratorius',
- 'add_seats' => 'Prideta licenzijų',
+ 'add_seats' => 'Prideta licenzijų',
'all_assets' => 'Visa įranga',
'all' => 'Viskas',
'archived' => 'Archyvuota',
@@ -40,9 +40,10 @@
'checkout' => 'Išimti',
'city' => 'Miestas',
'click_here' => 'Paspauskite čia',
- 'companies' => 'Kompanijos',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Kompanijos',
'company' => 'Kompanija',
- 'component' => 'Komponentas',
+ 'component' => 'Komponentas',
'components' => 'Komponentai',
'complete' => 'Baigti',
'consumable' => 'Suvartojama įranga',
@@ -58,10 +59,10 @@
'custom_report' => 'Pasirenkama įrangos ataskaita',
'dashboard' => 'Valdymo skydelis',
'days' => 'dienos',
- 'days_to_next_audit' => 'Dienos iki kito audito',
+ 'days_to_next_audit' => 'Dienos iki kito audito',
'date' => 'Data',
'debug_warning' => 'Įspėjimas!',
- 'debug_warning_text' => 'Ši programa veikia gamybos režimu, įjungus derinimą. Tai gali atskleisti slaptus duomenis, jei jūsų programa yra prieinama išoriniam pasauliui. Išjunkite derinimo režimą nustatydami APP_DEBUG
reikšmę savo .env
byloje false
.',
+ 'debug_warning_text' => 'Ši programa veikia gamybos režimu, įjungus derinimą. Tai gali atskleisti slaptus duomenis, jei jūsų programa yra prieinama išoriniam pasauliui. Išjunkite derinimo režimą nustatydami APP_DEBUG
reikšmę savo .env
byloje false
.',
'delete' => 'Ištrinti',
'deleted' => 'Ištrinta',
'delete_seats' => 'Ištrintos licenzijos',
@@ -89,6 +90,7 @@
'history' => 'Istorija',
'history_for' => 'Istorija žmogui: ',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Ištrinti nuotrauką',
'image_upload' => 'Įkelti nuotrauką',
'import' => 'Įkelti',
diff --git a/resources/lang/lt/validation.php b/resources/lang/lt/validation.php
index c09b5a1dc1..99f586559f 100644
--- a/resources/lang/lt/validation.php
+++ b/resources/lang/lt/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute jau užimtas.',
'uploaded' => 'Nepavyko įkelti atributo.',
'url' => ':attribute formatas neteisingas.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Jūsų dabartinis slaptažodis yra neteisingas",
'dumbpwd' => 'Šis slaptažodis yra per dažnas.',
"statuslabel_type" => "Turite pasirinkti tinkamą statuso etiketės tipą",
- "unique_undeleted" => "Atributas turi būti unikalus.",
],
/*
diff --git a/resources/lang/lv/admin/hardware/message.php b/resources/lang/lv/admin/hardware/message.php
index 7881a11706..0ec9cd89a8 100644
--- a/resources/lang/lv/admin/hardware/message.php
+++ b/resources/lang/lv/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Īpašums netika pārbaudīts, lūdzu, mēģiniet vēlreiz',
'success' => 'Aktīvs pārbaudīts veiksmīgi.',
'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.',
- 'not_available' => 'Šis īpašums nav pieejams izrakstīšanai!'
+ 'not_available' => 'Šis īpašums nav pieejams izrakstīšanai!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/lv/admin/settings/general.php b/resources/lang/lv/admin/settings/general.php
index f4eb7fbecf..cda01a3f6d 100644
--- a/resources/lang/lv/admin/settings/general.php
+++ b/resources/lang/lv/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Ievadiet tekstu "DELETE" zemāk esošajā lodziņā, lai dzēstu savus dzēstos ierakstus. Šo darbību nevar atsaukt.',
'custom_css' => 'Pielāgota CSS',
'custom_css_help' => 'Ievadiet jebkuru pielāgotu CSS ignorēšanu, kuru vēlaties izmantot. Neiekļaujiet <style></style> atzīmes.',
+ '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' => 'Valūta pēc noklusējuma',
'default_eula_text' => 'Noklusējuma EULA',
'default_language' => 'Noklusējuma valoda',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP iespējota',
'ldap_integration' => 'LDAP integrācija',
'ldap_settings' => 'LDAP iestatījumi',
+ '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 serveris',
'ldap_server_help' => 'Tam vajadzētu sākt ar ldap: // (nešifrētiem vai TLS) vai ldaps: // (attiecībā uz SSL)',
'ldap_server_cert' => 'LDAP SSL sertifikātu validācija',
diff --git a/resources/lang/lv/admin/suppliers/message.php b/resources/lang/lv/admin/suppliers/message.php
index 83f5b88fa9..066fc160ac 100644
--- a/resources/lang/lv/admin/suppliers/message.php
+++ b/resources/lang/lv/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Piegādātājs neeksistē.',
- 'assoc_users' => 'Šis piegādātājs pašlaik ir saistīts ar vismaz vienu modeli, un to nevar izdzēst. Lūdzu, atjauniniet savus modeļus, lai vairs nenorādītu šo piegādātāju, un mēģiniet vēlreiz.',
+
'create' => array(
'error' => 'Piegādātājs netika izveidots, lūdzu, mēģiniet vēlreiz.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Vai tiešām vēlaties dzēst šo piegādātāju?',
'error' => 'Radās problēma, izlaižot piegādātāju. Lūdzu mēģiniet vēlreiz.',
- 'success' => 'Piegādātājs tika veiksmīgi dzēsts.'
+ 'success' => 'Piegādātājs tika veiksmīgi dzēsts.',
+ '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. ',
)
);
diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php
index dfc075814e..0f2c5111b5 100644
--- a/resources/lang/lv/general.php
+++ b/resources/lang/lv/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Aksesuāri',
- 'activated' => 'Aktivizēts',
+ 'activated' => 'Aktivizēts',
'accessory' => 'Piederums',
- 'accessory_report' => 'Piederumu pārskats',
+ 'accessory_report' => 'Piederumu pārskats',
'action' => 'Darbība',
'activity_report' => 'Darbības pārskats',
'address' => 'Adrese',
'admin' => 'Administrators',
- 'add_seats' => 'Pievienoti sēdekļi',
+ 'add_seats' => 'Pievienoti sēdekļi',
'all_assets' => 'Visi aktīvi',
'all' => 'Viss',
'archived' => 'Arhivēts',
@@ -40,9 +40,10 @@
'checkout' => 'Izrakstīšanās',
'city' => 'Pilsēta',
'click_here' => 'Noklikšķiniet šeit',
- 'companies' => 'Kompānijas',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Kompānijas',
'company' => 'Uzņēmums',
- 'component' => 'Komponents',
+ 'component' => 'Komponents',
'components' => 'Komponenti',
'complete' => 'Pabeigt',
'consumable' => 'Izlietojams',
@@ -58,10 +59,10 @@
'custom_report' => 'Pielāgoto aktīvu pārskats',
'dashboard' => 'Informācijas panelis',
'days' => 'dienas',
- 'days_to_next_audit' => 'Dienas līdz nākamajam auditam',
+ 'days_to_next_audit' => 'Dienas līdz nākamajam auditam',
'date' => 'Datums',
'debug_warning' => 'Brīdinājums!',
- 'debug_warning_text' => 'Šī lietojumprogramma darbojas ražošanas režīmā ar iespējotu atkļūdošanu. Tas var pakļaut sensitīvus datus, ja jūsu pieteikums ir pieejams ārpasauli. Atspējošanas atkļūdošanas režīms, iestatot APP_DEBUG
vērtību savam .env
failam uz false
.',
+ 'debug_warning_text' => 'Šī lietojumprogramma darbojas ražošanas režīmā ar iespējotu atkļūdošanu. Tas var pakļaut sensitīvus datus, ja jūsu pieteikums ir pieejams ārpasauli. Atspējošanas atkļūdošanas režīms, iestatot APP_DEBUG
vērtību savam .env
failam uz false
.',
'delete' => 'Dzēst',
'deleted' => 'Svītrots',
'delete_seats' => 'Izdzēstās vietas',
@@ -89,6 +90,7 @@
'history' => 'Vēsture',
'history_for' => 'Vēsture par',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Dzēst attēlu',
'image_upload' => 'Augšupielādēt attēlu',
'import' => 'Importēt',
diff --git a/resources/lang/lv/validation.php b/resources/lang/lv/validation.php
index bdf13d6fb6..3db819a497 100644
--- a/resources/lang/lv/validation.php
+++ b/resources/lang/lv/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'Atribūts jau ir pieņemts.',
'uploaded' => 'Atribūts neizdevās augšupielādēt.',
'url' => 'Atribūta formāts nav derīgs.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Jūsu pašreizējā parole nav pareiza",
'dumbpwd' => 'Šī parole ir pārāk izplatīta.',
"statuslabel_type" => "Jums ir jāizvēlas derīgs statusa etiķetes veids",
- "unique_undeleted" => "Atribūtam jābūt unikālam.",
],
/*
diff --git a/resources/lang/mi/admin/hardware/message.php b/resources/lang/mi/admin/hardware/message.php
index 2548ebdaf4..dad96cf98f 100644
--- a/resources/lang/mi/admin/hardware/message.php
+++ b/resources/lang/mi/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Kaore i teahia te taketake, me ngana ano',
'success' => 'Kua tohua te tahua.',
'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.',
- 'not_available' => 'Kaore i te wātea te taonga mo te takitaki!'
+ 'not_available' => 'Kaore i te wātea te taonga mo te takitaki!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/mi/admin/settings/general.php b/resources/lang/mi/admin/settings/general.php
index c0b45cc1e4..90269ec7d6 100644
--- a/resources/lang/mi/admin/settings/general.php
+++ b/resources/lang/mi/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Whakauruhia te tuhinga "MUA" i roto i te pouaka i raro nei hei horoi i au reta kua mukua. Kaore e taea te whakakore tenei mahi.',
'custom_css' => 'CSS Ritenga',
'custom_css_help' => 'Whakauruhia tetahi tahua CSS ritenga e hiahia ana koe ki te whakamahi. Kaua e whakauru i nga tūtohu <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' => 'Moni Moni',
'default_eula_text' => 'EULA Taunoa',
'default_language' => 'Reo Taunoa',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'I whakahohea te LDAP',
'ldap_integration' => 'Te whakauru i te LDAP',
'ldap_settings' => 'Tautuhinga 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' => 'Tūmau LDAP',
'ldap_server_help' => 'Me tīmata tenei ki te ldap: // (mo te whakakoretanga, TLS ranei), mo te hiri: // (mo te SSL)',
'ldap_server_cert' => 'Tiwhikete Tiwhikete SSL LDAP',
diff --git a/resources/lang/mi/admin/suppliers/message.php b/resources/lang/mi/admin/suppliers/message.php
index b44f67e9e9..353f8bfde1 100644
--- a/resources/lang/mi/admin/suppliers/message.php
+++ b/resources/lang/mi/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Kaore he kaiwhakarato.',
- 'assoc_users' => 'Kei te hono tenei kaiwhakarato ki te tauira kotahi, kaore e taea te muku. Tena koa whakahou i o tauira kia kaua e tuhi atu ki tenei kaihoko me te ngana ano.',
+
'create' => array(
'error' => 'Kaore i hangaia te kaiwhakarato, tēnā whakamātau anō.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Kei te hiahia koe ki te muku i tenei kaiwhakarato?',
'error' => 'He raru kei te whakakore i te kaituku. Tena ngana ano.',
- 'success' => 'Kua mukua te kaihoko.'
+ 'success' => 'Kua mukua te kaihoko.',
+ '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. ',
)
);
diff --git a/resources/lang/mi/general.php b/resources/lang/mi/general.php
index f737f2cda9..109ec6b203 100644
--- a/resources/lang/mi/general.php
+++ b/resources/lang/mi/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Tuhinga',
- 'activated' => 'Kua whakahohe',
+ 'activated' => 'Kua whakahohe',
'accessory' => 'Waea Uru',
- 'accessory_report' => 'Pūrongo Whaiaro',
+ 'accessory_report' => 'Pūrongo Whaiaro',
'action' => 'Mahi',
'activity_report' => 'Mahinga Mahi',
'address' => 'Wāhitau',
'admin' => 'Kaiwhakahaere',
- 'add_seats' => 'Ngā nohoanga kua whakaurua',
+ 'add_seats' => 'Ngā nohoanga kua whakaurua',
'all_assets' => 'Nga taonga katoa',
'all' => 'Katoa',
'archived' => 'Whakamahia',
@@ -40,9 +40,10 @@
'checkout' => 'Taki',
'city' => 'City',
'click_here' => 'Pāwhiri ki konei',
- 'companies' => 'Kamupene',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Kamupene',
'company' => 'Kamupene',
- 'component' => 'Tuhinga',
+ 'component' => 'Tuhinga',
'components' => 'Tuhinga',
'complete' => 'Kua oti',
'consumable' => 'Whakamahia',
@@ -58,10 +59,10 @@
'custom_report' => 'Ripoata Ahua Ritenga',
'dashboard' => 'Papatohu',
'days' => 'ra',
- 'days_to_next_audit' => 'Ko nga ra ki te arotake i muri',
+ 'days_to_next_audit' => 'Ko nga ra ki te arotake i muri',
'date' => 'Rā',
'debug_warning' => 'Whakatūpato!',
- 'debug_warning_text' => 'Ko tenei tono kei te whakahaere i te mahinga whakaputa me te taraiwa kua whakahohea. Ka taea e tenei te whakaatu i nga raraunga taarata mehemea ka uru atu to tono ki te ao o waho. Monokia te aratau taapatu mā te whakarite i te uara APP_DEBUG123_7____132 i roto i to kōnae .env
ki false
.',
+ 'debug_warning_text' => 'Ko tenei tono kei te whakahaere i te mahinga whakaputa me te taraiwa kua whakahohea. Ka taea e tenei te whakaatu i nga raraunga taarata mehemea ka uru atu to tono ki te ao o waho. Monokia te aratau taapatu mā te whakarite i te uara APP_DEBUG123_7____132 i roto i to kōnae .env
ki false
.',
'delete' => 'Mukua',
'deleted' => 'Kua mukua',
'delete_seats' => 'Kua mukua nga Maatai',
@@ -89,6 +90,7 @@
'history' => 'Hītori',
'history_for' => 'History mo',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Mukua te Whakaahua',
'image_upload' => 'Tukuna Whakaahua',
'import' => 'Kawemai',
diff --git a/resources/lang/mi/validation.php b/resources/lang/mi/validation.php
index e4b859ebb9..4d3ca21c54 100644
--- a/resources/lang/mi/validation.php
+++ b/resources/lang/mi/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'Ko te: kua tangohia te huanga.',
'uploaded' => 'Ko te: ko te huanga i rahua te tuku.',
'url' => 'Ko te: ko te hōputu huanga he muhu.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "He hē tō kupuhipa o nāianei",
'dumbpwd' => 'He noa rawa te kupuhipa.',
"statuslabel_type" => "Me tīpako i te momo tahua tohu whaimana",
- "unique_undeleted" => "Ko te: me tino ahurei te huanga.",
],
/*
diff --git a/resources/lang/mn/admin/hardware/message.php b/resources/lang/mn/admin/hardware/message.php
index 3fdb15a9d4..ccc98f67c4 100644
--- a/resources/lang/mn/admin/hardware/message.php
+++ b/resources/lang/mn/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(
diff --git a/resources/lang/mn/admin/settings/general.php b/resources/lang/mn/admin/settings/general.php
index 6350ba484a..e1bf6cd912 100644
--- a/resources/lang/mn/admin/settings/general.php
+++ b/resources/lang/mn/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: // (unrrypted буюу TLS) эсвэл ldaps-ээр эхлэх ёстой: // (SSL нь)',
'ldap_server_cert' => 'LDAP SSL гэрчилгээ баталгаажуулалт',
diff --git a/resources/lang/mn/admin/suppliers/message.php b/resources/lang/mn/admin/suppliers/message.php
index 1d4d158e59..1b6f5e72c6 100644
--- a/resources/lang/mn/admin/suppliers/message.php
+++ b/resources/lang/mn/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. ',
)
);
diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php
index f5deefd67c..7035946304 100644
--- a/resources/lang/mn/general.php
+++ b/resources/lang/mn/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Дагалдах хэрэгсэл',
- 'activated' => 'Идэвхжүүлсэн',
+ 'activated' => 'Идэвхжүүлсэн',
'accessory' => 'Дагалдах хэрэгсэл',
- 'accessory_report' => 'Дагалдах хэрэгслийн тайлан',
+ 'accessory_report' => 'Дагалдах хэрэгслийн тайлан',
'action' => 'Үйлдэл',
'activity_report' => 'Үйл ажиллагааны тайлан',
'address' => 'Хаяг',
'admin' => 'админ',
- 'add_seats' => 'Суудал нэмсэн',
+ 'add_seats' => 'Суудал нэмсэн',
'all_assets' => 'Бүх хөрөнгө',
'all' => 'Бүгд',
'archived' => 'Архивлагдсан',
@@ -40,9 +40,10 @@
'checkout' => 'Тооцоо хийх',
'city' => 'Хот',
'click_here' => 'Энд дар',
- 'companies' => 'Компаниуд',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Компаниуд',
'company' => 'Компани',
- 'component' => 'Бүрэлдэхүүн хэсэг',
+ 'component' => 'Бүрэлдэхүүн хэсэг',
'components' => 'Бүрэлдэхүүн хэсгүүд',
'complete' => 'Бүрэн дуусгах',
'consumable' => 'Боломжтой',
@@ -58,10 +59,10 @@
'custom_report' => 'Гаалийн хєрєнгийн тайлан',
'dashboard' => 'Хянах самбар',
'days' => 'өдөр',
- 'days_to_next_audit' => 'Дараагийн аудитуудад орох өдрүүд',
+ 'days_to_next_audit' => 'Дараагийн аудитуудад орох өдрүүд',
'date' => 'Огноо',
'debug_warning' => 'Анхаар!',
- 'debug_warning_text' => 'Энэ програм нь дибаг хийх боломжтойгоор үйлдвэрлэлийн горимд ажиллаж байна. Хэрэв таны хэрэглээ гаднах ертөнцөд хүртээмжтэй бол эмзэг өгөгдлийг илтгэнэ. APP_DEBUG
утгыг өөрийн .env
файлыг false
руу тохируулах замаар дибаг хийх горимыг идэвхгүй болгох.',
+ 'debug_warning_text' => 'Энэ програм нь дибаг хийх боломжтойгоор үйлдвэрлэлийн горимд ажиллаж байна. Хэрэв таны хэрэглээ гаднах ертөнцөд хүртээмжтэй бол эмзэг өгөгдлийг илтгэнэ. APP_DEBUG
утгыг өөрийн .env
файлыг false
руу тохируулах замаар дибаг хийх горимыг идэвхгүй болгох.',
'delete' => 'Устгах',
'deleted' => 'Устгагдсан',
'delete_seats' => 'Устгагдсан суудал',
@@ -89,6 +90,7 @@
'history' => 'Түүх',
'history_for' => 'Түүх',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Зураг устгах',
'image_upload' => 'Зургийн байршуулалт',
'import' => 'Импорт',
diff --git a/resources/lang/mn/validation.php b/resources/lang/mn/validation.php
index 29bfa6273f..cc4e55fe6c 100644
--- a/resources/lang/mn/validation.php
+++ b/resources/lang/mn/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" => "Үүнд: аттрибут нь өвөрмөц байх ёстой.",
],
/*
diff --git a/resources/lang/ms/admin/hardware/message.php b/resources/lang/ms/admin/hardware/message.php
index 6a5ce8dc4e..4ebb7aed04 100644
--- a/resources/lang/ms/admin/hardware/message.php
+++ b/resources/lang/ms/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Harta gagal diagihkan, sila cuba semula',
'success' => 'Harta berjaya diagihkan.',
'user_does_not_exist' => 'Pengguna tak sah. Sila cuba lagi.',
- 'not_available' => 'Aset itu tidak tersedia untuk checkout!'
+ 'not_available' => 'Aset itu tidak tersedia untuk checkout!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php
index c1a4194b09..95ff8c5710 100644
--- a/resources/lang/ms/admin/settings/general.php
+++ b/resources/lang/ms/admin/settings/general.php
@@ -23,6 +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_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 Wang Default',
'default_eula_text' => 'EULA lalai',
'default_language' => 'Bahasa Lalai',
@@ -44,6 +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_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' => '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',
diff --git a/resources/lang/ms/admin/suppliers/message.php b/resources/lang/ms/admin/suppliers/message.php
index eb3e5fce61..e9f53147ba 100644
--- a/resources/lang/ms/admin/suppliers/message.php
+++ b/resources/lang/ms/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Pembekal tidak wujud.',
- 'assoc_users' => 'Pembekal ini mempunyai kaitan dengan sekurang-kurangnya satu model dan tidak boleh dibuang. Sila kemaskini model-model anda supaya tidak lagi dirujukkan dengan kategori ini dan cuba lagi. ',
+
'create' => array(
'error' => 'Pembekal gagal dicipta, sila cuba lagi.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Anda pasti anda ingin hapuskan pembekal ini? ',
'error' => 'Ada isu semasa menghapuskan pembekal, sila cuba lagi.',
- 'success' => 'Pembekal berjaya dihapuskan.'
+ 'success' => 'Pembekal berjaya dihapuskan.',
+ '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. ',
)
);
diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php
index 6db91360d5..302dec643c 100644
--- a/resources/lang/ms/general.php
+++ b/resources/lang/ms/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Aksesori',
- 'activated' => 'Diaktifkan',
+ 'activated' => 'Diaktifkan',
'accessory' => 'Aksesori',
- 'accessory_report' => 'Laporan Aksesori',
+ 'accessory_report' => 'Laporan Aksesori',
'action' => 'Tindakan',
'activity_report' => 'Laporan Aktiviti',
'address' => 'Alamat',
'admin' => 'Pentadbir',
- 'add_seats' => 'Menambah kerusi',
+ 'add_seats' => 'Menambah kerusi',
'all_assets' => 'Semua Harta',
'all' => 'Semua',
'archived' => 'Diarkibkan',
@@ -40,9 +40,10 @@
'checkout' => 'Agihkan',
'city' => 'Bandar',
'click_here' => 'Tekan di sini',
- 'companies' => 'Syarikat-syarikat',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Syarikat-syarikat',
'company' => 'Syarikat',
- 'component' => 'Komponen',
+ 'component' => 'Komponen',
'components' => 'Komponen',
'complete' => 'Lengkap',
'consumable' => 'Boleh makan',
@@ -58,10 +59,10 @@
'custom_report' => 'Laporan Harta Pilihan',
'dashboard' => 'Papan Pemuka',
'days' => 'hari',
- 'days_to_next_audit' => 'Hari ke Audit Seterusnya',
+ 'days_to_next_audit' => 'Hari ke Audit Seterusnya',
'date' => 'Tarikh',
'debug_warning' => 'Amaran!',
- 'debug_warning_text' => 'Aplikasi ini berjalan dalam mod pengeluaran dengan debug membolehkan. Ini boleh mendedahkan data sensitif jika aplikasi anda boleh diakses oleh dunia luar. Lumpuhkan mod debug dengan menetapkan APP_DEBUG
nilai dalam fail .env
anda ke false
.',
+ 'debug_warning_text' => 'Aplikasi ini berjalan dalam mod pengeluaran dengan debug membolehkan. Ini boleh mendedahkan data sensitif jika aplikasi anda boleh diakses oleh dunia luar. Lumpuhkan mod debug dengan menetapkan APP_DEBUG
nilai dalam fail .env
anda ke false
.',
'delete' => 'Hapuskan',
'deleted' => 'Dihapuskan',
'delete_seats' => 'Kerusi dipadamkan',
@@ -89,6 +90,7 @@
'history' => 'Sejarah',
'history_for' => 'Sejarah untuk',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Hapuskan imej',
'image_upload' => 'Muat naik imej',
'import' => 'Import',
diff --git a/resources/lang/ms/validation.php b/resources/lang/ms/validation.php
index 84596e5ecc..b21c8571bc 100644
--- a/resources/lang/ms/validation.php
+++ b/resources/lang/ms/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute telah diambil.',
'uploaded' => 'The: attribute gagal untuk dimuat naik.',
'url' => ':attribute format tidak sah.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Kata laluan semasa anda tidak betul",
'dumbpwd' => 'Kata laluan itu terlalu umum.',
"statuslabel_type" => "Anda mesti memilih jenis label status yang sah",
- "unique_undeleted" => "The: atribut mestilah unik.",
],
/*
diff --git a/resources/lang/nl/admin/hardware/message.php b/resources/lang/nl/admin/hardware/message.php
index 9eef82d42d..8fcfd26f75 100644
--- a/resources/lang/nl/admin/hardware/message.php
+++ b/resources/lang/nl/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Product is niet uitgecheckt, probeer het opnieuw',
'success' => 'Product is met succes uitgecheckt.',
'user_does_not_exist' => 'De gebruiker is ongeldig. Probeer het opnieuw.',
- 'not_available' => 'Dat item is niet beschikbaar om uit te leveren!'
+ 'not_available' => 'Dat item is niet beschikbaar om uit te leveren!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php
index d08148c222..432bc5df7d 100644
--- a/resources/lang/nl/admin/settings/general.php
+++ b/resources/lang/nl/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Voer de tekst "DELETE" in het vak hieronder om uw verwijderde records op te schonen. Deze actie kan niet ongedaan worden gemaakt.',
'custom_css' => 'Aangepaste CSS',
'custom_css_help' => 'Voer een aangepaste CSS overschrijving die je wilt gebruiken in. Gebruik geen <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' => 'Standaard valuta',
'default_eula_text' => 'Standaard gebruikersovereenkomst',
'default_language' => 'Standaardtaal',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP ingeschakeld',
'ldap_integration' => 'LDAP integratie',
'ldap_settings' => 'LDAP instellingen',
+ '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' => 'Dit moet beginnen met ldap:// (voor onversleuteld of TLS) of ldaps:// (voor SSL)',
'ldap_server_cert' => 'LDAP SSL certificaat validatie',
diff --git a/resources/lang/nl/admin/suppliers/message.php b/resources/lang/nl/admin/suppliers/message.php
index 5dd9ae3666..1a031da967 100644
--- a/resources/lang/nl/admin/suppliers/message.php
+++ b/resources/lang/nl/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'De leverancier bestaat niet.',
- 'assoc_users' => 'Deze leverancier is momenteel gekoppeld met ten minste één model en kan hierdoor niet verwijderd worden. Pas je modellen aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ',
+
'create' => array(
'error' => 'De leverancier is niet aangemaakt, probeer het opnieuw.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Ben je zeker dat je de leverancier wil verwijderen?',
'error' => 'Er ging iets mis tijdens het verwijderen van de leverancier. Probeer het nog een keer.',
- 'success' => 'De leverancier is succesvol verwijderd.'
+ 'success' => 'De leverancier is succesvol verwijderd.',
+ '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. ',
)
);
diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php
index 6ea6c28175..ab325ba8f8 100644
--- a/resources/lang/nl/general.php
+++ b/resources/lang/nl/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accessoires',
- 'activated' => 'Geactiveerd',
+ 'activated' => 'Geactiveerd',
'accessory' => 'Accessoire',
- 'accessory_report' => 'Accessoire Rapport',
+ 'accessory_report' => 'Accessoire Rapport',
'action' => 'Actie',
'activity_report' => 'Activiteitenrapportage',
'address' => 'Adres',
'admin' => 'Beheerder',
- 'add_seats' => 'Toegevoegde plekken',
+ 'add_seats' => 'Toegevoegde plekken',
'all_assets' => 'Alle materialen',
'all' => 'Alle',
'archived' => 'Gearchiveerd',
@@ -40,9 +40,10 @@
'checkout' => 'Afrekenen',
'city' => 'Plaats',
'click_here' => 'Klik hier',
- 'companies' => 'Bedrijven',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Bedrijven',
'company' => 'Bedrijf',
- 'component' => 'Component',
+ 'component' => 'Component',
'components' => 'Componenten',
'complete' => 'Voltooid',
'consumable' => 'Verbruiksartikelen',
@@ -58,10 +59,10 @@
'custom_report' => 'Handmatig Materiaal Rapport',
'dashboard' => 'Dashboard',
'days' => 'dagen',
- 'days_to_next_audit' => 'Dagen tot de volgende controle',
+ 'days_to_next_audit' => 'Dagen tot de volgende controle',
'date' => 'Datum',
'debug_warning' => 'Waarschuwing!',
- 'debug_warning_text' => 'Deze applicatie draait in productie modus met foutopsporing ingeschakeld. Dit kan betekenen dat mogelijk gevoelige gegevens zichtbaar zijn voor de buitenwereld. Schakel foutopsporing uit door de APP_DEBUG
variabele in je .env
bestand op false
te zetten.',
+ 'debug_warning_text' => 'Deze applicatie draait in productie modus met foutopsporing ingeschakeld. Dit kan betekenen dat mogelijk gevoelige gegevens zichtbaar zijn voor de buitenwereld. Schakel foutopsporing uit door de APP_DEBUG
variabele in je .env
bestand op false
te zetten.',
'delete' => 'Verwijder',
'deleted' => 'Verwijderd',
'delete_seats' => 'Verwijderde plekken',
@@ -89,6 +90,7 @@
'history' => 'Historie',
'history_for' => 'Geschiedenis van',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Afbeelding verwijderen',
'image_upload' => 'Afbeelding uploaden',
'import' => 'Importeer',
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index c5cce3e242..a5da95fe0a 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'Het veld :attribute is reeds in gebruik.',
'uploaded' => 'Uploaden van :attribute is mislukt.',
'url' => 'Het formaat van :attribute is ongeldig.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Je huidige wachtwoord is incorrect",
'dumbpwd' => 'Dat wachtwoord is te veelvoorkomend.',
"statuslabel_type" => "Selecteer een valide status label",
- "unique_undeleted" => ":attribute moet uniek zijn.",
],
/*
diff --git a/resources/lang/no/admin/hardware/message.php b/resources/lang/no/admin/hardware/message.php
index 874ab4de9a..8229ebe26f 100644
--- a/resources/lang/no/admin/hardware/message.php
+++ b/resources/lang/no/admin/hardware/message.php
@@ -62,7 +62,8 @@ return array(
'error' => 'Eiendel ble ikke sjekket ut. Prøv igjen',
'success' => 'Vellykket utsjekk av eiendel.',
'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
- 'not_available' => 'Den eiendelen er ikke tilgjengelig til å sjekkes ut!'
+ 'not_available' => 'Den eiendelen er ikke tilgjengelig til å sjekkes ut!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php
index 7a0ec29a59..3d5d1816aa 100644
--- a/resources/lang/no/admin/settings/general.php
+++ b/resources/lang/no/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Skriv "DELETE" i boksen under for å fjerne dine slettende data. Dette kan ikke reverseres.',
'custom_css' => 'Egendefinert CSS',
'custom_css_help' => 'Legg til egendefinert CSS. Ikke ta med taggene <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' => 'Standardvaluta',
'default_eula_text' => 'Standard EULA',
'default_language' => 'Standardspråk',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP aktivert',
'ldap_integration' => 'LDAP Integrering',
'ldap_settings' => 'LDAP Instillinger',
+ '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 bør starte med ldap:// (for ukryptert eller TLS) eller ldaps:// (for SSL)',
'ldap_server_cert' => 'Validering av LDAP SSL sertifikat',
diff --git a/resources/lang/no/admin/suppliers/message.php b/resources/lang/no/admin/suppliers/message.php
index 27383ba021..0d1c45170f 100644
--- a/resources/lang/no/admin/suppliers/message.php
+++ b/resources/lang/no/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Leverandør finnes ikke.',
- 'assoc_users' => 'Denne leverandøren er tilknyttet minst en modell og kan ikke slettes. Oppdater modellene dine til ikke å bruke denne leverandøren og prøv igjen. ',
+
'create' => array(
'error' => 'Leverandør ble ikke opprettet. Prøv igjen.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Er du sikker på at du vil slette denne leverandøren?',
'error' => 'Det oppstod et problem under sletting av leverandør. Prøv igjen.',
- 'success' => 'Sletting av leverandør vellykket.'
+ 'success' => 'Sletting av leverandør vellykket.',
+ '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. ',
)
);
diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php
index 14a8384b31..815344787f 100644
--- a/resources/lang/no/general.php
+++ b/resources/lang/no/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Tilbehør',
- 'activated' => 'Aktivert',
+ 'activated' => 'Aktivert',
'accessory' => 'Tilbehør',
- 'accessory_report' => 'Rapport over tilbehør',
+ 'accessory_report' => 'Rapport over tilbehør',
'action' => 'Handlinger',
'activity_report' => 'Aktivitetsrapport',
'address' => 'Adresse',
'admin' => 'Admin',
- 'add_seats' => 'Setelisenser lagt til',
+ 'add_seats' => 'Setelisenser lagt til',
'all_assets' => 'Alle eiendeler',
'all' => 'Alle',
'archived' => 'Arkivert',
@@ -40,9 +40,10 @@
'checkout' => 'Sjekk ut',
'city' => 'By',
'click_here' => 'Klikk her',
- 'companies' => 'Selskaper',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Selskaper',
'company' => 'Firmanavn',
- 'component' => 'Komponent',
+ 'component' => 'Komponent',
'components' => 'Komponenter',
'complete' => 'Fullført',
'consumable' => 'Forbruksvare',
@@ -58,10 +59,10 @@
'custom_report' => 'Tilpasset eiendelsrapport',
'dashboard' => 'Kontrollpanel',
'days' => 'dager',
- 'days_to_next_audit' => 'Dager til neste revisjon',
+ 'days_to_next_audit' => 'Dager til neste revisjon',
'date' => 'Dato',
'debug_warning' => 'Advarsel!',
- 'debug_warning_text' => 'Dette programmet kjører i produksjonsmodus med feilsøking aktiverert. Dette kan utsette følsomme data hvis programmet er tilgjengelig for omverdenen. Deaktiver debug modus ved å sette APP_DEBUG
-verdien i filen .env
til false
.',
+ 'debug_warning_text' => 'Dette programmet kjører i produksjonsmodus med feilsøking aktiverert. Dette kan utsette følsomme data hvis programmet er tilgjengelig for omverdenen. Deaktiver debug modus ved å sette APP_DEBUG
-verdien i filen .env
til false
.',
'delete' => 'Slett',
'deleted' => 'Slettet',
'delete_seats' => 'Slettede setelisenser',
@@ -89,6 +90,7 @@
'history' => 'Historie',
'history_for' => 'Historikk for',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Slett bilde',
'image_upload' => 'Last opp bilde',
'import' => 'Importer',
diff --git a/resources/lang/no/validation.php b/resources/lang/no/validation.php
index 7f29314d63..c54d299fff 100644
--- a/resources/lang/no/validation.php
+++ b/resources/lang/no/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'Attributtet :attribute er allerede tatt.',
'uploaded' => 'Atribbutet :attribute kunne ikke lastes opp.',
'url' => 'Attributt-formatet :attribute er ugyldig.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Gjeldende passord er feil",
'dumbpwd' => 'Passordet er for vanlig.',
"statuslabel_type" => "Du må velge en gyldig statusetikett-type",
- "unique_undeleted" => ":attribute må være unik.",
],
/*
diff --git a/resources/lang/pl/admin/hardware/message.php b/resources/lang/pl/admin/hardware/message.php
index 2d257004a6..b81718e2aa 100644
--- a/resources/lang/pl/admin/hardware/message.php
+++ b/resources/lang/pl/admin/hardware/message.php
@@ -62,7 +62,8 @@ return array(
'error' => 'Nie mogę wypisać nabytku/zasobu, proszę spróbować ponownie.',
'success' => 'Przypisano nabytek/zasób.',
'user_does_not_exist' => 'Nieprawidłowy użytkownik. Proszę spróbować ponownie.',
- 'not_available' => 'Ten składnik aktywów nie jest dostępny do zamówienia!'
+ 'not_available' => 'Ten składnik aktywów nie jest dostępny do zamówienia!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php
index e020a99139..d4083e2211 100644
--- a/resources/lang/pl/admin/settings/general.php
+++ b/resources/lang/pl/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Wpisz w poniższe pole słowo "DELETE" aby wyczyścić usunięte rekordy. Tej czynności nie da się cofnąć.',
'custom_css' => 'Własny CSS',
'custom_css_help' => 'Wprowadź własny kod CSS. Nie używaj tagów <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' => 'Domyślna Waluta',
'default_eula_text' => 'Domyślna EULA',
'default_language' => 'Domyślny język',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP włączone',
'ldap_integration' => 'Integracja z LDAP',
'ldap_settings' => 'Ustawienia 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' => 'Serwery LDAP',
'ldap_server_help' => 'To powinno się rozpocząć od ldap: / / (dla nieszyfrowanych połączeń) lub ldaps: / / (dla szyfrowanych połączeń)',
'ldap_server_cert' => 'Walidacja certyfikatu SSL dla LDAP',
diff --git a/resources/lang/pl/admin/suppliers/message.php b/resources/lang/pl/admin/suppliers/message.php
index 665d7642f9..6ac4814784 100644
--- a/resources/lang/pl/admin/suppliers/message.php
+++ b/resources/lang/pl/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Dostawca nie istnieje.',
- 'assoc_users' => 'Dostawca jest obecnie powiązany z co najmniej jednym modelem i nie może być usunięty. uaktualnij swoją listę modeli by nie zawierała powiązania z tym dostawcą i spróbuj ponownie. ',
+
'create' => array(
'error' => 'Dostawca nie został utworzony, spróbuj ponownie.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Czy na pewno usunąć tego dostawcę?',
'error' => 'Podczas usuwania dostawcy napotkano błąd. Spróbuj ponownie.',
- 'success' => 'Dostawca usunięty pomyślnie.'
+ 'success' => 'Dostawca usunięty pomyślnie.',
+ 'assoc_assets' => 'Ten dostawca jest obecnie powiązany z :asset_count aktywami i nie może zostać usunięty. Zaktualizuj aktywa aby nie były z nim powiązane i spróbuj ponownie. ',
+ 'assoc_licenses' => 'Ten dostawca jest obecnie powiązany z :licenses_count licencjami i nie może zostać usunięty. Zaktualizuj licencje tak aby do niego nie nawiązywały i spróbuj ponownie. ',
+ '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. ',
)
);
diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php
index d42fc3c114..2fa2e09dd2 100644
--- a/resources/lang/pl/general.php
+++ b/resources/lang/pl/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Akcesoria',
- 'activated' => 'Aktywowana',
+ 'activated' => 'Aktywowana',
'accessory' => 'Akcesorium',
- 'accessory_report' => 'Raporty Akcesoriów',
+ 'accessory_report' => 'Raporty Akcesoriów',
'action' => 'Edycja',
'activity_report' => 'Raport Aktywności',
'address' => 'Adres',
'admin' => 'Admin',
- 'add_seats' => 'Dodano miejsca',
+ 'add_seats' => 'Dodano miejsca',
'all_assets' => 'Wszystkie aktywa',
'all' => 'Wszystko',
'archived' => 'Archiwum',
@@ -40,9 +40,10 @@
'checkout' => 'Przypisz',
'city' => 'Miasto',
'click_here' => 'Kliknij tutaj',
- 'companies' => 'Firmy',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Firmy',
'company' => 'Firma',
- 'component' => 'Składnik',
+ 'component' => 'Składnik',
'components' => 'Składniki',
'complete' => 'Ukończone',
'consumable' => 'Materiał eksploatacyjny',
@@ -58,10 +59,10 @@
'custom_report' => 'Raport niestandardowy składnik aktywów',
'dashboard' => 'Panel główny',
'days' => 'dni',
- 'days_to_next_audit' => 'Dni do następnej inspekcji',
+ 'days_to_next_audit' => 'Dni do następnej inspekcji',
'date' => 'Data',
'debug_warning' => 'Ostrzeżenie!',
- 'debug_warning_text' => 'Ta aplikacja jest uruchomiona w trybie produkcyjnym z włączonym debugowaniem. Jeśli aplikacja jest dostępna na zewnątrz, może to zagrażać ujawnieniem wrażliwych danych. Wyłącz tryb debugowania przez ustawienie wartości APP_DEBUG
w pliku .env
na false
.',
+ 'debug_warning_text' => 'Ta aplikacja jest uruchomiona w trybie produkcyjnym z włączonym debugowaniem. Jeśli aplikacja jest dostępna na zewnątrz, może to zagrażać ujawnieniem wrażliwych danych. Wyłącz tryb debugowania przez ustawienie wartości APP_DEBUG
w pliku .env
na false
.',
'delete' => 'Kasuj',
'deleted' => 'Usunięte',
'delete_seats' => 'Usunięte miejsca',
@@ -89,6 +90,7 @@
'history' => 'Historia',
'history_for' => 'Historia dla',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Usuń zdjęcie',
'image_upload' => 'Dodaj zdjęcie',
'import' => 'Zaimportuj',
diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php
index 3dc8e53ab8..eae368a384 100644
--- a/resources/lang/pl/validation.php
+++ b/resources/lang/pl/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute został już wzięty.',
'uploaded' => 'Nie udało się przesłać atrybutu:.',
'url' => 'Format pola :attribute jest niewłaściwy.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Twoje bieżące hasło jest niepoprawne",
'dumbpwd' => 'To hasło jest zbyt powszechne.',
"statuslabel_type" => "Musisz wybrać odpowiedni typ etykiety statusu",
- "unique_undeleted" => "Atrybut: musi być unikatowy.",
],
/*
diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php
index 1085fa5158..95d1bab9c2 100644
--- a/resources/lang/pt-BR/admin/hardware/message.php
+++ b/resources/lang/pt-BR/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Ativo não foi registrado, favor tentar novamente',
'success' => 'Ativo registrado com sucesso.',
'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.',
- 'not_available' => 'Esse recurso não está disponível para checkout!'
+ 'not_available' => 'Esse recurso não está disponível para checkout!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 3ff7230fb4..3c7e82a673 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Digite o texto "DELETE" na caixa antes de excluir os registros. Este ação não poderá ser deifeita.',
'custom_css' => 'CSS personalizado',
'custom_css_help' => 'Digite quaisquer CSS modificada que você gostaria de usar. Mas não inclua as tags <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' => 'Moeda padrão',
'default_eula_text' => 'EULA Padrão',
'default_language' => 'Idioma Padrão',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP ativo',
'ldap_integration' => 'Integração LDAP',
'ldap_settings' => 'Configurações 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' => 'Deve iniciar com ldap:// (para encriptado ou TLS) ou ldaps:// (para SSL)',
'ldap_server_cert' => 'Validação certificado SSL LDAP',
diff --git a/resources/lang/pt-BR/admin/suppliers/message.php b/resources/lang/pt-BR/admin/suppliers/message.php
index 15d38a2447..22582bf0a5 100644
--- a/resources/lang/pt-BR/admin/suppliers/message.php
+++ b/resources/lang/pt-BR/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'O fornecedor não existe.',
- 'assoc_users' => 'Este fornecedor está no momento associado com pelo menos um modelo e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ',
+
'create' => array(
'error' => 'O fornecedor não foi criado, tente novamente.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Tem certeza de que deseja excluir este fornecedor?',
'error' => 'Houve um problema ao excluir o fornecedor. Tente novamente.',
- 'success' => 'O fornecedor foi excluído com sucesso.'
+ 'success' => 'O fornecedor foi excluído com sucesso.',
+ '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. ',
)
);
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index 9f7a4ad1d0..af6396f088 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Acessórios',
- 'activated' => 'Ativado',
+ 'activated' => 'Ativado',
'accessory' => 'Acessório',
- 'accessory_report' => 'Relatório dispositivo',
+ 'accessory_report' => 'Relatório dispositivo',
'action' => 'Ação',
'activity_report' => 'Relatório de Atividade',
'address' => 'Endereço',
'admin' => 'Administrador',
- 'add_seats' => 'Utilizadores adicionados',
+ 'add_seats' => 'Utilizadores adicionados',
'all_assets' => 'Todos os Ativos',
'all' => 'Todos',
'archived' => 'Arquivado',
@@ -40,9 +40,10 @@
'checkout' => 'Check-out',
'city' => 'Cidade',
'click_here' => 'Clique aqui',
- 'companies' => 'Empresas',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Empresas',
'company' => 'Empresas',
- 'component' => 'Componente',
+ 'component' => 'Componente',
'components' => 'Componentes',
'complete' => 'Completo',
'consumable' => 'Consumíveis',
@@ -58,10 +59,10 @@
'custom_report' => 'Relatório de Ativos Personalizado',
'dashboard' => 'Painel de Controle',
'days' => 'dias',
- 'days_to_next_audit' => 'Dias para próxima auditoria',
+ 'days_to_next_audit' => 'Dias para próxima auditoria',
'date' => 'Data',
'debug_warning' => 'Atenção!',
- 'debug_warning_text' => 'Esta aplicação está em execução no modo de produção com a depuração ativada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desative o modo de depuração mudando o valor de APP_DEBUG
no seu arquivo.env
para false
.',
+ 'debug_warning_text' => 'Esta aplicação está em execução no modo de produção com a depuração ativada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desative o modo de depuração mudando o valor de APP_DEBUG
no seu arquivo.env
para false
.',
'delete' => 'Deletar',
'deleted' => 'Excluído',
'delete_seats' => 'Utilizadores apagados',
@@ -89,6 +90,7 @@
'history' => 'Histórico',
'history_for' => 'Histórico de',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Excluir Imagem',
'image_upload' => 'Carregar Imagem',
'import' => 'Importar',
diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php
index 517424eeb8..48be0c6940 100644
--- a/resources/lang/pt-BR/validation.php
+++ b/resources/lang/pt-BR/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'O :attribute já foi tomado.',
'uploaded' => 'O atributo: não foi possível carregar.',
'url' => 'O formato de :attribute é inválido.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Sua senha atual está incorreta",
'dumbpwd' => 'Essa senha é muito comum.',
"statuslabel_type" => "Você deve selecionar um tipo de etiqueta de status válido",
- "unique_undeleted" => "O atributo deve ser exclusivo.",
],
/*
diff --git a/resources/lang/pt-PT/admin/hardware/message.php b/resources/lang/pt-PT/admin/hardware/message.php
index 07be060221..1a66f84c30 100644
--- a/resources/lang/pt-PT/admin/hardware/message.php
+++ b/resources/lang/pt-PT/admin/hardware/message.php
@@ -62,7 +62,8 @@ return array(
'error' => 'Não foi possível alocar o artigo, por favor tente novamente',
'success' => 'Artigo alocado com sucesso.',
'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.',
- 'not_available' => 'Esse recurso não está disponível para checkout!'
+ 'not_available' => 'Esse recurso não está disponível para checkout!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index 758e456f92..37d2abe910 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Escreva o texto "DELETE" na caixa abaixo para remover os registos eliminados. Esta ação não pode ser desfeita.',
'custom_css' => 'CSS Personalizado',
'custom_css_help' => 'Insira o CSS personalizado que deseja utilizar. Não use as 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' => 'Moeda padrão',
'default_eula_text' => 'EULA padrão',
'default_language' => 'Idioma predefinido',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP ativo',
'ldap_integration' => 'Integração LDAP',
'ldap_settings' => 'Configurações 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' => 'Isso deve começar com ldap: / / (para não-criptado ou TLS) ou ldaps: / / (para SSL)',
'ldap_server_cert' => 'Validação certificado SSL LDAP',
diff --git a/resources/lang/pt-PT/admin/suppliers/message.php b/resources/lang/pt-PT/admin/suppliers/message.php
index dd2ea64c85..2793283bed 100644
--- a/resources/lang/pt-PT/admin/suppliers/message.php
+++ b/resources/lang/pt-PT/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Fornecedor não existente.',
- 'assoc_users' => 'Este Fornecedor está associado com pelo menos um modelo e não pode ser removido. Atualize os seus modelos para que não referenciem esta categoria e tente novamente. ',
+
'create' => array(
'error' => 'Não foi possível criar o Fornecedor, por favor tente novamente.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Tem a certeza que pretende remover este fornecedor?',
'error' => 'Ocorreu um problema ao remover este fornecedor. Por favor, tente novamente.',
- 'success' => 'Fornecedor removido com sucesso.'
+ 'success' => 'Fornecedor removido com sucesso.',
+ '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. ',
)
);
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index da85fa7f4c..3587898bec 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Acessórios',
- 'activated' => 'Activado',
+ 'activated' => 'Activado',
'accessory' => 'Acessório',
- 'accessory_report' => 'Relatório de Acessório',
+ 'accessory_report' => 'Relatório de Acessório',
'action' => 'Ação',
'activity_report' => 'Relatório de atividades',
'address' => 'Morada',
'admin' => 'Administração',
- 'add_seats' => 'Utilizadores adicionados',
+ 'add_seats' => 'Utilizadores adicionados',
'all_assets' => 'Todos os Artigos',
'all' => 'Todos',
'archived' => 'Arquivado',
@@ -40,9 +40,10 @@
'checkout' => 'Alocar',
'city' => 'Cidade',
'click_here' => 'Clique aqui',
- 'companies' => 'Empresas',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Empresas',
'company' => 'Empresa',
- 'component' => 'Componente',
+ 'component' => 'Componente',
'components' => 'Componentes',
'complete' => 'Completo',
'consumable' => 'Consumível',
@@ -58,10 +59,10 @@
'custom_report' => 'Relatório de Artigo personalizado',
'dashboard' => 'Dashboard',
'days' => 'dias',
- 'days_to_next_audit' => 'Dias para próxima auditoria',
+ 'days_to_next_audit' => 'Dias para próxima auditoria',
'date' => 'Data',
'debug_warning' => 'Atenção!',
- 'debug_warning_text' => 'Esta aplicação está em execução no modo de produção com a depuração activada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desactive o modo de depuração mudando o valor de APP_DEBUG
no teu ficheiro .env
para false
.',
+ 'debug_warning_text' => 'Esta aplicação está em execução no modo de produção com a depuração activada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desactive o modo de depuração mudando o valor de APP_DEBUG
no teu ficheiro .env
para false
.',
'delete' => 'Remover',
'deleted' => 'Removidos',
'delete_seats' => 'Utilizadores apagados',
@@ -89,6 +90,7 @@
'history' => 'Histórico',
'history_for' => 'Histórico para',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Apagar imagem',
'image_upload' => 'Carregar Imagem',
'import' => 'Importar',
diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php
index 6ca869d397..8e7070587f 100644
--- a/resources/lang/pt-PT/validation.php
+++ b/resources/lang/pt-PT/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'Este :attribute já existe.',
'uploaded' => 'O atributo: não foi possível carregar.',
'url' => 'O formato do :attribute é inválido.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Sua senha atual está incorreta",
'dumbpwd' => 'Essa senha é muito comum.',
"statuslabel_type" => "Você deve selecionar um tipo de etiqueta de status válido",
- "unique_undeleted" => "O atributo deve ser exclusivo.",
],
/*
diff --git a/resources/lang/ro/admin/hardware/message.php b/resources/lang/ro/admin/hardware/message.php
index 763790e8d6..da10154c5b 100644
--- a/resources/lang/ro/admin/hardware/message.php
+++ b/resources/lang/ro/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Activul nu a fost predat, va rugam incercati iar',
'success' => 'Activul a fost predat.',
'user_does_not_exist' => 'Utilizatorul este invalid. Va rugam incercati iar.',
- 'not_available' => 'Activul respectiv nu este disponibil pentru checkout!'
+ 'not_available' => 'Activul respectiv nu este disponibil pentru checkout!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php
index ea4686a846..7085233b9c 100644
--- a/resources/lang/ro/admin/settings/general.php
+++ b/resources/lang/ro/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Introduceți textul "DELETE" în caseta de mai jos pentru a elimina înregistrările șterse. Această acțiune nu poate fi anulată.',
'custom_css' => 'CSS personalizat',
'custom_css_help' => 'Introduceți orice suprascrieri personalizate CSS pe care doriți să le utilizați. Nu includeți etichetele <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' => 'Moneda implicita',
'default_eula_text' => 'EULA implicita',
'default_language' => 'Limba implicita',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP activat',
'ldap_integration' => 'Integrarea LDAP',
'ldap_settings' => 'Setări 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' => 'Acest lucru ar trebui să înceapă cu ldap: // (pentru TCP sau TLS) sau ldaps: // (pentru SSL)',
'ldap_server_cert' => 'Validarea certificatelor SSL pentru LDAP',
diff --git a/resources/lang/ro/admin/suppliers/message.php b/resources/lang/ro/admin/suppliers/message.php
index 1e3f478e8a..91ccc15767 100644
--- a/resources/lang/ro/admin/suppliers/message.php
+++ b/resources/lang/ro/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Furnizorul nu exista.',
- 'assoc_users' => 'Acest furnizor este momentan asociat cu cel putin un model si nu poate fi sters. Va rugam actualizati modelele asociate acestui furnizor si incercati iar. ',
+
'create' => array(
'error' => 'Furnizorul nu a fost creat, va rugam incercati iar.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Sunteti sigur ca vreti sa stergeti acest furnizor?',
'error' => 'A aparut o problema la stergerea furnizorului. Va rugam incercati iar.',
- 'success' => 'Furnizorul a fost sters.'
+ 'success' => 'Furnizorul a fost sters.',
+ '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. ',
)
);
diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php
index ef1e3b1516..a59c3d713d 100644
--- a/resources/lang/ro/general.php
+++ b/resources/lang/ro/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Accesorii',
- 'activated' => 'activat',
+ 'activated' => 'activat',
'accessory' => 'Accesorii',
- 'accessory_report' => 'Raportul accesoriu',
+ 'accessory_report' => 'Raportul accesoriu',
'action' => 'Acțiune',
'activity_report' => 'Raport de activitate',
'address' => 'Adresa',
'admin' => 'Admin',
- 'add_seats' => 'Adăugat scaune',
+ 'add_seats' => 'Adăugat scaune',
'all_assets' => 'Toate activele',
'all' => 'Toate',
'archived' => 'Arhivat',
@@ -40,9 +40,10 @@
'checkout' => 'Preda',
'city' => 'Oras',
'click_here' => 'Click aici',
- 'companies' => 'Companii',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Companii',
'company' => 'Companie',
- 'component' => 'component',
+ 'component' => 'component',
'components' => 'Componente',
'complete' => 'Complet',
'consumable' => 'Consumabil',
@@ -58,10 +59,10 @@
'custom_report' => 'Raport active custom',
'dashboard' => 'Bord',
'days' => 'zi',
- 'days_to_next_audit' => 'Zile până la următorul audit',
+ 'days_to_next_audit' => 'Zile până la următorul audit',
'date' => 'Data',
'debug_warning' => 'Avertizare!',
- 'debug_warning_text' => 'Această aplicație rulează în modul de producție cu debugging activat. Acest lucru poate expune date sensibile dacă aplicația dvs. este accesibilă lumii exterioare. Dezactivați modul de depanare setând valoarea APP_DEBUG
din fișierul .env
la false
.',
+ 'debug_warning_text' => 'Această aplicație rulează în modul de producție cu debugging activat. Acest lucru poate expune date sensibile dacă aplicația dvs. este accesibilă lumii exterioare. Dezactivați modul de depanare setând valoarea APP_DEBUG
din fișierul .env
la false
.',
'delete' => 'Sterge',
'deleted' => 'Sters',
'delete_seats' => 'Locurile șterse',
@@ -89,6 +90,7 @@
'history' => 'Istorie',
'history_for' => 'Istoric pentru',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Sterge poza',
'image_upload' => 'Incarca poza',
'import' => 'Import',
diff --git a/resources/lang/ro/validation.php b/resources/lang/ro/validation.php
index 159bab26ec..bce490274d 100644
--- a/resources/lang/ro/validation.php
+++ b/resources/lang/ro/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute este deja folosit.',
'uploaded' => 'Atributul: nu a reușit să se încarce.',
'url' => 'Formatul :attribute nu este valid.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Parola curentă este incorectă",
'dumbpwd' => 'Această parolă este prea obișnuită.',
"statuslabel_type" => "Trebuie să selectați un tip de etichetă de stare validă",
- "unique_undeleted" => "Atributul: trebuie să fie unic.",
],
/*
diff --git a/resources/lang/ru/admin/hardware/message.php b/resources/lang/ru/admin/hardware/message.php
index fdb09e8175..ac7c076224 100644
--- a/resources/lang/ru/admin/hardware/message.php
+++ b/resources/lang/ru/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(
diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php
index 7dbde659cf..5e9855049e 100644
--- a/resources/lang/ru/admin/settings/general.php
+++ b/resources/lang/ru/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' => 'Пользовательское соглашение по умолчанию',
'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',
diff --git a/resources/lang/ru/admin/suppliers/message.php b/resources/lang/ru/admin/suppliers/message.php
index 45d8609780..35f20ee7f4 100644
--- a/resources/lang/ru/admin/suppliers/message.php
+++ b/resources/lang/ru/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' => 'Этот поставщик в настоящее время связан с :asset_count активом(активами) и не может быть удален. Обновите свои активы, чтобы больше не ссылаться на этого поставщика и повторите попытку. ',
+ 'assoc_licenses' => 'Этот поставщик в настоящее время связан с: license_count лицензией(лицензиями) и не может быть удален. Обновите свои лицензии, чтобы больше не ссылаться на этого поставщика и повторите попытку. ',
+ 'assoc_maintenances' => 'Этот поставщик в настоящее время связан с:asset_maintenances_count активом(активами)на обслуживании и не может быть удален. Пожалуйста, обновите информацию о своих активах на ремонте, чтобы больше не ссылаться на этого поставщика и повторите попытку. ',
)
);
diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php
index 236a805fea..79018c4995 100644
--- a/resources/lang/ru/general.php
+++ b/resources/lang/ru/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Аксессуары',
- 'activated' => 'Активно',
+ 'activated' => 'Активно',
'accessory' => 'Аксессуар',
- 'accessory_report' => 'Отчёт по аксессуарам',
+ 'accessory_report' => 'Отчёт по аксессуарам',
'action' => 'Действие',
'activity_report' => 'Oтчет о деятельности',
'address' => 'Адрес',
'admin' => 'Администратор',
- 'add_seats' => 'Рабочих мест',
+ 'add_seats' => 'Рабочих мест',
'all_assets' => 'Все активы',
'all' => 'Все',
'archived' => 'Архивные',
@@ -40,9 +40,10 @@
'checkout' => 'Отвязать',
'city' => 'Город',
'click_here' => 'Нажмите здесь',
- 'companies' => 'Компании',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Компании',
'company' => 'Компания',
- 'component' => 'Компонент',
+ 'component' => 'Компонент',
'components' => 'Компоненты',
'complete' => 'Завершен',
'consumable' => 'Расходный материал',
@@ -58,10 +59,10 @@
'custom_report' => 'Пользовательский отчет по активам',
'dashboard' => 'Панель мониторинга',
'days' => 'дней',
- 'days_to_next_audit' => 'Дней на следующий аудит',
+ 'days_to_next_audit' => 'Дней на следующий аудит',
'date' => 'Дата',
'debug_warning' => 'Предупреждение!',
- 'debug_warning_text' => 'Это приложение выполняется в режиме с включенной отладкой. Это может нарушить конфиденциальность данных, если приложение доступно для внешнего мира. Отключите режим отладки, поменяв значение APP_DEBUG
в файле .env
на false
.',
+ 'debug_warning_text' => 'Это приложение выполняется в режиме с включенной отладкой. Это может нарушить конфиденциальность данных, если приложение доступно для внешнего мира. Отключите режим отладки, поменяв значение APP_DEBUG
в файле .env
на false
.',
'delete' => 'Удалить',
'deleted' => 'Удалено',
'delete_seats' => 'Удаленные лицензии',
@@ -89,6 +90,7 @@
'history' => 'История',
'history_for' => 'История для',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Удалить изображение',
'image_upload' => 'Загрузить изображение',
'import' => 'Импорт',
diff --git a/resources/lang/ru/validation.php b/resources/lang/ru/validation.php
index 7d1f9b3a3c..db95b0daf9 100644
--- a/resources/lang/ru/validation.php
+++ b/resources/lang/ru/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" => "Атрибут: должен быть уникальным.",
],
/*
diff --git a/resources/lang/sv-SE/admin/hardware/message.php b/resources/lang/sv-SE/admin/hardware/message.php
index 6d8398b055..450e40b50d 100644
--- a/resources/lang/sv-SE/admin/hardware/message.php
+++ b/resources/lang/sv-SE/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Tillgången utcheckades inte, försök igen',
'success' => 'Tillgången checkas ut framgångsrikt.',
'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.',
- 'not_available' => 'Den tillgången är inte tillgänglig för kassan!'
+ 'not_available' => 'Den tillgången är inte tillgänglig för kassan!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index d0242ac135..1a5c53280c 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Skriv texten "DELETE" i fältet nedan för att tömma dina borttagna poster. Detta går ej att ångra.',
'custom_css' => 'Anpassad CSS',
'custom_css_help' => 'Fyll i eventuella anpassade CSS-överskridningar du vill använda. Inkludera inte <style></style> taggar.',
+ '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' => 'Standardspråk',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP aktiverad',
'ldap_integration' => 'LDAP-integration',
'ldap_settings' => 'LDAP-inställningar',
+ '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' => 'Detta bör börja med ldap: // (för okrypterad eller TLS) eller ldaps: // (för SSL)',
'ldap_server_cert' => 'Validering av LDAP SSL-certifikat',
diff --git a/resources/lang/sv-SE/admin/suppliers/message.php b/resources/lang/sv-SE/admin/suppliers/message.php
index 50376cb520..f6ceb60d2d 100644
--- a/resources/lang/sv-SE/admin/suppliers/message.php
+++ b/resources/lang/sv-SE/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Leverantören finns inte.',
- 'assoc_users' => 'Denna leverantör är för närvarande associerad med minst en modell och kan inte raderas. Vänligen uppdatera dina modeller för att inte längre referera till denna leverantör och försök igen.',
+
'create' => array(
'error' => 'Leverantören skapades inte, var god försök igen.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Är du säker på att du vill radera denna leverantör?',
'error' => 'Det var ett problem att ta bort leverantören. Var god försök igen.',
- 'success' => 'Leverantören har tagits bort.'
+ 'success' => 'Leverantören har tagits bort.',
+ '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. ',
)
);
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index d16a8f9d8b..6d0968048c 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Tillbehör',
- 'activated' => 'Aktiverad',
+ 'activated' => 'Aktiverad',
'accessory' => 'Tillbehör',
- 'accessory_report' => 'Tillbehörsrapport',
+ 'accessory_report' => 'Tillbehörsrapport',
'action' => 'Åtgärd',
'activity_report' => 'Aktivitets Rapport',
'address' => 'Adress',
'admin' => 'Administratör',
- 'add_seats' => 'Tillagda platser',
+ 'add_seats' => 'Tillagda platser',
'all_assets' => 'Alla Tillgångar',
'all' => 'Alla',
'archived' => 'Arkiverad',
@@ -40,9 +40,10 @@
'checkout' => 'Checka ut',
'city' => 'Ort',
'click_here' => 'Klicka här',
- 'companies' => 'Företag',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Företag',
'company' => 'Företag',
- 'component' => 'Komponent',
+ 'component' => 'Komponent',
'components' => 'Komponenter',
'complete' => 'Komplett',
'consumable' => 'Förbrukningsmaterial',
@@ -58,10 +59,10 @@
'custom_report' => 'Anpassad tillgångsrapport',
'dashboard' => 'Översikt',
'days' => 'dagar',
- 'days_to_next_audit' => 'Dagar till nästa revision',
+ 'days_to_next_audit' => 'Dagar till nästa revision',
'date' => 'Datum',
'debug_warning' => 'Varning!',
- 'debug_warning_text' => 'Programmet körs i produktionsläge med debugging aktiverat. Detta kan avslöja känslig data om din ansökan är tillgänglig för omvärlden. Inaktivera felsökningsläge genom att ange värdet APP_DEBUG
i filen .env
till false
.',
+ 'debug_warning_text' => 'Programmet körs i produktionsläge med debugging aktiverat. Detta kan avslöja känslig data om din ansökan är tillgänglig för omvärlden. Inaktivera felsökningsläge genom att ange värdet APP_DEBUG
i filen .env
till false
.',
'delete' => 'Ta bort',
'deleted' => 'Raderad',
'delete_seats' => 'Borttagna platser',
@@ -89,6 +90,7 @@
'history' => 'Historik',
'history_for' => 'Historik för',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Ta bort Bild',
'image_upload' => 'Ladda upp Bild',
'import' => 'Importera',
diff --git a/resources/lang/sv-SE/validation.php b/resources/lang/sv-SE/validation.php
index a1005f9199..a77cd0a400 100644
--- a/resources/lang/sv-SE/validation.php
+++ b/resources/lang/sv-SE/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'Attributet har redan tagits.',
'uploaded' => 'Attributet misslyckades att ladda upp.',
'url' => 'Attributet formatet är ogiltigt.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Ditt nuvarande lösenord är felaktigt",
'dumbpwd' => 'Det lösenordet är för vanligt.',
"statuslabel_type" => "Du måste välja en giltig status etikett typ",
- "unique_undeleted" => "Attributet måste vara unikt.",
],
/*
diff --git a/resources/lang/ta/admin/hardware/message.php b/resources/lang/ta/admin/hardware/message.php
index 1a8e4be197..b20d58cde0 100644
--- a/resources/lang/ta/admin/hardware/message.php
+++ b/resources/lang/ta/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(
diff --git a/resources/lang/ta/admin/settings/general.php b/resources/lang/ta/admin/settings/general.php
index bb4cc4a055..22944f38da 100644
--- a/resources/lang/ta/admin/settings/general.php
+++ b/resources/lang/ta/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' => 'LDAP SSL சான்றிதழ் சரிபார்ப்பு',
diff --git a/resources/lang/ta/admin/suppliers/message.php b/resources/lang/ta/admin/suppliers/message.php
index 642f719868..ddbc83b463 100644
--- a/resources/lang/ta/admin/suppliers/message.php
+++ b/resources/lang/ta/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. ',
)
);
diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php
index 5cefca47fe..de400e993e 100644
--- a/resources/lang/ta/general.php
+++ b/resources/lang/ta/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'கருவிகள்',
- 'activated' => 'இயக்கப்பட்டது',
+ 'activated' => 'இயக்கப்பட்டது',
'accessory' => 'துணை',
- 'accessory_report' => 'துணை குறிப்பு',
+ 'accessory_report' => 'துணை குறிப்பு',
'action' => 'அதிரடி',
'activity_report' => 'செயல்பாட்டு அறிக்கை',
'address' => 'முகவரி',
'admin' => 'நிர்வாகம்',
- 'add_seats' => 'சேர்க்கப்பட்டது இடங்கள்',
+ 'add_seats' => 'சேர்க்கப்பட்டது இடங்கள்',
'all_assets' => 'அனைத்து சொத்துகளும்',
'all' => 'அனைத்து',
'archived' => 'காப்பகப்படுத்தியவை',
@@ -40,9 +40,10 @@
'checkout' => 'வெளியேறுதல்',
'city' => 'பெருநகரம்',
'click_here' => 'இங்கே கிளிக் செய்யவும்',
- 'companies' => 'நிறுவனங்கள்',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'நிறுவனங்கள்',
'company' => 'நிறுவனம்',
- 'component' => 'உபகரண',
+ 'component' => 'உபகரண',
'components' => 'கூறுகள்',
'complete' => 'முழுமையான',
'consumable' => 'பயன்படுத்தக்கூடிய',
@@ -58,10 +59,10 @@
'custom_report' => 'விருப்ப சொத்து அறிக்கை',
'dashboard' => 'டாஷ்போர்டு',
'days' => 'நாட்களில்',
- 'days_to_next_audit' => 'அடுத்த ஆடிட்டிற்கு நாட்கள்',
+ 'days_to_next_audit' => 'அடுத்த ஆடிட்டிற்கு நாட்கள்',
'date' => 'தேதி',
'debug_warning' => 'எச்சரிக்கை!',
- 'debug_warning_text' => 'இயல்பான பிழைத்திருத்தத்துடன் இந்த பயன்பாட்டை உற்பத்தி முறையில் இயக்கும். வெளிப்புற உலகத்திற்கு உங்கள் பயன்பாடு அணுகக்கூடியதாக இருந்தால் இது முக்கியமான தரவுகளை அம்பலப்படுத்தலாம். உங்கள் .env
கோப்பில் false
இல் APP_DEBUG
மதிப்பை அமைப்பதன் மூலம் பிழைத்திருத்த முடையை முடக்கு.',
+ 'debug_warning_text' => 'இயல்பான பிழைத்திருத்தத்துடன் இந்த பயன்பாட்டை உற்பத்தி முறையில் இயக்கும். வெளிப்புற உலகத்திற்கு உங்கள் பயன்பாடு அணுகக்கூடியதாக இருந்தால் இது முக்கியமான தரவுகளை அம்பலப்படுத்தலாம். உங்கள் .env
கோப்பில் false
இல் APP_DEBUG
மதிப்பை அமைப்பதன் மூலம் பிழைத்திருத்த முடையை முடக்கு.',
'delete' => 'அழி',
'deleted' => 'நீக்கப்பட்ட',
'delete_seats' => 'நீக்கப்பட்ட இடங்கள்',
@@ -89,6 +90,7 @@
'history' => 'வரலாறு',
'history_for' => 'வரலாறு',
'id' => 'ஐடி',
+ 'image' => 'Image',
'image_delete' => 'படத்தை நீக்கு',
'image_upload' => 'படத்தை பதிவேற்றம் செய்யவும்',
'import' => 'இறக்குமதி',
diff --git a/resources/lang/ta/validation.php b/resources/lang/ta/validation.php
index 3d1b60bcce..3bdf57ecbb 100644
--- a/resources/lang/ta/validation.php
+++ b/resources/lang/ta/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" => "பண்பு: பண்பு தனித்துவமானது.",
],
/*
diff --git a/resources/lang/th/admin/hardware/message.php b/resources/lang/th/admin/hardware/message.php
index d18982a2bc..c049a8c242 100644
--- a/resources/lang/th/admin/hardware/message.php
+++ b/resources/lang/th/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(
diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php
index 1d1546e335..cccec84309 100644
--- a/resources/lang/th/admin/settings/general.php
+++ b/resources/lang/th/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'ป้อนข้อความ "DELETE" ในช่องด้านล่างเพื่อล้างระเบียนที่ลบไป ไม่สามารถยกเลิกการดำเนินการนี้ได้',
'custom_css' => 'กำหนด CSS เอง',
'custom_css_help' => 'ระบุการกำหนด CSS ที่คุณต้องการใช้แทน ห้ามรวม tags นี้ <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 แล้ว',
'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: // (สำหรับ unencrypted หรือ TLS) หรือ ldaps: // (สำหรับ SSL)',
'ldap_server_cert' => 'การตรวจสอบใบรับรอง SSL LDAP',
diff --git a/resources/lang/th/admin/suppliers/message.php b/resources/lang/th/admin/suppliers/message.php
index c6fd10a99c..f95787c4db 100644
--- a/resources/lang/th/admin/suppliers/message.php
+++ b/resources/lang/th/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. ',
)
);
diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php
index 20b632ab9a..48c7b057d9 100644
--- a/resources/lang/th/general.php
+++ b/resources/lang/th/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'อุปกรณ์',
- 'activated' => 'เปิดใช้งาน',
+ 'activated' => 'เปิดใช้งาน',
'accessory' => 'อุปกรณ์',
- 'accessory_report' => 'รายงานอุปกรณ์เสริม',
+ 'accessory_report' => 'รายงานอุปกรณ์เสริม',
'action' => 'ดำเนินการ',
'activity_report' => 'รายงานกิจกรรม',
'address' => 'ที่อยู่',
'admin' => 'ผู้ดูแลระบบ',
- 'add_seats' => 'เพิ่มที่นั่งแล้ว',
+ 'add_seats' => 'เพิ่มที่นั่งแล้ว',
'all_assets' => 'ทรัพย์สินทั้งหมด',
'all' => 'ทั้งหมด',
'archived' => 'ถูกเก็บไว้',
@@ -40,9 +40,10 @@
'checkout' => 'เช็คเอาท์',
'city' => 'เมือง',
'click_here' => 'คลิกที่นี่',
- 'companies' => 'บริษัท',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'บริษัท',
'company' => 'บริษัท',
- 'component' => 'ตัวแทน',
+ 'component' => 'ตัวแทน',
'components' => 'ส่วนประกอบ',
'complete' => 'สมบูรณ์',
'consumable' => 'การใช้งาน',
@@ -58,10 +59,10 @@
'custom_report' => 'รายงานทรัพย์สินแบบกำหนดเอง',
'dashboard' => 'หน้าหลัก',
'days' => 'วัน',
- 'days_to_next_audit' => 'วันที่จะตรวจสอบถัดไป',
+ 'days_to_next_audit' => 'วันที่จะตรวจสอบถัดไป',
'date' => 'วันเดือนปี',
'debug_warning' => 'คำเตือน!',
- 'debug_warning_text' => 'แอ็พพลิเคชันนี้กำลังทำงานในโหมดการผลิตโดยเปิดใช้งานดีบัก ข้อมูลนี้สามารถเปิดเผยข้อมูลที่ละเอียดอ่อนหากแอปพลิเคชันของคุณสามารถเข้าถึงโลกภายนอกได้ ปิดใช้งานโหมดดีบั๊กโดยการตั้งค่า APP_DEBUG
ในไฟล์ .env
ของคุณเป็น false
',
+ 'debug_warning_text' => 'แอ็พพลิเคชันนี้กำลังทำงานในโหมดการผลิตโดยเปิดใช้งานดีบัก ข้อมูลนี้สามารถเปิดเผยข้อมูลที่ละเอียดอ่อนหากแอปพลิเคชันของคุณสามารถเข้าถึงโลกภายนอกได้ ปิดใช้งานโหมดดีบั๊กโดยการตั้งค่า APP_DEBUG
ในไฟล์ .env
ของคุณเป็น false
',
'delete' => 'ลบ',
'deleted' => 'ลบแล้ว',
'delete_seats' => 'ลบที่นั่งแล้ว',
@@ -89,6 +90,7 @@
'history' => 'ประวัติศาสตร์',
'history_for' => 'ประวัติของ',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'ลบรูปภาพประจำตัว',
'image_upload' => 'อัพโหลดภาพ',
'import' => 'นำเข้า',
diff --git a/resources/lang/th/validation.php b/resources/lang/th/validation.php
index 3d617fc296..059faa5016 100644
--- a/resources/lang/th/validation.php
+++ b/resources/lang/th/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" => "แอตทริบิวต์ต้องไม่ซ้ำกัน",
],
/*
diff --git a/resources/lang/tr/admin/hardware/message.php b/resources/lang/tr/admin/hardware/message.php
index 09feac498d..76724454c2 100644
--- a/resources/lang/tr/admin/hardware/message.php
+++ b/resources/lang/tr/admin/hardware/message.php
@@ -62,7 +62,8 @@ return array(
'error' => 'Demirbaş çıkışı yapılamadı. Lütfen tekrar deneyin',
'success' => 'Demirbaş çıkışı yapıldı.',
'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.',
- 'not_available' => 'Bu varlık için atama yapılamaz!'
+ 'not_available' => 'Bu varlık için atama yapılamaz!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php
index c4db82a8f3..f957f7b47b 100644
--- a/resources/lang/tr/admin/settings/general.php
+++ b/resources/lang/tr/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Silinmiş kayıtları temizlemek için kutuya "DELETE" yazın. Bu işlem alınamaz. SON KARARIN MI ???',
'custom_css' => 'Özel CSS',
'custom_css_help' => 'Kullanmak istediğiniz özel CSS geçersiz. <style></style> etiketlerini kullanmayın.',
+ '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' => 'Varsayılan Para Birimi',
'default_eula_text' => 'Varsayılan Sözleşme',
'default_language' => 'Varsayılan Dil',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'LDAP etkin',
'ldap_integration' => 'LDAP Entegrasyonu',
'ldap_settings' => 'LDAP Ayarları',
+ '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 Sunucu',
'ldap_server_help' => 'ldap:// (şifrelenmemiş veya TLS) veya ldaps:// (SSL için) ile başlamalıdır',
'ldap_server_cert' => 'LDAP SSL sertifikası doğrulama',
diff --git a/resources/lang/tr/admin/suppliers/message.php b/resources/lang/tr/admin/suppliers/message.php
index 5621831fc9..f9a7f5f4a2 100644
--- a/resources/lang/tr/admin/suppliers/message.php
+++ b/resources/lang/tr/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Tedarikçi mevcut değil.',
- 'assoc_users' => 'Bu kategori en az 1 adet model ile ilişkili ve silinemez. Lütfen Modelleri güncelleyerek bu kategori ile bağını kesin ve tekrar deneyin. ',
+
'create' => array(
'error' => 'Tedarikçi oluşturulamadı, lütfen tekrar deneyin.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Tedarikçiyi silmek istediğinize emin misiniz?',
'error' => 'Tedarikçi silinirken bir hata oluştu. Lütfen tekrar deneyin.',
- 'success' => 'Tedarikçi silindi.'
+ 'success' => 'Tedarikçi silindi.',
+ '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. ',
)
);
diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php
index 82a0526137..61b10c3897 100644
--- a/resources/lang/tr/general.php
+++ b/resources/lang/tr/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Aksesuarlar',
- 'activated' => 'Aktif edildi',
+ 'activated' => 'Aktif edildi',
'accessory' => 'Aksesuar',
- 'accessory_report' => 'Aksesuar Raporu',
+ 'accessory_report' => 'Aksesuar Raporu',
'action' => 'Hareket',
'activity_report' => 'Aktivite Raporu',
'address' => 'Adres',
'admin' => 'Yönetici',
- 'add_seats' => 'Eklenen kişi sayısı',
+ 'add_seats' => 'Eklenen kişi sayısı',
'all_assets' => 'Tüm Demirbaşlar',
'all' => 'Tümü',
'archived' => 'Arşivlenmiş',
@@ -40,9 +40,10 @@
'checkout' => 'Atama',
'city' => 'Şehir',
'click_here' => 'Buraya Tıklayın',
- 'companies' => 'Şirketler',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Şirketler',
'company' => 'Şirket',
- 'component' => 'Bileşen',
+ 'component' => 'Bileşen',
'components' => 'Bileşenler',
'complete' => 'Tamamla',
'consumable' => 'Sarf Malzeme',
@@ -58,10 +59,10 @@
'custom_report' => 'Özel demirbaş raporu',
'dashboard' => 'Pano',
'days' => 'günler',
- 'days_to_next_audit' => 'Sonraki Denetime Günden Gün Sayısı',
+ 'days_to_next_audit' => 'Sonraki Denetime Günden Gün Sayısı',
'date' => 'Tarih',
'debug_warning' => 'Uyarı!',
- 'debug_warning_text' => 'Bu uygulama, hata ayıklamanın etkin olduğu üretim modunda çalışıyor. Bu, hassas verilerinizi, uygulamanıza dış dünyadan erişebilirse ortaya çıkarabilir. Ayarını yaparak hata ayıklama modunu devre dışı bırakın. APP_DEBUG
value in your .env
file to false
.
+ 'debug_warning_text' => 'Bu uygulama, hata ayıklamanın etkin olduğu üretim modunda çalışıyor. Bu, hassas verilerinizi, uygulamanıza dış dünyadan erişebilirse ortaya çıkarabilir. Ayarını yaparak hata ayıklama modunu devre dışı bırakın. APP_DEBUG
value in your .env
file to false
.
Context | Request Context
',
@@ -92,6 +93,7 @@ Context | Request Context
'history' => 'Geçmiş',
'history_for' => 'Kullanıcı geçmişi',
'id' => 'Kimlik',
+ 'image' => 'Image',
'image_delete' => 'Resmi sil',
'image_upload' => 'Resim yükle',
'import' => 'İçeri aktar',
diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php
index 26fa5bccba..e67ec04924 100644
--- a/resources/lang/tr/validation.php
+++ b/resources/lang/tr/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute zaten alınmış.',
'uploaded' => ': Özniteliği yüklenemedi.',
'url' => ':attribute biçim geçersiz.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Geçerli şifre yanlış",
'dumbpwd' => 'Bu şifre çok yaygındır.',
"statuslabel_type" => "Geçerli bir durum etiketi türü seçmelisiniz",
- "unique_undeleted" => ": Özniteliği benzersiz olmalıdır.",
],
/*
diff --git a/resources/lang/vi/admin/hardware/message.php b/resources/lang/vi/admin/hardware/message.php
index eb0d469176..55070e3930 100644
--- a/resources/lang/vi/admin/hardware/message.php
+++ b/resources/lang/vi/admin/hardware/message.php
@@ -62,7 +62,8 @@ return array(
'error' => 'Tài sản chưa được checkout, xin vui lòng thử lại',
'success' => 'Tài sản đã checkout thành công.',
'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.',
- 'not_available' => 'Tài sản đó không có sẵn để thanh toán!'
+ 'not_available' => 'Tài sản đó không có sẵn để thanh toán!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php
index 6c2c7cb811..005656ca73 100644
--- a/resources/lang/vi/admin/settings/general.php
+++ b/resources/lang/vi/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Nhập văn bản "DELETE" vào hộp dưới đây để xóa các bản ghi đã xóa của bạn. Hành động này không thể được hoàn tác.',
'custom_css' => 'CSS tùy chỉnh',
'custom_css_help' => 'Nhập bất kỳ CSS tùy chỉnh. Không bao gồm thẻ <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' => 'Tiền tệ mặc định',
'default_eula_text' => 'EULA mặc định',
'default_language' => 'Ngôn ngữ mặc định',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'Bật LDAP',
'ldap_integration' => 'Tích hợp LDAP',
'ldap_settings' => 'Cài đặt 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' => 'Máy chủ LDAP',
'ldap_server_help' => 'Điều này sẽ bắt đầu với ldap: // (cho không mã hóa hoặc TLS) hoặc ldaps: // (cho SSL)',
'ldap_server_cert' => 'Xác thực giấy chứng nhận LDAP SSL',
diff --git a/resources/lang/vi/admin/suppliers/message.php b/resources/lang/vi/admin/suppliers/message.php
index 666c9ce205..e40bdf0eb9 100644
--- a/resources/lang/vi/admin/suppliers/message.php
+++ b/resources/lang/vi/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Nhà cung cấp không tồn tại.',
- 'assoc_users' => 'Nhà cung cấp này hiện tại đang liên kết với ít nhất một kiểu tài sản và không thể xóa. Xin vui lòng cập nhật kiểu tài sản để không còn liên kết đến nhà cung cấp này và thử lại. ',
+
'create' => array(
'error' => 'Nhà cung cấp chưa được tạo, xin thử lại.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Bạn có chắc muốn xóa nhà cung cấp này?',
'error' => 'Có vấn đề xảy ra khi xóa nhà cung cấp. Xin thử lại.',
- 'success' => 'Nhà cung cấp đã xóa thành công.'
+ 'success' => 'Nhà cung cấp đã xóa thành công.',
+ 'assoc_assets' => 'Nhà cung cấp này hiện tại đang có liên kết với: asset_count tài sản và không thể xóa. Xin vui lòng cập nhật các tài sản để không còn liên kết với nhà cung cấp này và thử lại. ',
+ 'assoc_licenses' => 'Nhà cung cấp này hiện tại đang có liên kết với: licenses_count license(s) và không thể xóa. Xin vui lòng cập nhật các licence để không còn liên kết với nhà cung cấp này và thử lại. ',
+ 'assoc_maintenances' => 'Nhà cung cấp này hiện tại đang có liên kết với: asset_maintainces_count tài sản đang trong trạng thái bảo trì và không thể xóa. Xin vui lòng cập nhật các tài sản đó để không còn liên kết với nhà cung cấp này và thử lại. ',
)
);
diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php
index a6818c66a4..9e2ad505f1 100644
--- a/resources/lang/vi/general.php
+++ b/resources/lang/vi/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Phụ kiện',
- 'activated' => 'Kích hoạt',
+ 'activated' => 'Kích hoạt',
'accessory' => 'Phụ kiện',
- 'accessory_report' => 'Báo cáo phụ kiện',
+ 'accessory_report' => 'Báo cáo phụ kiện',
'action' => 'Tác vụ',
'activity_report' => 'Activity Report',
'address' => 'Địa chỉ',
'admin' => 'Quản lý',
- 'add_seats' => 'Thêm chỗ ngồi',
+ 'add_seats' => 'Thêm chỗ ngồi',
'all_assets' => 'Tất cả tài sản',
'all' => 'Tất cả',
'archived' => 'Đã lưu trữ',
@@ -40,9 +40,10 @@
'checkout' => 'Checkout',
'city' => 'Thành phố',
'click_here' => 'Bấm vào đây',
- 'companies' => 'Các công ty',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Các công ty',
'company' => 'Công ty',
- 'component' => 'Hợp phần',
+ 'component' => 'Hợp phần',
'components' => 'Các thành phần',
'complete' => 'Hoàn thành',
'consumable' => 'Vật tư phụ',
@@ -58,10 +59,10 @@
'custom_report' => 'Điều chỉnh báo cáo tài sản',
'dashboard' => 'Bảng điều khiển',
'days' => 'ngày',
- 'days_to_next_audit' => 'Ngày kiểm tra tiếp theo',
+ 'days_to_next_audit' => 'Ngày kiểm tra tiếp theo',
'date' => 'Ngày',
'debug_warning' => 'Cảnh báo!',
- 'debug_warning_text' => 'Ứng dụng này đang chạy trong chế độ sản xuất với bật gỡ lỗi. Điều này có thể phơi bày dữ liệu nhạy cảm nếu ứng dụng của bạn có thể tiếp cận được với thế giới bên ngoài. Tắt chế độ gỡ lỗi bằng cách đặt giá trị APP_DEBUG
trong tệp .env
của bạn thành false
.',
+ 'debug_warning_text' => 'Ứng dụng này đang chạy trong chế độ sản xuất với bật gỡ lỗi. Điều này có thể phơi bày dữ liệu nhạy cảm nếu ứng dụng của bạn có thể tiếp cận được với thế giới bên ngoài. Tắt chế độ gỡ lỗi bằng cách đặt giá trị APP_DEBUG
trong tệp .env
của bạn thành false
.',
'delete' => 'Xóa',
'deleted' => 'Đã xóa',
'delete_seats' => 'Ghế đã Xóa',
@@ -89,6 +90,7 @@
'history' => 'Lịch sử',
'history_for' => 'Lịch cấp phát của',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Xóa hình',
'image_upload' => 'Tải hình',
'import' => 'Nhập',
diff --git a/resources/lang/vi/validation.php b/resources/lang/vi/validation.php
index b86285b7f4..e4c88075ef 100644
--- a/resources/lang/vi/validation.php
+++ b/resources/lang/vi/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute đã sẵn sàng.',
'uploaded' => 'Thuộc tính: không thể tải lên.',
'url' => 'Định dạng :attribute thì không hợp lý.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Mật khẩu hiện tại của bạn không chính xác",
'dumbpwd' => 'Mật khẩu đó quá phổ biến.',
"statuslabel_type" => "Bạn phải chọn một loại nhãn tình trạng hợp lệ",
- "unique_undeleted" => "Thuộc tính: phải là duy nhất.",
],
/*
diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php
index bd8c51116f..7a26c4bef9 100644
--- a/resources/lang/zh-CN/admin/hardware/message.php
+++ b/resources/lang/zh-CN/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(
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index d3e5f6497d..78efce4d4b 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/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' => 'Default 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:// (for unencrypted or TLS)或 ldaps:// (for SSL)开头',
'ldap_server_cert' => '检验LDAP的SSL证书',
diff --git a/resources/lang/zh-CN/admin/suppliers/message.php b/resources/lang/zh-CN/admin/suppliers/message.php
index 9aa6321254..d818084d11 100644
--- a/resources/lang/zh-CN/admin/suppliers/message.php
+++ b/resources/lang/zh-CN/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' => '此供应商下至少还有 :asset_count 个相关模板,目前不能被删除,请你确定您的所有资 产不在此分类下,然后重试。 ',
+ 'assoc_licenses' => '此供应商目前与 :licenses_count 个许可证相关联,不能删除。请更新您的许可证,断开与此供应商的关联,然后重试。 ',
+ 'assoc_maintenances' => '此供应商下至少还有 :asset_count 个相关模板,目前不能被删除,请你确定您的所有资产不在此分类下,然后重试。 ',
)
);
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index 04bcd698ea..f06d65c8f6 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => '附属品',
- 'activated' => '已激活',
+ 'activated' => '已激活',
'accessory' => '附属品',
- 'accessory_report' => '配件报告',
+ 'accessory_report' => '配件报告',
'action' => '操作',
'activity_report' => '活动报告',
'address' => '地址',
'admin' => '管理员',
- 'add_seats' => '已增加空位',
+ 'add_seats' => '已增加空位',
'all_assets' => '所有资产',
'all' => '所有',
'archived' => '已存档',
@@ -40,9 +40,10 @@
'checkout' => '借出',
'city' => '城市',
'click_here' => '点击此处',
- 'companies' => '公司',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => '公司',
'company' => '公司',
- 'component' => '组件',
+ 'component' => '组件',
'components' => '组件',
'complete' => '完成',
'consumable' => '消耗品',
@@ -58,10 +59,10 @@
'custom_report' => '客户资产的报告',
'dashboard' => '控制面板',
'days' => '天数',
- 'days_to_next_audit' => '距离下一次盘点的天数',
+ 'days_to_next_audit' => '距离下一次盘点的天数',
'date' => '日期',
'debug_warning' => '警告!',
- 'debug_warning_text' => '此应用程序运行在生产模式下的调试状态。如果您的应用程序可以被外部访问,这会使敏感数据暴露。通过将 .env
文件中的APP_DEBUG
值设置为 false
来 禁用调试模式。',
+ 'debug_warning_text' => '此应用程序运行在生产模式下的调试状态。如果您的应用程序可以被外部访问,这会使敏感数据暴露。通过将 .env
文件中的APP_DEBUG
值设置为 false
来 禁用调试模式。',
'delete' => '刪除',
'deleted' => '已删除',
'delete_seats' => '已移除空位',
@@ -89,6 +90,7 @@
'history' => '历史记录',
'history_for' => '历史记录',
'id' => '编号',
+ 'image' => 'Image',
'image_delete' => '删除图片',
'image_upload' => '上传图片',
'import' => '导入',
diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php
index 550246a426..33d848fa0c 100644
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/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" => ":属性必须是唯一的。",
],
/*
diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php
index d6b4c14f9e..63bdc66c27 100644
--- a/resources/lang/zh-TW/admin/hardware/message.php
+++ b/resources/lang/zh-TW/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(
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 9fe83a7e60..466ba6981b 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/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' => '檢查LDAP的SSL憑證',
diff --git a/resources/lang/zh-TW/admin/suppliers/message.php b/resources/lang/zh-TW/admin/suppliers/message.php
index fd1e448103..b9150ef2dd 100644
--- a/resources/lang/zh-TW/admin/suppliers/message.php
+++ b/resources/lang/zh-TW/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. ',
)
);
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 8745ac746d..9fe138c7f7 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => '配件',
- 'activated' => '已啟用',
+ 'activated' => '已啟用',
'accessory' => '配件',
- 'accessory_report' => '配件報告',
+ 'accessory_report' => '配件報告',
'action' => '操作',
'activity_report' => '活動報告',
'address' => '地址',
'admin' => '管理員',
- 'add_seats' => '新增授權',
+ 'add_seats' => '新增授權',
'all_assets' => '所有資產',
'all' => '所有',
'archived' => '已封存',
@@ -40,9 +40,10 @@
'checkout' => '借出',
'city' => '城市',
'click_here' => '點擊這裡',
- 'companies' => '公司',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => '公司',
'company' => '公司',
- 'component' => '組件',
+ 'component' => '組件',
'components' => '組件',
'complete' => '完成',
'consumable' => '耗材',
@@ -58,10 +59,10 @@
'custom_report' => '自訂資產報告',
'dashboard' => '儀表板',
'days' => '天',
- 'days_to_next_audit' => '下次稽核時間(天)',
+ 'days_to_next_audit' => '下次稽核時間(天)',
'date' => '日期',
'debug_warning' => '警告!',
- 'debug_warning_text' => '此應用程式已開啟除錯模式, 如果開放外部存取可能造成敏感資料外洩。您可透過修改.env
檔案中的參數APP_DEBUG
,將值改為false
關閉除錯模式。',
+ 'debug_warning_text' => '此應用程式已開啟除錯模式, 如果開放外部存取可能造成敏感資料外洩。您可透過修改.env
檔案中的參數APP_DEBUG
,將值改為false
關閉除錯模式。',
'delete' => '刪除',
'deleted' => '刪除',
'delete_seats' => '刪除授權',
@@ -89,6 +90,7 @@
'history' => '歷史記錄',
'history_for' => '歷史記錄',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => '刪除圖片',
'image_upload' => '上傳圖片',
'import' => '匯入',
diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php
index f396c7fc95..9c76f19787 100644
--- a/resources/lang/zh-TW/validation.php
+++ b/resources/lang/zh-TW/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => ':attribute 已被採用',
'uploaded' => ':attribute 上傳失敗',
'url' => ':attribute 格式不正確',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "當前密碼不正確!",
'dumbpwd' => '該密碼太常見。',
"statuslabel_type" => "您必須選擇一個有效的狀態標籤",
- "unique_undeleted" => ":attribute 必須是唯一值",
],
/*
diff --git a/resources/lang/zu/admin/hardware/message.php b/resources/lang/zu/admin/hardware/message.php
index b669e19534..a5e998fc9e 100644
--- a/resources/lang/zu/admin/hardware/message.php
+++ b/resources/lang/zu/admin/hardware/message.php
@@ -61,7 +61,8 @@ return array(
'error' => 'Ifa alizange lihlolwe, sicela uzame futhi',
'success' => 'Ifa likhiphe ngempumelelo.',
'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.',
- 'not_available' => 'Le mali ayitholakali ukuhlolwa!'
+ 'not_available' => 'Le mali ayitholakali ukuhlolwa!',
+ 'no_assets_selected' => 'You must select at least one asset from the list'
),
'checkin' => array(
diff --git a/resources/lang/zu/admin/settings/general.php b/resources/lang/zu/admin/settings/general.php
index d4870e25f6..2044654000 100644
--- a/resources/lang/zu/admin/settings/general.php
+++ b/resources/lang/zu/admin/settings/general.php
@@ -23,6 +23,8 @@ return array(
'confirm_purge_help' => 'Faka umbhalo "SUSELA" ebhokisini elingezansi ukuze uhlenge amarekhodi akho asusiwe. Lesi senzo asikwazi ukuhlehliswa.',
'custom_css' => 'I-Custom CSS',
'custom_css_help' => 'Faka noma iyiphi i-CSS yangokwezifiso ongathanda ukuyisebenzisa. Ungafaki amathegi angu-<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' => 'Imali Eyingqayizivele',
'default_eula_text' => 'I-EULA ezenzakalelayo',
'default_language' => 'Ulimi oluzenzakalelayo',
@@ -44,6 +46,8 @@ return array(
'ldap_enabled' => 'I-LDAP inikwe amandla',
'ldap_integration' => 'Ukuhlanganiswa kwe-LDAP',
'ldap_settings' => 'Izilungiselelo ze-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' => 'Iseva ye-LDAP',
'ldap_server_help' => 'Lokhu kufanele kuqale nge-ldap: // (for uncrypted or TLS) noma ldaps: // (for SSL)',
'ldap_server_cert' => 'Ukuqinisekiswa kwesitifiketi se-LDAP SSL',
diff --git a/resources/lang/zu/admin/suppliers/message.php b/resources/lang/zu/admin/suppliers/message.php
index e7134cbae4..01d0a7f088 100644
--- a/resources/lang/zu/admin/suppliers/message.php
+++ b/resources/lang/zu/admin/suppliers/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Umphakeli akekho.',
- 'assoc_users' => 'Lo mhlinzeki okwamanje uhlotshaniswa okungenani oyisibonelo esisodwa futhi angeke asuswe. Sicela ubuyekeze amamodeli akho ukuthi ungasaphinde ubhekisele kulo mhlinzeki futhi uzame futhi.',
+
'create' => array(
'error' => 'Umphakeli akazange adalwe, sicela uzame futhi.',
@@ -18,7 +18,10 @@ return array(
'delete' => array(
'confirm' => 'Uqinisekile ukuthi ufisa ukususa lo mphakeli?',
'error' => 'Kube nenkinga yokususa umphakeli. Ngicela uzame futhi.',
- 'success' => 'Umphakeli ususiwe ngempumelelo.'
+ 'success' => 'Umphakeli ususiwe ngempumelelo.',
+ '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. ',
)
);
diff --git a/resources/lang/zu/general.php b/resources/lang/zu/general.php
index a3105d84ef..8f578a5bc1 100644
--- a/resources/lang/zu/general.php
+++ b/resources/lang/zu/general.php
@@ -2,14 +2,14 @@
return [
'accessories' => 'Izesekeli',
- 'activated' => 'Kuvunyelwe',
+ 'activated' => 'Kuvunyelwe',
'accessory' => 'Ukufinyelela',
- 'accessory_report' => 'Umbiko wokufinyelela',
+ 'accessory_report' => 'Umbiko wokufinyelela',
'action' => 'Isenzo',
'activity_report' => 'Umbiko Womsebenzi',
'address' => 'Ikheli',
'admin' => 'Ukuphatha',
- 'add_seats' => 'Izihlalo ezengeziwe',
+ 'add_seats' => 'Izihlalo ezengeziwe',
'all_assets' => 'Zonke izimpahla',
'all' => 'Konke',
'archived' => 'I-Archived',
@@ -40,9 +40,10 @@
'checkout' => 'Hlola',
'city' => 'Idolobha',
'click_here' => 'Chofoza lapha',
- 'companies' => 'Izinkampani',
+ 'clear_selection' => 'Clear Selection',
+ 'companies' => 'Izinkampani',
'company' => 'Inkampani',
- 'component' => 'Ingxenye',
+ 'component' => 'Ingxenye',
'components' => 'Izingxenye',
'complete' => 'Qedela',
'consumable' => 'Iyatholakala',
@@ -58,10 +59,10 @@
'custom_report' => 'Umbiko wezezimali ngokwezifiso',
'dashboard' => 'Ideshibhodi',
'days' => 'izinsuku',
- 'days_to_next_audit' => 'Izinsuku kuya ku-Audit Elandelayo',
+ 'days_to_next_audit' => 'Izinsuku kuya ku-Audit Elandelayo',
'date' => 'Usuku',
'debug_warning' => 'Isexwayiso!',
- 'debug_warning_text' => 'Lolu hlelo lokusebenza lusemodi yokukhiqiza ngokususa iphutha kunikwe amandla. Lokhu kungabonisa idatha ebucayi uma isicelo sakho sifinyeleleka ezweni langaphandle. Khubaza imodi yokulungisa iphutha ngokubeka inani le-APP_DEBUG
kufayela lakho le-.env
kuya ku-false
.',
+ 'debug_warning_text' => 'Lolu hlelo lokusebenza lusemodi yokukhiqiza ngokususa iphutha kunikwe amandla. Lokhu kungabonisa idatha ebucayi uma isicelo sakho sifinyeleleka ezweni langaphandle. Khubaza imodi yokulungisa iphutha ngokubeka inani le-APP_DEBUG
kufayela lakho le-.env
kuya ku-false
.',
'delete' => 'Susa',
'deleted' => 'Isusiwe',
'delete_seats' => 'Izihlalo ezifakiwe',
@@ -89,6 +90,7 @@
'history' => 'Umlando',
'history_for' => 'Umlando we',
'id' => 'ID',
+ 'image' => 'Image',
'image_delete' => 'Susa isithombe',
'image_upload' => 'Layisha isithombe',
'import' => 'Ngenisa',
diff --git a/resources/lang/zu/validation.php b/resources/lang/zu/validation.php
index 52439d57ee..a49079b267 100644
--- a/resources/lang/zu/validation.php
+++ b/resources/lang/zu/validation.php
@@ -87,6 +87,7 @@ return array(
'unique' => 'I: imfanelo isivele ithathwe.',
'uploaded' => 'I: imfanelo ayihlulekile ukulayisha.',
'url' => 'I: ifomethi yokwaziswa ayivumelekile.',
+ "unique_undeleted" => "The :attribute must be unique.",
/*
|--------------------------------------------------------------------------
@@ -117,7 +118,6 @@ return array(
"hashed_pass" => "Iphasiwedi yakho yamanje ayilungile",
'dumbpwd' => 'Lelo phasiwedi livame kakhulu.',
"statuslabel_type" => "Kumele ukhethe uhlobo lwelebula lesimo esivumelekile",
- "unique_undeleted" => "I: imfanelo kufanele ibe eyingqayizivele.",
],
/*