هناك :count أصول مع ضمانات تنتهي صلاحيتها في :threshold أيام.',
'assigned_to' => 'عينت الى',
'best_regards' => 'أفضل التحيات،',
- 'canceled' => 'ملغى:',
- 'checkin_date' => 'تاريخ الادخال:',
- 'checkout_date' => 'تاريخ الاخراج:',
+ 'canceled' => 'ملغى',
+ 'checkin_date' => 'تاريخ الادخال',
+ 'checkout_date' => 'تاريخ الاخراج',
'checkedout_from' => 'الخروج من',
'checkedin_from' => 'تم التحقق من',
'checked_into' => 'تم التحقق من الدخول',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'يرجى النقر على الرابط التالي لتأكيد حسابك على :web :',
'current_QTY' => 'الكمية الحالية',
'days' => 'أيام',
- 'expecting_checkin_date' => 'تاريخ الادخال المتوقع:',
+ 'expecting_checkin_date' => 'تاريخ الادخال المتوقع',
'expires' => 'ينتهي',
'hello' => 'مرحبا',
'hi' => 'مرحبا',
'i_have_read' => 'لقد قرأت بنود الاستخدام وأوافق عليها، وقد تلقيت هذا البند.',
'inventory_report' => 'تقرير المخزون',
- 'item' => 'عنصر:',
+ 'item' => 'عنصر',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'هنالك :count رخص سوف تنتهي في الأيام :threshold القادمة.',
'link_to_update_password' => 'يرجى النقر على الرابط التالي لتحديث كلمة المرور الخاصة بك على :web :',
@@ -66,11 +66,11 @@ return [
'name' => 'اسم',
'new_item_checked' => 'تم فحص عنصر جديد تحت اسمك، التفاصيل أدناه.',
'notes' => 'ملاحظات',
- 'password' => 'كلمة المرور:',
+ 'password' => 'كلمة المرور',
'password_reset' => 'إعادة تعيين كلمة المرور',
'read_the_terms' => 'يرجى قراءة شروط الاستخدام أدناه.',
'read_the_terms_and_click' => 'يرجى قراءة شروط الاستخدام أدناه، وانقر على الرابط في الأسفل لتأكيد أنك تقرأ وتوافق على شروط الاستخدام، وقد استلمت الأصل.',
- 'requested' => 'تم الطلب:',
+ 'requested' => 'طلب',
'reset_link' => 'رابط إعادة تعيين كلمة المرور',
'reset_password' => 'انقر هنا لإعادة تعيين كلمة المرور:',
'rights_reserved' => 'جميع الحقوق محفوظة.format@@0',
diff --git a/resources/lang/bg-BG/admin/locations/message.php b/resources/lang/bg-BG/admin/locations/message.php
index b729a64469..4b5c4ea9aa 100644
--- a/resources/lang/bg-BG/admin/locations/message.php
+++ b/resources/lang/bg-BG/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Местоположението не съществува.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Местоположението е свързано с поне един актив и не може да бъде изтрито. Моля, актуализирайте активите, така че да не са свързани с това местоположение и опитайте отново. ',
'assoc_child_loc' => 'В избраното местоположение е присъединено едно или повече местоположения. Моля преместете ги в друго и опитайте отново.',
'assigned_assets' => 'Изписани Активи',
diff --git a/resources/lang/bg-BG/admin/settings/general.php b/resources/lang/bg-BG/admin/settings/general.php
index 99b48e105c..8c2448c6b6 100644
--- a/resources/lang/bg-BG/admin/settings/general.php
+++ b/resources/lang/bg-BG/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Архивиране',
'backups_help' => 'Създаване, сваляне и възстановяване на архиви ',
'backups_restoring' => 'Възстановяване от архив',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Качване на архив',
'backups_path' => 'Архивите на сървъра са записани в :path',
'backups_restore_warning' => 'Използвайте бутона за възстановяване ,за да възстановите архивно копие. (Това не работи с S3 файлова система или Docker.)
Вашата цяла :app_name датабаза и всички качени файлове ще бъдат заменени от съдържанието на архива. ',
diff --git a/resources/lang/bg-BG/admin/users/message.php b/resources/lang/bg-BG/admin/users/message.php
index d444cd9f60..c20ff4799c 100644
--- a/resources/lang/bg-BG/admin/users/message.php
+++ b/resources/lang/bg-BG/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Активът беше отказан.',
'bulk_manager_warn' => 'Вашите потребителски профили бяха обновени успешно, обаче вашето управителско вписване не беше запазено, защото управителят, които сте избрали бе в списъка с потребителски профили за промяна и потребителите не могат да бъдат свои управители. Моля изберете вашите потребителски профили отново, с изключение на управителя.',
'user_exists' => 'Потребителят вече съществува!',
- 'user_not_found' => 'Потребителят не съществува.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Полето за вход е задължително',
'user_has_no_assets_assigned' => 'Няма заведени активи на този потребител.',
'user_password_required' => 'Паролата е задължителна.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра: ',
'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра:',
'password_ldap' => 'Паролата за този профил се управлява от LDAP / Active Directory. Моля, свържете се с вашия ИТ отдел, за да промените паролата си.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php
index 65cb677538..d767a6e09b 100644
--- a/resources/lang/bg-BG/general.php
+++ b/resources/lang/bg-BG/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Също маркирай за изтриване потребителите. Историята на тяхните активи ще остане докато не изчистите изтритите записи през административните настройки.',
'bulk_checkin_delete_success' => 'Избраните потребители бяха изтрити и техните активи вписани обратно.',
'bulk_checkin_success' => 'Активите за избраните потребители бяха вписани обратно.',
- 'set_to_null' => 'Изтрии стойнистите за този актив|Изтрии стойностите за всичките :asset_count актива ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Изтрий стойноста :field за този потребител|Изтрий стойността :field за всичките :user_count потребителя ',
'na_no_purchase_date' => 'N/A - Няма дата на закупуване',
'assets_by_status' => 'Статус на Активи',
@@ -559,8 +559,8 @@ return [
'expires' => 'Изтича',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => 'остават :count',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/bg-BG/localizations.php b/resources/lang/bg-BG/localizations.php
index aec385abaa..0b266dc815 100644
--- a/resources/lang/bg-BG/localizations.php
+++ b/resources/lang/bg-BG/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Избор на език',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Английски, САЩ',
'en-GB'=> 'Английски, Великобритания',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Зулу',
],
- 'select_country' => 'Изберете държава',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Остров Възнесение',
@@ -135,6 +135,7 @@ return [
'EC'=>'Еквадор',
'EE'=>'Естония',
'EG'=>'Египет',
+ 'GB-ENG'=>'England',
'ER'=>'Еритрея',
'ES'=>'Испания',
'ET'=>'Етиопия',
@@ -233,6 +234,7 @@ return [
'NG'=>'Нигерия',
'NI'=>'Никарагуа',
'NL'=>'Холандия',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Норвегия',
'NP'=>'Непал',
'NR'=>'Науру',
@@ -260,7 +262,7 @@ return [
'RU'=>'Руска федерация',
'RW'=>'Руанда',
'SA'=>'Саудитска Арабия',
- 'UK'=>'Шотландия',
+ 'GB-SCT'=>'Шотландия',
'SB'=>'Соломонови острови',
'SC'=>'Сейшелските острови',
'SS'=>'Южен Судан',
@@ -312,6 +314,7 @@ return [
'VI'=>'Вирджински острови (САЩ)',
'VN'=>'Виетнам',
'VU'=>'Вануату',
+ 'GB-WLS' =>'Wales',
'WF'=>'Острови Уолис и Футуна',
'WS'=>'Самоу',
'YE'=>'Йемен',
diff --git a/resources/lang/bg-BG/mail.php b/resources/lang/bg-BG/mail.php
index c90fc87a03..75562c0b3d 100644
--- a/resources/lang/bg-BG/mail.php
+++ b/resources/lang/bg-BG/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Потребител е направил заявка за елемент в уебсайта',
'acceptance_asset_accepted' => 'Потребителя прие актива',
'acceptance_asset_declined' => 'Потребителя отказа актива',
- 'accessory_name' => 'Име на аксесоар:',
- 'additional_notes' => 'Допълнителни бележки:',
+ 'accessory_name' => 'Аксесоар',
+ 'additional_notes' => 'Допълнителни бележки',
'admin_has_created' => 'Администратор е създал акаунт за вас на :web website.',
- 'asset' => 'Актив:',
- 'asset_name' => 'Име на актив:',
+ 'asset' => 'Актив',
+ 'asset_name' => 'Име на актив',
'asset_requested' => 'Заявка за актив',
'asset_tag' => 'Инвентарен номер',
'assets_warrantee_alert' => 'Има :count актив(а) с гаранция, която ще изтече в следващите :threshold дни.|Има :count активa с гаранции, която ще изтече в следващите :threshold дни.',
'assigned_to' => 'Възложени на',
'best_regards' => 'С най-добри пожелания.',
- 'canceled' => 'Отменено:',
- 'checkin_date' => 'Дата на вписване:',
- 'checkout_date' => 'Дата на отписване:',
+ 'canceled' => 'Отменено',
+ 'checkin_date' => 'Дата на вписване',
+ 'checkout_date' => 'Дата на изписване',
'checkedout_from' => 'Изписан от',
'checkedin_from' => 'Вписан от',
'checked_into' => 'Изписан на',
@@ -55,7 +55,7 @@ return [
'hi' => 'Здравейте',
'i_have_read' => 'Прочетох и се съгласих с условията за ползване, и получих този артикул.',
'inventory_report' => 'Списък активи',
- 'item' => 'Артикул:',
+ 'item' => 'Информация',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Има :count лиценз, който изтича в следващите :threshold дни.|Има :count лиценза, които изтичат в следващите :threshold дни.',
'link_to_update_password' => 'Моля щракенете върху следния линк за да обновите своята :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Име',
'new_item_checked' => 'Нов артикул беше изписан под вашето име, детайлите са отдолу.',
'notes' => 'Бележки',
- 'password' => 'Парола:',
+ 'password' => 'Парола',
'password_reset' => 'Нулиране на паролата',
'read_the_terms' => 'Моля прочетете условията по-долу.',
'read_the_terms_and_click' => 'Моля прочетете условията за ползване по-долу и щракнете върху връзката в края, за да потвърдите че сте прочели и се съгласявате с условията на употреба и сте получили актива.',
- 'requested' => 'Изискан:',
+ 'requested' => 'Изискан',
'reset_link' => 'Вашата връзка за повторно задаване на паролата',
'reset_password' => 'Щракнете тук, за да нулирате паролата си:',
'rights_reserved' => 'Всички права запазени.',
diff --git a/resources/lang/ca-ES/admin/locations/message.php b/resources/lang/ca-ES/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/ca-ES/admin/locations/message.php
+++ b/resources/lang/ca-ES/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ca-ES/admin/settings/general.php b/resources/lang/ca-ES/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/ca-ES/admin/settings/general.php
+++ b/resources/lang/ca-ES/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ca-ES/admin/users/message.php b/resources/lang/ca-ES/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/ca-ES/admin/users/message.php
+++ b/resources/lang/ca-ES/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ca-ES/general.php b/resources/lang/ca-ES/general.php
index fc33fe60f5..ccd3f2a54d 100644
--- a/resources/lang/ca-ES/general.php
+++ b/resources/lang/ca-ES/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ca-ES/localizations.php b/resources/lang/ca-ES/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/ca-ES/localizations.php
+++ b/resources/lang/ca-ES/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ca-ES/mail.php b/resources/lang/ca-ES/mail.php
index 9bb00688f4..e9618c3b08 100644
--- a/resources/lang/ca-ES/mail.php
+++ b/resources/lang/ca-ES/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Recurs:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Recurs',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Etiqueta de Recurs',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/chr-US/admin/locations/message.php b/resources/lang/chr-US/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/chr-US/admin/locations/message.php
+++ b/resources/lang/chr-US/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/chr-US/admin/settings/general.php b/resources/lang/chr-US/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/chr-US/admin/settings/general.php
+++ b/resources/lang/chr-US/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/chr-US/admin/users/message.php b/resources/lang/chr-US/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/chr-US/admin/users/message.php
+++ b/resources/lang/chr-US/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/chr-US/general.php b/resources/lang/chr-US/general.php
index 7634387906..3092228674 100644
--- a/resources/lang/chr-US/general.php
+++ b/resources/lang/chr-US/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/chr-US/localizations.php b/resources/lang/chr-US/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/chr-US/localizations.php
+++ b/resources/lang/chr-US/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/chr-US/mail.php b/resources/lang/chr-US/mail.php
index edb1683200..72fb70db80 100644
--- a/resources/lang/chr-US/mail.php
+++ b/resources/lang/chr-US/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/cs-CZ/account/general.php b/resources/lang/cs-CZ/account/general.php
index 9785d993d6..889b0a4889 100644
--- a/resources/lang/cs-CZ/account/general.php
+++ b/resources/lang/cs-CZ/account/general.php
@@ -2,16 +2,16 @@
return array(
'personal_api_keys' => 'Osobní API klíče',
- 'personal_access_token' => 'Personal Access Token',
- 'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
- 'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+ 'personal_access_token' => 'Osobní přístupový token',
+ 'personal_api_keys_success' => 'Osobní API klíč :key byl úspěšně vytvořen',
+ 'here_is_api_key' => 'Zde je váš nový osobní přístupový token. Toto je jediná chvíle, kdy bude zobrazen, takže si jej prosím uložte! Nyní můžete použít tento token k vytvoření API požadavků.',
+ 'api_key_warning' => 'Při generování tokenu API se ujistěte, že jej ihned okopírujete, nebude znovu k zobrazení.',
'api_base_url' => 'Základní adresa API je umístěna na:',
'api_base_url_endpoint' => '/<endpoint>',
'api_token_expiration_time' => 'API tokeny vyprší:',
'api_reference' => 'Please check the API reference to find specific API endpoints and additional API documentation.',
- 'profile_updated' => 'Account successfully updated',
- 'no_tokens' => 'You have not created any personal access tokens.',
- 'enable_sounds' => 'Enable sound effects',
- 'enable_confetti' => 'Enable confetti effects',
+ 'profile_updated' => 'Účet úspěšně aktualizován',
+ 'no_tokens' => 'Nevytvořili jste žádné osobní přístupové tokeny.',
+ 'enable_sounds' => 'Povolit zvukové efekty',
+ 'enable_confetti' => 'Povolit efekty confetti',
);
diff --git a/resources/lang/cs-CZ/admin/locations/message.php b/resources/lang/cs-CZ/admin/locations/message.php
index 455e756269..a06798348d 100644
--- a/resources/lang/cs-CZ/admin/locations/message.php
+++ b/resources/lang/cs-CZ/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Místo neexistuje.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Toto umístění je spojeno s alespoň jedním majetkem a nemůže být smazáno. Aktualizujte majetky tak aby nenáleželi k tomuto umístění a zkuste to znovu. ',
'assoc_child_loc' => 'Toto umístění je nadřazené alespoň jednomu umístění a nelze jej smazat. Aktualizujte své umístění tak, aby na toto umístění již neodkazovalo a zkuste to znovu. ',
'assigned_assets' => 'Přiřazený majetek',
diff --git a/resources/lang/cs-CZ/admin/settings/general.php b/resources/lang/cs-CZ/admin/settings/general.php
index a5c11c1223..698f8f8991 100644
--- a/resources/lang/cs-CZ/admin/settings/general.php
+++ b/resources/lang/cs-CZ/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Zálohy',
'backups_help' => 'Vytvořit, stáhnout a obnovit zálohy ',
'backups_restoring' => 'Obnovit ze zálohy',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Nahrát zálohu',
'backups_path' => 'Zálohy jsou uloženy v :path',
'backups_restore_warning' => 'Použijte tlačítko obnovení pro obnovení z předchozí zálohy. (Toto v současné době nefunguje se S3 souborovým úložištěm nebo Docker.
Vaše celá databáze :app_name a všechny nahrané soubory budou zcela nahrazeny tím, co je v záložním souboru. ',
diff --git a/resources/lang/cs-CZ/admin/users/message.php b/resources/lang/cs-CZ/admin/users/message.php
index 4a2551113c..4afa1c3519 100644
--- a/resources/lang/cs-CZ/admin/users/message.php
+++ b/resources/lang/cs-CZ/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Úspěšně jste odmítli tento majetek.',
'bulk_manager_warn' => 'Uživatelé byli úspěšně aktualizováni, položka správce však nebyla uložena, protože správce, který jste si vybrali, byl také v seznamu uživatelů, který má být upraven, a uživatelé nemusí být jejich vlastní správce. Zvolte své uživatele znovu, kromě správce.',
'user_exists' => 'Uživatel již existuje!',
- 'user_not_found' => 'Uživatel neexistuje.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Přihlašovací pole je povinné',
'user_has_no_assets_assigned' => 'Momentálně nejsou uživateli přiřazeny žádné položky.',
'user_password_required' => 'Je vyžadováno heslo.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nelze vyhledat server LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP.
Chyba serveru LDAP:',
'ldap_could_not_get_entries' => 'Nelze získat záznamy ze serveru LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP.
Chyba serveru LDAP:',
'password_ldap' => 'Heslo pro tento účet je spravováno serverem LDAP / Active Directory. Obraťte se na oddělení IT a změňte heslo.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/cs-CZ/general.php b/resources/lang/cs-CZ/general.php
index 6a30ea60f5..868ecfc5a9 100644
--- a/resources/lang/cs-CZ/general.php
+++ b/resources/lang/cs-CZ/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Také odstranit tyto uživatele. Historie jejich majetku zůstane neporušená/dokud tvrvale nevymažete smazané záznamy v nastavení správce.',
'bulk_checkin_delete_success' => 'Vybraní uživatelé byli odstraněni a jejich položky byly odebrány.',
'bulk_checkin_success' => 'Položky vybraných uživatelů byly odebrány.',
- 'set_to_null' => 'Odstranit hodnoty z aktiva|Odstranit hodnoty z :asset_count aktiv ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Odstranit hodnoty :field pro tohoto uživatele|Odstranit :field hodnoty pro všechny :user_count uživatele ',
'na_no_purchase_date' => 'N/A – neznámé datum nákupu',
'assets_by_status' => 'Majetek podle stavu',
@@ -559,8 +559,8 @@ return [
'expires' => 'Vyprší',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/cs-CZ/localizations.php b/resources/lang/cs-CZ/localizations.php
index ea101d88bc..e89a783b15 100644
--- a/resources/lang/cs-CZ/localizations.php
+++ b/resources/lang/cs-CZ/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Vyberte jazyk',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Angličtina, USA',
'en-GB'=> 'Angličtina, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zuluština',
],
- 'select_country' => 'Zvolte stát',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ostrov Ascension',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ekvádor',
'EE'=>'Estonsko',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Španělsko',
'ET'=>'Etiopie',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigérie',
'NI'=>'Nikaragua',
'NL'=>'Nizozemsko',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norsko',
'NP'=>'Nepál',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Ruská federace',
'RW'=>'Rwanda',
'SA'=>'Saúdská Arábie',
- 'UK'=>'Skotsko',
+ 'GB-SCT'=>'Skotsko',
'SB'=>'Šalamounovy ostrovy',
'SC'=>'Seychelles',
'SS'=>'Jižní Súdán',
@@ -312,6 +314,7 @@ return [
'VI'=>'Americké Panenské ostrovy',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Ostrovy Wallis a Futuna',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/cs-CZ/mail.php b/resources/lang/cs-CZ/mail.php
index 226e79c4ea..771ab9a32d 100644
--- a/resources/lang/cs-CZ/mail.php
+++ b/resources/lang/cs-CZ/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Uživatel požádal o položku na webu',
'acceptance_asset_accepted' => 'Uživatel potvrdil vlastnictví',
'acceptance_asset_declined' => 'Uživatel zamítl vlastnictví',
- 'accessory_name' => 'Název příslušenství:',
- 'additional_notes' => 'Další Poznámky:',
+ 'accessory_name' => 'Název příslušenství',
+ 'additional_notes' => 'Další Poznámky',
'admin_has_created' => 'Administrátor pro vás vytvořil účet na stránce :web.',
- 'asset' => 'Majetek:',
- 'asset_name' => 'Název majetku:',
+ 'asset' => 'Majetek',
+ 'asset_name' => 'Název majetku',
'asset_requested' => 'Požadovaný majetek',
'asset_tag' => 'Inventární číslo',
'assets_warrantee_alert' => 'Je zde :count položka se zárukou končící v následujících :threshold dnech.|Jsou zde :count položek se zárukou končící v následujících :threshold dnech.',
'assigned_to' => 'Přiděleno',
'best_regards' => 'S pozdravem,',
- 'canceled' => 'Zrušeno:',
- 'checkin_date' => 'Datum převzetí:',
- 'checkout_date' => 'Datum vydání:',
+ 'canceled' => 'Zrušeno',
+ 'checkin_date' => 'Datum převzetí',
+ 'checkout_date' => 'Datum vydání',
'checkedout_from' => 'Zkontrolováno od',
'checkedin_from' => 'Zaškrtnuto z',
'checked_into' => 'Ověřeno do',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Kliknutím na následující odkaz potvrdíte váš účet pro :web:',
'current_QTY' => 'Aktuální množství',
'days' => 'Dní',
- 'expecting_checkin_date' => 'Očekávané datum převzetí:',
+ 'expecting_checkin_date' => 'Očekávané datum převzetí',
'expires' => 'Vyprší',
'hello' => 'Dobrý den',
'hi' => 'Ahoj',
'i_have_read' => 'Přečetl/a jsem si podmínky používání, souhlasím s pravidel používání a obdržel jsem tuto položku.',
'inventory_report' => 'Zpráva o majetku',
- 'item' => 'Položka:',
+ 'item' => 'Položka',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Je zde :count licence, které končí platnost v příštích :threshold dnech.|Jsou zde :count licence, kterým končí platnost v příštích :threshold dnech.',
'link_to_update_password' => 'Klepnutím na následující odkaz aktualizujte své heslo pro :web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Položka',
'new_item_checked' => 'Nová položka byla odevzdána pod vaším jménem, podrobnosti jsou uvedeny níže.',
'notes' => 'Poznámky',
- 'password' => 'Heslo:',
+ 'password' => 'Heslo',
'password_reset' => 'Resetování hesla',
'read_the_terms' => 'Prosím přečtěte si níže uvedené podmínky použití.',
'read_the_terms_and_click' => 'Přečtěte si prosím níže uvedené podmínky použití, a klikněte na odkaz v dolní části pro potvrzení, že jste si přečetli a souhlasili s podmínkami použití a obdrželi aktivum.',
- 'requested' => 'Zažádáno:',
+ 'requested' => 'Požadováno',
'reset_link' => 'Váš odkaz pro resetování hesla',
'reset_password' => 'Pro zresetování vašeho hesla klikněte na odkaz:',
'rights_reserved' => 'Všechna práva vyhrazena.',
diff --git a/resources/lang/cs-CZ/validation.php b/resources/lang/cs-CZ/validation.php
index 5aeca5e9f8..fc8adac1dd 100644
--- a/resources/lang/cs-CZ/validation.php
+++ b/resources/lang/cs-CZ/validation.php
@@ -13,21 +13,21 @@ return [
|
*/
- 'accepted' => 'The :attribute field must be accepted.',
- 'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
- 'active_url' => 'The :attribute field must be a valid URL.',
- 'after' => 'The :attribute field must be a date after :date.',
- 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
- 'alpha' => 'The :attribute field must only contain letters.',
- 'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
- 'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+ 'accepted' => 'Je potřeba potvrdit :attribute.',
+ 'accepted_if' => 'Položka :attribute je vyžadována, když :other je :value.',
+ 'active_url' => ':attribute není platnou URL.',
+ 'after' => ':attribute nemůže být později než :date.',
+ 'after_or_equal' => 'Atribut musí mít datum následující nebo rovné :date.',
+ 'alpha' => ':attribute může obsahovat pouze písmena.',
+ 'alpha_dash' => ':attribute může obsahovat pouze písmena, čísla, a pomlčky.',
+ 'alpha_num' => ':attribute může obsahovat pouze písmena a čísla.',
'array' => 'The :attribute field must be an array.',
'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
'before' => 'The :attribute field must be a date before :date.',
'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
'between' => [
- 'array' => 'The :attribute field must have between :min and :max items.',
- 'file' => 'The :attribute field must be between :min and :max kilobytes.',
+ 'array' => ':attribute musí být mezi hodnotami :min a :max.',
+ 'file' => ':attribute musí být větší než :min a menší než :max kilobytů.',
'numeric' => 'The :attribute field must be between :min and :max.',
'string' => 'The :attribute field must be between :min and :max characters.',
],
@@ -169,7 +169,7 @@ return [
'unique' => ':attribute byl již vybrán.',
'uploaded' => 'Atribut: se nepodařilo nahrát.',
'uppercase' => 'The :attribute field must be uppercase.',
- 'url' => 'The :attribute field must be a valid URL.',
+ 'url' => ':attribute není platnou URL.',
'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute field must be a valid UUID.',
diff --git a/resources/lang/cy-GB/admin/locations/message.php b/resources/lang/cy-GB/admin/locations/message.php
index bff9af8cc5..d208fbeb6b 100644
--- a/resources/lang/cy-GB/admin/locations/message.php
+++ b/resources/lang/cy-GB/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Nid yw\'r lleoliad yn bodoli.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Mae\'r lleoliad yma wedi perthnasu i oleiaf un ased a nid yw\'n bosib dileu. Diweddarwch eich asedau i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ',
'assoc_child_loc' => 'Mae\'r lleoliad yma yn rhiant i oleiaf un lleoliad a nid yw\'n bosib dileu. Diweddarwch eich lleoliadau i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/cy-GB/admin/settings/general.php b/resources/lang/cy-GB/admin/settings/general.php
index 1ffee5dde6..cc8cbc6162 100644
--- a/resources/lang/cy-GB/admin/settings/general.php
+++ b/resources/lang/cy-GB/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Copi wrth gefn',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/cy-GB/admin/users/message.php b/resources/lang/cy-GB/admin/users/message.php
index 63046b048d..aaa5470a95 100644
--- a/resources/lang/cy-GB/admin/users/message.php
+++ b/resources/lang/cy-GB/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Rydych wedi llwyddo I wrthod yr ased yma.',
'bulk_manager_warn' => 'Mae eich defnyddwyr wedi diweddaru\'n llwyddiannus ond mae\'r blwch rheolwr heb newid gan fod y rheolwr yn y rhestr o defnyddwyr. Dewisiwch eto heb cynnwys y rheolwr.',
'user_exists' => 'Defnyddiwr yn bodoli yn barod!',
- 'user_not_found' => 'Nid yw\'r defnyddiwr yn bodoli.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Mae angen llenwi\'r maes login',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Rhaid gosod cyfrinair.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Wedi methu cyraedd y server LDAP. Gwiriwch eich gosodiadau LDAP.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Wedi methu llwytho data trwy LDAP. Gwiriwch eich gosodiadau LDAP.
Error from LDAP Server:',
'password_ldap' => 'Mae eich cyfrinair wedi\'i rheoli trwy LDAP/Active Directory. Cysylltwch a\'r Adran TGCh i\'w newid. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/cy-GB/general.php b/resources/lang/cy-GB/general.php
index f59d6fa541..ecd17c81a0 100644
--- a/resources/lang/cy-GB/general.php
+++ b/resources/lang/cy-GB/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Dod i ben',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/cy-GB/localizations.php b/resources/lang/cy-GB/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/cy-GB/localizations.php
+++ b/resources/lang/cy-GB/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/cy-GB/mail.php b/resources/lang/cy-GB/mail.php
index 5f611e2456..6f1f6ac079 100644
--- a/resources/lang/cy-GB/mail.php
+++ b/resources/lang/cy-GB/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Mae defnyddiwr wedi gwneud cais am eitem ar y wefan',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Enw Ategolyn:',
- 'additional_notes' => 'Nodiadau ychwanegol:',
+ 'accessory_name' => 'Enw Ategolyn',
+ 'additional_notes' => 'Nodiadau ychwanegol',
'admin_has_created' => 'Mae gweinyddwr wedi creu cyfrif i chi a yr :web wefan.',
- 'asset' => 'Ased:',
- 'asset_name' => 'Enw Ased:',
+ 'asset' => 'Ased',
+ 'asset_name' => 'Enw Ased',
'asset_requested' => 'Gofynnwyd am ased',
'asset_tag' => 'Tag Ased',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Wedi Neilltuo i',
'best_regards' => 'Cofon gorau,',
- 'canceled' => 'Wedi canslo:',
- 'checkin_date' => 'Dyddian i mewn:',
- 'checkout_date' => 'Dyddiad Allan:',
+ 'canceled' => 'Wedi canslo',
+ 'checkin_date' => 'Dyddian i mewn',
+ 'checkout_date' => 'Dyddiad Allan',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Cliciwch ar y ddolen ganlynol i gadarnhau eich cyfrif :gwe:',
'current_QTY' => 'Nifer cyfredol',
'days' => 'Dydd',
- 'expecting_checkin_date' => 'Dyddiad disgwl i mewn:',
+ 'expecting_checkin_date' => 'Dyddiad disgwl i mewn',
'expires' => 'Dod i ben',
'hello' => 'Helo',
'hi' => 'Hi',
'i_have_read' => 'Rwyf wedi darllen a chytuno â\'r telerau defnyddio, ac wedi derbyn yr eitem hon.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Eitem:',
+ 'item' => 'Eitem',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Mae yna :count trwydded yn dod i ben yn ystod y :threshold diwrnod nesaf | Mae :count trwyddedau yn dod i ben yn y :threshold diwrnod nesaf.',
'link_to_update_password' => 'Cliciwch ar y ddolen ganlynol i gadarnhau eich cyfrinair :gwe:',
@@ -66,11 +66,11 @@ return [
'name' => 'Enw',
'new_item_checked' => 'Mae eitem newydd wedi\'i gwirio o dan eich enw, mae\'r manylion isod.',
'notes' => 'Nodiadau',
- 'password' => 'Cyfrinair:',
+ 'password' => 'Cyfrinair',
'password_reset' => 'Ailosod Cyfrinair',
'read_the_terms' => 'Darllenwch y telerau defnyddio isod.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Gofynnwyd amdano:',
+ 'requested' => 'Gofynnwyd amdano',
'reset_link' => 'Eich dolen Ail-osod Cyfrinair',
'reset_password' => 'Cliciwch yma i ailosod eich cyfrinair:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/da-DK/admin/locations/message.php b/resources/lang/da-DK/admin/locations/message.php
index de442f87da..260f9e625d 100644
--- a/resources/lang/da-DK/admin/locations/message.php
+++ b/resources/lang/da-DK/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Beliggenhed findes ikke.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Denne placering er i øjeblikket forbundet med mindst ét aktiv og kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne placering, og prøv igen.',
'assoc_child_loc' => 'Denne placering er for øjeblikket forælder på mindst et barns placering og kan ikke slettes. Opdater dine placeringer for ikke længere at henvise til denne placering, og prøv igen.',
'assigned_assets' => 'Tildelte aktiver',
diff --git a/resources/lang/da-DK/admin/settings/general.php b/resources/lang/da-DK/admin/settings/general.php
index 75a71fbb78..6466546cd0 100644
--- a/resources/lang/da-DK/admin/settings/general.php
+++ b/resources/lang/da-DK/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Opret, download og gendan sikkerhedskopier ',
'backups_restoring' => 'Gendanner fra sikkerhedskopi',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Sikkerhedskopi',
'backups_path' => 'Sikkerhedskopier på serveren gemmes i :path',
'backups_restore_warning' => 'Brug gendannelsesknappen til at gendanne fra en tidligere sikkerhedskopi. (Dette virker ikke i øjeblikket med S3 fillagring eller Docker.
Hele din :app_name database og eventuelle uploadede filer vil blive fuldstændig erstattet af, hvad der er i backup-filen. ',
diff --git a/resources/lang/da-DK/admin/users/message.php b/resources/lang/da-DK/admin/users/message.php
index d9ac4b2446..3a9aac23c4 100644
--- a/resources/lang/da-DK/admin/users/message.php
+++ b/resources/lang/da-DK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Du har afvist dette aktiv.',
'bulk_manager_warn' => 'Dine brugere er blevet opdateret, men din administratorindgang blev ikke gemt, fordi den valgte leder også var på brugerlisten, der skulle redigeres, og brugerne er måske ikke deres egen administrator. Vælg venligst dine brugere igen, undtagen manager.',
'user_exists' => 'Bruger eksistere allerede!',
- 'user_not_found' => 'Bruger eksisterer ikke.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Login-feltet er påkrævet',
'user_has_no_assets_assigned' => 'Ingen aktiver i øjeblikket tildelt brugeren.',
'user_password_required' => 'Adgangskoden er påkrævet.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Kunne ikke søge på LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Error fra LDAP-server:',
'ldap_could_not_get_entries' => 'Kunne ikke få poster fra LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Error fra LDAP-server:',
'password_ldap' => 'Adgangskoden til denne konto administreres af LDAP / Active Directory. Kontakt din it-afdeling for at ændre dit kodeord.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php
index 10332c74d8..fb581ebc31 100644
--- a/resources/lang/da-DK/general.php
+++ b/resources/lang/da-DK/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Fjern også disse brugere. Deres asset historie vil forblive intakte medmindre/indtil du fjerner slettede poster i administratorindstillingerne.',
'bulk_checkin_delete_success' => 'Dine valgte brugere er blevet slettet og deres emner er blevet tjekket ind.',
'bulk_checkin_success' => 'Emnerne for de valgte brugere er blevet tjekket ind.',
- 'set_to_null' => 'Slet værdier for dette aktiv|Slet værdier for alle :asset_count aktiver ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Slet :field værdier for denne bruger, Slet :field værdier for alle :user_count brugere ',
'na_no_purchase_date' => 'Ikke relevant - ingen købsdato angivet',
'assets_by_status' => 'Aktiver efter status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Udløber',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/da-DK/localizations.php b/resources/lang/da-DK/localizations.php
index 9399cd2594..c43ccc54c4 100644
--- a/resources/lang/da-DK/localizations.php
+++ b/resources/lang/da-DK/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Vælg et sprog',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Engelsk (US)',
'en-GB'=> 'Engelsk (UK)',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Vælg et land',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Egypten',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spanien',
'ET'=>'Etiopien',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Holland',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norge',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Rusland (Den Russiske Føderation)',
'RW'=>'Rwanda',
'SA'=>'Saudi-Arabien',
- 'UK'=>'Skotland',
+ 'GB-SCT'=>'Skotland',
'SB'=>'Salomonøerne',
'SC'=>'Seychellerne',
'SS'=>'Sydsudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Jomfruøerne (USA)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis- og Futunaøerne',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/da-DK/mail.php b/resources/lang/da-DK/mail.php
index f6883c0db9..7aa7c46a3c 100644
--- a/resources/lang/da-DK/mail.php
+++ b/resources/lang/da-DK/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'En bruger har anmodet om et emne på hjemmesiden',
'acceptance_asset_accepted' => 'En bruger har accepteret et emne',
'acceptance_asset_declined' => 'En bruger har afvist et emne',
- 'accessory_name' => 'Tilbehør Navn:',
- 'additional_notes' => 'Yderligere bemærkninger:',
+ 'accessory_name' => 'Tilbehør Navn',
+ 'additional_notes' => 'Yderligere bemærkninger',
'admin_has_created' => 'En administrator har oprettet en konto til dig på webstedet:.',
- 'asset' => 'aktiv:',
- 'asset_name' => 'Aktivnavn:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Aktivnavn',
'asset_requested' => 'Aktiver bedt om',
'asset_tag' => 'Inventarnummer',
'assets_warrantee_alert' => 'Der er :count aktiv hvor garantien udløber indenfor de næste :threshold dage.|Der er :count aktiver hvor garantien udløber indenfor de næste :threshold dage.',
'assigned_to' => 'Tildelt',
'best_regards' => 'Med venlig hilsen,',
- 'canceled' => 'annulleret:',
- 'checkin_date' => 'Checkin dato:',
- 'checkout_date' => 'Checkout dato:',
+ 'canceled' => 'annulleret',
+ 'checkin_date' => 'Tjekket Ind Dato',
+ 'checkout_date' => 'Checkout dato',
'checkedout_from' => 'Tjekket ud fra',
'checkedin_from' => 'Tjekket ind fra',
'checked_into' => 'Tjekket ind',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Venligst klik på følgende link for at bekræfte din: web-konto:',
'current_QTY' => 'Nuværende QTY',
'days' => 'Dage',
- 'expecting_checkin_date' => 'Forventet Checkin Date:',
+ 'expecting_checkin_date' => 'Forventet indtjekningsdato',
'expires' => 'udløber',
'hello' => 'Hej',
'hi' => 'Hej',
'i_have_read' => 'Jeg har læst og accepterer vilkårene for brug og har modtaget denne vare.',
'inventory_report' => 'Lagerrapport',
- 'item' => 'Vare:',
+ 'item' => 'Emne',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Der er :count licens(er) der udløber indenfor den/de næste :threshold dag(e).',
'link_to_update_password' => 'Venligst klik på følgende link for at opdatere din: webadgangskode:',
@@ -66,11 +66,11 @@ return [
'name' => 'Navn',
'new_item_checked' => 'En ny vare er blevet tjekket ud under dit navn, detaljerne er nedenfor.',
'notes' => 'Noter',
- 'password' => 'Adgangskode:',
+ 'password' => 'Adgangskode',
'password_reset' => 'Nulstil kodeord',
'read_the_terms' => 'Læs venligst brugsbetingelserne nedenfor.',
'read_the_terms_and_click' => 'Læs venligst vilkårene for brug nedenfor, og klik på linket nederst for at bekræfte, at du læser og accepterer vilkårene for brug, og har modtaget aktivet.',
- 'requested' => 'Anmodede om:',
+ 'requested' => 'Anmodet',
'reset_link' => 'Din Password Reset Link',
'reset_password' => 'Klik her for at nulstille adgangskoden:',
'rights_reserved' => 'Alle rettigheder forbeholdt.',
diff --git a/resources/lang/de-DE/admin/hardware/message.php b/resources/lang/de-DE/admin/hardware/message.php
index 1078588e86..5678a25bf5 100644
--- a/resources/lang/de-DE/admin/hardware/message.php
+++ b/resources/lang/de-DE/admin/hardware/message.php
@@ -58,7 +58,7 @@ return [
'file_delete_success' => 'Die Datei wurde erfolgreich gelöscht',
'file_delete_error' => 'Die Datei konnte nicht gelöscht werden',
'file_missing' => 'Die ausgewählte Datei fehlt',
- 'file_already_deleted' => 'The file selected was already deleted',
+ 'file_already_deleted' => 'Die ausgewählte Datei wurde bereits gelöscht',
'header_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der Kopfzeile enthalten fehlerhafte UTF-8 Zeichen',
'content_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der ersten Zeile des Inhalts enthalten fehlerhafte UTF-8-Zeichen',
],
diff --git a/resources/lang/de-DE/admin/locations/message.php b/resources/lang/de-DE/admin/locations/message.php
index 1de692a2f2..86c6566a25 100644
--- a/resources/lang/de-DE/admin/locations/message.php
+++ b/resources/lang/de-DE/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'Standort nicht verfügbar.',
- 'assoc_users' => 'Dieser Standort kann derzeit nicht gelöscht werden, da er der Standort der Aufzeichnung für mindestens ein Asset oder einen Benutzer ist, ihm Assets zugewiesen sind oder er der übergeordnete Standort eines anderen Standorts ist. Aktualisieren Sie Ihre Modelle, damit dieser Standort nicht mehr referenziert wird, und versuchen Sie es erneut. ',
+ 'assoc_users' => 'Dieser Standort kann derzeit nicht gelöscht werden, da er der Standort eines Datensatzes für mindestens ein Asset oder einen Benutzer ist, ihm Assets zugewiesen sind oder er der übergeordnete Standort eines anderen Standorts ist. Aktualisieren Sie Ihre Datensätze, sodass dieser Standort nicht mehr referenziert wird, und versuchen Sie es erneut. ',
'assoc_assets' => 'Dieser Standort ist aktuell mindestens einem Gegenstand zugewiesen und kann nicht gelöscht werden. Bitte entfernen Sie die Standortzuweisung bei den jeweiligen Gegenständen und versuchen Sie es erneut diesen Standort zu entfernen. ',
'assoc_child_loc' => 'Dieser Ort ist aktuell mindestens einem anderen Ort übergeordnet und kann nicht gelöscht werden. Bitte Orte aktualisieren, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
'assigned_assets' => 'Zugeordnete Assets',
'current_location' => 'Aktueller Standort',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => 'Öffnen in :map_provider_icon Karten',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'Der Standort wurde nicht wiederhergestellt. Bitte versuchen Sie es erneut',
+ 'success' => 'Standort erfolgreich wiederhergestellt.'
),
'delete' => array(
diff --git a/resources/lang/de-DE/admin/settings/general.php b/resources/lang/de-DE/admin/settings/general.php
index 7a1e799f9e..0ee47d7750 100644
--- a/resources/lang/de-DE/admin/settings/general.php
+++ b/resources/lang/de-DE/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sicherungen',
'backups_help' => 'Backups erstellen, herunterladen und wiederherstellen ',
'backups_restoring' => 'Aus Backup wiederherstellen',
+ 'backups_clean' => 'Bereinigen Sie die gesicherte Datenbank vor der Wiederherstellung',
+ 'backups_clean_helptext' => "Dies kann nützlich sein, wenn Sie zwischen Datenbankversionen wechseln",
'backups_upload' => 'Backup hochladen',
'backups_path' => 'Sicherungen auf dem Server werden in :path gespeichert',
'backups_restore_warning' => 'Klicke den Wiederherstellungs-Knopf um ein Backup wiederherzustellen. (Funktioniert derzeit nicht mit S3 Datenspeicher oder Docker.)
Die gesamte :app_name Datenbank und alle hochgeladenen Dateien werden mit den Inhalten des Backups überschrieben. ',
diff --git a/resources/lang/de-DE/admin/users/message.php b/resources/lang/de-DE/admin/users/message.php
index f83a34bd4d..2f38e600ac 100644
--- a/resources/lang/de-DE/admin/users/message.php
+++ b/resources/lang/de-DE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Sie haben diesen Gegenstand abgelehnt.',
'bulk_manager_warn' => 'Benutzer erfolgreich geändert. Vorgesetzter sollte auch bearbeitet werden und konnte nicht angepasst werden, weil er sich nicht selbst als Vorgesetzter eingetragen haben kann. Bitte Benutzer ohne den Vorgesetzten nochmal bearbeiten.',
'user_exists' => 'Benutzer existiert bereits!',
- 'user_not_found' => 'Benutzer existiert nicht.',
+ 'user_not_found' => 'Der Benutzer existiert nicht oder Sie sind nicht berechtigt, ihn anzuzeigen.',
'user_login_required' => 'Das Loginfeld ist erforderlich',
'user_has_no_assets_assigned' => 'Derzeit sind keine Assets dem Benutzer zugewiesen.',
'user_password_required' => 'Das Passswortfeld ist erforderlich.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
'password_ldap' => 'Das Passwort für diesen Account wird vom LDAP/Active Directory verwaltet. Bitte kontaktieren Sie Ihre IT-Abteilung, um Ihr Passwort zu ändern. ',
+ 'multi_company_items_assigned' => 'Diesem Benutzer sind Artikel zugewiesen. Bitte checken Sie diese ein, bevor Sie das Unternehmen wechseln.'
),
'deletefile' => array(
diff --git a/resources/lang/de-DE/general.php b/resources/lang/de-DE/general.php
index 3bf30700ff..56c2a1c071 100644
--- a/resources/lang/de-DE/general.php
+++ b/resources/lang/de-DE/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Die Benutzer auch "soft-löschen". Die Historie der Gegenstände bleibt erhalten, solange die markierten Datensätze nicht in den Admin-Einstellungen endgültig gelöscht werden.',
'bulk_checkin_delete_success' => 'Die ausgewählten Benutzer wurden gelöscht und ihre Gegenstände wurden eingecheckt.',
'bulk_checkin_success' => 'Die Gegenstände für die ausgewählten Benutzer wurden eingecheckt.',
- 'set_to_null' => 'Werte für dieses Asset|Werte für alle :asset_count Assets löschen ',
+ 'set_to_null' => 'Werte für diese Auswahl löschen|Werte für alle :selection_count Auswahlen löschen ',
'set_users_field_to_null' => ':field Werte für diesen Benutzer löschen|:field Werte für alle :user_count Benutzer löschen ',
'na_no_purchase_date' => 'N/A - Kein Kaufdatum angegeben',
'assets_by_status' => 'Assets sortiert nach Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Ablaufdatum',
'map_fields'=> ':item_type Feld zuordnen',
'remaining_var' => ':count verbleibend',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
- 'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
+ 'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
];
diff --git a/resources/lang/de-DE/localizations.php b/resources/lang/de-DE/localizations.php
index e674b2c5e9..95e7539cca 100644
--- a/resources/lang/de-DE/localizations.php
+++ b/resources/lang/de-DE/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Sprache auswählen',
+ 'select_language' => 'Wählen Sie eine Sprache',
'languages' => [
'en-US'=> 'Englisch, USA',
'en-GB'=> 'Englisch, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Land auswählen',
+ 'select_country' => 'Wählen Sie ein Land',
'countries' => [
'AC'=>'Ascensionsinsel',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Ägypten',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spanien',
'ET'=>'Äthiopien',
@@ -234,6 +235,7 @@ im Indischen Ozean',
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Niederlande',
+ 'GB-NIR' => 'Nordirland',
'NO'=>'Norwegen',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -261,7 +263,7 @@ im Indischen Ozean',
'RU'=>'Russland',
'RW'=>'Ruanda',
'SA'=>'Saudi-Arabien',
- 'UK'=>'Schottland',
+ 'GB-SCT'=>'Schottland',
'SB'=>'Salomon-Inseln',
'SC'=>'Seychellen',
'SS'=>'Südsudan',
@@ -313,6 +315,7 @@ im Indischen Ozean',
'VI'=>'Amerikanische Jungferninseln',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis und Futuna',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/de-DE/mail.php b/resources/lang/de-DE/mail.php
index 24989de9c1..4693b0f004 100644
--- a/resources/lang/de-DE/mail.php
+++ b/resources/lang/de-DE/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Ein Benutzer hat ein Gerät auf der Webseite angefordert',
'acceptance_asset_accepted' => 'Ein Benutzer hat einen Gegenstand akzeptiert',
'acceptance_asset_declined' => 'Ein Benutzer hat einen Gegenstand abgelehnt',
- 'accessory_name' => 'Zubehör Name:',
- 'additional_notes' => 'Zusätzliche Bemerkungen:',
+ 'accessory_name' => 'Zubehör Name',
+ 'additional_notes' => 'Zusätzliche Bemerkungen',
'admin_has_created' => 'Ein Administrator hat auf der :web Webseite ein Konto für Sie erstellt.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Name des Gegenstandes:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Gegenstand angefordert',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'Die Garantie von :count Asset wird in :threshold Tagen auslaufen.|Die Garantie von :count Assets wird in :threshold Tagen auslaufen.',
'assigned_to' => 'Zugewiesen an',
'best_regards' => 'Grüße,',
- 'canceled' => 'Abgebrochen:',
- 'checkin_date' => 'Rücknahmedatum:',
- 'checkout_date' => 'Herausgabedatum:',
+ 'canceled' => 'Abgebrochen',
+ 'checkin_date' => 'Rücknahmedatum',
+ 'checkout_date' => 'Herausgabedatum',
'checkedout_from' => 'Herausgegeben von',
'checkedin_from' => 'Eingecheckt von',
'checked_into' => 'Zurückgenommen in',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Bitte klicken Sie zum Bestätigen Ihres :web Kontos auf den folgenden Link:',
'current_QTY' => 'Aktuelle Menge',
'days' => 'Tage',
- 'expecting_checkin_date' => 'Erwartetes Rückgabedatum:',
+ 'expecting_checkin_date' => 'Erwartetes Rückgabedatum',
'expires' => 'Ablaufdatum',
'hello' => 'Hallo',
'hi' => 'Hallo',
'i_have_read' => 'Ich habe die Nutzungsbedingungen gelesen und stimme diesen zu, und ich habe diesen Gegenstand erhalten.',
'inventory_report' => 'Bestandsbericht',
- 'item' => 'Gegenstand:',
+ 'item' => 'Gegenstand',
'item_checked_reminder' => 'Dies ist eine Erinnerung daran, dass Sie derzeit :count Artikel ausgeliehen haben, die Sie weder angenommen noch abgelehnt haben. Klicken Sie bitte auf den untenstehenden Link, um diese entweder anzunehmen oder abzulehnen.',
'license_expiring_alert' => 'Es gibt :count auslaufende Lizenz in den nächsten :threshold Tagen.|Es gibt :count auslaufende Lizenzen in den nächsten :threshold Tagen.',
'link_to_update_password' => 'Klicken Sie bitte auf den folgenden Link zum Aktualisieren Ihres :web Passworts:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'Ein neuer Gegenstand wurde unter Ihrem Namen ausgecheckt. Details finden Sie weiter unten.',
'notes' => 'Notizen',
- 'password' => 'Passwort:',
+ 'password' => 'Passwort',
'password_reset' => 'Passwort zurücksetzen',
'read_the_terms' => 'Bitte lesen Sie die nachfolgenden Nutzungsbedingungen.',
'read_the_terms_and_click' => 'Bitte lesen Sie die Nutzungsbedingungen unten, und klicken Sie auf den Link am unteren Ende, um zu bestätigen, dass Sie die Nutzungsbedingungen gelesen und akzeptiert haben und das Asset erhalten haben.',
- 'requested' => 'Angefordert:',
+ 'requested' => 'Angefordert',
'reset_link' => 'Ihr Link zum Zurücksetzen des Kennworts',
'reset_password' => 'Klicken Sie hier, um Ihr Passwort zurückzusetzen:',
'rights_reserved' => 'Alle Rechte vorbehalten.',
@@ -80,7 +80,7 @@ return [
'supplier' => 'Lieferant',
'tag' => 'Kennzeichnung',
'test_email' => 'Test E-Mail von Snipe-IT',
- 'test_mail_text' => 'Dies ist ein Test von Snipe-IT-Asset-Management-System. Wenn Sie das erhalten haben, funktioniert das Senden von Mails :)',
+ 'test_mail_text' => 'Dies ist ein Test des Snipe-IT Asset Management Systems. Wenn Sie das erhalten haben, funktioniert das Senden von Mails :)',
'the_following_item' => 'Der folgende Gegenstand wurde eingecheckt: ',
'to_reset' => 'Zum Zurücksetzen Ihres :web Passwortes, füllen Sie bitte dieses Formular aus:',
'type' => 'Typ',
diff --git a/resources/lang/de-if/admin/accessories/general.php b/resources/lang/de-if/admin/accessories/general.php
index 49915e7979..9aa93ed7ed 100644
--- a/resources/lang/de-if/admin/accessories/general.php
+++ b/resources/lang/de-if/admin/accessories/general.php
@@ -8,7 +8,7 @@ return array(
'create' => 'Zubehör erstellen',
'edit' => 'Zubehör bearbeiten',
'eula_text' => 'Kategorie EULA',
- 'eula_text_help' => 'Dieses Feld erlaubt Dir, die EULA je nach Asset-Typ anzupassen. Wenn Du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
+ 'eula_text_help' => 'Dieses Feld erlaubt dir, die EULA je nach Asset-Typ anzupassen. Wenn du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
'require_acceptance' => 'Benutzer müssen die Annahme von Assets dieser Kategorie bestätigen.',
'no_default_eula' => 'Keine Standard EULA gefunden. Füge eine in den Einstellungen hinzu.',
'total' => 'Gesamt',
diff --git a/resources/lang/de-if/admin/accessories/message.php b/resources/lang/de-if/admin/accessories/message.php
index d8377dbe99..0e3fc8edc5 100644
--- a/resources/lang/de-if/admin/accessories/message.php
+++ b/resources/lang/de-if/admin/accessories/message.php
@@ -17,7 +17,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du dieses Zubehör löschen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du dieses Zubehör löschen möchtest?',
'error' => 'Beim Löschen dieses Zubehörs ist ein Problem aufgetreten. Bitte versuche es erneut.',
'success' => 'Das Zubehör wurde erfolgreich gelöscht.'
),
diff --git a/resources/lang/de-if/admin/categories/general.php b/resources/lang/de-if/admin/categories/general.php
index 902e7537ab..4778417939 100644
--- a/resources/lang/de-if/admin/categories/general.php
+++ b/resources/lang/de-if/admin/categories/general.php
@@ -11,7 +11,7 @@ return array(
'email_will_be_sent_due_to_global_eula' => 'Eine E-Mail wird an den Benutzer gesendet, da die globale EULA verwendet wird.',
'email_will_be_sent_due_to_category_eula' => 'Eine E-Mail wird an den Benutzer gesendet, da eine EULA für diese Kategorie festgelegt ist.',
'eula_text' => 'Kategorie EULA',
- 'eula_text_help' => 'Dieses Feld erlaubt Dir, die EULA je nach Asset-Typ anzupassen. Wenn Du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
+ 'eula_text_help' => 'Dieses Feld erlaubt dir, die EULA je nach Asset-Typ anzupassen. Wenn du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
'name' => 'Kategoriename',
'require_acceptance' => 'Benutzer müssen die Annahme von Assets dieser Kategorie bestätigen.',
'required_acceptance' => 'Dieser Benutzer erhält eine E-Mail zur Bestätigung der Annahme des Gegenstands.',
diff --git a/resources/lang/de-if/admin/categories/message.php b/resources/lang/de-if/admin/categories/message.php
index bac81f0a6f..107bb3ccb1 100644
--- a/resources/lang/de-if/admin/categories/message.php
+++ b/resources/lang/de-if/admin/categories/message.php
@@ -18,7 +18,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diese Kategorie löschen willst?',
+ 'confirm' => 'Bist Du sicher, dass du diese Kategorie löschen willst?',
'error' => 'Beim löschen der Kategorie ist ein Problem aufgetreten. Bitte versuche es erneut.',
'success' => 'Die Kategorie wurde erfolgreich gelöscht.'
)
diff --git a/resources/lang/de-if/admin/companies/message.php b/resources/lang/de-if/admin/companies/message.php
index 75a2b72cae..8c268f707f 100644
--- a/resources/lang/de-if/admin/companies/message.php
+++ b/resources/lang/de-if/admin/companies/message.php
@@ -13,7 +13,7 @@ return [
'success' => 'Firma erfolgreich aktualisiert.',
],
'delete' => [
- 'confirm' => 'Bist Du sicher, dass Du diese Firma löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diese Firma löschen willst?',
'error' => 'Es gab ein Problem beim Löschen der Firma. Bitte versuche es erneut.',
'success' => 'Die Firma wurde erfolgreich gelöscht.',
],
diff --git a/resources/lang/de-if/admin/components/message.php b/resources/lang/de-if/admin/components/message.php
index 5466746668..efc9e20c95 100644
--- a/resources/lang/de-if/admin/components/message.php
+++ b/resources/lang/de-if/admin/components/message.php
@@ -15,7 +15,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diese Komponente löschen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du diese Komponente löschen möchtest?',
'error' => 'Es gab ein Problem beim Löschen der Firma. Bitte versuche es erneut.',
'success' => 'Die Komponente wurde erfolgreich gelöscht.'
),
diff --git a/resources/lang/de-if/admin/consumables/message.php b/resources/lang/de-if/admin/consumables/message.php
index 88f9c3f885..99929088ab 100644
--- a/resources/lang/de-if/admin/consumables/message.php
+++ b/resources/lang/de-if/admin/consumables/message.php
@@ -16,7 +16,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du dieses Verbrauchsmaterial löschen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du dieses Verbrauchsmaterial löschen möchtest?',
'error' => 'Es gab ein Problem beim Löschen des Verbrauchsmaterials. Bitte versuche es erneut.',
'success' => 'Das Verbrauchsmaterial wurde erfolgreich gelöscht.'
),
diff --git a/resources/lang/de-if/admin/custom_fields/general.php b/resources/lang/de-if/admin/custom_fields/general.php
index 940ef407bd..ef562837d1 100644
--- a/resources/lang/de-if/admin/custom_fields/general.php
+++ b/resources/lang/de-if/admin/custom_fields/general.php
@@ -21,7 +21,7 @@ return [
'field_element_short' => 'Element',
'field_format' => 'Format',
'field_custom_format' => 'Benutzerdefiniertes Regex-Format',
- 'field_custom_format_help' => 'In diesem Feld kannst Du einen Regex-Ausdruck zur Validierung verwenden. Er sollte mit "regex:" beginnen. Um beispielsweise zu validieren, dass ein benutzerdefiniertes Feld eine gültige IMEI (15 numerische Ziffern) enthält, würdest Du regex:/^[0-9]{15}$/ nutzen.',
+ 'field_custom_format_help' => 'In diesem Feld kannst du einen Regex-Ausdruck zur Validierung verwenden. Er sollte mit "regex:" beginnen. Um beispielsweise zu validieren, dass ein benutzerdefiniertes Feld eine gültige IMEI (15 numerische Ziffern) enthält, würdest du regex:/^[0-9]{15}$/ nutzen.',
'required' => 'Pflichtfeld',
'req' => 'Erf.',
'used_by_models' => 'Von Modellen benutzt',
diff --git a/resources/lang/de-if/admin/custom_fields/message.php b/resources/lang/de-if/admin/custom_fields/message.php
index dd5f451f73..9b26b128ac 100644
--- a/resources/lang/de-if/admin/custom_fields/message.php
+++ b/resources/lang/de-if/admin/custom_fields/message.php
@@ -19,7 +19,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du dieses Feld löschen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du dieses Feld löschen möchtest?',
'error' => 'Beim Löschen des Felds ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'success' => 'Das Feld wurde erfolgreich gelöscht.',
'in_use' => 'Dieses Feld wird derzeit noch verwendet.',
@@ -42,7 +42,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diesen Feldsatz löschen möchten?',
+ 'confirm' => 'Bist du sicher, dass du diesen Feldsatz löschen möchten?',
'error' => 'Beim Löschen des Feldsatzes ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'success' => 'Der Feldsatz wurde erfolgreich gelöscht.',
'in_use' => 'Dieser Feldsatz wird derzeit noch verwendet.',
diff --git a/resources/lang/de-if/admin/departments/message.php b/resources/lang/de-if/admin/departments/message.php
index 07ee07e1d9..fdec3cffcd 100644
--- a/resources/lang/de-if/admin/departments/message.php
+++ b/resources/lang/de-if/admin/departments/message.php
@@ -14,7 +14,7 @@ return array(
'success' => 'Abteilung wurde erfolgreich aktualisiert.'
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diese Abteilung löschen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du diese Abteilung löschen möchtest?',
'error' => 'Beim Löschen der Abteilung ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'success' => 'Die Abteilung wurde erfolgreich gelöscht.'
)
diff --git a/resources/lang/de-if/admin/depreciations/message.php b/resources/lang/de-if/admin/depreciations/message.php
index d8231c8810..a582bd8235 100644
--- a/resources/lang/de-if/admin/depreciations/message.php
+++ b/resources/lang/de-if/admin/depreciations/message.php
@@ -17,7 +17,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diese Abschreibungsklasse löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diese Abschreibungsklasse löschen willst?',
'error' => 'Beim Löschen der Abschreibungsklasse ist ein Problem aufgetreten. Bitte versuche es erneut.',
'success' => 'Die Abschreibungsklasse wurde erfolgreich gelöscht.'
)
diff --git a/resources/lang/de-if/admin/groups/message.php b/resources/lang/de-if/admin/groups/message.php
index 1a7357a236..9675e85156 100644
--- a/resources/lang/de-if/admin/groups/message.php
+++ b/resources/lang/de-if/admin/groups/message.php
@@ -13,7 +13,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du die Gruppe löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diese Gruppe löschen möchtest?',
'create' => 'Beim Erstellen der Gruppe ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'update' => 'Beim Aktualisieren der Gruppe ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'delete' => 'Beim Löschen der Gruppe ist ein Fehler aufgetreten. Bitte versuche es erneut.',
diff --git a/resources/lang/de-if/admin/hardware/form.php b/resources/lang/de-if/admin/hardware/form.php
index f3392a527f..88428fc532 100644
--- a/resources/lang/de-if/admin/hardware/form.php
+++ b/resources/lang/de-if/admin/hardware/form.php
@@ -8,7 +8,7 @@ return [
'bulk_delete_warn' => 'Du bist im Begriff :asset_count Assets zu löschen.',
'bulk_restore_warn' => 'Sie sind dabei, :asset_count Assets wiederherzustellen.',
'bulk_update' => 'Massenaktualisierung von Assets',
- 'bulk_update_help' => 'Diese Eingabemaske erlaubt Dir die Aktualisierung von mehreren Assets zugleich. Fülle die Felder aus, die Du ändern möchtest. Alle leeren Felder bleiben unverändert. ',
+ 'bulk_update_help' => 'Diese Eingabemaske erlaubt dir die Aktualisierung von mehreren Assets zugleich. Fülle die Felder aus, die du ändern möchtest. Alle leeren Felder bleiben unverändert. ',
'bulk_update_warn' => 'Du bearbeitest die Eigenschaften eines Assets.|Du bearbeitest die Eigenschaften von :asset_count Assets.',
'bulk_update_with_custom_field' => 'Beachte, dass die Assets :asset_model_count verschiedene Arten von Modellen sind.',
'bulk_update_model_prefix' => 'Auf Modellen',
diff --git a/resources/lang/de-if/admin/hardware/general.php b/resources/lang/de-if/admin/hardware/general.php
index 841cbf995f..968e0fb78c 100644
--- a/resources/lang/de-if/admin/hardware/general.php
+++ b/resources/lang/de-if/admin/hardware/general.php
@@ -2,7 +2,7 @@
return [
'about_assets_title' => 'Über Assets',
- 'about_assets_text' => 'Assets sind Gegenstände die durch eine Seriennummer oder einem Asset-Tag identifiziert werden. Meistens sind diese Gegenstände von höherem Wert, weshalb es Sinn ergibt diese spezifisch zu kennzeichnen.',
+ 'about_assets_text' => 'Assets sind Gegenstände die durch eine Seriennummer oder einem Asset-Tag identifiziert werden. Meistens sind diese Gegenstände von höherem Wert, weshalb es Sinn ergibt, diese spezifisch zu kennzeichnen.',
'archived' => 'Archiviert',
'asset' => 'Asset',
'bulk_checkout' => 'Assets herausgeben',
@@ -14,7 +14,7 @@ return [
'deleted' => 'Dieses Asset wurde gelöscht.',
'delete_confirm' => 'Bist du sicher, dass du dieses Asset löschen möchtest?',
'edit' => 'Asset bearbeiten',
- 'model_deleted' => 'Dieses Modell für Assets wurde gelöscht. Du musst das Modell wiederherstellen, bevor Du das Asset wiederherstellen kannst.',
+ 'model_deleted' => 'Dieses Modell für Assets wurde gelöscht. Du musst das Modell wiederherstellen, bevor du das Asset wiederherstellen kannst.',
'model_invalid' => 'Das Modell für dieses Asset ist ungültig.',
'model_invalid_fix' => 'Das Asset muss aktualisiert und ein gültiges Asset-Modell verwendet werden, bevor versucht wird, es ein- oder auszuchecken oder es zu prüfen.',
'requestable' => 'Anforderbar',
diff --git a/resources/lang/de-if/admin/hardware/message.php b/resources/lang/de-if/admin/hardware/message.php
index 9445aed5f4..1769e733f4 100644
--- a/resources/lang/de-if/admin/hardware/message.php
+++ b/resources/lang/de-if/admin/hardware/message.php
@@ -46,7 +46,7 @@ return [
'upload' => [
'error' => 'Datei(en) wurde(n) nicht hochgeladen. Bitte versuche es erneut.',
'success' => 'Datei(en) wurden erfolgreich hochgeladen.',
- 'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die Du hochladen möchtest, ist zu groß',
+ 'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die du hochladen möchtest, ist zu groß',
'invalidfiles' => 'Eine oder mehrere Deiner Dateien sind zu groß, oder deren Dateityp ist nicht zugelassen. Zugelassene Dateitypen sind png, gif, jpg, doc, docx, pdf, und txt.',
],
@@ -58,14 +58,14 @@ return [
'file_delete_success' => 'Deine Datei wurde erfolgreich gelöscht',
'file_delete_error' => 'Die Datei konnte nicht gelöscht werden',
'file_missing' => 'Die ausgewählte Datei fehlt',
- 'file_already_deleted' => 'The file selected was already deleted',
+ 'file_already_deleted' => 'Die ausgewählte Datei wurde bereits gelöscht',
'header_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der Kopfzeile enthalten fehlerhafte UTF-8 Zeichen',
'content_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der ersten Zeile des Inhalts enthalten fehlerhafte UTF-8-Zeichen',
],
'delete' => [
- 'confirm' => 'Bist Du sicher, dass Du dieses Asset entfernen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du dieses Asset entfernen möchtest?',
'error' => 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'nothing_updated' => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts gelöscht.',
'success' => 'Dass Asset wurde erfolgreich entfernt.',
diff --git a/resources/lang/de-if/admin/kits/general.php b/resources/lang/de-if/admin/kits/general.php
index 7861933cb4..024d8605e6 100644
--- a/resources/lang/de-if/admin/kits/general.php
+++ b/resources/lang/de-if/admin/kits/general.php
@@ -2,7 +2,7 @@
return [
'about_kits_title' => 'Über vordefinierte Kits',
- 'about_kits_text' => 'Mit vordefinierten Kits kannst Du schnell eine Sammlung von Elementen (Assets, Lizenzen, etc.) an einen Benutzer ausgeben. Dies kann hilfreich sein, wenn Ihr Onboarding-Prozess über viele Nutzer hinweg einheitlich ist und alle Nutzer die gleichen Artikel erhalten.',
+ 'about_kits_text' => 'Mit vordefinierten Kits kannst du schnell eine Sammlung von Elementen (Assets, Lizenzen, etc.) an einen Benutzer ausgeben. Dies kann hilfreich sein, wenn dein Onboarding-Prozess über viele Nutzer hinweg einheitlich ist und alle Nutzer die gleichen Artikel erhalten.',
'checkout' => 'Kit herausgeben ',
'create_success' => 'Kit wurde erfolgreich erstellt.',
'create' => 'Vordefiniertes Kit erstellen',
diff --git a/resources/lang/de-if/admin/licenses/message.php b/resources/lang/de-if/admin/licenses/message.php
index a42c63877e..020067cf8c 100644
--- a/resources/lang/de-if/admin/licenses/message.php
+++ b/resources/lang/de-if/admin/licenses/message.php
@@ -2,10 +2,10 @@
return array(
- 'does_not_exist' => 'Die Lizenz existiert nicht oder Du hast keine Berechtigung, sie anzusehen.',
+ 'does_not_exist' => 'Die Lizenz existiert nicht oder du hast keine Berechtigung, sie anzusehen.',
'user_does_not_exist' => 'Benutzer existiert nicht oder Sie haben keine Berechtigung, sie anzusehen.',
- 'asset_does_not_exist' => 'Der Gegenstand, mit dem Du diese Lizenz verknüpfen möchtest, existiert nicht.',
- 'owner_doesnt_match_asset' => 'Der Gegenstand, den Du mit dieser Lizenz verknüpfen möchtest, gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
+ 'asset_does_not_exist' => 'Der Gegenstand, mit dem du diese Lizenz verknüpfen möchtest, existiert nicht.',
+ 'owner_doesnt_match_asset' => 'Der Gegenstand, den du mit dieser Lizenz verknüpfen möchtest, gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
'assoc_users' => 'Diese Lizenz ist derzeit einem Benutzer zugeordnet und kann nicht gelöscht werden. Bitte nimm die Lizenz zurück und versuche anschließend erneut, diese zu löschen. ',
'select_asset_or_person' => 'Du musst ein Asset oder einen Benutzer auswählen, aber nicht beides.',
'not_found' => 'Lizenz nicht gefunden',
@@ -25,7 +25,7 @@ return array(
'upload' => array(
'error' => 'Datei(en) wurde(n) nicht hochgeladen. Bitte versuche es erneut.',
'success' => 'Datei(en) wurden erfolgreich hochgeladen.',
- 'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die Du hochladen möchtest, ist zu groß',
+ 'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die du hochladen möchtest, ist zu groß',
'invalidfiles' => 'Eine oder mehrere Deiner Dateien sind zu groß oder ist ein Dateityp, der nicht zulässig ist. Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml und lic.',
),
@@ -35,7 +35,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diese Lizenz löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diese Lizenz löschen willst?',
'error' => 'Beim Löschen der Lizenz ist ein Problem aufgetreten. Bitte versuche es erneut.',
'success' => 'Die Lizenz wurde erfolgreich gelöscht.'
),
diff --git a/resources/lang/de-if/admin/locations/message.php b/resources/lang/de-if/admin/locations/message.php
index 7c4f2485f1..07c657d990 100644
--- a/resources/lang/de-if/admin/locations/message.php
+++ b/resources/lang/de-if/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'Standort existiert nicht.',
- 'assoc_users' => 'Dieser Standort kann derzeit nicht gelöscht werden, da er der Standort der Aufzeichnung für mindestens ein Asset oder einen Benutzer ist, ihm Assets zugewiesen sind oder er der übergeordnete Standort eines anderen Standorts ist. Aktualisiere deine Modelle, damit dieser Standort nicht mehr referenziert wird, und versuche es erneut. ',
+ 'assoc_users' => 'Dieser Standort kann derzeit nicht gelöscht werden, da er der Standort eines Datensatzes für mindestens ein Asset oder einen Benutzer ist, ihm Assets zugewiesen sind oder er der übergeordnete Standort eines anderen Standorts ist. Aktualisiere deine Datensätze, sodass dieser Standort nicht mehr referenziert wird, und versuche es erneut. ',
'assoc_assets' => 'Dieser Standort ist mindestens einem Gegenstand zugewiesen und kann nicht gelöscht werden. Bitte entferne die Standortzuweisung bei den jeweiligen Gegenständen und versuche erneut, diesen Standort zu entfernen. ',
'assoc_child_loc' => 'Dieser Standort ist mindestens einem anderen Ort übergeordnet und kann nicht gelöscht werden. Bitte aktualisiere Deine Standorte, so dass dieser Standort nicht mehr verknüpft ist, und versuche es erneut. ',
'assigned_assets' => 'Zugeordnete Assets',
'current_location' => 'Aktueller Standort',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => 'Öffnen in :map_provider_icon Karten',
'create' => array(
@@ -22,12 +22,12 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'Der Standort wurde nicht wiederhergestellt. Bitte versuche es erneut',
+ 'success' => 'Standort erfolgreich wiederhergestellt.'
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diesen Standort löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diesen Standort löschen willst?',
'error' => 'Es gab einen Fehler beim Löschen des Standorts. Bitte erneut versuchen.',
'success' => 'Der Standort wurde erfolgreich gelöscht.'
)
diff --git a/resources/lang/de-if/admin/manufacturers/message.php b/resources/lang/de-if/admin/manufacturers/message.php
index 6255e5e845..5c8318dfcc 100644
--- a/resources/lang/de-if/admin/manufacturers/message.php
+++ b/resources/lang/de-if/admin/manufacturers/message.php
@@ -22,7 +22,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diesen Hersteller löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diesen Hersteller löschen willst?',
'error' => 'Beim löschen des Herstellers ist ein Problem aufgetreten. Bitte versuche es erneut.',
'success' => 'Der Hersteller wurde erfolgreich gelöscht.'
)
diff --git a/resources/lang/de-if/admin/manufacturers/table.php b/resources/lang/de-if/admin/manufacturers/table.php
index f3df7aed63..17ca29500d 100644
--- a/resources/lang/de-if/admin/manufacturers/table.php
+++ b/resources/lang/de-if/admin/manufacturers/table.php
@@ -2,7 +2,7 @@
return array(
'about_manufacturers_title' => 'Über Hersteller',
- 'about_manufacturers_text' => 'Hersteller sind die Firmen, die Deine Assets herstellen. Hier kannst Du wichtige Supportkontakte eintragen, die in den Assetdetails angezeigt werden.',
+ 'about_manufacturers_text' => 'Hersteller sind die Firmen, die deine Assets herstellen. Hier kannst du wichtige Support-Kontaktinformationen eintragen, die in den Asset-Details angezeigt werden.',
'asset_manufacturers' => 'Asset Hersteller',
'create' => 'Hersteller anlegen',
'id' => 'ID',
diff --git a/resources/lang/de-if/admin/models/message.php b/resources/lang/de-if/admin/models/message.php
index 5b0093319d..971dd3da31 100644
--- a/resources/lang/de-if/admin/models/message.php
+++ b/resources/lang/de-if/admin/models/message.php
@@ -21,7 +21,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du dieses Asset-Modell entfernen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du dieses Asset-Modell entfernen möchtest?',
'error' => 'Beim Löschen des Modell ist ein Fehler aufgetreten. Bitte versuche es noch einmal.',
'success' => 'Das Modell wurde erfolgreich gelöscht.'
),
diff --git a/resources/lang/de-if/admin/settings/general.php b/resources/lang/de-if/admin/settings/general.php
index ca3b2c0222..15f8e3c310 100644
--- a/resources/lang/de-if/admin/settings/general.php
+++ b/resources/lang/de-if/admin/settings/general.php
@@ -8,33 +8,35 @@ return [
'ad_append_domain' => 'Domänenname an das Feld Benutzername anhängen',
'ad_append_domain_help' => 'Der Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.',
'admin_cc_email' => 'CC Email',
- 'admin_cc_email_help' => 'Wenn Du eine Kopie der Rücknahme-/Herausgabe-E-Mails, die an Benutzer gehen, auch an zusätzliche E-Mail-Empfänger versenden möchtest, gebe sie hier ein. Ansonsten lass dieses Feld blank.',
+ 'admin_cc_email_help' => 'Wenn du eine Kopie der Check-in-/Check-out-E-Mails, die an Benutzer gesendet werden, an ein zusätzliches E-Mail-Konto senden möchtest, gebe es hier ein. Andernfalls lasse dieses Feld einfach leer.',
'admin_settings' => 'Admin-Einstellungen',
'is_ad' => 'Dies ist ein Active Directory Server',
'alerts' => 'Alarme',
'alert_title' => 'Benachrichtigungseinstellungen ändern',
'alert_email' => 'Alarme senden an',
- 'alert_email_help' => 'E-Mail-Adressen oder Verteilerlisten an die Warnungen gesendet werden sollen, durch Komma getrennt',
+ 'alert_email_help' => 'E-Mail-Adressen oder Verteilerlisten, an die Benachrichtigungen gesendet werden sollen, durch Kommas getrennt',
'alerts_enabled' => 'E-Mail-Benachrichtigungen aktiviert',
'alert_interval' => 'Ablauf Alarmschwelle (in Tagen)',
'alert_inv_threshold' => 'Inventar Alarmschwelle',
'allow_user_skin' => 'Benutzerdesign erlauben',
- 'allow_user_skin_help_text' => 'Wenn Du dieses Kästchen aktivierst, kann ein Benutzer das Design mit einem anderen überschreiben.',
+ 'allow_user_skin_help_text' => 'Wenn du dieses Kästchen aktivierst, kann ein Benutzer das Design mit einem anderen überschreiben.',
'asset_ids' => 'Asset IDs',
'audit_interval' => 'Auditintervall',
- 'audit_interval_help' => 'Wenn Du verpflichtet bist, Deine Assets regelmäßig physisch zu überprüfen, geben das Intervall in Monaten an. Wenn Du diesen Wert aktualisiert, werden alle "nächsten Audittermine" für Assets mit einem anstehenden Prüfungsdatum aktualisiert.',
+ 'audit_interval_help' => 'Wenn du Anlagen regelmäßig physisch prüfen musst, gebe das von Ihnen verwendete Intervall in Monaten ein. Wenn du diesen Wert aktualisierst, werden alle „nächsten Prüftermine“ für Anlagen mit einem bevorstehenden Prüftermin aktualisiert.',
'audit_warning_days' => 'Audit-Warnschwelle',
- 'audit_warning_days_help' => 'Wie viele Tage im Voraus sollen wir Dich warnen, wenn Assets zur Prüfung fällig werden?',
+ 'audit_warning_days_help' => 'Wie viele Tage im Voraus sollen wir dich benachrichtigen, wenn eine Prüfung der Vermögenswerte ansteht?',
'auto_increment_assets' => 'Erzeugen von fortlaufenden Asset Tags',
'auto_increment_prefix' => 'Präfix (optional)',
'auto_incrementing_help' => 'Aktiviere zuerst fortlaufende Asset Tags um dies zu setzen',
'backups' => 'Backups',
'backups_help' => 'Backups erstellen, herunterladen und wiederherstellen ',
'backups_restoring' => 'Aus Backup wiederherstellen',
+ 'backups_clean' => 'Bereinige die gesicherte Datenbank vor der Wiederherstellung',
+ 'backups_clean_helptext' => "Dies kann nützlich sein, wenn du zwischen Datenbankversionen wechselst",
'backups_upload' => 'Backup hochladen',
'backups_path' => 'Backups auf dem Server werden in :path gespeichert',
'backups_restore_warning' => 'Klicke den Wiederherstellungs-Knopf um ein Backup wiederherzustellen. (Funktioniert derzeit nicht mit S3 Datenspeicher oder Docker.)
Die gesamte :app_name Datenbank und alle hochgeladenen Dateien werden mit den Inhalten des Backups überschrieben. ',
- 'backups_logged_out' => 'Alle vorhandenen Benutzer, auch Du, werden abgemeldet, sobald Deine Wiederherstellung abgeschlossen ist.',
+ 'backups_logged_out' => 'Alle vorhandenen Benutzer, einschließlich dir selbst, werden abgemeldet, sobald die Wiederherstellung abgeschlossen ist.',
'backups_large' => 'Sehr große Backups können beim Wiederherstellungsversuch ausfallen (Time-Out) und müssen eventuell über die Kommandozeile ausgeführt werden. ',
'barcode_settings' => 'Barcode Einstellungen',
'confirm_purge' => 'Bereinigung bestätigen',
@@ -73,7 +75,7 @@ return [
'generate_backup' => 'Backup erstellen',
'google_workspaces' => 'Google Arbeitsbereiche',
'header_color' => 'Kopfzeilenfarbe',
- 'info' => 'Mit diesen Einstellungen kannst Du verschiedene Bereiche Deiner Installation anpassen.',
+ 'info' => 'Mit diesen Einstellungen kannst du verschiedene Bereiche deiner Installation anpassen.',
'label_logo' => 'Label-Logo',
'label_logo_size' => 'Quadratische Logos sehen am besten aus und werden rechts oben auf jedem Asset-Label angezeigt. ',
'laravel' => 'Laravel Version',
@@ -87,17 +89,17 @@ return [
'ldap_enabled' => 'LDAP aktiviert',
'ldap_integration' => 'LDAP Integration',
'ldap_settings' => 'LDAP Einstellungen',
- 'ldap_client_tls_cert_help' => 'Client-seitige TLS-Zertifikat und Schlüssel für LDAP Verbindungen sind in der Regel nur in Google Workspace Konfigurationen mit "Secure LDAP" nützlich. Beide werden benötigt.',
+ 'ldap_client_tls_cert_help' => 'Clientseitiges TLS-Zertifikat und Schlüssel für LDAP-Verbindungen sind normalerweise nur in Google Workspace-Konfigurationen mit „Secure LDAP“ nützlich. Beide sind aber erforderlich.',
'ldap_location' => 'LDAP Standort',
'ldap_location_help' => 'Das Feld LDAP Standort sollte verwendet werden, wenn keine OU im Basis Bind DN verwendet wird. Leer lassen, wenn eine OU-Suche verwendet wird.',
'ldap_login_test_help' => 'Gib einen gültigen LDAP-Benutzernamen und ein Passwort von der oben angegebenen Basis-DN ein, um zu testen, ob Deine LDAP-Anmeldung korrekt konfiguriert ist. DU MUSST DEINE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
- 'ldap_login_sync_help' => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Falls Deine LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. DU MUSST DEINE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
+ 'ldap_login_sync_help' => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Falls deine LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. DU MUSST DEINE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
'ldap_manager' => 'LDAP Manager',
'ldap_server' => 'LDAP-Server',
'ldap_server_help' => 'Dies sollte mit ldap:// (für unverschlüsselt) oder ldaps:// (für TLS oder SSL) beginnen',
'ldap_server_cert' => 'LDAP-SSL-Zertifikatsüberprüfung',
'ldap_server_cert_ignore' => 'Ungültiges SSL-Zertifikat erlauben',
- 'ldap_server_cert_help' => 'Wähle diese Option, wenn Du selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchtest.',
+ 'ldap_server_cert_help' => 'Aktiviere diese Option, wenn du ein selbstsigniertes SSL-Zertifikat verwendest und ein ungültiges SSL-Zertifikat akzeptieren möchtest.',
'ldap_tls' => 'TLS verwenden',
'ldap_tls_help' => 'Diese Option sollte nur aktiviert werden, wenn STARTTLS auf Deinem LDAP-Server ausgeführt wird. ',
'ldap_uname' => 'LDAP Bind Benutzername',
@@ -109,7 +111,7 @@ return [
'ldap_basedn' => 'Basis Bind DN',
'ldap_filter' => 'LDAP Filter',
'ldap_pw_sync' => 'LDAP-Passwort-Sync',
- 'ldap_pw_sync_help' => 'Deaktiviere diese Option, wenn Du LDAP-Passwörter nicht mit lokalen Passwörtern synchronisieren möchtest. Wenn Du dies deaktivierst, können sich Deine Benutzer möglicherweise nicht einloggen, wenn Dein LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
+ 'ldap_pw_sync_help' => 'Deaktiviere diese Option, wenn du LDAP-Passwörter nicht mit lokalen Passwörtern synchronisieren möchtest. Wenn du diese Option deaktivierst, können sich deine Benutzer möglicherweise nicht anmelden, wenn dein LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
'ldap_username_field' => 'Benutzernamen Feld',
'ldap_lname_field' => 'Nachname',
'ldap_fname_field' => 'LDAP Vorname',
@@ -136,7 +138,7 @@ return [
'login_remote_user_enabled_text' => 'Login mit Remote-Benutzer-Header aktivieren',
'login_remote_user_enabled_help' => 'Diese Option aktiviert die Authentifizierung über den REMOTE_USER Header gemäß dem "Common Gateway Interface (rfc3875)"',
'login_common_disabled_text' => 'Deaktiviere andere Authentifizierungsmethoden',
- 'login_common_disabled_help' => 'Diese Option deaktiviert andere Authentifizierungsmethoden. Aktiviere diese Option nur, wenn Du Dir sicher bist, dass REMOTE_USER Login bereits funktioniert',
+ 'login_common_disabled_help' => 'Diese Option deaktiviert andere Authentifizierungsmethoden. Aktiviere diese Option nur, wenn du dir sicher bist, dass REMOTE_USER Login bereits funktioniert',
'login_remote_user_custom_logout_url_text' => 'Benutzerdefinierte Abmelde-URL',
'login_remote_user_custom_logout_url_help' => 'Sofern hier eine URL angegeben ist, werden Benutzer automatisch zu dieser URL weitergeleitet, nachdem der Benutzer sich aus Snipe-IT ausloggt. Dies ist nützlich, um die Benutzersitzung Deines Authentifizierungsproviders korrekt zu beenden.',
'login_remote_user_header_name_text' => 'Benutzerdefinierter Benutzername Header',
@@ -157,7 +159,7 @@ return [
'php_gd_info' => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationsanweisungen.',
'php_gd_warning' => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
'pwd_secure_complexity' => 'Passwortkomplexität',
- 'pwd_secure_complexity_help' => 'Wählen Sie aus, welche Komplexitätsregeln Du für Passwörter durchsetzen möchtest.',
+ 'pwd_secure_complexity_help' => 'Wähle aus, welche Komplexitätsregeln du für Passwörter durchsetzen möchtest.',
'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Passwort darf nicht mit Vorname, Nachname, E-Mail oder Benutzername identisch sein',
'pwd_secure_complexity_letters' => 'Mindestens ein Buchstabe erforderlich',
'pwd_secure_complexity_numbers' => 'Mindestens eine Zahl erforderlich',
@@ -166,7 +168,7 @@ return [
'pwd_secure_min' => 'Minimale Passwortlänge',
'pwd_secure_min_help' => 'Minimal zulässiger Wert ist 8',
'pwd_secure_uncommon' => 'Gewöhnliche Passwörter verhindern',
- 'pwd_secure_uncommon_help' => 'Verhindert die Verwendung der 10.000 häufigsten Passwörter aus im Internet geleakten Quellen.',
+ 'pwd_secure_uncommon_help' => 'Dadurch wird verhindert, dass Benutzer gängige Passwörter aus den 10.000 am häufigsten bei Daten-Leaks gemeldeten Passwörtern verwenden.',
'qr_help' => 'Schalte zuerst QR Codes an um dies zu setzen',
'qr_text' => 'QR Code Text',
'saml' => 'SAML',
@@ -233,7 +235,7 @@ return [
'brand_help' => 'Logo, Seitenname',
'web_brand' => 'Web Branding Typ',
'about_settings_title' => 'Über Einstellungen',
- 'about_settings_text' => 'Mit diesen Einstellungen kannst Du verschiedene Aspekte Ihrer Installation anpassen.',
+ 'about_settings_text' => 'Mit diesen Einstellungen kannst du verschiedene Aspekte deiner Installation anpassen.',
'labels_per_page' => 'Etiketten pro Seite',
'label_dimensions' => 'Etikettengröße (Zoll)',
'next_auto_tag_base' => 'Nächster Auto-Inkrement',
@@ -255,7 +257,7 @@ return [
'width_w' => 'b',
'height_h' => 'h',
'show_url_in_emails' => 'Link zu Snipe-IT in E-Mails',
- 'show_url_in_emails_help_text' => 'Deaktiviere dieses Kästchen, wenn Du nicht auf Deine Snipe-IT-Installation in Deinen E-Mail-Fußzeilen verlinken möchtest. Nützlich, wenn sich die meisten Nutzer nie anmelden. ',
+ 'show_url_in_emails_help_text' => 'Deaktiviere dieses Kästchen, wenn du nicht auf deine Snipe-IT-Installation in deinen E-Mail-Fußzeilen verlinken möchtest. Nützlich, wenn sich die meisten Nutzer nie anmelden. ',
'text_pt' => 'pkt',
'thumbnail_max_h' => 'Maximale Höhe der Miniaturansicht',
'thumbnail_max_h_help' => 'Maximale Höhe in Pixeln, die Miniaturbilder in der Listenansicht anzeigen dürfen. Min. 25, max. 500.',
@@ -267,7 +269,7 @@ return [
'two_factor_reset_help' => 'Dies zwingt den Benutzer, sein Gerät erneut mit seiner Authentifizierungs-App zu registrieren. Dies kann nützlich sein, wenn ihr derzeit angemeldetes Gerät verloren geht oder gestohlen wird. ',
'two_factor_reset_success' => 'Zwei-Faktor-Gerät erfolgreich zurückgesetzt',
'two_factor_reset_error' => 'Zwei-Faktor-Gerät zurücksetzen ist fehlgeschlagen',
- 'two_factor_enabled_warning' => 'Die Aktivierung der Zwei-Faktor-Authentifizierung bewirkt, dass Du Dich sofort mit einem bei Google Authenticator registrierten Gerät authentifizieren musst. Du hast die Möglichkeit, Dein Gerät hinzuzufügen, falls derzeit keines registriert ist.',
+ 'two_factor_enabled_warning' => 'Die Aktivierung der Zwei-Faktor-Authentifizierung bewirkt, dass du dich sofort mit einem bei Google-Authentikator registrierten Gerät authentifizieren musst. Du hast die Möglichkeit, dein Gerät hinzuzufügen, falls derzeit keines registriert ist.',
'two_factor_enabled_help' => 'Damit wird die Zwei-Faktor-Authentifizierung mit dem Google Authenticator aktiviert.',
'two_factor_optional' => 'Auswählbar (Benutzer können aktivieren oder deaktivieren, wenn erlaubt)',
'two_factor_required' => 'Für alle Benutzer erforderlich',
@@ -331,7 +333,7 @@ return [
'labels_help' => 'Etikettengrößen & Einstellungen',
'purge_keywords' => 'Endgültig löschen',
'purge_help' => 'Gelöschte Einträge bereinigen',
- 'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Du kannst Deine Einstellungen trotzdem speichern, aber Du musst die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
+ 'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Du kannst deine Einstellungen trotzdem speichern, aber du musst die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
'ldap_ad' => 'LDAP/AD',
'employee_number' => 'Mitarbeiternummer',
'create_admin_user' => 'Benutzer erstellen ::',
diff --git a/resources/lang/de-if/admin/settings/message.php b/resources/lang/de-if/admin/settings/message.php
index c0a93dafca..21c46d45c6 100644
--- a/resources/lang/de-if/admin/settings/message.php
+++ b/resources/lang/de-if/admin/settings/message.php
@@ -12,7 +12,7 @@ return [
'generated' => 'Neue Backup Datei erfolgreich erstellt.',
'file_not_found' => 'Backup Datei konnte nicht gefunden werden.',
'restore_warning' => 'Ja, wiederherstellen. Ich bestätige, dass dies alle vorhandenen Daten überschreibt, die derzeit in der Datenbank vorhanden sind. Diese Aktion wird auch alle bestehenden Benutzer abmelden (einschließlich Dir).',
- 'restore_confirm' => 'Bist Du sicher, dass Du Deine Datenbank aus :filename wiederherstellen möchten?'
+ 'restore_confirm' => 'Bist du sicher, dass du deine Datenbank aus :filename wiederherstellen möchten?'
],
'restore' => [
'success' => 'Ihr Systembackup wurde wiederhergestellt. Bitte melde dich erneut an.'
@@ -26,7 +26,7 @@ return [
'sending' => 'Test E-Mail wird gesendet...',
'success' => 'Mail gesendet!',
'error' => 'E-Mail konnte nicht gesendet werden.',
- 'additional' => 'Keine zusätzliche Fehlermeldung vorhanden. Überprüfe Deine E-Mail-Einstellungen und Dein App-Protokoll.'
+ 'additional' => 'Keine zusätzliche Fehlermeldung vorhanden. Überprüfe deine E-Mail-Einstellungen und dein App-Protokoll.'
],
'ldap' => [
'testing' => 'Teste LDAP Verbindung, Binding & Abfrage ...',
diff --git a/resources/lang/de-if/admin/statuslabels/message.php b/resources/lang/de-if/admin/statuslabels/message.php
index 0b6937b035..8eb7361d80 100644
--- a/resources/lang/de-if/admin/statuslabels/message.php
+++ b/resources/lang/de-if/admin/statuslabels/message.php
@@ -17,7 +17,7 @@ return [
],
'delete' => [
- 'confirm' => 'Bist Du sicher, dass Du diese Statusbezeichnung löschen willst?',
+ 'confirm' => 'Bist du sicher, dass du diese Statusbezeichnung löschen willst?',
'error' => 'Es trat ein Fehler beim Löschen der Statusbezeichnung auf. Bitte versuche es erneut.',
'success' => 'Die Statusbezeichnung wurde erfolgreich gelöscht.',
],
diff --git a/resources/lang/de-if/admin/suppliers/message.php b/resources/lang/de-if/admin/suppliers/message.php
index ab6a21f565..7c753552c8 100644
--- a/resources/lang/de-if/admin/suppliers/message.php
+++ b/resources/lang/de-if/admin/suppliers/message.php
@@ -17,7 +17,7 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bist Du sicher, dass Du diesen Lieferanten löschen möchtest?',
+ 'confirm' => 'Bist du sicher, dass du diesen Lieferanten löschen möchtest?',
'error' => 'Beim Löschen des Lieferanten ist ein Fehler aufgetreten. Bitte versuche es erneut.',
'success' => 'Lieferant wurde erfolgreich gelöscht.',
'assoc_assets' => 'Dieser Lieferant ist derzeit :asset_count Asset(s) zugeordnet und kann nicht gelöscht werden. Bitte aktualisiere Deine Assets, so dass sie nicht mehr auf diesen Lieferant verweisen und versuche es erneut. ',
diff --git a/resources/lang/de-if/admin/users/general.php b/resources/lang/de-if/admin/users/general.php
index 10b5b0d236..0f3b39bd5d 100644
--- a/resources/lang/de-if/admin/users/general.php
+++ b/resources/lang/de-if/admin/users/general.php
@@ -2,9 +2,9 @@
return [
'activated_help_text' => 'Der Nutzer kann sich einloggen',
- 'activated_disabled_help_text' => 'Du kannst den Aktiverungsstatus für Dein eigenes Account nicht ändern.',
+ 'activated_disabled_help_text' => 'Du kannst den Aktivierungsstatus für deinen eigenen Account nicht bearbeiten.',
'assets_user' => 'Assets zugewiesen an :name',
- 'bulk_update_warn' => 'Du bist dabei, die Eigenschaften von :user_count Benutzern zu bearbeiten. Bitte beachte, dass Du Deine eigenen Benutzerattribute nicht über dieses Formular ändern kansst. Du musst Deinen eigenen Benutzer einzeln bearbeiten.',
+ 'bulk_update_warn' => 'Du bist dabei, die Eigenschaften von :user_count Benutzern zu bearbeiten. Bitte beachte, dass du deine eigenen Benutzerattribute nicht über dieses Formular ändern kannst und Änderungen an deinem eigenen Benutzer einzeln vornehmen musst.',
'bulk_update_help' => 'Hier können mehrere Benutzer gleichzeitig bearbeitet werden. Nur Felder ausfüllen, welche geändert werden sollen. Leere Felder werden nicht geändert.',
'current_assets' => 'Asset wurde an nachfolgenden Benutzer ausgegeben',
'clone' => 'Benutzer kopieren',
@@ -25,7 +25,7 @@ return [
'send_email_help' => 'Du musst eine E-Mail-Adresse angeben, um dem Benutzer Zugangsdaten zu zusenden. Das Versenden von Zugangsdaten ist nur bei der Erstellung eines Benutzers möglich. Passwörter werden in einem Einweg-Hash gespeichert und können danach nicht mehr ausgelesen werden.',
'view_user' => 'Benutzer :name ansehen',
'usercsv' => 'CSV Datei',
- 'two_factor_admin_optin_help' => 'Ihre aktuellen Administrator-Einstellungen erlauben die selektive Durchführung der zwei-Faktor-Authentifizierung. ',
+ 'two_factor_admin_optin_help' => 'Ihre aktuellen Administrator-Einstellungen erlauben die selektive Durchführung der Zwei-Faktor-Authentifizierung. ',
'two_factor_enrolled' => '2FA-Gerät registriert ',
'two_factor_active' => '2FA aktiv ',
'user_deactivated' => 'Benutzer kann sich nicht anmelden',
@@ -40,12 +40,12 @@ return [
'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
'remote_label' => 'Dies ist ein externer Benutzer',
'remote' => 'Extern',
- 'remote_help' => 'Dies kann nützlich sein, wenn Du nach externen Benutzern filtern musst, die niemals oder nur selten an Ihre physischen Standorte kommen.',
+ 'remote_help' => 'Dies kann nützlich sein, wenn du nach externen Benutzern filtern musst, die niemals oder nur selten an Ihre physischen Standorte kommen.',
'not_remote_label' => 'Dies ist kein externer Benutzer',
'vip_label' => 'VIP Benutzer',
'vip_help' => 'Dies kann hilfreich sein, um wichtige Personen zu markieren, wenn du möchtest.',
'create_user' => 'Benutzer erstellen',
- 'create_user_page_explanation' => 'Dies sind die Anmeldeinformationen, die Du verwendest, um zum ersten Mal auf die Webseite zuzugreifen.',
+ 'create_user_page_explanation' => 'Dies sind die Anmeldeinformationen, die du verwendest, um zum ersten Mal auf die Webseite zuzugreifen.',
'email_credentials' => 'E-Mail-Anmeldedaten',
'email_credentials_text' => 'Meine Zugangsdaten an die oben genannte E-Mail-Adresse senden',
'next_save_user' => 'Weiter: Benutzer speichern',
diff --git a/resources/lang/de-if/admin/users/message.php b/resources/lang/de-if/admin/users/message.php
index 0d55bea3c6..dcb538da2e 100644
--- a/resources/lang/de-if/admin/users/message.php
+++ b/resources/lang/de-if/admin/users/message.php
@@ -4,9 +4,9 @@ return array(
'accepted' => 'Du hast den Gegenstand erfolgreich angenommen.',
'declined' => 'Du hast diesen Gegenstand erfolgreich abgelehnt.',
- 'bulk_manager_warn' => 'Deine Benutzer wurden erfolgreich aktualisiert, aber Dein Manager-Eintrag wurde nicht gespeichert, da der Manager, den Du ausgewählt hast, auch in der zu bearbeitenden Liste war, und Benutzer dürfen nicht ihr eigener Manager sein. Bitte wähle Deine Benutzer erneut aus, ohne den Manager.',
+ 'bulk_manager_warn' => 'Deine Benutzer wurden erfolgreich aktualisiert, aber dein Manager-Eintrag wurde nicht gespeichert, da der Manager, den du ausgewählt hast, auch in der zu bearbeitenden Liste war, und Benutzer dürfen nicht ihr eigener Manager sein. Bitte wähle deine Benutzer erneut aus, ohne diesen Manager.',
'user_exists' => 'Benutzer existiert bereits!',
- 'user_not_found' => 'Benutzer existiert nicht.',
+ 'user_not_found' => 'Der Benutzer existiert nicht oder du bistnicht berechtigt, ihn anzuzeigen.',
'user_login_required' => 'Das Loginfeld ist erforderlich',
'user_has_no_assets_assigned' => 'Derzeit sind keine Assets dem Benutzer zugewiesen.',
'user_password_required' => 'Das Passswortfeld ist erforderlich.',
@@ -47,12 +47,13 @@ return array(
'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.',
'accept_or_decline' => 'Du musst diesen Gegenstand entweder annehmen oder ablehnen.',
'cannot_delete_yourself' => 'Wir würden uns wirklich schlecht fühlen, wenn du dich selbst löschen würdest. Überlege es dir bitte noch einmal.',
- 'incorrect_user_accepted' => 'Das Asset, dass Du versuchst zu aktivieren, wurde nicht an Dich ausgebucht.',
+ 'incorrect_user_accepted' => 'Das Asset, das du annehmen willst, wurde nicht an dich ausgecheckt.',
'ldap_could_not_connect' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server: ',
'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
'password_ldap' => 'Das Passwort für diesen Account wird vom LDAP/Active Directory verwaltet. Bitte kontaktiere Deine IT-Abteilung, um Dein Passwort zu ändern. ',
+ 'multi_company_items_assigned' => 'Diesem Benutzer sind Artikel zugewiesen. Bitte checke diese ein, bevor du das Unternehmen wechselst.'
),
'deletefile' => array(
diff --git a/resources/lang/de-if/admin/users/table.php b/resources/lang/de-if/admin/users/table.php
index f240ae35a9..718b0f0634 100644
--- a/resources/lang/de-if/admin/users/table.php
+++ b/resources/lang/de-if/admin/users/table.php
@@ -35,7 +35,7 @@ return array(
'updateuser' => 'Benutzer aktualisieren',
'username' => 'Benutzername',
'user_deleted_text' => 'Dieser Benutzer wurde als gelöscht markiert.',
- 'username_note' => '(Dies wird nur für Active Directory Bindung verwendet, nicht für Login.)',
+ 'username_note' => '(Dies wird nur für die Active Directory-Bindung verwendet, nicht für die Anmeldung.)',
'cloneuser' => 'Benutzer kopieren',
'viewusers' => 'Benutzer anzeigen',
);
diff --git a/resources/lang/de-if/auth/general.php b/resources/lang/de-if/auth/general.php
index f7fbdfdcfe..eca2f213c4 100644
--- a/resources/lang/de-if/auth/general.php
+++ b/resources/lang/de-if/auth/general.php
@@ -11,7 +11,7 @@ return [
'ldap_reset_password' => 'Bitte klicke hier, um Dein LDAP-Passwort zurückzusetzen',
'remember_me' => 'Benutzername merken',
'username_help_top' => 'Benutzernamen eingeben, um einen Link zum Zurücksetzen des Passwortes per E-Mail zu erhalten.',
- 'username_help_bottom' => 'Abhängig von der Konfiguration, kann der Benutzername identisch mit ihrer E-Mailadresse sein. Falls Du Deinen Benutzernamen vergessen hast, kontaktiere Deinen Administrator.
Benutzernamen ohne zugeordnete E-Mailadresse erhalten keine E-Mail zum Zurücksetzen des Passwortes. ',
+ 'username_help_bottom' => 'Abhängig von der Konfiguration, kann der Benutzername identisch mit ihrer E-Mailadresse sein. Falls du deinen Benutzernamen vergessen hast, kontaktiere deinen Administrator.
Benutzernamen ohne zugeordnete E-Mailadresse erhalten keine E-Mail zum Zurücksetzen des Passwortes. ',
'google_login' => 'Mit Google Workspace anmelden',
'google_login_failed' => 'Anmeldung fehlgeschlagen, bitte melde dich erneut an!',
];
diff --git a/resources/lang/de-if/auth/message.php b/resources/lang/de-if/auth/message.php
index e5e2c958bf..a023f19921 100644
--- a/resources/lang/de-if/auth/message.php
+++ b/resources/lang/de-if/auth/message.php
@@ -11,7 +11,7 @@ return array(
'two_factor' => array(
'already_enrolled' => 'Dein Gerät ist bereits eingeschrieben.',
- 'success' => 'Du hast Dich erfolgreich angemeldet.',
+ 'success' => 'Du hast dich erfolgreich angemeldet.',
'code_required' => 'Zwei-Faktor-Code ist erforderlich.',
'invalid_code' => 'Zwei-Faktor-Code ist ungültig.',
'enter_two_factor_code' => 'Bitte gebe deinen Zwei-Faktor-Authentifizierungscode ein.',
@@ -20,12 +20,12 @@ return array(
'signin' => array(
'error' => 'Bei der Anmeldung ist ein Problem aufgetreten, bitte versuche es erneut.',
- 'success' => 'Du hast Dich erfolgreich angemeldet.',
+ 'success' => 'Du hast dich erfolgreich angemeldet.',
),
'logout' => array(
'error' => 'Beim Abmelden ist ein Fehler aufgetreten. Bitte versuche es erneut.',
- 'success' => 'Du hast Dich erfolgreich abgemeldet.',
+ 'success' => 'Du hast dich erfolgreich abgemeldet.',
),
'signup' => array(
diff --git a/resources/lang/de-if/general.php b/resources/lang/de-if/general.php
index 71794e03b4..b28f4a5edc 100644
--- a/resources/lang/de-if/general.php
+++ b/resources/lang/de-if/general.php
@@ -35,7 +35,7 @@ return [
'assets_audited' => 'Assets geprüft',
'assets_checked_in_count' => 'Asset zurückgenommen',
'assets_checked_out_count' => 'Assets herausgegeben',
- 'asset_deleted_warning' => 'Dieses Asset wurde gelöscht. Du musst es wiederherstellen, bevor Du es jemandem zuweisen kannst.',
+ 'asset_deleted_warning' => 'Dieses Asset wurde gelöscht. Du musst es wiederherstellen, bevor du es jemandem zuweisen kannst.',
'assigned_date' => 'Zuweisungsdatum',
'assigned_to' => 'Herausgegeben an :name',
'assignee' => 'Herausgegeben an',
@@ -284,8 +284,8 @@ return [
'accept_eula' => 'Annahmeerklärung',
'supplier' => 'Lieferant',
'suppliers' => 'Lieferanten',
- 'sure_to_delete' => 'Bist Du Dir sicher, dass du das löschen möchtest',
- 'sure_to_delete_var' => 'Willst Du :item wirklich löschen?',
+ 'sure_to_delete' => 'Bist du dir sicher, dass du das löschen möchtest',
+ 'sure_to_delete_var' => 'Willst du :item wirklich löschen?',
'delete_what' => ':item löschen',
'submit' => 'Abschicken',
'target' => 'Ziel',
@@ -358,11 +358,11 @@ return [
'last_checkout' => 'Letzte Herausgabe',
'due_to_checkin' => 'Folgende :count Elemente werden demnächst zurückgenommen:',
'expected_checkin' => 'Erwartetes Rückgabedatum',
- 'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an Dich herausgegeben sind. Wenn Du der Meinung bist, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den Du nie erhalten hast), sende bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
+ 'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an dich herausgegeben sind. Wenn du der Meinung bist, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den du nie erhalten hast), sende bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
'changed' => 'Geändert',
'to' => 'An',
- 'report_fields_info' => 'Wähle die Felder aus, die Du in Deinem benutzerdefinierten Bericht einfügen möchtest, und klicke auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und Du kannst diese in Excel öffnen.
- Wenn Du nur bestimmte Artikel exportieren möchten, verwende die folgenden Optionen, um das Ergebnis zu verfeinern.
',
+ 'report_fields_info' => 'Wähle die Felder aus, die du in deinem benutzerdefinierten Bericht einfügen möchtest, und klicke auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und du kannst diese in Excel öffnen.
+ Wenn du nur bestimmte Artikel exportieren möchten, verwende die folgenden Optionen, um das Ergebnis zu verfeinern.
',
'range' => 'Bereich',
'bom_remark' => 'Füge ein BOM (Byte-Reihenfolge-Markierung) zu dieser CSV hinzu',
'improvements' => 'Verbesserungen',
@@ -379,7 +379,7 @@ return [
'invalid_item_category_single' => 'Ungültige oder fehlende :type Kategorie. Bitte aktualisiere die Kategorie dieses :type um eine gültige Kategorie vor dem Auschecken hinzuzufügen.',
'dashboard_info' => 'Das ist Dein Dashboard. Es gibt viele wie dieses, aber das hier ist Deins.',
'60_percent_warning' => '60% abgeschlossen (Warnung)',
- 'dashboard_empty' => 'Es sieht so aus, als hättest Du noch nichts hinzugefügt, sodass wir nichts Großartiges zum Anzeigen haben. Beginne jetzt mit dem Hinzufügen einiger Gegenstände, Zubehör, Verbrauchsmaterialien oder Lizenzen!',
+ 'dashboard_empty' => 'Es sieht so aus, als hättest du noch nichts hinzugefügt, sodass wir nichts Großartiges zum Anzeigen haben. Beginne jetzt mit dem Hinzufügen einiger Gegenstände, Zubehör, Verbrauchsmaterialien oder Lizenzen!',
'new_asset' => 'Neues Asset',
'new_license' => 'Neue Lizenz',
'new_accessory' => 'Neues Zubehör',
@@ -408,18 +408,18 @@ return [
'checkout_tooltip' => 'Diesen Gegenstand heraugeben',
'checkin_tooltip' => 'Externer Link zu',
'checkout_user_tooltip' => 'Diesen Artikel an einen Benutzer herausgeben',
- 'checkin_to_diff_location' => 'Sie können sich dafür entscheiden, dieses Asset an einem anderen Ort als dem standardmäßigen Standort :default_location einzuchecken, falls einer festgelegt ist',
+ 'checkin_to_diff_location' => 'Du kannst dich dafür entscheiden, dieses Asset an einem anderen Ort als dem standardmäßigen Standort :default_location einzuchecken, falls einer festgelegt ist',
'maintenance_mode' => 'Der Dienst ist wegen Wartungsarbeiten vorübergehend nicht verfügbar. Bitte versuche es später noch einmal.',
'maintenance_mode_title' => 'System vorübergehend nicht verfügbar',
'ldap_import' => 'Benutzerkennwort sollte nicht von LDAP verwaltet werden. (Das erlaubt es Dir, Passwortrücksetzungen zu versenden.)',
'purge_not_allowed' => 'Löschen von "gelöschten Daten" wurde in der .env-Datei verboten. Kontaktiere den Support oder Deinen Systemadministrator.',
'backup_delete_not_allowed' => 'Das Löschen von Sicherungen wurde in der .env-Datei verboten. Kontaktiere den Support oder Deinen Systemadministrator.',
'additional_files' => 'Zusätzliche Dateien',
- 'shitty_browser' => 'Keine Signatur erkannt. Wenn Du einen älteren Browser benutzt, verwende bitte einen moderneren Browser, um den Erhalt zu bestätigen.',
+ 'shitty_browser' => 'Keine Signatur erkannt. Wenn du einen älteren Browser benutzt, verwende bitte einen moderneren Browser, um den Erhalt zu bestätigen.',
'bulk_soft_delete' =>'Auch diese Benutzer soft-löschen. Die Assets-Historie bleibt erhalten, solange/bis die markierten Datensätze nicht in den Admin-Einstellungen endgültig gelöscht werden.',
'bulk_checkin_delete_success' => 'Die ausgewählten Benutzer wurden gelöscht und ihre Assets wurden eingecheckt.',
'bulk_checkin_success' => 'Die Assets der ausgewählten Benutzer wurden eingecheckt.',
- 'set_to_null' => 'Werte für dieses Asset|Werte für alle :asset_count Assets löschen ',
+ 'set_to_null' => 'Werte für diese Auswahl löschen|Werte für alle :selection_count Auswahlen löschen ',
'set_users_field_to_null' => ':field Werte für diesen Benutzer löschen|:field Werte für alle :user_count Benutzer löschen ',
'na_no_purchase_date' => 'N/A - Kein Kaufdatum angegeben',
'assets_by_status' => 'Assets sortiert nach Status',
@@ -444,7 +444,7 @@ return [
'integration_option' => 'Integrationsoptionen',
'log_does_not_exist' => 'Es existiert kein passender Logeintrag.',
'merge_users' => 'Benutzer zusammenführen',
- 'merge_information' => 'Dies wird die :count Benutzer zu einem Benutzer zusammenführen. Wähle den Benutzer, in den Du die anderen zusammenführen möchtest. Die zugehörigen Assets, Lizenzen, etc. werden in den ausgewählten Benutzer verschoben und die anderen Benutzer werden als gelöscht markiert.',
+ 'merge_information' => 'Dies wird die :count Benutzer zu einem Benutzer zusammenführen. Wähle den Benutzer, in den du die anderen zusammenführen möchtest. Die zugehörigen Assets, Lizenzen, etc. werden in den ausgewählten Benutzer verschoben und die anderen Benutzer werden als gelöscht markiert.',
'warning_merge_information' => 'Diese Aktion kann NICHT rückgängig gemacht werden und sollte NUR verwendet werden, wenn Benutzer aufgrund eines falschen Imports oder einer fehlerhaften Synchronisation zusammengeführt werden müssen. Stelle sicher, dass zuerst ein Backup erstellt wird.',
'no_users_selected' => 'Keine Benutzer ausgewählt',
'not_enough_users_selected' => 'Mindestens :count Benutzer müssen ausgewählt sein',
@@ -478,7 +478,7 @@ return [
'autoassign_licenses_help' => 'Erlaube diesem Benutzer die Zuweisung von Lizenzen über die Benutzeroberfläche für die Massenzuweisung von Lizenzen oder über die CLI-Tools.',
'autoassign_licenses_help_long' => 'Es erlaubt einem Benutzer, Lizenzen über die Massen-Zuweisung GUI oder CLI-Tools zugewiesen zu bekommen. (Zum Beispiel möchtest du den Auftragnehmern möglicherweise nicht automatisch eine Lizenz zuweisen, die nur Mitarbeitern zur Verfügung stehen würde. Du kannst diesen Benutzern weiterhin einzelne Lizenzen zuweisen, aber sie werden nicht in der Lizenzen Massenherausgabe der Benutzer berücksichtigt.)',
'no_autoassign_licenses_help' => 'Den Benutzer nicht bei der Lizenzen Massen-Zuweisung GUI oder CLI-Tools berücksichtigen.',
- 'modal_confirm_generic' => 'Bist Du dir sicher?',
+ 'modal_confirm_generic' => 'Bist du dir sicher?',
'cannot_be_deleted' => 'Dieser Gegenstand kann nicht gelöscht werden',
'cannot_be_edited' => 'Dieser Gegenstand kann nicht bearbeitet werden.',
'undeployable_tooltip' => 'Dieser Gegenstand kann nicht herausgegeben werden. Überprüfe die verbleibende Menge.',
@@ -486,7 +486,7 @@ return [
'item_notes' => ':item Notizen',
'item_name_var' => ':item Name',
'error_user_company' => 'Checkout Zielfirma und Asset-Gesellschaft stimmen nicht überein',
- 'error_user_company_accept_view' => 'Ein Asset, welches Dir zugewiesen wurde, gehört einem anderen Unternehmen, sodass Du es nicht akzeptieren oder ablehnen kannst. Bitte prüfe das mit deinem Vorgesetzten',
+ 'error_user_company_accept_view' => 'Ein Asset, welches dir zugewiesen wurde, gehört einem anderen Unternehmen, sodass du es nicht akzeptieren oder ablehnen kannst. Bitte prüfe das mit deinem Vorgesetzten',
'importer' => [
'checked_out_to_fullname' => 'Herausgegeben an: Voller Name',
'checked_out_to_first_name' => 'Herausgegeben an: Vorname',
@@ -509,7 +509,7 @@ return [
'address2' => 'Adresszeile 2',
'import_note' => 'Mit CSV-Importer importiert',
],
- 'remove_customfield_association' => 'Entfernen Sie dieses Feld aus dem Feldsatz. Dies wird das benutzerdefinierte Feld nicht löschen, sondern nur die Zuordnung dieses Feldes zu diesem Feldsatz entfernen.',
+ 'remove_customfield_association' => 'Entfernst du dieses Feld aus dem Feldsatz, wird das benutzerdefinierte Feld nicht gelöscht, sondern nur die Zuordnung dieses Feldes zu diesem Feldsatz.',
'checked_out_to_fields' => 'Auf folgende Felder herausgegeben',
'percent_complete' => '% vollständig',
'uploading' => 'Hochladen... ',
@@ -559,8 +559,8 @@ return [
'expires' => 'Ablaufdatum',
'map_fields'=> 'Feld :item_type zuordnen',
'remaining_var' => ':count verbleibend',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
- 'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
+ 'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
];
diff --git a/resources/lang/de-if/help.php b/resources/lang/de-if/help.php
index 27be1a5b27..4f443e60d0 100644
--- a/resources/lang/de-if/help.php
+++ b/resources/lang/de-if/help.php
@@ -19,9 +19,9 @@ return [
'assets' => 'Assets sind Elemente, die mit Seriennummer oder einem Asset-Tag versehen sind. Sie sind meist höhere Werte, bei denen die Identifizierung eines bestimmten Gegenstands von Bedeutung ist.',
- 'categories' => 'Kategorien helfen Dir beim Organisieren von Assets. Beispielkategorien sind "PCs", "Laptops", "Mobiltelefone", "Tablets" usw., jedoch kannst Du Kategorien nutzen, wie Du es für sinnvoll erachtest.',
+ 'categories' => 'Kategorien helfen dir beim Organisieren von Assets. Beispielkategorien sind "PCs", "Laptops", "Mobiltelefone", "Tablets" usw., jedoch kannst du Kategorien nutzen, wie du es für sinnvoll erachtest.',
- 'accessories' => 'Ein Zubehör ist alles, was Du an einen Benutzer ausgeben kannst, jedoch keine Seriennummer besitzt (oder es keinen Sinn macht diese zu verwalten). Zum Beispiel: Mäuse und Tastaturen.',
+ 'accessories' => 'Ein Zubehör ist alles, was du an einen Benutzer ausgeben kannst, jedoch keine Seriennummer besitzt (oder es keinen Sinn macht diese zu verwalten). Zum Beispiel: Mäuse und Tastaturen.',
'companies' => 'Unternehmen können als einfaches Identifikationsfeld oder zur Begrenzung der Sichtbarkeit von Assets, Benutzer usw. verwendet werden, wenn die volle Unterstützung für Unternehmen in Ihren Admin-Einstellungen aktiviert ist.',
diff --git a/resources/lang/de-if/localizations.php b/resources/lang/de-if/localizations.php
index 061b7f779c..abfa7df127 100644
--- a/resources/lang/de-if/localizations.php
+++ b/resources/lang/de-if/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Sprache auswählen',
+ 'select_language' => 'Wähle eine Sprache',
'languages' => [
'en-US'=> 'Englisch, USA',
'en-GB'=> 'Englisch, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Land auswählen',
+ 'select_country' => 'Wähle ein Land',
'countries' => [
'AC'=>'Ascensionsinsel',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Ägypten',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spanien',
'ET'=>'Äthiopien',
@@ -234,6 +235,7 @@ im Indischen Ozean',
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Niederlande',
+ 'GB-NIR' => 'Nordirland',
'NO'=>'Norwegen',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -261,7 +263,7 @@ im Indischen Ozean',
'RU'=>'Russland',
'RW'=>'Ruanda',
'SA'=>'Saudi-Arabien',
- 'UK'=>'Schottland',
+ 'GB-SCT'=>'Schottland',
'SB'=>'Salomon-Inseln',
'SC'=>'Seychellen',
'SS'=>'Südsudan',
@@ -313,6 +315,7 @@ im Indischen Ozean',
'VI'=>'Amerikanische Jungferninseln',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis und Futuna',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/de-if/mail.php b/resources/lang/de-if/mail.php
index 94122e1f05..daa5e0463a 100644
--- a/resources/lang/de-if/mail.php
+++ b/resources/lang/de-if/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Ein Benutzer hat ein Gerät auf der Webseite angefordert',
'acceptance_asset_accepted' => 'Ein Benutzer hat einen Gegenstand akzeptiert',
'acceptance_asset_declined' => 'Ein Benutzer hat einen Gegenstand abgelehnt',
- 'accessory_name' => 'Zubehörname:',
- 'additional_notes' => 'Zusätzliche Bemerkungen:',
+ 'accessory_name' => 'Zubehör Name',
+ 'additional_notes' => 'Zusätzliche Bemerkungen',
'admin_has_created' => 'Ein Administrator hat auf der :web Webseite ein Konto für Dich erstellt.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Assetname:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Gegenstand angefordert',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'Die Garantie von :count Asset wird in :threshold Tagen auslaufen.|Die Garantie von :count Assets wird in :threshold Tagen auslaufen.',
'assigned_to' => 'Zugewiesen an',
'best_regards' => 'Grüße,',
- 'canceled' => 'Abgebrochen:',
- 'checkin_date' => 'Rücknahmedatum:',
- 'checkout_date' => 'Herausgabedatum:',
+ 'canceled' => 'Abgebrochen',
+ 'checkin_date' => 'Rücknahmedatum',
+ 'checkout_date' => 'Herausgabedatum',
'checkedout_from' => 'Herausgegeben von',
'checkedin_from' => 'Eingecheckt von',
'checked_into' => 'Zurückgenommen in',
@@ -49,14 +49,14 @@ return [
'click_to_confirm' => 'Bitte klicke zum Bestätigen Deines :web Kontos auf den folgenden Link:',
'current_QTY' => 'Aktuelle Menge',
'days' => 'Tage',
- 'expecting_checkin_date' => 'Erwartetes Rückgabedatum:',
+ 'expecting_checkin_date' => 'Erwartetes Rückgabedatum',
'expires' => 'Ablaufdatum',
'hello' => 'Hallo',
'hi' => 'Hi',
'i_have_read' => 'Ich habe die Nutzungsbedingungen gelesen und stimme diesen zu, und ich habe diesen Gegenstand erhalten.',
'inventory_report' => 'Bestandsbericht',
- 'item' => 'Gegenstand:',
- 'item_checked_reminder' => 'Dies ist eine Erinnerung, dass Sie derzeit :count Artikel ausgeliehen haben, die Sie noch nicht akzeptiert oder abgelehnt haben. Bitte klicken Sie auf den untenstehenden Link, um Ihre Entscheidung zu bestätigen.',
+ 'item' => 'Gegenstand',
+ 'item_checked_reminder' => 'Dies ist eine Erinnerung, dass Sie derzeit :count Artikel ausgeliehen haben, die dunoch nicht akzeptiert oder abgelehnt hast. Bitte klicke auf den untenstehenden Link, um deine Entscheidung zu treffen.',
'license_expiring_alert' => 'Es gibt :count auslaufende Lizenz in den nächsten :threshold Tagen.|Es gibt :count auslaufende Lizenzen in den nächsten :threshold Tagen.',
'link_to_update_password' => 'Klicken Sie bitte auf den folgenden Link zum Aktualisieren Ihres :web Passworts:',
'login' => 'Anmelden:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'Ein neuer Gegenstand wurde unter Ihrem Namen ausgecheckt. Details folgen.',
'notes' => 'Notizen',
- 'password' => 'Passwort:',
+ 'password' => 'Passwort',
'password_reset' => 'Passwort zurücksetzen',
'read_the_terms' => 'Bitte lese die nachfolgenden Nutzungsbedingungen.',
- 'read_the_terms_and_click' => 'Bitte lese die Nutzungsbedingungen unten, und klicke auf den Link am unteren Ende, um zu bestätigen, dass Du die Nutzungsbedingungen gelesen und akzeptiert hast und das Asset erhalten hast.',
- 'requested' => 'Angefordert:',
+ 'read_the_terms_and_click' => 'Bitte lese die unten stehenden Nutzungsbedingungen und klicke auf den Link unten, um zu bestätigen, dass du die Nutzungsbedingungen gelesen hast, diesen zustimmst und das Asset erhalten hast.',
+ 'requested' => 'Angefragt',
'reset_link' => 'Sein Link zum Zurücksetzen des Kennworts',
'reset_password' => 'Klicke hier, um Dein Passwort zurückzusetzen:',
'rights_reserved' => 'Alle Rechte vorbehalten.',
@@ -80,7 +80,7 @@ return [
'supplier' => 'Lieferant',
'tag' => 'Kennzeichnung',
'test_email' => 'Test E-Mail von Snipe-IT',
- 'test_mail_text' => 'Dies ist ein Test von Snipe-IT-Asset-Management-System. Wenn Du das erhalten hast, funktioniert das Senden von Mails :)',
+ 'test_mail_text' => 'Dies ist ein Test des Snipe-IT Asset Management Systems. Wenn du das erhalten hast, funktioniert das Senden von Mails :)',
'the_following_item' => 'Der folgende Gegenstand wurde eingecheckt: ',
'to_reset' => 'Zum Zurücksetzen Ihres :web Passwortes, fülle bitte dieses Formular aus:',
'type' => 'Typ',
diff --git a/resources/lang/el-GR/admin/locations/message.php b/resources/lang/el-GR/admin/locations/message.php
index e6a7abf906..ce395dfd9c 100644
--- a/resources/lang/el-GR/admin/locations/message.php
+++ b/resources/lang/el-GR/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Η τοποθεσία δεν υπάρχει.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Αυτή η τοποθεσία συσχετίζεται προς το παρόν με τουλάχιστον ένα στοιχείο και δεν μπορεί να διαγραφεί. Ενημερώστε τα στοιχεία σας ώστε να μην αναφέρονται πλέον στην τοποθεσία αυτή και να προσπαθήσετε ξανά.',
'assoc_child_loc' => 'Αυτή η τοποθεσία είναι αυτήν τη στιγμή γονέας τουλάχιστον μιας τοποθεσίας παιδιού και δεν μπορεί να διαγραφεί. Ενημερώστε τις τοποθεσίες σας ώστε να μην αναφέρονται πλέον σε αυτήν την τοποθεσία και δοκιμάστε ξανά.',
'assigned_assets' => 'Αντιστοιχισμένα Στοιχεία Ενεργητικού',
diff --git a/resources/lang/el-GR/admin/settings/general.php b/resources/lang/el-GR/admin/settings/general.php
index d6fe5191a9..02f12210af 100644
--- a/resources/lang/el-GR/admin/settings/general.php
+++ b/resources/lang/el-GR/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Αντίγραφα Ασφαλείας',
'backups_help' => 'Δημιουργήστε, κατεβάστε και επαναφέρετε αντίγραφα ασφαλείας ',
'backups_restoring' => 'Επαναφορά από αντίγραφο ασφαλείας',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Μεταφόρτωση Αντιγράφου Ασφαλείας',
'backups_path' => 'Τα αντίγραφα ασφαλείας στο διακομιστή αποθηκεύονται στο :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/el-GR/admin/users/message.php b/resources/lang/el-GR/admin/users/message.php
index dee0a51b4f..93f6765d69 100644
--- a/resources/lang/el-GR/admin/users/message.php
+++ b/resources/lang/el-GR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Έχετε απορρίψει επιτυχώς αυτό το στοιχείο.',
'bulk_manager_warn' => 'Οι χρήστες σας ενημερώθηκαν με επιτυχία, ωστόσο η καταχώριση του διαχειριστή σας δεν αποθηκεύτηκε, επειδή ο διαχειριστής που επιλέξατε ήταν επίσης στη λίστα χρηστών για επεξεργασία και οι χρήστες ενδέχεται να μην είναι ο δικός τους διαχειριστής. Επιλέξτε ξανά τους χρήστες σας, εξαιρουμένου του διαχειριστή.',
'user_exists' => 'Ο χρήστης υπάρχει ήδη!',
- 'user_not_found' => 'Ο χρήστης δεν υπάρχει.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Το πεδίο εισόδου είναι υποχρεωτικό',
'user_has_no_assets_assigned' => 'Δεν έχουν εκχωρηθεί στοιχεία ενεργητικού στο χρήστη.',
'user_password_required' => 'Ο κωδικός είναι απαραίτητος.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Δεν ήταν δυνατή η αναζήτηση στον διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του διακομιστή LDAP στο αρχείο ρύθμισης LDAP.
Ερώτηση από διακομιστή LDAP:',
'ldap_could_not_get_entries' => 'Δεν ήταν δυνατή η λήψη καταχωρήσεων από το διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του διακομιστή LDAP στο αρχείο ρύθμισης LDAP.
Ερώτηση από διακομιστή LDAP:',
'password_ldap' => 'Ο κωδικός πρόσβασης για αυτόν τον λογαριασμό γίνεται από το LDAP / Active Directory. Επικοινωνήστε με το τμήμα πληροφορικής σας για να αλλάξετε τον κωδικό πρόσβασής σας.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php
index 053f6de8b2..76d7140ea1 100644
--- a/resources/lang/el-GR/general.php
+++ b/resources/lang/el-GR/general.php
@@ -408,7 +408,7 @@ return [
'checkout_tooltip' => 'Ελέγξτε αυτό το στοιχείο έξω',
'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
'checkout_user_tooltip' => 'Επιλέξτε αυτό το στοιχείο έξω σε ένα χρήστη',
- 'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+ 'checkin_to_diff_location' => 'Μπορείτε να επιλέξετε να ελέγξετε αυτό το στοιχείο σε μια τοποθεσία άλλη από την προεπιλεγμένη θέση αυτού του περιουσιακού στοιχείου του :default_location αν έχει οριστεί',
'maintenance_mode' => 'Η υπηρεσία δεν είναι προσωρινά διαθέσιμη για ενημερώσεις συστήματος. Παρακαλούμε ελέγξτε ξανά αργότερα.',
'maintenance_mode_title' => 'Προσωρινά Μη Διαθέσιμο Σύστημα',
'ldap_import' => 'Ο κωδικός πρόσβασης χρήστη δεν πρέπει να γίνεται από το LDAP. (Αυτό σας επιτρέπει να στείλετε αιτήματα ξεχασμένων κωδικών.)',
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Επίσης απαλή διαγραφή αυτών των χρηστών. Το ιστορικό των περιουσιακών στοιχείων τους θα παραμείνει άθικτο χωρίς / μέχρι να καθαρίσετε τις διαγραφές εγγραφών στις Ρυθμίσεις Διαχειριστή.',
'bulk_checkin_delete_success' => 'Οι επιλεγμένοι χρήστες έχουν διαγραφεί και τα στοιχεία τους έχουν ελεγχθεί.',
'bulk_checkin_success' => 'Τα στοιχεία για τους επιλεγμένους χρήστες έχουν ελεγχθεί.',
- 'set_to_null' => 'Διαγραφή τιμών για αυτό το στοιχείο:asset_count στοιχείων ενεργητικού ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Διαγραφή τιμών :field για αυτόν τον χρήστη: Διαγραφή τιμών :field για όλους τους χρήστες :user_count ',
'na_no_purchase_date' => 'N/A - Δεν δόθηκε ημερομηνία αγοράς',
'assets_by_status' => 'Ενεργητικό ανά κατάσταση',
@@ -559,8 +559,8 @@ return [
'expires' => 'Λήξη',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/el-GR/localizations.php b/resources/lang/el-GR/localizations.php
index d0b955c8af..a3649940db 100644
--- a/resources/lang/el-GR/localizations.php
+++ b/resources/lang/el-GR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Επιλέξτε μια γλώσσα',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Αγγλικά, ΗΠΑ',
'en-GB'=> 'Αγγλικά, Ηνωμένο Βασίλειο',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Επιλέξτε μια χώρα',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Νήσος Αναλήψεως',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Εσθονία',
'EG'=>'Αίγυπτος',
+ 'GB-ENG'=>'England',
'ER'=>'Ερυθραία',
'ES'=>'Ισπανία',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Ολλανδία',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Νορβηγία',
'NP'=>'Νεπάλ',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Ρωσική Ομοσπονδία',
'RW'=>'Rwanda',
'SA'=>'Σαουδική Αραβία',
- 'UK'=>'Σκωτία',
+ 'GB-SCT'=>'Σκωτία',
'SB'=>'Νήσοι Σολομώντος',
'SC'=>'Seychelles',
'SS'=>'Νότιο Σουδάν',
@@ -312,6 +314,7 @@ return [
'VI'=>'Παρθένες Νήσοι (Η.Π.Α.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Νήσοι Ουώλλις Και Φουτούνα',
'WS'=>'Samoa',
'YE'=>'Υεμένη',
diff --git a/resources/lang/el-GR/mail.php b/resources/lang/el-GR/mail.php
index fd9951f68f..602682d393 100644
--- a/resources/lang/el-GR/mail.php
+++ b/resources/lang/el-GR/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Ο χρήστης έχει ζητήσει ένα στοιχείο στην ιστοσελίδα',
'acceptance_asset_accepted' => 'Ένας χρήστης έχει αποδεχθεί ένα αντικείμενο',
'acceptance_asset_declined' => 'Ένας χρήστης έχει απορρίψει ένα στοιχείο',
- 'accessory_name' => 'Όνομα ανταλλακτικού:',
- 'additional_notes' => 'Πρόσθετες σημειώσεις:',
+ 'accessory_name' => 'Όνομα ανταλλακτικού',
+ 'additional_notes' => 'Πρόσθετες σημειώσεις',
'admin_has_created' => 'Ένας διαχειριστής έχει δημιουργήσει ένα λογαριασμό για εσάς στην: web ιστοσελίδα.',
- 'asset' => 'Πάγιο:',
- 'asset_name' => 'Όνομα του περιουσιακού στοιχείου:',
+ 'asset' => 'Πάγιο',
+ 'asset_name' => 'Ονομασία του παγίου',
'asset_requested' => 'Πάγιο αίτήθηκε',
'asset_tag' => 'Ετικέτα παγίων',
'assets_warrantee_alert' => 'Υπάρχει :count περιουσιακό στοιχείο με μια εγγύηση που λήγει στις επόμενες :threshold days.°C. Υπάρχουν :count περιουσιακά στοιχεία με εγγυήσεις που λήγουν στις επόμενες :threshold ημέρες.',
'assigned_to' => 'Ανατέθηκε στον',
'best_regards' => 'Τις καλύτερες ευχές,',
- 'canceled' => 'Ακυρωμένο:',
- 'checkin_date' => 'Ημερομηνία άφιξης:',
- 'checkout_date' => 'Ημερομηνία αποχώρησης:',
+ 'canceled' => 'Ακυρωμένο',
+ 'checkin_date' => 'Ημερομηνία άφιξης',
+ 'checkout_date' => 'Ημερομηνία αποχώρησης',
'checkedout_from' => 'Έγινε έλεγχος από',
'checkedin_from' => 'Έγινε έλεγχος από',
'checked_into' => 'Έγινε έλεγχος',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Κάντε κλικ στον παρακάτω σύνδεσμο για να επιβεβαιώσετε τον λογαριασμό σας στο διαδίκτυο:',
'current_QTY' => 'Τρέχουσα ποσότητα',
'days' => 'Ημέρες',
- 'expecting_checkin_date' => 'Αναμενόμενη ημερομηνία checkin:',
+ 'expecting_checkin_date' => 'Αναμενώμενη ημέρα άφιξης',
'expires' => 'Λήξη',
'hello' => 'Γεια',
'hi' => 'Γεια σας',
'i_have_read' => 'Έχω διαβάσει και συμφωνώ με τους όρους χρήσης, και έχω λάβει αυτό το στοιχείο.',
'inventory_report' => 'Έκθεση Αποθέματος',
- 'item' => 'Αντικείμενο:',
+ 'item' => 'Αντικείμενο',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Υπάρχει :count άδεια που λήγει στις επόμενες :threshold ημέρες."Υπάρχουν :count άδειες που λήγουν στις επόμενες :threshold ημέρες.',
'link_to_update_password' => 'Κάντε κλικ στον παρακάτω σύνδεσμο για να ενημερώσετε τον κωδικό: web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Όνομα',
'new_item_checked' => 'Ένα νέο στοιχείο έχει ελεγχθεί με το όνομά σας, οι λεπτομέρειες είναι παρακάτω.',
'notes' => 'Σημειώσεις',
- 'password' => 'Κωδικός:',
+ 'password' => 'Κωδικός Πρόσβασης',
'password_reset' => 'Επαναφορά κωδικού πρόσβασης',
'read_the_terms' => 'Παρακαλώ διαβάστε του παρακάτω όρους.',
'read_the_terms_and_click' => 'Παρακαλούμε διαβάστε τους όρους χρήσης παρακάτω, και κάντε κλικ στο σύνδεσμο στο κάτω μέρος για να επιβεβαιώσετε ότι διαβάζετε και συμφωνείτε με τους όρους χρήσης και έχετε λάβει το περιουσιακό στοιχείο.',
- 'requested' => 'Ζητήθηκαν:',
+ 'requested' => 'Ζητήθηκαν',
'reset_link' => 'Αποστολή συνδέσμου ακύρωσης κωδικού',
'reset_password' => 'Κάντε κλικ εδώ για να επαναφέρετε τον κωδικό πρόσβασής σας:',
'rights_reserved' => 'Με επιφύλαξη παντός δικαιώματος.',
diff --git a/resources/lang/en-GB/admin/locations/message.php b/resources/lang/en-GB/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/en-GB/admin/locations/message.php
+++ b/resources/lang/en-GB/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/en-GB/admin/models/message.php b/resources/lang/en-GB/admin/models/message.php
index 18a3fb10ce..ae3bc34eed 100644
--- a/resources/lang/en-GB/admin/models/message.php
+++ b/resources/lang/en-GB/admin/models/message.php
@@ -43,11 +43,5 @@ return array(
'success' => 'Model deleted!|:success_count models deleted!',
'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
),
- 'download' => [
- 'error' => 'File(s) not downloaded. Please try again.',
- 'success' => 'File(s) successfully downloaded.',
- 'does_not_exist' => 'No file exists',
- 'no_match' => 'No matching record for that asset/file',
- ],
);
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 3f6d3ebd3a..b9e98e4c98 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, Download & Restore Backups',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/en-GB/admin/users/message.php b/resources/lang/en-GB/admin/users/message.php
index f4e6c0b56d..e950e5d805 100644
--- a/resources/lang/en-GB/admin/users/message.php
+++ b/resources/lang/en-GB/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 4a37c0de38..9993eadcec 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/en-GB/localizations.php b/resources/lang/en-GB/localizations.php
index ae75588e74..3647db6e2c 100644
--- a/resources/lang/en-GB/localizations.php
+++ b/resources/lang/en-GB/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/en-GB/mail.php b/resources/lang/en-GB/mail.php
index 47937a087b..47bc54b722 100644
--- a/resources/lang/en-GB/mail.php
+++ b/resources/lang/en-GB/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/en-ID/admin/locations/message.php b/resources/lang/en-ID/admin/locations/message.php
index 07cc078b39..1303e0af9b 100644
--- a/resources/lang/en-ID/admin/locations/message.php
+++ b/resources/lang/en-ID/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokasi tidak ada.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Saat ini kategori ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Silahkan perbaharui pengguna anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ',
'assoc_child_loc' => 'Lokasi ini saat ini merupakan induk dari setidaknya satu lokasi anak dan tidak dapat dihapus. Perbarui lokasi Anda agar tidak lagi merujuk lokasi ini dan coba lagi. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 9d5e2af9f1..cf5a777b25 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Cadangkan',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/en-ID/admin/users/message.php b/resources/lang/en-ID/admin/users/message.php
index 868d53fa50..9871b00d79 100644
--- a/resources/lang/en-ID/admin/users/message.php
+++ b/resources/lang/en-ID/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Anda sudah berhasil menolak aset ini.',
'bulk_manager_warn' => 'Pengguna anda sudah berhasil diperbarui, namun entri manajer anda tidak disimpan karena manajer yang anda pilih juga berada dalam daftar pengguna untuk disunting, dan pengguna mungkin bukan manajer mereka sendiri. Silahkan pilih pengguna anda lagi, tidak termasuk manajernya.',
'user_exists' => 'Pengguna sudah ada!',
- 'user_not_found' => 'Pengguna tidak ada.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Bidang masuk diperlukan',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Kata sandi diperlukan.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Tidak dapat mencari peladen LDAP. Silahkan periksa konfigurasi peladen LDAP anda di berkas konfigurasi LDAP.
Kesalahan dari peladen LDAP:',
'ldap_could_not_get_entries' => 'Tidak bisa mendapatkan entri dari peladen LDAP. Silakan periksa konfigurasi peladen LDAP Anda di berkas konfigurasi LDAP.
Kesalahan dari peladen LDAP:',
'password_ldap' => 'Kata sandi untuk akun ini dikelola oleh LDAP/Direktori Aktif. Silakan hubungi departemen IT Anda untuk mengubah kata sandi Anda. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index e68b355dfe..8167389c6f 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Berakhir',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/en-ID/localizations.php b/resources/lang/en-ID/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/en-ID/localizations.php
+++ b/resources/lang/en-ID/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/en-ID/mail.php b/resources/lang/en-ID/mail.php
index 0697ac09f2..283a617e34 100644
--- a/resources/lang/en-ID/mail.php
+++ b/resources/lang/en-ID/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Pengguna sudah meminta sebuah item di situs web',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Nama Aksesoris:',
- 'additional_notes' => 'Catatan Tambahan:',
+ 'accessory_name' => 'Nama Aksesoris',
+ 'additional_notes' => 'Catatan Tambahan',
'admin_has_created' => 'Admin sudah membuat akun untuk anda di :web situs web.',
- 'asset' => 'Aset:',
- 'asset_name' => 'Nama Aset:',
+ 'asset' => 'Aset',
+ 'asset_name' => 'Nama Aset',
'asset_requested' => 'Permintaan aset',
'asset_tag' => 'Penanda aset',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Ditetapkan untuk',
'best_regards' => 'Salam hormat,',
- 'canceled' => 'Dibatalkan:',
- 'checkin_date' => 'Tanggal Check in:',
- 'checkout_date' => 'Tanggal Check out:',
+ 'canceled' => 'Dibatalkan',
+ 'checkin_date' => 'Tanggal Check in',
+ 'checkout_date' => 'Tanggal Check out',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Silahkan klik pada link berikut untuk mengkonfirmasi :akun web Anda:',
'current_QTY' => 'QTY saat ini',
'days' => 'Hari',
- 'expecting_checkin_date' => 'Tanggal Checkin yang Diharapkan:',
+ 'expecting_checkin_date' => 'Tanggal Checkin yang Diharapkan',
'expires' => 'Berakhir',
'hello' => 'Halo',
'hi' => 'Hai',
'i_have_read' => 'Saya sudah baca dan menyetujui syarat penggunaan, dan sudah menerima item ini.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.|Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.',
'link_to_update_password' => 'Silahkan klik pada link berikut untuk memperbarui :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nama',
'new_item_checked' => 'Item baru sudah diperiksa atas nama anda, rinciannya dibawah ini.',
'notes' => 'Catatan',
- 'password' => 'Kata Sandi:',
+ 'password' => 'Kata Sandi',
'password_reset' => 'Atur ulang kata sandi',
'read_the_terms' => 'Silahkan baca syarat penggunaan dibawah ini.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Diminta:',
+ 'requested' => 'Diminta',
'reset_link' => 'Tautan Atur ulang kata sandi anda',
'reset_password' => 'Klik disini untuk atur ulang kata sandi anda:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/es-CO/admin/custom_fields/general.php b/resources/lang/es-CO/admin/custom_fields/general.php
index 71d2aa2e0e..802ff7d59e 100644
--- a/resources/lang/es-CO/admin/custom_fields/general.php
+++ b/resources/lang/es-CO/admin/custom_fields/general.php
@@ -37,7 +37,7 @@ return [
'show_in_email' => '¿Incluir el campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
'show_in_email_short' => 'Incluye en correos electrónicos.',
'help_text' => 'Texto de ayuda',
- 'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los elementos del formulario mientras se edita un activo para proporcionar contexto en el campo.',
+ 'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
'about_custom_fields_title' => 'Acerca de campos personalizados',
'about_custom_fields_text' => 'Los campos personalizados le permiten añadir atributos arbitrarios a los activos.',
'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
diff --git a/resources/lang/es-CO/admin/depreciations/general.php b/resources/lang/es-CO/admin/depreciations/general.php
index e347dd8e3a..046b5a129f 100644
--- a/resources/lang/es-CO/admin/depreciations/general.php
+++ b/resources/lang/es-CO/admin/depreciations/general.php
@@ -6,9 +6,9 @@ return [
'asset_depreciations' => 'Depreciación de activos',
'create' => 'Crear depreciación',
'depreciation_name' => 'Nombre de depreciación',
- 'depreciation_min' => 'Valor del piso de la depreciación',
+ 'depreciation_min' => 'Valor mínimo de depreciación',
'number_of_months' => 'Número de meses',
- 'update' => 'Actualizar Depreciación',
+ 'update' => 'Actualizar depreciación',
'depreciation_min' => 'Valor mínimo después de depreciación',
'no_depreciations_warning' => 'Advertencia:
No tiene ninguna depreciación configurada.
diff --git a/resources/lang/es-CO/admin/depreciations/table.php b/resources/lang/es-CO/admin/depreciations/table.php
index ad042d1640..b4f03dafc9 100644
--- a/resources/lang/es-CO/admin/depreciations/table.php
+++ b/resources/lang/es-CO/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
'months' => 'Meses',
'term' => 'Períodos',
'title' => 'Nombre ',
- 'depreciation_min' => 'Valor del piso',
+ 'depreciation_min' => 'Valor mínimo',
];
diff --git a/resources/lang/es-CO/admin/hardware/form.php b/resources/lang/es-CO/admin/hardware/form.php
index d0fdf9d9e7..5fa50af118 100644
--- a/resources/lang/es-CO/admin/hardware/form.php
+++ b/resources/lang/es-CO/admin/hardware/form.php
@@ -23,12 +23,12 @@ return [
'depreciation' => 'Depreciación',
'depreciates_on' => 'Se deprecia en',
'default_location' => 'Ubicación predeterminada',
- 'default_location_phone' => 'Teléfono de ubicación por defecto',
+ 'default_location_phone' => 'Teléfono de ubicación predeterminada',
'eol_date' => 'Fecha fin de soporte (EOL)',
'eol_rate' => 'Tasa fin de soporte (EOL)',
'expected_checkin' => 'Fecha esperada de devolución',
'expires' => 'Vence',
- 'fully_depreciated' => 'Totalmente Depreciado',
+ 'fully_depreciated' => 'Totalmente depreciado',
'help_checkout' => 'Si desea asignar este equipo inmediatamente, seleccione "Listo para asignar" de la lista de estados de arriba. ',
'mac_address' => 'Dirección MAC',
'manufacturer' => 'Fabricante',
diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php
index c99c15692a..de4defa9b1 100644
--- a/resources/lang/es-CO/admin/hardware/general.php
+++ b/resources/lang/es-CO/admin/hardware/general.php
@@ -11,7 +11,7 @@ return [
'checkout' => 'Asignar activo',
'clone' => 'Clonar activo',
'deployable' => 'Utilizable',
- 'deleted' => 'Este activo ha sido borrado.',
+ 'deleted' => 'Este activo ha sido eliminado.',
'delete_confirm' => '¿Está seguro de que desea eliminar este activo?',
'edit' => 'Editar activo',
'model_deleted' => 'Este modelo de activo ha sido eliminado. Debe restaurar este modelo antes de poder restaurar el activo.',
@@ -36,7 +36,7 @@ return [
'error_messages' => 'Mensajes de error:',
'success_messages' => 'Mensajes de éxito:',
'alert_details' => 'Por favor vea abajo para más detalles.',
- 'custom_export' => 'Exportación personalizada',
+ 'custom_export' => 'Personalizar exportación',
'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
- 'user_department' => 'Departamento de Usuario',
+ 'user_department' => 'Departamento del usuario',
];
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index 0f2225cce2..b86ae2f515 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/resources/lang/es-CO/admin/hardware/message.php
@@ -7,12 +7,12 @@ return [
'does_not_exist_var'=> 'Activo con placa :asset_tag no encontrado.',
'no_tag' => 'No se ha proporcionado ninguna placa de activo.',
'does_not_exist_or_not_requestable' => 'Ese activo no existe o no es solicitable.',
- 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero devuelva o recupere el activo y vuelva a intentarlo. ',
+ 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
'warning_audit_date_mismatch' => 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
'create' => [
'error' => 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
- 'success' => 'Equipo creado con éxito. :)',
+ 'success' => 'Activo creado con éxito. :)',
'success_linked' => 'Activo con placa :tag creado con éxito. Haga clic aquí para ver.',
],
@@ -20,15 +20,15 @@ return [
'error' => 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
'success' => 'Equipo actualizado correctamente.',
'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
- 'nothing_updated' => 'No se seleccionaron campos, por lo que no se actualizó nada.',
+ 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
'no_assets_selected' => 'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
'error' => 'El activo no fue restaurado, por favor inténtelo nuevamente',
- 'success' => 'Equipo restaurado con éxito.',
- 'bulk_success' => 'Equipo restaurado con éxito.',
+ 'success' => 'Activo restaurado exitosamente.',
+ 'bulk_success' => 'Activo restaurado exitosamente.',
'nothing_updated' => 'No se seleccionaron activos, por lo que no se restauró nada.',
],
@@ -52,7 +52,7 @@ return [
'import' => [
'import_button' => 'Importar',
- 'error' => 'Algunos artículos no importaron correctamente.',
+ 'error' => 'Algunos elementos no se pudieron importar correctamente.',
'errorDetail' => 'Los siguientes elementos no fueron importados debido a errores.',
'success' => 'Su archivo ha sido importado',
'file_delete_success' => 'Su archivo se ha eliminado correctamente',
@@ -60,7 +60,7 @@ return [
'file_missing' => 'Falta el archivo seleccionado',
'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
'header_row_has_malformed_characters' => 'Uno o más atributos en la fila del encabezado contienen caracteres UTF-8 mal formados',
- 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila de contenido contienen caracteres UTF-8 mal formados',
+ 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
],
diff --git a/resources/lang/es-CO/admin/hardware/table.php b/resources/lang/es-CO/admin/hardware/table.php
index 4d808c0b0f..b4d4790a54 100644
--- a/resources/lang/es-CO/admin/hardware/table.php
+++ b/resources/lang/es-CO/admin/hardware/table.php
@@ -26,7 +26,7 @@ return [
'days_without_acceptance' => 'Días sin aceptación',
'monthly_depreciation' => 'Depreciación mensual',
'assigned_to' => 'Asignado a',
- 'requesting_user' => 'Solicitando usuario',
+ 'requesting_user' => 'Usuario solicitante',
'requested_date' => 'Fecha solicitada',
'changed' => 'Cambios',
'icon' => 'Ícono',
diff --git a/resources/lang/es-CO/admin/locations/message.php b/resources/lang/es-CO/admin/locations/message.php
index 67a85e4d29..455c5833ec 100644
--- a/resources/lang/es-CO/admin/locations/message.php
+++ b/resources/lang/es-CO/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'La ubicación no existe.',
- 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o un usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor actualice sus modelos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
+ 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo. ',
'assoc_assets' => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assoc_child_loc' => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada. Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assigned_assets' => 'Activos asignados',
diff --git a/resources/lang/es-CO/admin/models/message.php b/resources/lang/es-CO/admin/models/message.php
index 56e29af024..e6aab2c07d 100644
--- a/resources/lang/es-CO/admin/models/message.php
+++ b/resources/lang/es-CO/admin/models/message.php
@@ -5,7 +5,7 @@ return array(
'deleted' => 'Se eliminó el modelo del activo',
'does_not_exist' => 'Modelo inexistente.',
'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
- 'no_association_fix' => 'Esto romperá cosas de formas extrañas y horribles. Edite este activo ahora para asignarle un modelo.',
+ 'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
'assoc_users' => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
diff --git a/resources/lang/es-CO/admin/models/table.php b/resources/lang/es-CO/admin/models/table.php
index 12e3078e86..312944b9cd 100644
--- a/resources/lang/es-CO/admin/models/table.php
+++ b/resources/lang/es-CO/admin/models/table.php
@@ -12,6 +12,6 @@ return array(
'update' => 'Actualizar modelo de activo',
'view' => 'Ver modelo de activo',
'update' => 'Actualizar modelo de activo',
- 'clone' => 'Clonar Modelo',
- 'edit' => 'Editar Modelo',
+ 'clone' => 'Clonar modelo',
+ 'edit' => 'Editar modelo',
);
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index b5fb99dec1..2a3d963522 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -15,49 +15,51 @@ return [
'alert_title' => 'Actualizar ajustes de notificación',
'alert_email' => 'Enviar alertas a',
'alert_email_help' => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas',
- 'alerts_enabled' => 'Alertas de email habilitadas',
- 'alert_interval' => 'Umbral de alertas de caducidad (en días)',
- 'alert_inv_threshold' => 'Umbral de alerta de inventario',
+ 'alerts_enabled' => 'Alertas de correo electrónico habilitadas',
+ 'alert_interval' => 'Umbral para las alertas de caducidad (en días)',
+ 'alert_inv_threshold' => 'Umbral para alerta de inventario',
'allow_user_skin' => 'Permitir al usuario cambiar la apariencia',
'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
'asset_ids' => 'Códigos de los activos',
'audit_interval' => 'Intervalo de auditoría',
'audit_interval_help' => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
- 'audit_warning_days' => 'Umbral de advertencia de auditoría',
+ 'audit_warning_days' => 'Umbral para aviso de auditoría',
'audit_warning_days_help' => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
- 'auto_increment_assets' => 'Generar placas de activos autoincrementables',
+ 'auto_increment_assets' => 'Generar incremento automático en las placas de activos',
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
'backups' => 'Copias de seguridad',
'backups_help' => 'Crear, descargar y restaurar copias de seguridad ',
'backups_restoring' => 'Restaurando desde la copia de seguridad',
+ 'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+ 'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
'backups_upload' => 'Cargar copia de seguridad',
'backups_path' => 'Las copias de seguridad en el servidor se almacenan en :path',
'backups_restore_warning' => 'Utilice el botón de restauración para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker).
Su base de datos completa de :app_name y cualquier archivo cargado será completamente reemplazado por lo que hay en la copia de seguridad. ',
'backups_logged_out' => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
'backups_large' => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
- 'barcode_settings' => 'Ajustes de código de barras',
+ 'barcode_settings' => 'Configuración del código de barras',
'confirm_purge' => 'Confirmar purga',
'confirm_purge_help' => 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
'custom_css' => 'Custom CSS',
'custom_css_help' => 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas <style></style>.',
'custom_forgot_pass_url' => 'URL de restablecimiento de contraseña personalizada',
- 'custom_forgot_pass_url_help' => 'Esto reemplaza la URL de la contraseña olvidada en la pantalla de inicio de sesión, útil para dirigir a la gente a la funcionalidad interna o alojada para restablecer la contraseña LDAP. Deshabilitará efectivamente la funcionalidad de contraseña olvidada por el usuario local.',
+ 'custom_forgot_pass_url_help' => 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
'dashboard_message' => 'Mensaje en el tablero',
'dashboard_message_help' => 'Este texto aparecerá en el panel de control para cualquiera con permiso para ver el tablero.',
- 'default_currency' => 'Moneda por defecto',
+ 'default_currency' => 'Divisa predeterminada',
'default_eula_text' => 'Acuerdo de uso predeterminado',
- 'default_language' => 'Idioma por defecto',
+ 'default_language' => 'Idioma predeterminado',
'default_eula_help_text' => 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
'acceptance_note' => 'Añada una nota para su decisión (opcional)',
'display_asset_name' => 'Mostrar nombre del activo',
'display_checkout_date' => 'Mostrar fecha de asignación',
'display_eol' => 'Mostrar fin de soporte (EOL) en la vista de tabla',
'display_qr' => 'Mostrar códigos cuadrados',
- 'display_alt_barcode' => 'Mostrar código de barras 1D',
+ 'display_alt_barcode' => 'Mostrar códigos de barras de 1D',
'email_logo' => 'Logo de correo electrónico',
- 'barcode_type' => 'Tipo de código de barras 2D',
- 'alt_barcode_type' => 'Tipo de código de barras 1D',
+ 'barcode_type' => 'Tipo de código de barras de 2D',
+ 'alt_barcode_type' => 'Tipo de código de barras de 1D',
'email_logo_size' => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
'enabled' => 'Activado',
'eula_settings' => 'Configuración de los acuerdos de uso',
diff --git a/resources/lang/es-CO/admin/settings/message.php b/resources/lang/es-CO/admin/settings/message.php
index 249cdc401b..c3df16d04e 100644
--- a/resources/lang/es-CO/admin/settings/message.php
+++ b/resources/lang/es-CO/admin/settings/message.php
@@ -9,7 +9,7 @@ return [
'backup' => [
'delete_confirm' => '¿Está seguro de que desea eliminar este archivo de respaldo? Esta acción no puede se puede deshacer. ',
'file_deleted' => 'El archivo de copia de seguridad se ha eliminado correctamente. ',
- 'generated' => 'Se ha creado un nuevo archivo de copia de seguridad.',
+ 'generated' => 'Se ha creado un nuevo archivo de copia de seguridad satisfactoriamente.',
'file_not_found' => 'Ese archivo de copia de seguridad no se pudo encontrar en el servidor.',
'restore_warning' => 'Sí, restaurarlo. Reconozco que esto sobrescribirá cualquier dato existente actualmente en la base de datos. Esto también cerrará la sesión de todos sus usuarios existentes (incluido usted).',
'restore_confirm' => '¿Está seguro que desea restaurar su base de datos desde :filename?'
@@ -18,7 +18,7 @@ return [
'success' => 'Se ha restaurado la copia de seguridad de su sistema. Por favor, vuelva a iniciar sesión.'
],
'purge' => [
- 'error' => 'Se ha producido un error al purgar. ',
+ 'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ',
'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
'success' => 'Los registros eliminados se han purgado correctamente.',
],
@@ -29,7 +29,7 @@ return [
'additional' => 'No se proporciona ningún mensaje de error adicional. Compruebe la configuración de su correo y el registro de errores de la aplicación.'
],
'ldap' => [
- 'testing' => 'Probando conexión LDAP, Binding & Query ...',
+ 'testing' => 'Probando conexión al LDAP, Binding & Query ...',
'500' => 'Error 500 del servidor. Por favor, compruebe los registros de error de su servidor para más información.',
'error' => 'Algo salió mal :(',
'sync_success' => 'Una muestra de 10 usuarios devueltos desde el servidor LDAP basado en su configuración:',
@@ -38,7 +38,7 @@ return [
],
'webhook' => [
'sending' => 'Enviando mensaje de prueba :app...',
- 'success' => '¡Su Integración :webhook_name funciona!',
+ 'success' => '¡Su integración :webhook_name funciona!',
'success_pt1' => '¡Éxito! Compruebe el ',
'success_pt2' => ' para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
'500' => 'Error 500 del servidor.',
diff --git a/resources/lang/es-CO/admin/statuslabels/table.php b/resources/lang/es-CO/admin/statuslabels/table.php
index 459ee3dd92..78f5a67ce6 100644
--- a/resources/lang/es-CO/admin/statuslabels/table.php
+++ b/resources/lang/es-CO/admin/statuslabels/table.php
@@ -12,8 +12,8 @@ return array(
'name' => 'Nombre de estado',
'pending' => 'Pendiente',
'status_type' => 'Tipo de estado',
- 'show_in_nav' => 'Mostrar en barra lateral',
+ 'show_in_nav' => 'Mostrar en la barra lateral',
'title' => 'Etiquetas de estado',
'undeployable' => 'No utilizable',
- 'update' => 'Actualizar Etiqueta de Estado',
+ 'update' => 'Actualizar la etiqueta de estado',
);
diff --git a/resources/lang/es-CO/admin/users/general.php b/resources/lang/es-CO/admin/users/general.php
index 09e9a9b029..bdd5bffed2 100644
--- a/resources/lang/es-CO/admin/users/general.php
+++ b/resources/lang/es-CO/admin/users/general.php
@@ -15,7 +15,7 @@ return [
'info' => 'Información',
'restore_user' => 'Haga clic aquí para restaurarlos.',
'last_login' => 'Último acceso',
- 'ldap_config_text' => 'Los ajustes de configuración LDAP se pueden encontrar Admin > Configuración. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
+ 'ldap_config_text' => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
'print_assigned' => 'Imprimir todos los asignados',
'email_assigned' => 'Enviar correo con todos los asignados',
'user_notified' => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
@@ -26,10 +26,10 @@ return [
'view_user' => 'Ver usuario :name',
'usercsv' => 'Archivo CSV',
'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores. ',
- 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+ 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
'two_factor_active' => '2FA activo ',
- 'user_deactivated' => 'Usuario no puede iniciar sesión',
- 'user_activated' => 'Usuario puede iniciar sesión',
+ 'user_deactivated' => 'El usuario no puede iniciar sesión',
+ 'user_activated' => 'El usuario puede iniciar sesión',
'activation_status_warning' => 'No cambiar el estado de activación',
'group_memberships_helpblock' => 'Sólo los superadministradores pueden editar membresías de grupo.',
'superadmin_permission_warning' => 'Sólo los superadministradores pueden conceder acceso a un usuario superadministrador.',
diff --git a/resources/lang/es-CO/admin/users/message.php b/resources/lang/es-CO/admin/users/message.php
index 73e8c8bff5..c291465ec8 100644
--- a/resources/lang/es-CO/admin/users/message.php
+++ b/resources/lang/es-CO/admin/users/message.php
@@ -3,16 +3,16 @@
return array(
'accepted' => 'Ha aceptado este artículo exitosamente.',
- 'declined' => 'Ha rechazado este activo con exitosamente.',
+ 'declined' => 'Ha rechazado correctamente este activo.',
'bulk_manager_warn' => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
'user_exists' => '¡El usuario ya existe!',
- 'user_not_found' => 'El usuario no existe.',
+ 'user_not_found' => 'El usuario no existe o usted no tiene permisos para verlo.',
'user_login_required' => 'El campo usuario es obligatorio',
'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
'user_password_required' => 'La contraseña es obligatoria.',
'insufficient_permissions' => 'Permisos insuficientes.',
'user_deleted_warning' => 'Este usuario ha sido eliminado. Tendrá que restaurar este usuario para editarlo o para asignarle nuevos activos.',
- 'ldap_not_configured' => 'La integración LDAP no ha sido configurada para esta instalación.',
+ 'ldap_not_configured' => 'La integración con LDAP no ha sido configurada para esta instalación.',
'password_resets_sent' => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.',
'password_reset_sent' => 'Un enlace para restablecer la contraseña ha sido enviado a :email!',
'user_has_no_email' => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
@@ -20,12 +20,12 @@ return array(
'success' => array(
- 'create' => 'El usuario se ha creado correctamente.',
+ 'create' => 'El usuario fue creado correctamente.',
'update' => 'Usuario actualizado exitosamente.',
'update_bulk' => '¡Usuarios actualizados con éxito!',
'delete' => 'El usuario se ha eliminado correctamente.',
'ban' => 'El usuario fue baneado con éxito.',
- 'unban' => 'El usuario se ha desbaneado correctamente.',
+ 'unban' => 'El usuario fue desbloqueado correctamente.',
'suspend' => 'El usuario fue suspendido correctamente.',
'unsuspend' => 'El usuario no fue suspendido correctamente.',
'restored' => 'Usuario restaurado correctamente.',
@@ -36,14 +36,14 @@ return array(
'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
- 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se ha podido eliminar.',
+ 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor primero seleccione otro supervisor.|Este usuario todavía supervisa :count ubicaciones. Por favor primero seleccione otro supervisor.',
'delete_has_users_var' => 'Este usuario todavía supervisa a otro usuario. Por favor primero seleccione otro supervisor para ese usuario.|Este usuario todavía supervisa :count usuarios. Por favor primero seleccione otro supervisor para ellos.',
'unsuspend' => 'Hubo un problema marcando como no suspendido al usuario. Por favor, inténtelo de nuevo.',
- 'import' => 'Hubo un problema importando usuarios. Por favor, inténtelo de nuevo.',
+ 'import' => 'Hubo un problema importando los usuarios. Por favor, inténtelo de nuevo.',
'asset_already_accepted' => 'Este activo ya ha sido aceptado.',
'accept_or_decline' => 'Debe aceptar o rechazar este activo.',
'cannot_delete_yourself' => 'Nos sentiríamos muy mal si usted se eliminara, por favor reconsidérelo.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP.
Error del servidor LDAP:',
'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP.
Error del servidor LDAP:',
'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña. ',
+ 'multi_company_items_assigned' => 'Este usuario tiene elementos asignados, por favor, realice el ingreso de estos elementos antes de cambiarlo de compañía.'
),
'deletefile' => array(
diff --git a/resources/lang/es-CO/admin/users/table.php b/resources/lang/es-CO/admin/users/table.php
index 9b782664d9..940800616b 100644
--- a/resources/lang/es-CO/admin/users/table.php
+++ b/resources/lang/es-CO/admin/users/table.php
@@ -3,7 +3,7 @@
return array(
'activated' => 'Activo',
'allow' => 'Permitir',
- 'checkedout' => 'Equipos',
+ 'checkedout' => 'Activos',
'created_at' => 'Creado',
'createuser' => 'Crear usuario',
'deny' => 'Denegar',
@@ -31,7 +31,7 @@ return array(
'show_deleted' => 'Mostrar usuarios eliminados',
'title' => 'Cargo',
'to_restore_them' => 'para restaurarlos.',
- 'total_assets_cost' => "Coste total de activos",
+ 'total_assets_cost' => "Costo total de activos",
'updateuser' => 'Actualizar usuario',
'username' => 'Nombre de usuario',
'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.',
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 3b24e50c34..29a2101e0a 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'También borra suavemente estos usuarios. Su historial de activos permanecerá intacto a menos/hasta que purgue los registros borrados en la Configuración de administración.',
'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
- 'set_to_null' => 'Eliminar valores para este activo|Borrar valores para todos los activos :asset_count ',
+ 'set_to_null' => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
'set_users_field_to_null' => 'Eliminar :field values for this user|Eliminar :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No se proporcionó fecha de compra',
'assets_by_status' => 'Activos por estado',
@@ -492,7 +492,7 @@ return [
'checked_out_to_first_name' => 'Asignado a: Nombre',
'checked_out_to_last_name' => 'Asignado a: Apellido',
'checked_out_to_username' => 'Asignado a: Nombre de usuario',
- 'checked_out_to_email' => 'Asignado a: correo electrónico',
+ 'checked_out_to_email' => 'Asignado a: Correo electrónico',
'checked_out_to_tag' => 'Asignado a: Placa de activo',
'manager_first_name' => 'Nombre del supervisor',
'manager_last_name' => 'Apellido del supervisor',
@@ -510,7 +510,7 @@ return [
'import_note' => 'Importado usando el importador de csv',
],
'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
- 'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+ 'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
'percent_complete' => '% completo',
'uploading' => 'Subiendo... ',
'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
@@ -559,8 +559,8 @@ return [
'expires' => 'Vence',
'map_fields'=> 'Asociar campos para :item_type',
'remaining_var' => ':count restantes',
- 'assets_in_var' => 'Activos en :name :type',
'label' => 'Etiqueta',
'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+ 'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
];
diff --git a/resources/lang/es-CO/localizations.php b/resources/lang/es-CO/localizations.php
index 9c46fa7a49..31f9a4946b 100644
--- a/resources/lang/es-CO/localizations.php
+++ b/resources/lang/es-CO/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Seleccionar un idioma',
+ 'select_language' => 'Seleccione un idioma',
'languages' => [
'en-US'=> 'Inglés, EEUU',
'en-GB'=> 'Inglés, Reino Unido',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Seleccionar un país',
+ 'select_country' => 'Seleccione un país',
'countries' => [
'AC'=>'Isla de Ascensión',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egipto',
+ 'GB-ENG'=>'Inglaterra',
'ER'=>'Eritrea',
'ES'=>'España',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Holanda',
+ 'GB-NIR' => 'Irlanda del Norte',
'NO'=>'Noruega',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federación Rusa',
'RW'=>'Rwanda',
'SA'=>'Arabia Saudita',
- 'UK'=>'Escocia',
+ 'GB-SCT'=>'Escocia',
'SB'=>'Islas Salomón',
'SC'=>'Seychelles',
'SS'=>'Sudán del Sur',
@@ -312,6 +314,7 @@ return [
'VI'=>'Islas Virginas (EE.UU.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Gales',
'WF'=>'Islas Wallis y Futuna',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/es-CO/mail.php b/resources/lang/es-CO/mail.php
index fb056480ed..f7d647325a 100644
--- a/resources/lang/es-CO/mail.php
+++ b/resources/lang/es-CO/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
- 'accessory_name' => 'Nombre de accesorio:',
- 'additional_notes' => 'Notas adicionales:',
+ 'accessory_name' => 'Nombre de accesorio',
+ 'additional_notes' => 'Notas adicionales',
'admin_has_created' => 'Un administrador ha creado una cuenta para usted en el sitio :web.',
- 'asset' => 'Activo:',
- 'asset_name' => 'Nombre del activo:',
+ 'asset' => 'Activo',
+ 'asset_name' => 'Nombre del activo',
'asset_requested' => 'Activo solicitado',
'asset_tag' => 'Placa del activo',
'assets_warrantee_alert' => 'Hay :count activo con una garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
'assigned_to' => 'Asignado a',
'best_regards' => 'Saludos cordiales,',
- 'canceled' => 'Cancelado:',
- 'checkin_date' => 'Fecha de devolución:',
- 'checkout_date' => 'Fecha de asignación:',
+ 'canceled' => 'Cancelado',
+ 'checkin_date' => 'Fecha de ingreso',
+ 'checkout_date' => 'Fecha de asignación',
'checkedout_from' => 'Asignado desde',
'checkedin_from' => 'Devuelto desde',
'checked_into' => 'Devuelto en',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
'current_QTY' => 'Cantidad actual',
'days' => 'Días',
- 'expecting_checkin_date' => 'Fecha esperada de devolución:',
+ 'expecting_checkin_date' => 'Fecha esperada de devolución',
'expires' => 'Vence',
'hello' => 'Hola',
'hi' => 'Hola',
'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
'inventory_report' => 'Informe de inventario',
- 'item' => 'Elemento:',
+ 'item' => 'Elemento',
'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar contraseña de :web :',
@@ -66,11 +66,11 @@ return [
'name' => 'Nombre',
'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
'notes' => 'Notas',
- 'password' => 'Contraseña:',
+ 'password' => 'Contraseña',
'password_reset' => 'Reiniciar la contraseña',
'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
- 'requested' => 'Solicitado:',
+ 'requested' => 'Solicitado',
'reset_link' => 'Su enlace de restablecimiento de contraseña',
'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
'rights_reserved' => 'Todos los derechos reservados.',
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index c998f61da3..664f966756 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -157,7 +157,7 @@ return [
'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
'string' => 'El atributo: debe ser una cadena.',
'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
- 'unique_undeleted' => 'El :atrribute debe ser único.',
+ 'unique_undeleted' => 'El :attribute debe ser único.',
'non_circular' => ':attribute no debe crear una referencia circular.',
'not_array' => ':attribute no puede ser una matriz.',
'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
diff --git a/resources/lang/es-ES/admin/custom_fields/general.php b/resources/lang/es-ES/admin/custom_fields/general.php
index 7f5932d939..de2fc5b254 100644
--- a/resources/lang/es-ES/admin/custom_fields/general.php
+++ b/resources/lang/es-ES/admin/custom_fields/general.php
@@ -37,7 +37,7 @@ return [
'show_in_email' => '¿Incluir el campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
'show_in_email_short' => 'Incluye en correos electrónicos.',
'help_text' => 'Texto de ayuda',
- 'help_text_description' => 'Un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
+ 'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
'about_custom_fields_title' => 'Acerca de los Campos Personalizados',
'about_custom_fields_text' => 'Los campos personalizados le permiten añadir atributos arbitrarios a los activos.',
'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
diff --git a/resources/lang/es-ES/admin/depreciations/general.php b/resources/lang/es-ES/admin/depreciations/general.php
index b30fe7e077..e0f7c86f6d 100644
--- a/resources/lang/es-ES/admin/depreciations/general.php
+++ b/resources/lang/es-ES/admin/depreciations/general.php
@@ -8,7 +8,7 @@ return [
'depreciation_name' => 'Nombre amortización',
'depreciation_min' => 'Valor mínimo de amortización',
'number_of_months' => 'Número de meses',
- 'update' => 'Actualizar Amortización',
+ 'update' => 'Actualizar amortización',
'depreciation_min' => 'Valor mínimo después de la depreciación',
'no_depreciations_warning' => 'Advertencia:
No tiene ninguna depreciación configurada.
diff --git a/resources/lang/es-ES/admin/depreciations/message.php b/resources/lang/es-ES/admin/depreciations/message.php
index 6532eb38e3..b57b54c800 100644
--- a/resources/lang/es-ES/admin/depreciations/message.php
+++ b/resources/lang/es-ES/admin/depreciations/message.php
@@ -2,7 +2,7 @@
return array(
- 'does_not_exist' => 'Clase de amortización inexistente.',
+ 'does_not_exist' => 'La clase de depreciación no existe.',
'assoc_users' => 'Esta depreciación está actualmente asociada con uno o más modelos y no puede ser eliminada. Por favor, elimine los modelos y luego intente borrarlas de nuevo. ',
diff --git a/resources/lang/es-ES/admin/hardware/form.php b/resources/lang/es-ES/admin/hardware/form.php
index 2efbfc5bd8..3ab9529b8b 100644
--- a/resources/lang/es-ES/admin/hardware/form.php
+++ b/resources/lang/es-ES/admin/hardware/form.php
@@ -23,7 +23,7 @@ return [
'depreciation' => 'Depreciación',
'depreciates_on' => 'Se deprecia en',
'default_location' => 'Ubicación predeterminada',
- 'default_location_phone' => 'Teléfono de ubicación por defecto',
+ 'default_location_phone' => 'Teléfono de ubicación predeterminada',
'eol_date' => 'Fecha fin de soporte (EOL)',
'eol_rate' => 'Tasa fin de soporte (EOL)',
'expected_checkin' => 'Fecha esperada de devolución',
diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php
index 4a48f4692e..6b6077cfee 100644
--- a/resources/lang/es-ES/admin/hardware/general.php
+++ b/resources/lang/es-ES/admin/hardware/general.php
@@ -38,5 +38,5 @@ return [
'alert_details' => 'Por favor vea abajo para más detalles.',
'custom_export' => 'Personalizar exportación',
'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
- 'user_department' => 'Departamento de Usuario',
+ 'user_department' => 'Departamento del usuario',
];
diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php
index 6393d33dac..6e27340cc8 100644
--- a/resources/lang/es-ES/admin/hardware/message.php
+++ b/resources/lang/es-ES/admin/hardware/message.php
@@ -7,28 +7,28 @@ return [
'does_not_exist_var'=> 'Activo con placa :asset_tag no encontrado.',
'no_tag' => 'No se ha proporcionado ninguna placa de activo.',
'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
- 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero devuelva o recupere el activo y vuelva a intentarlo. ',
+ 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
'warning_audit_date_mismatch' => 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
'create' => [
'error' => 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
- 'success' => 'Equipo creado. :)',
+ 'success' => 'Activo creado con éxito. :)',
'success_linked' => 'Activo con placa :tag creado con éxito. Haga clic aquí para ver.',
],
'update' => [
'error' => 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
- 'success' => 'Equipo actualizado.',
+ 'success' => 'Equipo actualizado correctamente.',
'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
- 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
+ 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
'no_assets_selected' => 'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
'error' => 'El activo no fue restaurado, por favor inténtelo nuevamente',
- 'success' => 'Equipo restaurado correctamente.',
- 'bulk_success' => 'Equipo restaurado correctamente.',
+ 'success' => 'Activo restaurado exitosamente.',
+ 'bulk_success' => 'Activo restaurado exitosamente.',
'nothing_updated' => 'No se seleccionaron activos, por lo que no se restauró nada.',
],
@@ -60,7 +60,7 @@ return [
'file_missing' => 'Falta el archivo seleccionado',
'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
'header_row_has_malformed_characters' => 'Uno o más atributos en la fila del encabezado contienen caracteres UTF-8 mal formados',
- 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila de contenido contienen caracteres UTF-8 mal formados',
+ 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
],
diff --git a/resources/lang/es-ES/admin/hardware/table.php b/resources/lang/es-ES/admin/hardware/table.php
index 744e2c5aae..10c961e3e1 100644
--- a/resources/lang/es-ES/admin/hardware/table.php
+++ b/resources/lang/es-ES/admin/hardware/table.php
@@ -26,7 +26,7 @@ return [
'days_without_acceptance' => 'Días sin aceptación',
'monthly_depreciation' => 'Depreciación mensual',
'assigned_to' => 'Asignado a',
- 'requesting_user' => 'Solicitando usuario',
+ 'requesting_user' => 'Usuario solicitante',
'requested_date' => 'Fecha solicitada',
'changed' => 'Cambios',
'icon' => 'Ícono',
diff --git a/resources/lang/es-ES/admin/locations/message.php b/resources/lang/es-ES/admin/locations/message.php
index 67a85e4d29..455c5833ec 100644
--- a/resources/lang/es-ES/admin/locations/message.php
+++ b/resources/lang/es-ES/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'La ubicación no existe.',
- 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o un usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor actualice sus modelos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
+ 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo. ',
'assoc_assets' => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assoc_child_loc' => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada. Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assigned_assets' => 'Activos asignados',
diff --git a/resources/lang/es-ES/admin/models/message.php b/resources/lang/es-ES/admin/models/message.php
index fde8ae8700..9370ef2a54 100644
--- a/resources/lang/es-ES/admin/models/message.php
+++ b/resources/lang/es-ES/admin/models/message.php
@@ -5,7 +5,7 @@ return array(
'deleted' => 'Se eliminó el modelo del activo',
'does_not_exist' => 'Modelo inexistente.',
'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
- 'no_association_fix' => 'Esto romperá cosas de formas extrañas y horribles. Edite este activo ahora para asignarle un modelo.',
+ 'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
'assoc_users' => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
@@ -17,18 +17,18 @@ return array(
'update' => array(
'error' => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
- 'success' => 'Modelo actualizado.',
+ 'success' => 'El modelo fue actualizado exitosamente.',
),
'delete' => array(
'confirm' => '¿Está seguro de que desea eliminar este modelo de activo?',
'error' => 'Hubo un problema eliminando el modelo. Por favor, inténtelo de nuevo.',
- 'success' => 'Modelo eliminado.'
+ 'success' => 'El modelo fue eliminado exitosamente.'
),
'restore' => array(
'error' => 'El modelo no fue restaurado, por favor intente nuevamente',
- 'success' => 'Modelo restaurado exitosamente.'
+ 'success' => 'El modelo fue restaurado exitosamente.'
),
'bulkedit' => array(
diff --git a/resources/lang/es-ES/admin/models/table.php b/resources/lang/es-ES/admin/models/table.php
index 12e3078e86..312944b9cd 100644
--- a/resources/lang/es-ES/admin/models/table.php
+++ b/resources/lang/es-ES/admin/models/table.php
@@ -12,6 +12,6 @@ return array(
'update' => 'Actualizar modelo de activo',
'view' => 'Ver modelo de activo',
'update' => 'Actualizar modelo de activo',
- 'clone' => 'Clonar Modelo',
- 'edit' => 'Editar Modelo',
+ 'clone' => 'Clonar modelo',
+ 'edit' => 'Editar modelo',
);
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index bedddec537..c6c794efe0 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -15,37 +15,39 @@ return [
'alert_title' => 'Actualizar ajustes de notificación',
'alert_email' => 'Enviar alertas a',
'alert_email_help' => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas, separadas por comas',
- 'alerts_enabled' => 'Alertas habilitadas',
- 'alert_interval' => 'Limite de alertas de expiración (en días)',
- 'alert_inv_threshold' => 'Umbral de alerta del inventario',
+ 'alerts_enabled' => 'Alertas de correo electrónico habilitadas',
+ 'alert_interval' => 'Umbral para las alertas de caducidad (en días)',
+ 'alert_inv_threshold' => 'Umbral para alerta de inventario',
'allow_user_skin' => 'Permitir al usuario cambiar la apariencia',
'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
'asset_ids' => 'Códigos de los activos',
'audit_interval' => 'Intervalo de auditoría',
'audit_interval_help' => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
- 'audit_warning_days' => 'Umbral de advertencia de auditoría',
+ 'audit_warning_days' => 'Umbral para aviso de auditoría',
'audit_warning_days_help' => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
- 'auto_increment_assets' => 'Generar placas de activos autoincrementables',
+ 'auto_increment_assets' => 'Generar incremento automático en las placas de activos',
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
'backups' => 'Copias de seguridad',
'backups_help' => 'Crear, descargar y restaurar copias de seguridad ',
'backups_restoring' => 'Restaurar desde copia de seguridad',
+ 'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+ 'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
'backups_upload' => 'Cargar copia de seguridad',
'backups_path' => 'Las copias de seguridad en el servidor se almacenan en :path',
'backups_restore_warning' => 'Utilice el botón de restauración para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker).
Su base de datos completa de :app_name y cualquier archivo cargado será completamente reemplazado por lo que hay en la copia de seguridad. ',
'backups_logged_out' => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
'backups_large' => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
- 'barcode_settings' => 'Configuración de Código de Barras',
+ 'barcode_settings' => 'Configuración del código de barras',
'confirm_purge' => 'Confirmar la purga',
'confirm_purge_help' => 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
'custom_css' => 'CSS Personalizado',
'custom_css_help' => 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas <style></style>.',
'custom_forgot_pass_url' => 'URL de restablecimiento de contraseña personalizada',
- 'custom_forgot_pass_url_help' => 'Esto remplaza la URL incorporada para las contraseñas olvidadas en la pantalla de inicio, útil para dirigir a las personas a una funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Esto efectivamente desactivará la funcionalidad local de olvido de contraseña.',
+ 'custom_forgot_pass_url_help' => 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
'dashboard_message' => 'Mensaje en el tablero',
'dashboard_message_help' => 'Este texto aparecerá en el panel para cualquiera que tenga permiso de ver el Panel.',
- 'default_currency' => 'Moneda Predeterminada',
+ 'default_currency' => 'Divisa predeterminada',
'default_eula_text' => 'Acuerdo de uso predeterminado',
'default_language' => 'Idioma predeterminado',
'default_eula_help_text' => 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
@@ -54,10 +56,10 @@ return [
'display_checkout_date' => 'Mostrar fecha de asignación',
'display_eol' => 'Mostrar fin de soporte (EOL) en la vista de tabla',
'display_qr' => 'Mostrar Códigos QR',
- 'display_alt_barcode' => 'Mostrar códigos de barras en 1D',
+ 'display_alt_barcode' => 'Mostrar códigos de barras de 1D',
'email_logo' => 'Logo de correo electrónico',
- 'barcode_type' => 'Tipo de códigos de barras 2D',
- 'alt_barcode_type' => 'Tipo de códigos de barras 1D',
+ 'barcode_type' => 'Tipo de códigos de barras de 2D',
+ 'alt_barcode_type' => 'Tipo de código de barras de 1D',
'email_logo_size' => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
'enabled' => 'Habilitado',
'eula_settings' => 'Configuración de los acuerdos de uso',
diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php
index f3856be1c6..fde69335bc 100644
--- a/resources/lang/es-ES/admin/settings/message.php
+++ b/resources/lang/es-ES/admin/settings/message.php
@@ -19,11 +19,11 @@ return [
],
'purge' => [
'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ',
- 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.',
+ 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
'success' => 'Registros eliminados correctamente purgados.',
],
'mail' => [
- 'sending' => 'Enviando correo electrónico...',
+ 'sending' => 'Enviando correo electrónico de prueba...',
'success' => '¡Correo enviado!',
'error' => 'El correo no pudo ser enviado.',
'additional' => 'No se proporciona ningún mensaje de error adicional. Compruebe la configuración de su correo y el registro de errores de la aplicación.'
@@ -38,7 +38,7 @@ return [
],
'webhook' => [
'sending' => 'Enviando mensaje de prueba de :app...',
- 'success' => '¡Su Integración :webhook_name funciona!',
+ 'success' => '¡Su integración :webhook_name funciona!',
'success_pt1' => '¡Éxito! Compruebe el ',
'success_pt2' => ' para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
'500' => 'Error 500 del servidor.',
diff --git a/resources/lang/es-ES/admin/statuslabels/table.php b/resources/lang/es-ES/admin/statuslabels/table.php
index f9f487f28d..78f5a67ce6 100644
--- a/resources/lang/es-ES/admin/statuslabels/table.php
+++ b/resources/lang/es-ES/admin/statuslabels/table.php
@@ -15,5 +15,5 @@ return array(
'show_in_nav' => 'Mostrar en la barra lateral',
'title' => 'Etiquetas de estado',
'undeployable' => 'No utilizable',
- 'update' => 'Actualizar Etiqueta Estado',
+ 'update' => 'Actualizar la etiqueta de estado',
);
diff --git a/resources/lang/es-ES/admin/users/general.php b/resources/lang/es-ES/admin/users/general.php
index 0f437d2c1b..7b89307e14 100644
--- a/resources/lang/es-ES/admin/users/general.php
+++ b/resources/lang/es-ES/admin/users/general.php
@@ -7,15 +7,15 @@ return [
'bulk_update_warn' => 'Está a punto de modificar las propiedades de :user_count usuarios. Por favor, tenga en cuenta que no puede modificar las propiedades de su propio usuario con este formulario, y debe realizar las modificaciones a su propio usuario de forma individual.',
'bulk_update_help' => 'Este formulario le permite actualizar varios usuarios a la vez. Solo diligencie los campos que necesita modificar. Los campos que queden en blanco no se modificarán.',
'current_assets' => 'Activos actualmente asignados a este usuario',
- 'clone' => 'Clonar Usuario',
+ 'clone' => 'Clonar usuario',
'contact_user' => 'Contacta con :name',
- 'edit' => 'Editar Usuario',
+ 'edit' => 'Editar usuario',
'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
'history_user' => 'Historial de :name',
'info' => 'Información',
'restore_user' => 'Haga clic aquí para restaurarlos.',
'last_login' => 'Último acceso',
- 'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.',
+ 'ldap_config_text' => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
'print_assigned' => 'Imprimir todos los asignados',
'email_assigned' => 'Enviar correo con todos los asignados',
'user_notified' => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
@@ -23,13 +23,13 @@ return [
'auto_assign_help' => 'Omitir este usuario en la asignación automática de licencias',
'software_user' => 'Software asignado a :name',
'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
- 'view_user' => 'Ver Usuario :name',
+ 'view_user' => 'Ver usuario :name',
'usercsv' => 'Archivo CSV',
'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores. ',
- 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+ 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
'two_factor_active' => '2FA activo ',
- 'user_deactivated' => 'Usuario no puede iniciar sesión',
- 'user_activated' => 'Usuario puede iniciar sesión',
+ 'user_deactivated' => 'El usuario no puede iniciar sesión',
+ 'user_activated' => 'El usuario puede iniciar sesión',
'activation_status_warning' => 'No cambiar el estado de activación',
'group_memberships_helpblock' => 'Sólo los superadministradores pueden editar pertenencias a grupo.',
'superadmin_permission_warning' => 'Sólo los superadministradores pueden conceder acceso a un usuario superadministrador.',
diff --git a/resources/lang/es-ES/admin/users/message.php b/resources/lang/es-ES/admin/users/message.php
index 80d6c215d3..0c79a69073 100644
--- a/resources/lang/es-ES/admin/users/message.php
+++ b/resources/lang/es-ES/admin/users/message.php
@@ -3,10 +3,10 @@
return array(
'accepted' => 'Ha aceptado este artículo exitosamente.',
- 'declined' => 'Ha rechazado este activo con exitosamente.',
+ 'declined' => 'Ha rechazado correctamente este activo.',
'bulk_manager_warn' => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
- 'user_exists' => 'El Usuario ya existe!',
- 'user_not_found' => 'Usuario inexistente.',
+ 'user_exists' => '¡El usuario ya existe!',
+ 'user_not_found' => 'El usuario no existe o usted no tiene permisos para verlo.',
'user_login_required' => 'El campo usuario es obligatorio',
'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
'user_password_required' => 'La contraseña es obligatoria.',
@@ -36,7 +36,7 @@ return array(
'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
- 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pueden eliminar.',
+ 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP.
Error del servidor LDAP:',
'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:',
'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.',
+ 'multi_company_items_assigned' => 'Este usuario tiene elementos asignados, por favor, realice el ingreso de estos elementos antes de cambiarlo de compañía.'
),
'deletefile' => array(
diff --git a/resources/lang/es-ES/admin/users/table.php b/resources/lang/es-ES/admin/users/table.php
index b7299bb066..a1bba42e5e 100644
--- a/resources/lang/es-ES/admin/users/table.php
+++ b/resources/lang/es-ES/admin/users/table.php
@@ -3,7 +3,7 @@
return array(
'activated' => 'Activo',
'allow' => 'Permitir',
- 'checkedout' => 'Equipos',
+ 'checkedout' => 'Activos',
'created_at' => 'Creado',
'createuser' => 'Crear usuario',
'deny' => 'Denegar',
@@ -31,11 +31,11 @@ return array(
'show_deleted' => 'Mostrar usuarios eliminados',
'title' => 'Cargo',
'to_restore_them' => 'para restaurarlos.',
- 'total_assets_cost' => "Coste total de activos",
+ 'total_assets_cost' => "Costo total de activos",
'updateuser' => 'Actualizar usuario',
'username' => 'Nombre de usuario',
'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.',
'username_note' => '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)',
- 'cloneuser' => 'Clonar Usuario',
- 'viewusers' => 'Ver Usuarios',
+ 'cloneuser' => 'Clonar usuario',
+ 'viewusers' => 'Ver usuarios',
);
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 4bfdcd9ee3..bed087d66a 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'También, elimine temporalmente a estos usuarios. Su historial de activos permanecerá intacto a menos que purgue los registros eliminados en la Configuración de administración.',
'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
- 'set_to_null' => 'Eliminar valores para este activo|Eliminar valores para todos los :asset_count activos ',
+ 'set_to_null' => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
'set_users_field_to_null' => 'Eliminar valores de :field para este usuario|Eliminar valores de :field para todos los :user_count usuarios ',
'na_no_purchase_date' => 'N/A - No se proporcionó fecha de compra',
'assets_by_status' => 'Activos por estado',
@@ -492,7 +492,7 @@ return [
'checked_out_to_first_name' => 'Asignado a: Nombre',
'checked_out_to_last_name' => 'Asignado a: Apellido',
'checked_out_to_username' => 'Asignado a: Nombre de usuario',
- 'checked_out_to_email' => 'Asignado a: correo electrónico',
+ 'checked_out_to_email' => 'Asignado a: Correo electrónico',
'checked_out_to_tag' => 'Asignado a: Placa de activo',
'manager_first_name' => 'Nombre del supervisor',
'manager_last_name' => 'Apellido del supervisor',
@@ -510,7 +510,7 @@ return [
'import_note' => 'Importado usando el importador de csv',
],
'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
- 'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+ 'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
'percent_complete' => '% completo',
'uploading' => 'Subiendo... ',
'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
@@ -559,8 +559,8 @@ return [
'expires' => 'Vence',
'map_fields'=> 'Asociar campos para :item_type',
'remaining_var' => ':count restantes',
- 'assets_in_var' => 'Activos en :name :type',
'label' => '',
'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+ 'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
];
diff --git a/resources/lang/es-ES/localizations.php b/resources/lang/es-ES/localizations.php
index 03c489ced2..e83e0fce47 100644
--- a/resources/lang/es-ES/localizations.php
+++ b/resources/lang/es-ES/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Seleccionar un idioma',
+ 'select_language' => 'Seleccione un idioma',
'languages' => [
'en-US'=> 'Inglés, EEUU',
'en-GB'=> 'Inglés, Reino Unido',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulú',
],
- 'select_country' => 'Seleccionar un país',
+ 'select_country' => 'Seleccione un país',
'countries' => [
'AC'=>'Isla de Ascensión',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egipto',
+ 'GB-ENG'=>'Inglaterra',
'ER'=>'Eritrea',
'ES'=>'España',
'ET'=>'Etiopía',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Países Bajos',
+ 'GB-NIR' => 'Irlanda del Norte',
'NO'=>'Noruega',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federación Rusa',
'RW'=>'Ruanda',
'SA'=>'Arabia Saudita',
- 'UK'=>'Escocia',
+ 'GB-SCT'=>'Escocia',
'SB'=>'Islas Salomón',
'SC'=>'Seychelles',
'SS'=>'Sudán del Sur',
@@ -312,6 +314,7 @@ return [
'VI'=>'Islas Vírgenes (EE. UU.)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Gales',
'WF'=>'Islas Wallis y Futuna',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/es-ES/mail.php b/resources/lang/es-ES/mail.php
index e8e2365497..0b67799b4e 100644
--- a/resources/lang/es-ES/mail.php
+++ b/resources/lang/es-ES/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
- 'accessory_name' => 'Nombre de accesorio:',
- 'additional_notes' => 'Notas adicionales:',
+ 'accessory_name' => 'Nombre de accesorio',
+ 'additional_notes' => 'Notas adicionales',
'admin_has_created' => 'Un administrador ha creado una cuenta para ti en la web :web.',
- 'asset' => 'Activo:',
- 'asset_name' => 'Nombre del activo:',
+ 'asset' => 'Activo',
+ 'asset_name' => 'Nombre del activo',
'asset_requested' => 'Activo solicitado',
'asset_tag' => 'Placa del activo',
'assets_warrantee_alert' => 'Hay :count activo con una garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
'assigned_to' => 'Asignado a',
'best_regards' => 'Cordialmente,',
- 'canceled' => 'Cancelado:',
- 'checkin_date' => 'Fecha de devolución:',
- 'checkout_date' => 'Fecha de asignación:',
+ 'canceled' => 'Cancelado',
+ 'checkin_date' => 'Fecha de ingreso',
+ 'checkout_date' => 'Fecha de asignación',
'checkedout_from' => 'Asignado desde',
'checkedin_from' => 'Devuelto desde',
'checked_into' => 'Devuelto en',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
'current_QTY' => 'Cantidad actual',
'days' => 'Días',
- 'expecting_checkin_date' => 'Fecha esperada de devolución:',
+ 'expecting_checkin_date' => 'Fecha esperada de devolución',
'expires' => 'Vence',
'hello' => 'Hola',
'hi' => 'Hola',
'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
'inventory_report' => 'Informe de inventario',
- 'item' => 'Elemento:',
+ 'item' => 'Elemento',
'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar contraseña de :web :',
@@ -66,11 +66,11 @@ return [
'name' => 'Nombre',
'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
'notes' => 'Notas',
- 'password' => 'Contraseña:',
+ 'password' => 'Contraseña',
'password_reset' => 'Reiniciar la contraseña',
'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
- 'requested' => 'Solicitado:',
+ 'requested' => 'Solicitado',
'reset_link' => 'Su enlace de restablecimiento de contraseña',
'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
'rights_reserved' => 'Todos los derechos reservados.',
diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php
index eacfdb039c..e2aeab8161 100644
--- a/resources/lang/es-ES/validation.php
+++ b/resources/lang/es-ES/validation.php
@@ -157,7 +157,7 @@ return [
'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
'string' => 'El atributo: debe ser una cadena.',
'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
- 'unique_undeleted' => 'El :atrribute debe ser único.',
+ 'unique_undeleted' => 'El :attribute debe ser único.',
'non_circular' => ':attribute no debe crear una referencia circular.',
'not_array' => ':attribute no puede ser una matriz.',
'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
diff --git a/resources/lang/es-MX/admin/custom_fields/general.php b/resources/lang/es-MX/admin/custom_fields/general.php
index b8c1f15330..b9fd8573fb 100644
--- a/resources/lang/es-MX/admin/custom_fields/general.php
+++ b/resources/lang/es-MX/admin/custom_fields/general.php
@@ -37,7 +37,7 @@ return [
'show_in_email' => '¿Incluir el campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
'show_in_email_short' => 'Incluye en correos electrónicos.',
'help_text' => 'Texto de ayuda',
- 'help_text_description' => 'Esto es un texto opcional que se mostrará debajo de los elementos del formulario cuando se este editando un activo para proporcionar contexto adicional del campo.',
+ 'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
'about_custom_fields_title' => 'Acerca de los Campos Personalizados',
'about_custom_fields_text' => 'Los campos personalizados te permiten agregar atributos arbritarios a los activos.',
'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
diff --git a/resources/lang/es-MX/admin/depreciations/general.php b/resources/lang/es-MX/admin/depreciations/general.php
index 1df875daaf..78e3c260ab 100644
--- a/resources/lang/es-MX/admin/depreciations/general.php
+++ b/resources/lang/es-MX/admin/depreciations/general.php
@@ -8,7 +8,7 @@ return [
'depreciation_name' => 'Nombre amortización',
'depreciation_min' => 'Valor mínimo de depreciación',
'number_of_months' => 'Número de meses',
- 'update' => 'Actualizar Amortización',
+ 'update' => 'Actualizar amortización',
'depreciation_min' => 'Valor mínimo después de depreciado',
'no_depreciations_warning' => 'Advertencia:
No tiene ninguna depreciación configurada.
diff --git a/resources/lang/es-MX/admin/depreciations/message.php b/resources/lang/es-MX/admin/depreciations/message.php
index 6532eb38e3..b57b54c800 100644
--- a/resources/lang/es-MX/admin/depreciations/message.php
+++ b/resources/lang/es-MX/admin/depreciations/message.php
@@ -2,7 +2,7 @@
return array(
- 'does_not_exist' => 'Clase de amortización inexistente.',
+ 'does_not_exist' => 'La clase de depreciación no existe.',
'assoc_users' => 'Esta depreciación está actualmente asociada con uno o más modelos y no puede ser eliminada. Por favor, elimine los modelos y luego intente borrarlas de nuevo. ',
diff --git a/resources/lang/es-MX/admin/depreciations/table.php b/resources/lang/es-MX/admin/depreciations/table.php
index b303c8e502..ee803b42fd 100644
--- a/resources/lang/es-MX/admin/depreciations/table.php
+++ b/resources/lang/es-MX/admin/depreciations/table.php
@@ -6,7 +6,6 @@ return [
'months' => 'Meses',
'term' => 'Termina',
'title' => 'Nombre ',
- 'depreciation_min' => 'Key: array[\'depreciacion_min\']
-array[\'depreciacion_min\']',
+ 'depreciation_min' => 'Valor mínimo',
];
diff --git a/resources/lang/es-MX/admin/hardware/form.php b/resources/lang/es-MX/admin/hardware/form.php
index 85879521d6..d594df3b34 100644
--- a/resources/lang/es-MX/admin/hardware/form.php
+++ b/resources/lang/es-MX/admin/hardware/form.php
@@ -23,7 +23,7 @@ return [
'depreciation' => 'Depreciación',
'depreciates_on' => 'Se deprecia en',
'default_location' => 'Ubicación predeterminada',
- 'default_location_phone' => 'Teléfono de ubicación por defecto',
+ 'default_location_phone' => 'Teléfono de ubicación predeterminada',
'eol_date' => 'Fecha fin de soporte (EOL)',
'eol_rate' => 'Tasa fin de soporte (EOL)',
'expected_checkin' => 'Fecha esperada de devolución',
diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php
index de8689309c..52e1cbe7a6 100644
--- a/resources/lang/es-MX/admin/hardware/general.php
+++ b/resources/lang/es-MX/admin/hardware/general.php
@@ -36,7 +36,7 @@ return [
'error_messages' => 'Mensajes de error:',
'success_messages' => 'Mensajes de éxito:',
'alert_details' => 'Por favor, vea abajo para más detalles.',
- 'custom_export' => 'Exportación personalizada',
+ 'custom_export' => 'Personalizar exportación',
'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
- 'user_department' => 'Departamento',
+ 'user_department' => 'Departamento del usuario',
];
diff --git a/resources/lang/es-MX/admin/hardware/message.php b/resources/lang/es-MX/admin/hardware/message.php
index 42e2e9f3ad..b8084131dc 100644
--- a/resources/lang/es-MX/admin/hardware/message.php
+++ b/resources/lang/es-MX/admin/hardware/message.php
@@ -7,28 +7,28 @@ return [
'does_not_exist_var'=> 'Activo con placa :asset_tag no encontrado.',
'no_tag' => 'No se ha proporcionado ninguna placa de activo.',
'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
- 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero compruebe el activo y vuelva a intentarlo. ',
+ 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
'warning_audit_date_mismatch' => 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
'create' => [
'error' => 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
- 'success' => 'Equipo creado. :)',
+ 'success' => 'Activo creado con éxito. :)',
'success_linked' => 'Activo con placa :tag creado con éxito. Haga clic aquí para ver.',
],
'update' => [
'error' => 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
- 'success' => 'Equipo actualizado.',
+ 'success' => 'Equipo actualizado correctamente.',
'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
- 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
+ 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
'no_assets_selected' => 'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
'error' => 'El activo no fue restaurado, por favor inténtelo nuevamente',
- 'success' => 'Equipo restaurado correctamente.',
- 'bulk_success' => 'Activo restaurado con éxito.',
+ 'success' => 'Activo restaurado exitosamente.',
+ 'bulk_success' => 'Activo restaurado exitosamente.',
'nothing_updated' => 'No se seleccionaron activos, por lo que no se restauró nada.',
],
@@ -60,7 +60,7 @@ return [
'file_missing' => 'Falta el archivo seleccionado',
'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
'header_row_has_malformed_characters' => 'Uno o más atributos de la fila de encabezado contiene caracteres UTF-8 mal formados',
- 'content_row_has_malformed_characters' => 'Uno o más atributos de la fila de encabezado contiene caracteres UTF-8 mal formados',
+ 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
],
diff --git a/resources/lang/es-MX/admin/hardware/table.php b/resources/lang/es-MX/admin/hardware/table.php
index a68a3de87c..da38ffff0a 100644
--- a/resources/lang/es-MX/admin/hardware/table.php
+++ b/resources/lang/es-MX/admin/hardware/table.php
@@ -5,7 +5,7 @@ return [
'asset_tag' => 'Placa del activo',
'asset_model' => 'Modelo',
'assigned_to' => 'Asignado a',
- 'book_value' => 'Valor Actual',
+ 'book_value' => 'Valor actual',
'change' => 'Operación',
'checkout_date' => 'Fecha de asignación',
'checkoutto' => 'Asignado a',
@@ -24,7 +24,7 @@ return [
'title' => 'Activo ',
'image' => 'Imagen de dispositivo',
'days_without_acceptance' => 'Días sin aceptación',
- 'monthly_depreciation' => 'Depreciación Mensual',
+ 'monthly_depreciation' => 'Depreciación mensual',
'assigned_to' => 'Asignado a',
'requesting_user' => 'Usuario Solicitante',
'requested_date' => 'Fecha solicitada',
diff --git a/resources/lang/es-MX/admin/locations/message.php b/resources/lang/es-MX/admin/locations/message.php
index 67a85e4d29..455c5833ec 100644
--- a/resources/lang/es-MX/admin/locations/message.php
+++ b/resources/lang/es-MX/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'La ubicación no existe.',
- 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o un usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor actualice sus modelos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
+ 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo. ',
'assoc_assets' => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assoc_child_loc' => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada. Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assigned_assets' => 'Activos asignados',
diff --git a/resources/lang/es-MX/admin/models/message.php b/resources/lang/es-MX/admin/models/message.php
index 4bbc09023b..9370ef2a54 100644
--- a/resources/lang/es-MX/admin/models/message.php
+++ b/resources/lang/es-MX/admin/models/message.php
@@ -5,7 +5,7 @@ return array(
'deleted' => 'Se eliminó el modelo del activo',
'does_not_exist' => 'Modelo inexistente.',
'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
- 'no_association_fix' => 'Esto causará problemas raros y horribles. Edita este activo para asignarlo a un modelo.',
+ 'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
'assoc_users' => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
@@ -17,18 +17,18 @@ return array(
'update' => array(
'error' => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
- 'success' => 'Modelo actualizado.',
+ 'success' => 'El modelo fue actualizado exitosamente.',
),
'delete' => array(
'confirm' => '¿Está seguro de que desea eliminar este modelo de activo?',
'error' => 'Hubo un problema eliminando el modelo. Por favor, inténtelo de nuevo.',
- 'success' => 'Modelo eliminado.'
+ 'success' => 'El modelo fue eliminado exitosamente.'
),
'restore' => array(
'error' => 'El modelo no fue restaurado, por favor intente nuevamente',
- 'success' => 'Modelo restaurado exitosamente.'
+ 'success' => 'El modelo fue restaurado exitosamente.'
),
'bulkedit' => array(
diff --git a/resources/lang/es-MX/admin/models/table.php b/resources/lang/es-MX/admin/models/table.php
index 12e3078e86..312944b9cd 100644
--- a/resources/lang/es-MX/admin/models/table.php
+++ b/resources/lang/es-MX/admin/models/table.php
@@ -12,6 +12,6 @@ return array(
'update' => 'Actualizar modelo de activo',
'view' => 'Ver modelo de activo',
'update' => 'Actualizar modelo de activo',
- 'clone' => 'Clonar Modelo',
- 'edit' => 'Editar Modelo',
+ 'clone' => 'Clonar modelo',
+ 'edit' => 'Editar modelo',
);
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index 9e5e8d30d1..51a4c08cfe 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -15,37 +15,39 @@ return [
'alert_title' => 'Actualizar ajustes de notificación',
'alert_email' => 'Enviar alertas a',
'alert_email_help' => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas',
- 'alerts_enabled' => 'Alertas habilitadas',
- 'alert_interval' => 'Limite de alertas de expiración (en días)',
- 'alert_inv_threshold' => 'Umbral de alerta del inventario',
+ 'alerts_enabled' => 'Alertas de correo electrónico habilitadas',
+ 'alert_interval' => 'Umbral para las alertas de caducidad (en días)',
+ 'alert_inv_threshold' => 'Umbral para alerta de inventario',
'allow_user_skin' => 'Permitir al usuario cambiar la apariencia',
'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
'asset_ids' => 'Códigos de los activos',
'audit_interval' => 'Intervalo de auditoría',
'audit_interval_help' => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
- 'audit_warning_days' => 'Umbral de advertencia de auditoría',
+ 'audit_warning_days' => 'Umbral para aviso de auditoría',
'audit_warning_days_help' => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
- 'auto_increment_assets' => 'Generar placas de activos autoincrementables',
+ 'auto_increment_assets' => 'Generar incremento automático en las placas de activos',
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
'backups' => 'Copias de seguridad',
'backups_help' => 'Crear, descargar y restaurar copias de seguridad ',
'backups_restoring' => 'Restaurando desde la copia de seguridad',
+ 'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+ 'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
'backups_upload' => 'Cargar copia de seguridad',
'backups_path' => 'Las copias de seguridad en el servidor se almacenan en :path',
'backups_restore_warning' => 'Utilice el botón de restauración para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker).
Su base de datos completa de :app_name y cualquier archivo cargado será completamente reemplazado por lo que hay en la copia de seguridad. ',
'backups_logged_out' => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
'backups_large' => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
- 'barcode_settings' => 'Configuración de Código de Barras',
+ 'barcode_settings' => 'Configuración del código de barras',
'confirm_purge' => 'Confirmar la purga',
'confirm_purge_help' => 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
'custom_css' => 'CSS Personalizado',
'custom_css_help' => 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas <style></style>.',
'custom_forgot_pass_url' => 'URL de restablecimiento de contraseña personalizada',
- 'custom_forgot_pass_url_help' => 'Esto remplaza la URL incorporada para las contraseñas olvidadas en la pantalla de inicio, útil para dirigir a las personas a una funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Esto efectivamente desactivará la funcionalidad local de olvido de contraseña.',
+ 'custom_forgot_pass_url_help' => 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
'dashboard_message' => 'Mensaje en el tablero',
'dashboard_message_help' => 'Este texto aparecerá en el panel para cualquiera que tenga permiso de ver el Panel.',
- 'default_currency' => 'Moneda Predeterminada',
+ 'default_currency' => 'Divisa predeterminada',
'default_eula_text' => 'Acuerdo de uso predeterminado',
'default_language' => 'Idioma predeterminado',
'default_eula_help_text' => 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
@@ -54,10 +56,10 @@ return [
'display_checkout_date' => 'Mostrar fecha de asignación',
'display_eol' => 'Mostrar fin de soporte (EOL) en la vista de tabla',
'display_qr' => 'Mostrar Códigos QR',
- 'display_alt_barcode' => 'Mostrar códigos de barras en 1D',
+ 'display_alt_barcode' => 'Mostrar códigos de barras de 1D',
'email_logo' => 'Logo de correo electrónico',
- 'barcode_type' => 'Tipo de códigos de barras 2D',
- 'alt_barcode_type' => 'Tipo de códigos de barras 1D',
+ 'barcode_type' => 'Tipo de código de barras de 2D',
+ 'alt_barcode_type' => 'Tipo de código de barras de 1D',
'email_logo_size' => 'Los logotipos cuadrados se ven mejor en correo electrónico. ',
'enabled' => 'Habilitado',
'eula_settings' => 'Configuración de los acuerdos de uso',
diff --git a/resources/lang/es-MX/admin/settings/message.php b/resources/lang/es-MX/admin/settings/message.php
index 4bb4f0e790..a4ed5797d4 100644
--- a/resources/lang/es-MX/admin/settings/message.php
+++ b/resources/lang/es-MX/admin/settings/message.php
@@ -19,7 +19,7 @@ return [
],
'purge' => [
'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ',
- 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.',
+ 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
'success' => 'Registros eliminados correctamente purgados.',
],
'mail' => [
@@ -38,7 +38,7 @@ return [
],
'webhook' => [
'sending' => 'Enviando mensaje de prueba a :app...',
- 'success' => '¡Su Integración :webhook_name funciona!',
+ 'success' => '¡Su integración :webhook_name funciona!',
'success_pt1' => '¡Éxito! Compruebe el ',
'success_pt2' => ' canal para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
'500' => 'Error 500 del servidor.',
diff --git a/resources/lang/es-MX/admin/statuslabels/table.php b/resources/lang/es-MX/admin/statuslabels/table.php
index f9f487f28d..78f5a67ce6 100644
--- a/resources/lang/es-MX/admin/statuslabels/table.php
+++ b/resources/lang/es-MX/admin/statuslabels/table.php
@@ -15,5 +15,5 @@ return array(
'show_in_nav' => 'Mostrar en la barra lateral',
'title' => 'Etiquetas de estado',
'undeployable' => 'No utilizable',
- 'update' => 'Actualizar Etiqueta Estado',
+ 'update' => 'Actualizar la etiqueta de estado',
);
diff --git a/resources/lang/es-MX/admin/users/general.php b/resources/lang/es-MX/admin/users/general.php
index ff0211df1d..56c81d1f96 100644
--- a/resources/lang/es-MX/admin/users/general.php
+++ b/resources/lang/es-MX/admin/users/general.php
@@ -7,15 +7,15 @@ return [
'bulk_update_warn' => 'Está a punto de modificar las propiedades de :user_count usuarios. Por favor, tenga en cuenta que no puede modificar las propiedades de su propio usuario con este formulario, y debe realizar las modificaciones a su propio usuario de forma individual.',
'bulk_update_help' => 'Este formulario le permite actualizar varios usuarios a la vez. Solo diligencie los campos que necesita modificar. Los campos que queden en blanco no se modificarán.',
'current_assets' => 'Activos actualmente asignados a este usuario',
- 'clone' => 'Clonar Usuario',
+ 'clone' => 'Clonar usuario',
'contact_user' => 'Contacta con :name',
- 'edit' => 'Editar Usuario',
+ 'edit' => 'Editar usuario',
'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
'history_user' => 'Historial de :name',
'info' => 'Información',
'restore_user' => 'Haga clic aquí para restaurarlos.',
'last_login' => 'Último acceso',
- 'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.',
+ 'ldap_config_text' => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
'print_assigned' => 'Imprimir todos los asignados',
'email_assigned' => 'Enviar correo con todos los asignados',
'user_notified' => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
@@ -23,7 +23,7 @@ return [
'auto_assign_help' => 'Omitir este usuario en la asignación automática de licencias',
'software_user' => 'Software asignado a :name',
'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
- 'view_user' => 'Ver Usuario :name',
+ 'view_user' => 'Ver usuario :name',
'usercsv' => 'Archivo CSV',
'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores. ',
'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
diff --git a/resources/lang/es-MX/admin/users/message.php b/resources/lang/es-MX/admin/users/message.php
index 851958d7a8..5a61f1ca26 100644
--- a/resources/lang/es-MX/admin/users/message.php
+++ b/resources/lang/es-MX/admin/users/message.php
@@ -3,10 +3,10 @@
return array(
'accepted' => 'Ha aceptado este artículo exitosamente.',
- 'declined' => 'Ha rechazado este activo con exitosamente.',
+ 'declined' => 'Ha rechazado correctamente este activo.',
'bulk_manager_warn' => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
- 'user_exists' => 'El Usuario ya existe!',
- 'user_not_found' => 'El usuario no existe.',
+ 'user_exists' => '¡El usuario ya existe!',
+ 'user_not_found' => 'El usuario no existe o usted no tiene permisos para verlo.',
'user_login_required' => 'El campo usuario es obligatorio',
'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
'user_password_required' => 'La contraseña es obligatoria.',
@@ -36,7 +36,7 @@ return array(
'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
- 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pueden eliminar.',
+ 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP.
Error del servidor LDAP:',
'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:',
'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.',
+ 'multi_company_items_assigned' => 'Este usuario tiene elementos asignados, por favor, realice el ingreso de estos elementos antes de cambiarlo de compañía.'
),
'deletefile' => array(
diff --git a/resources/lang/es-MX/admin/users/table.php b/resources/lang/es-MX/admin/users/table.php
index b7299bb066..a1bba42e5e 100644
--- a/resources/lang/es-MX/admin/users/table.php
+++ b/resources/lang/es-MX/admin/users/table.php
@@ -3,7 +3,7 @@
return array(
'activated' => 'Activo',
'allow' => 'Permitir',
- 'checkedout' => 'Equipos',
+ 'checkedout' => 'Activos',
'created_at' => 'Creado',
'createuser' => 'Crear usuario',
'deny' => 'Denegar',
@@ -31,11 +31,11 @@ return array(
'show_deleted' => 'Mostrar usuarios eliminados',
'title' => 'Cargo',
'to_restore_them' => 'para restaurarlos.',
- 'total_assets_cost' => "Coste total de activos",
+ 'total_assets_cost' => "Costo total de activos",
'updateuser' => 'Actualizar usuario',
'username' => 'Nombre de usuario',
'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.',
'username_note' => '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)',
- 'cloneuser' => 'Clonar Usuario',
- 'viewusers' => 'Ver Usuarios',
+ 'cloneuser' => 'Clonar usuario',
+ 'viewusers' => 'Ver usuarios',
);
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index b80745261e..e26ac44355 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'También eliminar parcialmente estos usuarios. Su historial de activos permanecerá intacto a menos/hasta que purgue los registros borrados en los Configuración de administración.',
'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
- 'set_to_null' => 'Eliminar valores para este activo|Eliminar valores para los :asset_count activos ',
+ 'set_to_null' => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
'set_users_field_to_null' => 'Eliminar valores de :field para este usuario|Eliminar valores de :field para todos los :user_count usuarios ',
'na_no_purchase_date' => 'N/A - No se proporcionó fecha de compra',
'assets_by_status' => 'Activos por estado',
@@ -482,7 +482,7 @@ return [
'cannot_be_deleted' => 'Este elemento no puede ser eliminado',
'cannot_be_edited' => 'Este elemento no puede ser editado.',
'undeployable_tooltip' => 'Este elemento no puede ser asignado. Compruebe la cantidad restante.',
- 'serial_number' => 'Número serie',
+ 'serial_number' => 'Número de serie',
'item_notes' => ':item Notas',
'item_name_var' => ':item Nombre',
'error_user_company' => 'La compañía destino de la asignación y la compañía del activo no coinciden',
@@ -492,7 +492,7 @@ return [
'checked_out_to_first_name' => 'Asignado a: Nombre',
'checked_out_to_last_name' => 'Asignado a: Apellido',
'checked_out_to_username' => 'Asignado a: Nombre de usuario',
- 'checked_out_to_email' => 'Asignado a: correo electrónico',
+ 'checked_out_to_email' => 'Asignado a: Correo electrónico',
'checked_out_to_tag' => 'Asignado a: Placa de activo',
'manager_first_name' => 'Nombre del supervisor',
'manager_last_name' => 'Apellido del supervisor',
@@ -510,7 +510,7 @@ return [
'import_note' => 'Importado usando el importador de csv',
],
'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
- 'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+ 'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
'percent_complete' => '% completo',
'uploading' => 'Subiendo... ',
'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
@@ -559,8 +559,8 @@ return [
'expires' => 'Vence',
'map_fields'=> 'Asociar campos para :item_type',
'remaining_var' => ':count restantes',
- 'assets_in_var' => 'Activos en :name :type',
'label' => 'Etiqueta',
'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+ 'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
];
diff --git a/resources/lang/es-MX/localizations.php b/resources/lang/es-MX/localizations.php
index 7a5987bf91..2c5b02ca8a 100644
--- a/resources/lang/es-MX/localizations.php
+++ b/resources/lang/es-MX/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Seleccionar un idioma',
+ 'select_language' => 'Seleccione un idioma',
'languages' => [
'en-US'=> 'Inglés, EEUU',
'en-GB'=> 'Inglés, Reino Unido',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulú',
],
- 'select_country' => 'Seleccionar un país',
+ 'select_country' => 'Seleccione un país',
'countries' => [
'AC'=>'Isla de Ascensión',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egipto',
+ 'GB-ENG'=>'Inglaterra',
'ER'=>'Eritrea',
'ES'=>'España',
'ET'=>'Etiopía',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Países Bajos',
+ 'GB-NIR' => 'Irlanda del Norte',
'NO'=>'Noruega',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federación Rusa',
'RW'=>'Ruanda',
'SA'=>'Arabia Saudita',
- 'UK'=>'Escocia',
+ 'GB-SCT'=>'Escocia',
'SB'=>'Islas Salomón',
'SC'=>'Seychelles',
'SS'=>'Sudán del Sur',
@@ -312,6 +314,7 @@ return [
'VI'=>'Islas Vírgenes de los Estados Unidos',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Gales',
'WF'=>'Islas Wallis y Futuna',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/es-MX/mail.php b/resources/lang/es-MX/mail.php
index 74066ef97d..c3e99c6e27 100644
--- a/resources/lang/es-MX/mail.php
+++ b/resources/lang/es-MX/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
- 'accessory_name' => 'Nombre de accesorio:',
- 'additional_notes' => 'Notas adicionales:',
+ 'accessory_name' => 'Nombre de accesorio',
+ 'additional_notes' => 'Notas adicionales',
'admin_has_created' => 'Un administrador ha creado una cuenta para ti en la web :web.',
- 'asset' => 'Activo:',
- 'asset_name' => 'Nombre del activo:',
+ 'asset' => 'Activo',
+ 'asset_name' => 'Nombre del activo',
'asset_requested' => 'Activo solicitado',
'asset_tag' => 'Placa del activo',
'assets_warrantee_alert' => 'Hay :count activo con su garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
'assigned_to' => 'Asignado a',
'best_regards' => 'Cordialmente,',
- 'canceled' => 'Cancelado:',
- 'checkin_date' => 'Fecha de devolución:',
- 'checkout_date' => 'Fecha de asignación:',
+ 'canceled' => 'Cancelado',
+ 'checkin_date' => 'Fecha de ingreso',
+ 'checkout_date' => 'Fecha de asignación',
'checkedout_from' => 'Asignado desde',
'checkedin_from' => 'Devuelto desde',
'checked_into' => 'Devuelto en',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
'current_QTY' => 'Cantidad actual',
'days' => 'Días',
- 'expecting_checkin_date' => 'Fecha esperada de devolución:',
+ 'expecting_checkin_date' => 'Fecha esperada de devolución',
'expires' => 'Vence',
'hello' => 'Hola',
'hi' => 'Hola',
'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
'inventory_report' => 'Reporte de Inventario',
- 'item' => 'Elemento:',
+ 'item' => 'Elemento',
'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar contraseña de :web :',
@@ -66,11 +66,11 @@ return [
'name' => 'Nombre',
'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
'notes' => 'Notas',
- 'password' => 'Contraseña:',
+ 'password' => 'Contraseña',
'password_reset' => 'Reiniciar la contraseña',
'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
'read_the_terms_and_click' => 'Por favor, lea los términos de uso a continuación, y haga clic en el enlace en la parte inferior para confirmar que usted lee y acepta las condiciones de uso, y han recibido el activo.',
- 'requested' => 'Solicitado:',
+ 'requested' => 'Solicitado',
'reset_link' => 'Su enlace de restablecimiento de contraseña',
'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
'rights_reserved' => 'Todos los derechos reservados.',
diff --git a/resources/lang/es-MX/validation.php b/resources/lang/es-MX/validation.php
index a153b545fd..813772f033 100644
--- a/resources/lang/es-MX/validation.php
+++ b/resources/lang/es-MX/validation.php
@@ -157,7 +157,7 @@ return [
'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
'string' => 'El atributo: debe ser una cadena.',
'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
- 'unique_undeleted' => 'El :atrribute debe ser único.',
+ 'unique_undeleted' => 'El :attribute debe ser único.',
'non_circular' => ':attribute no debe crear una referencia circular.',
'not_array' => ':attribute no puede ser una matriz.',
'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
diff --git a/resources/lang/es-VE/admin/custom_fields/general.php b/resources/lang/es-VE/admin/custom_fields/general.php
index 9ea814cc54..b2ddf6af06 100644
--- a/resources/lang/es-VE/admin/custom_fields/general.php
+++ b/resources/lang/es-VE/admin/custom_fields/general.php
@@ -37,7 +37,7 @@ return [
'show_in_email' => '¿Incluir el campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
'show_in_email_short' => 'Incluye en correos electrónicos.',
'help_text' => 'Texto de Ayuda',
- 'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los elementos del formulario al editar un activo para proporcionar contexto en el campo.',
+ 'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
'about_custom_fields_title' => 'Acerca de campos personalizados',
'about_custom_fields_text' => 'Los campos personalizados le permiten agregar atributos arbitrarios a los activos.',
'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
diff --git a/resources/lang/es-VE/admin/depreciations/general.php b/resources/lang/es-VE/admin/depreciations/general.php
index 14a75fb14f..b5f39b4440 100644
--- a/resources/lang/es-VE/admin/depreciations/general.php
+++ b/resources/lang/es-VE/admin/depreciations/general.php
@@ -6,9 +6,9 @@ return [
'asset_depreciations' => 'Depreciación de activos',
'create' => 'Crear depreciación',
'depreciation_name' => 'Nombre de depreciación',
- 'depreciation_min' => 'Valor del piso de la depreciación',
+ 'depreciation_min' => 'Valor mínimo de depreciación',
'number_of_months' => 'Número de meses',
- 'update' => 'Actualizar Depreciación',
+ 'update' => 'Actualizar depreciación',
'depreciation_min' => 'Valor mínimo después de la depreciación',
'no_depreciations_warning' => 'Advertencia:
No tiene ninguna depreciación configurada.
diff --git a/resources/lang/es-VE/admin/depreciations/table.php b/resources/lang/es-VE/admin/depreciations/table.php
index dccade4a9b..e057c715db 100644
--- a/resources/lang/es-VE/admin/depreciations/table.php
+++ b/resources/lang/es-VE/admin/depreciations/table.php
@@ -2,10 +2,10 @@
return [
- 'id' => 'Identificación',
+ 'id' => 'ID',
'months' => 'Meses',
'term' => 'Duración',
'title' => 'Nombre ',
- 'depreciation_min' => 'Valor del piso',
+ 'depreciation_min' => 'Valor mínimo',
];
diff --git a/resources/lang/es-VE/admin/hardware/form.php b/resources/lang/es-VE/admin/hardware/form.php
index 66c196d8ff..bf127fc985 100644
--- a/resources/lang/es-VE/admin/hardware/form.php
+++ b/resources/lang/es-VE/admin/hardware/form.php
@@ -21,14 +21,14 @@ return [
'create' => 'Crear activo',
'date' => 'Fecha de compra',
'depreciation' => 'Depreciación',
- 'depreciates_on' => 'Se Deprecia En',
+ 'depreciates_on' => 'Se deprecia en',
'default_location' => 'Ubicación predeterminada',
- 'default_location_phone' => 'Teléfono de ubicación por defecto',
+ 'default_location_phone' => 'Teléfono de ubicación predeterminada',
'eol_date' => 'Fecha fin de soporte (EOL)',
'eol_rate' => 'Tasa fin de soporte (EOL)',
'expected_checkin' => 'Fecha esperada de devolución',
'expires' => 'Vence',
- 'fully_depreciated' => 'Completamente Depreciado',
+ 'fully_depreciated' => 'Completamente depreciado',
'help_checkout' => 'Si desea asignar este equipo inmediatamente, seleccione "Listo para asignar" de la lista de estados de arriba. ',
'mac_address' => 'Dirección MAC',
'manufacturer' => 'Fabricante',
diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php
index 4a48f4692e..6b6077cfee 100644
--- a/resources/lang/es-VE/admin/hardware/general.php
+++ b/resources/lang/es-VE/admin/hardware/general.php
@@ -38,5 +38,5 @@ return [
'alert_details' => 'Por favor vea abajo para más detalles.',
'custom_export' => 'Personalizar exportación',
'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
- 'user_department' => 'Departamento de Usuario',
+ 'user_department' => 'Departamento del usuario',
];
diff --git a/resources/lang/es-VE/admin/hardware/message.php b/resources/lang/es-VE/admin/hardware/message.php
index 170de20f0d..b6be69b03a 100644
--- a/resources/lang/es-VE/admin/hardware/message.php
+++ b/resources/lang/es-VE/admin/hardware/message.php
@@ -7,7 +7,7 @@ return [
'does_not_exist_var'=> 'Activo con placa :asset_tag no encontrado.',
'no_tag' => 'No se ha proporcionado ninguna placa de activo.',
'does_not_exist_or_not_requestable' => 'Ese activo no existe o no es solicitable.',
- 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero devuelva o recupere el activo y vuelva a intentarlo. ',
+ 'assoc_users' => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
'warning_audit_date_mismatch' => 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
'create' => [
@@ -18,17 +18,17 @@ return [
'update' => [
'error' => 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
- 'success' => 'Activo actualizado con éxito.',
+ 'success' => 'Equipo actualizado correctamente.',
'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
- 'nothing_updated' => 'Ningún campo fue seleccionado, así que nada se actualizó.',
+ 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
'no_assets_selected' => 'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
'error' => 'El activo no fue restaurado, por favor inténtelo nuevamente',
- 'success' => 'Activo restaurado correctamente.',
- 'bulk_success' => 'Activo restaurado correctamente.',
+ 'success' => 'Activo restaurado exitosamente.',
+ 'bulk_success' => 'Activo restaurado exitosamente.',
'nothing_updated' => 'No se seleccionaron activos, por lo que no se restauró nada.',
],
@@ -40,7 +40,7 @@ return [
'deletefile' => [
'error' => 'Archivo no eliminado. Por favor inténtelo nuevamente.',
- 'success' => 'Archivo borrado con éxito.',
+ 'success' => 'Archivo eliminado correctamente.',
],
'upload' => [
@@ -60,7 +60,7 @@ return [
'file_missing' => 'Falta el archivo seleccionado',
'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
'header_row_has_malformed_characters' => 'Uno o más atributos en la fila del encabezado contienen caracteres UTF-8 mal formados',
- 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila de contenido contienen caracteres UTF-8 mal formados',
+ 'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
],
diff --git a/resources/lang/es-VE/admin/hardware/table.php b/resources/lang/es-VE/admin/hardware/table.php
index 270064451a..e9c9e25d7a 100644
--- a/resources/lang/es-VE/admin/hardware/table.php
+++ b/resources/lang/es-VE/admin/hardware/table.php
@@ -26,7 +26,7 @@ return [
'days_without_acceptance' => 'Días sin aceptación',
'monthly_depreciation' => 'Depreciación mensual',
'assigned_to' => 'Asignado a',
- 'requesting_user' => 'Solicitando usuario',
+ 'requesting_user' => 'Usuario solicitante',
'requested_date' => 'Fecha solicitada',
'changed' => 'Cambios',
'icon' => 'Icono',
diff --git a/resources/lang/es-VE/admin/locations/message.php b/resources/lang/es-VE/admin/locations/message.php
index cbdef563d2..62bd2bb241 100644
--- a/resources/lang/es-VE/admin/locations/message.php
+++ b/resources/lang/es-VE/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'La localización no existe.',
- 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o un usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor actualice sus modelos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
+ 'assoc_users' => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo. ',
'assoc_assets' => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assoc_child_loc' => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada. Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
'assigned_assets' => 'Activos asignados',
diff --git a/resources/lang/es-VE/admin/models/message.php b/resources/lang/es-VE/admin/models/message.php
index a9cfe39e8d..e1676ce356 100644
--- a/resources/lang/es-VE/admin/models/message.php
+++ b/resources/lang/es-VE/admin/models/message.php
@@ -5,7 +5,7 @@ return array(
'deleted' => 'Se eliminó el modelo del activo',
'does_not_exist' => 'El modelo no existe.',
'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
- 'no_association_fix' => 'Esto romperá cosas de formas extrañas y horribles. Edite este activo ahora para asignarle un modelo.',
+ 'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
'assoc_users' => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
@@ -17,18 +17,18 @@ return array(
'update' => array(
'error' => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
- 'success' => 'Modelo actualizado con éxito.',
+ 'success' => 'El modelo fue actualizado exitosamente.',
),
'delete' => array(
'confirm' => '¿Está seguro de que desea eliminar este modelo de activo?',
'error' => 'Hubo un problema eliminando el modelo. Por favor, inténtelo de nuevo.',
- 'success' => 'El modelo fue borrado con éxito.'
+ 'success' => 'El modelo fue eliminado exitosamente.'
),
'restore' => array(
'error' => 'El modelo no fue restaurado, por favor intente nuevamente',
- 'success' => 'Modelo restaurado con éxito.'
+ 'success' => 'El modelo fue restaurado exitosamente.'
),
'bulkedit' => array(
diff --git a/resources/lang/es-VE/admin/models/table.php b/resources/lang/es-VE/admin/models/table.php
index 12e3078e86..312944b9cd 100644
--- a/resources/lang/es-VE/admin/models/table.php
+++ b/resources/lang/es-VE/admin/models/table.php
@@ -12,6 +12,6 @@ return array(
'update' => 'Actualizar modelo de activo',
'view' => 'Ver modelo de activo',
'update' => 'Actualizar modelo de activo',
- 'clone' => 'Clonar Modelo',
- 'edit' => 'Editar Modelo',
+ 'clone' => 'Clonar modelo',
+ 'edit' => 'Editar modelo',
);
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index a9118e8ca4..5ab6845a79 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -16,48 +16,50 @@ return [
'alert_email' => 'Enviar alertas a',
'alert_email_help' => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas',
'alerts_enabled' => 'Alertas de correo electrónico habilitadas',
- 'alert_interval' => 'Limite de alertas de expiración (en días)',
- 'alert_inv_threshold' => 'Umbral de alerta del inventario',
+ 'alert_interval' => 'Umbral para las alertas de caducidad (en días)',
+ 'alert_inv_threshold' => 'Umbral para alerta de inventario',
'allow_user_skin' => 'Permitir al usuario cambiar la apariencia',
'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
'asset_ids' => 'Códigos de los activos',
'audit_interval' => 'Intervalo de Auditoría',
'audit_interval_help' => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
- 'audit_warning_days' => 'Umbral de advertencia de auditoría',
+ 'audit_warning_days' => 'Umbral para aviso de auditoría',
'audit_warning_days_help' => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
- 'auto_increment_assets' => 'Generar placas de activos autoincrementables',
+ 'auto_increment_assets' => 'Generar incremento automático en las placas de activos',
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
'backups' => 'Copias de Seguridad',
'backups_help' => 'Crear, descargar y restaurar copias de seguridad ',
'backups_restoring' => 'Restaurando desde la copia de seguridad',
+ 'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+ 'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
'backups_upload' => 'Cargar copia de seguridad',
'backups_path' => 'Las copias de seguridad en el servidor se almacenan en :path',
'backups_restore_warning' => 'Utilice el botón de restauración para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker).
Su base de datos completa de :app_name y cualquier archivo cargado será completamente reemplazado por lo que hay en la copia de seguridad. ',
'backups_logged_out' => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
'backups_large' => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
- 'barcode_settings' => 'Configuración del Código de Barras',
+ 'barcode_settings' => 'Configuración del código de barras',
'confirm_purge' => 'Confirmar Purga',
'confirm_purge_help' => 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
'custom_css' => 'CSS Personalizado',
'custom_css_help' => 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas <style></style>.',
'custom_forgot_pass_url' => 'URL de restablecimiento de contraseña personalizada',
- 'custom_forgot_pass_url_help' => 'Esto remplaza la URL incorporada para contraseña olvidada en la pantalla de inicio, útil para dirigir a las personas a una funcionalidad de restablecimiento de interna o alojada en LDPA. Esto deshabilitará la funcionalidad local de contraseña olvidada.',
+ 'custom_forgot_pass_url_help' => 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
'dashboard_message' => 'Mensaje en el tablero',
'dashboard_message_help' => 'Este texto aparecerá en el panel para cualquiera que tenga permiso de ver el panel.',
'default_currency' => 'Divisa predeterminada',
'default_eula_text' => 'Acuerdo de uso predeterminado',
- 'default_language' => 'Lenguaje Predeterminado',
+ 'default_language' => 'Idioma predeterminado',
'default_eula_help_text' => 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
'acceptance_note' => 'Añada una nota para su decisión (opcional)',
'display_asset_name' => 'Mostrar nombre del activo',
'display_checkout_date' => 'Mostrar fecha de asignación',
'display_eol' => 'Mostrar fin de soporte (EOL) en la vista de tabla',
'display_qr' => 'Mostrar Códigos QR',
- 'display_alt_barcode' => 'Mostrar código de barras 1D',
+ 'display_alt_barcode' => 'Mostrar códigos de barras de 1D',
'email_logo' => 'Logo de correo electrónico',
- 'barcode_type' => 'Tipo de código de barras 2D',
- 'alt_barcode_type' => 'Tipo de código de barras 1D',
+ 'barcode_type' => 'Tipo de código de barras de 2D',
+ 'alt_barcode_type' => 'Tipo de código de barras de 1D',
'email_logo_size' => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
'enabled' => 'Activado',
'eula_settings' => 'Configuración de los acuerdos de uso',
@@ -284,7 +286,7 @@ return [
'bottom' => 'abajo',
'vertical' => 'vertical',
'horizontal' => 'horizontal',
- 'unique_serial' => 'Numero de Serial Único',
+ 'unique_serial' => 'Números de serie únicos',
'unique_serial_help_text' => 'Marcando esta casilla se aplicará una restricción de números de serie únicos a los activos',
'zerofill_count' => 'Longitud de los números en las placas de los activos, incluyendo los ceros de relleno',
'username_format_help' => 'Esta configuración solo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario por usted.',
diff --git a/resources/lang/es-VE/admin/settings/message.php b/resources/lang/es-VE/admin/settings/message.php
index 564784c25a..517b9e985f 100644
--- a/resources/lang/es-VE/admin/settings/message.php
+++ b/resources/lang/es-VE/admin/settings/message.php
@@ -9,8 +9,8 @@ return [
'backup' => [
'delete_confirm' => '¿Está seguro de que desea eliminar este archivo de respaldo? Esta acción no puede se puede deshacer. ',
'file_deleted' => 'El archivo de respaldo fue eliminado satisfactoriamente. ',
- 'generated' => 'Un nuevo archivo de respaldo ha sido creado con éxito.',
- 'file_not_found' => 'El archivo de respaldo no puede ser encontrado en el servidor.',
+ 'generated' => 'Se ha creado un nuevo archivo de copia de seguridad satisfactoriamente.',
+ 'file_not_found' => 'Ese archivo de copia de seguridad no se pudo encontrar en el servidor.',
'restore_warning' => 'Sí, restaurarlo. Reconozco que esto sobrescribirá cualquier dato existente actualmente en la base de datos. Esto también cerrará la sesión de todos sus usuarios existentes (incluido usted).',
'restore_confirm' => '¿Está seguro que desea restaurar su base de datos desde :filename?'
],
@@ -38,7 +38,7 @@ return [
],
'webhook' => [
'sending' => 'Enviando mensaje de prueba :app...',
- 'success' => '¡Su Integración :webhook_name funciona!',
+ 'success' => '¡Su integración :webhook_name funciona!',
'success_pt1' => '¡Éxito! Compruebe el ',
'success_pt2' => ' para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
'500' => 'Error 500 del servidor.',
diff --git a/resources/lang/es-VE/admin/statuslabels/table.php b/resources/lang/es-VE/admin/statuslabels/table.php
index 32d9f76366..78f5a67ce6 100644
--- a/resources/lang/es-VE/admin/statuslabels/table.php
+++ b/resources/lang/es-VE/admin/statuslabels/table.php
@@ -15,5 +15,5 @@ return array(
'show_in_nav' => 'Mostrar en la barra lateral',
'title' => 'Etiquetas de estado',
'undeployable' => 'No utilizable',
- 'update' => 'Actualizar Etiqueta de Estado',
+ 'update' => 'Actualizar la etiqueta de estado',
);
diff --git a/resources/lang/es-VE/admin/users/general.php b/resources/lang/es-VE/admin/users/general.php
index 797a66f03d..726eceef3b 100644
--- a/resources/lang/es-VE/admin/users/general.php
+++ b/resources/lang/es-VE/admin/users/general.php
@@ -9,13 +9,13 @@ return [
'current_assets' => 'Activos actualmente asignados a este usuario',
'clone' => 'Clonar usuario',
'contact_user' => 'Contactar a :name',
- 'edit' => 'Editar Usuario',
+ 'edit' => 'Editar usuario',
'filetype_info' => 'Los tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
'history_user' => 'Historial para :name',
'info' => 'Información',
'restore_user' => 'Haga clic aquí para restaurarlos.',
'last_login' => 'Último Inicio de Sesión',
- 'ldap_config_text' => 'Los parámetros de configuración LDAP pueden ser encontrados en Admin > Settings. La ubicación (opcional) seleccionada será establecida para todos los usuarios importados.',
+ 'ldap_config_text' => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
'print_assigned' => 'Imprimir todos los asignados',
'email_assigned' => 'Enviar correo con todos los asignados',
'user_notified' => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
@@ -23,13 +23,13 @@ return [
'auto_assign_help' => 'Omitir este usuario en la asignación automática de licencias',
'software_user' => 'Software asignado a :name',
'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
- 'view_user' => 'Ver Usuario :name',
+ 'view_user' => 'Ver usuario :name',
'usercsv' => 'Archivo CSV',
'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores. ',
- 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+ 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
'two_factor_active' => '2FA activo ',
- 'user_deactivated' => 'Usuario no puede iniciar sesión',
- 'user_activated' => 'Usuario puede iniciar sesión',
+ 'user_deactivated' => 'El usuario no puede iniciar sesión',
+ 'user_activated' => 'El usuario puede iniciar sesión',
'activation_status_warning' => 'No cambiar el estado de activación',
'group_memberships_helpblock' => 'Sólo los superadministradores pueden editar membresías de grupo.',
'superadmin_permission_warning' => 'Sólo los superadministradores pueden conceder acceso a un usuario superadministrador.',
diff --git a/resources/lang/es-VE/admin/users/message.php b/resources/lang/es-VE/admin/users/message.php
index 6e75b54dd8..8b42961711 100644
--- a/resources/lang/es-VE/admin/users/message.php
+++ b/resources/lang/es-VE/admin/users/message.php
@@ -3,16 +3,16 @@
return array(
'accepted' => 'Ha aceptado este artículo exitosamente.',
- 'declined' => 'Ha rechazado este activo con exitosamente.',
+ 'declined' => 'Ha rechazado correctamente este activo.',
'bulk_manager_warn' => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
'user_exists' => '¡El usuario ya existe!',
- 'user_not_found' => 'El usuario no existe.',
+ 'user_not_found' => 'El usuario no existe o usted no tiene permisos para verlo.',
'user_login_required' => 'El campo usuario es obligatorio',
'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
'user_password_required' => 'La contraseña es obligatoria.',
'insufficient_permissions' => 'Permisos insuficientes.',
'user_deleted_warning' => 'Este usuario ha sido eliminado. Tendrá que restaurar este usuario para editarlo o para asignarle nuevos activos.',
- 'ldap_not_configured' => 'La integración LDAP no ha sido configurada para esta instalación.',
+ 'ldap_not_configured' => 'La integración con LDAP no ha sido configurada para esta instalación.',
'password_resets_sent' => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.',
'password_reset_sent' => 'Un enlace para restablecer la contraseña ha sido enviado a :email!',
'user_has_no_email' => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
@@ -36,7 +36,7 @@ return array(
'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
- 'delete_has_assets' => 'Este usuario tiene elementos asignados y no pudo ser borrado.',
+ 'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP.
Error del servidor LDAP:',
'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:',
'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña. ',
+ 'multi_company_items_assigned' => 'Este usuario tiene elementos asignados, por favor, realice el ingreso de estos elementos antes de cambiarlo de compañía.'
),
'deletefile' => array(
diff --git a/resources/lang/es-VE/admin/users/table.php b/resources/lang/es-VE/admin/users/table.php
index 9c43517297..7775acc393 100644
--- a/resources/lang/es-VE/admin/users/table.php
+++ b/resources/lang/es-VE/admin/users/table.php
@@ -31,11 +31,11 @@ return array(
'show_deleted' => 'Mostrar usuarios eliminados',
'title' => 'Cargo',
'to_restore_them' => 'para restaurarlos.',
- 'total_assets_cost' => "Coste total de activos",
+ 'total_assets_cost' => "Costo total de activos",
'updateuser' => 'Actualizar usuario',
'username' => 'Nombre de usuario',
'user_deleted_text' => 'Este usuario ha sido marcado como borrado.',
'username_note' => '(Esto es usado sólo para el enlace de Active Directory, no para iniciar sesión.)',
- 'cloneuser' => 'Clonar Usuario',
- 'viewusers' => 'Ver Usuarios',
+ 'cloneuser' => 'Clonar usuario',
+ 'viewusers' => 'Ver usuarios',
);
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index 24e6f6554c..9f5fc2a1c0 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'También borra suavemente estos usuarios. Su historial de activos permanecerá intacto a menos/hasta que purgue los registros borrados en la Configuración de administración.',
'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
- 'set_to_null' => 'Eliminar valores para este activo|Borrar valores para todos los activos :asset_count ',
+ 'set_to_null' => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
'set_users_field_to_null' => 'Eliminar :field values for this user|Eliminar :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No se proporcionó fecha de compra',
'assets_by_status' => 'Activos por estado',
@@ -482,7 +482,7 @@ return [
'cannot_be_deleted' => 'Este elemento no puede ser eliminado',
'cannot_be_edited' => 'Este elemento no puede ser editado.',
'undeployable_tooltip' => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
- 'serial_number' => 'Número Serial',
+ 'serial_number' => 'Número de serie',
'item_notes' => ':item Notas',
'item_name_var' => ':item Nombre',
'error_user_company' => 'La compañía destino de la asignación y la compañía del activo no coinciden',
@@ -492,7 +492,7 @@ return [
'checked_out_to_first_name' => 'Asignado a: Nombre',
'checked_out_to_last_name' => 'Asignado a: Apellido',
'checked_out_to_username' => 'Asignado a: Nombre de usuario',
- 'checked_out_to_email' => 'Asignado a: correo electrónico',
+ 'checked_out_to_email' => 'Asignado a: Correo electrónico',
'checked_out_to_tag' => 'Asignado a: Placa de activo',
'manager_first_name' => 'Nombre del supervisor',
'manager_last_name' => 'Apellido del supervisor',
@@ -510,7 +510,7 @@ return [
'import_note' => 'Importado usando el importador de csv',
],
'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
- 'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+ 'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
'percent_complete' => '% completo',
'uploading' => 'Subiendo... ',
'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
@@ -559,8 +559,8 @@ return [
'expires' => 'Vence',
'map_fields'=> 'Asociar campos para :item_type',
'remaining_var' => ':count restantes',
- 'assets_in_var' => 'Activos en :name :type',
'label' => 'Etiqueta',
'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+ 'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
];
diff --git a/resources/lang/es-VE/localizations.php b/resources/lang/es-VE/localizations.php
index 9c46fa7a49..31f9a4946b 100644
--- a/resources/lang/es-VE/localizations.php
+++ b/resources/lang/es-VE/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Seleccionar un idioma',
+ 'select_language' => 'Seleccione un idioma',
'languages' => [
'en-US'=> 'Inglés, EEUU',
'en-GB'=> 'Inglés, Reino Unido',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Seleccionar un país',
+ 'select_country' => 'Seleccione un país',
'countries' => [
'AC'=>'Isla de Ascensión',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egipto',
+ 'GB-ENG'=>'Inglaterra',
'ER'=>'Eritrea',
'ES'=>'España',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Holanda',
+ 'GB-NIR' => 'Irlanda del Norte',
'NO'=>'Noruega',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federación Rusa',
'RW'=>'Rwanda',
'SA'=>'Arabia Saudita',
- 'UK'=>'Escocia',
+ 'GB-SCT'=>'Escocia',
'SB'=>'Islas Salomón',
'SC'=>'Seychelles',
'SS'=>'Sudán del Sur',
@@ -312,6 +314,7 @@ return [
'VI'=>'Islas Virginas (EE.UU.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Gales',
'WF'=>'Islas Wallis y Futuna',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/es-VE/mail.php b/resources/lang/es-VE/mail.php
index d573a1c28e..750e73c95d 100644
--- a/resources/lang/es-VE/mail.php
+++ b/resources/lang/es-VE/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
- 'accessory_name' => 'Nombre del Accesorio:',
- 'additional_notes' => 'Notas Adicionales:',
+ 'accessory_name' => 'Nombre de Accesorio',
+ 'additional_notes' => 'Notas adicionales',
'admin_has_created' => 'Un administrador ha creado una cuenta para ti en el sitio web de :web.',
- 'asset' => 'Activo:',
- 'asset_name' => 'Nombre del activo:',
+ 'asset' => 'Activo',
+ 'asset_name' => 'Nombre del activo',
'asset_requested' => 'Activo solicitado',
'asset_tag' => 'Placa del activo',
'assets_warrantee_alert' => 'Hay :count activo con una garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
'assigned_to' => 'Asignado A',
'best_regards' => 'Atentamente,',
- 'canceled' => 'Cancelado:',
- 'checkin_date' => 'Fecha de devolución:',
- 'checkout_date' => 'Fecha de asignación:',
+ 'canceled' => 'Cancelado',
+ 'checkin_date' => 'Fecha de ingreso',
+ 'checkout_date' => 'Fecha de asignación',
'checkedout_from' => 'Asignado desde',
'checkedin_from' => 'Devuelto desde',
'checked_into' => 'Devuelto en',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
'current_QTY' => 'Cantidad actual',
'days' => 'Días',
- 'expecting_checkin_date' => 'Fecha esperada de devolución:',
+ 'expecting_checkin_date' => 'Fecha esperada de devolución',
'expires' => 'Vence',
'hello' => 'Hola',
'hi' => 'Hola',
'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
'inventory_report' => 'Informe de inventario',
- 'item' => 'Elemento:',
+ 'item' => 'Elemento',
'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar contraseña de :web :',
@@ -66,11 +66,11 @@ return [
'name' => 'Nombre',
'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
'notes' => 'Notas',
- 'password' => 'Contraseña:',
+ 'password' => 'Contraseña',
'password_reset' => 'Restablecer Contraseña',
'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
- 'requested' => 'Solicitado:',
+ 'requested' => 'Solicitado',
'reset_link' => 'Su enlace de restablecimiento de contraseña',
'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
'rights_reserved' => 'Todos los derechos reservados.',
diff --git a/resources/lang/es-VE/validation.php b/resources/lang/es-VE/validation.php
index 225b49a3a3..d377eed63d 100644
--- a/resources/lang/es-VE/validation.php
+++ b/resources/lang/es-VE/validation.php
@@ -157,7 +157,7 @@ return [
'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
'string' => 'Este :attribute debe ser una cadena.',
'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
- 'unique_undeleted' => 'El :atrribute debe ser único.',
+ 'unique_undeleted' => 'El :attribute debe ser único.',
'non_circular' => ':attribute no debe crear una referencia circular.',
'not_array' => ':attribute no puede ser una matriz.',
'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
diff --git a/resources/lang/et-EE/admin/locations/message.php b/resources/lang/et-EE/admin/locations/message.php
index db8f8018e9..aafbb36aef 100644
--- a/resources/lang/et-EE/admin/locations/message.php
+++ b/resources/lang/et-EE/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Asukohta ei eksisteeri.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Selle asukohaga on seotud vähemalt üks vahend ja seda ei saa kustutada. Palun uuenda oma vahendeid, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ',
'assoc_child_loc' => 'Sel asukohal on hetkel all-asukohti ja seda ei saa kustutada. Palun uuenda oma asukohti nii, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ',
'assigned_assets' => 'Määratud Varad',
diff --git a/resources/lang/et-EE/admin/settings/general.php b/resources/lang/et-EE/admin/settings/general.php
index fc5c6379e6..98917e3d65 100644
--- a/resources/lang/et-EE/admin/settings/general.php
+++ b/resources/lang/et-EE/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Varukoopiad',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/et-EE/admin/users/message.php b/resources/lang/et-EE/admin/users/message.php
index bd33914137..8f95427069 100644
--- a/resources/lang/et-EE/admin/users/message.php
+++ b/resources/lang/et-EE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Oled selle vahendi tagasi lükanud.',
'bulk_manager_warn' => 'Sinu kasutajad on edukalt muudetud, kuid sinu juhi-kirjet ei salvestatud sest juht, kelle valisid oli ka muudatavate kasutajate hulgas ning kasutaja ei või olla ise-enda juht. Palun vali oma kasutajad uuesti, jättes juhi kõrvale.',
'user_exists' => 'Kasutaja on juba olemas!',
- 'user_not_found' => 'Kasutajat ei eksisteeri.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Login väli on kohustuslik',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Parooli väli on kohustuslik.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'LDAP-serverit ei õnnestunud otsida. Palun kontrollige oma LDAP-i serveri konfiguratsiooni LDAP-i konfiguratsioonifailis.
Viga LDAP serverist:',
'ldap_could_not_get_entries' => 'LDAP-serverisse tehtud sissekandeid ei saanud. Palun kontrollige oma LDAP-i serveri konfiguratsiooni LDAP-i konfiguratsioonifailis.
Viga LDAP serverist:',
'password_ldap' => 'Selle konto parooli haldab LDAP / Active Directory. Parooli muutmiseks võtke ühendust oma IT-osakonnaga.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/et-EE/general.php b/resources/lang/et-EE/general.php
index 293cc29944..a7b60d6f71 100644
--- a/resources/lang/et-EE/general.php
+++ b/resources/lang/et-EE/general.php
@@ -334,7 +334,7 @@ return [
'i_decline' => 'Ma keeldun',
'accept_decline' => 'Aktsepteeri/Keeldu',
'sign_tos' => 'Sign below to indicate that you agree to the terms of service:',
- 'clear_signature' => 'Clear Signature',
+ 'clear_signature' => 'Puhasta allkirja väli',
'show_help' => 'Näita abi',
'hide_help' => 'Peida abi',
'view_all' => 'kuva kõik',
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Aegub',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/et-EE/localizations.php b/resources/lang/et-EE/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/et-EE/localizations.php
+++ b/resources/lang/et-EE/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/et-EE/mail.php b/resources/lang/et-EE/mail.php
index 226f94f939..91e14bb2bf 100644
--- a/resources/lang/et-EE/mail.php
+++ b/resources/lang/et-EE/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Kasutaja on taotlenud üksuse veebis',
'acceptance_asset_accepted' => 'Kasutaja aktsepteeris seadme',
'acceptance_asset_declined' => 'Kasutaja keeldus seadmest',
- 'accessory_name' => 'Lisaseade Nimi:',
- 'additional_notes' => 'Lisamärkmed:',
+ 'accessory_name' => 'Tarviku Nimi',
+ 'additional_notes' => 'Lisamärkmed',
'admin_has_created' => 'Administraator on loonud konto teile: veebisaidil.',
- 'asset' => 'Vahend:',
- 'asset_name' => 'Vahendi nimi:',
+ 'asset' => 'Vahend',
+ 'asset_name' => 'Ressursi nimi',
'asset_requested' => 'Taotletud vahend',
'asset_tag' => 'Varade silt',
'assets_warrantee_alert' => 'Sul on :count vahend, mille garantii aegub järgmise :threshold päeva jooksul.|Sul on :count vahendit, mille garantii aegub järgmise :threshold päeva jooksul.',
'assigned_to' => 'Määratud',
'best_regards' => 'Parimate soovidega,',
- 'canceled' => 'Tühistatud:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Tühistatud',
+ 'checkin_date' => 'Tagastamise kuupäev',
+ 'checkout_date' => 'Väljastamise kuupäev',
'checkedout_from' => 'Väljastatud',
'checkedin_from' => 'Vastu võetud',
'checked_into' => 'Väljastatud',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Kinnitamiseks klõpsake järgmisel lingil: veebikonto:',
'current_QTY' => 'Praegune QTY',
'days' => 'päeva',
- 'expecting_checkin_date' => 'Ootel Checkin Kuupäev:',
+ 'expecting_checkin_date' => 'Eeldatav tagastamise kuupäev',
'expires' => 'Aegub',
'hello' => 'Tere',
'hi' => 'Tere',
'i_have_read' => 'Olen lugenud ja nõustun kasutustingimustega ja saanud selle kirje.',
'inventory_report' => 'Inventari aruanne',
- 'item' => 'Kirje:',
+ 'item' => 'Kirje',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count litsents aegub järgmise :threshold päeva jooksul.|:count litsentsi aegub järgmise :threshold päeva jooksul.',
'link_to_update_password' => 'Klienditeenuse uuendamiseks klõpsake järgmisel lingil:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nimi',
'new_item_checked' => 'Uus vara on Teie nimele väljastatud, üksikasjad on allpool.',
'notes' => 'Märkused',
- 'password' => 'Parool:',
+ 'password' => 'Parool',
'password_reset' => 'Parooli taastamine',
'read_the_terms' => 'Palun lugege allpool toodud kasutustingimusi.',
'read_the_terms_and_click' => 'Palun lugege läbi allpool toodud kasutustingimused ja klõpsake alloleval lingil kinnitamiseks, et lugesite läbi ja nõustute kasutustingimustega, ning olete vara kätte saanud.',
- 'requested' => 'Taotletud:',
+ 'requested' => 'Taotletud',
'reset_link' => 'Teie salasõna lähtestamise link',
'reset_password' => 'Parooli lähtestamiseks klõpsake siin:',
'rights_reserved' => 'Kõik õigused kaitstud.',
diff --git a/resources/lang/fa-IR/admin/locations/message.php b/resources/lang/fa-IR/admin/locations/message.php
index 8e7d51027b..899045a2b0 100644
--- a/resources/lang/fa-IR/admin/locations/message.php
+++ b/resources/lang/fa-IR/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'مکان وجود ندارد.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'این مکان در حال حاضر همراه با حداقل یک دارایی است و قادر به حذف نمی شود. لطفا بروز دارایی های خود را به دیگر این مکان مرجع و دوباره امتحان کنید. ',
'assoc_child_loc' => 'این مکان در حال حاضر پدر و مادر کودک حداقل یک مکان است و قادر به حذف نمی شود. لطفا به روز رسانی مکان خود را به دیگر این مکان مرجع و دوباره امتحان کنید. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/fa-IR/admin/settings/general.php b/resources/lang/fa-IR/admin/settings/general.php
index 99923b076e..a94612bd47 100644
--- a/resources/lang/fa-IR/admin/settings/general.php
+++ b/resources/lang/fa-IR/admin/settings/general.php
@@ -42,6 +42,8 @@ return [
',
'backups_restoring' => 'بازیابی از پشتیبان گیری
',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'نسخه پشتیبان را دانلود کنید',
'backups_path' => 'نسخههای پشتیبان روی سرور در :path ذخیره میشوند
',
diff --git a/resources/lang/fa-IR/admin/users/message.php b/resources/lang/fa-IR/admin/users/message.php
index 3e319acc79..171c82e7ee 100644
--- a/resources/lang/fa-IR/admin/users/message.php
+++ b/resources/lang/fa-IR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'شما با موفقیت این دارایی را به کاهش دادید.',
'bulk_manager_warn' => 'کاربران شما با موفقیت به روز شده اند، با این حال مدیر ورود شما ذخیره نشد زیرا مدیر شما انتخاب شده بود نیز در لیست کاربر برای ویرایش، و کاربران ممکن است مدیر خود نیست. لطفا کاربران خود را دوباره انتخاب کنید، به غیر از مدیر.',
'user_exists' => 'کاربر "{0}" در حال حاضر وجود دارد.',
- 'user_not_found' => 'کاربر وجود ندارد.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'فیلد ورود الزامی است.',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'کلمه عبور ضروری است.',
@@ -56,6 +56,7 @@ return array(
'ldap_could_not_search' => 'جستجو در سرور LDPA انجام نشد.لطفا پیکربندی LDPA سرور را در فایل LDPA config بررسی کنید.
اشکال از سرور LDPA:',
'ldap_could_not_get_entries' => 'مجوز از سرور LDPA گرفته نشد.لطفا پیکربندی LDPA سرور را در فایل LDPA config بررسی کنید.
اشکال از سرور LDPA:',
'password_ldap' => 'رمز عبور این حساب توسط LDAP / Active Directory مدیریت می شود. برای تغییر رمز عبور خود، لطفا با بخش IT خود تماس بگیرید.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/fa-IR/general.php b/resources/lang/fa-IR/general.php
index 6509fa3ea0..beff80f90e 100644
--- a/resources/lang/fa-IR/general.php
+++ b/resources/lang/fa-IR/general.php
@@ -502,7 +502,7 @@ return [
',
'bulk_checkin_success' => 'موارد برای کاربران انتخاب شده بررسی شده است.
',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -645,8 +645,8 @@ return [
'expires' => 'منقضی می شود',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/fa-IR/localizations.php b/resources/lang/fa-IR/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/fa-IR/localizations.php
+++ b/resources/lang/fa-IR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/fa-IR/mail.php b/resources/lang/fa-IR/mail.php
index fc826111f3..608e936763 100644
--- a/resources/lang/fa-IR/mail.php
+++ b/resources/lang/fa-IR/mail.php
@@ -36,19 +36,20 @@ return [
'a_user_requested' => 'یک کاربر یک مورد را در وبسایت درخواست کرده است',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'نام لوازم جانبی:',
- 'additional_notes' => 'یادداشت های اضافی:',
+ 'accessory_name' => 'نام وسیله',
+ 'additional_notes' => 'یادداشت های اضافی',
'admin_has_created' => 'یک مدیر یک حساب کاربری برای شما در وب سایت وب ایجاد کرده است.',
- 'asset' => 'دارایی:',
+ 'asset' => 'دارایی',
'asset_name' => 'نام دارایی',
'asset_requested' => 'دارایی درخواست شد',
'asset_tag' => 'نام دارایی',
'assets_warrantee_alert' => 'دارایی :count با گارانتی منقضی در روزهای بعدی: آستانه وجود دارد.',
'assigned_to' => 'اختصاص یافته به',
'best_regards' => 'با احترام،',
- 'canceled' => 'لغو شد:',
- 'checkin_date' => 'تاریخ ورود:',
- 'checkout_date' => 'چک کردن تاریخ:',
+ 'canceled' => 'لغو شد',
+ 'checkin_date' => 'تاریخ ورود
+',
+ 'checkout_date' => 'چک کردن تاریخ',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -57,13 +58,13 @@ return [
'click_to_confirm' => 'لطفا برای پیوستن به این لینک کلیک کنید تا حساب خود را تایید کنید:',
'current_QTY' => 'QTY فعلی',
'days' => 'روزها',
- 'expecting_checkin_date' => 'تاریخ انتظار انتظار:',
+ 'expecting_checkin_date' => ' چک در تاریخ را پر کنید',
'expires' => 'منقضی می شود',
'hello' => 'سلام',
'hi' => 'سلام',
'i_have_read' => 'من شرایط استفاده را خوانده ام و موافقم و این مورد را دریافت کرده ام.',
'inventory_report' => 'Inventory Report',
- 'item' => 'مورد:',
+ 'item' => 'مورد',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'مجوز :count در روزهای بعدی :threshold منقضی می شود.|مجوزهای :count در روزهای بعدی :threshold منقضی می شوند.',
'link_to_update_password' => 'برای به روزرسانی لطفا بر روی لینک زیر کلیک کنید: web password:',
@@ -74,11 +75,11 @@ return [
'name' => 'نام',
'new_item_checked' => 'یک آیتم جدید تحت نام شما چک شده است، جزئیات زیر است.',
'notes' => 'نت ها',
- 'password' => 'کلمه عبور:',
+ 'password' => 'رمز عبور',
'password_reset' => 'تنظیم مجدد رمز عبور',
'read_the_terms' => 'لطفا شرایط استفاده زیر را بخوانید.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'درخواست شده:',
+ 'requested' => 'در خواست شده',
'reset_link' => 'رمز عبور خود را بازنشانی کنید',
'reset_password' => 'برای تغییر رمز عبور اینجا کلیک کنید:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/fi-FI/admin/locations/message.php b/resources/lang/fi-FI/admin/locations/message.php
index 25eb4232f3..8e8b87f335 100644
--- a/resources/lang/fi-FI/admin/locations/message.php
+++ b/resources/lang/fi-FI/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Sijaintia ei löydy.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Sijaintiin on tällä hetkellä liitettynä vähintään yksi laite, eikä sitä voi poistaa. Poista viittaus sijantiin ja yritä uudelleen. ',
'assoc_child_loc' => 'Tämä sijainti on ylempi toiselle sijainnille eikä sitä voi poistaa. Päivitä sijainnit, jotta et enää viitata tähän sijaintiin ja yritä uudelleen. ',
'assigned_assets' => 'Luovutetut laitteet',
diff --git a/resources/lang/fi-FI/admin/settings/general.php b/resources/lang/fi-FI/admin/settings/general.php
index dfc4951d5f..61f2121baa 100644
--- a/resources/lang/fi-FI/admin/settings/general.php
+++ b/resources/lang/fi-FI/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Varmuuskopiot',
'backups_help' => 'Luo, lataa ja palauta varmuuskopiota ',
'backups_restoring' => 'Palauta varmuuskopiosta',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Lataa varmuuskopio',
'backups_path' => 'Varmuuskopiot ovat tallennettuna palvelimelle polulla :path',
'backups_restore_warning' => 'Käytä palautuspainiketta palauttaaksesi aiemman varmuuskopion. (Tämä ei tällä hetkellä toimi S3 tallennustilan tai Dockerin kanssa.)
Koko :app_name tietokantasi ja kaikki ladatut tiedostot korvataan kokonaan sillä, mitä on varmuuskopiotiedostossa. ',
diff --git a/resources/lang/fi-FI/admin/users/message.php b/resources/lang/fi-FI/admin/users/message.php
index 2f2001e545..e2078638d2 100644
--- a/resources/lang/fi-FI/admin/users/message.php
+++ b/resources/lang/fi-FI/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Olet onnistuneesti hylännyt tämän laitteen.',
'bulk_manager_warn' => 'Käyttäjät on onnistuneesti päivitetty, mutta esimies-merkintää ei tallennettu, koska valitsemasi esimies oli mukana käyttäjäluettelossa, eikä käyttäjä voi olla itsensä esimies. Valitse käyttäjät uudelleen, poislukien esimies.',
'user_exists' => 'Käyttäjä on jo luotu!',
- 'user_not_found' => 'Käyttäjää ei löydy.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Käyttäjätunnus vaaditaan',
'user_has_no_assets_assigned' => 'Käyttäjälle ei tällä hetkellä ole määritetty omaisuutta.',
'user_password_required' => 'Salasana vaaditaan.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Haku LDAP-palvelimelta ei onnistunut ei voitu hakea. Tarkista LDAP-palvelimen määritys.
LDAP-palvelimen virhe:',
'ldap_could_not_get_entries' => 'LDAP-palvelimelta ei palautunut kohteita. Tarkista LDAP-palvelimen määritys.
LDAP-palvelimen virhe:',
'password_ldap' => 'Tätä salasanaa hallinnoi LDAP / Active Directory. Vaihda salasanasi IT-osastolla.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/fi-FI/general.php b/resources/lang/fi-FI/general.php
index e644fa766e..62fe83098a 100644
--- a/resources/lang/fi-FI/general.php
+++ b/resources/lang/fi-FI/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Piilota myös nämä käyttäjät. Heidän laitehistoria säilyy ennallaan ellet/kunnes puhdistat poistetut tietueet Admin Asetuksista.',
'bulk_checkin_delete_success' => 'Valitut käyttäjät on poistettu ja heidän kohteet on palautettu.',
'bulk_checkin_success' => 'Valittujen käyttäjien laitteet on palautettu.',
- 'set_to_null' => 'Poista tämän laitteen arvot|Poista arvot kaikille :asset_count laitteille ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Poista tämän käyttäjän :field -arvot|Poista :field -arvot kaikilta : user_count käyttäjältä ',
'na_no_purchase_date' => 'N/A - ostopäivää ei annettu',
'assets_by_status' => 'Laitteet tilan mukaan',
@@ -559,8 +559,8 @@ return [
'expires' => 'vanhenee',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/fi-FI/localizations.php b/resources/lang/fi-FI/localizations.php
index 16b0fda350..e77447a13d 100644
--- a/resources/lang/fi-FI/localizations.php
+++ b/resources/lang/fi-FI/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Valitse kieli',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Englanti, Yhdysvallat',
'en-GB'=> 'Englanti, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Valitse maa',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension saari',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Eesti',
'EG'=>'Egypti',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Espanja',
'ET'=>'Etiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Alankomaat',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norja',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Venäjä',
'RW'=>'Ruanda',
'SA'=>'Saudi-Arabia',
- 'UK'=>'Skotlanti',
+ 'GB-SCT'=>'Skotlanti',
'SB'=>'Salomonsaaret',
'SC'=>'Seychellit',
'SS'=>'Etelä-Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Yhdysvaltain Neitsytsaaret',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis-ja Futunasaaret',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/fi-FI/mail.php b/resources/lang/fi-FI/mail.php
index cfdbdae04a..3e42649e5d 100644
--- a/resources/lang/fi-FI/mail.php
+++ b/resources/lang/fi-FI/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Käyttäjä on pyytänyt nimikettä sivustolla',
'acceptance_asset_accepted' => 'Käyttäjä on hyväksynyt kohteen',
'acceptance_asset_declined' => 'Käyttäjä on hylännyt kohteen',
- 'accessory_name' => 'Oheistarvikkeen nimi:',
- 'additional_notes' => 'Muistiinpanot:',
+ 'accessory_name' => 'Oheistarvikkeen nimi',
+ 'additional_notes' => 'Muistiinpanot',
'admin_has_created' => 'Järjestelmänvalvoja on luonut tilin sinulle :web verkkosivustolle.',
- 'asset' => 'Laite:',
- 'asset_name' => 'Laitteen nimi:',
+ 'asset' => 'Laite',
+ 'asset_name' => 'Laitteen nimi',
'asset_requested' => 'Pyydetty laite',
'asset_tag' => 'Laitetunniste',
'assets_warrantee_alert' => 'There is :count asset with a guarantee expiring in the next :threshold days .- There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Osoitettu',
'best_regards' => 'Parhain terveisin,',
- 'canceled' => 'Peruutettu:',
- 'checkin_date' => 'Palautuspäivä:',
- 'checkout_date' => 'Luovutuspäivä:',
+ 'canceled' => 'Peruutettu',
+ 'checkin_date' => 'Palautuspäivä',
+ 'checkout_date' => 'Luovutuspäivä',
'checkedout_from' => 'Luovutettu lähteestä',
'checkedin_from' => 'Tarkistettu alkaen',
'checked_into' => 'Tarkastettu sisään',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Vahvista tilisi klikkaamalla seuraavaa linkkiä :web:',
'current_QTY' => 'Nykyinen määrä',
'days' => 'Päiviä',
- 'expecting_checkin_date' => 'Odotettu palautuspäivä:',
+ 'expecting_checkin_date' => 'Odotettu palautuspäivä',
'expires' => 'Vanhenee',
'hello' => 'Hei',
'hi' => 'Moi',
'i_have_read' => 'Olen lukenut ja hyväksynyt käyttöehdot ja olen saanut tämän kohteen.',
'inventory_report' => 'Varaston Raportti',
- 'item' => 'Nimike:',
+ 'item' => 'Nimike',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count lisenssiä vanhenee :threshold päivän sisällä.|:count lisenssiä vanhenee :threshold päivän sisällä.',
'link_to_update_password' => 'Napsauta seuraavaa linkkiä päivittääksesi :web salasanasi:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nimi',
'new_item_checked' => 'Uusi nimike on luovutettu sinulle, yksityiskohdat ovat alla.',
'notes' => 'Muistiinpanot',
- 'password' => 'Salasana:',
+ 'password' => 'Salasana',
'password_reset' => 'Salasanan nollaus',
'read_the_terms' => 'Lue alla olevat käyttöehdot.',
'read_the_terms_and_click' => 'Ole hyvä ja lue alla olevat käyttöehdot. ja klikkaa alareunassa olevaa linkkiä vahvistaaksesi, että olet lukenut ja hyväksynyt käyttöehdot, ja olet vastaanottanut käyttöomaisuuden.',
- 'requested' => 'Pyydetty:',
+ 'requested' => 'Pyydetty',
'reset_link' => 'Salasanasi resetointi-linkki',
'reset_password' => 'Palauta salasanasi napsauttamalla tätä:',
'rights_reserved' => 'Kaikki oikeudet pidätetään.',
diff --git a/resources/lang/fil-PH/admin/locations/message.php b/resources/lang/fil-PH/admin/locations/message.php
index 5e1fd2cf9b..801f8304b0 100644
--- a/resources/lang/fil-PH/admin/locations/message.php
+++ b/resources/lang/fil-PH/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Ang lokasyon ay hindi umiiral.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Ang lokasyong ito ay kasalukuyang naiugnay sa hindi bumaba sa isang asset at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga asset upang hindi na magreperens sa lokasyong ito at paki-subok muli. ',
'assoc_child_loc' => 'Ang lokasyong ito ay kasalukuyang pinagmumulan sa hindi bumaba sa lokasyon isang bata at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga lokasyon upang hindi na magreperens sa lokasyong ito at paki-subok muli. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/fil-PH/admin/settings/general.php b/resources/lang/fil-PH/admin/settings/general.php
index edb97be379..4b22950e05 100644
--- a/resources/lang/fil-PH/admin/settings/general.php
+++ b/resources/lang/fil-PH/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Mga backup',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/fil-PH/admin/users/message.php b/resources/lang/fil-PH/admin/users/message.php
index 2432c53e4a..dd9ccd1f56 100644
--- a/resources/lang/fil-PH/admin/users/message.php
+++ b/resources/lang/fil-PH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Matagumpay mong hindi tinaggap ang asset na ito.',
'bulk_manager_warn' => 'Ang iyong mga user ay matagumpay nang nai-update, subalit ang iyong manager entry ay hindi nai-save dahil ang manager na iyong pinili ay kabilang sa listahan ng user na kailangang i-edit, at ang mga user ay maaaring wala sa sarili nilang pamamahala. Mangyaring pumiling muli ng iyong user, hindi kasama ang manager.',
'user_exists' => 'Ang user ay umiiral na!',
- 'user_not_found' => 'Ang gumagamit ay hindi umiiral.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Ang field ng login ay kinakailangan',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Ang password ay kinakailangan.',
@@ -54,6 +54,7 @@ return array(
'ldap_could_not_search' => 'Hindi makapaghanap ng serber ng LDAP. Mangyaring suriin ang iyong konpigurasyon ng serber ng LDAP sa LDAP config file.
may error mula sa Serber ng LDAP:',
'ldap_could_not_get_entries' => 'Hindi makakuha ng entry mula sa serber ng LDAP. Mangyaring surrin ang iyong konpigurasyon ng serber ng LDAP sa LDAP config file.
May-error mula sa Serber ng LDAP:',
'password_ldap' => 'Ang password sa account na ito ay pinamahalaan ng LDAP/Actibong Direktorya. Mangyaring komontak sa iyong IT department para baguhin ang iyong password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/fil-PH/general.php b/resources/lang/fil-PH/general.php
index 4f04f0382f..b5d3e60d78 100644
--- a/resources/lang/fil-PH/general.php
+++ b/resources/lang/fil-PH/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Mawalan ng Bisa',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/fil-PH/localizations.php b/resources/lang/fil-PH/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/fil-PH/localizations.php
+++ b/resources/lang/fil-PH/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/fil-PH/mail.php b/resources/lang/fil-PH/mail.php
index b37c492d3a..1717cf264d 100644
--- a/resources/lang/fil-PH/mail.php
+++ b/resources/lang/fil-PH/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Ang gumagamit ay nag-rekwest ng aytem sa website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Ang Pangalan ng Aksesorya:',
- 'additional_notes' => 'Ang mga Karagdagang mga Lista:',
+ 'accessory_name' => 'Ang Pangalan ng Aksesorya',
+ 'additional_notes' => 'Ang mga Karagdagang mga Lista',
'admin_has_created' => 'Ang tagapangasiwa ay nakapagsagawa ng isang account para sa iyo sa :web website.',
- 'asset' => 'Ang Asset:',
- 'asset_name' => 'Ang Pangalan ng Asset:',
+ 'asset' => 'Ang Asset',
+ 'asset_name' => 'Ang Pangalan ng Asset',
'asset_requested' => 'Ang nirekwest na asset',
'asset_tag' => 'Ang Tag ng Asset',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Nakatalaga Sa',
'best_regards' => 'Lubos na bumabati,',
- 'canceled' => 'Nakansela:',
- 'checkin_date' => 'Ang Petsa ng Pag-checkin:',
- 'checkout_date' => 'Ang Petsa ng Pag-checkout:',
+ 'canceled' => 'Nakansela',
+ 'checkin_date' => 'Ang Petsa ng Pag-checkin',
+ 'checkout_date' => 'Ang Petsa ng Pagcheck-out',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Paki-klik sa mga sumusunod na link para i-komperma ang iyong :web account:',
'current_QTY' => 'Ang kasalukuyang QTY',
'days' => 'Mga araw',
- 'expecting_checkin_date' => 'Ang Inaasahang Petsa ng Pag-checkin:',
+ 'expecting_checkin_date' => 'Ang Inaasahang Petsa ng Pag-checkin',
'expires' => 'Mawalang bisa',
'hello' => 'Kumusta',
'hi' => 'Kumusta',
'i_have_read' => 'Ako ay nakabasa ay sumasang-ayon sa mga tuntunin ng paggamit, at ang aytem na ito ay aking tinatanggap.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Aytem:',
+ 'item' => 'Ang Aytem',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Paki-klik sa mga sumusunod na link para makapag-update sa iyong :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ang Pangalan',
'new_item_checked' => 'Ang bagong aytem na nai-check out sa ilalim ng iyong pangalan, ang mga detalye ay nasa ibaba.',
'notes' => 'Ang mga Palatandaan',
- 'password' => 'Ang Password:',
+ 'password' => 'Ang Password',
'password_reset' => 'Ang Pagbago ng Password',
'read_the_terms' => 'Paki-basa sa mga tuntunin ng paggamit sa ibaba.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Mga Nai-rekwest:',
+ 'requested' => 'Ang Nirekwest',
'reset_link' => 'Ang Link para sa Pag-reset ng Password',
'reset_password' => 'I-klik ito para ma-reset ang iyong password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/fr-FR/admin/locations/message.php b/resources/lang/fr-FR/admin/locations/message.php
index 2c505d5a08..5464a145b6 100644
--- a/resources/lang/fr-FR/admin/locations/message.php
+++ b/resources/lang/fr-FR/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Le lieu n\'existe pas.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Cet emplacement est actuellement associé à au moins un actif et ne peut pas être supprimé. Veuillez mettre à jour vos actifs pour ne plus faire référence à cet emplacement et réessayez. ',
'assoc_child_loc' => 'Cet emplacement est actuellement le parent d\'au moins un sous emplacement et ne peut pas être supprimé . S\'il vous plaît mettre à jour vos emplacement pour ne plus le référencer et réessayez. ',
'assigned_assets' => 'Actifs assignés',
diff --git a/resources/lang/fr-FR/admin/settings/general.php b/resources/lang/fr-FR/admin/settings/general.php
index 57219b9b21..751b47bb83 100644
--- a/resources/lang/fr-FR/admin/settings/general.php
+++ b/resources/lang/fr-FR/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sauvegardes',
'backups_help' => 'Créer, télécharger et restaurer des sauvegardes ',
'backups_restoring' => 'Restaurer à partir d\'une sauvegarde',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Téléverser la sauvegarde',
'backups_path' => 'Les sauvegardes sont stockées dans :path sur le serveur',
'backups_restore_warning' => 'Utilisez le bouton de restauration pour restaurer à partir d\'une sauvegarde (cela ne fonctionne pas actuellement avec le stockage de fichiers S3 ou Docker).
Votre base de données :app_name tout entière et tous les fichiers téléchargés seront intégralement remplacés par ce qui se trouve dans le fichier de sauvegarde. ',
diff --git a/resources/lang/fr-FR/admin/users/message.php b/resources/lang/fr-FR/admin/users/message.php
index 1045c4d2e7..e2cc1a38ac 100644
--- a/resources/lang/fr-FR/admin/users/message.php
+++ b/resources/lang/fr-FR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Vous avez refusé cet actif.',
'bulk_manager_warn' => 'Vos utilisateurs ont été mis à jour avec succès, mais votre entrée de gestionnaire n\'a pas été enregistrée, car le gestionnaire que vous avez sélectionné était également dans la liste d\'utilisateurs à éditer, et les utilisateurs peuvent ne pas être leur propre gestionnaire. Sélectionnez à nouveau vos utilisateurs, à l\'exclusion du gestionnaire.',
'user_exists' => 'L\'utilisateur existe déjà !',
- 'user_not_found' => 'L\'utilisateur·trice n\'existe pas.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Le champ identifiant est obligatoire',
'user_has_no_assets_assigned' => 'Aucun actif actuellement assigné à l\'utilisateur·trice.',
'user_password_required' => 'Le mot de passe est obligatoire.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Impossible de rechercher le serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur de serveur LDAP :',
'ldap_could_not_get_entries' => 'Impossible d\'obtenir les entrées du serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur de serveur LDAP :',
'password_ldap' => 'Le mot de passe de ce compte est géré par LDAP / Active Directory. Veuillez contacter votre service informatique pour changer votre mot de passe.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php
index 9125942a91..74d71b32cb 100644
--- a/resources/lang/fr-FR/general.php
+++ b/resources/lang/fr-FR/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Supprimer ces utilisateurs également. Leur historique de matériel restera intact jusqu\'à ce que vous les supprimiez définitivement depuis le panneau de configuration de l\'administrateur.',
'bulk_checkin_delete_success' => 'Les utilisateurs sélectionnés ont été supprimés et leurs matériels ont été dissociés.',
'bulk_checkin_success' => 'Les articles des utilisateurs sélectionnés ont été dissociés.',
- 'set_to_null' => 'Supprimer des valeurs pour ce matériel|Supprimer des valeurs pour :asset_count matériels ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Supprimer les valeurs du champ :field pour cet·te utilisateur·trice|Supprimer les valeurs du champ :field pour les :user_count utilisateurs·trices ',
'na_no_purchase_date' => 'NC - Pas de date d\'achat renseignée',
'assets_by_status' => 'Matériels par statut',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expire le',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count restant',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/fr-FR/localizations.php b/resources/lang/fr-FR/localizations.php
index 1f5f0e27f5..105c5af96c 100644
--- a/resources/lang/fr-FR/localizations.php
+++ b/resources/lang/fr-FR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Sélectionnez une langue',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Anglais, États-Unis',
'en-GB'=> 'Anglais, Royaume-Uni',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zoulou',
],
- 'select_country' => 'Sélectionnez un pays',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Île de l\'Ascension',
@@ -135,6 +135,7 @@ return [
'EC'=>'Équateur',
'EE'=>'Estonie',
'EG'=>'Égypte',
+ 'GB-ENG'=>'England',
'ER'=>'Érythrée',
'ES'=>'Espagne',
'ET'=>'Éthiopie',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigéria',
'NI'=>'Nicaragua',
'NL'=>'Pays-Bas',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norvège',
'NP'=>'Népal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Fédération de Russie',
'RW'=>'Rwanda',
'SA'=>'Arabie Saoudite',
- 'UK'=>'Écosse',
+ 'GB-SCT'=>'Écosse',
'SB'=>'Îles Salomon',
'SC'=>'Seychelles',
'SS'=>'Soudan du Sud',
@@ -312,6 +314,7 @@ return [
'VI'=>'Îles Vierges Américaines',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis-et-Futuna',
'WS'=>'Samoa',
'YE'=>'Yémen',
diff --git a/resources/lang/fr-FR/mail.php b/resources/lang/fr-FR/mail.php
index 90e839e217..d3efd6f78c 100644
--- a/resources/lang/fr-FR/mail.php
+++ b/resources/lang/fr-FR/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un·e utilisateur·trice a demandé un article sur le site Web',
'acceptance_asset_accepted' => 'Un utilisateur a accepté un article',
'acceptance_asset_declined' => 'Un utilisateur a refusé un article',
- 'accessory_name' => 'Nom de l’accessoire :',
- 'additional_notes' => 'Notes complémentaires :',
+ 'accessory_name' => 'Nom de l\'accessoire',
+ 'additional_notes' => 'Notes complémentaires ',
'admin_has_created' => 'Un administrateur a créé un compte pour vous sur le site :web.',
- 'asset' => 'Produit:',
- 'asset_name' => 'Nom du produit:',
+ 'asset' => 'Biens',
+ 'asset_name' => 'Nom de l\'actif',
'asset_requested' => 'Produit demandé',
'asset_tag' => 'Numéro d\'inventaire',
'assets_warrantee_alert' => 'Il y a :count actif(s) avec une garantie expirant dans les prochains :threshold jours.|Il y a :count actif(s) avec des garanties expirant dans les prochains :threshold jours.',
'assigned_to' => 'Affecté à',
'best_regards' => 'Cordialement,',
- 'canceled' => 'Annulé:',
- 'checkin_date' => 'Date d\'association :',
- 'checkout_date' => 'Date de dissociation :',
+ 'canceled' => 'Annulé',
+ 'checkin_date' => 'Date de dissociation',
+ 'checkout_date' => 'Date d\'association',
'checkedout_from' => 'Verrouillé depuis',
'checkedin_from' => 'Enregistré depuis',
'checked_into' => 'Vérifié dans',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Veuillez cliquer sur le lien suivant pour confirmer votre :web account:',
'current_QTY' => 'Quantité actuelle',
'days' => 'jours',
- 'expecting_checkin_date' => 'Date d\'association prévue :',
+ 'expecting_checkin_date' => 'Date de dissociation prévue',
'expires' => 'Expire le',
'hello' => 'Bonjour',
'hi' => 'Salut',
'i_have_read' => 'J\'ai bien lu et approuvé les conditions d\'utilisation, et reçu cet objet.',
'inventory_report' => 'Rapport d\'inventaire',
- 'item' => 'Article :',
+ 'item' => 'Item',
'item_checked_reminder' => 'Ceci est un rappel que vous avez actuellement :count articles que vous n\'avez pas acceptés ou refusés. Veuillez cliquer sur le lien ci-dessous pour confirmer votre décision.',
'license_expiring_alert' => 'Il y a :count licence expirant dans les prochains :threshold jours.|Il y a :count licences expirant dans les prochains :threshold jours.',
'link_to_update_password' => 'Veuillez cliquer sur le lien suivant pour confirmer votre :web account:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nom',
'new_item_checked' => 'Un nouvel élément a été vérifié sous votre nom, les détails sont ci-dessous.',
'notes' => 'Notes',
- 'password' => 'Mot de passe:',
+ 'password' => 'Mot de passe',
'password_reset' => 'Réinitialisation du mot de passe',
'read_the_terms' => 'Merci de lire les conditions d\'utilisation ci-dessous.',
'read_the_terms_and_click' => 'Veuillez lire les conditions d\'utilisation ci-dessous, et cliquez sur le lien en bas pour confirmer que vous avez lu et accepté les conditions d\'utilisation, et que vous avez reçu l\'actif.',
- 'requested' => 'Demandé :',
+ 'requested' => 'Demandé',
'reset_link' => 'Votre lien pour réinitialiser le mot de passe',
'reset_password' => 'Cliquez ici pour réinitialiser votre mot de passe:',
'rights_reserved' => 'Tous droits réservés.',
diff --git a/resources/lang/ga-IE/admin/locations/message.php b/resources/lang/ga-IE/admin/locations/message.php
index 656e5b4d1a..d3a20741e6 100644
--- a/resources/lang/ga-IE/admin/locations/message.php
+++ b/resources/lang/ga-IE/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Níl an suíomh ann.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Tá an suíomh seo bainteach le sócmhainn amháin ar a laghad agus ní féidir é a scriosadh. Déan do sócmhainní a thabhairt cothrom le dáta gan tagairt a dhéanamh don áit seo agus déan iarracht arís.',
'assoc_child_loc' => 'Faoi láthair tá an suíomh seo ina tuismitheoir ar a laghad ar shuíomh leanbh amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh do láithreacha le do thoil gan tagairt a dhéanamh don suíomh seo agus déan iarracht arís.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index c33e9308ae..69e8ce7239 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Cúltacaí',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ga-IE/admin/users/message.php b/resources/lang/ga-IE/admin/users/message.php
index 9d26d415f4..be8f3e4fcc 100644
--- a/resources/lang/ga-IE/admin/users/message.php
+++ b/resources/lang/ga-IE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Dhiúltaigh tú an tsócmhainn seo go rathúil.',
'bulk_manager_warn' => 'Rinneadh do chuid úsáideoirí a nuashonrú go rathúil, áfach, níor shábháil do iontráil bainisteora toisc go raibh an bainisteoir a roghnaigh tú chomh maith sa liosta úsáideora le bheith in eagar, agus b\'fhéidir nach mbainfeadh úsáideoirí a mbainisteoir féin. Roghnaigh d\'úsáideoirí arís, gan an bainisteoir a áireamh.',
'user_exists' => 'Úsáideoir ann cheana!',
- 'user_not_found' => 'Níl an t-úsáideoir ann.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Is gá an réimse logála isteach',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Tá an focal faire ag teastáil.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Níorbh fhéidir an freastalaí LDAP a chuardach. Seiceáil do chumraíocht an fhreastalaí LDAP sa chomhad cumraíochta LDAP.
Error ó Freastalaí LDAP:',
'ldap_could_not_get_entries' => 'Níorbh fhéidir iontrálacha a fháil ón fhreastalaí LDAP. Seiceáil do chumraíocht an fhreastalaí LDAP sa chomhad cumraíochta LDAP.
Error ó Freastalaí LDAP:',
'password_ldap' => 'Bainistíonn LDAP / Active Directory an focal faire don chuntas seo. Téigh i dteagmháil le do roinn TF chun do phasfhocal a athrú.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index a724745532..59b86a92a3 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Deireadh',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ga-IE/localizations.php b/resources/lang/ga-IE/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/ga-IE/localizations.php
+++ b/resources/lang/ga-IE/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ga-IE/mail.php b/resources/lang/ga-IE/mail.php
index 8c2e0b2f03..4351e04db7 100644
--- a/resources/lang/ga-IE/mail.php
+++ b/resources/lang/ga-IE/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'D\'iarr úsáideoir mír ar an láithreán gréasáin',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Ainm Cúlpháirtí:',
- 'additional_notes' => 'Nótaí Breise:',
+ 'accessory_name' => 'Ainm Cúlpháirtí',
+ 'additional_notes' => 'Nótaí Breise',
'admin_has_created' => 'Tá riarthóir tar éis cuntas a chruthú duit ar: láithreán gréasáin gréasáin.',
- 'asset' => 'Sócmhainn:',
- 'asset_name' => 'Ainm Sócmhainne:',
+ 'asset' => 'Sócmhainn',
+ 'asset_name' => 'Ainm Sócmhainne',
'asset_requested' => 'Iarrtar sócmhainn',
'asset_tag' => 'Clib Sócmhainní',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Sannadh Chun',
'best_regards' => 'Dea-mhéin,',
- 'canceled' => 'Ar ceal:',
- 'checkin_date' => 'Dáta Checkin:',
- 'checkout_date' => 'Dáta Seiceáil:',
+ 'canceled' => 'Ar ceal',
+ 'checkin_date' => 'Dáta Checkin',
+ 'checkout_date' => 'Dáta Seiceáil',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Cliceáil ar an nasc seo a leanas le do thoil a dheimhniú: cuntas gréasáin:',
'current_QTY' => 'QTY Reatha',
'days' => 'Laethanta',
- 'expecting_checkin_date' => 'Dáta Checkin Ionchais:',
+ 'expecting_checkin_date' => 'An Dáta Seiceála Ionchais',
'expires' => 'Deireadh',
'hello' => 'Dia dhuit',
'hi' => 'Haigh',
'i_have_read' => 'Léigh na téarmaí úsáide agus léigh mé na téarmaí úsáide agus fuair mé an t-ítim seo.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Mír:',
+ 'item' => 'Mír',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Cliceáil ar an nasc seo a leanas chun do chuid focal faire:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ainm',
'new_item_checked' => 'Rinneadh mír nua a sheiceáil faoi d\'ainm, tá na sonraí thíos.',
'notes' => 'Nótaí',
- 'password' => 'Pasfhocal:',
+ 'password' => 'Pasfhocal',
'password_reset' => 'Athshocraigh Pasfhocal',
'read_the_terms' => 'Léigh na téarmaí úsáide thíos.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Iarrtar:',
+ 'requested' => 'Iarrtar',
'reset_link' => 'Do Nasc Athshocraigh Pasfhocal',
'reset_password' => 'Cliceáil anseo chun do phasfhocal a athshocrú:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/he-IL/admin/locations/message.php b/resources/lang/he-IL/admin/locations/message.php
index 01f7600f62..d73329b520 100644
--- a/resources/lang/he-IL/admin/locations/message.php
+++ b/resources/lang/he-IL/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'המיקום אינו קיים.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'המיקום משויך לפחות לפריט אחד ולכן לא ניתן למחוק אותו. אנא עדכן את הפריטים כך שלא יהיה אף פריט משויך למיקום זה ונסה שנית. ',
'assoc_child_loc' => 'למיקום זה מוגדרים תתי-מיקומים ולכן לא ניתן למחוק אותו. אנא עדכן את המיקומים כך שלא שמיקום זה לא יכיל תתי מיקומים ונסה שנית. ',
'assigned_assets' => 'פריטים מוקצים',
diff --git a/resources/lang/he-IL/admin/settings/general.php b/resources/lang/he-IL/admin/settings/general.php
index c98096e1e3..0a93eceedf 100644
--- a/resources/lang/he-IL/admin/settings/general.php
+++ b/resources/lang/he-IL/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'גיבויים',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'משחזר מגיבוי',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'העלה גיבוי',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/he-IL/admin/users/message.php b/resources/lang/he-IL/admin/users/message.php
index 5fe817ac78..a84b6a8dbb 100644
--- a/resources/lang/he-IL/admin/users/message.php
+++ b/resources/lang/he-IL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'דחיית את הנכס הזה בהצלחה.',
'bulk_manager_warn' => 'המשתמשים שלך עודכנו בהצלחה, אך רשומת המנהל שלך לא נשמרה מפני שהמנהל שבחרת נבחר גם ברשימת המשתמשים כדי לערוך, והמשתמשים לא יכולים להיות המנהל שלהם. בחר שוב את המשתמשים שלך, למעט המנהל.',
'user_exists' => 'משתמש כבר קיים!',
- 'user_not_found' => 'משתמש לא קיים.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'יש להזין את שדה הכניסה',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'נדרשת הסיסמה.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'לא ניתן לחפש בשרת LDAP. בדוק את תצורת שרת LDAP בקובץ תצורת LDAP.
שגיאה משרת LDAP:',
'ldap_could_not_get_entries' => 'לא ניתן לקבל רשומות משרת LDAP. בדוק את תצורת שרת LDAP בקובץ תצורת LDAP.
שגיאה משרת LDAP:',
'password_ldap' => 'הסיסמה עבור חשבון זה מנוהלת על ידי LDAP / Active Directory. צור קשר עם מחלקת ה- IT כדי לשנות את הסיסמה שלך.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php
index 9082dc70a7..26a578eda7 100644
--- a/resources/lang/he-IL/general.php
+++ b/resources/lang/he-IL/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'יפוג',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/he-IL/localizations.php b/resources/lang/he-IL/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/he-IL/localizations.php
+++ b/resources/lang/he-IL/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/he-IL/mail.php b/resources/lang/he-IL/mail.php
index 650301cd4a..c92f7b7961 100644
--- a/resources/lang/he-IL/mail.php
+++ b/resources/lang/he-IL/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'משתמש ביקש פריט באתר',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'שם אביזר:',
- 'additional_notes' => 'הערות נוספות:',
+ 'accessory_name' => 'שם אביזר',
+ 'additional_notes' => 'הערות נוספות',
'admin_has_created' => 'מנהל מערכת יצר עבורך חשבון באתר האינטרנט:.',
- 'asset' => 'נכס:',
- 'asset_name' => 'שם הנכס:',
+ 'asset' => 'נכס',
+ 'asset_name' => 'שם הנכס',
'asset_requested' => 'הנכס המבוקש',
'asset_tag' => 'תג נכס',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'שהוקצה ל',
'best_regards' => 'כל טוב,',
- 'canceled' => 'בּוּטלָה:',
- 'checkin_date' => 'תאריך הגעה:',
- 'checkout_date' => 'תבדוק את התאריך:',
+ 'canceled' => 'בּוּטלָה',
+ 'checkin_date' => 'תאריך הגעה',
+ 'checkout_date' => 'תבדוק את התאריך',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'לחץ על הקישור הבא כדי לאשר את: חשבון האינטרנט שלך:',
'current_QTY' => 'QTY הנוכחי',
'days' => 'ימים',
- 'expecting_checkin_date' => 'תאריך הצפוי:',
+ 'expecting_checkin_date' => 'תאריך הצ\'קין הצפוי',
'expires' => 'יפוג',
'hello' => 'שלום',
'hi' => 'היי',
'i_have_read' => 'קראתי והסכמתי לתנאי השימוש וקיבלתי פריט זה.',
'inventory_report' => 'Inventory Report',
- 'item' => 'פריט:',
+ 'item' => 'פריט',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'לחץ על הקישור הבא כדי לעדכן את: סיסמת האינטרנט:',
@@ -66,11 +66,11 @@ return [
'name' => 'שֵׁם',
'new_item_checked' => 'פריט חדש נבדק תחת שמך, הפרטים להלן.',
'notes' => 'הערות',
- 'password' => 'סיסמה:',
+ 'password' => 'סיסמה',
'password_reset' => 'איפוס סיסמא',
'read_the_terms' => 'אנא קרא את תנאי השימוש שלהלן.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'התקבלה:',
+ 'requested' => 'מבוקש',
'reset_link' => 'איפוס הסיסמה שלך קישור',
'reset_password' => 'לחץ כאן כדי לאפס את הסיסמה שלך:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/hr-HR/admin/locations/message.php b/resources/lang/hr-HR/admin/locations/message.php
index b3af1df949..6ec83842bc 100644
--- a/resources/lang/hr-HR/admin/locations/message.php
+++ b/resources/lang/hr-HR/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokacija ne postoji.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Ta je lokacija trenutačno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte svoju imovinu da više ne referira na tu lokaciju i pokušajte ponovno.',
'assoc_child_loc' => 'Ta je lokacija trenutačno roditelj najmanje jedne lokacije za djecu i ne može se izbrisati. Ažurirajte svoje lokacije da više ne referiraju ovu lokaciju i pokušajte ponovo.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/hr-HR/admin/settings/general.php b/resources/lang/hr-HR/admin/settings/general.php
index 63f7b6bb1e..26dbc64321 100644
--- a/resources/lang/hr-HR/admin/settings/general.php
+++ b/resources/lang/hr-HR/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sigurnosne kopije',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/hr-HR/admin/users/message.php b/resources/lang/hr-HR/admin/users/message.php
index c4d33a4a07..73465455b6 100644
--- a/resources/lang/hr-HR/admin/users/message.php
+++ b/resources/lang/hr-HR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Uspješno ste odbili ovaj materijal.',
'bulk_manager_warn' => 'Vaši su korisnici uspješno ažurirani, ali vaš unos upravitelja nije spremljen jer je upravitelj koji ste odabrali također bio na popisu korisnika koji se uređuje, a korisnici možda nisu vlastiti upravitelj. Ponovno odaberite svoje korisnike, isključujući upravitelja.',
'user_exists' => 'Korisnik već postoji!',
- 'user_not_found' => 'Korisnik ne postoji.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Potrebno je polje za prijavu',
'user_has_no_assets_assigned' => 'Niti jedno sredstvo trenutno nije dodjeljeno korisniku.',
'user_password_required' => 'Zaporka je potrebna.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nije moguće pretražiti LDAP poslužitelj. Provjerite konfiguraciju LDAP poslužitelja u LDAP konfiguracijskoj datoteci.
Preku s LDAP poslužitelja:',
'ldap_could_not_get_entries' => 'Nije bilo moguće dobiti unose s LDAP poslužitelja. Provjerite konfiguraciju LDAP poslužitelja u LDAP konfiguracijskoj datoteci.
Preku s LDAP poslužitelja:',
'password_ldap' => 'Lozinku za ovaj račun upravlja LDAP / Active Directory. Obratite se IT odjelu za promjenu zaporke.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php
index a76d8db5c7..4bf7bb9813 100644
--- a/resources/lang/hr-HR/general.php
+++ b/resources/lang/hr-HR/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'istječe',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/hr-HR/localizations.php b/resources/lang/hr-HR/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/hr-HR/localizations.php
+++ b/resources/lang/hr-HR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/hr-HR/mail.php b/resources/lang/hr-HR/mail.php
index 92546e7a3c..f6a9cdfcf3 100644
--- a/resources/lang/hr-HR/mail.php
+++ b/resources/lang/hr-HR/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Korisnik je zatražio stavku na web mjestu',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Naziv dodatne opreme:',
- 'additional_notes' => 'Dodatne napomene:',
+ 'accessory_name' => 'Naziv dodatne opreme',
+ 'additional_notes' => 'Dodatne napomene',
'admin_has_created' => 'Administrator vam je stvorio račun na: web stranici.',
- 'asset' => 'Imovina:',
- 'asset_name' => 'Naziv imovine:',
+ 'asset' => 'Imovina',
+ 'asset_name' => 'Naziv imovine',
'asset_requested' => 'Traženo sredstvo',
'asset_tag' => 'Oznaka imovine',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Dodijeljena',
'best_regards' => 'Lijepi Pozdrav,',
- 'canceled' => 'otkazano:',
- 'checkin_date' => 'Datum prijave:',
- 'checkout_date' => 'Datum kupnje:',
+ 'canceled' => 'otkazano',
+ 'checkin_date' => 'Datum čekanja',
+ 'checkout_date' => 'Datum kupnje',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Kliknite na sljedeću vezu kako biste potvrdili svoj: web račun:',
'current_QTY' => 'Trenutna QTY',
'days' => 'dana',
- 'expecting_checkin_date' => 'Datum predviđenog provjere:',
+ 'expecting_checkin_date' => 'Očekivani datum provjere',
'expires' => 'istječe',
'hello' => 'zdravo',
'hi' => 'bok',
'i_have_read' => 'Pročitao sam i prihvaćam uvjete korištenja i primio sam ovu stavku.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Artikal:',
+ 'item' => 'Artikal',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Postoji :count licenca koja istječe u naredna :threshold dana.|Postoje :count licence koje istječu u naredna :threshold dana.',
'link_to_update_password' => 'Kliknite sljedeću vezu da biste ažurirali svoju: web lozinku:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ime',
'new_item_checked' => 'Nova stavka je provjerena pod vašim imenom, detalji su u nastavku.',
'notes' => 'Bilješke',
- 'password' => 'Lozinka:',
+ 'password' => 'Lozinka',
'password_reset' => 'Ponovno postavljanje zaporke',
'read_the_terms' => 'Pročitajte uvjete upotrebe u nastavku.',
'read_the_terms_and_click' => 'Molimo pročitajte uvjete korištenja u nastavku i kliknite na poveznicu na dnu kako biste potvrdili da ste pročitali i da se slažete s uvjetima korištenja te da ste primili imovinu.',
- 'requested' => 'Traženi:',
+ 'requested' => 'Traženi',
'reset_link' => 'Vaša lozinka resetiraj vezu',
'reset_password' => 'Kliknite ovdje da biste poništili zaporku:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/hu-HU/admin/locations/message.php b/resources/lang/hu-HU/admin/locations/message.php
index a79cbdd770..fb86f0bbe2 100644
--- a/resources/lang/hu-HU/admin/locations/message.php
+++ b/resources/lang/hu-HU/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Hely nem létezik.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Ez a hely jelenleg legalább egy eszközhöz társítva, és nem törölhető. Frissítse eszközeit, hogy ne hivatkozzon erre a helyre, és próbálja újra.',
'assoc_child_loc' => 'Ez a hely jelenleg legalább egy gyermek helye szülője, és nem törölhető. Frissítse tartózkodási helyeit, hogy ne hivatkozzon erre a helyre, és próbálja újra.',
'assigned_assets' => 'Hozzárendelt eszközök',
diff --git a/resources/lang/hu-HU/admin/settings/general.php b/resources/lang/hu-HU/admin/settings/general.php
index b195078bad..3b646d781b 100644
--- a/resources/lang/hu-HU/admin/settings/general.php
+++ b/resources/lang/hu-HU/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Biztonsági mentések',
'backups_help' => 'Biztonsági mentések létrehozása, letöltése és visszaállítása ',
'backups_restoring' => 'Visszaállítás biztonsági másolatból',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Biztonsági másolat feltöltése',
'backups_path' => 'A tárolt biztonsági másolatok a szerveren elérhetőek a :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/hu-HU/admin/users/message.php b/resources/lang/hu-HU/admin/users/message.php
index f11845df05..e100d51b78 100644
--- a/resources/lang/hu-HU/admin/users/message.php
+++ b/resources/lang/hu-HU/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Az eszközt sikeresen csökkentetted.',
'bulk_manager_warn' => 'A felhasználók sikeresen frissültek, azonban a kezelői bejegyzést nem mentette el, mert a kiválasztott kezelő a szerkesztőben is szerepel a felhasználók listájában, és a felhasználók nem lehetnek saját kezelőik. Kérjük, ismét válassza ki a felhasználókat, kivéve a kezelőt.',
'user_exists' => 'Felhasználó már létezik!',
- 'user_not_found' => 'Felhasználó nem létezik.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'A bejelentkezési mező kötelező',
'user_has_no_assets_assigned' => 'A felhasználóhoz jelenleg nincs hozzárendelve eszköz.',
'user_password_required' => 'A jelszó szükséges.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nem sikerült keresni az LDAP kiszolgálót. Ellenőrizze az LDAP kiszolgáló konfigurációját az LDAP konfigurációs fájlban.
Az LDAP kiszolgáló hibája:',
'ldap_could_not_get_entries' => 'Nem sikerült bejegyzéseket szerezni az LDAP kiszolgálóról. Ellenőrizze az LDAP kiszolgáló konfigurációját az LDAP konfigurációs fájlban.
Az LDAP kiszolgáló hibája:',
'password_ldap' => 'A fiókhoz tartozó jelszót az LDAP / Active Directory kezeli. Kérjük, lépjen kapcsolatba informatikai részlegével a jelszó megváltoztatásához.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/hu-HU/general.php b/resources/lang/hu-HU/general.php
index 4f6613fa51..b74d8565e4 100644
--- a/resources/lang/hu-HU/general.php
+++ b/resources/lang/hu-HU/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Gyengéden törölje ezeket a felhasználókat is. Az eszköztörténetük érintetlen marad, kivéve, ha/amíg nem törli a törölt rekordokat a Rendszergazdai beállításokban.',
'bulk_checkin_delete_success' => 'A kiválasztott felhasználók törlésre, és a náluk levő eszközök visszavételre kerültek.',
'bulk_checkin_success' => 'A kiválasztott felhasználókhoz tartozó eszközök visszavételre kerültek.',
- 'set_to_null' => 'Az eszköz értékeinek törlése|Az összes :asset_count eszköz értékeinek törlése ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'A felhasználó :field értékeinek törlése|Az összes :user_count felhasználó :field értékeinek törlése ',
'na_no_purchase_date' => 'N/A - Nincs megadva a vásárlás dátuma',
'assets_by_status' => 'Eszközök státusz szerint',
@@ -559,8 +559,8 @@ return [
'expires' => 'Lejárat',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/hu-HU/localizations.php b/resources/lang/hu-HU/localizations.php
index 4705cb43d2..188164967f 100644
--- a/resources/lang/hu-HU/localizations.php
+++ b/resources/lang/hu-HU/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Válasszon ki egy nyelvet',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Angol, Amerikai Egyesült Államok',
'en-GB'=> 'Angol, Egyesült Királyság',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Válasszon ki egy országot',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension-sziget',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuadori Köztársaság',
'EE'=>'Észtország',
'EG'=>'Egyiptom',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spanyolország',
'ET'=>'Etiópia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigéria',
'NI'=>'Nicaraguai Köztársaság',
'NL'=>'Hollandia',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norvégia',
'NP'=>'Nepál',
'NR'=>'Naurui Köztársaság',
@@ -260,7 +262,7 @@ return [
'RU'=>'Oroszország',
'RW'=>'Ruandai Köztársaság',
'SA'=>'Szaúd-Arábia',
- 'UK'=>'Skócia',
+ 'GB-SCT'=>'Skócia',
'SB'=>'Salamon-szigetek',
'SC'=>'Seychelle Köztársaság',
'SS'=>'Dél-Szudán',
@@ -312,6 +314,7 @@ return [
'VI'=>'Amerikai Virgin-szigetek',
'VN'=>'Vietnám',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis-és Futuna-szigetek',
'WS'=>'Szamoa',
'YE'=>'Jemeni Köztársaság',
diff --git a/resources/lang/hu-HU/mail.php b/resources/lang/hu-HU/mail.php
index 3db4e6126b..237b8df8e7 100644
--- a/resources/lang/hu-HU/mail.php
+++ b/resources/lang/hu-HU/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A felhasználó egy elemet kért a webhelyen',
'acceptance_asset_accepted' => 'A felhasználó elfogadott egy tételt',
'acceptance_asset_declined' => 'A felhasználó visszautasított egy tételt',
- 'accessory_name' => 'Tartozéknév:',
- 'additional_notes' => 'További megjegyzések:',
+ 'accessory_name' => 'Tartozék neve',
+ 'additional_notes' => 'További megjegyzések',
'admin_has_created' => 'A rendszergazda létrehozott egy fiókot az alábbi weboldalon:',
- 'asset' => 'Eszköz:',
- 'asset_name' => 'Eszköz neve:',
+ 'asset' => 'Eszköz',
+ 'asset_name' => 'Eszköz neve',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Eszköz azonosító',
'assets_warrantee_alert' => ':count darab eszköznél a jótállás :threshold napon belül lejár.|:count darab eszköznél a jótállások :threshold napon belül lejárnak.',
'assigned_to' => 'Hozzárendelve',
'best_regards' => 'Üdvözlettel,',
- 'canceled' => 'Megszakítva:',
- 'checkin_date' => 'Visszavétel dátuma:',
- 'checkout_date' => 'Kiadási dátum:',
+ 'canceled' => 'Megszakítva',
+ 'checkin_date' => 'Visszavétel dátuma',
+ 'checkout_date' => 'Kiadási dátum',
'checkedout_from' => 'Kiadva innen',
'checkedin_from' => 'Visszavéve innen',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Kérjük, kattintson az alábbi linkre a weboldal megerősítéséhez: web account:',
'current_QTY' => 'Jelenlegi QTY',
'days' => 'Nap',
- 'expecting_checkin_date' => 'Várható visszaadás dátuma:',
+ 'expecting_checkin_date' => 'Várható visszaadás dátuma',
'expires' => 'Lejárat',
'hello' => 'Helló',
'hi' => 'Üdv',
'i_have_read' => 'Elolvastam és elfogadom a felhasználási feltételeket, és megkaptuk ezt az elemet.',
'inventory_report' => 'Készlet Jelentés',
- 'item' => 'Tétel:',
+ 'item' => 'Tétel',
'item_checked_reminder' => 'Ez egy emlékeztető arról, hogy jelenleg :count számú jóváhagyásra váró eszköze van. Kérem, az alábbi linken döntsön ezek elfogadásáról, vagy elutasításáról.',
'license_expiring_alert' => ':count licensz lejár :thershold nap múlva.|:count licensz lejár :thershold nap múlva.',
'link_to_update_password' => 'Kérjük, kattintson a következő linkre a frissítéshez: webes jelszó:',
@@ -66,11 +66,11 @@ return [
'name' => 'Név',
'new_item_checked' => 'Egy új elemet az Ön neve alatt ellenőriztek, a részletek lent találhatók.',
'notes' => 'Jegyzetek',
- 'password' => 'Jelszó:',
+ 'password' => 'Jelszó',
'password_reset' => 'Jelszó visszaállítása',
'read_the_terms' => 'Kérjük, olvassa el az alábbi használati feltételeket.',
'read_the_terms_and_click' => 'Kérjük, a használati feltételek elolvasása után az alábbi linken erősítse meg annak elfogadását, és az eszköz átvételét.',
- 'requested' => 'Kérve:',
+ 'requested' => 'Kérve',
'reset_link' => 'Jelszó visszaállítása linkre',
'reset_password' => 'Kattintson ide a jelszó visszaállításához:',
'rights_reserved' => 'Minden jog fenntartva.',
diff --git a/resources/lang/id-ID/admin/locations/message.php b/resources/lang/id-ID/admin/locations/message.php
index f2a551ea96..91df51809b 100644
--- a/resources/lang/id-ID/admin/locations/message.php
+++ b/resources/lang/id-ID/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokasi tidak ada.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Lokasi saat ini dikaitkan dengan setidaknya oleh satu aset dan tidak dapat dihapus. Perbarui aset Anda yang tidak ada referensi dari lokasi ini dan coba lagi. ',
'assoc_child_loc' => 'Lokasi saat ini digunakan oleh induk salah satu dari turunan lokasi dan tidak dapat di hapus. Mohon perbarui lokasi Anda ke yang tidak ada referensi dengan lokasi ini dan coba kembali. ',
'assigned_assets' => 'Aset yang Ditetapkan',
diff --git a/resources/lang/id-ID/admin/settings/general.php b/resources/lang/id-ID/admin/settings/general.php
index 7d1847cb1b..e5ea28f2aa 100644
--- a/resources/lang/id-ID/admin/settings/general.php
+++ b/resources/lang/id-ID/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Cadangan',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/id-ID/admin/users/message.php b/resources/lang/id-ID/admin/users/message.php
index fa87a83c3e..e93480c0b8 100644
--- a/resources/lang/id-ID/admin/users/message.php
+++ b/resources/lang/id-ID/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Anda sukses menolak aset ini.',
'bulk_manager_warn' => 'Pengguna Anda telah berhasil diperbarui, namun entri pengelola Anda tidak disimpan karena manajer yang Anda pilih juga ada dalam daftar pengguna untuk diedit, dan pengguna mungkin bukan manajer mereka sendiri. Silakan pilih pengguna Anda lagi, tidak termasuk manajernya.',
'user_exists' => 'Pengguna sudah ada!',
- 'user_not_found' => 'Pengguna tidak ada.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Kolom login wajib di-isi',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Kata sandi wajib di-isi.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Gagal mencari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP.
Eror dari server LDAP:',
'ldap_could_not_get_entries' => 'Gagal menerima catatan dari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP.
Eror dari server LDAP:',
'password_ldap' => 'Kata sandi untuk akun ini dikelola oleh LDAP / Active Directory. Silakan menghubungi departemen TI Anda untuk mengganti kata sandi Anda.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php
index 7b818d41b4..de8a9af595 100644
--- a/resources/lang/id-ID/general.php
+++ b/resources/lang/id-ID/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'Tidak tersedia - Tanggal pembelian tidak di informasikan',
'assets_by_status' => 'Aset berdasarkan status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Kadaluarsa',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/id-ID/localizations.php b/resources/lang/id-ID/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/id-ID/localizations.php
+++ b/resources/lang/id-ID/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/id-ID/mail.php b/resources/lang/id-ID/mail.php
index 10274c21da..8eef5f3406 100644
--- a/resources/lang/id-ID/mail.php
+++ b/resources/lang/id-ID/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Pengguna telah meminta item di situs web',
'acceptance_asset_accepted' => 'Pengguna telah menerima',
'acceptance_asset_declined' => 'Pengguna telah menolak',
- 'accessory_name' => 'Nama Aksesori:',
- 'additional_notes' => 'Catatan Tambahan:',
+ 'accessory_name' => 'Nama Aksesori',
+ 'additional_notes' => 'Catatan Tambahan',
'admin_has_created' => 'Administrator telah membuat akun untuk Anda di: situs web web.',
- 'asset' => 'Aset:',
- 'asset_name' => 'Nama Aset:',
+ 'asset' => 'Aset',
+ 'asset_name' => 'Nama Aset',
'asset_requested' => 'Permintaan aset',
'asset_tag' => 'Tag Aset',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Ditugaskan untuk',
'best_regards' => 'Salam Hormat,',
- 'canceled' => 'Dibatalkan:',
- 'checkin_date' => 'Tanggal Checkin:',
- 'checkout_date' => 'Tanggal keluar:',
+ 'canceled' => 'Dibatalkan',
+ 'checkin_date' => 'Tanggal Pengembalian',
+ 'checkout_date' => 'Tanggal Pemberian',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Silahkan klik pada link berikut untuk mengkonfirmasi: akun web Anda:',
'current_QTY' => 'QTY saat ini',
'days' => 'Hari',
- 'expecting_checkin_date' => 'Tanggal Checkin yang Diharapkan:',
+ 'expecting_checkin_date' => 'Tanggal pengembalian diharapkan diterima',
'expires' => 'Kadaluarsa',
'hello' => 'Halo',
'hi' => 'Hai',
'i_have_read' => 'Saya telah membaca dan menyetujui persyaratan penggunaan, dan telah menerima barang ini.',
'inventory_report' => 'Laporan Inventori',
- 'item' => 'Barang:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.|Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.',
'link_to_update_password' => 'Silahkan klik pada link berikut untuk mengupdate: password web anda:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nama',
'new_item_checked' => 'Item baru telah diperiksa berdasarkan nama Anda, rinciannya ada di bawah.',
'notes' => 'Catatan',
- 'password' => 'Password:',
+ 'password' => 'Kata sandi',
'password_reset' => 'Reset Password',
'read_the_terms' => 'Silahkan baca syarat penggunaan di bawah ini.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Diminta:',
+ 'requested' => 'Diminta',
'reset_link' => 'Tautan Reset Sandi Anda',
'reset_password' => 'Klik di sini untuk mengatur ulang kata sandi Anda:',
'rights_reserved' => 'Hak cipta di lindungi undang-undang.',
diff --git a/resources/lang/is-IS/admin/locations/message.php b/resources/lang/is-IS/admin/locations/message.php
index d313911453..992eb3ad71 100644
--- a/resources/lang/is-IS/admin/locations/message.php
+++ b/resources/lang/is-IS/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Staðsetningin er ekki til.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Skráðar eignir',
diff --git a/resources/lang/is-IS/admin/settings/general.php b/resources/lang/is-IS/admin/settings/general.php
index 71abc72550..2f072bccd7 100644
--- a/resources/lang/is-IS/admin/settings/general.php
+++ b/resources/lang/is-IS/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Öryggisafrit',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/is-IS/admin/users/message.php b/resources/lang/is-IS/admin/users/message.php
index fa2ffd8f0e..d2937a4b2b 100644
--- a/resources/lang/is-IS/admin/users/message.php
+++ b/resources/lang/is-IS/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/is-IS/button.php b/resources/lang/is-IS/button.php
index 2593b018ea..468e94bf08 100644
--- a/resources/lang/is-IS/button.php
+++ b/resources/lang/is-IS/button.php
@@ -7,7 +7,7 @@ return [
'checkin_and_delete' => 'Skrá inn allt / Eyða notenda',
'delete' => 'Eyða',
'edit' => 'Breyta',
- 'clone' => 'Clone',
+ 'clone' => 'Klóna',
'restore' => 'Endurheimta',
'remove' => 'Fjarlægja',
'request' => 'Óska eftir',
diff --git a/resources/lang/is-IS/general.php b/resources/lang/is-IS/general.php
index bcd7d35375..d12d71eaec 100644
--- a/resources/lang/is-IS/general.php
+++ b/resources/lang/is-IS/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Einnig merkja eydda "soft-delete" þessa notendur. Hreyfingarsaga eigna mun haldast óbreytt eða þangað til að þú velur að eyða varanlega "purge deleted" færslum í stjórnarenda stillingum.',
'bulk_checkin_delete_success' => 'Valdir notendur hefur verið eytt og hlutir þeirra hafa verið skráðir inn.',
'bulk_checkin_success' => 'Hlutir fyrir valin notenda hafa verið skrá inn.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - Vantar kaupdagssetningu',
'assets_by_status' => 'Eignir(búnaður) eftir stöðu',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires (útrunnið)',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/is-IS/localizations.php b/resources/lang/is-IS/localizations.php
index fd2d8233f6..979e1f0924 100644
--- a/resources/lang/is-IS/localizations.php
+++ b/resources/lang/is-IS/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Veldu tungumál',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -53,7 +53,7 @@ return [
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
'so-SO'=> 'Somali',
- 'es-ES'=> 'Spanish',
+ 'es-ES'=> 'Spænska',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
'es-VE'=> 'Spanish, Venezuela',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'United Kingdom',
+ 'GB-SCT'=>'United Kingdom',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/is-IS/mail.php b/resources/lang/is-IS/mail.php
index c474ad3449..cb52a86dbe 100644
--- a/resources/lang/is-IS/mail.php
+++ b/resources/lang/is-IS/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Viðbótar upplýsingar:',
+ 'accessory_name' => 'Nafn aukabúnaðs',
+ 'additional_notes' => 'Viðbótar upplýsingar',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Eign:',
- 'asset_name' => 'Heiti eignar:',
+ 'asset' => 'Eign',
+ 'asset_name' => 'Heiti eignar',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Búnaðar númer',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Skráð á',
'best_regards' => 'Með kveðju,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Skiladagsetning',
+ 'checkout_date' => 'Ráðstöfunardagsetning',
'checkedout_from' => 'Skráð út frá',
'checkedin_from' => 'Skráð inn frá',
'checked_into' => 'Skráð inní',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Dagar',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Áætluð skiladagsetning',
'expires' => 'Rennur út',
'hello' => 'Halló',
'hi' => 'Hæ',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Atriði',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nafn búnaðar',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Athugasemdir',
- 'password' => 'Password:',
+ 'password' => 'Lykilorð',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Óskað eftir',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/it-IT/account/general.php b/resources/lang/it-IT/account/general.php
index c49a4b5e56..042f73baf3 100644
--- a/resources/lang/it-IT/account/general.php
+++ b/resources/lang/it-IT/account/general.php
@@ -13,5 +13,5 @@ return array(
'profile_updated' => 'Account aggiornato con successo',
'no_tokens' => 'Non hai creato nessun token di accesso personale.',
'enable_sounds' => 'Attiva gli effetti sonori',
- 'enable_confetti' => 'Enable confetti effects',
+ 'enable_confetti' => 'Abilita effetti confetti',
);
diff --git a/resources/lang/it-IT/admin/custom_fields/message.php b/resources/lang/it-IT/admin/custom_fields/message.php
index 6e62fd4d96..3b36100943 100644
--- a/resources/lang/it-IT/admin/custom_fields/message.php
+++ b/resources/lang/it-IT/admin/custom_fields/message.php
@@ -5,7 +5,7 @@ return array(
'field' => array(
'invalid' => 'Il campo non esiste.',
'already_added' => 'Campo già aggiunto',
- 'none_selected' => 'No field selected',
+ 'none_selected' => 'Nessun campo selezionato',
'create' => array(
'error' => 'Campo non creato, riprova.',
diff --git a/resources/lang/it-IT/admin/hardware/general.php b/resources/lang/it-IT/admin/hardware/general.php
index e0f5220953..ba51e77632 100644
--- a/resources/lang/it-IT/admin/hardware/general.php
+++ b/resources/lang/it-IT/admin/hardware/general.php
@@ -4,7 +4,7 @@ return [
'about_assets_title' => 'Informazioni sugli asset',
'about_assets_text' => 'Gli asset sono elementi tracciati con il numero di serie o il tag di asset. Tendono ad essere oggetti di valore più elevato dove identificare un elemento specifico.',
'archived' => 'Archiviato',
- 'asset' => 'Asset',
+ 'asset' => 'Bene',
'bulk_checkout' => 'Ritiro Asset',
'bulk_checkin' => 'Check-in Bene',
'checkin' => 'Ingresso Asset',
diff --git a/resources/lang/it-IT/admin/hardware/message.php b/resources/lang/it-IT/admin/hardware/message.php
index 27ba872e14..e8ea4f72f1 100644
--- a/resources/lang/it-IT/admin/hardware/message.php
+++ b/resources/lang/it-IT/admin/hardware/message.php
@@ -2,7 +2,7 @@
return [
- 'undeployable' => 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+ 'undeployable' => 'Attenzione: Questo Bene è stato marcato come non distribuibile. Se lo stato del Bene è cambiato si prega di aggiornarlo.',
'does_not_exist' => 'Questo Asset non esiste.',
'does_not_exist_var'=> 'Bene con tag :asset_tag non trovato.',
'no_tag' => 'Nessun tag del Bene è stato fornito.',
@@ -51,7 +51,7 @@ return [
],
'import' => [
- 'import_button' => 'Process Import',
+ 'import_button' => 'Importa Processo',
'error' => 'Alcuni elementi non sono stati importati correttamente.',
'errorDetail' => 'Gli articoli seguenti non sono stati importati correttamente a causa di errori.',
'success' => 'Il file è stato importato con successo',
diff --git a/resources/lang/it-IT/admin/hardware/table.php b/resources/lang/it-IT/admin/hardware/table.php
index c0d0401e67..42ca7fe42d 100644
--- a/resources/lang/it-IT/admin/hardware/table.php
+++ b/resources/lang/it-IT/admin/hardware/table.php
@@ -8,7 +8,7 @@ return [
'book_value' => 'Valore Attuale',
'change' => 'Dentro/Fuori',
'checkout_date' => 'Data di estrazione',
- 'checkoutto' => 'Estratto',
+ 'checkoutto' => 'Assegnato',
'components_cost' => 'Costo Totale Componenti',
'current_value' => 'Valore Attuale',
'diff' => 'Differenza',
diff --git a/resources/lang/it-IT/admin/kits/general.php b/resources/lang/it-IT/admin/kits/general.php
index fb64eb3f6e..c0658a9029 100644
--- a/resources/lang/it-IT/admin/kits/general.php
+++ b/resources/lang/it-IT/admin/kits/general.php
@@ -47,5 +47,5 @@ return [
'kit_deleted' => 'Il kit è stato eliminato con successo',
'kit_model_updated' => 'Il modello è stato aggiornato correttamente',
'kit_model_detached' => 'Model was successfully detached',
- 'model_already_attached' => 'Model already attached to kit',
+ 'model_already_attached' => 'Modello già collegato al kit',
];
diff --git a/resources/lang/it-IT/admin/licenses/general.php b/resources/lang/it-IT/admin/licenses/general.php
index 83a1e5d948..01e798b893 100644
--- a/resources/lang/it-IT/admin/licenses/general.php
+++ b/resources/lang/it-IT/admin/licenses/general.php
@@ -14,7 +14,7 @@ return array(
'info' => 'Informazioni Licenza',
'license_seats' => 'Licenza Sede',
'seat' => 'Sede',
- 'seat_count' => 'Seat :count',
+ 'seat_count' => 'Slot :count',
'seats' => 'Sedi',
'software_licenses' => 'Licenze Software',
'user' => 'Utente',
@@ -24,12 +24,12 @@ return array(
[
'checkin_all' => [
'button' => 'Check-in di tutte le postazioni',
- 'modal' => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+ 'modal' => 'Questa azione restituirà uno slot. | Questa azione restituirà tutti i :checkedout_seats_count slot di questa licenza.',
'enabled_tooltip' => 'Check-in di TUTTE le postazioni di questa licenza, sia di utenti che di beni',
'disabled_tooltip' => 'Disattivato perché non ci sono postazioni assegnate',
'disabled_tooltip_reassignable' => 'Disattivato a causa della licenza non reassegnabile',
'success' => 'Check-in della licenza effettuato! | Check-in di tutte le licenze effettuato!',
- 'log_msg' => 'Checked in via bulk license checkin in license GUI',
+ 'log_msg' => 'Restituzione effettuata tramite la restituzione massiva nell\'interfaccia delle Licenze',
],
'checkout_all' => [
diff --git a/resources/lang/it-IT/admin/licenses/message.php b/resources/lang/it-IT/admin/licenses/message.php
index 55dcac1013..c52325b980 100644
--- a/resources/lang/it-IT/admin/licenses/message.php
+++ b/resources/lang/it-IT/admin/licenses/message.php
@@ -44,8 +44,8 @@ return array(
'error' => 'C\'è stato un problema nell\'estrazione della licenza. Riprova.',
'success' => 'La licenza è stata estratta con successo',
'not_enough_seats' => 'Non ci sono abbastanza copie della licenza disponibili per l\'assegnazione',
- 'mismatch' => 'The license seat provided does not match the license',
- 'unavailable' => 'This seat is not available for checkout.',
+ 'mismatch' => 'Lo slot di licenza fornito non corrisponde alla licenza',
+ 'unavailable' => 'Questo slot non è disponibile per l\'Assegnazione.',
),
'checkin' => array(
diff --git a/resources/lang/it-IT/admin/locations/message.php b/resources/lang/it-IT/admin/locations/message.php
index 039bcbad1b..8f90a8cea8 100644
--- a/resources/lang/it-IT/admin/locations/message.php
+++ b/resources/lang/it-IT/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'La posizione non esiste.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'Non puoi eliminare questa Sede/Luogo perché è associata ad almeno un Bene o un Utente, o ha Beni assegnati, o è la Sede sotto la quale sono registrate altre Sedi. Aggiorna le altre voci in modo che non facciano più riferimento a questa Sede e poi riprova. ',
'assoc_assets' => 'Questa posizione è associata ad almeno un prodotto e non può essere cancellata. Si prega di aggiornare i vostri prodotti di riferimento e riprovare. ',
'assoc_child_loc' => 'Questa posizione è parente di almeno un\'altra posizione e non può essere cancellata. Si prega di aggiornare le vostre posizioni di riferimento e riprovare. ',
'assigned_assets' => 'Beni Assegnati',
'current_location' => 'Posizione attuale',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => 'Apri con :map_provider_icon Maps',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'La Posizione non è stata ripristinata, si prega di riprovare',
+ 'success' => 'La Posizione è stata ripristinata con successo.'
),
'delete' => array(
diff --git a/resources/lang/it-IT/admin/locations/table.php b/resources/lang/it-IT/admin/locations/table.php
index f5b571c690..a0d02e39cb 100644
--- a/resources/lang/it-IT/admin/locations/table.php
+++ b/resources/lang/it-IT/admin/locations/table.php
@@ -31,8 +31,8 @@ return [
'asset_model' => 'Modello',
'asset_serial' => 'Seriale',
'asset_location' => 'Posizione',
- 'asset_checked_out' => 'Checked-Out il',
- 'asset_expected_checkin' => 'Check-In Previsto',
+ 'asset_checked_out' => 'Assegnato',
+ 'asset_expected_checkin' => 'Restituzione prevista',
'date' => 'Data:',
'phone' => 'Telefono Posizione',
'signed_by_asset_auditor' => 'Firmato Da (Revisore dei Beni):',
diff --git a/resources/lang/it-IT/admin/settings/general.php b/resources/lang/it-IT/admin/settings/general.php
index 1cb248b909..33e127607f 100644
--- a/resources/lang/it-IT/admin/settings/general.php
+++ b/resources/lang/it-IT/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Crea, scarica e ripristina i backup ',
'backups_restoring' => 'Ripristino da backup',
+ 'backups_clean' => 'Pulire il database di backup prima di ripristinare',
+ 'backups_clean_helptext' => "Questo può essere utile se stai cambiando tra le versioni del database",
'backups_upload' => 'Carica Backup',
'backups_path' => 'I backup sul server sono memorizzati in :path',
'backups_restore_warning' => 'Usa il pulsante di ripristino per ripristinare un backup precedente. (Al momento non funziona con l\'archivio file S3 o Docker.)
L\'intero database di :app_name e i file caricati saranno completamente sostituiti dal contenuto nel file di backup. ',
@@ -94,7 +96,7 @@ return [
'ldap_login_sync_help' => 'Questo verifica solamente che LDAP possa sincronizzare correttamente. Se la tua query di autenticazione LDAP non è corretta, gli utenti potrebbero non essere ancora in grado di accedere. DEVI SALVARE LE IMPOSTAZIONI LDAP PRIMA DI EFFETTUARE QUESTO TEST.',
'ldap_manager' => 'Manager LDAP',
'ldap_server' => 'Server LDAP',
- 'ldap_server_help' => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+ 'ldap_server_help' => 'Dovrebbe iniziare con ldap:// (se non crittografato) o ldaps:// (se TLS o SSL)',
'ldap_server_cert' => 'Validazione certificato SSL di LDAP',
'ldap_server_cert_ignore' => 'Consenti Certificato SSL non valido',
'ldap_server_cert_help' => 'Seleziona questa casella se stai utilizzando un certificato SSL autofirmato e vuoi accettare un certificato SSL non valido.',
@@ -218,8 +220,8 @@ return [
'webhook_integration_help' => 'L\'integrazione con :app è facoltativa, ma se si desidera utilizzarla bisogna specificare l\'endpoint e il canale. Per configurare l\'integrazione devi creare un webhook in arrivo sul tuo account :app . Clicca su Prova integrazione :app per confermare che le impostazioni siano corrette prima di salvare. ',
'webhook_integration_help_button' => 'Una volta salvate le informazioni di :app, apparirà un pulsante di prova.',
'webhook_test_help' => 'Verifica se l\'integrazione :app è configurata correttamente. DEVI PRIMA SALVARE LE IMPOSTAZIONI :app AGGIORNATE.',
- 'shortcuts_enabled' => 'Enable Shortcuts',
- 'shortcuts_help_text' => 'Windows: Alt + Access key, Mac: Control + Option + Access key',
+ 'shortcuts_enabled' => 'Abilita Scorciatoie',
+ 'shortcuts_help_text' => 'Windows: Alt + Tasto accesso, Mac: Control + Option + Tasto accesso',
'snipe_version' => 'Snipe-IT version',
'support_footer' => 'Supporto per i collegamenti a piè di pagina ',
'support_footer_help' => 'Specificare chi vede i collegamenti alle informazioni sul supporto IT e su Snipe-IT',
@@ -377,11 +379,11 @@ return [
'timezone' => 'Fuso orario',
'profile_edit' => 'Modifica Profilo',
'profile_edit_help' => 'Consenti agli utenti di modificare i propri profili.',
- 'default_avatar' => 'Upload custom default avatar',
- 'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
- 'restore_default_avatar' => 'Restore original system default avatar',
+ 'default_avatar' => 'Carica avatar predefinito personalizzato',
+ 'default_avatar_help' => 'Questa immagine verrà visualizzata come profilo se un utente non ha una foto di profilo.',
+ 'restore_default_avatar' => 'Ripristina avatar predefinito di sistema',
'restore_default_avatar_help' => '',
- 'due_checkin_days' => 'Due For Checkin Warning',
- 'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+ 'due_checkin_days' => 'Avviso di prevista Restituzione',
+ 'due_checkin_days_help' => 'Quanti giorni prima della restituzione prevista di un Bene dovrebbe essere elencato nella pagina della "Restituzioni Previste"?',
];
diff --git a/resources/lang/it-IT/admin/users/message.php b/resources/lang/it-IT/admin/users/message.php
index 654d82fdf0..e201b6c81d 100644
--- a/resources/lang/it-IT/admin/users/message.php
+++ b/resources/lang/it-IT/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Hai rifiutato con successo questo prodotto.',
'bulk_manager_warn' => 'I tuoi utenti sono stati aggiornati con successo, tuttavia la voce del gestore non è stata salvata perché il gestore selezionato è stato anche nell\'elenco utenti da modificare e gli utenti potrebbero non essere il proprio gestore. Seleziona nuovamente i tuoi utenti, esclusi il gestore.',
'user_exists' => 'Utente già esistente!',
- 'user_not_found' => 'L\'utente non esiste.',
+ 'user_not_found' => 'L\'Utente non esiste, oppure non hai i permessi per visualizzarlo.',
'user_login_required' => 'È necessario il campo login',
'user_has_no_assets_assigned' => 'Nessun bene assegnato all\'utente.',
'user_password_required' => 'È richiesta la password.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Impossibile trovare il server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP:',
'ldap_could_not_get_entries' => 'Impossibile ottenere voci dal server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP:',
'password_ldap' => 'La password per questo account è gestita da LDAP / Active Directory. Per cambiare la tua password, contatta il tuo reparto IT.',
+ 'multi_company_items_assigned' => 'Questo utente ha delle cose assegnate, prima di cambiare azienda le deve restituire.'
),
'deletefile' => array(
diff --git a/resources/lang/it-IT/button.php b/resources/lang/it-IT/button.php
index e2c400b10e..767da37440 100644
--- a/resources/lang/it-IT/button.php
+++ b/resources/lang/it-IT/button.php
@@ -7,7 +7,7 @@ return [
'checkin_and_delete' => 'Restituisci tutto / Elimina utente',
'delete' => 'Cancella',
'edit' => 'Modifica',
- 'clone' => 'Clone',
+ 'clone' => 'Clona',
'restore' => 'Ripristina',
'remove' => 'Rimuovi',
'request' => 'Richiedi',
@@ -23,12 +23,12 @@ return [
'append' => 'Aggiungi',
'new' => 'Nuovo',
'var' => [
- 'clone' => 'Clone :item_type',
- 'edit' => 'Edit :item_type',
- 'delete' => 'Delete :item_type',
- 'restore' => 'Restore :item_type',
- 'create' => 'Create New :item_type',
- 'checkout' => 'Checkout :item_type',
- 'checkin' => 'Checkin :item_type',
+ 'clone' => 'Clona :item_type',
+ 'edit' => 'Modifica :item_type',
+ 'delete' => 'Elimina :item_type',
+ 'restore' => 'Ripristina :item_type',
+ 'create' => 'Crea Nuovo :item_type',
+ 'checkout' => 'Assegna :item_type',
+ 'checkin' => 'Restituisci :item_type',
]
];
diff --git a/resources/lang/it-IT/general.php b/resources/lang/it-IT/general.php
index d39c171832..f0f851638c 100644
--- a/resources/lang/it-IT/general.php
+++ b/resources/lang/it-IT/general.php
@@ -134,7 +134,7 @@ return [
'lastname_firstinitial' => 'Cognome_ Iniziale Nome (smith_j@example.com)',
'firstinitial.lastname' => 'Iniziale Nome . Cognome (j.smith@example.com)',
'firstnamelastinitial' => 'Nome + Iniziale Cognome (janes@example.com)',
- 'lastnamefirstname' => 'Last Name.First Name (smith.jane@example.com)',
+ 'lastnamefirstname' => 'Cognome.Nome (rossi.mario@example.com)',
'first_name' => 'Nome',
'first_name_format' => 'Nome (jane@example.com)',
'files' => 'Files',
@@ -156,8 +156,8 @@ return [
'image_delete' => 'Cancella l\'Immagine',
'include_deleted' => 'Includi i Beni Eliminati',
'image_upload' => 'Carica immagine',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
- 'filetypes_size_help' => 'The maximum upload size allowed is :size.',
+ 'filetypes_accepted_help' => 'Il tipo di file accettato è :types. La dimensione massima è :size.|I tipi di file accettati sono :types. La dimensione massima di caricamento è :size.',
+ 'filetypes_size_help' => 'La dimensione massima di caricamento è :size.',
'image_filetypes_help' => 'I tipi di file accettati sono jpg, webp, png, gif, svg e avif. La dimensione massima consentita è :size.',
'unaccepted_image_type' => 'Questo immagine non è leggibile. I tipi di file accettati sono jpg, webp, png, gif e svg. Il tipo di questo file è :mimetype.',
'import' => 'Importa',
@@ -193,7 +193,7 @@ return [
'logout' => 'Logout',
'lookup_by_tag' => 'Ricerca per Etichetta Bene',
'maintenances' => 'Manutenzioni',
- 'manage_api_keys' => 'Manage API keys',
+ 'manage_api_keys' => 'Gestisci le Chiavi API',
'manufacturer' => 'Produttore',
'manufacturers' => 'Produttori',
'markdown' => 'Questo campo consente un Markdown di tipo Github.',
@@ -254,7 +254,7 @@ return [
'select_all' => 'Seleziona tutto',
'search' => 'Cerca',
'select_category' => 'Seleziona una categoria',
- 'select_datasource' => 'Select a data source',
+ 'select_datasource' => 'Seleziona una Origine Dati',
'select_department' => 'Seleziona un Reparto',
'select_depreciation' => 'Seleziona un tipo di Svalutazione',
'select_location' => 'Seleziona un Luogo',
@@ -274,12 +274,12 @@ return [
'signed_off_by' => 'Firmato Da',
'skin' => 'Tema',
'webhook_msg_note' => 'Una notifica verrà inviata tramite webhook',
- 'webhook_test_msg' => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+ 'webhook_test_msg' => 'Ciao! Sembra che l\'integrazione di :app su Snipe-IT funzioni!',
'some_features_disabled' => 'DEMO: Alcune caratteristiche sono disabilitate in questa modalità.',
'site_name' => 'Nome sito',
'state' => 'Provincia',
'status_labels' => 'Etichette di Stato',
- 'status_label' => 'Status Label',
+ 'status_label' => 'Etichetta stato',
'status' => 'Stato',
'accept_eula' => 'Accettazione Accordo',
'supplier' => 'Fornitore',
@@ -340,15 +340,15 @@ return [
'view_all' => 'visualizza tutti',
'hide_deleted' => 'Nascondi Eliminati',
'email' => 'Email',
- 'do_not_change' => 'Do not change',
- 'bug_report' => 'Report a bug',
+ 'do_not_change' => 'Non cambiare',
+ 'bug_report' => 'Segnala un bug',
'user_manual' => 'Manuale Utente',
'setup_step_1' => 'Passo 1',
'setup_step_2' => 'Passo 2',
'setup_step_3' => 'Passo 3',
'setup_step_4' => 'Passo 4',
'setup_config_check' => 'Controllo Configurazione',
- 'setup_create_database' => 'Create database tables',
+ 'setup_create_database' => 'Crea tabelle database',
'setup_create_admin' => 'Crea un utente amministratore',
'setup_done' => 'Finito!',
'bulk_edit_about_to' => 'Stai per modificare quanto segue: ',
@@ -419,14 +419,14 @@ return [
'bulk_soft_delete' =>'Includi soft-delete di questi utenti. La cronologia dei loro Beni rimarrà intatta finché non elimini i record nelle Impostazioni di Amministrazione.',
'bulk_checkin_delete_success' => 'Gli utenti che hai selezionato sono stati eliminati e i loro articoli sono stati restituiti.',
'bulk_checkin_success' => 'Gli articoli degli utenti selezionati sono stati restituiti.',
- 'set_to_null' => 'Elimina i valori per questo Bene|Elimina i valori per :asset_count Beni ',
+ 'set_to_null' => 'Elimina i valori per questa selezione|Elimina i valori per tutte le :selection_count selezioni ',
'set_users_field_to_null' => 'Cancella i valori :field per questo utente|Cancella i valori :field per tutti i :user_count utenti ',
'na_no_purchase_date' => 'N/D - data acquisto non dichiarata',
'assets_by_status' => 'Beni per Stato',
'assets_by_status_type' => 'Beni per Tipo di Stato',
'pie_chart_type' => 'Tipo di Grafico a Torta nel Cruscotto',
'hello_name' => 'Ciao, :name!',
- 'unaccepted_profile_warning' => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+ 'unaccepted_profile_warning' => 'Hai un oggetto che richiede l\'accettazione. Clicca qui per accettarlo o rifiutarlo|Hai :count elementi che richiedono l\'accettazione. Clicca qui per accettarli o rifiutarli',
'start_date' => 'Data Inizio',
'end_date' => 'Data Fine',
'alt_uploaded_image_thumbnail' => 'Miniatura caricata',
@@ -557,10 +557,10 @@ return [
'something_went_wrong' => 'Qualcosa è andato storto con la tua richiesta.',
'close' => 'Chiudi',
'expires' => 'Scade',
- 'map_fields'=> 'Map :item_type Field',
- 'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
- 'label' => 'Label',
+ 'map_fields'=> 'Mappa il Campo :item_type',
+ 'remaining_var' => ':count Rimanenti',
+ 'label' => 'Etichetta',
'import_asset_tag_exists' => 'Esiste già un Bene con tag :asset_tag e non è stato richiesto un aggiornamento. Nessuna modifica effettuata.',
+ 'countries_manually_entered_help' => 'I valori con un asterisco (*) sono stati inseriti manualmente e non corrispondono a valori esistenti ISO 3166 nell\'elenco a discesa',
];
diff --git a/resources/lang/it-IT/localizations.php b/resources/lang/it-IT/localizations.php
index c56b06d73b..a3d68a36b3 100644
--- a/resources/lang/it-IT/localizations.php
+++ b/resources/lang/it-IT/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Seleziona la lingua',
+ 'select_language' => 'Seleziona una lingua',
'languages' => [
'en-US'=> 'Inglese, Stati Uniti',
'en-GB'=> 'Inglese, Regno Unito',
@@ -41,7 +41,7 @@ return [
'mi-NZ'=> 'Maori',
'mn-MN'=> 'Mongolo',
//'no-NO'=> 'Norwegian',
- 'nb-NO'=> 'Norwegian Bokmål',
+ 'nb-NO'=> 'Norvegese Bokmål',
//'nn-NO'=> 'Norwegian Nynorsk',
'fa-IR'=> 'Persiano',
'pl-PL'=> 'Polacco',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Seleziona un paese',
+ 'select_country' => 'Seleziona un Paese',
'countries' => [
'AC'=>'Isola di Ascensione',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egitto',
+ 'GB-ENG'=>'Inghilterra',
'ER'=>'Eritrea',
'ES'=>'Spagna',
'ET'=>'Etiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Paesi Bassi',
+ 'GB-NIR' => 'Irlanda del Nord',
'NO'=>'Norvegia',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federazione Russa',
'RW'=>'Rwanda',
'SA'=>'Arabia Saudita',
- 'UK'=>'Scozia',
+ 'GB-SCT'=>'Scozia',
'SB'=>'Isole Salomone',
'SC'=>'Seychelles',
'SS'=>'Sudan Sud',
@@ -312,6 +314,7 @@ return [
'VI'=>'Isole Vergini (British.)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Galles',
'WF'=>'Isole di Wallis e Futuna',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/it-IT/mail.php b/resources/lang/it-IT/mail.php
index 6d50e26e14..004a90841f 100644
--- a/resources/lang/it-IT/mail.php
+++ b/resources/lang/it-IT/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un utente ha richiesto un elemento tramite il sito web',
'acceptance_asset_accepted' => 'Un utente ha accettato un elemento',
'acceptance_asset_declined' => 'Un utente ha rifiutato un elemento',
- 'accessory_name' => 'Nome accessorio:',
- 'additional_notes' => 'Note aggiuntive:',
+ 'accessory_name' => 'Nome Accessorio',
+ 'additional_notes' => 'Note aggiuntive',
'admin_has_created' => 'Un amministratore ha creato un account per il tuo sito web: web.',
- 'asset' => 'Bene:',
- 'asset_name' => 'Nome del bene:',
+ 'asset' => 'Bene',
+ 'asset_name' => 'Nome bene',
'asset_requested' => 'Bene richiesto',
'asset_tag' => 'Etichetta del bene',
'assets_warrantee_alert' => 'C\'è :count bene con garanzia in scadenza nei prossimi :threshold giorni.|Ci sono :count beni con garanzia in scadenza nei prossimi :threshold giorni.',
'assigned_to' => 'Assegnato a',
'best_regards' => 'Cordiali saluti,',
- 'canceled' => 'Annullato:',
- 'checkin_date' => 'Data di restituzione:',
- 'checkout_date' => 'Data di assegnazione:',
+ 'canceled' => 'Annullato',
+ 'checkin_date' => 'Data di entrata',
+ 'checkout_date' => 'Data di estrazione',
'checkedout_from' => 'Assegnato a',
'checkedin_from' => 'Accesso effettuato da',
'checked_into' => 'Assegnato nel',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Per favore, clicca sul seguente link per confermare il tuo account su :web :',
'current_QTY' => 'Quantità attuale',
'days' => 'Giorni',
- 'expecting_checkin_date' => 'Data di riconsegna prevista:',
+ 'expecting_checkin_date' => 'Data di riconsegna prevista',
'expires' => 'Scade',
'hello' => 'Ciao',
'hi' => 'Ciao',
'i_have_read' => 'Ho letto e accetto i termini di utilizzo e ho ricevuto questo elemento.',
'inventory_report' => 'Rapporto Inventario',
- 'item' => 'Articolo:',
+ 'item' => 'Articolo',
'item_checked_reminder' => 'Promemoria: attualmente hai :count elementi assegnati che non hai né accettato né rifiutato. Clicca sul link qui sotto per confermare la tua decisione.',
'license_expiring_alert' => 'Tra :threshold giorni sta per scadere :count licenza. |Tra :threshold giorni stanno per scadere :count licenze.',
'link_to_update_password' => 'Per favore clicca sul seguente collegamento per aggiornare la tua password per :web :',
@@ -66,11 +66,11 @@ return [
'name' => 'Nome',
'new_item_checked' => 'Ti è stato assegnato un nuovo Bene, di seguito i dettagli.',
'notes' => 'Note',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Reimposta la password',
'read_the_terms' => 'Leggi i termini di utilizzo qui sotto.',
'read_the_terms_and_click' => 'Leggi qui sotto i termini di utilizzo e fai clic sul link in basso per confermare di averli letti ed accettati e di aver quindi ricevuto il bene.',
- 'requested' => 'Richiesto:',
+ 'requested' => 'Richiesto',
'reset_link' => 'Il tuo link per reimpostare la password',
'reset_password' => 'Clicca qui per reimpostare la tua password:',
'rights_reserved' => 'Tutti i diritti riservati.',
diff --git a/resources/lang/it-IT/validation.php b/resources/lang/it-IT/validation.php
index 21739b2ec2..13d765b8fa 100644
--- a/resources/lang/it-IT/validation.php
+++ b/resources/lang/it-IT/validation.php
@@ -13,17 +13,17 @@ return [
|
*/
- 'accepted' => 'The :attribute field must be accepted.',
- 'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
- 'active_url' => 'The :attribute field must be a valid URL.',
- 'after' => 'The :attribute field must be a date after :date.',
- 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
- 'alpha' => 'The :attribute field must only contain letters.',
- 'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
- 'alpha_num' => 'The :attribute field must only contain letters and numbers.',
- 'array' => 'The :attribute field must be an array.',
- 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
- 'before' => 'The :attribute field must be a date before :date.',
+ 'accepted' => 'Il campo :attribute deve essere accettato.',
+ 'accepted_if' => 'Il campo :attribute deve essere accettato quando :other è :value.',
+ 'active_url' => 'Il campo :attribute deve essere un URL valido.',
+ 'after' => 'Il campo :attribute deve essere una data successiva a :date.',
+ 'after_or_equal' => 'Il campo :attribute deve essere una data successiva o uguale a :date.',
+ 'alpha' => 'Il campo :attribute deve contenere solo lettere.',
+ 'alpha_dash' => 'Il campo :attribute deve contenere solo lettere, numeri, trattini o trattini bassi.',
+ 'alpha_num' => 'Il campo :attribute deve contenere solo lettere e numeri.',
+ 'array' => 'Il campo :attribute deve essere un array.',
+ 'ascii' => 'Il campo :attribute deve contenere solo caratteri alfanumerici e simboli a byte singolo.',
+ 'before' => 'Il campo :attribute deve essere una data precedente il :date.',
'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
'between' => [
'array' => 'The :attribute field must have between :min and :max items.',
@@ -108,8 +108,8 @@ return [
'numeric' => 'The :attribute field must be at least :min.',
'string' => 'The :attribute field must be at least :min characters.',
],
- 'min_digits' => 'The :attribute field must have at least :min digits.',
- 'missing' => 'The :attribute field must be missing.',
+ 'min_digits' => 'Il campo :attribute deve avere almeno :min cifre.',
+ 'missing' => 'Il campo :attribute deve mancare.',
'missing_if' => 'The :attribute field must be missing when :other is :value.',
'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
'missing_with' => 'The :attribute field must be missing when :values is present.',
@@ -117,9 +117,9 @@ return [
'multiple_of' => 'The :attribute field must be a multiple of :value.',
'not_in' => ':attribute selezionato non è valido.',
'not_regex' => 'The :attribute field format is invalid.',
- 'numeric' => 'The :attribute field must be a number.',
+ 'numeric' => 'Il campo :attribute deve essere un numero.',
'password' => [
- 'letters' => 'The :attribute field must contain at least one letter.',
+ 'letters' => 'Il campo :attribute deve contenere almeno una lettera.',
'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
'numbers' => 'The :attribute field must contain at least one number.',
'symbols' => 'The :attribute field must contain at least one symbol.',
@@ -169,7 +169,7 @@ return [
'unique' => ':attribute è già stato preso.',
'uploaded' => 'Non è stato possibile caricare :attribute.',
'uppercase' => 'The :attribute field must be uppercase.',
- 'url' => 'The :attribute field must be a valid URL.',
+ 'url' => 'Il campo :attribute deve essere un URL valido.',
'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute field must be a valid UUID.',
@@ -229,8 +229,8 @@ return [
'generic' => [
'invalid_value_in_field' => 'Valore non valido incluso in questo campo',
- 'required' => 'This field is required',
- 'email' => 'Please enter a valid email address',
+ 'required' => 'Questo campo è obbligatorio',
+ 'email' => 'Inserire un indirizzo e-mail valido',
],
diff --git a/resources/lang/iu-NU/admin/locations/message.php b/resources/lang/iu-NU/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/iu-NU/admin/locations/message.php
+++ b/resources/lang/iu-NU/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/iu-NU/admin/settings/general.php b/resources/lang/iu-NU/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/iu-NU/admin/settings/general.php
+++ b/resources/lang/iu-NU/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/iu-NU/admin/users/message.php b/resources/lang/iu-NU/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/iu-NU/admin/users/message.php
+++ b/resources/lang/iu-NU/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/iu-NU/general.php b/resources/lang/iu-NU/general.php
index 7634387906..3092228674 100644
--- a/resources/lang/iu-NU/general.php
+++ b/resources/lang/iu-NU/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/iu-NU/localizations.php b/resources/lang/iu-NU/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/iu-NU/localizations.php
+++ b/resources/lang/iu-NU/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/iu-NU/mail.php b/resources/lang/iu-NU/mail.php
index edb1683200..72fb70db80 100644
--- a/resources/lang/iu-NU/mail.php
+++ b/resources/lang/iu-NU/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/ja-JP/admin/locations/message.php b/resources/lang/ja-JP/admin/locations/message.php
index 218e7f9755..a8ebea542a 100644
--- a/resources/lang/ja-JP/admin/locations/message.php
+++ b/resources/lang/ja-JP/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'ロケーションが存在しません。',
- 'assoc_users' => 'この場所は少なくとも1つのアセットまたはユーザーのレコードの場所であるか、アセットに割り当てられているか、別の場所の親の場所であるため、現在削除できません。 モデルを更新して、この場所を参照しないようにして、もう一度やり直してください。 ',
+ 'assoc_users' => 'この場所は少なくとも1つのアセットまたはユーザーのレコードの場所であるか、アセットに割り当てられているか、別の場所の親の場所であるため、現在削除できません。 レコードを更新して、この場所を参照しないようにして、もう一度やり直してください。 ',
'assoc_assets' => 'この設置場所は1人以上の利用者に関連付けされているため、削除できません。設置場所の関連付けを削除し、もう一度試して下さい。 ',
'assoc_child_loc' => 'この設置場所は、少なくとも一つの配下の設置場所があります。この設置場所を参照しないよう更新して下さい。 ',
'assigned_assets' => '割り当て済みアセット',
diff --git a/resources/lang/ja-JP/admin/settings/general.php b/resources/lang/ja-JP/admin/settings/general.php
index cc24c4ef41..c45cc720fb 100644
--- a/resources/lang/ja-JP/admin/settings/general.php
+++ b/resources/lang/ja-JP/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'バックアップ',
'backups_help' => 'バックアップの作成、ダウンロード、および復元 ',
'backups_restoring' => 'バックアップから復元中',
+ 'backups_clean' => '復元する前にバックアップされたデータベースをクリーンアップします',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'バックアップをアップロード',
'backups_path' => 'サーバー上のバックアップは :path に保存されています',
'backups_restore_warning' => '復元ボタンで 過去のバックアップから復元できます。(S3ファイルサーバーやDockerがサポートされません。)
ご利用中の :app_name のデータベース全体と全てのアップロードされたファイルがバックアップの内容で上書きされます。 ',
diff --git a/resources/lang/ja-JP/admin/users/message.php b/resources/lang/ja-JP/admin/users/message.php
index 09d71d9bee..292223aabd 100644
--- a/resources/lang/ja-JP/admin/users/message.php
+++ b/resources/lang/ja-JP/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'この資産を却下しました。',
'bulk_manager_warn' => 'あなたの利用者は正常に更新されました。しかしながら、あなたの管理者エントリーは保存されませんでした。あなたが選択した管理者が、編集対象の利用者一覧に選択されていたため更新されませんでした。および利用者は彼ら自身の管理者でない場合があります。再度、管理者を除いた上で、あなたの利用者を選択してください。',
'user_exists' => '利用者が既に存在しています!',
- 'user_not_found' => 'ユーザーが存在しません。',
+ 'user_not_found' => 'ユーザーが存在しないか、表示する権限がありません。',
'user_login_required' => 'ログインフィールドが必要です。',
'user_has_no_assets_assigned' => 'ユーザーに割り当てられているアセットはありません。',
'user_password_required' => 'パスワードが必要です。',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'LDAPサーバーを検索できません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー:',
'ldap_could_not_get_entries' => 'LDAPサーバーからエンティティを取得できません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー:',
'password_ldap' => 'このアカウントのパスワードは、LDAPかアクティブディレクトリで管理されています。パスワードを変更するには管理者にお問い合わせください。 ',
+ 'multi_company_items_assigned' => 'このユーザーにはアイテムが割り当てられています。会社を移動する前にチェックインしてください。'
),
'deletefile' => array(
diff --git a/resources/lang/ja-JP/general.php b/resources/lang/ja-JP/general.php
index 2ded9f0684..34989c6254 100644
--- a/resources/lang/ja-JP/general.php
+++ b/resources/lang/ja-JP/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'また、これらのユーザーを論理削除します。管理設定で削除したレコードを削除するまで、資産履歴はそのまま残ります。',
'bulk_checkin_delete_success' => '選択したユーザーが削除され、項目がチェックインされました。',
'bulk_checkin_success' => '選択したユーザーの項目がチェックインされています。',
- 'set_to_null' => 'このアセットの値を削除|全:asset_count個の資産を削除する ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'このユーザーの :field 値を削除|すべての :user_count ユーザーの :field 値を削除する ',
'na_no_purchase_date' => '該当なし - 購入日が指定されていません',
'assets_by_status' => 'ステータス別資産',
@@ -559,8 +559,8 @@ return [
'expires' => '保証失効日',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'ラベル',
'import_asset_tag_exists' => 'アセットタグ :asset_tag のアセットは既に存在し、アップデートは要求されませんでした。変更はありません。',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ja-JP/localizations.php b/resources/lang/ja-JP/localizations.php
index e09408cd7f..537ded61da 100644
--- a/resources/lang/ja-JP/localizations.php
+++ b/resources/lang/ja-JP/localizations.php
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'南スーダン',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ja-JP/mail.php b/resources/lang/ja-JP/mail.php
index 32ad1f8665..397b837161 100644
--- a/resources/lang/ja-JP/mail.php
+++ b/resources/lang/ja-JP/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'ユーザーがアイテムをリクエストしています',
'acceptance_asset_accepted' => 'ユーザーがアイテムを承認しました',
'acceptance_asset_declined' => 'ユーザーがアイテムを拒否しました',
- 'accessory_name' => '付属品名:',
- 'additional_notes' => '追記:',
+ 'accessory_name' => '付属品名',
+ 'additional_notes' => '追記',
'admin_has_created' => '管理者が:web でアカウントを作成しました。',
- 'asset' => '資産:',
- 'asset_name' => '資産名:',
+ 'asset' => '資産',
+ 'asset_name' => '資産名',
'asset_requested' => '資産リクエスト',
'asset_tag' => '資産タグ',
'assets_warrantee_alert' => ':threshold 日以内に:count 個の資産に保証期間が切れます。|:threshold 日以内に :count 個の資産に保証期間が切れます。',
'assigned_to' => '割り当て先',
'best_regards' => '敬具',
- 'canceled' => 'キャンセル済:',
- 'checkin_date' => 'チェックイン日:',
- 'checkout_date' => 'チェックアウト日:',
+ 'canceled' => 'キャンセル済',
+ 'checkin_date' => 'チェックイン日',
+ 'checkout_date' => '検査日',
'checkedout_from' => 'からチェックアウトしました',
'checkedin_from' => 'チェックイン元',
'checked_into' => 'チェックインされました',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => ':web account: を有効にする為に、次のリンクをクリックしてください。',
'current_QTY' => '現在の数量',
'days' => '日数',
- 'expecting_checkin_date' => 'チェックイン予定日:',
+ 'expecting_checkin_date' => '希望するチェックイン日',
'expires' => '保証失効日',
'hello' => 'こんにちは。',
'hi' => 'こんにちは',
'i_have_read' => '私は使用条件を読み、同意し、このアイテムを受け取りました。',
'inventory_report' => 'インベントリレポート',
- 'item' => 'アイテム:',
+ 'item' => '品目',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':threshold 日後に:count ライセンスが失効します。',
'link_to_update_password' => '次のリンクをクリックして、パスワードを更新してください。 :web password:',
@@ -66,11 +66,11 @@ return [
'name' => '名前',
'new_item_checked' => 'あなたの名前で新しいアイテムがチェックアウトされました。詳細は以下の通りです。',
'notes' => '備考',
- 'password' => 'パスワード:',
+ 'password' => 'パスワード',
'password_reset' => 'パスワードリセット',
'read_the_terms' => '下記の利用規約をお読みください。',
'read_the_terms_and_click' => '以下の利用規約をお読みください。 下部のリンクをクリックして、利用規約を読み、同意し、資産を受け取ったことを確認してください。',
- 'requested' => '要求済:',
+ 'requested' => '要求済',
'reset_link' => 'パスワードリセットのリンク',
'reset_password' => 'パスワードをリセットするにはここをクリック:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/km-KH/admin/locations/message.php b/resources/lang/km-KH/admin/locations/message.php
index de0f90c9f6..c8f470a632 100644
--- a/resources/lang/km-KH/admin/locations/message.php
+++ b/resources/lang/km-KH/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'ទីតាំងមិនមានទេ។',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'បច្ចុប្បន្នទីតាំងនេះត្រូវបានភ្ជាប់ជាមួយទ្រព្យសកម្មយ៉ាងហោចណាស់មួយ ហើយមិនអាចលុបបានទេ។ សូមអាប់ដេតទ្រព្យសកម្មរបស់អ្នក ដើម្បីកុំឱ្យយោងទីតាំងនេះតទៅទៀត ហើយព្យាយាមម្តងទៀត។ ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'ទ្រព្យសកម្មដែលបានចាត់តាំង',
diff --git a/resources/lang/km-KH/admin/settings/general.php b/resources/lang/km-KH/admin/settings/general.php
index 0631a8b37e..550471326f 100644
--- a/resources/lang/km-KH/admin/settings/general.php
+++ b/resources/lang/km-KH/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'ការបម្រុងទុក',
'backups_help' => 'បង្កើត ទាញយក និងស្ដារការបម្រុងទុក ',
'backups_restoring' => 'ការស្ដារឡើងវិញពីការបម្រុងទុក',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'ផ្ទុកឡើងការបម្រុងទុក',
'backups_path' => 'ការបម្រុងទុកនៅលើម៉ាស៊ីនមេត្រូវបានរក្សាទុកក្នុង :path',
'backups_restore_warning' => 'ប្រើប៊ូតុងស្ដារ ដើម្បីស្តារពីការបម្រុងទុកពីមុន។ (បច្ចុប្បន្នវាមិនដំណើរការជាមួយការផ្ទុកឯកសារ S3 ឬ Docker ទេ។)
មូលដ្ឋានទិន្នន័យ ទាំងមូល :app_name របស់អ្នក និងឯកសារដែលបានផ្ទុកឡើងណាមួយនឹងត្រូវបានជំនួសទាំងស្រុង ដោយអ្វីដែលមាននៅក្នុងឯកសារបម្រុងទុក។ ',
diff --git a/resources/lang/km-KH/admin/users/message.php b/resources/lang/km-KH/admin/users/message.php
index a4756ed5a6..f9586a9c53 100644
--- a/resources/lang/km-KH/admin/users/message.php
+++ b/resources/lang/km-KH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'អ្នកបានបដិសេធដោយជោគជ័យនូវទ្រព្យសកម្មនេះ។',
'bulk_manager_warn' => 'អ្នកប្រើប្រាស់របស់អ្នកត្រូវបានអាប់ដេតដោយជោគជ័យ ទោះជាយ៉ាងណាក៏ដោយ ធាតុគ្រប់គ្រងរបស់អ្នកមិនត្រូវបានរក្សាទុកទេ ដោយសារអ្នកគ្រប់គ្រងដែលអ្នកបានជ្រើសរើសក៏ស្ថិតនៅក្នុងបញ្ជីអ្នកប្រើប្រាស់ដែលត្រូវកែសម្រួលដែរ ហើយអ្នកប្រើប្រាស់ប្រហែលជាមិនមែនជាអ្នកគ្រប់គ្រងផ្ទាល់របស់ពួកគេទេ។ សូមជ្រើសរើសអ្នកប្រើប្រាស់របស់អ្នកម្តងទៀត ដោយមិនរាប់បញ្ចូលអ្នកគ្រប់គ្រង។',
'user_exists' => 'អ្នកប្រើប្រាស់មានហើយ!',
- 'user_not_found' => 'អ្នកប្រើប្រាស់មិនមានទេ។',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'មិនមានទ្រព្យសកម្មដែលត្រូវបានផ្ដល់ឱ្យអ្នកប្រើនាពេលបច្ចុប្បន្ននេះ។',
'user_password_required' => 'ពាក្យសម្ងាត់គឺត្រូវបានទាមទារ។',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'មិនអាចស្វែងរកម៉ាស៊ីនមេ LDAP បានទេ។ សូមពិនិត្យមើលការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនមេ LDAP របស់អ្នកនៅក្នុងឯកសារកំណត់រចនាសម្ព័ន្ធ LDAP ។
កំហុសពីម៉ាស៊ីនមេ LDAP៖',
'ldap_could_not_get_entries' => 'មិនអាចទទួលបានធាតុពីម៉ាស៊ីនមេ LDAP ទេ។ សូមពិនិត្យមើលការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនមេ LDAP របស់អ្នកនៅក្នុងឯកសារកំណត់រចនាសម្ព័ន្ធ LDAP ។
កំហុសពីម៉ាស៊ីនមេ LDAP៖',
'password_ldap' => 'ពាក្យសម្ងាត់សម្រាប់គណនីនេះត្រូវបានគ្រប់គ្រងដោយ LDAP/Active Directory។ សូមទាក់ទងផ្នែក IT របស់អ្នក ដើម្បីផ្លាស់ប្តូរពាក្យសម្ងាត់របស់អ្នក។ ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/km-KH/general.php b/resources/lang/km-KH/general.php
index aa9e95a7b2..aad4e2a0e7 100644
--- a/resources/lang/km-KH/general.php
+++ b/resources/lang/km-KH/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'ផុតកំណត់',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/km-KH/localizations.php b/resources/lang/km-KH/localizations.php
index 9bc3ba1aa5..ddfe79601a 100644
--- a/resources/lang/km-KH/localizations.php
+++ b/resources/lang/km-KH/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'ជ្រើសរើសភាសា',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'អង់គ្លេស អាមេរិក',
'en-GB'=> 'ភាសាអង់គ្លេស ចក្រភពអង់គ្លេស',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'ហ្សូលូ',
],
- 'select_country' => 'ជ្រើសរើសប្រទេសមួយ',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'កោះ Ascension',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'សីស្ហែល',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/km-KH/mail.php b/resources/lang/km-KH/mail.php
index 39335859aa..4b03e2bcc9 100644
--- a/resources/lang/km-KH/mail.php
+++ b/resources/lang/km-KH/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'អ្នកប្រើប្រាស់បានស្នើសុំធាតុនៅលើគេហទំព័រ',
'acceptance_asset_accepted' => 'អ្នកប្រើប្រាស់បានទទួលយកធាតុមួយ។',
'acceptance_asset_declined' => 'អ្នកប្រើប្រាស់បានបដិសេធធាតុមួយ។',
- 'accessory_name' => 'ឈ្មោះគ្រឿងបន្លាស់៖',
- 'additional_notes' => 'កំណត់ចំណាំបន្ថែម៖',
+ 'accessory_name' => 'ឈ្មោះគ្រឿងបន្លាស់',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'អ្នកគ្រប់គ្រងបានបង្កើតគណនីមួយសម្រាប់អ្នកនៅលើគេហទំព័រ៖ គេហទំព័រ។',
- 'asset' => 'ទ្រព្យសកម្ម៖',
- 'asset_name' => 'ឈ្មោះទ្រព្យសកម្ម៖',
+ 'asset' => 'ទ្រព្យសកម្ម',
+ 'asset_name' => 'ឈ្មោះទ្រព្យសម្បត្តិ',
'asset_requested' => 'បានស្នើសុំទ្រព្យសកម្ម',
'asset_tag' => 'ស្លាកទ្រព្យសម្បត្តិ',
'assets_warrantee_alert' => 'មាន : រាប់ទ្រព្យសកម្មជាមួយនឹងការធានាផុតកំណត់ក្នុងរយៈពេលបន្ទាប់ : threshold days។ | មាន : រាប់ទ្រព្យសកម្មជាមួយនឹងការធានាផុតកំណត់ក្នុងរយៈពេលបន្ទាប់ : threshold days ។',
'assigned_to' => 'ចាត់តាំងទៅ',
'best_regards' => 'សូមគោរព',
- 'canceled' => 'បានលុបចោល៖',
- 'checkin_date' => 'កាលបរិច្ឆេទត្រឡប់មកវិញ:',
- 'checkout_date' => 'ថ្ងៃប្រគល់អោយ:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'កាលបរិច្ឆេទត្រឡប់មកវិញ',
+ 'checkout_date' => 'ថ្ងៃប្រគល់អោយ',
'checkedout_from' => 'Checked out ពី',
'checkedin_from' => 'Checked in ពី',
'checked_into' => 'Checked into',
@@ -49,7 +49,7 @@ return [
'click_to_confirm' => 'សូមចុចលើតំណភ្ជាប់ខាងក្រោមដើម្បីបញ្ជាក់៖គណនីបណ្ដាញរបស់អ្នក៖',
'current_QTY' => 'Current QTY',
'days' => 'ថ្ងៃ',
- 'expecting_checkin_date' => 'កាលបរិច្ឆេទដែលរំពឹងទុកនឹង Checkin:',
+ 'expecting_checkin_date' => 'កាលបរិច្ឆេទដែលរំពឹងទុកនឹង Checkin',
'expires' => 'ផុតកំណត់',
'hello' => 'ជំរាបសួរ',
'hi' => 'សួស្តី',
@@ -66,7 +66,7 @@ return [
'name' => 'ឈ្មោះ',
'new_item_checked' => 'ធាតុថ្មីត្រូវបានchecked outក្រោមឈ្មោះរបស់អ្នក ព័ត៌មានលម្អិតមាននៅខាងក្រោម។',
'notes' => 'កំណត់ចំណាំ',
- 'password' => 'ពាក្យសម្ងាត់',
+ 'password' => 'Password',
'password_reset' => 'កំណត់ពាក្យសម្ងាត់ឡើងវិញ',
'read_the_terms' => 'សូមអានលក្ខខណ្ឌប្រើប្រាស់ខាងក្រោម។',
'read_the_terms_and_click' => 'សូមអានលក្ខខណ្ឌនៃការប្រើប្រាស់ខាងក្រោម ហើយចុចលើតំណភ្ជាប់នៅខាងក្រោម ដើម្បីបញ្ជាក់ថាអ្នកបានអាន និងយល់ព្រមតាមលក្ខខណ្ឌនៃការប្រើប្រាស់ ហើយបានទទួលទ្រព្យសកម្ម។',
diff --git a/resources/lang/ko-KR/admin/locations/message.php b/resources/lang/ko-KR/admin/locations/message.php
index 9e0697191c..208259bc32 100644
--- a/resources/lang/ko-KR/admin/locations/message.php
+++ b/resources/lang/ko-KR/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => '장소가 존재하지 않습니다.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => '이 장소는 현재 적어도 한명의 사용자와 연결되어 있어서 삭제할 수 없습니다. 사용자가 더 이상 이 장소를 참조하지 않게 갱신하고 다시 시도해주세요. ',
'assoc_child_loc' => '이 장소는 현재 하나 이상의 하위 장소를 가지고 있기에 삭제 할 수 없습니다. 이 장소의 참조를 수정하고 다시 시도해 주세요. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ko-KR/admin/settings/general.php b/resources/lang/ko-KR/admin/settings/general.php
index d95ddea46d..e6fea8c42d 100644
--- a/resources/lang/ko-KR/admin/settings/general.php
+++ b/resources/lang/ko-KR/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => '예비품',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ko-KR/admin/users/message.php b/resources/lang/ko-KR/admin/users/message.php
index efac4ad2fc..d615002458 100644
--- a/resources/lang/ko-KR/admin/users/message.php
+++ b/resources/lang/ko-KR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => '이 자산이 거부되었습니다.',
'bulk_manager_warn' => '사용자가 성공적으로 갱신되었지만, 선택한 관리자가 편집할 사용자 목록에도 있었고, 사용자가 자신의 관리자가 아니 어서 관리자 항목이 저장되지 않았습니다. 관리자를 제외한 사용자를 다시 선택하십시오.',
'user_exists' => '사용자가 이미 존재합니다!',
- 'user_not_found' => '사용자가 존재하지 않습니다.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => '로그인 항목을 입력해 주세요.',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => '비밀번호를 입력해 주세요.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'LDAP 서버를 찾을 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류:',
'ldap_could_not_get_entries' => 'LDAP 서버 목록을 가져올 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류:',
'password_ldap' => '이 계정의 비밀번호는 LDAP/Active 디렉토리에 의해 관리됩니다. 비밀번호를 변경하려면 IT 부서에 문의하세요. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ko-KR/general.php b/resources/lang/ko-KR/general.php
index 2ddeb87e7b..ba62dd248b 100644
--- a/resources/lang/ko-KR/general.php
+++ b/resources/lang/ko-KR/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => '만료',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ko-KR/localizations.php b/resources/lang/ko-KR/localizations.php
index 30d41de63a..d32dd0fc35 100644
--- a/resources/lang/ko-KR/localizations.php
+++ b/resources/lang/ko-KR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'남수단',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ko-KR/mail.php b/resources/lang/ko-KR/mail.php
index 5bda6a3967..f3da2fab64 100644
--- a/resources/lang/ko-KR/mail.php
+++ b/resources/lang/ko-KR/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => '사용자가 웹사이트에서 품목을 요청했습니다',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => '액세서리 이름',
- 'additional_notes' => '추가 참고 사항:',
+ 'accessory_name' => '부속품 명',
+ 'additional_notes' => '추가 참고 사항',
'admin_has_created' => ':web 웹사이트에서 관리자가 당신에게 계정을 생성했습니다.',
- 'asset' => '자산:',
- 'asset_name' => '자산명:',
+ 'asset' => '자산',
+ 'asset_name' => '자산 명',
'asset_requested' => '자산 요청',
'asset_tag' => '자산 태그',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => '할당',
'best_regards' => '감사합니다,',
- 'canceled' => '취소됨',
- 'checkin_date' => '반입 날짜',
- 'checkout_date' => '반출 날짜',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => '반입 일자',
+ 'checkout_date' => '반출 일자',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => ':web 계정을 확인하려면 다음 링크를 클릭하세요:',
'current_QTY' => '현재 수량',
'days' => '일',
- 'expecting_checkin_date' => '반입 예상 일:',
+ 'expecting_checkin_date' => '반입 예상 일',
'expires' => '만료',
'hello' => '안녕하세요',
'hi' => '안녕하세요',
'i_have_read' => '사용 조약을 읽고 동의 하며, 이 품목을 수령했습니다.',
'inventory_report' => 'Inventory Report',
- 'item' => '품목:',
+ 'item' => '항목',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => '다음 :threshold 일 내에 만료되는 라이선스가 :count 개 있습니다.|다음 :threshold 일 내에 만료되는 라이선스가 :count 개 있습니다.',
'link_to_update_password' => ':web 비밀번호를 수정하려면 다음 링크를 클릭하세요:',
@@ -66,11 +66,11 @@ return [
'name' => '이름',
'new_item_checked' => '당신의 이름으로 새 품목이 반출 되었습니다, 이하는 상세입니다.',
'notes' => '주석',
- 'password' => '비밀번호:',
+ 'password' => '비밀번호',
'password_reset' => '비밀번호 재설정',
'read_the_terms' => '아래의 이용 약관을 읽어 보시기 바랍니다.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => '요청됨:',
+ 'requested' => '요청됨',
'reset_link' => '비밀번호 재설정 링크',
'reset_password' => '이곳을 눌러 비밀번호를 재설정:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/lt-LT/admin/locations/message.php b/resources/lang/lt-LT/admin/locations/message.php
index 268d5c13f4..eb01011684 100644
--- a/resources/lang/lt-LT/admin/locations/message.php
+++ b/resources/lang/lt-LT/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Tokios vietos nėra.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'Šios vietos negalima panaikinti, nes ji yra bent vieno turto vieneto ar naudotojo vieta, jai yra priskirtas turtas arba ji yra nurodyta kaip pagrindinė kitos vietos vieta. Atnaujinkite savo įrašus, kad jie nebeturėtų sąsajų su šia vieta ir bandykite dar kartą. ',
'assoc_assets' => 'Ši vieta šiuo metu yra susieta bent su vienu turto vienetu ir negali būti panaikinta. Atnaujinkite savo turtą, kad nebebūtų sąsajos su šia vieta, ir bandykite dar kartą. ',
'assoc_child_loc' => 'Ši vieta šiuo metu yra kaip pagrindinė bent vienai žemesnio lygio vietai ir negali būti panaikinta. Atnaujinkite savo žemesnio lygio vietas, kad nebebūtų sąsajos su šia vieta, ir bandykite dar kartą. ',
'assigned_assets' => 'Priskirtas turtas',
diff --git a/resources/lang/lt-LT/admin/settings/general.php b/resources/lang/lt-LT/admin/settings/general.php
index 2737c712e8..8965bf2005 100644
--- a/resources/lang/lt-LT/admin/settings/general.php
+++ b/resources/lang/lt-LT/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Atsarginės kopijos',
'backups_help' => 'Kurti, atsisiųsti ir atkurti atsargines kopijas ',
'backups_restoring' => 'Atkurti iš atsarginės kopijos',
+ 'backups_clean' => 'Išvalyti išsaugotą duomenų bazę prieš atkūrimą',
+ 'backups_clean_helptext' => "Tai gali būti naudinga, jei keičiate duomenų bazės versiją",
'backups_upload' => 'Įkelti atsarginę kopiją',
'backups_path' => 'Atsarginės kopijos serveryje saugomos :path',
'backups_restore_warning' => 'Naudokite atkūrimo mygtuką , jei norite atkurti iš ankstesnės atsarginės kopijos. (Šiuo metu tai neveikia naudojant S3 failų saugyklą arba „Docker“.)
Jūsų visa :app_name duomenų bazė ir visi įkelti failai bus visiškai pakeisti tuo, kas yra atsarginės kopijos faile. ',
@@ -381,7 +383,7 @@ return [
'default_avatar_help' => 'Jei naudotojas neturi profilio nuotraukos, šis atvaizdas bus rodomas jo profilyje.',
'restore_default_avatar' => 'Atkurti pradinį sistemos numatytąjį avatarą',
'restore_default_avatar_help' => '',
- 'due_checkin_days' => 'Due For Checkin Warning',
+ 'due_checkin_days' => 'Įspėjimas, kad reikia paimti',
'due_checkin_days_help' => 'Likus kiek dienų iki numatomo turto paėmimo, jis turėtų būti rodomas puslapyje „Laukia paėmimo“?',
];
diff --git a/resources/lang/lt-LT/admin/users/message.php b/resources/lang/lt-LT/admin/users/message.php
index 4704a9f82f..24fee3b575 100644
--- a/resources/lang/lt-LT/admin/users/message.php
+++ b/resources/lang/lt-LT/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Jūs sėkmingai atsisakėte priimti šį turtą.',
'bulk_manager_warn' => 'Jūsų naudotojai buvo sėkmingai atnaujinti, tačiau tiesioginio vadovo informacija nebuvo išsaugota, nes jūsų nurodytas tiesioginis vadovas taip pat buvo redaguojamų naudotojų sąraše. Naudotojas negali būti savo paties tiesioginiu vadovu, todėl dar kartą pasirinkite naudotojus, neįtraukdami tiesioginio vadovo.',
'user_exists' => 'Toks naudotojas jau yra!',
- 'user_not_found' => 'Tokio naudotojo nėra.',
+ 'user_not_found' => 'Tokio naudotojo nėra arba jūs neturite teisės jo peržiūrėti.',
'user_login_required' => 'Prisijungimo laukas yra privalomas',
'user_has_no_assets_assigned' => 'Naudotojui neišduotas joks turtas.',
'user_password_required' => 'Slaptažodis yra privalomas.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nepavyko paieška LDAP serveryje. Patikrinkite LDAP serverio konfigūraciją LDAP konfigūracijos faile.
LDAP serverio klaida:',
'ldap_could_not_get_entries' => 'Nepavyko gauti įrašų iš LDAP serverio. Patikrinkite LDAP serverio konfigūraciją LDAP konfigūracijos faile.
LDAP serverio klaida:',
'password_ldap' => 'Šios paskyros slaptažodį tvarko LDAP / Active Directory. Prašome susisiekti su savo IT skyriumi, kad pakeistumėte slaptažodį. ',
+ 'multi_company_items_assigned' => 'Šiam naudotojui yra priskirti daiktai, paimkite juos prieš prieš keisdami įmonę.'
),
'deletefile' => array(
diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php
index 5fcb97f787..892860d02a 100644
--- a/resources/lang/lt-LT/general.php
+++ b/resources/lang/lt-LT/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Taip pat, panaikinti šiuos naudotojus. Jų turto istorija išliks nepakitusi, kol neišvalysite ištrintų įrašų administratoriaus nustatymuose.',
'bulk_checkin_delete_success' => 'Jūsų pasirinkti naudotojai buvo panaikinti, o jų daiktai buvo paimti.',
'bulk_checkin_success' => 'Nurodytų naudotojų daiktai buvo paimti.',
- 'set_to_null' => 'Išvalyti šio turto reikšmes|Išvalyti visų :asset_count turto vienetų reikšmes ',
+ 'set_to_null' => 'Ištrinti šio pasirinkimo reikšmes|Ištrinti visų :selection_count pasirinkimų reikšmes ',
'set_users_field_to_null' => 'Išvalyti :field reikšmes šiam naudotojui|Išvalyti :field reikšmes visiems :user_count naudotojams ',
'na_no_purchase_date' => 'N/D - Nenurodyta įsigijimo data',
'assets_by_status' => 'Turtas pagal būseną',
@@ -559,8 +559,8 @@ return [
'expires' => 'Baigiasi',
'map_fields'=> 'Susieti :item_type lauką',
'remaining_var' => ':count liko',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Etiketė',
'import_asset_tag_exists' => 'Turtas su inventoriniu numeriu :asset_tag jau yra ir atnaujinimo užklausa nebuvo pateikta. Jokie pakeitimai nebuvo atlikti.',
+ 'countries_manually_entered_help' => 'Žvaigždute (*) pažymėtos reikšmės buvo įvestos rankiniu būdu ir neatitinka esamų ISO 3166 išskleidžiamojo sąrašo reikšmių',
];
diff --git a/resources/lang/lt-LT/localizations.php b/resources/lang/lt-LT/localizations.php
index 76df234318..710c945b90 100644
--- a/resources/lang/lt-LT/localizations.php
+++ b/resources/lang/lt-LT/localizations.php
@@ -135,6 +135,7 @@ return [
'EC'=>'Ekvadoras',
'EE'=>'Estija',
'EG'=>'Egiptas',
+ 'GB-ENG'=>'Anglija',
'ER'=>'Eritrėja',
'ES'=>'Ispanija',
'ET'=>'Etiopija',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigerija',
'NI'=>'Nikaragva',
'NL'=>'Nyderlandai',
+ 'GB-NIR' => 'Šiaurės Airija',
'NO'=>'Norvegija',
'NP'=>'Nepalas',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Rusija',
'RW'=>'Ruanda',
'SA'=>'Saudo Arabija',
- 'UK'=>'Škotija',
+ 'GB-SCT'=>'Škotija',
'SB'=>'Saliamono salos',
'SC'=>'Seišeliai',
'SS'=>'Pietų Sudanas',
@@ -312,6 +314,7 @@ return [
'VI'=>'Mergelių salos (JAV)',
'VN'=>'Vietnamas',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Velsas',
'WF'=>'Voliso ir Futūnos salos',
'WS'=>'Samoa',
'YE'=>'Jemenas',
diff --git a/resources/lang/lt-LT/mail.php b/resources/lang/lt-LT/mail.php
index c4bf973dba..ef313cbc34 100644
--- a/resources/lang/lt-LT/mail.php
+++ b/resources/lang/lt-LT/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Naudotojas svetainėje užsakė daiktą',
'acceptance_asset_accepted' => 'Naudotojas priėmė daiktą',
'acceptance_asset_declined' => 'Naudotojas nepriėmė daikto',
- 'accessory_name' => 'Priedo pavadinimas:',
- 'additional_notes' => 'Papildomos pastabos:',
+ 'accessory_name' => 'Priedo pavadinimas',
+ 'additional_notes' => 'Papildomos pastabos',
'admin_has_created' => 'Administratorius sukūrė jums paskyrą :web svetainėje.',
- 'asset' => 'Turtas:',
- 'asset_name' => 'Turto pavadinimas:',
+ 'asset' => 'Turtas',
+ 'asset_name' => 'Turto pavadinimas',
'asset_requested' => 'Turtas užsakytas',
'asset_tag' => 'Inventorinis numeris',
'assets_warrantee_alert' => 'Yra :count turto vienetas, kurio garantija baigiasi per kitas :threshold dienas (-ų).|Yra :count turto vienetai (-ų), kurių garantija baigiasi per kitas :threshold dienas (-ų).',
'assigned_to' => 'Išduota',
'best_regards' => 'Pagarbiai,',
- 'canceled' => 'Atšauktas:',
- 'checkin_date' => 'Paėmimo data:',
- 'checkout_date' => 'Išdavimo data:',
+ 'canceled' => 'Atšauktas',
+ 'checkin_date' => 'Paėmimo data',
+ 'checkout_date' => 'Išdavimo data',
'checkedout_from' => 'Išduota iš',
'checkedin_from' => 'Paimta iš',
'checked_into' => 'Paimta į',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Spustelėkite šią nuorodą, kad patvirtintumėte savo :web paskyrą:',
'current_QTY' => 'Esamas kiekis',
'days' => 'Dienos',
- 'expecting_checkin_date' => 'Numatoma paėmimo data:',
+ 'expecting_checkin_date' => 'Numatoma paėmimo data',
'expires' => 'Baigia galioti',
'hello' => 'Sveiki',
'hi' => 'Sveiki',
'i_have_read' => 'Aš perskaičiau ir sutinku su naudojimo sąlygomis, ir patvirtinu, kad gavau šį daiktą.',
'inventory_report' => 'Inventoriaus ataskaita',
- 'item' => 'Daiktas:',
+ 'item' => 'Daiktas',
'item_checked_reminder' => 'Tai priminimas, kad šiuo metu jums yra išduoti :count daiktai, kurių nepriėmėte arba neatmetėte. Spustelėkite toliau pateiktą nuorodą, kad patvirtintumėte savo sprendimą.',
'license_expiring_alert' => 'Yra :count licencija, kuri baigiasi per kitas :threshold dienas.|Yra :count licencijos (-ų), kurios baigiasi per kitas :threshold dienas (-ų).',
'link_to_update_password' => 'Spustelėkite šią nuorodą, kad atnaujintumėte savo :web slaptažodį:',
@@ -66,11 +66,11 @@ return [
'name' => 'Pavadinimas',
'new_item_checked' => 'Jums buvo priskirtas naujas daiktas, išsami informacija pateikta žemiau.',
'notes' => 'Pastabos',
- 'password' => 'Slaptažodis:',
+ 'password' => 'Slaptažodis',
'password_reset' => 'Slaptažodžio nustatymas iš naujo',
'read_the_terms' => 'Perskaitykite žemiau pateiktas naudojimo sąlygas.',
'read_the_terms_and_click' => 'Perskaitykite žemiau pateiktas naudojimo sąlygas ir spustelėti apačioje esančią nuorodą, kad patvirtintumėte jog perskaitėte ir sutinkate su jomis, bei kad gavote turtą.',
- 'requested' => 'Užsakyta:',
+ 'requested' => 'Užsakytas',
'reset_link' => 'Jūsų slaptažodžio nustatymo iš naujo nuoroda',
'reset_password' => 'Spustelėkite čia norėdami iš naujo nustatyti slaptažodį:',
'rights_reserved' => 'Visos teisės saugomos.',
diff --git a/resources/lang/lv-LV/admin/locations/message.php b/resources/lang/lv-LV/admin/locations/message.php
index 82159cea8d..7f08ad2a36 100644
--- a/resources/lang/lv-LV/admin/locations/message.php
+++ b/resources/lang/lv-LV/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Atrašanās vietas neeksistē.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Pašlaik šī atrašanās vieta ir saistīta ar vismaz vienu īpašumu un to nevar izdzēst. Lūdzu, atjauniniet savus aktīvus, lai vairs nerindotu šo atrašanās vietu, un mēģiniet vēlreiz.',
'assoc_child_loc' => 'Pašlaik šī vieta ir vismaz viena bērna atrašanās vieta un to nevar izdzēst. Lūdzu, atjauniniet savas atrašanās vietas, lai vairs nerindotu šo atrašanās vietu, un mēģiniet vēlreiz.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/lv-LV/admin/settings/general.php b/resources/lang/lv-LV/admin/settings/general.php
index 39dd966cbe..42f565a52d 100644
--- a/resources/lang/lv-LV/admin/settings/general.php
+++ b/resources/lang/lv-LV/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Rezerves kopijas',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/lv-LV/admin/users/message.php b/resources/lang/lv-LV/admin/users/message.php
index 0779e5c823..c6e94e5826 100644
--- a/resources/lang/lv-LV/admin/users/message.php
+++ b/resources/lang/lv-LV/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Jūs esat veiksmīgi atteicies no šī īpašuma.',
'bulk_manager_warn' => 'Jūsu lietotāji ir veiksmīgi atjaunināti, taču jūsu pārvaldnieka ieraksts netika saglabāts, jo izvēlētā pārvaldnieks bija arī rediģējamo lietotāju sarakstā, un lietotāji, iespējams, nav viņu īpašnieks. Lūdzu, vēlreiz atlasiet savus lietotājus, izņemot pārvaldnieku.',
'user_exists' => 'Lietotājs jau eksistē!',
- 'user_not_found' => 'Lietotājs neeksistē.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Ievades lauks ir nepieciešams',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Parole ir nepieciešama.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nevarēja meklēt LDAP serverī. Lūdzu, pārbaudiet LDAP servera konfigurāciju LDAP konfigurācijas failā.
Par LDAP servera kļūda:',
'ldap_could_not_get_entries' => 'Nevarēja iegūt ierakstus no LDAP servera. Lūdzu, pārbaudiet LDAP servera konfigurāciju LDAP konfigurācijas failā.
Par LDAP servera kļūda:',
'password_ldap' => 'Šī konta paroli pārvalda LDAP / Active Directory. Lai mainītu savu paroli, lūdzu, sazinieties ar IT nodaļu.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/lv-LV/general.php b/resources/lang/lv-LV/general.php
index 07fc815c3c..2939d79a0b 100644
--- a/resources/lang/lv-LV/general.php
+++ b/resources/lang/lv-LV/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Arī gandrīz-dzēsiet šos lietotājus. Viņu inventāra vēsture būs neskarta līdz Jūs iztīrīsiet dzēstos ierakstus Admin Iestatījumos.',
'bulk_checkin_delete_success' => 'Jūsu atlasītie lietotāji ir dzēsti un ar tiem saistītais inventārs statusā Pieņemts.',
'bulk_checkin_success' => 'Inventārs atlasītajiem lietotājiem ir ar statusu Pieņemts.',
- 'set_to_null' => 'Dzēst šī inventāra vērtības|Dzēst vērtīibas visam :asset_count inventāram ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Dzēst lietotāja :field vērtības|Dzēst :field vērtīibas visiem :user_count lietotājiem ',
'na_no_purchase_date' => 'N/A - Iegādes datums nav norādīts',
'assets_by_status' => 'Inventārs pēc Statusa',
@@ -559,8 +559,8 @@ return [
'expires' => 'Beidzas',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/lv-LV/localizations.php b/resources/lang/lv-LV/localizations.php
index f5662e4991..f9c0d8efbe 100644
--- a/resources/lang/lv-LV/localizations.php
+++ b/resources/lang/lv-LV/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Izvēlieties valodu',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Angļu, ASV',
'en-GB'=> 'Angļu, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/lv-LV/mail.php b/resources/lang/lv-LV/mail.php
index 2f7ad4e7eb..7c15dfa0b3 100644
--- a/resources/lang/lv-LV/mail.php
+++ b/resources/lang/lv-LV/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Lietotājs ir pieprasījis vienumu vietnē',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Piederumu nosaukums:',
- 'additional_notes' => 'Papildu piezīmes:',
+ 'accessory_name' => 'Piederuma nosaukums',
+ 'additional_notes' => 'Papildu piezīmes',
'admin_has_created' => 'Administrators ir izveidojis jums kontu: tīmekļa vietnē.',
- 'asset' => 'Aktīvs:',
- 'asset_name' => 'Aktīvu nosaukums:',
+ 'asset' => 'Aktīvs',
+ 'asset_name' => 'Aktīva nosaukums',
'asset_requested' => 'Aktīvs pieprasīts',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Piešķirts',
'best_regards' => 'Ar laba vēlējumiem,',
- 'canceled' => 'Atcelts:',
- 'checkin_date' => 'Reģistrēšanās datums:',
- 'checkout_date' => 'Izrakstīšanās datums:',
+ 'canceled' => 'Atcelts',
+ 'checkin_date' => 'Reģistrēšanās datums',
+ 'checkout_date' => 'Izrakstīšanās datums',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Lūdzu, noklikšķiniet uz šīs saites, lai apstiprinātu savu: tīmekļa kontu:',
'current_QTY' => 'Pašreizējais QTY',
'days' => 'Dienas',
- 'expecting_checkin_date' => 'Paredzamais reģistrēšanās datums:',
+ 'expecting_checkin_date' => 'Paredzamais reģistrēšanās datums',
'expires' => 'Beidzas',
'hello' => 'Sveiki',
'hi' => 'Sveiki',
'i_have_read' => 'Esmu izlasījis un piekrītu lietošanas noteikumiem un saņēmu šo preci.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Vienība:',
+ 'item' => 'Vienums',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Pēc :threshold dienām beigsies termiņš :count licencei.| Pēc :threshold dienām beigsies termiņš :threshold :count licencēm.',
'link_to_update_password' => 'Lūdzu, noklikšķiniet uz šīs saites, lai atjauninātu savu: web paroli:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nosaukums',
'new_item_checked' => 'Jauns objekts ir atzīmēts zem sava vārda, sīkāk ir sniegta zemāk.',
'notes' => 'Piezīmes',
- 'password' => 'Parole:',
+ 'password' => 'Parole',
'password_reset' => 'Paroles atiestatīšana',
'read_the_terms' => 'Lūdzu, izlasiet lietošanas noteikumus zemāk.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Pieprasīts:',
+ 'requested' => 'Pieprasīts',
'reset_link' => 'Jūsu paroles atiestatīšanas saite',
'reset_password' => 'Noklikšķiniet šeit, lai atiestatītu savu paroli:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/mi-NZ/admin/locations/message.php b/resources/lang/mi-NZ/admin/locations/message.php
index e1d8ff3e66..147c039899 100644
--- a/resources/lang/mi-NZ/admin/locations/message.php
+++ b/resources/lang/mi-NZ/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Kāore i te tīariari te wāhi.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Kei te honohia tenei taapiri ki te iti rawa o te rawa me te kore e taea te muku. Whakaorangia nga taonga ki a koe kia kaua e tautuhi i tenei tauranga ka ngana ano.',
'assoc_child_loc' => 'Kei tenei waahi te matua o te iti rawa o te mokopuna me te kore e taea te muku. Whakaorangia nga taangata ki a koe kia kaua e tautuhi i tenei tauranga ka ngana ano.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/mi-NZ/admin/settings/general.php b/resources/lang/mi-NZ/admin/settings/general.php
index 84c5144e5a..07089abb5d 100644
--- a/resources/lang/mi-NZ/admin/settings/general.php
+++ b/resources/lang/mi-NZ/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Ngā Pūrua',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/mi-NZ/admin/users/message.php b/resources/lang/mi-NZ/admin/users/message.php
index 2ad8d30aab..0dd005bd70 100644
--- a/resources/lang/mi-NZ/admin/users/message.php
+++ b/resources/lang/mi-NZ/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Kua paopao angitu koe ki tenei taonga.',
'bulk_manager_warn' => 'Kua angitu te whakahoutia o nga kaiwhakamahi, heoi kihai i tohua to tautuhinga kaiwhakahaere no te mea ko te kaiwhakahaere i tohua e koe i roto i te rarangi kaiwhakamahi kia whakatikaia, kaore ano hoki nga kaiwhakamahi i to ratou ake kaiwhakahaere. Tēnā koa tīpako anō i ō kaiwhakamahi, kaore i te kaiwhakahaere.',
'user_exists' => 'Kua noho kē te Kaiwhakamahi!',
- 'user_not_found' => 'Kāore te Kaiwhakamahi i te tīariari.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Kei te hiahiatia te mara takiuru',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Kei te hiahiatia te kupuhipa.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Kāore i taea te rapu i te tūmau LDAP. Titiro koa ki te whirihoranga o tō tūmau LDAP i te kōnae whirihora LDAP.
Error mai i te Tūmau LDAP:',
'ldap_could_not_get_entries' => 'Kāore i taea te tiki tuhinga mai i te tūmau LDAP. Titiro koa ki te whirihoranga o tō tūmau LDAP i te kōnae whirihora LDAP.
Error mai i te Tūmau LDAP:',
'password_ldap' => 'Ko te kupuhipa mo tenei kaute kei te whakahaeretia e LDAP / Active Directory. Tēnā whakapā atu ki tō tari IT hei huri i tō kupuhipa.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/mi-NZ/general.php b/resources/lang/mi-NZ/general.php
index acc73b76c2..3fbad508b9 100644
--- a/resources/lang/mi-NZ/general.php
+++ b/resources/lang/mi-NZ/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Ka puta',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/mi-NZ/localizations.php b/resources/lang/mi-NZ/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/mi-NZ/localizations.php
+++ b/resources/lang/mi-NZ/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/mi-NZ/mail.php b/resources/lang/mi-NZ/mail.php
index 861707aef5..e777aa9181 100644
--- a/resources/lang/mi-NZ/mail.php
+++ b/resources/lang/mi-NZ/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Kua tono tetahi kaiwhakamahi i tetahi mea i runga i te paetukutuku',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Ingoa Whakauru:',
- 'additional_notes' => 'Nga Tuhipoka Atu:',
+ 'accessory_name' => 'Ingoa Whakauru',
+ 'additional_notes' => 'Nga Tuhipoka Atu',
'admin_has_created' => 'Kua hanga e tetahi kaiwhakahaere tetahi kaute mo koe i runga i te: paetukutuku tukutuku.',
- 'asset' => 'Tahua:',
- 'asset_name' => 'Ingoa Ahua:',
+ 'asset' => 'Tahua',
+ 'asset_name' => 'Ingoa Ahua',
'asset_requested' => 'Ka tonohia te taonga',
'asset_tag' => 'Tae Taonga',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Tohua Ki To',
'best_regards' => 'Ko nga whakaaro pai,',
- 'canceled' => 'Kua whakakorehia:',
- 'checkin_date' => 'Rangi Whakatau:',
- 'checkout_date' => 'Rā Whakatau:',
+ 'canceled' => 'Kua whakakorehia',
+ 'checkin_date' => 'Rangi Titiro',
+ 'checkout_date' => 'Rā Rārangi',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Tena koahia te hono e whai ake nei hei whakauru i to:',
'current_QTY' => 'QTY o nāianei',
'days' => 'Nga ra',
- 'expecting_checkin_date' => 'Te Whakataunga Whakataunga Whakaaro:',
+ 'expecting_checkin_date' => 'Ko te Whakataunga Whakataunga Whakaaro',
'expires' => 'Ka puta',
'hello' => 'Hiha',
'hi' => 'Hi',
'i_have_read' => 'Kua korerohia e au, kua whakaae ki nga tikanga whakamahi, kua riro mai hoki tenei mea.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Te nama:',
+ 'item' => 'Tuhinga',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Koahia te hono e whai ake nei hei whakahou i to: kupuhipahipa:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ingoa',
'new_item_checked' => 'Kua tohua tetahi mea hou i raro i to ingoa, kei raro iho nga korero.',
'notes' => 'Tuhipoka',
- 'password' => 'Kupuhipa:',
+ 'password' => 'Kupuhipa',
'password_reset' => 'Tautuhi Kupuhipa',
'read_the_terms' => 'Tena koa korerotia nga tikanga o te whakamahi i raro.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'I tonohia:',
+ 'requested' => 'I tonohia',
'reset_link' => 'Tautuhi Hononga Kupuhipa',
'reset_password' => 'Pāwhiri ki konei kia tautuhi i to kupuhipa:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/mk-MK/admin/accessories/general.php b/resources/lang/mk-MK/admin/accessories/general.php
index 1303eeeedb..6ab9ec14e6 100644
--- a/resources/lang/mk-MK/admin/accessories/general.php
+++ b/resources/lang/mk-MK/admin/accessories/general.php
@@ -16,7 +16,7 @@ return array(
'update' => 'Уредување на додаток',
'use_default_eula' => 'Наместо ова, користете стандардни Услови за користење.',
'use_default_eula_disabled' => 'Наместо тоа користете стандардни Услови за користење. Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.',
- 'clone' => 'Clone Accessory',
- 'delete_disabled' => 'This accessory cannot be deleted yet because some items are still checked out.',
+ 'clone' => 'Клонирај додаток',
+ 'delete_disabled' => 'Овој додаток не може да се избрише сè уште бидејќи некои ставки сè уште се позајмени.',
);
diff --git a/resources/lang/mk-MK/admin/accessories/message.php b/resources/lang/mk-MK/admin/accessories/message.php
index 258cac76ac..077432b72a 100644
--- a/resources/lang/mk-MK/admin/accessories/message.php
+++ b/resources/lang/mk-MK/admin/accessories/message.php
@@ -2,8 +2,8 @@
return array(
- 'does_not_exist' => 'The accessory [:id] does not exist.',
- 'not_found' => 'That accessory was not found.',
+ 'does_not_exist' => 'Додатокот [:id] не постои.',
+ 'not_found' => 'Додатокот не е пронајден.',
'assoc_users' => 'Овој додаток во моментов има :count ставки задолжени на корисници. Ве молиме проверете во додатоците и обидете се повторно. ',
'create' => array(
@@ -25,10 +25,10 @@ return array(
'checkout' => array(
'error' => 'Додатокот не беше задолжен, обидете се повторно',
'success' => 'Додатокот е задолжен.',
- 'unavailable' => 'Accessory is not available for checkout. Check quantity available',
+ 'unavailable' => 'Додатокот не е достапен за позајмување. Проверете ја достапната количина',
'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
'checkout_qty' => array(
- 'lte' => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+ 'lte' => 'Во моментов е достапен само еден додаток од овој тип, а вие се обидувате да позајмите :checkout_qty. Ве молиме, прилагодете ја количината за позајмување или вкупната залиха на овој додаток и обидете се повторно. Има вкупно :number_currently_remaining достапни додатоци, а вие се обидувате да позајмите :checkout_qty. Ве молиме, прилагодете ја количината за позајмување или вкупната залиха на овој додаток и обидете се повторно.',
),
),
diff --git a/resources/lang/mk-MK/admin/asset_maintenances/form.php b/resources/lang/mk-MK/admin/asset_maintenances/form.php
index eacd6cada3..ffc722d638 100644
--- a/resources/lang/mk-MK/admin/asset_maintenances/form.php
+++ b/resources/lang/mk-MK/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
'Asset Maintenance Type',
+ 'asset_maintenance_type' => 'Тип на оддржување на средства',
'title' => 'Наслов',
- 'start_date' => 'Start Date',
- 'completion_date' => 'Completion Date',
+ 'start_date' => 'Почетен датум',
+ 'completion_date' => 'Датум на завршување',
'cost' => 'Цена',
'is_warranty' => 'Подобрување на гаранцијата',
- 'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+ 'asset_maintenance_time' => 'Време на одржување на средства (во денови)',
'notes' => 'Забелешки',
- 'update' => 'Update Asset Maintenance',
- 'create' => 'Create Asset Maintenance'
+ 'update' => 'Освежи одржување на средства',
+ 'create' => 'Креирај одржување на средства'
];
diff --git a/resources/lang/mk-MK/admin/asset_maintenances/general.php b/resources/lang/mk-MK/admin/asset_maintenances/general.php
index dfbf043bf6..cc9a7108ec 100644
--- a/resources/lang/mk-MK/admin/asset_maintenances/general.php
+++ b/resources/lang/mk-MK/admin/asset_maintenances/general.php
@@ -8,9 +8,9 @@
'repair' => 'Поправка',
'maintenance' => 'Одржување',
'upgrade' => 'Надградба',
- 'calibration' => 'Calibration',
- 'software_support' => 'Software Support',
- 'hardware_support' => 'Hardware Support',
- 'configuration_change' => 'Configuration Change',
- 'pat_test' => 'PAT Test',
+ 'calibration' => 'Калибрирање',
+ 'software_support' => 'Софтверска поддршка',
+ 'hardware_support' => 'Хардверска поддршка',
+ 'configuration_change' => 'Промена на конфигурацијата',
+ 'pat_test' => 'PAT тест',
];
diff --git a/resources/lang/mk-MK/admin/categories/general.php b/resources/lang/mk-MK/admin/categories/general.php
index 8862d9b365..9f51c97357 100644
--- a/resources/lang/mk-MK/admin/categories/general.php
+++ b/resources/lang/mk-MK/admin/categories/general.php
@@ -3,13 +3,13 @@
return array(
'asset_categories' => 'Категории на основни средства',
'category_name' => 'Име на категорија',
- 'checkin_email' => 'Send email to user on checkin/checkout.',
- 'checkin_email_notification' => 'This user will be sent an email on checkin/checkout.',
+ 'checkin_email' => 'Испрати е-пошта до корисникот при позајмување/враќање.',
+ 'checkin_email_notification' => 'На корисникот ќе му биде испратена е-пошта при позајмување/враќање.',
'clone' => 'Клонирај Категорија',
'create' => 'Креирај категорија',
'edit' => 'Уреди категорија',
- 'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
- 'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+ 'email_will_be_sent_due_to_global_eula' => 'Е-пошта ќе биде испратена бидејќи се користи глобалниот EULA.',
+ 'email_will_be_sent_due_to_category_eula' => 'Е-пошта ќе биде испратена бидејќи EULA се користи за оваа категорија.',
'eula_text' => 'Категорија - Услови за користење',
'eula_text_help' => 'Ова поле ви овозможува да ги прилагодите вашите Услови за користење за сите видови на средства. Ако имате само едни Услови за користење за сите ваши основни средства, можете да вклучите подолу да се користaт стандардните Услови за користење.',
'name' => 'Име на категорија',
@@ -20,6 +20,6 @@ return array(
'update' => 'Уреди категорија',
'use_default_eula' => 'Наместо ова, користете стандардни Услови за користење.',
'use_default_eula_disabled' => 'Наместо ова, користете стандардни Услови за користење. Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.',
- 'use_default_eula_column' => 'Use default EULA',
+ 'use_default_eula_column' => 'Користи основна EULA',
);
diff --git a/resources/lang/mk-MK/admin/categories/message.php b/resources/lang/mk-MK/admin/categories/message.php
index 13578118e7..6618f71ebe 100644
--- a/resources/lang/mk-MK/admin/categories/message.php
+++ b/resources/lang/mk-MK/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
'update' => array(
'error' => 'Категоријата не беше ажурирана, обидете се повторно',
'success' => 'Категоријата е успешно ажурирана.',
- 'cannot_change_category_type' => 'You cannot change the category type once it has been created',
+ 'cannot_change_category_type' => 'Не можете да го смените типот на категорија откако е создадена',
),
'delete' => array(
diff --git a/resources/lang/mk-MK/admin/companies/general.php b/resources/lang/mk-MK/admin/companies/general.php
index 6e0a0f426b..8002061ce8 100644
--- a/resources/lang/mk-MK/admin/companies/general.php
+++ b/resources/lang/mk-MK/admin/companies/general.php
@@ -3,5 +3,5 @@
return [
'select_company' => 'Изберете компанија',
'about_companies' => 'За компаниите',
- 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+ 'about_companies_description' => ' Можете да ги користите компаниите како едноставно информативно поле или можете да ги користите за да ограничите видливоста и достапноста на средствата за корисниците со конкретна компанија со вклучување на целосна поддршка за компании во вашите административни поставки.',
];
diff --git a/resources/lang/mk-MK/admin/companies/message.php b/resources/lang/mk-MK/admin/companies/message.php
index c38348ecdd..6b1f79a2b5 100644
--- a/resources/lang/mk-MK/admin/companies/message.php
+++ b/resources/lang/mk-MK/admin/companies/message.php
@@ -2,7 +2,7 @@
return [
'does_not_exist' => 'Компанијата не постои.',
- 'deleted' => 'Deleted company',
+ 'deleted' => 'Избришана компанија',
'assoc_users' => 'Оваа компанија моментално е поврзана со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате вашите модели за да не ја користите оваа компанија и обидете се повторно. ',
'create' => [
'error' => 'Компанијата не е креирана, обидете се повторно.',
diff --git a/resources/lang/mk-MK/admin/companies/table.php b/resources/lang/mk-MK/admin/companies/table.php
index 58a4d78818..21aa7e2999 100644
--- a/resources/lang/mk-MK/admin/companies/table.php
+++ b/resources/lang/mk-MK/admin/companies/table.php
@@ -2,9 +2,9 @@
return array(
'companies' => 'Компании',
'create' => 'Креирај компанија',
- 'email' => 'Company Email',
+ 'email' => 'Е-пошта на компанијата',
'title' => 'Компанија',
- 'phone' => 'Company Phone',
+ 'phone' => 'Телефон на компанијата',
'update' => 'Ажурирај компанија',
'name' => 'Име на компанија',
'id' => 'ID',
diff --git a/resources/lang/mk-MK/admin/components/general.php b/resources/lang/mk-MK/admin/components/general.php
index cf94d5cd0b..06488f5acc 100644
--- a/resources/lang/mk-MK/admin/components/general.php
+++ b/resources/lang/mk-MK/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
'remaining' => 'Останува',
'total' => 'Вкупно',
'update' => 'Уреди компонента',
- 'checkin_limit' => 'Amount checked in must be equal to or less than :assigned_qty'
+ 'checkin_limit' => 'Количината што е вратена мора да биде еднаква или помала од :assigned_qty'
);
diff --git a/resources/lang/mk-MK/admin/components/message.php b/resources/lang/mk-MK/admin/components/message.php
index 3d957da9a0..a912028b51 100644
--- a/resources/lang/mk-MK/admin/components/message.php
+++ b/resources/lang/mk-MK/admin/components/message.php
@@ -24,7 +24,7 @@ return array(
'error' => 'Компонентата не беше задолжена, обидете се повторно',
'success' => 'Компонентата е задолжена.',
'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
- 'unavailable' => 'Not enough components remaining: :remaining remaining, :requested requested ',
+ 'unavailable' => 'Нема доволно компоненти: :remaining remaining, :requested requested ',
),
'checkin' => array(
diff --git a/resources/lang/mk-MK/admin/consumables/general.php b/resources/lang/mk-MK/admin/consumables/general.php
index b6e398241e..b9df73ab9a 100644
--- a/resources/lang/mk-MK/admin/consumables/general.php
+++ b/resources/lang/mk-MK/admin/consumables/general.php
@@ -8,5 +8,5 @@ return array(
'remaining' => 'Останува',
'total' => 'Вкупно',
'update' => 'Ажурирај потрошен материјал',
- 'inventory_warning' => 'The inventory of this consumable is below the minimum amount of :min_count',
+ 'inventory_warning' => 'Залихата на оваа потрошна стока е под минималната количина од :min_count',
);
diff --git a/resources/lang/mk-MK/admin/consumables/message.php b/resources/lang/mk-MK/admin/consumables/message.php
index 991fc7909d..b62a1c838f 100644
--- a/resources/lang/mk-MK/admin/consumables/message.php
+++ b/resources/lang/mk-MK/admin/consumables/message.php
@@ -2,7 +2,7 @@
return array(
- 'invalid_category_type' => 'The category must be a consumable category.',
+ 'invalid_category_type' => 'Категоријата мора да биде категорија на потрошни материјали.',
'does_not_exist' => 'Потрошниот материјал не постои.',
'create' => array(
@@ -25,7 +25,7 @@ return array(
'error' => 'Потрошниот материјал не е задолжен, обидете се повторно',
'success' => 'Потрошниот материјал е успешно задолжен.',
'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
- 'unavailable' => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+ 'unavailable' => 'Нема доволно потрошни материјали за ова позајмување. Ве молиме проверете ја преостанатата количина. ',
),
'checkin' => array(
diff --git a/resources/lang/mk-MK/admin/custom_fields/general.php b/resources/lang/mk-MK/admin/custom_fields/general.php
index 7f48e1b0a7..81370e4b83 100644
--- a/resources/lang/mk-MK/admin/custom_fields/general.php
+++ b/resources/lang/mk-MK/admin/custom_fields/general.php
@@ -2,10 +2,10 @@
return [
'custom_fields' => 'Полиња по желба',
- 'manage' => 'Manage',
+ 'manage' => 'Управувај',
'field' => 'Поле',
'about_fieldsets_title' => 'За Fieldsets',
- 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+ 'about_fieldsets_text' => 'Fildsets ви овозможуваат да создавате групи на прилагодени полиња што често се повторно користат за специфични типови на модели на средства.',
'custom_format' => 'Custom Regex format...',
'encrypt_field' => 'Енкриптирајте ја вредноста на ова поле во базата на податоци',
'encrypt_field_help' => 'ПРЕДУПРЕДУВАЊЕ: Шифрирањето на поле прави полето да не може да се пребарува.',
diff --git a/resources/lang/mk-MK/admin/locations/message.php b/resources/lang/mk-MK/admin/locations/message.php
index f6737fca1f..739117b67e 100644
--- a/resources/lang/mk-MK/admin/locations/message.php
+++ b/resources/lang/mk-MK/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Локацијата не постои.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Оваа локација моментално е поврзана со барем едно основно средство и не може да се избрише. Ве молиме да ги ажурирате вашите основни средства за да не ја користите оваа локација и обидете се повторно. ',
'assoc_child_loc' => 'Оваа локација моментално е родител на најмалку една локација и не може да се избрише. Ве молиме да ги ажурирате вашите локации повеќе да не ја користат оваа локација како родител и обидете се повторно. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/mk-MK/admin/settings/general.php b/resources/lang/mk-MK/admin/settings/general.php
index c1879362e6..a06f0f797e 100644
--- a/resources/lang/mk-MK/admin/settings/general.php
+++ b/resources/lang/mk-MK/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Резервни копии',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/mk-MK/admin/users/message.php b/resources/lang/mk-MK/admin/users/message.php
index cf76e9efb4..456bb9184a 100644
--- a/resources/lang/mk-MK/admin/users/message.php
+++ b/resources/lang/mk-MK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Го одбивте основното средство.',
'bulk_manager_warn' => 'Вашите корисници се ажурирани, но записот за менаџерот не е зачуван, бидејќи менаџерот што го избравте беше во листата на корисници што се ажурираа. Корисниците не може да бидат свој сопствен менаџер. Изберете ги корисниците повторно, со исклучок на менаџерот и пробајте пак.',
'user_exists' => 'Корисникот веќе постои!',
- 'user_not_found' => 'Корисникот не постои.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Полето за корисничко име е задолжително',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Потребна е лозинка.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Не можам да го пребарам LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека.
Грешка од LDAP-серверот:',
'ldap_could_not_get_entries' => 'Не можам да добијам записи од LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека.
Грешка од LDAP-серверот:',
'password_ldap' => 'Лозинката за корисникот е управувана од LDAP/Active Directory. Ве молиме контактирајте го одделот за ИТ за да ја смените вашата лозинка. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/mk-MK/button.php b/resources/lang/mk-MK/button.php
index c6caa2d48e..282fcd99e9 100644
--- a/resources/lang/mk-MK/button.php
+++ b/resources/lang/mk-MK/button.php
@@ -18,7 +18,7 @@ return [
'generate_labels' => '{1} Generate Label|[2,*] Generate Labels',
'send_password_link' => 'Испрати врска за ресетирање на лозинка',
'go' => 'Go',
- 'bulk_actions' => 'Bulk Actions',
+ 'bulk_actions' => 'Масовни дејства',
'add_maintenance' => 'Add Maintenance',
'append' => 'Append',
'new' => 'Ново',
diff --git a/resources/lang/mk-MK/general.php b/resources/lang/mk-MK/general.php
index 13a6322dd6..12632b99ef 100644
--- a/resources/lang/mk-MK/general.php
+++ b/resources/lang/mk-MK/general.php
@@ -1,22 +1,22 @@
'2FA reset',
+ '2FA_reset' => '2FA ресетирање',
'accessories' => 'Додатоци',
'activated' => 'Активиран',
- 'accepted_date' => 'Date Accepted',
+ 'accepted_date' => 'Датум на прифаќање',
'accessory' => 'Додаток',
'accessory_report' => 'Извештај за додаток',
'action' => 'Акција',
'activity_report' => 'Извештај за активност',
'address' => 'Адреса',
'admin' => 'Admin',
- 'admin_tooltip' => 'This user has admin privileges',
- 'superuser' => 'Superuser',
- 'superuser_tooltip' => 'This user has superuser privileges',
+ 'admin_tooltip' => 'Корисникот има администраторски привилегии',
+ 'superuser' => 'Суперкорисник',
+ 'superuser_tooltip' => 'Корисникот има привилегии на суперкорисник',
'administrator' => 'Администратор',
'add_seats' => 'Додадени места',
- 'age' => "Age",
+ 'age' => "Возраст",
'all_assets' => 'Сите основни средства',
'all' => 'Сите',
'archived' => 'Архивирано',
@@ -25,20 +25,20 @@ return [
'asset' => 'Основно средство',
'asset_report' => 'Извештај за основни средства',
'asset_tag' => 'Код на основното средство',
- 'asset_tags' => 'Asset Tags',
- 'assets_available' => 'Assets available',
- 'accept_assets' => 'Accept Assets :name',
- 'accept_assets_menu' => 'Accept Assets',
+ 'asset_tags' => 'Етикети на средства',
+ 'assets_available' => 'Достапни средства',
+ 'accept_assets' => 'Прифати средства :name',
+ 'accept_assets_menu' => 'Прифати средства',
'audit' => 'Ревизија',
'audit_report' => 'Дневник за ревизија',
'assets' => 'Основни средства',
- 'assets_audited' => 'assets audited',
- 'assets_checked_in_count' => 'assets checked in',
- 'assets_checked_out_count' => 'assets checked out',
- 'asset_deleted_warning' => 'This asset has been deleted. You must restore it before you can assign it to someone.',
- 'assigned_date' => 'Date Assigned',
- 'assigned_to' => 'Assigned to :name',
- 'assignee' => 'Assigned to',
+ 'assets_audited' => 'ревидирани средства',
+ 'assets_checked_in_count' => 'вратени редства',
+ 'assets_checked_out_count' => 'позајмени средства',
+ 'asset_deleted_warning' => 'Ова средство е избришано. Мора да го вратите пред да можете да го доделите на некого.',
+ 'assigned_date' => 'Датум на задолжување',
+ 'assigned_to' => 'Задолжени на :name',
+ 'assignee' => 'Задолжен на',
'avatar_delete' => 'Избриши аватар',
'avatar_upload' => 'Прикачи аватар',
'back' => 'Назад',
@@ -46,13 +46,13 @@ return [
'bulkaudit' => 'Масовна ревизија',
'bulkaudit_status' => 'Статус на ревизија',
'bulk_checkout' => 'Масовно задолжување',
- 'bulk_edit' => 'Bulk Edit',
- 'bulk_delete' => 'Bulk Delete',
- 'bulk_actions' => 'Bulk Actions',
- 'bulk_checkin_delete' => 'Bulk Checkin / Delete Users',
+ 'bulk_edit' => 'Масовно уредување',
+ 'bulk_delete' => 'Масовно бришење',
+ 'bulk_actions' => 'Масовни дејства',
+ 'bulk_checkin_delete' => 'Раздолжи ги / избриши ги корисниците',
'byod' => 'BYOD',
- 'byod_help' => 'This device is owned by the user',
- 'bystatus' => 'by Status',
+ 'byod_help' => 'Уредот е во сопственост на корисникот',
+ 'bystatus' => 'по Статус',
'cancel' => 'Откажи',
'categories' => 'Категории',
'category' => 'Категорија',
@@ -76,19 +76,19 @@ return [
'consumable' => 'Потрошен материјал',
'consumables' => 'Потрошен материјал',
'country' => 'Држава',
- 'could_not_restore' => 'Error restoring :item_type: :error',
- 'not_deleted' => 'The :item_type was not deleted and therefore cannot be restored',
+ 'could_not_restore' => 'Грешка при враќање :item_type: :error',
+ 'not_deleted' => 'Уредот :item_type не е избришан и затоа не може да се врати',
'create' => 'Креирај Нов {0}',
'created' => 'Креирана ставка',
'created_asset' => 'креирано основно средство',
- 'created_at' => 'Created At',
- 'created_by' => 'Created By',
- 'record_created' => 'Record Created',
+ 'created_at' => 'Креирано на',
+ 'created_by' => 'Креирано од',
+ 'record_created' => 'Записот креиран',
'updated_at' => 'Ажурирано во',
'currency' => '$', // this is deprecated
'current' => 'Тековна',
- 'current_password' => 'Current Password',
- 'customize_report' => 'Customize Report',
+ 'current_password' => 'Тековна лозинка',
+ 'customize_report' => 'Прилагоди извештај',
'custom_report' => 'Приспособен извештај за основни средства',
'dashboard' => 'Табла',
'days' => 'денови',
@@ -98,29 +98,29 @@ return [
'debug_warning_text' => 'Оваа апликација работи во режим на производство со овозможено дебагирање. Ова може да изложи чувствителните податоци доколку вашата апликација е достапна за надворешниот свет. Оневозможете го дебагирачкиот режим со поставување на APP_DEBUG во вашата .env датотека на false.',
'delete' => 'Избриши',
'delete_confirm' => 'Дали сте сигурни дека сакате да избришете: ставка?',
- 'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+ 'delete_confirm_no_undo' => 'Дали сте сигурни, сакате да го избришете :item? Ова неможе да се врати.',
'deleted' => 'Избришани',
'delete_seats' => 'Избришани места',
- 'deletion_failed' => 'Deletion failed',
+ 'deletion_failed' => 'Неуспешно бришење',
'departments' => 'Одделенија',
'department' => 'Одделение',
'deployed' => 'Распоредени',
'depreciation' => 'Амортизационен план',
- 'depreciations' => 'Depreciations',
+ 'depreciations' => 'Амортизации',
'depreciation_report' => 'Извештај за амортизација',
'details' => 'Детали',
'download' => 'Преземи',
- 'download_all' => 'Download All',
+ 'download_all' => 'Преземи сè',
'editprofile' => 'Уредете го вашиот профил',
'eol' => 'EOL',
'email_domain' => 'Домен за е-пошта',
'email_format' => 'Формат на е-пошта',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => 'Број на вработен',
'email_domain_help' => 'Ова се користи за генерирање на адреси на е-пошта при увоз',
- 'error' => 'Error',
- 'exclude_archived' => 'Exclude Archived Assets',
- 'exclude_deleted' => 'Exclude Deleted Assets',
- 'example' => 'Example: ',
+ 'error' => 'Грешка',
+ 'exclude_archived' => 'Исклучи архивирани средства',
+ 'exclude_deleted' => 'Исклучи избришани средства',
+ 'example' => 'Пример: ',
'filastname_format' => 'Почетна буква од име, Презиме (jjankov@example.com)',
'firstname_lastname_format' => 'Име, точка, Презиме (janko.jankov@example.com)',
'firstname_lastname_underscore_format' => 'Име, _, Презиме (janko_jankov@example.com)',
@@ -139,12 +139,12 @@ return [
'first_name_format' => 'Име (janko@example.com)',
'files' => 'Датотеки',
'file_name' => 'Датотека',
- 'file_type' => 'File Type',
- 'filesize' => 'File Size',
+ 'file_type' => 'Тип на фајл',
+ 'filesize' => 'Големина на фајл',
'file_uploads' => 'Прикачување датотеки',
- 'file_upload' => 'File Upload',
+ 'file_upload' => 'Прикачи фајл',
'generate' => 'Генерирање',
- 'generate_labels' => 'Generate Labels',
+ 'generate_labels' => 'Генерирај етикети',
'github_markdown' => 'Ова поле прифаќа означување според Github.',
'groups' => 'Групи',
'gravatar_email' => 'Gravatar е-пошта',
@@ -216,7 +216,7 @@ return [
'no' => 'Не',
'notes' => 'Забелешки',
'order_number' => 'Број на нарачка',
- 'only_deleted' => 'Only Deleted Assets',
+ 'only_deleted' => 'Само избришани средства',
'page_menu' => 'Прикажани се _MENU_ ставки',
'pagination_info' => 'Прикажани се _START_ до _END_ од _TOTAL_ ставки',
'pending' => 'Во чекање',
@@ -391,7 +391,7 @@ return [
'consumables_count' => 'Consumables Count',
'components_count' => 'Components Count',
'licenses_count' => 'Licenses Count',
- 'notification_error' => 'Error',
+ 'notification_error' => 'Грешка',
'notification_error_hint' => 'Please check the form below for errors',
'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
'notification_success' => 'Success',
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Истекува',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/mk-MK/localizations.php b/resources/lang/mk-MK/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/mk-MK/localizations.php
+++ b/resources/lang/mk-MK/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/mk-MK/mail.php b/resources/lang/mk-MK/mail.php
index 18e46c943e..b5e4c1cabf 100644
--- a/resources/lang/mk-MK/mail.php
+++ b/resources/lang/mk-MK/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Корисникот побарал средство на веб-страницата',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Име на додаток:',
- 'additional_notes' => 'Дополнителни забелешки:',
+ 'accessory_name' => 'Име на додаток',
+ 'additional_notes' => 'Дополнителни забелешки',
'admin_has_created' => 'Администраторот создаде сметка за вас на :web веб-страница.',
- 'asset' => 'Основно средство:',
- 'asset_name' => 'Име на основното средство:',
+ 'asset' => 'Основно средство',
+ 'asset_name' => 'Име на основното средство',
'asset_requested' => 'Бараното основно средство',
'asset_tag' => 'Код на основното средство',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Задолжен на',
'best_regards' => 'Со почит,',
- 'canceled' => 'Откажано:',
- 'checkin_date' => 'Датум на раздолжување:',
- 'checkout_date' => 'Датум на задолжување:',
+ 'canceled' => 'Откажано',
+ 'checkin_date' => 'Датум на раздолжување',
+ 'checkout_date' => 'Датум на задолжување',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Ве молиме кликнете на следната врска за да ја потврдите вашата :web сметка:',
'current_QTY' => 'Тековна количина',
'days' => 'Денови',
- 'expecting_checkin_date' => 'Очекуван датум на раздолжување:',
+ 'expecting_checkin_date' => 'Очекуван датум на раздолжување',
'expires' => 'Истекува',
'hello' => 'Здраво',
'hi' => 'Здраво',
'i_have_read' => 'Ги прочитав и се согласив со условите за користење и го примив ова средство.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Средство:',
+ 'item' => 'Ставка',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Ве молиме кликнете на следната врска за да ја обновите вашата :web лозинка:',
@@ -66,11 +66,11 @@ return [
'name' => 'Име',
'new_item_checked' => 'Ново основно средство е задолжено на Ваше име, деталите се подолу.',
'notes' => 'Забелешки',
- 'password' => 'Лозинка:',
+ 'password' => 'Лозинка',
'password_reset' => 'Ресетирање на лозинка',
'read_the_terms' => 'Ве молиме прочитајте ги условите за употреба подолу.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Побарано:',
+ 'requested' => 'Побарано',
'reset_link' => 'Вашата врска за ресетирање на лозинка',
'reset_password' => 'За да ја ресетирате Вашата лозинка, притиснете на врската:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/ml-IN/admin/locations/message.php b/resources/lang/ml-IN/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/ml-IN/admin/locations/message.php
+++ b/resources/lang/ml-IN/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ml-IN/admin/users/message.php b/resources/lang/ml-IN/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/ml-IN/admin/users/message.php
+++ b/resources/lang/ml-IN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index 271d535f5d..17a0d3f276 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ml-IN/localizations.php b/resources/lang/ml-IN/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/ml-IN/localizations.php
+++ b/resources/lang/ml-IN/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ml-IN/mail.php b/resources/lang/ml-IN/mail.php
index edb1683200..72fb70db80 100644
--- a/resources/lang/ml-IN/mail.php
+++ b/resources/lang/ml-IN/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/mn-MN/admin/locations/message.php b/resources/lang/mn-MN/admin/locations/message.php
index 803ac71e41..c6993151e5 100644
--- a/resources/lang/mn-MN/admin/locations/message.php
+++ b/resources/lang/mn-MN/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Байршил байхгүй байна.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Энэ байршил нь одоогоор нэгээс доошгүй активтай холбоотой бөгөөд устгах боломжгүй байна. Энэ байршлыг лавлагаа болгохоо болихын тулд өөрийн хөрөнгийг шинэчлээд дахин оролдоно уу.',
'assoc_child_loc' => 'Энэ байршил нь одоогоор хамгийн багадаа нэг хүүхдийн байрлалын эцэг эх бөгөөд устгах боломжгүй байна. Энэ байршлыг лавшруулахгүй болгохын тулд байршлаа шинэчлээд дахин оролдоно уу.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/mn-MN/admin/settings/general.php b/resources/lang/mn-MN/admin/settings/general.php
index 900f44f11f..855b626c34 100644
--- a/resources/lang/mn-MN/admin/settings/general.php
+++ b/resources/lang/mn-MN/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Нөөцлөлтүүд',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/mn-MN/admin/users/message.php b/resources/lang/mn-MN/admin/users/message.php
index c0fad766d6..0b27528e6e 100644
--- a/resources/lang/mn-MN/admin/users/message.php
+++ b/resources/lang/mn-MN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Та энэ хөрөнгийг амжилттай татгалзсан.',
'bulk_manager_warn' => 'Таны хэрэглэгчид амжилттай шинэчлэгдсэн хэдий ч таны менежерийн оруулгыг хадгалсангүй, учир нь таны сонгосон менежер засварлах хэрэглэгчийн жагсаалт мөн хэрэглэгчид магадгүй өөрийн менежер биш байж болно. Менежерийг оруулалгүйгээр хэрэглэгчдийг дахин сонгоно уу.',
'user_exists' => 'Хэрэглэгч бүртгэгдсэн байна!',
- 'user_not_found' => 'Хэрэглэгч байхгүй байна.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Нэвтрэх талбар шаардлагатай байна',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Нууц үг шаардагдана.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'LDAP серверийг хайж чадахгүй байна. LDAP серверийн тохиргоог LDAP тохиргооны файлдаа шалгана уу.
LDAP серверийн алдаа:',
'ldap_could_not_get_entries' => 'LDAP серверээс бичилтийг авч чадсангүй. LDAP серверийн тохиргоог LDAP тохиргооны файлдаа шалгана уу.
LDAP серверийн алдаа:',
'password_ldap' => 'Энэ акаунтын нууц үгийг LDAP / Active Directory удирддаг. Нууц үгээ солихын тулд өөрийн IT хэлтэст хандана уу.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/mn-MN/general.php b/resources/lang/mn-MN/general.php
index cf870ecaf6..d4b9681d83 100644
--- a/resources/lang/mn-MN/general.php
+++ b/resources/lang/mn-MN/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Хугацаа дуусна',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/mn-MN/localizations.php b/resources/lang/mn-MN/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/mn-MN/localizations.php
+++ b/resources/lang/mn-MN/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/mn-MN/mail.php b/resources/lang/mn-MN/mail.php
index 5e47c2bcdb..843c290006 100644
--- a/resources/lang/mn-MN/mail.php
+++ b/resources/lang/mn-MN/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Хэрэглэгч вэбсайт дээрх зүйлийг хүссэн байна',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Дагалдах хэрэгслийн нэр:',
- 'additional_notes' => 'Нэмэлт тайлбар:',
+ 'accessory_name' => 'Дагалдах хэрэгслийн нэр',
+ 'additional_notes' => 'Нэмэлт тайлбар',
'admin_has_created' => 'Администратор танд зориулж дараах вэбсайт дээр акаунт үүсгэсэн байна.',
- 'asset' => 'Актив:',
- 'asset_name' => 'Хөрөнгийн нэр:',
+ 'asset' => 'Актив',
+ 'asset_name' => 'Хөрөнгийн нэр',
'asset_requested' => 'Хөрөнгө хүссэн',
'asset_tag' => 'Хөрөнгийн шошго',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Томилогдсон',
'best_regards' => 'Хамгийн сайн нь,',
- 'canceled' => 'Цуцалсан:',
- 'checkin_date' => 'Огноо шалгах:',
- 'checkout_date' => 'Тооцоо хийх өдөр:',
+ 'canceled' => 'Цуцалсан',
+ 'checkin_date' => 'Checkin Огноо',
+ 'checkout_date' => 'Тооцоо хийх өдөр',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Вэбсайтаа баталгаажуулахын тулд дараах холбоос дээр дарна уу:',
'current_QTY' => 'Одоогийн QTY',
'days' => 'Өдөр',
- 'expecting_checkin_date' => 'Хүлээгдэж буй хугацаа:',
+ 'expecting_checkin_date' => 'Хүлээгдэж буй хугацаа',
'expires' => 'Хугацаа дуусна',
'hello' => 'Сайн уу',
'hi' => 'Сайн уу',
'i_have_read' => 'Би ашиглалтын нөхцөлийг уншиж, зөвшөөрч, энэ зүйлийг хүлээн авсан.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Зүйл:',
+ 'item' => 'Зүйл',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count ширхэг лизенц :threshhold өдрийн дотор дуусна.|:count ширхэг лизенц :threshhold өдрийн дотор дуусна.',
'link_to_update_password' => 'Вэбсайтаа шинэчлэхийн тулд дараах холбоос дээр дарна уу:',
@@ -66,11 +66,11 @@ return [
'name' => 'Нэр',
'new_item_checked' => 'Таны нэрээр шинэ зүйл шалгасан бөгөөд дэлгэрэнгүй мэдээлэл доор байна.',
'notes' => 'Тэмдэглэл',
- 'password' => 'Нууц үг:',
+ 'password' => 'Нууц үг',
'password_reset' => 'Нууц үг шинэчлэх',
'read_the_terms' => 'Доорх хэрэглээний нөхцөлийг уншина уу.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Хүсэлт гаргасан:',
+ 'requested' => 'Хүсэлт гаргасан',
'reset_link' => 'Таны нууц үгээ шинэчлэх линк',
'reset_password' => 'Нууц үгээ дахин тохируулах бол энд дарна уу:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/ms-MY/admin/categories/general.php b/resources/lang/ms-MY/admin/categories/general.php
index 6d7f840eda..aec594f8ef 100644
--- a/resources/lang/ms-MY/admin/categories/general.php
+++ b/resources/lang/ms-MY/admin/categories/general.php
@@ -8,7 +8,7 @@ return array(
'clone' => 'Klon Kategori',
'create' => 'Cipta Kategori',
'edit' => 'Kemaskini Kategori',
- 'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
+ 'email_will_be_sent_due_to_global_eula' => '.',
'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
'eula_text' => 'Kategori EULA',
'eula_text_help' => 'Bidang ini membolehkan anda menyesuaikan EULA anda untuk jenis aset tertentu. Jika anda hanya mempunyai satu EULA untuk semua aset anda, anda boleh menyemak kotak di bawah untuk menggunakan lalai utama.',
diff --git a/resources/lang/ms-MY/admin/locations/message.php b/resources/lang/ms-MY/admin/locations/message.php
index eeb1b41078..cd2ae708a6 100644
--- a/resources/lang/ms-MY/admin/locations/message.php
+++ b/resources/lang/ms-MY/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokasi tidak wujud.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Lokasi ini kini dikaitkan dengan sekurang-kurangnya satu aset dan tidak boleh dihapuskan. Sila kemas kini aset anda untuk tidak merujuk lagi lokasi ini dan cuba lagi.',
'assoc_child_loc' => 'Lokasi ini adalah ibu bapa sekurang-kurangnya satu lokasi kanak-kanak dan tidak boleh dipadamkan. Sila kemas kini lokasi anda untuk tidak merujuk lokasi ini lagi dan cuba lagi.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ms-MY/admin/settings/general.php b/resources/lang/ms-MY/admin/settings/general.php
index 1094443927..6e3b58072e 100644
--- a/resources/lang/ms-MY/admin/settings/general.php
+++ b/resources/lang/ms-MY/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sandaran',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ms-MY/admin/users/message.php b/resources/lang/ms-MY/admin/users/message.php
index 893f110b21..0c68b5a6a5 100644
--- a/resources/lang/ms-MY/admin/users/message.php
+++ b/resources/lang/ms-MY/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Anda telah berjaya menolak aset ini.',
'bulk_manager_warn' => 'Pengguna anda telah berjaya dikemas kini, namun entri pengurus anda tidak disimpan kerana pengurus yang anda pilih juga dalam senarai pengguna untuk diedit, dan pengguna mungkin bukan pengurus mereka sendiri. Sila pilih pengguna anda sekali lagi, tidak termasuk pengurus.',
'user_exists' => 'Pengguna telah wujud!',
- 'user_not_found' => 'Pengguna tidak wujud.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Ruangan log masuk diperlukan',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Ruangan kata kunci diperlukan.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Tidak dapat mencari pelayan LDAP. Sila periksa konfigurasi pelayan LDAP anda dalam fail konfigurasi LDAP.
Error dari LDAP Server:',
'ldap_could_not_get_entries' => 'Tidak dapat masuk dari pelayan LDAP. Sila periksa konfigurasi pelayan LDAP anda dalam fail konfigurasi LDAP.
Error dari LDAP Server:',
'password_ldap' => 'Kata laluan untuk akaun ini diuruskan oleh LDAP / Active Directory. Sila hubungi jabatan IT anda untuk menukar kata laluan anda.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ms-MY/general.php b/resources/lang/ms-MY/general.php
index af5feb34ac..8c058a91f7 100644
--- a/resources/lang/ms-MY/general.php
+++ b/resources/lang/ms-MY/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Tamat tempoh',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ms-MY/localizations.php b/resources/lang/ms-MY/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/ms-MY/localizations.php
+++ b/resources/lang/ms-MY/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ms-MY/mail.php b/resources/lang/ms-MY/mail.php
index f02540ae16..90875764ef 100644
--- a/resources/lang/ms-MY/mail.php
+++ b/resources/lang/ms-MY/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Seorang pengguna telah meminta item di laman web',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Nama Aksesori:',
- 'additional_notes' => 'Nota tambahan:',
+ 'accessory_name' => 'Nama Aksesori',
+ 'additional_notes' => 'Nota tambahan',
'admin_has_created' => 'Pentadbir telah membuat akaun untuk anda di: laman web web.',
- 'asset' => 'Aset:',
- 'asset_name' => 'Nama Aset:',
+ 'asset' => 'Harta',
+ 'asset_name' => 'Nama Harta',
'asset_requested' => 'Aset diminta',
'asset_tag' => 'Tag Harta',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Ditugaskan untuk',
'best_regards' => 'Selamat sejahtera,',
- 'canceled' => 'Dibatalkan:',
- 'checkin_date' => 'Tarikh Semakan:',
- 'checkout_date' => 'Tarikh Semakan:',
+ 'canceled' => 'Dibatalkan',
+ 'checkin_date' => 'Tarikh daftar masuk',
+ 'checkout_date' => 'Tarikh Agihan',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Sila klik pada pautan berikut untuk mengesahkan akaun web anda:',
'current_QTY' => 'QTY semasa',
'days' => 'Hari',
- 'expecting_checkin_date' => 'Tarikh Semak Yang Diharapkan:',
+ 'expecting_checkin_date' => 'Tarikh Periksa Yang Diharapkan',
'expires' => 'Tamat tempoh',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'Saya telah membaca dan bersetuju dengan terma penggunaan, dan telah menerima item ini.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Perkara:',
+ 'item' => 'Perkara',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Terdapat :count lesen yang akan tamat dalam tempoh :threshold hari.|Terdapat :count lesen yang akan tamat dalam tempoh :threshold hari.',
'link_to_update_password' => 'Sila klik pada pautan berikut untuk mengemas kini kata laluan web anda:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nama',
'new_item_checked' => 'Item baru telah diperiksa di bawah nama anda, butiran di bawah.',
'notes' => 'Nota',
- 'password' => 'Kata Laluan:',
+ 'password' => 'Kata Laluan',
'password_reset' => 'Memadam kata laluan',
'read_the_terms' => 'Sila baca terma penggunaan di bawah.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Diminta:',
+ 'requested' => 'Diminta',
'reset_link' => 'Pautan Semula Kata Laluan Anda',
'reset_password' => 'Klik di sini untuk menetapkan semula kata laluan anda:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/nb-NO/admin/locations/message.php b/resources/lang/nb-NO/admin/locations/message.php
index d74b25367b..4d9e7ad933 100644
--- a/resources/lang/nb-NO/admin/locations/message.php
+++ b/resources/lang/nb-NO/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokasjon eksisterer ikke.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ',
'assoc_child_loc' => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ',
'assigned_assets' => 'Tildelte ressurser',
diff --git a/resources/lang/nb-NO/admin/settings/general.php b/resources/lang/nb-NO/admin/settings/general.php
index a917561c0c..ab23cfe635 100644
--- a/resources/lang/nb-NO/admin/settings/general.php
+++ b/resources/lang/nb-NO/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sikkerhetskopier',
'backups_help' => 'Opprette, laste ned og gjenopprette sikkerhetskopier ',
'backups_restoring' => 'Gjenoppretting fra sikkerhetskopi',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Last opp sikkerhetskopi',
'backups_path' => 'Sikkerhetskopier på tjeneren lagres i :path',
'backups_restore_warning' => 'Bruk gjenopprettingsknappen for å gjenopprette fra en tidligere sikkerhetskopi. (Dette fungerer ikke med S3-fillagring eller Docker.)
Din hele :app_name databasen og eventuelle opplastede filer vil bli fullstendig erstattet av det som er i sikkerhetskopifilen. ',
diff --git a/resources/lang/nb-NO/admin/users/message.php b/resources/lang/nb-NO/admin/users/message.php
index ece6cbec5e..83cb339fa8 100644
--- a/resources/lang/nb-NO/admin/users/message.php
+++ b/resources/lang/nb-NO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Du har avvist eiendelen.',
'bulk_manager_warn' => 'Brukerne er oppdatert, men lederen ble ikke lagret fordi lederen du valgte også i brukerlisten for redigering og brukere kan ikke være sin egen leder. Velg brukerne igjen, unntatt lederen.',
'user_exists' => 'Bruker finnes allerede!',
- 'user_not_found' => 'Brukeren finnes ikke.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Login-feltet er påkrevd',
'user_has_no_assets_assigned' => 'Ingen eiendeler er tilordnet brukeren for øyeblikket.',
'user_password_required' => 'Passord er påkrevd.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:',
'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:',
'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/nb-NO/general.php b/resources/lang/nb-NO/general.php
index c4fe3ad5d9..4484eb1493 100644
--- a/resources/lang/nb-NO/general.php
+++ b/resources/lang/nb-NO/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Fjern også disse brukerne ved å fjerne deres eiendelshistorikk intakt/til du fjerner slettede poster i Admin-innstillingene.',
'bulk_checkin_delete_success' => 'Dine valgte brukere er slettet og deres elementer har blitt sjekket inn.',
'bulk_checkin_success' => 'Elementene for de valgte brukerne har blitt sjekket inn.',
- 'set_to_null' => 'Slette verdier for denne eiendelen Slett verdier for alle :asset_count eiendeler ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Slett :field verdier for denne brukeren. Slett :field verdier for alle :user_count brukere ',
'na_no_purchase_date' => 'N/A - Ingen kjøpsdato oppgitt',
'assets_by_status' => 'Eiendeler etter status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Utløper',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/nb-NO/localizations.php b/resources/lang/nb-NO/localizations.php
index 354be751b9..cfe4f6d42a 100644
--- a/resources/lang/nb-NO/localizations.php
+++ b/resources/lang/nb-NO/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Velg et språk',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Engelsk, USA',
'en-GB'=> 'Engelsk, Storbritannia',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Velg et land',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spania',
'ET'=>'Etiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Nederland',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norge',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russland',
'RW'=>'Rwanda',
'SA'=>'Saudi-Arabia',
- 'UK'=>'Storbritannia',
+ 'GB-SCT'=>'Storbritannia',
'SB'=>'Salomonøyene',
'SC'=>'Seychellene',
'SS'=>'Sør-Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Jomfruøyene, (USA)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis- og Futunaøyene',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/nb-NO/mail.php b/resources/lang/nb-NO/mail.php
index f9688539bf..a443b1bf0c 100644
--- a/resources/lang/nb-NO/mail.php
+++ b/resources/lang/nb-NO/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'En bruker har bedt om et element på webområdet',
'acceptance_asset_accepted' => 'En bruker har godtatt et element',
'acceptance_asset_declined' => 'En bruker har avvist et element',
- 'accessory_name' => 'Navn tilbehør:',
- 'additional_notes' => 'Flere notater:',
+ 'accessory_name' => 'Navn tilbehør',
+ 'additional_notes' => 'Flere notater',
'admin_has_created' => 'En administrator har opprettet en konto for deg på :web nettsted.',
- 'asset' => 'Eiendel:',
- 'asset_name' => 'Navn:',
+ 'asset' => 'Eiendel',
+ 'asset_name' => 'Navn',
'asset_requested' => 'Eiendel forespurt',
'asset_tag' => 'Eiendelsmerke',
'assets_warrantee_alert' => 'En eiendel har garanti som utløper innenfor de neste :treshold dagene.|:count eiendeler har garanti som utløper innenfor de neste :tershold dagene.',
'assigned_to' => 'Tilordnet til',
'best_regards' => 'Med vennlig hilsen,',
- 'canceled' => 'Avbrutt:',
- 'checkin_date' => 'Innsjekkdato:',
- 'checkout_date' => 'Utsjekkdato:',
+ 'canceled' => 'Avbrutt',
+ 'checkin_date' => 'Innsjekkdato',
+ 'checkout_date' => 'Utsjekkdato',
'checkedout_from' => 'Sjekket ut fra',
'checkedin_from' => 'Sjekket inn fra',
'checked_into' => 'Sjekket inn',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
'current_QTY' => 'Nåværende antall',
'days' => 'Dager',
- 'expecting_checkin_date' => 'Forventet innsjekkdato:',
+ 'expecting_checkin_date' => 'Forventet dato for innsjekk',
'expires' => 'Utløper',
'hello' => 'Hallo',
'hi' => 'Hei',
'i_have_read' => 'Jeg har lest og godtar vilkårene for bruk, og har mottatt denne enheten.',
'inventory_report' => 'Lagerbeholdnings rapport',
- 'item' => 'Enhet:',
+ 'item' => 'Enhet',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
'link_to_update_password' => 'Klikk på følgende link for å bekrefte din :web passord:',
@@ -66,11 +66,11 @@ return [
'name' => 'Navn',
'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
'notes' => 'Notater',
- 'password' => 'Passord:',
+ 'password' => 'Passord',
'password_reset' => 'Tilbakestill passord',
'read_the_terms' => 'Vennligst les bruksbetingelsene nedenfor.',
'read_the_terms_and_click' => 'Vennligst les vilkårene for bruk nedenfor. og klikk på lenken nederst for å bekrefte at du leser og godtar vilkårene for bruk, og har mottatt eiendelen.',
- 'requested' => 'Forespurt:',
+ 'requested' => 'Forespurt',
'reset_link' => 'Lenke for tilbakestilling av passord',
'reset_password' => 'Klikk her for å tilbakestille passordet:',
'rights_reserved' => 'Alle rettigheter forbeholdt.',
diff --git a/resources/lang/nl-NL/account/general.php b/resources/lang/nl-NL/account/general.php
index 3fb4862ad1..9bae590bcd 100644
--- a/resources/lang/nl-NL/account/general.php
+++ b/resources/lang/nl-NL/account/general.php
@@ -2,16 +2,16 @@
return array(
'personal_api_keys' => 'Persoonlijke API-sleutels',
- 'personal_access_token' => 'Personal Access Token',
- 'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
- 'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+ 'personal_access_token' => 'Persoonlijke toegangs-token',
+ 'personal_api_keys_success' => 'Persoonlijke API-sleutel :key succesvol gemaakt',
+ 'here_is_api_key' => 'Hier is je nieuwe persoonlijke toegangstoken. Dit is de enige keer dat het wordt weergegeven, dus verlies het niet! Je kunt nu deze token gebruiken om API-verzoeken te doen.',
+ 'api_key_warning' => 'Bij het genereren van een API-token, zorg ervoor dat je deze direct kopieert, omdat deze daarna niet meer zichtbaar is.',
'api_base_url' => 'Je API-basis-url bevindt zich op:',
'api_base_url_endpoint' => '/<endpoint>',
'api_token_expiration_time' => 'API tokens zijn ingesteld om te verlopen in:',
- 'api_reference' => 'Please check the API reference to find specific API endpoints and additional API documentation.',
- 'profile_updated' => 'Account successfully updated',
- 'no_tokens' => 'You have not created any personal access tokens.',
- 'enable_sounds' => 'Enable sound effects',
- 'enable_confetti' => 'Enable confetti effects',
+ 'api_reference' => 'Controleer de API referentie om specifieke API eindpunten en aanvullende API documentatie te vinden.',
+ 'profile_updated' => 'Account succesvol bijgewerkt',
+ 'no_tokens' => 'Je hebt geen persoonlijke toegangs-tokens aangemaakt.',
+ 'enable_sounds' => 'Zet geluid effecten aan',
+ 'enable_confetti' => 'Zet confetti effecten aan',
);
diff --git a/resources/lang/nl-NL/admin/accessories/message.php b/resources/lang/nl-NL/admin/accessories/message.php
index 419ea67431..21da0c2852 100644
--- a/resources/lang/nl-NL/admin/accessories/message.php
+++ b/resources/lang/nl-NL/admin/accessories/message.php
@@ -28,7 +28,7 @@ return array(
'unavailable' => 'Accessoire kan niet worden uitgegeven. Controleer de beschikbare hoeveelheid',
'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.',
'checkout_qty' => array(
- 'lte' => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+ 'lte' => 'Er is momenteel slechts één beschikbaar accessoire van dit type en u probeert :checkout_qty uit te checken. Pas het uitcheck aantal of de totale voorraad van dit accessoire aan en probeer het opnieuw.|Er zijn :number_currently_remaining totaal beschikbare accessoires en u probeert :checkout_qty uit te checken. Pas het uitcheck aantal of de totale voorraad van dit accessoire aan en probeer het opnieuw.',
),
),
diff --git a/resources/lang/nl-NL/admin/consumables/general.php b/resources/lang/nl-NL/admin/consumables/general.php
index d3cc6e7488..58ff6ce7fe 100644
--- a/resources/lang/nl-NL/admin/consumables/general.php
+++ b/resources/lang/nl-NL/admin/consumables/general.php
@@ -8,5 +8,5 @@ return array(
'remaining' => 'Resterende',
'total' => 'Totaal',
'update' => 'Wijzig verbruiksartikel',
- 'inventory_warning' => 'The inventory of this consumable is below the minimum amount of :min_count',
+ 'inventory_warning' => 'De inventaris van dit verbruiksartikel is lager dan het minimum aantal van :min_count',
);
diff --git a/resources/lang/nl-NL/admin/consumables/message.php b/resources/lang/nl-NL/admin/consumables/message.php
index 295d2a8bc4..467ad79e05 100644
--- a/resources/lang/nl-NL/admin/consumables/message.php
+++ b/resources/lang/nl-NL/admin/consumables/message.php
@@ -2,7 +2,7 @@
return array(
- 'invalid_category_type' => 'The category must be a consumable category.',
+ 'invalid_category_type' => 'Deze categorie moet een verbruik categorie zijn.',
'does_not_exist' => 'Verbruiksartikel bestaat niet.',
'create' => array(
diff --git a/resources/lang/nl-NL/admin/custom_fields/message.php b/resources/lang/nl-NL/admin/custom_fields/message.php
index e52efb7bed..a1def524f3 100644
--- a/resources/lang/nl-NL/admin/custom_fields/message.php
+++ b/resources/lang/nl-NL/admin/custom_fields/message.php
@@ -5,7 +5,7 @@ return array(
'field' => array(
'invalid' => 'Dat veld bestaat niet.',
'already_added' => 'Veld is al toegevoegd',
- 'none_selected' => 'No field selected',
+ 'none_selected' => 'Geen veld geselecteerd',
'create' => array(
'error' => 'Veld is niet aangemaakt, probeer het opnieuw.',
diff --git a/resources/lang/nl-NL/admin/hardware/form.php b/resources/lang/nl-NL/admin/hardware/form.php
index 6dbf2a442b..4b2787f2c5 100644
--- a/resources/lang/nl-NL/admin/hardware/form.php
+++ b/resources/lang/nl-NL/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
'order' => 'Ordernummer',
'qr' => 'QR-code',
'requestable' => 'Gebruikers mogen dit asset aanvragen',
- 'redirect_to_all' => 'Return to all :type',
- 'redirect_to_type' => 'Go to :type',
- 'redirect_to_checked_out_to' => 'Go to Checked Out to',
+ 'redirect_to_all' => 'Terug naar alle :type',
+ 'redirect_to_type' => 'Ga naar :type',
+ 'redirect_to_checked_out_to' => 'Ga naar uitcheckt naar',
'select_statustype' => 'Selecteer status type',
'serial' => 'Serienummer',
'status' => 'Status',
diff --git a/resources/lang/nl-NL/admin/hardware/general.php b/resources/lang/nl-NL/admin/hardware/general.php
index b0df639d32..45f2dbf6ef 100644
--- a/resources/lang/nl-NL/admin/hardware/general.php
+++ b/resources/lang/nl-NL/admin/hardware/general.php
@@ -15,8 +15,8 @@ return [
'delete_confirm' => 'Weet u zeker dat u dit item wilt verwijderen?',
'edit' => 'Asset bewerken',
'model_deleted' => 'Dit Assets model is verwijderd. U moet het model herstellen voordat u het Asset kunt herstellen.',
- 'model_invalid' => 'This model for this asset is invalid.',
- 'model_invalid_fix' => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+ 'model_invalid' => 'Het model voor deze asset is ongeldig.',
+ 'model_invalid_fix' => 'De asset moet worden bijgewerkt en gebruikt een geldig asset model voordat u het probeert in of uit te checken, of om het te auditen.',
'requestable' => 'Aanvraagbaar',
'requested' => 'Aangevraagd',
'not_requestable' => 'Niet aanvraagbaar',
diff --git a/resources/lang/nl-NL/admin/hardware/message.php b/resources/lang/nl-NL/admin/hardware/message.php
index 5d532de820..d32cb2dd12 100644
--- a/resources/lang/nl-NL/admin/hardware/message.php
+++ b/resources/lang/nl-NL/admin/hardware/message.php
@@ -2,13 +2,13 @@
return [
- 'undeployable' => 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+ 'undeployable' => 'Waarschuwing: Dit bestand is gemarkeerd als niet-uitgeefbaar. Als deze status is veranderd, update dan de asset status.',
'does_not_exist' => 'Dit asset bestaat niet.',
- 'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
- 'no_tag' => 'No asset tag provided.',
+ 'does_not_exist_var'=> 'Asset met tag :asset_tag niet gevonden.',
+ 'no_tag' => 'Geen asset tag opgegeven.',
'does_not_exist_or_not_requestable' => 'Die asset bestaat niet of is niet aanvraagbaar.',
'assoc_users' => 'Dit asset is momenteel toegewezen aan een gebruiker en kan niet worden verwijderd. Controleer het asset eerst en probeer het opnieuw. ',
- 'warning_audit_date_mismatch' => 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+ 'warning_audit_date_mismatch' => 'De volgende auditdatum van dit asset (:next_audit_date) ligt vóór de laatste auditdatum (:last_audit_date). Gelieve de volgende auditdatum bij te werken.',
'create' => [
'error' => 'Asset is niet aangemaakt, probeer het opnieuw :(',
@@ -33,7 +33,7 @@ return [
],
'audit' => [
- 'error' => 'Asset audit unsuccessful: :error ',
+ 'error' => 'Asset audit mislukt: :error ',
'success' => 'Asset audit succesvol geregistreerd.',
],
@@ -51,14 +51,14 @@ return [
],
'import' => [
- 'import_button' => 'Process Import',
+ 'import_button' => 'Import verwerken',
'error' => 'Sommige items zijn niet goed geïmporteerd.',
'errorDetail' => 'De volgende items zijn niet geïmporteerd vanwege fouten.',
'success' => 'Je bestand is geïmporteerd',
'file_delete_success' => 'Je bestand is succesvol verwijderd',
'file_delete_error' => 'Het bestand kon niet worden verwijderd',
'file_missing' => 'Het geselecteerde bestand ontbreekt',
- 'file_already_deleted' => 'The file selected was already deleted',
+ 'file_already_deleted' => 'Het geselecteerde bestand is al verwijderd',
'header_row_has_malformed_characters' => 'Een of meer attributen in de kopregel bevatten ongeldige UTF-8-tekens',
'content_row_has_malformed_characters' => 'Een of meer attributen in de eerste rij inhoud bevat ongeldige UTF-8 tekens',
],
diff --git a/resources/lang/nl-NL/admin/kits/general.php b/resources/lang/nl-NL/admin/kits/general.php
index 1c23815471..a94863a8a2 100644
--- a/resources/lang/nl-NL/admin/kits/general.php
+++ b/resources/lang/nl-NL/admin/kits/general.php
@@ -47,5 +47,5 @@ return [
'kit_deleted' => 'Kit is succesvol verwijderd',
'kit_model_updated' => 'Model is succesvol bijgewerkt',
'kit_model_detached' => 'Model is met succes losgekoppeld',
- 'model_already_attached' => 'Model already attached to kit',
+ 'model_already_attached' => 'Model is al gekoppeld aan kit',
];
diff --git a/resources/lang/nl-NL/admin/licenses/general.php b/resources/lang/nl-NL/admin/licenses/general.php
index 1e6266a9ec..276cd11ef3 100644
--- a/resources/lang/nl-NL/admin/licenses/general.php
+++ b/resources/lang/nl-NL/admin/licenses/general.php
@@ -14,7 +14,7 @@ return array(
'info' => 'Licentiegegevens',
'license_seats' => 'Licentie werkplekken',
'seat' => 'Werkplek',
- 'seat_count' => 'Seat :count',
+ 'seat_count' => 'Werkplek :count',
'seats' => 'Werkplekken',
'software_licenses' => 'Applicatie Licenties',
'user' => 'Gebruiker',
@@ -24,12 +24,12 @@ return array(
[
'checkin_all' => [
'button' => 'Alle licenties inchecken',
- 'modal' => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+ 'modal' => 'Hiermee wordt één werkplek ingecheckt. | Hiermee worden alle :checkedout_seats_count werkplekken voor deze licentie ingecheckt.',
'enabled_tooltip' => 'Check ALLE werkplekken in voor deze licentie van zowel gebruikers als assets',
'disabled_tooltip' => 'Dit is uitgeschakeld omdat er nog niets is uitgecheckt',
'disabled_tooltip_reassignable' => 'Dit is uitgeschakeld omdat de licentie niet opnieuw toegewezen kan worden',
'success' => 'Licentie met succes ingecheckt! | Alle licenties zijn met succes ingecheckt!',
- 'log_msg' => 'Checked in via bulk license checkin in license GUI',
+ 'log_msg' => 'Ingecheckt via bulk licentiecontrole in licentie GUI',
],
'checkout_all' => [
diff --git a/resources/lang/nl-NL/admin/licenses/message.php b/resources/lang/nl-NL/admin/licenses/message.php
index 5830355d79..0d65e553c1 100644
--- a/resources/lang/nl-NL/admin/licenses/message.php
+++ b/resources/lang/nl-NL/admin/licenses/message.php
@@ -44,8 +44,8 @@ return array(
'error' => 'Er was een probleem met het uitchecken van deze licentie. Probeer het opnieuw.',
'success' => 'De licentie is met succes uitgecheckt',
'not_enough_seats' => 'Niet genoeg licentieplaatsen beschikbaar voor de kassa',
- 'mismatch' => 'The license seat provided does not match the license',
- 'unavailable' => 'This seat is not available for checkout.',
+ 'mismatch' => 'De opgegeven licentie werkplek komt niet overeen met de licentie',
+ 'unavailable' => 'Deze licentie is niet beschikbaar voor uitchecken.',
),
'checkin' => array(
diff --git a/resources/lang/nl-NL/admin/locations/message.php b/resources/lang/nl-NL/admin/locations/message.php
index 4020d4e3ef..40b6875e6d 100644
--- a/resources/lang/nl-NL/admin/locations/message.php
+++ b/resources/lang/nl-NL/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'Locatie bestaat niet.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'Deze locatie is momenteel niet verwijderbaar omdat het de locatie is voor ten minste één product of gebruiker, heeft de assets toegewezen of is de bovenliggende locatie van een andere locatie. Update uw gegevens zodat deze locatie niet langer gebruikt wordt en probeer het opnieuw. ',
'assoc_assets' => 'Deze locatie is momenteel gekoppeld met tenminste één asset en kan hierdoor niet worden verwijderd. Update je assets die niet meer bij deze locatie en probeer het opnieuw. ',
'assoc_child_loc' => 'Deze locatie is momenteen de ouder van ten minste één kind locatie en kan hierdoor niet worden verwijderd. Update je locaties bij die niet meer naar deze locatie verwijzen en probeer het opnieuw. ',
'assigned_assets' => 'Toegewezen activa',
'current_location' => 'Huidige locatie',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => 'Open in :map_provider_icon kaarten',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'Locatie is niet hersteld, probeer het opnieuw',
+ 'success' => 'Locatie hersteld.'
),
'delete' => array(
diff --git a/resources/lang/nl-NL/admin/models/message.php b/resources/lang/nl-NL/admin/models/message.php
index edef7962b5..1cd1b6a5ec 100644
--- a/resources/lang/nl-NL/admin/models/message.php
+++ b/resources/lang/nl-NL/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
'no_association' => 'WAARSCHUWING! Het asset model voor dit item is ongeldig of ontbreekt!',
'no_association_fix' => 'Dit maakt dingen kapot op rare en gruwelijke manieren. Bewerk dit product nu om het een model toe te wijzen.',
'assoc_users' => 'Dit model is momenteel gekoppeld met één of meer assets en kan niet worden verwijderd. Verwijder de assets en probeer het opnieuw. ',
- 'invalid_category_type' => 'This category must be an asset category.',
+ 'invalid_category_type' => 'Deze categorie moet een asset categorie zijn.',
'create' => array(
'error' => 'Model is niet aangemaakt, probeer het opnieuw.',
diff --git a/resources/lang/nl-NL/admin/settings/general.php b/resources/lang/nl-NL/admin/settings/general.php
index 2fc17ddf9e..66ca4095b2 100644
--- a/resources/lang/nl-NL/admin/settings/general.php
+++ b/resources/lang/nl-NL/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Back-ups',
'backups_help' => 'Maken, downloaden en herstellen van back-ups ',
'backups_restoring' => 'Herstellen vanuit back-up',
+ 'backups_clean' => 'Maak de backed-up database schoon voor herstel',
+ 'backups_clean_helptext' => "Dit kan handig zijn als je wisselt tussen databaseversies",
'backups_upload' => 'Backup uploaden',
'backups_path' => 'Back-ups op de server worden opgeslagen in :path',
'backups_restore_warning' => 'Gebruik de herstel knop om een vorige back-up te herstellen. (Dit werkt momenteel niet met S3 bestandsopslag of Docker.)
Je gehele :app_name database en alle geüploade bestanden zullen volledig vervangen wordendoor wat er in het backup bestand staat. ',
@@ -49,7 +51,7 @@ return [
'default_eula_text' => 'Standaard gebruikersovereenkomst',
'default_language' => 'Standaardtaal',
'default_eula_help_text' => 'Je kunt aangepaste gebruikersovereenkomsten koppelen aan specifieke assetcategorieën.',
- 'acceptance_note' => 'Add a note for your decision (Optional)',
+ 'acceptance_note' => 'Voeg een notitie toe voor uw beslissing (optioneel)',
'display_asset_name' => 'Geef Asset naam weer',
'display_checkout_date' => 'Toon Checkout datum',
'display_eol' => 'Toon EOL in tabel weergave',
@@ -94,7 +96,7 @@ return [
'ldap_login_sync_help' => 'Dit test enkel of LDAP correct kan synchroniseren. Als uw LDAP authenticatie vraag niet correct is, dan is het mogelijk dat gebruikers niet kunnen inloggen. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
'ldap_manager' => 'LDAP manager',
'ldap_server' => 'LDAP server',
- 'ldap_server_help' => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+ 'ldap_server_help' => 'Dit moet beginnen met ldap:// (voor onversleuteld) of ldaps:// (voor TLS of SSL)',
'ldap_server_cert' => 'LDAP SSL certificaat validatie',
'ldap_server_cert_ignore' => 'Staat ongeldige SSL certificaat toe',
'ldap_server_cert_help' => 'Selecteer deze box als je een eigen ondergetekende SSL certificaat gebruik en deze wilt accepteren.',
@@ -122,8 +124,8 @@ return [
'ldap_test' => 'LDAP testen',
'ldap_test_sync' => 'LDAP-synchronisatie testen',
'license' => 'Softwarelicentie',
- 'load_remote' => 'Load Remote Avatars',
- 'load_remote_help_text' => 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+ 'load_remote' => 'Laad Externe Avatars',
+ 'load_remote_help_text' => 'Vink dit selectievakje uit als uw installatie geen scripts van het internet kan laden. Dit zal voorkomen dat Snipe-IT avatars van Gravatar of andere bronnen probeert te laden.',
'login' => 'Inlog pogingen',
'login_attempt' => 'Inlog poging',
'login_ip' => 'IP adres',
@@ -218,8 +220,8 @@ return [
'webhook_integration_help' => ':app integratie is optioneel, maar het eindpunt en kanaal zijn vereist als je het wilt gebruiken. Om :app integratie te configureren, moet je eerst een inkomende webhook maken op je :app account. Klik op de knop Test :app Integration om te bevestigen dat je instellingen correct zijn voordat je ze opslaat. ',
'webhook_integration_help_button' => 'Zodra je :app informatie hebt opgeslagen, verschijnt er een testknop.',
'webhook_test_help' => 'Test of je :app integratie correct is geconfigureerd. JE MOET EERST DE AANGEPASTE :app INSTELLINGEN OPSLAAN.',
- 'shortcuts_enabled' => 'Enable Shortcuts',
- 'shortcuts_help_text' => 'Windows: Alt + Access key, Mac: Control + Option + Access key',
+ 'shortcuts_enabled' => 'Sneltoetsen inschakelen',
+ 'shortcuts_help_text' => 'Windows: Alt + Sneltoets, Mac: Control + Option + Sneltoets',
'snipe_version' => 'Snipe-IT Versie',
'support_footer' => 'Ondersteuningsvoettekst links ',
'support_footer_help' => 'Geef aan wie de links naar de Snipe-IT-ondersteuningsinformatie en gebruikershandleiding ziet',
@@ -292,15 +294,15 @@ return [
'oauth_clients' => 'OAuth Clients',
'oauth' => 'OAuth',
'oauth_help' => 'Oauth eindpunt instellingen',
- 'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+ 'oauth_no_clients' => 'Je hebt nog geen OAuth clients aangemaakt.',
'oauth_secret' => 'Secret',
- 'oauth_authorized_apps' => 'Authorized Applications',
- 'oauth_redirect_url' => 'Redirect URL',
- 'oauth_name_help' => ' Something your users will recognize and trust.',
+ 'oauth_authorized_apps' => 'Geautoriseerde toepassingen',
+ 'oauth_redirect_url' => 'Omleidings URL',
+ 'oauth_name_help' => ' Iets dat uw gebruikers herkennen en vertrouwen.',
'oauth_scopes' => 'Scopes',
- 'oauth_callback_url' => 'Your application authorization callback URL.',
- 'create_client' => 'Create Client',
- 'no_scopes' => 'No scopes',
+ 'oauth_callback_url' => 'Uw applicatie autorisatie callback URL.',
+ 'create_client' => 'Client aanmaken',
+ 'no_scopes' => 'Geen scopes',
'asset_tag_title' => 'Update Asset Tag Instellingen',
'barcode_title' => 'Barcode instellingen bijwerken',
'barcodes' => 'Barcodes',
@@ -375,13 +377,13 @@ return [
'database_driver' => 'Database Stuurprogramma',
'bs_table_storage' => 'Tafel opslag',
'timezone' => 'Tijdzone',
- 'profile_edit' => 'Edit Profile',
- 'profile_edit_help' => 'Allow users to edit their own profiles.',
- 'default_avatar' => 'Upload custom default avatar',
- 'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
- 'restore_default_avatar' => 'Restore original system default avatar',
+ 'profile_edit' => 'Profiel bewerken',
+ 'profile_edit_help' => 'Gebruikers toestaan hun eigen profielen te bewerken.',
+ 'default_avatar' => 'Aangepaste standaard avatar uploaden',
+ 'default_avatar_help' => 'Deze afbeelding wordt weergegeven als profielfoto wanneer een gebruiker geen profielfoto heeft.',
+ 'restore_default_avatar' => 'Originele standaard avatar herstellen',
'restore_default_avatar_help' => '',
- 'due_checkin_days' => 'Due For Checkin Warning',
- 'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+ 'due_checkin_days' => 'Waarschuwing voor aankomende Checkin',
+ 'due_checkin_days_help' => 'Hoeveel dagen vóór de verwachte check-in van een product moet het worden weergegeven op de pagina "Waarschuwing voor aankomende Check-in"?',
];
diff --git a/resources/lang/nl-NL/admin/settings/message.php b/resources/lang/nl-NL/admin/settings/message.php
index 9a19c6a7c6..d5fe1867ce 100644
--- a/resources/lang/nl-NL/admin/settings/message.php
+++ b/resources/lang/nl-NL/admin/settings/message.php
@@ -15,7 +15,7 @@ return [
'restore_confirm' => 'Weet je zeker dat je je database wilt herstellen met :filename?'
],
'restore' => [
- 'success' => 'Your system backup has been restored. Please log in again.'
+ 'success' => 'Uw systeemback-up is hersteld. Log opnieuw in.'
],
'purge' => [
'error' => 'Er is iets fout gegaan tijdens het opschonen.',
diff --git a/resources/lang/nl-NL/admin/users/message.php b/resources/lang/nl-NL/admin/users/message.php
index e6741bd994..67bcf5f437 100644
--- a/resources/lang/nl-NL/admin/users/message.php
+++ b/resources/lang/nl-NL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Je hebt dit asset met succes geweigerd.',
'bulk_manager_warn' => 'Uw gebruikers zijn succesvol bijgewerkt, de gekozen manager kon echter niet toegepast worden omdat deze persoon ook in de lijst staat, gebruikers mogen niet hun eigen manager zijn. Probeer het nogmaals en selecteer de gebruikers zonder de manager.',
'user_exists' => 'Gebruiker bestaat reeds!',
- 'user_not_found' => 'Gebruiker bestaat niet.',
+ 'user_not_found' => 'Gebruiker bestaat niet of je hebt geen toestemming om deze gebruiker te bekijken.',
'user_login_required' => 'Het veld gebruikersnaam is verplicht.',
'user_has_no_assets_assigned' => 'Geen assets toegewezen aan de gebruiker.',
'user_password_required' => 'Het veld wachtwoord is verplicht.',
@@ -37,22 +37,23 @@ return array(
'update' => 'Er was een probleem tijdens het bijwerken van de gebruiker. Probeer opnieuw, aub.',
'delete' => 'Er was een probleem tijdens het verwijderen van de gebruiker. Probeer opnieuw, aub.',
'delete_has_assets' => 'Deze gebruiker heeft toegewezen items en kon niet worden verwijderd.',
- 'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
- 'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
- 'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
- 'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
- 'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+ 'delete_has_assets_var' => 'Deze gebruiker heeft nog een asset toegewezen. Controleer dit eerst.|Deze gebruiker heeft nog steeds :count assets toegewezen. Controleer dit eerst.',
+ 'delete_has_licenses_var' => 'Deze gebruiker heeft nog een licentie toegewezen. Controleer dit eerst.|Deze gebruiker heeft nog steeds :count licenties toegewezen. Controleer dit eerst.',
+ 'delete_has_accessories_var' => 'Deze gebruiker heeft nog een accessoires toegewezen. Controleer dit eerst.|Deze gebruiker heeft nog steeds :count accessoires toegewezen. Controleer dit eerst.',
+ 'delete_has_locations_var' => 'Deze gebruiker beheert nog een locatie. Selecteer eerst een andere manager.|Deze gebruiker beheert nog steeds :count locaties. Selecteer eerst een andere manager.',
+ 'delete_has_users_var' => 'Deze gebruiker beheert nog een andere gebruiker. Selecteer eerst een andere manager.|Deze gebruiker beheert nog steeds :count gebruikers. Selecteer eerst een andere manager.',
'unsuspend' => 'Er was een probleem tijdens het opnieuw inschakelen van de gebruiker. Probeer opnieuw, aub.',
'import' => 'Er was een probleem met het importeren van de gebruikers. Probeer het opnieuw.',
'asset_already_accepted' => 'Dit asset is al geaccepteerd.',
'accept_or_decline' => 'Je moet dit asset accepteren of weigeren.',
- 'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+ 'cannot_delete_yourself' => 'We zouden het heel erg vinden als je jezelf zou verwijderen, overweeg alsjeblieft opnieuw.',
'incorrect_user_accepted' => 'Het asset dat je probeerde te accepteren is niet uitgecheckt aan jou.',
'ldap_could_not_connect' => 'Kan niet verbinden met de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand.
Fout van LDAP server:',
'ldap_could_not_bind' => 'Kan niet verbinden met de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand.
Fout van LDAP server: ',
'ldap_could_not_search' => 'Kan niet zoeken in de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand.
Fout van LDAP server:',
'ldap_could_not_get_entries' => 'Kan geen gegeven van de LDAP server krijgen. Controleer je LDAP server configuratie in de LDAP configuratie bestand.
Fout van LDAP server:',
'password_ldap' => 'Het wachtwoord voor deze account wordt beheerd door LDAP/Active Directory. Neem contact op met uw IT-afdeling om uw wachtwoord te wijzigen. ',
+ 'multi_company_items_assigned' => 'Deze gebruiker heeft items toegewezen, controleer ze alstublieft voordat u van bedrijf verwisselt.'
),
'deletefile' => array(
diff --git a/resources/lang/nl-NL/auth/message.php b/resources/lang/nl-NL/auth/message.php
index 913f1e2504..8559f8aefa 100644
--- a/resources/lang/nl-NL/auth/message.php
+++ b/resources/lang/nl-NL/auth/message.php
@@ -14,8 +14,8 @@ return array(
'success' => 'U bent succesvol ingelogd.',
'code_required' => 'Tweestapsverificatie code is vereist.',
'invalid_code' => 'Tweestapsverificatie code is ongeldig.',
- 'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
- 'please_enroll' => 'Please enroll a device in two-factor authentication.',
+ 'enter_two_factor_code' => 'Voer je tweestaps verificatiecode in.',
+ 'please_enroll' => 'Registreer een apparaat voor twee-factor-authenticatie.',
),
'signin' => array(
diff --git a/resources/lang/nl-NL/button.php b/resources/lang/nl-NL/button.php
index 64f0f9fae0..a8616ccc6f 100644
--- a/resources/lang/nl-NL/button.php
+++ b/resources/lang/nl-NL/button.php
@@ -7,7 +7,7 @@ return [
'checkin_and_delete' => 'Check Alles In / Verwijder Gebruiker',
'delete' => 'Verwijder',
'edit' => 'Bewerk',
- 'clone' => 'Clone',
+ 'clone' => 'Dupliceren',
'restore' => 'Herstel',
'remove' => 'Verwijder',
'request' => 'Aanvraag',
@@ -23,12 +23,12 @@ return [
'append' => 'Aanvullen',
'new' => 'Nieuw',
'var' => [
- 'clone' => 'Clone :item_type',
- 'edit' => 'Edit :item_type',
- 'delete' => 'Delete :item_type',
- 'restore' => 'Restore :item_type',
- 'create' => 'Create New :item_type',
+ 'clone' => 'Dupliceer :item_type',
+ 'edit' => ':item_type bewerken',
+ 'delete' => ':item_type verwijderen',
+ 'restore' => 'Herstel :item_type',
+ 'create' => 'Nieuw :item_type aanmaken',
'checkout' => 'Checkout :item_type',
- 'checkin' => 'Checkin :item_type',
+ 'checkin' => 'Check-in :item_type',
]
];
diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php
index dae57e5431..da34078bc8 100644
--- a/resources/lang/nl-NL/general.php
+++ b/resources/lang/nl-NL/general.php
@@ -11,9 +11,9 @@ return [
'activity_report' => 'Activiteitenrapportage',
'address' => 'Adres',
'admin' => 'Beheerder',
- 'admin_tooltip' => 'This user has admin privileges',
+ 'admin_tooltip' => 'Deze gebruiker heeft beheerdersrechten',
'superuser' => 'Superuser',
- 'superuser_tooltip' => 'This user has superuser privileges',
+ 'superuser_tooltip' => 'Deze gebruiker heeft superuser rechten',
'administrator' => 'Beheerder',
'add_seats' => 'Toegevoegde plekken',
'age' => "Leeftijd",
@@ -77,7 +77,7 @@ return [
'consumables' => 'Verbruiksartikelen',
'country' => 'Land',
'could_not_restore' => 'Fout herstellen :item_type: :error',
- 'not_deleted' => 'The :item_type was not deleted and therefore cannot be restored',
+ 'not_deleted' => 'De :item_type is niet verwijderd en kan daarom niet worden hersteld',
'create' => 'Nieuwe aanmaken',
'created' => 'Item aangemaakt',
'created_asset' => 'aangemaakt asset',
@@ -98,7 +98,7 @@ return [
'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',
'delete_confirm' => 'Weet u zeker dat u :item wilt verwijderen?',
- 'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+ 'delete_confirm_no_undo' => 'Weet je zeker dat je :item wilt verwijderen? Dit kan niet ongedaan worden gemaakt.',
'deleted' => 'Verwijderd',
'delete_seats' => 'Verwijderde plekken',
'deletion_failed' => 'Verwijderen mislukt',
@@ -134,7 +134,7 @@ return [
'lastname_firstinitial' => 'Achternaam eerste initiaal (smith_j@example.com)',
'firstinitial.lastname' => 'Eerste initiaal achternaam (j.smith@example.com)',
'firstnamelastinitial' => 'Voornaam Initiaal Achternaam (janes@voorbeeld.com)',
- 'lastnamefirstname' => 'Last Name.First Name (smith.jane@example.com)',
+ 'lastnamefirstname' => 'Achternaam.Voornaam (smith.jane@example.com)',
'first_name' => 'Voornaam',
'first_name_format' => 'Voornaam (jane@example.com)',
'files' => 'Bestanden',
@@ -156,9 +156,9 @@ return [
'image_delete' => 'Afbeelding verwijderen',
'include_deleted' => 'Verwijderde activa opnemen',
'image_upload' => 'Afbeelding uploaden',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
- 'filetypes_size_help' => 'The maximum upload size allowed is :size.',
- 'image_filetypes_help' => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+ 'filetypes_accepted_help' => 'Geaccepteerde bestandstype is :types. De maximale toegestane grootte is :size.|Geaccepteerde bestandstypen zijn :types. De maximale uploadgrootte is :size.',
+ 'filetypes_size_help' => 'De maximale uploadgrootte is :size.',
+ 'image_filetypes_help' => 'Geaccepteerde bestandstypen zijn jpg, webp, png, gif, svg en avif. De maximale toegestane bestandsgrootte is :size.',
'unaccepted_image_type' => 'Dit afbeeldingsbestand is niet leesbaar. Geaccepteerde bestandstypen zijn jpg, webp, png, gif en svg. Het mimetype van dit bestand is: :mimetype.',
'import' => 'Importeer',
'import_this_file' => 'Kaart velden en verwerk dit bestand',
@@ -193,7 +193,7 @@ return [
'logout' => 'Afmelden',
'lookup_by_tag' => 'Opzoeken via Asset tag',
'maintenances' => 'Onderhoudsbeurten',
- 'manage_api_keys' => 'Manage API keys',
+ 'manage_api_keys' => 'API-sleutels beheren',
'manufacturer' => 'Fabrikant',
'manufacturers' => 'Fabrikanten',
'markdown' => 'Dit veld staat Github markdown gebruik toe.',
@@ -206,8 +206,8 @@ return [
'new_password' => 'Nieuw wachtwoord',
'next' => 'Volgende',
'next_audit_date' => 'Volgende datum van de Audit',
- 'next_audit_date_help' => 'If you use auditing in your organization, this is usually automatically calculated based on the asset's last audit date and audit frequency (in Admin Settings > Alerts) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
- 'audit_images_help' => 'You can find audit images in the asset\'s history tab.',
+ 'next_audit_date_help' => 'Als u auditcontrole in uw organisatie gebruikt, dit wordt meestal automatisch berekend op basis van de asset's laatste audit datum en audit frequentie (in Admin Instellingen > Notificaties) en u kunt dit leeg laten. U kunt hier handmatig deze datum instellen indien nodig, maar het moet later zijn dan de laatste audit datum. ',
+ 'audit_images_help' => 'U vindt audit afbeeldingen op het tabblad historie van het asset.',
'no_email' => 'Er is geen e-mailadres gekoppeld aan deze gebruiker',
'last_audit' => 'Laatste controle',
'new' => 'nieuw!',
@@ -240,21 +240,21 @@ return [
'restored' => 'hersteld',
'restore' => 'Herstel',
'requestable_models' => 'Aanvraagbare modellen',
- 'requestable_items' => 'Requestable Items',
+ 'requestable_items' => 'Aanvraagbare items',
'requested' => 'Aangevraagd',
'requested_date' => 'Aangevraagde datum',
'requested_assets' => 'Aangevraagd activa',
'requested_assets_menu' => 'Aangevraagde activa',
'request_canceled' => 'Aanvraag geannuleerd',
- 'request_item' => 'Request this item',
- 'external_link_tooltip' => 'External link to',
+ 'request_item' => 'Dit item aanvragen',
+ 'external_link_tooltip' => 'Externe link naar',
'save' => 'Opslaan',
'select_var' => 'Selecteer :thing... ', // this will eventually replace all of our other selects
'select' => 'Selecteer',
'select_all' => 'Alles selecteren',
'search' => 'Zoeken',
'select_category' => 'Selecteer een categorie',
- 'select_datasource' => 'Select a data source',
+ 'select_datasource' => 'Selecteer een gegevensbron',
'select_department' => 'Selecteer de afdeling',
'select_depreciation' => 'Selecteer een afschrijvingstype',
'select_location' => 'Selecteer een locatie',
@@ -274,12 +274,12 @@ return [
'signed_off_by' => 'Afgetekend door',
'skin' => 'Thema',
'webhook_msg_note' => 'Er wordt een melding verzonden via webhook',
- 'webhook_test_msg' => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+ 'webhook_test_msg' => 'Oh hai! Het lijkt erop dat jouw :app integratie met Snipe-IT werkt!',
'some_features_disabled' => 'DEMO MODUS: Sommige functies zijn uitgeschakeld voor deze installatie.',
'site_name' => 'Sitenaam',
'state' => 'Status',
'status_labels' => 'Statuslabels',
- 'status_label' => 'Status Label',
+ 'status_label' => 'Status label',
'status' => 'Status',
'accept_eula' => 'Aanvaarding overeenkomst',
'supplier' => 'Leverancier',
@@ -305,7 +305,7 @@ return [
'user' => 'Gebruiker',
'accepted' => 'geaccepteerd',
'declined' => 'afgewezen',
- 'declined_note' => 'Declined Notes',
+ 'declined_note' => 'Geweigerde notities',
'unassigned' => 'Niet-toegewezen',
'unaccepted_asset_report' => 'Niet-geaccepteerde activa',
'users' => 'Gebruikers',
@@ -340,16 +340,16 @@ return [
'view_all' => 'alles weergeven',
'hide_deleted' => 'Verberg verwijderde',
'email' => 'E-mailadres',
- 'do_not_change' => 'Do not change',
- 'bug_report' => 'Report a bug',
+ 'do_not_change' => 'Niet wijzigen',
+ 'bug_report' => 'Fout (bug) rapporteren',
'user_manual' => 'Gebruiker\'s Handleiding',
'setup_step_1' => 'Stap 1',
'setup_step_2' => 'Stap 2',
'setup_step_3' => 'Stap 3',
'setup_step_4' => 'Stap 4',
'setup_config_check' => 'Configuratie Controle',
- 'setup_create_database' => 'Create database tables',
- 'setup_create_admin' => 'Create an admin user',
+ 'setup_create_database' => 'Database tabellen aanmaken',
+ 'setup_create_admin' => 'Maak een admin gebruiker aan',
'setup_done' => 'Klaar!',
'bulk_edit_about_to' => 'Je staat op het punt om het volgende te bewerken: ',
'checked_out' => 'Uitgecheckt',
@@ -406,9 +406,9 @@ return [
'accessory_name' => 'Accessoire naam:',
'clone_item' => 'Item dupliceren',
'checkout_tooltip' => 'Check dit item uit',
- 'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+ 'checkin_tooltip' => 'Check dit item in zodat het beschikbaar is om opnieuw uit te checken, opnieuw te imagen, etc',
'checkout_user_tooltip' => 'Check dit item uit aan een gebruiker',
- 'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+ 'checkin_to_diff_location' => 'U kunt dit product inchecken op een andere locatie dan de standaard locatie van :default_location in dit asset als deze is ingesteld',
'maintenance_mode' => 'De service is tijdelijk niet beschikbaar voor systeemupdates. Probeer het later nog eens.',
'maintenance_mode_title' => 'Dienst tijdelijk niet beschikbaar',
'ldap_import' => 'Het gebruikerswachtwoord mag niet worden beheerd door LDAP. (Hiermee kun je vergeten wachtwoord aanvragen verzenden.)',
@@ -419,14 +419,14 @@ return [
'bulk_soft_delete' =>'Ook deze gebruikers zacht verwijderen. Hun bezitting geschiedenis blijft intact tenzij u verwijderde records verwijderd in de Admin Instellingen.',
'bulk_checkin_delete_success' => 'Uw geselecteerde gebruikers zijn verwijderd en hun artikelen zijn ingecheckt.',
'bulk_checkin_success' => 'De artikelen voor de geselecteerde gebruikers zijn ingecheckt.',
- 'set_to_null' => 'Waarden voor deze bezittingľWaarden verwijderen voor alle :asset_count bezittingen ',
+ 'set_to_null' => 'Waarden verwijderen voor deze selectie|Verwijder waarden voor alle :selection_count selecties ',
'set_users_field_to_null' => 'Verwijder :field waardes voor deze gebruiker|Verwijder :field waardes voor alle :user_count gebruikers ',
'na_no_purchase_date' => 'N.v.t. - Geen aankoopdatum opgegeven',
'assets_by_status' => 'Active op status',
'assets_by_status_type' => 'Active op statustype',
'pie_chart_type' => 'Dashboard cirkeldiagram type',
'hello_name' => 'Welkom :name!',
- 'unaccepted_profile_warning' => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+ 'unaccepted_profile_warning' => 'U heeft één item dat acceptatie vereist. Klik hier om het te accepteren of te weigeren|Je hebt :count items die acceptatie vereisen. Klik hier om te accepteren of te weigeren',
'start_date' => 'Begindatum',
'end_date' => 'Einddatum',
'alt_uploaded_image_thumbnail' => 'Upload mini-afbeelding',
@@ -509,8 +509,8 @@ return [
'address2' => 'Adresregel 2',
'import_note' => 'Geïmporteerd met csv-bestand',
],
- 'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
- 'checked_out_to_fields' => 'Checked Out To Fields',
+ 'remove_customfield_association' => 'Verwijder dit veld uit de veldenset. Dit zal niet verwijderen van het aangepaste veld, alleen dit veld associatie met deze veldset.',
+ 'checked_out_to_fields' => 'Uitgecheckt aan velden',
'percent_complete' => '% voltooid',
'uploading' => 'Uploaden... ',
'upload_error' => 'Fout bij het uploaden. Controleer of er geen lege rijen zijn en dat er geen kolomnamen zijn gedupliceerd.',
@@ -529,7 +529,7 @@ return [
'permission_denied_superuser_demo' => 'Toestemming geweigerd. U kunt geen gebruikersinformatie voor superadmins op de demo bijwerken.',
'pwd_reset_not_sent' => 'Gebruiker is niet geactiveerd, wordt LDAP-gesynchroniseerd of heeft geen e-mailadres',
'error_sending_email' => 'Fout bij verzenden e-mail',
- 'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe return to the dashboard, or contact your administrator.',
+ 'sad_panda' => 'Verdrietige panda. U bent niet gemachtigd om het ding te doen. Ga terug naar het dashboardof neem contact op met uw beheerder.',
'bulk' => [
'delete' =>
[
@@ -552,15 +552,15 @@ return [
'components' => ':count Component|:count componenten',
],
'more_info' => 'Meer Info',
- 'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
- 'whoops' => 'Whoops!',
- 'something_went_wrong' => 'Something went wrong with your request.',
- 'close' => 'Close',
+ 'quickscan_bulk_help' => 'Als u dit selectievakje aanvinkt, wordt het asset record bewerkt om deze nieuwe locatie te weerspiegelen. Als u het uitgevinkt laat staan ziet u de locatie in het audit logboek. Let op dat als dit asset is uitgecheckt, dan zal de locatie van de persoon, product of locatie waar het uitgecheckt is niet veranderen.',
+ 'whoops' => 'Oeps!',
+ 'something_went_wrong' => 'Er ging iets mis met uw verzoek.',
+ 'close' => 'Sluiten',
'expires' => 'Verloopt',
- 'map_fields'=> 'Map :item_type Field',
- 'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
+ 'map_fields'=> 'Map :item_type veld',
+ 'remaining_var' => ':count resterend',
'label' => 'Label',
- 'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'import_asset_tag_exists' => 'Een asset met de asset tag :asset_tag bestaat al en een update is niet aangevraagd. Er is geen wijziging aangebracht.',
+ 'countries_manually_entered_help' => 'De waarden met een asterisk (*) zijn handmatig ingevoerd en komen niet overeen met de bestaande ISO 3166 dropdown waarden',
];
diff --git a/resources/lang/nl-NL/localizations.php b/resources/lang/nl-NL/localizations.php
index 95ae96166f..596db189c5 100644
--- a/resources/lang/nl-NL/localizations.php
+++ b/resources/lang/nl-NL/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Kies een taal',
+ 'select_language' => 'Selecteer een taal',
'languages' => [
'en-US'=> 'Engels, VS',
'en-GB'=> 'Engels, VK',
@@ -41,7 +41,7 @@ return [
'mi-NZ'=> 'Maori',
'mn-MN'=> 'Mongools',
//'no-NO'=> 'Norwegian',
- 'nb-NO'=> 'Norwegian Bokmål',
+ 'nb-NO'=> 'Noors Bokmål',
//'nn-NO'=> 'Norwegian Nynorsk',
'fa-IR'=> 'Perzisch',
'pl-PL'=> 'Pools',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zoeloe',
],
- 'select_country' => 'Selecteer een land',
+ 'select_country' => 'Selecteer een Land',
'countries' => [
'AC'=>'Ascensie Eiland',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Egypte',
+ 'GB-ENG'=>'Engeland',
'ER'=>'Eritrea',
'ES'=>'Spanje',
'ET'=>'Ethiopië',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Nederland',
+ 'GB-NIR' => 'Noord-Ierland',
'NO'=>'Noorwegen',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Rusland',
'RW'=>'Rwanda',
'SA'=>'Saoedi-Arabië',
- 'UK'=>'Schotland',
+ 'GB-SCT'=>'Schotland',
'SB'=>'Solomon eilanden',
'SC'=>'Seychellen',
'SS'=>'Zuid-Soedan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Amerikaanse Maagdeneilanden',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis en Futuna eilanden',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/nl-NL/mail.php b/resources/lang/nl-NL/mail.php
index 46275730b7..356d408c0e 100644
--- a/resources/lang/nl-NL/mail.php
+++ b/resources/lang/nl-NL/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Een gebruiker heeft een item op de website aangevraagd',
'acceptance_asset_accepted' => 'Een gebruiker heeft een artikel geaccepteerd',
'acceptance_asset_declined' => 'Een gebruiker heeft een artikel geweigerd',
- 'accessory_name' => 'Accessoire Naam:',
- 'additional_notes' => 'Aanvullende Notities:',
+ 'accessory_name' => 'Accessoirenaam',
+ 'additional_notes' => 'Aanvullende Notities',
'admin_has_created' => 'Een beheerder heeft een account voor u aangemaakt op de :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset naam:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset naam',
'asset_requested' => 'Asset aangevraagd',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'Er is :count asset met een garantie die afloopt in de volgende :threshold dagen.|Er zijn :count assets met garanties die vervallen in de volgende :threshold dagen.',
'assigned_to' => 'Toegewezen aan',
'best_regards' => 'Met vriendelijke groeten,',
- 'canceled' => 'Geannuleerd:',
- 'checkin_date' => 'Datum ingecheckt:',
- 'checkout_date' => 'Datum uitgecheckt:',
+ 'canceled' => 'Geannuleerd',
+ 'checkin_date' => 'Ingecheckt datum',
+ 'checkout_date' => 'Uitcheck datum',
'checkedout_from' => 'Uitgecheckt van',
'checkedin_from' => 'Ingecheckt op',
'checked_into' => 'Ingecheckt bij',
@@ -49,14 +49,14 @@ return [
'click_to_confirm' => 'Klik op de volgende link om uw :web account te bevestigen:',
'current_QTY' => 'Huidige hoeveelheid',
'days' => 'Dagen',
- 'expecting_checkin_date' => 'Verwachte incheck datum:',
+ 'expecting_checkin_date' => 'Verwachte incheck datum',
'expires' => 'Verloopt',
'hello' => 'Hallo',
'hi' => 'Hoi',
'i_have_read' => 'Ik heb de gebruiksvoorwaarden gelezen en geaccepteerd en heb dit item ontvangen.',
'inventory_report' => 'Inventarisrapport',
- 'item' => 'Item:',
- 'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+ 'item' => 'Item',
+ 'item_checked_reminder' => 'Dit is een herinnering dat je op dit moment :count items uitgecheckt hebt die je niet hebt geaccepteerd of geweigerd. Klik op de onderstaande link om uw besluit te bevestigen.',
'license_expiring_alert' => 'Er is :count licentie die afloopt in de volgende :threshold dagen.|Er zijn :count licenties die vervallen in de volgende :threshold dagen.',
'link_to_update_password' => 'Klik op de volgende link om je :web wachtwoord te vernieuwen:',
'login' => 'Login:',
@@ -66,11 +66,11 @@ return [
'name' => 'Naam',
'new_item_checked' => 'Een nieuw item is onder uw naam uitgecheckt, details staan hieronder.',
'notes' => 'Opmerkingen',
- 'password' => 'Wachtwoord:',
+ 'password' => 'Wachtwoord',
'password_reset' => 'Wachtwoord opnieuw instellen',
'read_the_terms' => 'Lees alstublieft de onderstaande gebruiksovereenkomst.',
'read_the_terms_and_click' => 'Gelieve de onderstaande gebruiksvoorwaarden te lezen, en klik op de link onderaan om te bevestigen dat je de gebruiksvoorwaarden leest en accepteert en het bestand hebt ontvangen.',
- 'requested' => 'Aangevraagd:',
+ 'requested' => 'Aangevraagd',
'reset_link' => 'Je Wachtwoord Herstel Link',
'reset_password' => 'Klik hier om uw wachtwoord opnieuw in te stellen:',
'rights_reserved' => 'Alle rechten voorbehouden.',
@@ -87,10 +87,10 @@ return [
'upcoming-audits' => 'Er is :count asset die binnen :threshold dagen gecontroleerd moet worden.|Er zijn :count assets die binnen :threshold dagen gecontroleerd moeten worden.',
'user' => 'Gebruiker',
'username' => 'Gebruikersnaam',
- 'unaccepted_asset_reminder' => 'You have Unaccepted Assets.',
+ 'unaccepted_asset_reminder' => 'Je hebt niet geaccepteerde Assets.',
'welcome' => 'Welkom :name',
'welcome_to' => 'Welkom bij :web!',
'your_assets' => 'Bekijk je activa',
'your_credentials' => 'Je Snipe-IT inloggegevens',
- 'mail_sent' => 'Mail sent successfully!',
+ 'mail_sent' => 'Mail is succesvol verstuurd!',
];
diff --git a/resources/lang/nl-NL/table.php b/resources/lang/nl-NL/table.php
index 6260b042cc..fb4327a724 100644
--- a/resources/lang/nl-NL/table.php
+++ b/resources/lang/nl-NL/table.php
@@ -6,6 +6,6 @@ return array(
'action' => 'Actie',
'by' => 'Door',
'item' => 'Item',
- 'no_matching_records' => 'No matching records found',
+ 'no_matching_records' => 'Geen overeenkomende records gevonden',
);
diff --git a/resources/lang/nl-NL/validation.php b/resources/lang/nl-NL/validation.php
index 783cf9df10..94c759fc94 100644
--- a/resources/lang/nl-NL/validation.php
+++ b/resources/lang/nl-NL/validation.php
@@ -13,148 +13,148 @@ return [
|
*/
- 'accepted' => 'The :attribute field must be accepted.',
- 'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
- 'active_url' => 'The :attribute field must be a valid URL.',
- 'after' => 'The :attribute field must be a date after :date.',
- 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
- 'alpha' => 'The :attribute field must only contain letters.',
- 'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
- 'alpha_num' => 'The :attribute field must only contain letters and numbers.',
- 'array' => 'The :attribute field must be an array.',
- 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
- 'before' => 'The :attribute field must be a date before :date.',
- 'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+ 'accepted' => ':attribute veld moet geaccepteerd worden.',
+ 'accepted_if' => ':attribute veld moet geaccepteerd worden als :other :value is.',
+ 'active_url' => ':attribute veld moet een geldige URL zijn.',
+ 'after' => ':attribute veld moet een datum na :date zijn.',
+ 'after_or_equal' => ':attribute veld moet een datum na of gelijk aan :date zijn.',
+ 'alpha' => ':attribute veld mag alleen letters bevatten.',
+ 'alpha_dash' => ':attribute veld mag alleen letters, cijfers, streepjes en onderstrepingstekens bevatten.',
+ 'alpha_num' => ':attribute veld mag alleen letters en cijfers bevatten.',
+ 'array' => ':attribute moet een array zijn.',
+ 'ascii' => ':attribute veld mag alleen alfanumerieke tekens en symbolen bevatten.',
+ 'before' => ':attribute veld moet een datum voor :date zijn.',
+ 'before_or_equal' => ':attribute veld moet een datum voor of gelijk aan :date zijn.',
'between' => [
- 'array' => 'The :attribute field must have between :min and :max items.',
- 'file' => 'The :attribute field must be between :min and :max kilobytes.',
- 'numeric' => 'The :attribute field must be between :min and :max.',
- 'string' => 'The :attribute field must be between :min and :max characters.',
+ 'array' => ':attribute veld moet tussen :min en :max items bevatten.',
+ 'file' => ':attribute veld moet tussen :min en :max kilobytes zijn.',
+ 'numeric' => ':attribute veld moet tussen de :min en de :max liggen.',
+ 'string' => ':attribute veld moet tussen :min en :max karakters lang zijn.',
],
- 'boolean' => 'The :attribute field must be true or false.',
- 'can' => 'The :attribute field contains an unauthorized value.',
- 'confirmed' => 'The :attribute field confirmation does not match.',
- 'contains' => 'The :attribute field is missing a required value.',
- 'current_password' => 'The password is incorrect.',
- 'date' => 'The :attribute field must be a valid date.',
- 'date_equals' => 'The :attribute field must be a date equal to :date.',
- 'date_format' => 'The :attribute field must match the format :format.',
- 'decimal' => 'The :attribute field must have :decimal decimal places.',
- 'declined' => 'The :attribute field must be declined.',
- 'declined_if' => 'The :attribute field must be declined when :other is :value.',
- 'different' => 'The :attribute field and :other must be different.',
- 'digits' => 'The :attribute field must be :digits digits.',
- 'digits_between' => 'The :attribute field must be between :min and :max digits.',
- 'dimensions' => 'The :attribute field has invalid image dimensions.',
+ 'boolean' => ':attribute moet waar of onwaar zijn.',
+ 'can' => ':attribute veld bevat een niet-geautoriseerde waarde.',
+ 'confirmed' => ':attribute veld bevestiging komt niet overeen.',
+ 'contains' => ':attribute veld mist een verplichte waarde.',
+ 'current_password' => 'Het wachtwoord is onjuist.',
+ 'date' => ':attribute veld moet een geldige datum zijn.',
+ 'date_equals' => ':attribute moet een datum gelijk zijn aan :date.',
+ 'date_format' => ':attribute veld moet overeenkomen met het formaat :format.',
+ 'decimal' => ':attribute veld moet :decimale decimale plaatsen hebben.',
+ 'declined' => ':attribute veld moet worden geweigerd.',
+ 'declined_if' => ':attribute veld moet afgewezen worden als :other :value is.',
+ 'different' => ':attribute veld en :other mag niet hetzelfde zijn.',
+ 'digits' => ':attribute veld moet uit :digits cijfers bestaan.',
+ 'digits_between' => ':attribute veld moet tussen de :min en :max cijfers zijn.',
+ 'dimensions' => ':attribute veld heeft geen geldige afmetingen voor afbeeldingen.',
'distinct' => ':attribute veld heeft een duplicaat waarde.',
- 'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
- 'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
- 'email' => 'The :attribute field must be a valid email address.',
- 'ends_with' => 'The :attribute field must end with one of the following: :values.',
+ 'doesnt_end_with' => ':attribute veld mag niet eindigen met één van de volgende: :values.',
+ 'doesnt_start_with' => ':attribute veld mag niet beginnen met één van de volgende: :values.',
+ 'email' => ':attribute veld moet een geldig e-mail adres zijn.',
+ 'ends_with' => ':attribute veld moet eindigen met één van de volgende: :values.',
'enum' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
'exists' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
- 'extensions' => 'The :attribute field must have one of the following extensions: :values.',
- 'file' => 'The :attribute field must be a file.',
+ 'extensions' => ':attribute veld moet een van de volgende extensies hebben: :values.',
+ 'file' => ':attribute veld moet een bestand zijn.',
'filled' => ':attribute veld moet een waarde hebben.',
'gt' => [
- 'array' => 'The :attribute field must have more than :value items.',
- 'file' => 'The :attribute field must be greater than :value kilobytes.',
- 'numeric' => 'The :attribute field must be greater than :value.',
- 'string' => 'The :attribute field must be greater than :value characters.',
+ 'array' => 'Het :attribute veld moet meer dan :value items bevatten.',
+ 'file' => 'Het :attribute veld moet groter zijn dan :value kilobytes.',
+ 'numeric' => ':attribute veld moet groter zijn dan :value.',
+ 'string' => 'Het veld :attribute moet meer dan :value karakters bevatten.',
],
'gte' => [
- 'array' => 'The :attribute field must have :value items or more.',
- 'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
- 'numeric' => 'The :attribute field must be greater than or equal to :value.',
- 'string' => 'The :attribute field must be greater than or equal to :value characters.',
+ 'array' => 'Het :attribute veld moet :value of meer bevatten.',
+ 'file' => 'Het veld :attribute moet groter of gelijk zijn aan :value kilobytes.',
+ 'numeric' => ':attribute veld moet groter of gelijk zijn aan :value.',
+ 'string' => 'Het veld :attribute moet :value of groter zijn.',
],
- 'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
- 'image' => 'The :attribute field must be an image.',
+ 'hex_color' => ':attribute veld moet een geldige hexadecimale kleur hebben.',
+ 'image' => ':attribute veld moet een afbeelding zijn.',
'import_field_empty' => 'De waarde voor :fieldname kan niet leeg zijn.',
'in' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
- 'in_array' => 'The :attribute field must exist in :other.',
- 'integer' => 'The :attribute field must be an integer.',
- 'ip' => 'The :attribute field must be a valid IP address.',
- 'ipv4' => 'The :attribute field must be a valid IPv4 address.',
- 'ipv6' => 'The :attribute field must be a valid IPv6 address.',
- 'json' => 'The :attribute field must be a valid JSON string.',
- 'list' => 'The :attribute field must be a list.',
- 'lowercase' => 'The :attribute field must be lowercase.',
+ 'in_array' => ':attribute veld moet bestaan in :other.',
+ 'integer' => ':attribute veld moet een geheel getal zijn.',
+ 'ip' => ':attribute veld moet een geldig IP-adres zijn.',
+ 'ipv4' => ':attribute veld moet een geldig IPv4-adres zijn.',
+ 'ipv6' => ':attribute veld moet een geldig IPv6-adres zijn.',
+ 'json' => ':attribute veld moet een geldige JSON string zijn.',
+ 'list' => ':attribute moet een lijst zijn.',
+ 'lowercase' => ':attribute veld moet een kleine letters zijn.',
'lt' => [
- 'array' => 'The :attribute field must have less than :value items.',
- 'file' => 'The :attribute field must be less than :value kilobytes.',
- 'numeric' => 'The :attribute field must be less than :value.',
- 'string' => 'The :attribute field must be less than :value characters.',
+ 'array' => 'Het :attribute veld moet minder dan :value items bevatten.',
+ 'file' => 'Het :attribute veld moet kleiner zijn dan :value kilobytes.',
+ 'numeric' => ':attribute veld moet kleiner zijn dan :value.',
+ 'string' => ':attribute veld moet minder dan :value karakters bevatten.',
],
'lte' => [
- 'array' => 'The :attribute field must not have more than :value items.',
- 'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
- 'numeric' => 'The :attribute field must be less than or equal to :value.',
- 'string' => 'The :attribute field must be less than or equal to :value characters.',
+ 'array' => 'Het :attribute veld mag niet meer dan :value items bevatten.',
+ 'file' => 'Het veld :attribute moet kleiner of gelijk zijn aan :value kilobytes.',
+ 'numeric' => ':attribute veld moet kleiner of gelijk zijn aan :value.',
+ 'string' => 'Het veld :attribute moet minder of gelijk zijn aan :value tekens.',
],
- 'mac_address' => 'The :attribute field must be a valid MAC address.',
+ 'mac_address' => ':attribute veld moet een geldig MAC-adres zijn.',
'max' => [
- 'array' => 'The :attribute field must not have more than :max items.',
- 'file' => 'The :attribute field must not be greater than :max kilobytes.',
- 'numeric' => 'The :attribute field must not be greater than :max.',
- 'string' => 'The :attribute field must not be greater than :max characters.',
+ 'array' => ':attribute veld mag niet meer dan :max items bevatten.',
+ 'file' => ':attribute veld mag niet groter zijn dan :max kilobytes.',
+ 'numeric' => ':attribute veld mag niet groter zijn dan :max.',
+ 'string' => ':attribute veld mag niet groter zijn dan :max tekens.',
],
- 'max_digits' => 'The :attribute field must not have more than :max digits.',
- 'mimes' => 'The :attribute field must be a file of type: :values.',
- 'mimetypes' => 'The :attribute field must be a file of type: :values.',
+ 'max_digits' => ':attribute veld mag niet meer dan :max cijfers bevatten.',
+ 'mimes' => ':attribute veld moet een bestand zijn van het type: :values.',
+ 'mimetypes' => ':attribute veld moet een bestand zijn van het type: :values.',
'min' => [
- 'array' => 'The :attribute field must have at least :min items.',
- 'file' => 'The :attribute field must be at least :min kilobytes.',
- 'numeric' => 'The :attribute field must be at least :min.',
- 'string' => 'The :attribute field must be at least :min characters.',
+ 'array' => ':attribute veld moet minstens :min items bevatten.',
+ 'file' => ':attribute veld moet minstens :min kilobytes zijn.',
+ 'numeric' => ':attribute veld moet minstens :min zijn.',
+ 'string' => ':attribute veld moet minstens :min tekens bevatten.',
],
- 'min_digits' => 'The :attribute field must have at least :min digits.',
- 'missing' => 'The :attribute field must be missing.',
- 'missing_if' => 'The :attribute field must be missing when :other is :value.',
- 'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
- 'missing_with' => 'The :attribute field must be missing when :values is present.',
- 'missing_with_all' => 'The :attribute field must be missing when :values are present.',
- 'multiple_of' => 'The :attribute field must be a multiple of :value.',
+ 'min_digits' => ':attribute veld moet minstens :min cijfers bevatten.',
+ 'missing' => ':attribute moet ontbreken.',
+ 'missing_if' => ':attribute veld moet ontbreken wanneer :other :value is.',
+ 'missing_unless' => ':attribute veld moet ontbreken, tenzij :other gelijk is aan :value.',
+ 'missing_with' => ':attribute veld moet ontbreken als :values aanwezig is.',
+ 'missing_with_all' => ':attribute veld moet ontbreken wanneer :values aanwezig zijn.',
+ 'multiple_of' => 'Het :attribute veld moet een veelvoud van :value zijn.',
'not_in' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
- 'not_regex' => 'The :attribute field format is invalid.',
- 'numeric' => 'The :attribute field must be a number.',
+ 'not_regex' => ':attribute veld formaat is ongeldig.',
+ 'numeric' => ':attribute veld moet een getal zijn.',
'password' => [
- 'letters' => 'The :attribute field must contain at least one letter.',
- 'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
- 'numbers' => 'The :attribute field must contain at least one number.',
- 'symbols' => 'The :attribute field must contain at least one symbol.',
- 'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+ 'letters' => ':attribute moet minstens één letter bevatten.',
+ 'mixed' => ':attribute veld moet minstens één hoofdletter en één kleine letter bevatten.',
+ 'numbers' => ':attribute veld moet minstens één cijfer bevatten.',
+ 'symbols' => ':attribute veld moet minstens één teken bevatten.',
+ 'uncompromised' => 'Het gegeven :attribute is weergegeven in een gegevenslek. Kies een ander :attribuut.',
],
- 'percent' => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+ 'percent' => 'Het afschrijvingsminimum moet tussen 0 en 100 liggen wanneer het afschrijvingstype procentueel is.',
'present' => ':attribute veld moet aanwezig zijn.',
- 'present_if' => 'The :attribute field must be present when :other is :value.',
- 'present_unless' => 'The :attribute field must be present unless :other is :value.',
- 'present_with' => 'The :attribute field must be present when :values is present.',
- 'present_with_all' => 'The :attribute field must be present when :values are present.',
- 'prohibited' => 'The :attribute field is prohibited.',
- 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
- 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
- 'prohibits' => 'The :attribute field prohibits :other from being present.',
- 'regex' => 'The :attribute field format is invalid.',
+ 'present_if' => ':attribute veld moet aanwezig zijn als :other :value is.',
+ 'present_unless' => ':attribute veld moet aanwezig zijn tenzij :other gelijk is aan :value.',
+ 'present_with' => ':attribute veld moet aanwezig zijn als :values aanwezig is.',
+ 'present_with_all' => ':attribute veld moet aanwezig zijn wanneer :values aanwezig zijn.',
+ 'prohibited' => ':attribute veld is verboden.',
+ 'prohibited_if' => ':attribute veld is verboden wanneer :other :value is.',
+ 'prohibited_unless' => ':attribute veld is verboden tenzij :other gelijk is aan :values.',
+ 'prohibits' => ':attribute veld verbiedt :other van aanwezig te zijn.',
+ 'regex' => ':attribute veld formaat is ongeldig.',
'required' => 'Het veld :attribute is verplicht.',
- 'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+ 'required_array_keys' => ':attribute veld moet items bevatten voor: :values.',
'required_if' => 'het veld :attribute is verplicht als :other gelijk is aan :value.',
- 'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
- 'required_if_declined' => 'The :attribute field is required when :other is declined.',
+ 'required_if_accepted' => ':attribute veld is verplicht als :other wordt geaccepteerd.',
+ 'required_if_declined' => ':attribute veld is verplicht als :other wordt geweigerd.',
'required_unless' => ':attribute veld is vereist tenzij :other is in :values.',
'required_with' => 'Het veld :attribute is verplicht als :values ingesteld staan.',
- 'required_with_all' => 'The :attribute field is required when :values are present.',
+ 'required_with_all' => ':attribute veld is verplicht wanneer :values aanwezig zijn.',
'required_without' => 'Het veld :attribute is verplicht als :values niet ingesteld staan.',
'required_without_all' => ':attribute veld is vereist wanneer geen van :values aanwezig zijn.',
- 'same' => 'The :attribute field must match :other.',
+ 'same' => ':attribute veld moet overeenkomen met :other.',
'size' => [
- 'array' => 'The :attribute field must contain :size items.',
- 'file' => 'The :attribute field must be :size kilobytes.',
- 'numeric' => 'The :attribute field must be :size.',
- 'string' => 'The :attribute field must be :size characters.',
+ 'array' => ':attribute veld moet :size items bevatten.',
+ 'file' => ':attribute veld moet :size kilobytes zijn.',
+ 'numeric' => ':attribute veld moet :size zijn.',
+ 'string' => ':attribute veld moet :size karakters bevatten.',
],
- 'starts_with' => 'The :attribute field must start with one of the following: :values.',
+ 'starts_with' => ':attribute veld moet beginnen met één van de volgende: :values.',
'string' => ':attribute moet een string zijn.',
'two_column_unique_undeleted' => ':attribute moet uniek zijn in :table1 en :table2. ',
'unique_undeleted' => 'De :attribute moet uniek zijn. ',
@@ -165,13 +165,13 @@ return [
'numbers' => 'Wachtwoord moet ten minste één cijfer bevatten.',
'case_diff' => 'Wachtwoord moet kleine letters en hoofdletters bevatten.',
'symbols' => 'Wachtwoord moet symbolen bevatten.',
- 'timezone' => 'The :attribute field must be a valid timezone.',
+ 'timezone' => ':attribute moet een geldige tijdzone zijn.',
'unique' => 'Het veld :attribute is reeds in gebruik.',
'uploaded' => 'Uploaden van :attribute is mislukt.',
- 'uppercase' => 'The :attribute field must be uppercase.',
- 'url' => 'The :attribute field must be a valid URL.',
- 'ulid' => 'The :attribute field must be a valid ULID.',
- 'uuid' => 'The :attribute field must be a valid UUID.',
+ 'uppercase' => ':attribute veld moet met hoofdletter zijn.',
+ 'url' => ':attribute veld moet een geldige URL zijn.',
+ 'ulid' => ':attribute veld moet een geldige ULID zijn.',
+ 'uuid' => ':attribute veld moet een geldige UUID zijn.',
/*
|--------------------------------------------------------------------------
@@ -190,8 +190,8 @@ return [
'hashed_pass' => 'Je huidige wachtwoord is incorrect',
'dumbpwd' => 'Dat wachtwoord is te veelvoorkomend.',
'statuslabel_type' => 'Selecteer een valide status label',
- 'custom_field_not_found' => 'This field does not seem to exist, please double check your custom field names.',
- 'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+ 'custom_field_not_found' => 'Dit veld lijkt niet te bestaan, controleer uw aangepaste veldnamen.',
+ 'custom_field_not_found_on_model' => 'Dit veld lijkt te bestaan, maar is niet beschikbaar in de veldset van dit Asset Model.',
// date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
// We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
@@ -229,8 +229,8 @@ return [
'generic' => [
'invalid_value_in_field' => 'Ongeldige waarde ingevoerd in dit veld',
- 'required' => 'This field is required',
- 'email' => 'Please enter a valid email address',
+ 'required' => 'Dit veld is verplicht',
+ 'email' => 'Vul een geldig e-mailadres in',
],
diff --git a/resources/lang/nn-NO/admin/locations/message.php b/resources/lang/nn-NO/admin/locations/message.php
index d74b25367b..4d9e7ad933 100644
--- a/resources/lang/nn-NO/admin/locations/message.php
+++ b/resources/lang/nn-NO/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokasjon eksisterer ikke.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ',
'assoc_child_loc' => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ',
'assigned_assets' => 'Tildelte ressurser',
diff --git a/resources/lang/nn-NO/admin/settings/general.php b/resources/lang/nn-NO/admin/settings/general.php
index a917561c0c..ab23cfe635 100644
--- a/resources/lang/nn-NO/admin/settings/general.php
+++ b/resources/lang/nn-NO/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sikkerhetskopier',
'backups_help' => 'Opprette, laste ned og gjenopprette sikkerhetskopier ',
'backups_restoring' => 'Gjenoppretting fra sikkerhetskopi',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Last opp sikkerhetskopi',
'backups_path' => 'Sikkerhetskopier på tjeneren lagres i :path',
'backups_restore_warning' => 'Bruk gjenopprettingsknappen for å gjenopprette fra en tidligere sikkerhetskopi. (Dette fungerer ikke med S3-fillagring eller Docker.)
Din hele :app_name databasen og eventuelle opplastede filer vil bli fullstendig erstattet av det som er i sikkerhetskopifilen. ',
diff --git a/resources/lang/nn-NO/admin/users/message.php b/resources/lang/nn-NO/admin/users/message.php
index ece6cbec5e..83cb339fa8 100644
--- a/resources/lang/nn-NO/admin/users/message.php
+++ b/resources/lang/nn-NO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Du har avvist eiendelen.',
'bulk_manager_warn' => 'Brukerne er oppdatert, men lederen ble ikke lagret fordi lederen du valgte også i brukerlisten for redigering og brukere kan ikke være sin egen leder. Velg brukerne igjen, unntatt lederen.',
'user_exists' => 'Bruker finnes allerede!',
- 'user_not_found' => 'Brukeren finnes ikke.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Login-feltet er påkrevd',
'user_has_no_assets_assigned' => 'Ingen eiendeler er tilordnet brukeren for øyeblikket.',
'user_password_required' => 'Passord er påkrevd.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:',
'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:',
'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/nn-NO/general.php b/resources/lang/nn-NO/general.php
index c4fe3ad5d9..4484eb1493 100644
--- a/resources/lang/nn-NO/general.php
+++ b/resources/lang/nn-NO/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Fjern også disse brukerne ved å fjerne deres eiendelshistorikk intakt/til du fjerner slettede poster i Admin-innstillingene.',
'bulk_checkin_delete_success' => 'Dine valgte brukere er slettet og deres elementer har blitt sjekket inn.',
'bulk_checkin_success' => 'Elementene for de valgte brukerne har blitt sjekket inn.',
- 'set_to_null' => 'Slette verdier for denne eiendelen Slett verdier for alle :asset_count eiendeler ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Slett :field verdier for denne brukeren. Slett :field verdier for alle :user_count brukere ',
'na_no_purchase_date' => 'N/A - Ingen kjøpsdato oppgitt',
'assets_by_status' => 'Eiendeler etter status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Utløper',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/nn-NO/localizations.php b/resources/lang/nn-NO/localizations.php
index c2a39e938d..8fa41e7504 100644
--- a/resources/lang/nn-NO/localizations.php
+++ b/resources/lang/nn-NO/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Velg et språk',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Engelsk, USA',
'en-GB'=> 'Engelsk, Storbritannia',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Velg et land',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spania',
'ET'=>'Etiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Nederland',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norge',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russland',
'RW'=>'Rwanda',
'SA'=>'Saudi-Arabia',
- 'UK'=>'Skottland',
+ 'GB-SCT'=>'Skottland',
'SB'=>'Salomonøyene',
'SC'=>'Seychellene',
'SS'=>'Sør-Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Jomfruøyene, (USA)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis- og Futunaøyene',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/nn-NO/mail.php b/resources/lang/nn-NO/mail.php
index f9688539bf..a443b1bf0c 100644
--- a/resources/lang/nn-NO/mail.php
+++ b/resources/lang/nn-NO/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'En bruker har bedt om et element på webområdet',
'acceptance_asset_accepted' => 'En bruker har godtatt et element',
'acceptance_asset_declined' => 'En bruker har avvist et element',
- 'accessory_name' => 'Navn tilbehør:',
- 'additional_notes' => 'Flere notater:',
+ 'accessory_name' => 'Navn tilbehør',
+ 'additional_notes' => 'Flere notater',
'admin_has_created' => 'En administrator har opprettet en konto for deg på :web nettsted.',
- 'asset' => 'Eiendel:',
- 'asset_name' => 'Navn:',
+ 'asset' => 'Eiendel',
+ 'asset_name' => 'Navn',
'asset_requested' => 'Eiendel forespurt',
'asset_tag' => 'Eiendelsmerke',
'assets_warrantee_alert' => 'En eiendel har garanti som utløper innenfor de neste :treshold dagene.|:count eiendeler har garanti som utløper innenfor de neste :tershold dagene.',
'assigned_to' => 'Tilordnet til',
'best_regards' => 'Med vennlig hilsen,',
- 'canceled' => 'Avbrutt:',
- 'checkin_date' => 'Innsjekkdato:',
- 'checkout_date' => 'Utsjekkdato:',
+ 'canceled' => 'Avbrutt',
+ 'checkin_date' => 'Innsjekkdato',
+ 'checkout_date' => 'Utsjekkdato',
'checkedout_from' => 'Sjekket ut fra',
'checkedin_from' => 'Sjekket inn fra',
'checked_into' => 'Sjekket inn',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
'current_QTY' => 'Nåværende antall',
'days' => 'Dager',
- 'expecting_checkin_date' => 'Forventet innsjekkdato:',
+ 'expecting_checkin_date' => 'Forventet dato for innsjekk',
'expires' => 'Utløper',
'hello' => 'Hallo',
'hi' => 'Hei',
'i_have_read' => 'Jeg har lest og godtar vilkårene for bruk, og har mottatt denne enheten.',
'inventory_report' => 'Lagerbeholdnings rapport',
- 'item' => 'Enhet:',
+ 'item' => 'Enhet',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
'link_to_update_password' => 'Klikk på følgende link for å bekrefte din :web passord:',
@@ -66,11 +66,11 @@ return [
'name' => 'Navn',
'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
'notes' => 'Notater',
- 'password' => 'Passord:',
+ 'password' => 'Passord',
'password_reset' => 'Tilbakestill passord',
'read_the_terms' => 'Vennligst les bruksbetingelsene nedenfor.',
'read_the_terms_and_click' => 'Vennligst les vilkårene for bruk nedenfor. og klikk på lenken nederst for å bekrefte at du leser og godtar vilkårene for bruk, og har mottatt eiendelen.',
- 'requested' => 'Forespurt:',
+ 'requested' => 'Forespurt',
'reset_link' => 'Lenke for tilbakestilling av passord',
'reset_password' => 'Klikk her for å tilbakestille passordet:',
'rights_reserved' => 'Alle rettigheter forbeholdt.',
diff --git a/resources/lang/no-NO/admin/locations/message.php b/resources/lang/no-NO/admin/locations/message.php
index d74b25367b..4d9e7ad933 100644
--- a/resources/lang/no-NO/admin/locations/message.php
+++ b/resources/lang/no-NO/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokasjon eksisterer ikke.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ',
'assoc_child_loc' => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ',
'assigned_assets' => 'Tildelte ressurser',
diff --git a/resources/lang/no-NO/admin/settings/general.php b/resources/lang/no-NO/admin/settings/general.php
index a917561c0c..ab23cfe635 100644
--- a/resources/lang/no-NO/admin/settings/general.php
+++ b/resources/lang/no-NO/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sikkerhetskopier',
'backups_help' => 'Opprette, laste ned og gjenopprette sikkerhetskopier ',
'backups_restoring' => 'Gjenoppretting fra sikkerhetskopi',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Last opp sikkerhetskopi',
'backups_path' => 'Sikkerhetskopier på tjeneren lagres i :path',
'backups_restore_warning' => 'Bruk gjenopprettingsknappen for å gjenopprette fra en tidligere sikkerhetskopi. (Dette fungerer ikke med S3-fillagring eller Docker.)
Din hele :app_name databasen og eventuelle opplastede filer vil bli fullstendig erstattet av det som er i sikkerhetskopifilen. ',
diff --git a/resources/lang/no-NO/admin/users/message.php b/resources/lang/no-NO/admin/users/message.php
index ece6cbec5e..83cb339fa8 100644
--- a/resources/lang/no-NO/admin/users/message.php
+++ b/resources/lang/no-NO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Du har avvist eiendelen.',
'bulk_manager_warn' => 'Brukerne er oppdatert, men lederen ble ikke lagret fordi lederen du valgte også i brukerlisten for redigering og brukere kan ikke være sin egen leder. Velg brukerne igjen, unntatt lederen.',
'user_exists' => 'Bruker finnes allerede!',
- 'user_not_found' => 'Brukeren finnes ikke.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Login-feltet er påkrevd',
'user_has_no_assets_assigned' => 'Ingen eiendeler er tilordnet brukeren for øyeblikket.',
'user_password_required' => 'Passord er påkrevd.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:',
'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:',
'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/no-NO/general.php b/resources/lang/no-NO/general.php
index c4fe3ad5d9..4484eb1493 100644
--- a/resources/lang/no-NO/general.php
+++ b/resources/lang/no-NO/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Fjern også disse brukerne ved å fjerne deres eiendelshistorikk intakt/til du fjerner slettede poster i Admin-innstillingene.',
'bulk_checkin_delete_success' => 'Dine valgte brukere er slettet og deres elementer har blitt sjekket inn.',
'bulk_checkin_success' => 'Elementene for de valgte brukerne har blitt sjekket inn.',
- 'set_to_null' => 'Slette verdier for denne eiendelen Slett verdier for alle :asset_count eiendeler ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Slett :field verdier for denne brukeren. Slett :field verdier for alle :user_count brukere ',
'na_no_purchase_date' => 'N/A - Ingen kjøpsdato oppgitt',
'assets_by_status' => 'Eiendeler etter status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Utløper',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/no-NO/localizations.php b/resources/lang/no-NO/localizations.php
index c2a39e938d..8fa41e7504 100644
--- a/resources/lang/no-NO/localizations.php
+++ b/resources/lang/no-NO/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Velg et språk',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Engelsk, USA',
'en-GB'=> 'Engelsk, Storbritannia',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Velg et land',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spania',
'ET'=>'Etiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Nederland',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norge',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russland',
'RW'=>'Rwanda',
'SA'=>'Saudi-Arabia',
- 'UK'=>'Skottland',
+ 'GB-SCT'=>'Skottland',
'SB'=>'Salomonøyene',
'SC'=>'Seychellene',
'SS'=>'Sør-Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Jomfruøyene, (USA)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis- og Futunaøyene',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/no-NO/mail.php b/resources/lang/no-NO/mail.php
index f9688539bf..a443b1bf0c 100644
--- a/resources/lang/no-NO/mail.php
+++ b/resources/lang/no-NO/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'En bruker har bedt om et element på webområdet',
'acceptance_asset_accepted' => 'En bruker har godtatt et element',
'acceptance_asset_declined' => 'En bruker har avvist et element',
- 'accessory_name' => 'Navn tilbehør:',
- 'additional_notes' => 'Flere notater:',
+ 'accessory_name' => 'Navn tilbehør',
+ 'additional_notes' => 'Flere notater',
'admin_has_created' => 'En administrator har opprettet en konto for deg på :web nettsted.',
- 'asset' => 'Eiendel:',
- 'asset_name' => 'Navn:',
+ 'asset' => 'Eiendel',
+ 'asset_name' => 'Navn',
'asset_requested' => 'Eiendel forespurt',
'asset_tag' => 'Eiendelsmerke',
'assets_warrantee_alert' => 'En eiendel har garanti som utløper innenfor de neste :treshold dagene.|:count eiendeler har garanti som utløper innenfor de neste :tershold dagene.',
'assigned_to' => 'Tilordnet til',
'best_regards' => 'Med vennlig hilsen,',
- 'canceled' => 'Avbrutt:',
- 'checkin_date' => 'Innsjekkdato:',
- 'checkout_date' => 'Utsjekkdato:',
+ 'canceled' => 'Avbrutt',
+ 'checkin_date' => 'Innsjekkdato',
+ 'checkout_date' => 'Utsjekkdato',
'checkedout_from' => 'Sjekket ut fra',
'checkedin_from' => 'Sjekket inn fra',
'checked_into' => 'Sjekket inn',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
'current_QTY' => 'Nåværende antall',
'days' => 'Dager',
- 'expecting_checkin_date' => 'Forventet innsjekkdato:',
+ 'expecting_checkin_date' => 'Forventet dato for innsjekk',
'expires' => 'Utløper',
'hello' => 'Hallo',
'hi' => 'Hei',
'i_have_read' => 'Jeg har lest og godtar vilkårene for bruk, og har mottatt denne enheten.',
'inventory_report' => 'Lagerbeholdnings rapport',
- 'item' => 'Enhet:',
+ 'item' => 'Enhet',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
'link_to_update_password' => 'Klikk på følgende link for å bekrefte din :web passord:',
@@ -66,11 +66,11 @@ return [
'name' => 'Navn',
'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
'notes' => 'Notater',
- 'password' => 'Passord:',
+ 'password' => 'Passord',
'password_reset' => 'Tilbakestill passord',
'read_the_terms' => 'Vennligst les bruksbetingelsene nedenfor.',
'read_the_terms_and_click' => 'Vennligst les vilkårene for bruk nedenfor. og klikk på lenken nederst for å bekrefte at du leser og godtar vilkårene for bruk, og har mottatt eiendelen.',
- 'requested' => 'Forespurt:',
+ 'requested' => 'Forespurt',
'reset_link' => 'Lenke for tilbakestilling av passord',
'reset_password' => 'Klikk her for å tilbakestille passordet:',
'rights_reserved' => 'Alle rettigheter forbeholdt.',
diff --git a/resources/lang/pl-PL/admin/locations/message.php b/resources/lang/pl-PL/admin/locations/message.php
index 993b8e9f81..89e46146d3 100644
--- a/resources/lang/pl-PL/admin/locations/message.php
+++ b/resources/lang/pl-PL/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokalizacja nie istnieje.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Lokalizacja obecnie jest skojarzona z minimum jednym aktywem i nie może zostać usunięta. Uaktualnij właściwości aktywów tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ',
'assoc_child_loc' => 'Lokalizacja obecnie jest rodzicem minimum jeden innej lokalizacji i nie może zostać usunięta. Uaktualnij właściwości lokalizacji tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ',
'assigned_assets' => 'Przypisane aktywa',
diff --git a/resources/lang/pl-PL/admin/settings/general.php b/resources/lang/pl-PL/admin/settings/general.php
index 761da71d77..4f9849ee07 100644
--- a/resources/lang/pl-PL/admin/settings/general.php
+++ b/resources/lang/pl-PL/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Kopie zapasowe',
'backups_help' => 'Utwórz, pobieraj i przywracaj kopie zapasowe ',
'backups_restoring' => 'Przywróć z kopii zapasowej',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Prześlij kopię zapasową',
'backups_path' => 'Kopie zapasowe na serwerze są przechowywane w :path',
'backups_restore_warning' => 'Użyj przycisku przywracania aby przywrócić z poprzedniej kopii zapasowej. (To nie działa obecnie z pamięcią plików S3 lub Docker.
Twoja baza danych cała :app_name i wszystkie przesłane pliki zostaną całkowicie zastąpione przez to, co znajduje się w pliku kopii zapasowej. ',
diff --git a/resources/lang/pl-PL/admin/users/message.php b/resources/lang/pl-PL/admin/users/message.php
index 72172694fb..f7e4406680 100644
--- a/resources/lang/pl-PL/admin/users/message.php
+++ b/resources/lang/pl-PL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Pomyślnie odrzuciłeś ten składnik aktywów.',
'bulk_manager_warn' => 'Użytkownicy zostały pomyślnie zaktualizowane, jednak Twój wpis manager nie został zapisany, bo dyrektor wybrano był również na liście użytkowników do edycji i użytkowników nie może być ich Menedżer. Wybierz użytkowników, z wyjątkiem Menedżera.',
'user_exists' => 'Użytkownik już istnieje!',
- 'user_not_found' => 'Użytkownik nie istnieje.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Pole login jest wymagane',
'user_has_no_assets_assigned' => 'Brak aktywów aktualnie przypisanych do użytkownika.',
'user_password_required' => 'Pole hasło jest wymagane.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nie udało się przeszukać serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:',
'ldap_could_not_get_entries' => 'Nie udało się pobrać pozycji z serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:',
'password_ldap' => 'Hasło dla tego konta jest zarządzane przez usługę LDAP, Active Directory. Skontaktuj się z działem IT, aby zmienić swoje hasło. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/pl-PL/general.php b/resources/lang/pl-PL/general.php
index 5ea9d83ce5..eb06c07ac6 100644
--- a/resources/lang/pl-PL/general.php
+++ b/resources/lang/pl-PL/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Również miękkie usuwanie tych użytkowników. Ich historia zasobów pozostanie nieuszkodzona/dopóki nie usuniesz usuniętych rekordów w ustawieniach administratora.',
'bulk_checkin_delete_success' => 'Wybrani użytkownicy zostali usunięci i ich zasoby zostały odebrane.',
'bulk_checkin_success' => 'Elementy dla wybranych użytkowników zostały odebrane.',
- 'set_to_null' => 'Usuń wartości dla tego zasobu|Usuń wartości dla wszystkich :asset_count aktywów ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Usuń :field wartości dla tego użytkownika|Usuń :field wartości dla wszystkich użytkowników :user_count ',
'na_no_purchase_date' => 'N/A - Nie podano daty zakupu',
'assets_by_status' => 'Zasoby wg statusu',
@@ -559,8 +559,8 @@ return [
'expires' => 'Wygasa',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/pl-PL/localizations.php b/resources/lang/pl-PL/localizations.php
index b547f62e86..cbda13a9a0 100644
--- a/resources/lang/pl-PL/localizations.php
+++ b/resources/lang/pl-PL/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Wybierz język',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'angielski (USA)',
'en-GB'=> 'angielski (UK)',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'zuluski',
],
- 'select_country' => 'Wybierz kraj',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Wyspa Wniebowstąpienia',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ekwador',
'EE'=>'Estonia',
'EG'=>'Egipt',
+ 'GB-ENG'=>'England',
'ER'=>'Erytrea',
'ES'=>'Hiszpania',
'ET'=>'Etiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nikaragua',
'NL'=>'Holandia',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norwegia',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federacja Rosyjska',
'RW'=>'Rwanda',
'SA'=>'Arabia Saudyjska',
- 'UK'=>'Szkocja',
+ 'GB-SCT'=>'Szkocja',
'SB'=>'Wyspy Salomona',
'SC'=>'Seszele',
'SS'=>'Sudan Południowy',
@@ -312,6 +314,7 @@ return [
'VI'=>'Wyspy Dziewicze Stanów Zjednoczonych',
'VN'=>'Wietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis i Futuna',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/pl-PL/mail.php b/resources/lang/pl-PL/mail.php
index 569c22064a..bbb3ca38a2 100644
--- a/resources/lang/pl-PL/mail.php
+++ b/resources/lang/pl-PL/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Użytkownik zamówił pozycję na stronie internetowej',
'acceptance_asset_accepted' => 'Użytkownik zaakceptował zasób',
'acceptance_asset_declined' => 'Użytkownik odrzucił zasób',
- 'accessory_name' => 'Nazwa sprzętu:',
- 'additional_notes' => 'Dodatkowe notatki:',
+ 'accessory_name' => 'Nazwa akcesoriów',
+ 'additional_notes' => 'Dodatkowe notatki',
'admin_has_created' => 'Administrator utworzył dla Ciebie konto na stronie :web.',
- 'asset' => 'Sprzęt:',
- 'asset_name' => 'Nazwa sprzętu:',
+ 'asset' => 'Aktywo',
+ 'asset_name' => 'Nazwa nabytku',
'asset_requested' => 'Wystosowane zapotrzebowanie na sprzęt',
'asset_tag' => 'Tag sprzętu',
'assets_warrantee_alert' => 'Istnieje :count aktywów z gwarancją wygasającą w ciągu następnych :thereshold dni. | Istnieje :count aktywów z gwarancją wygasającą w ciągu następnych :threshold dni.',
'assigned_to' => 'Przypisane do',
'best_regards' => 'Pozdrawiam',
- 'canceled' => 'Anulowane:',
- 'checkin_date' => 'Data otrzymania:',
- 'checkout_date' => 'Data przypisania:',
+ 'canceled' => 'Anulowane',
+ 'checkin_date' => 'Data przypisania',
+ 'checkout_date' => 'Data przypisania',
'checkedout_from' => 'Zamówiono z',
'checkedin_from' => 'Sprawdzone od',
'checked_into' => 'Sprawdzone w',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Proszę kliknąć na ten link aby potwierdzić swoje konto na :web:',
'current_QTY' => 'Bieżąca ilość',
'days' => 'Dni',
- 'expecting_checkin_date' => 'Spodziewana data przyjęcia:',
+ 'expecting_checkin_date' => 'Przewidywana data przyjęcia',
'expires' => 'Wygasa',
'hello' => 'Cześć',
'hi' => 'Cześć',
'i_have_read' => 'Przeczytałem i zgadzam się z warunkami użytkowania oraz potwierdzam otrzymanie niniejszej pozycji.',
'inventory_report' => 'Raport z magazynu',
- 'item' => 'Pozycja:',
+ 'item' => 'Przedmiot',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Istnieje: liczba licencja wygasająca w ciągu następnych: dni progowe. | Istnieje: liczba licencji wygasających w ciągu następnych: dni progowe.',
'link_to_update_password' => 'Proszę kliknąć na poniższy link, aby zaktualizować swoje hasło na :web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nazwa',
'new_item_checked' => 'Nowy przedmiot przypisany do Ciebie został zwrócony, szczegóły poniżej.',
'notes' => 'Uwagi',
- 'password' => 'Hasło:',
+ 'password' => 'Hasło',
'password_reset' => 'Resetowanie hasła',
'read_the_terms' => 'Proszę przeczytać warunki użytkowania przedstawione poniżej.',
'read_the_terms_and_click' => 'Proszę zapoznać się z poniższymi warunkami użycia, i kliknij na link na dole, aby potwierdzić, że przeczytałeś/aś i zgodzisz się na warunki użytkowania i otrzymałeś/aś aktywa.',
- 'requested' => 'Zamówione:',
+ 'requested' => 'Wymagane',
'reset_link' => 'Link resetujący Twoje hasło',
'reset_password' => 'Kliknij tutaj aby zresetować swoje hasło:',
'rights_reserved' => 'Wszystkie prawa zastrzeżone.',
diff --git a/resources/lang/pt-BR/admin/hardware/form.php b/resources/lang/pt-BR/admin/hardware/form.php
index c678fc998d..dac049b61d 100644
--- a/resources/lang/pt-BR/admin/hardware/form.php
+++ b/resources/lang/pt-BR/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
'order' => 'Número do Pedido',
'qr' => 'Código QR',
'requestable' => 'Usuários podem solicitar este ativo',
- 'redirect_to_all' => 'Return to all :type',
- 'redirect_to_type' => 'Go to :type',
- 'redirect_to_checked_out_to' => 'Go to Checked Out to',
+ 'redirect_to_all' => 'Voltar para todos os :type',
+ 'redirect_to_type' => 'Ir para :type',
+ 'redirect_to_checked_out_to' => 'Ir para Checked Out para',
'select_statustype' => 'Selecione o Tipo de Status',
'serial' => 'Serial',
'status' => 'Status',
diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php
index 141bbf507f..f96cb26aa4 100644
--- a/resources/lang/pt-BR/admin/hardware/message.php
+++ b/resources/lang/pt-BR/admin/hardware/message.php
@@ -4,11 +4,11 @@ return [
'undeployable' => 'Aviso: Este bem foi marcado como atualmente não implementável. Se este status mudou, por favor, atualize o status do bem.',
'does_not_exist' => 'O ativo não existe.',
- 'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
- 'no_tag' => 'No asset tag provided.',
+ 'does_not_exist_var'=> 'Ativo com a etiqueta :asset_tag não encontrado.',
+ 'no_tag' => 'Nenhuma etiqueta de ativo fornecida.',
'does_not_exist_or_not_requestable' => 'Esse ativo não existe ou não pode ser solicitado.',
'assoc_users' => 'Este bem está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize seu bem para que não referencie mais este usuário e tente novamente. ',
- 'warning_audit_date_mismatch' => 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+ 'warning_audit_date_mismatch' => 'A próxima data de auditoria deste ativo (:next_audit_date) é anterior à última data de auditoria (:last_audit_date). Por favor, atualize a próxima data de auditoria.',
'create' => [
'error' => 'O ativo não foi criado, tente novamente. :(',
@@ -33,7 +33,7 @@ return [
],
'audit' => [
- 'error' => 'Asset audit unsuccessful: :error ',
+ 'error' => 'Auditoria de ativo malsucedida: :error ',
'success' => 'Auditoria de equipamentos logada com sucesso.',
],
@@ -51,14 +51,14 @@ return [
],
'import' => [
- 'import_button' => 'Process Import',
+ 'import_button' => 'Processar Importação',
'error' => 'Alguns itens não foram importados corretamente.',
'errorDetail' => 'Os seguintes itens não foram importados devido a erros.',
'success' => 'O seu arquivo foi importado',
'file_delete_success' => 'O arquivo foi excluído com sucesso',
'file_delete_error' => 'Não foi possível excluir o arquivo',
'file_missing' => 'O arquivo selecionado está faltando',
- 'file_already_deleted' => 'The file selected was already deleted',
+ 'file_already_deleted' => 'O arquivo selecionado já foi excluído',
'header_row_has_malformed_characters' => 'Um ou mais atributos na linha do cabeçalho contém caracteres UTF-8 malformados',
'content_row_has_malformed_characters' => 'Um ou mais atributos na primeira linha de conteúdo contém caracteres UTF-8 malformados',
],
diff --git a/resources/lang/pt-BR/admin/locations/message.php b/resources/lang/pt-BR/admin/locations/message.php
index a1d5ac2607..89d9259b34 100644
--- a/resources/lang/pt-BR/admin/locations/message.php
+++ b/resources/lang/pt-BR/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'O local não existe.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'Este local não pode ser excluído no momento, pois é o local de registro de pelo menos um ativo ou usuário, possui ativos atribuídos a ele ou é o local principal de outro local. Atualize seus registros para que não façam mais referência a este local e tente novamente. ',
'assoc_assets' => 'Este local esta atualmente associado a pelo menos um ativo e não pode ser deletado. Por favor atualize seu ativo para não fazer mais referência a este local e tente novamente. ',
'assoc_child_loc' => 'Este local é atualmente o principal de pelo menos local secundário e não pode ser deletado. Por favor atualize seus locais para não fazer mais referência a este local e tente novamente. ',
'assigned_assets' => 'Ativos atribuídos',
'current_location' => 'Localização Atual',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => 'Abrir :map_provider_icon Maps',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'A localização não foi restaurada, por favor, tente novamente',
+ 'success' => 'Localização restaurada com sucesso.'
),
'delete' => array(
diff --git a/resources/lang/pt-BR/admin/models/message.php b/resources/lang/pt-BR/admin/models/message.php
index 60695ac872..7e68d2542d 100644
--- a/resources/lang/pt-BR/admin/models/message.php
+++ b/resources/lang/pt-BR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
'no_association' => 'ATENÇÃO! O modelo de ativo para este item é inválido ou está faltando!',
'no_association_fix' => 'Isso quebrará as coisas de maneiras estranhas e horríveis. Edite este equipamento agora para atribuir um modelo a ele.',
'assoc_users' => 'Este modelo está no momento associado com um ou mais ativos e não pode ser excluído. Exclua os ativos e então tente excluir novamente. ',
- 'invalid_category_type' => 'This category must be an asset category.',
+ 'invalid_category_type' => 'Esta categoria deve ser uma categoria de ativo.',
'create' => array(
'error' => 'O modelo não foi criado, tente novamente.',
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 37d54ca10f..500eeb9584 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Criar, baixar e restaurar backups ',
'backups_restoring' => 'Restaurando do Backup',
+ 'backups_clean' => 'Limpe o banco de dados de backup antes de realizar a restauração',
+ 'backups_clean_helptext' => "Isso pode ser útil se você estiver mudando entre versões de banco de dados",
'backups_upload' => 'Carregar Backup',
'backups_path' => 'As cópias de segurança no servidor são armazenadas em :path',
'backups_restore_warning' => 'Use o botão de restauração para restaurar de um backup anterior. (Isso atualmente não funciona com o armazenamento de arquivos S3 ou o Docker.
Seu banco de dados :app_name inteiro e todos os arquivos enviados serão completamente substituídos pelo que está no arquivo de backup. ',
@@ -94,7 +96,7 @@ return [
'ldap_login_sync_help' => 'Isso apenas prova que LDAP sincroniza corretamente. Se o autenticador query LDAP não estiver correto, usuários ainda não poderão realizar o login. VOCÊ DEVE PRIMEIRO SALVAR AS NOVAS CONFIGURAÇÕES DO LDAP.',
'ldap_manager' => 'Gerenciador LDAP',
'ldap_server' => 'Servidor LDAP',
- 'ldap_server_help' => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+ 'ldap_server_help' => 'Isso deve começar com ldap:// (para não criptografado) ou ldaps:// (para TLS ou SSL)',
'ldap_server_cert' => 'Validação certificado SSL LDAP',
'ldap_server_cert_ignore' => 'Permitir certificado SSL inválido',
'ldap_server_cert_help' => 'Selecione esta opção se está utilizando um certificado SSL próprio e deseja aceitar um certificado SSL inválido.',
@@ -218,7 +220,7 @@ return [
'webhook_integration_help' => 'integração :app é opcional, porém o endpoint e o canal são necessários se você deseja usá-lo. Para configurar a integração :app, primeiro você deve criar um webhook entrante na sua conta :app. Clique no botão Teste a integração do :app para confirmar se suas configurações estão corretas antes de salvar. ',
'webhook_integration_help_button' => 'Depois de salvar suas informações do :app, será exibido um botão de teste.',
'webhook_test_help' => 'Teste se sua integração :app está configurada corretamente. VOCÊ DEVE SALVAR SUAS CONFIGURAÇÃO :app PRIMEIRO.',
- 'shortcuts_enabled' => 'Enable Shortcuts',
+ 'shortcuts_enabled' => 'Ativar Atalhos',
'shortcuts_help_text' => 'Windows: Alt + Access key, Mac: Control + Option + Access key',
'snipe_version' => 'Versão do Snipe-IT',
'support_footer' => 'Links de rodapé de suporte ',
diff --git a/resources/lang/pt-BR/admin/settings/message.php b/resources/lang/pt-BR/admin/settings/message.php
index cd6e5f1045..0450396ce5 100644
--- a/resources/lang/pt-BR/admin/settings/message.php
+++ b/resources/lang/pt-BR/admin/settings/message.php
@@ -15,7 +15,7 @@ return [
'restore_confirm' => 'Tem certeza que deseja restaurar seu banco de dados a partir de :filename?'
],
'restore' => [
- 'success' => 'Your system backup has been restored. Please log in again.'
+ 'success' => 'Seu backup do sistema foi restaurado. Por favor, faça login novamente.'
],
'purge' => [
'error' => 'Ocorreu um erro ao excluir os registros. ',
diff --git a/resources/lang/pt-BR/admin/users/message.php b/resources/lang/pt-BR/admin/users/message.php
index 693ef19df6..9786c38aee 100644
--- a/resources/lang/pt-BR/admin/users/message.php
+++ b/resources/lang/pt-BR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Você recusou com sucesso esse ativo.',
'bulk_manager_warn' => 'Os usuários foram atualizados com êxito, no entanto seu Gerenciador de entrada não foi salvo porque o gerente selecionado estava também na lista de usuários a ser editado e usuários podem não ser seu próprio gerente. Por favor, selecione os usuários novamente, excluindo o gerente.',
'user_exists' => 'O usuário já existe!',
- 'user_not_found' => 'O usuário não existe.',
+ 'user_not_found' => 'O usuário não existe ou você não tem permissão para visualizá-lo.',
'user_login_required' => 'O campo de login é requerido',
'user_has_no_assets_assigned' => 'Não há ativos atualmente atribuídos ao usuário.',
'user_password_required' => 'A senha é requerida.',
@@ -37,22 +37,23 @@ return array(
'update' => 'Houve um problema ao atualizar o usuário. Tente novamente.',
'delete' => 'Houve um problema ao excluir o usuário. Tente novamente.',
'delete_has_assets' => 'Este usuário tem itens atribuídos e não pôde ser excluído.',
- 'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
- 'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
- 'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
- 'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
- 'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+ 'delete_has_assets_var' => 'Este usuário ainda tem um ativo atribuído. Por favor, faça a devolução primeiro. | Este usuário ainda tem :count ativos atribuídos. Por favor, faça a devolução dos ativos primeiro.',
+ 'delete_has_licenses_var' => 'Este usuário ainda tem uma licença atribuída. Por favor, faça a devolução primeiro. | Este usuário ainda tem :count licenças atribuídas. Por favor, faça a devolução delas primeiro.',
+ 'delete_has_accessories_var' => 'Este usuário ainda tem um acessório atribuído. Por favor, faça a devolução primeiro. | Este usuário ainda tem :count acessórios atribuídos. Por favor, faça a devolução dos ativos primeiro.',
+ 'delete_has_locations_var' => 'Este usuário ainda gerencia um local. Por favor, selecione outro gerente primeiro. | Este usuário ainda gerencia :count locais. Por favor, selecione outro gerente primeiro.',
+ 'delete_has_users_var' => 'Este usuário ainda gerencia outro usuário. Por favor, selecione outro gerente para esse usuário primeiro. | Este usuário ainda gerencia :count usuários. Por favor, selecione outro gerente para eles primeiro.',
'unsuspend' => 'Houve um problema ao remover a suspensão do usuário. Tente novamente.',
'import' => 'Houve um problema ao importar usuários. Tente novamente.',
'asset_already_accepted' => 'Este ativo já foi aceito.',
'accept_or_decline' => 'Você precisa aceita ou rejeitar esse ativo.',
- 'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+ 'cannot_delete_yourself' => 'Nós nos sentiríamos muito mal se você se deletasse, por favor, reconsidere.',
'incorrect_user_accepted' => 'O ativo que tentou aceitar não foi solicitado por você.',
'ldap_could_not_connect' => 'Não foi possível conectar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:',
'ldap_could_not_bind' => 'Não foi possível se ligar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP: ',
'ldap_could_not_search' => 'Não foi possível procurar o servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:',
'ldap_could_not_get_entries' => 'Não foi possível obter informações do servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:',
'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha. ',
+ 'multi_company_items_assigned' => 'Este usuário tem itens atribuídos, por favor, faça a devolução antes de mudar de empresa.'
),
'deletefile' => array(
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index f4094944c0..8259371f4d 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -420,7 +420,7 @@ Resultados da Sincronização',
'bulk_soft_delete' =>'Também exclua esses usuários. Seu histórico de ativos permanecerá intacto até você remover os registros excluídos nas configurações do Administrador.',
'bulk_checkin_delete_success' => 'Os usuários selecionados foram excluídos e seus itens foram devolvidos.',
'bulk_checkin_success' => 'Os itens dos usuários selecionados foram devolvidos.',
- 'set_to_null' => 'Excluir valores para este ativo|Excluir valores para todos os :asset_count ativos ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Excluir os valores de :field para este usuário! Excluir :field valores para todos :user_count usuários ',
'na_no_purchase_date' => 'N/A - Nenhuma data de compra fornecida',
'assets_by_status' => 'Ativos por Situação',
@@ -560,8 +560,8 @@ Resultados da Sincronização',
'expires' => 'Expira',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/pt-BR/localizations.php b/resources/lang/pt-BR/localizations.php
index e06df6fa0c..1570026c04 100644
--- a/resources/lang/pt-BR/localizations.php
+++ b/resources/lang/pt-BR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Selecionar um idioma',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Inglês, EUA',
'en-GB'=> 'Inglês, Reino Unido',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Selecione um país',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ilha de Ascensão',
@@ -135,6 +135,7 @@ return [
'EC'=>'Equador',
'EE'=>'Estónia',
'EG'=>'Egito',
+ 'GB-ENG'=>'England',
'ER'=>'Eritreia',
'ES'=>'Espanha',
'ET'=>'Etiópia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigéria',
'NI'=>'Nicarágua',
'NL'=>'Países Baixos',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Noruega',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federação Russa',
'RW'=>'Ruanda',
'SA'=>'Arábia Saudita',
- 'UK'=>'Escócia',
+ 'GB-SCT'=>'Escócia',
'SB'=>'Ilhas Salomão',
'SC'=>'Seicheles',
'SS'=>'Sudão do Sul',
@@ -312,6 +314,7 @@ return [
'VI'=>'Ilhas Virgens (Americanas)',
'VN'=>'Vietnã',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Ilhas Wallis e Futuna',
'WS'=>'Samoa',
'YE'=>'Iêmen',
diff --git a/resources/lang/pt-BR/mail.php b/resources/lang/pt-BR/mail.php
index 7a1897e899..916bb69fa7 100644
--- a/resources/lang/pt-BR/mail.php
+++ b/resources/lang/pt-BR/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Um usuário requisitou um item no website',
'acceptance_asset_accepted' => 'Um usuário aceitou um item',
'acceptance_asset_declined' => 'Um usuário recusou um item',
- 'accessory_name' => 'Nome do Acessório:',
- 'additional_notes' => 'Comentários adicionais:',
+ 'accessory_name' => 'Nome do Acessório',
+ 'additional_notes' => 'Comentários adicionais',
'admin_has_created' => 'Um administrador criou uma conta para você em :web.',
- 'asset' => 'Ativo:',
- 'asset_name' => 'Nome do Ativo:',
+ 'asset' => 'Ativo',
+ 'asset_name' => 'Nome do Ativo',
'asset_requested' => 'Requisição de Ativo',
'asset_tag' => 'Etiqueta de Ativo',
'assets_warrantee_alert' => 'Há um :count ativo com a garantia expirando nos próximos :threshold dias. Existem :count ativos com a garantia expirando nos próximos :threshold dias.',
'assigned_to' => 'Atribuído a',
'best_regards' => 'Atenciosamente,',
- 'canceled' => 'Cancelado:',
- 'checkin_date' => 'Data de devolução:',
- 'checkout_date' => 'Data de atribuição:',
+ 'canceled' => 'Cancelado',
+ 'checkin_date' => 'Data de devolução',
+ 'checkout_date' => 'Data de saída',
'checkedout_from' => 'Check-out de',
'checkedin_from' => 'Check-in de',
'checked_into' => 'Check-in em',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Por favor clique no link a seguir para confirmar sua conta :web:',
'current_QTY' => 'Qtde. atual',
'days' => 'Dias',
- 'expecting_checkin_date' => 'Data prevista de devolução:',
+ 'expecting_checkin_date' => 'Excedeu a data dar entrada',
'expires' => 'Expira',
'hello' => 'Olá',
'hi' => 'Oi',
'i_have_read' => 'Li e concordo com os termos de uso e recebi este item.',
'inventory_report' => 'Relatório de Inventário',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Há uma :count licença expirando nos próximos :threshold dias. | Existem :count licenças expirand nos próximos :threshold dias.',
'link_to_update_password' => 'Por favor clique no link abaixo para atualizar a sua senha do :web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nome',
'new_item_checked' => 'Um novo item foi feito Check-out em seu nome, detalhes abaixo.',
'notes' => 'Notas',
- 'password' => 'Senha:',
+ 'password' => 'Senha',
'password_reset' => 'Redefinir Senha',
'read_the_terms' => 'Por favor, leia os termos de uso abaixo.',
'read_the_terms_and_click' => 'Por favor, leia os termos de uso abaixo, e clique no link na parte inferior para confirmar que você leu e concorda com os termos de uso, e recebeu o ativo.',
- 'requested' => 'Solicitado:',
+ 'requested' => 'Solicitado',
'reset_link' => 'Seu Link de redefinição da senha',
'reset_password' => 'Clique aqui para redefinir sua senha:',
'rights_reserved' => 'Todos os direitos reservados.',
diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php
index c39968a343..0c037d78b6 100644
--- a/resources/lang/pt-BR/validation.php
+++ b/resources/lang/pt-BR/validation.php
@@ -125,7 +125,7 @@ return [
'symbols' => 'The :attribute field must contain at least one symbol.',
'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
],
- 'percent' => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+ 'percent' => 'A depreciação mínima deve estar entre 0 e 100 quando o tipo de depreciação for percentual.',
'present' => 'O campo:attribute deve estar presente.',
'present_if' => 'The :attribute field must be present when :other is :value.',
diff --git a/resources/lang/pt-PT/admin/locations/message.php b/resources/lang/pt-PT/admin/locations/message.php
index 962ac01c2c..7ea917eac4 100644
--- a/resources/lang/pt-PT/admin/locations/message.php
+++ b/resources/lang/pt-PT/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Localização não existe.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Esta localização está atualmente associada com pelo menos um artigo e não pode ser removida. Atualize este artigos de modo a não referenciarem mais este local e tente novamente. ',
'assoc_child_loc' => 'Esta localização contém pelo menos uma sub-localização e não pode ser removida. Por favor, atualize as localizações para não referenciarem mais esta localização e tente novamente. ',
'assigned_assets' => 'Artigos atribuídos',
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index c6eddbaa5e..ab3c8a5321 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Cópias de segurança',
'backups_help' => 'Criar, baixar e restaurar cópias de segurança ',
'backups_restoring' => 'Restaurar da cópia de segurança',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Carregar cópia de segurança',
'backups_path' => 'As cópia de segurança no servidor são guardadas em :path',
'backups_restore_warning' => 'Use o botão de restaurar para restaurar de uma cópia de segurança anterior. (Isto não funciona actualmente com armazenamento de ficheiro S3 ou Docker)
A sua inteira :app_name base de dados e algum ficheiro enviado irá ser apagado pelo que está no ficheiro da cópia de segurança. ',
diff --git a/resources/lang/pt-PT/admin/users/message.php b/resources/lang/pt-PT/admin/users/message.php
index a1ed26601f..d739576cd1 100644
--- a/resources/lang/pt-PT/admin/users/message.php
+++ b/resources/lang/pt-PT/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Recusou este artigo com sucesso.',
'bulk_manager_warn' => 'Seus usuários foram atualizados com sucesso, no entanto, sua entrada de gerente não foi salva porque o gerente que você selecionou também estava na lista de usuários para ser editada e os usuários podem não ser seu próprio gerente. Selecione seus usuários novamente, excluindo o gerente.',
'user_exists' => 'Utilizador já existe!',
- 'user_not_found' => 'O utilizador não existe.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'O atributo login é obrigatório',
'user_has_no_assets_assigned' => 'Não há conteúdos atualmente atribuídos ao usuário.',
'user_password_required' => 'A password é obrigatória.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Não foi possível pesquisar no servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP:',
'ldap_could_not_get_entries' => 'Não foi possível obter registos do servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP:',
'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index 140ee7070f..1644e31237 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Também exclua esses utilizadores. O seu histórico de ativos permanecerá intacto a menos que / até que purgue os registos apagados nas configurações do Administrador.',
'bulk_checkin_delete_success' => 'Os utilizadores selecionados foram apagados e os seus itens foram entregues.',
'bulk_checkin_success' => 'Os itens para os utilizadores selecionados foram recebidos.',
- 'set_to_null' => 'Apagar valores para este artigo|Apagar valores para todos os :asset_count ativos ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Apagar os valores de :field para este utilizador|Apagar os valores de :field para todos :user_count utilizadores ',
'na_no_purchase_date' => 'N/D - Nenhuma data de compra fornecida',
'assets_by_status' => 'Artigos por Estado',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expira a',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/pt-PT/localizations.php b/resources/lang/pt-PT/localizations.php
index 0bf88d6fbd..0732512198 100644
--- a/resources/lang/pt-PT/localizations.php
+++ b/resources/lang/pt-PT/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Selecione um idioma',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Inglês, EUA',
'en-GB'=> 'Inglês, Reino Unido',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Selecione um país',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ilha de Ascensão',
@@ -135,6 +135,7 @@ return [
'EC'=>'Equador',
'EE'=>'Estónia',
'EG'=>'Egito',
+ 'GB-ENG'=>'England',
'ER'=>'Eritreia',
'ES'=>'Espanha',
'ET'=>'Etiópia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigéria',
'NI'=>'Nicarágua',
'NL'=>'Países Baixos',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Noruega',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federação Russa',
'RW'=>'Ruanda',
'SA'=>'Arábia Saudita',
- 'UK'=>'Escócia',
+ 'GB-SCT'=>'Escócia',
'SB'=>'Ilhas Salomão',
'SC'=>'Seychelles',
'SS'=>'Sudão do Sul',
@@ -312,6 +314,7 @@ return [
'VI'=>'Ilhas Virgens (E.U.A)',
'VN'=>'Vietname',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Ilhas Wallis e Futuna',
'WS'=>'Samoa',
'YE'=>'Iémen',
diff --git a/resources/lang/pt-PT/mail.php b/resources/lang/pt-PT/mail.php
index dcf8db7b4f..d1f1338107 100644
--- a/resources/lang/pt-PT/mail.php
+++ b/resources/lang/pt-PT/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Um utilizador solicitou um artigo no site',
'acceptance_asset_accepted' => 'Um usuário aceitou um item',
'acceptance_asset_declined' => 'Um usuário recusou um item',
- 'accessory_name' => 'Nome do acessório:',
- 'additional_notes' => 'Notas adicionais:',
+ 'accessory_name' => 'Nome do Acessório',
+ 'additional_notes' => 'Notas adicionais',
'admin_has_created' => 'Um administrador criou uma conta para ti no :web site.',
- 'asset' => 'Artigo:',
- 'asset_name' => 'Nome do Artigo:',
+ 'asset' => 'Ativo',
+ 'asset_name' => 'Nome do Ativo',
'asset_requested' => 'Artigo requesitado',
'asset_tag' => 'Etiqueta do Ativo',
'assets_warrantee_alert' => 'Existe :count artigo com a garantia a expirar nos próximos :threshold dias.|Existem :count artigos com a garantia a expirar nos próximos :threshold dias.',
'assigned_to' => 'Atribuído a',
'best_regards' => 'Atenciosamente',
- 'canceled' => 'Cancelado:',
- 'checkin_date' => 'Data de devolução:',
- 'checkout_date' => 'Data de atribuição:',
+ 'canceled' => 'Cancelado',
+ 'checkin_date' => 'Data de devolução',
+ 'checkout_date' => 'Data de alocação',
'checkedout_from' => 'Check-out de',
'checkedin_from' => 'Check-in de',
'checked_into' => 'Check-in em',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Por favor clique no link a seguir para confirmar sua conta :web:',
'current_QTY' => 'qtde. actual',
'days' => 'Dias',
- 'expecting_checkin_date' => 'Data prevista de devolução:',
+ 'expecting_checkin_date' => 'Data de devolução esperada',
'expires' => 'Expira a',
'hello' => 'Olá',
'hi' => 'Oi',
'i_have_read' => 'Li e concordo com os termos de uso e recebi este item.',
'inventory_report' => 'Relatório de Inventário',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Há :count licença a expirar nos próximos :threshold dias. Existem :count licenças que irão expirar nos próximos :threshold dias.',
'link_to_update_password' => 'Por favor clique no link abaixo para actualizar a sua senha do :web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nome',
'new_item_checked' => 'Um novo item foi atribuído a ti, os detalhes estão abaixo.',
'notes' => 'Notas',
- 'password' => 'Senha:',
+ 'password' => 'Password',
'password_reset' => 'Repor senha',
'read_the_terms' => 'Por favor, leia os termos de uso abaixo.',
'read_the_terms_and_click' => 'Por favor, leia os termos de uso abaixo, e clique no link na parte inferior para confirmar que você leu e concorda com os termos de uso, e recebeu o ativo.',
- 'requested' => 'Requisitado:',
+ 'requested' => 'Solicitado',
'reset_link' => 'Seu Link de redefinição da senha',
'reset_password' => 'Clique aqui para redefinir a sua password:',
'rights_reserved' => 'Todos os direitos reservados.',
diff --git a/resources/lang/ro-RO/admin/locations/message.php b/resources/lang/ro-RO/admin/locations/message.php
index 4815a3596f..b5862edc33 100644
--- a/resources/lang/ro-RO/admin/locations/message.php
+++ b/resources/lang/ro-RO/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Locatia nu exista.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Această locație este în prezent asociată cu cel puțin un material și nu poate fi ștearsă. Actualizați-vă activele astfel încât acestea să nu mai fie menționate și să încercați din nou.',
'assoc_child_loc' => 'Această locație este în prezent părinte pentru cel puțin o locație copil și nu poate fi ștearsă. Actualizați locațiile dvs. pentru a nu mai referi această locație și încercați din nou.',
'assigned_assets' => 'Atribuire Active',
diff --git a/resources/lang/ro-RO/admin/settings/general.php b/resources/lang/ro-RO/admin/settings/general.php
index a6db46aff8..e63a677216 100644
--- a/resources/lang/ro-RO/admin/settings/general.php
+++ b/resources/lang/ro-RO/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Copiile de rezervă',
'backups_help' => 'Creează, descarcă și restaurează copii de rezervă ',
'backups_restoring' => 'Restaurare din Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Încărcare copie de rezervă',
'backups_path' => 'Copiile de rezervă de pe server sunt stocate în :path',
'backups_restore_warning' => 'Utilizaţi butonul de restaurare pentru a restaura dintr-o copie de rezervă anterioară. (Acest lucru nu funcționează în prezent cu stocarea fișierului S3 sau cu Docker.
Întreaga bază de date cu :app_name şi orice fişiere încărcate vor fi înlocuite complet cu ce se află în fişierul de rezervă. ',
diff --git a/resources/lang/ro-RO/admin/users/message.php b/resources/lang/ro-RO/admin/users/message.php
index 727ceb96b8..5e9a031156 100644
--- a/resources/lang/ro-RO/admin/users/message.php
+++ b/resources/lang/ro-RO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Ați refuzat cu succes acest activ.',
'bulk_manager_warn' => 'Utilizatorii dvs. au fost actualizați cu succes, cu toate acestea, intrarea managerului dvs. nu a fost salvată, deoarece managerul pe care l-ați selectat a fost, de asemenea, în lista de utilizatori care urmează să fie editat și este posibil ca utilizatorii să nu fie propriul manager. Selectați din nou utilizatorii dvs., cu excepția managerului.',
'user_exists' => 'Utilizatorul exista deja!',
- 'user_not_found' => 'Utilizatorul nu exista.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Campul de login este necesar',
'user_has_no_assets_assigned' => 'Nici un activ alocat utilizatorului în prezent.',
'user_password_required' => 'Este necesara parola.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Căutarea serverului LDAP nu a putut fi efectuată. Verificați configurația serverului LDAP în fișierul de configurare LDAP.
Error de la LDAP Server:',
'ldap_could_not_get_entries' => 'Nu s-au putut obține intrări de pe serverul LDAP. Verificați configurația serverului LDAP în fișierul de configurare LDAP.
Error de la LDAP Server:',
'password_ldap' => 'Parola pentru acest cont este gestionată de LDAP / Active Directory. Contactați departamentul IT pentru a vă schimba parola.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ro-RO/general.php b/resources/lang/ro-RO/general.php
index 72c1e574d8..d2b5ba2fb7 100644
--- a/resources/lang/ro-RO/general.php
+++ b/resources/lang/ro-RO/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'De asemenea, soft-delete acesti utilizatori. Istoricul lor de active va ramane intact numai in cazul in care eliminati inregistrarile sterse din Setarile Administratorului.',
'bulk_checkin_delete_success' => 'Utilizatorii selectați au fost șterși și elementele lor au fost verificate.',
'bulk_checkin_success' => 'Elementele pentru utilizatorii selectați au fost verificate.',
- 'set_to_null' => 'Ștergeți valorile pentru acest element / Ștergeți valorile pentru toate cele :asset_count active ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Ştergeţi :field values for this user Ştergeţi :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - Nicio dată de cumpărare furnizată',
'assets_by_status' => 'Bunuri după stare',
@@ -559,8 +559,8 @@ return [
'expires' => 'expiră',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ro-RO/localizations.php b/resources/lang/ro-RO/localizations.php
index fa8ac10c8f..d385282744 100644
--- a/resources/lang/ro-RO/localizations.php
+++ b/resources/lang/ro-RO/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Selectaţi o limbă',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Engleză, SUA',
'en-GB'=> 'Engleză, Marea Britanie',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Selectează o țară',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Insula Ascension',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egipt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritreea',
'ES'=>'Spania',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Olanda',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norvegia',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Federaţia Rusă',
'RW'=>'Rwanda',
'SA'=>'Arabia Saudită',
- 'UK'=>'Scoţia',
+ 'GB-SCT'=>'Scoţia',
'SB'=>'Insulele Solomon',
'SC'=>'Seychelles',
'SS'=>'Sudanul de Sud',
@@ -312,6 +314,7 @@ return [
'VI'=>'Insulele Virgine Americane',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Insulele Wallis și Futuna',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ro-RO/mail.php b/resources/lang/ro-RO/mail.php
index 0d117e9562..bb18f360d3 100644
--- a/resources/lang/ro-RO/mail.php
+++ b/resources/lang/ro-RO/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Un utilizator a solicitat un element de pe site',
'acceptance_asset_accepted' => 'Un utilizator a acceptat un articol',
'acceptance_asset_declined' => 'Un utilizator a refuzat un articol',
- 'accessory_name' => 'Nume accesoriu:',
- 'additional_notes' => 'Note Aditionale:',
+ 'accessory_name' => 'Nume Accesoriu',
+ 'additional_notes' => 'Note Aditionale',
'admin_has_created' => 'Un administrator a creat un cont pentru dvs. pe: site-ul Web.',
- 'asset' => 'activ:',
- 'asset_name' => 'Numele activului:',
+ 'asset' => 'Activ',
+ 'asset_name' => 'Nume activ',
'asset_requested' => 'Activul solicitat',
'asset_tag' => 'Eticheta activ',
'assets_warrantee_alert' => 'Există :count active cu o garanție care expiră în următoarele :prag zile. Există :count active cu garanții care expiră în următoarele :threshold zile.',
'assigned_to' => 'Atribuit',
'best_regards' => 'Toate cele bune,',
- 'canceled' => 'Anulat:',
- 'checkin_date' => 'Checkin Data:',
- 'checkout_date' => 'Verifica data:',
+ 'canceled' => 'Anulat',
+ 'checkin_date' => 'Verificați data',
+ 'checkout_date' => 'Data predare',
'checkedout_from' => 'Verificat de la',
'checkedin_from' => 'Verificat de la',
'checked_into' => 'Verificat în',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Dați clic pe următorul link pentru a vă confirma: contul web:',
'current_QTY' => 'CTA curentă',
'days' => 'zi',
- 'expecting_checkin_date' => 'Data expirării așteptate:',
+ 'expecting_checkin_date' => 'Data de așteptare așteptată',
'expires' => 'expiră',
'hello' => 'buna',
'hi' => 'Bună',
'i_have_read' => 'Am citit și sunt de acord cu termenii de utilizare și am primit acest articol.',
'inventory_report' => 'Raport de inventar',
- 'item' => 'Articol:',
+ 'item' => 'Articol',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Există :count licență care expiră în următoarele :prag zile. Există :count licențe care expiră în următoarele :threshold zile.',
'link_to_update_password' => 'Faceți clic pe următorul link pentru a vă actualiza parola web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Nume',
'new_item_checked' => 'Un element nou a fost verificat sub numele dvs., detaliile sunt de mai jos.',
'notes' => 'notițe',
- 'password' => 'Parola:',
+ 'password' => 'Parola',
'password_reset' => 'Resetare parola',
'read_the_terms' => 'Citiți termenii de utilizare de mai jos.',
'read_the_terms_and_click' => 'Vă rugăm să citiţi termenii de utilizare de mai jos, și faceți clic pe link-ul din partea de jos pentru a confirma că ați citit și sunteți de acord cu termenii de utilizare și ați primit activul.',
- 'requested' => 'Solicitat:',
+ 'requested' => 'Cereri',
'reset_link' => 'Parola Resetare parolă',
'reset_password' => 'Faceți clic aici pentru a vă reseta parola:',
'rights_reserved' => 'Toate drepturile rezervate.',
diff --git a/resources/lang/ru-RU/account/general.php b/resources/lang/ru-RU/account/general.php
index de267467b2..8e78a543d0 100644
--- a/resources/lang/ru-RU/account/general.php
+++ b/resources/lang/ru-RU/account/general.php
@@ -2,16 +2,16 @@
return array(
'personal_api_keys' => 'Персональные API ключи',
- 'personal_access_token' => 'Personal Access Token',
- 'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
- 'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+ 'personal_access_token' => 'Персональный токен доступа',
+ 'personal_api_keys_success' => 'Ключ персонального API :key создан успешно',
+ 'here_is_api_key' => 'Вот Ваш новый персональный токен доступа. Это единственный раз, когда он показывается. Не потеряйте его! Теперь Вы можете использовать данный токен для выполнения запросов API.',
+ 'api_key_warning' => 'При создании ключа API скопируйте его сразу, его больше нельзя посмотреть.',
'api_base_url' => 'Ваш базовый URL-адрес API находится в:',
'api_base_url_endpoint' => '/<endpoint>',
'api_token_expiration_time' => 'API токены истекут:',
- 'api_reference' => 'Please check the API reference to find specific API endpoints and additional API documentation.',
- 'profile_updated' => 'Account successfully updated',
- 'no_tokens' => 'You have not created any personal access tokens.',
- 'enable_sounds' => 'Enable sound effects',
- 'enable_confetti' => 'Enable confetti effects',
+ 'api_reference' => 'Пожалуйста, обратитесь к справочнику API, чтобы найти конкретные конечные точки API и дополнительную документацию API.',
+ 'profile_updated' => 'Аккаунт успешно обновлен',
+ 'no_tokens' => 'Вы не создали никаких персональных токенов доступа.',
+ 'enable_sounds' => 'Включить звуковые эффекты',
+ 'enable_confetti' => 'Включить эффект конфетти',
);
diff --git a/resources/lang/ru-RU/admin/accessories/message.php b/resources/lang/ru-RU/admin/accessories/message.php
index d79b162fa1..97320bd68a 100644
--- a/resources/lang/ru-RU/admin/accessories/message.php
+++ b/resources/lang/ru-RU/admin/accessories/message.php
@@ -28,7 +28,7 @@ return array(
'unavailable' => 'Нет доступных аксессуаров для выдачи. Проверьте их количество',
'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.',
'checkout_qty' => array(
- 'lte' => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+ 'lte' => 'Вы пытаетесь выдать :checkout_qty аксессуаров, но в настоящее время доступен только один аксессуар данного типа. Пожалуйста, измените количество для выдачи или доступный остаток и попробуйте еще раз.|Вы пытаетесь выдать :checkout_qty аксессуаров, но доступно всего :number_currently_remaining. Пожалуйста, измените количество для выдачи или доступный остаток этого аксессуара и попробуйте заново.',
),
),
diff --git a/resources/lang/ru-RU/admin/consumables/general.php b/resources/lang/ru-RU/admin/consumables/general.php
index 6a9544c868..abbc05ff2d 100644
--- a/resources/lang/ru-RU/admin/consumables/general.php
+++ b/resources/lang/ru-RU/admin/consumables/general.php
@@ -8,5 +8,5 @@ return array(
'remaining' => 'Осталось',
'total' => 'Всего',
'update' => 'Обновить расходный материал',
- 'inventory_warning' => 'The inventory of this consumable is below the minimum amount of :min_count',
+ 'inventory_warning' => 'Количество расходных материалов меньше минимального количества :min_count',
);
diff --git a/resources/lang/ru-RU/admin/consumables/message.php b/resources/lang/ru-RU/admin/consumables/message.php
index f64467a984..c68637b800 100644
--- a/resources/lang/ru-RU/admin/consumables/message.php
+++ b/resources/lang/ru-RU/admin/consumables/message.php
@@ -2,7 +2,7 @@
return array(
- 'invalid_category_type' => 'The category must be a consumable category.',
+ 'invalid_category_type' => 'Категория должна быть категорией расходных материалов.',
'does_not_exist' => 'Расходный материал не существует.',
'create' => array(
diff --git a/resources/lang/ru-RU/admin/custom_fields/message.php b/resources/lang/ru-RU/admin/custom_fields/message.php
index ecf5462179..06ee479cca 100644
--- a/resources/lang/ru-RU/admin/custom_fields/message.php
+++ b/resources/lang/ru-RU/admin/custom_fields/message.php
@@ -5,7 +5,7 @@ return array(
'field' => array(
'invalid' => 'Это поле не существует.',
'already_added' => 'Поле уже добавлено',
- 'none_selected' => 'No field selected',
+ 'none_selected' => 'Ни одно поле не выбрано',
'create' => array(
'error' => 'Поле не было создано, попробуйте ещё раз.',
diff --git a/resources/lang/ru-RU/admin/hardware/form.php b/resources/lang/ru-RU/admin/hardware/form.php
index e639d27978..4b0676cfda 100644
--- a/resources/lang/ru-RU/admin/hardware/form.php
+++ b/resources/lang/ru-RU/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
'order' => 'Номер заказа',
'qr' => 'QR-код',
'requestable' => 'Пользователи могут запросить этот актив',
- 'redirect_to_all' => 'Return to all :type',
- 'redirect_to_type' => 'Go to :type',
- 'redirect_to_checked_out_to' => 'Go to Checked Out to',
+ 'redirect_to_all' => 'Вернуться ко всем :type',
+ 'redirect_to_type' => 'Перейти к :type',
+ 'redirect_to_checked_out_to' => 'Перейти к заметке',
'select_statustype' => 'Выберите тип статуса',
'serial' => 'Серийный номер',
'status' => 'Статус',
diff --git a/resources/lang/ru-RU/admin/hardware/general.php b/resources/lang/ru-RU/admin/hardware/general.php
index 9bcd752559..45050186ef 100644
--- a/resources/lang/ru-RU/admin/hardware/general.php
+++ b/resources/lang/ru-RU/admin/hardware/general.php
@@ -15,8 +15,8 @@ return [
'delete_confirm' => 'Вы уверены, что хотите удалить этот актив?',
'edit' => 'Редактировать актив',
'model_deleted' => 'Эта модель была удалена. Вы должны восстановить модель прежде, чем сможете восстановить актив.',
- 'model_invalid' => 'This model for this asset is invalid.',
- 'model_invalid_fix' => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+ 'model_invalid' => 'Модель недействительна для этого актива.',
+ 'model_invalid_fix' => 'Актив должен быть обновлен, используйте действительную модель активов, прежде чем пытаться забрать/выдать или проверить его.',
'requestable' => 'Готов к выдаче',
'requested' => 'Запрошенное',
'not_requestable' => 'Не подлежит запросу',
diff --git a/resources/lang/ru-RU/admin/hardware/message.php b/resources/lang/ru-RU/admin/hardware/message.php
index 868858a394..de68e15dcf 100644
--- a/resources/lang/ru-RU/admin/hardware/message.php
+++ b/resources/lang/ru-RU/admin/hardware/message.php
@@ -2,13 +2,13 @@
return [
- 'undeployable' => 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+ 'undeployable' => 'Внимание: Этот актив в настоящее время помечен как не подлежащий установке. Если этот статус изменился, пожалуйста обновите статус актива.',
'does_not_exist' => 'Актив не существует.',
- 'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
- 'no_tag' => 'No asset tag provided.',
+ 'does_not_exist_var'=> 'Актив с тегом :asset_tag не найден.',
+ 'no_tag' => 'Тег актива не предоставлен.',
'does_not_exist_or_not_requestable' => 'Этот актив не существует или не подлежит запросу.',
'assoc_users' => 'Этот актив в настоящее время привязан к пользователю и не может быть удален. Пожалуйста сначала снимите привязку, и затем попробуйте удалить снова. ',
- 'warning_audit_date_mismatch' => 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+ 'warning_audit_date_mismatch' => 'Дата следующего аудита этого актива (:next_audit_date) не может быть раньше последней даты аудита (:last_audit_date). Пожалуйста, обновите следующую дату аудита.',
'create' => [
'error' => 'Актив не был создан, пожалуйста попробуйте снова. :(',
@@ -33,7 +33,7 @@ return [
],
'audit' => [
- 'error' => 'Asset audit unsuccessful: :error ',
+ 'error' => 'Аудит активов не удался: :error ',
'success' => 'Аудит успешно выполнен.',
],
@@ -51,14 +51,14 @@ return [
],
'import' => [
- 'import_button' => 'Process Import',
+ 'import_button' => 'Процесс Импорта',
'error' => 'Некоторые элементы не были импортированы корректно.',
'errorDetail' => 'Следующие элементы не были импортированы из за ошибок.',
'success' => 'Ваш файл был импортирован',
'file_delete_success' => 'Ваш файл был успешно удален',
'file_delete_error' => 'Невозможно удалить файл',
'file_missing' => 'Выбранный файл отсутствует',
- 'file_already_deleted' => 'The file selected was already deleted',
+ 'file_already_deleted' => 'Выбранный файл уже удален',
'header_row_has_malformed_characters' => 'Один или несколько атрибутов в строке заголовка содержат неправильно сформированные символы UTF-8',
'content_row_has_malformed_characters' => 'Один или несколько атрибутов в первой строке содержимого содержат неправильно сформированные символы UTF-8',
],
diff --git a/resources/lang/ru-RU/admin/kits/general.php b/resources/lang/ru-RU/admin/kits/general.php
index 73ceb3a4ab..02f81d0d07 100644
--- a/resources/lang/ru-RU/admin/kits/general.php
+++ b/resources/lang/ru-RU/admin/kits/general.php
@@ -47,5 +47,5 @@ return [
'kit_deleted' => 'Комплект успешно удален',
'kit_model_updated' => 'Модель успешно изменена',
'kit_model_detached' => 'Модель успешно отсоединена',
- 'model_already_attached' => 'Model already attached to kit',
+ 'model_already_attached' => 'Модель уже прикреплена к комплекту',
];
diff --git a/resources/lang/ru-RU/admin/licenses/general.php b/resources/lang/ru-RU/admin/licenses/general.php
index 5f79d22d9e..bb545c5df9 100644
--- a/resources/lang/ru-RU/admin/licenses/general.php
+++ b/resources/lang/ru-RU/admin/licenses/general.php
@@ -14,7 +14,7 @@ return array(
'info' => 'Информация о лицензии',
'license_seats' => 'Лицензируемых мест',
'seat' => 'Место',
- 'seat_count' => 'Seat :count',
+ 'seat_count' => 'Мест :count',
'seats' => 'Мест',
'software_licenses' => 'Лицензии ПО',
'user' => 'Пользователь',
@@ -24,12 +24,12 @@ return array(
[
'checkin_all' => [
'button' => 'Изъять все места',
- 'modal' => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+ 'modal' => 'Это действие вернёт одно место. | Это действие вернёт все :checkedout_seats_count места для этой лицензии.',
'enabled_tooltip' => 'Освободить назначения ВСЕХ мест на эту лицензию как от пользователей, так и от активов',
'disabled_tooltip' => 'Недоступно, т.к. в настоящее время нет выданных (назначенных) мест',
'disabled_tooltip_reassignable' => 'Недоступно, т.к. Лицензия не переназначаема',
'success' => 'Лицензия успешно получена! | Все лицензии были успешно получены!',
- 'log_msg' => 'Checked in via bulk license checkin in license GUI',
+ 'log_msg' => 'Возвращено через массовый отзыв лицензий в GUI',
],
'checkout_all' => [
diff --git a/resources/lang/ru-RU/admin/licenses/message.php b/resources/lang/ru-RU/admin/licenses/message.php
index 2e1094ac4c..9610a1a19a 100644
--- a/resources/lang/ru-RU/admin/licenses/message.php
+++ b/resources/lang/ru-RU/admin/licenses/message.php
@@ -44,8 +44,8 @@ return array(
'error' => 'При выдаче лицензии произошла ошибка. Повторите попытку.',
'success' => 'Лицензия успешно назначена',
'not_enough_seats' => 'Недостаточно лицензионных мест для оформления заказа',
- 'mismatch' => 'The license seat provided does not match the license',
- 'unavailable' => 'This seat is not available for checkout.',
+ 'mismatch' => 'Предоставленное лицензионное место не соответствует лицензии',
+ 'unavailable' => 'Место недоступно для выдачи.',
),
'checkin' => array(
diff --git a/resources/lang/ru-RU/admin/locations/message.php b/resources/lang/ru-RU/admin/locations/message.php
index 5b9d9a9c9a..dc47cd9aab 100644
--- a/resources/lang/ru-RU/admin/locations/message.php
+++ b/resources/lang/ru-RU/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'Статус актива не существует.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Это месторасположение связано как минимум с одним активом и не может быть удалено. Измените ваши активы так, чтобы они не ссылались на это месторасположение и попробуйте ещё раз. ',
'assoc_child_loc' => 'У этого месторасположения является родительским и у него есть как минимум одно месторасположение уровнем ниже. Поэтому оно не может быть удалено. Обновите ваши месторасположения, так чтобы не ссылаться на него и попробуйте снова. ',
'assigned_assets' => 'Присвоенные активы',
'current_location' => 'Текущее местоположение',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => 'Открыть в картах :map_provider_icon',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'Местоположение не было восстановлено, пожалуйста, попробуйте еще раз',
+ 'success' => 'Местоположение успешно восстановлено.'
),
'delete' => array(
diff --git a/resources/lang/ru-RU/admin/models/message.php b/resources/lang/ru-RU/admin/models/message.php
index b9febcec83..d27fcd6f6a 100644
--- a/resources/lang/ru-RU/admin/models/message.php
+++ b/resources/lang/ru-RU/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
'no_association' => 'ПРЕДУПРЕЖДЕНИЕ! Модель активов для этого элемента неверна или отсутствует!',
'no_association_fix' => 'Это странно и ужасно сломает вещи. Отредактируйте этот актив сейчас, чтобы назначить ему модель.',
'assoc_users' => 'Данная модель связана с одним или несколькими активами, и не может быть удалена. Удалите либо измените связанные активы. ',
- 'invalid_category_type' => 'This category must be an asset category.',
+ 'invalid_category_type' => 'Эта категория должна быть категорией активов.',
'create' => array(
'error' => 'Модель не была создана, повторите еще раз.',
diff --git a/resources/lang/ru-RU/admin/settings/general.php b/resources/lang/ru-RU/admin/settings/general.php
index 1326f510cf..edea3a7ef8 100644
--- a/resources/lang/ru-RU/admin/settings/general.php
+++ b/resources/lang/ru-RU/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Резервные копии',
'backups_help' => 'Создавать, загружать и восстанавливать резервные копии ',
'backups_restoring' => 'Восстановление из резервной копии',
+ 'backups_clean' => 'Очистить резервную базу данных перед восстановлением',
+ 'backups_clean_helptext' => "Это может быть полезно, если вы переключаетесь между версиями базы данных",
'backups_upload' => 'Загрузить резервную копию',
'backups_path' => 'Резервные копии хранятся на сервере в :path',
'backups_restore_warning' => 'Используйте кнопку восстановления для восстановления из предыдущей резервной копии. (В настоящее время он не работает с хранилищем файлов S3 или Docker.)
Ваша база данных :app_name и все загруженные файлы будут полностью заменены на те, что находится в файле резервной копии. ',
@@ -49,7 +51,7 @@ return [
'default_eula_text' => 'Пользовательское соглашение по умолчанию',
'default_language' => 'Язык по умолчанию',
'default_eula_help_text' => 'Вы так же можете привязать собственные пользовательские соглашения к определенным категориям активов.',
- 'acceptance_note' => 'Add a note for your decision (Optional)',
+ 'acceptance_note' => 'Добавить заметку для вашего решения (необязательно)',
'display_asset_name' => 'Отображаемое имя актива',
'display_checkout_date' => 'Отображать дату выдачи',
'display_eol' => 'Отображать дату истечения срока гарантии в таблице',
@@ -94,7 +96,7 @@ return [
'ldap_login_sync_help' => 'Этим производится проверка правильности синхронизации LDAP. Если тест подлинности LDAP не пройдёт, пользователи так и не смогут войти в систему. СНАЧАЛА ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШИ ОБНОВЛЕННЫЕ НАСТРОЙКИ LDAP.',
'ldap_manager' => 'LDAP Manager',
'ldap_server' => 'Сервер LDAP',
- 'ldap_server_help' => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+ 'ldap_server_help' => 'Должен начинаться с ldap:// (для незашифрованных соединений) или ldaps:// (для TLS или SSL)',
'ldap_server_cert' => 'Подтверждение SSL сертификата LDAP',
'ldap_server_cert_ignore' => 'Разрешить невалидный SSL сертификат',
'ldap_server_cert_help' => 'Выберите галочку если вы используете самоподписанный SSL сертификат и хотите принять невалидный SSL сертификат.',
@@ -122,8 +124,8 @@ return [
'ldap_test' => 'Тест LDAP',
'ldap_test_sync' => 'Тест синхронизации LDAP',
'license' => 'Лицензия на ПО',
- 'load_remote' => 'Load Remote Avatars',
- 'load_remote_help_text' => 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+ 'load_remote' => 'Загрузить аватары из внешних источников',
+ 'load_remote_help_text' => 'Снимите флажок, если вы не можете загрузить скрипты из интернета. Это предотвратит попытки Snipe-IT загрузить аватары из Gravatar или других внешних источников.',
'login' => 'Попытки входа',
'login_attempt' => 'Попытка входа',
'login_ip' => 'IP-адрес',
@@ -150,7 +152,7 @@ return [
'optional' => 'не обязательно',
'per_page' => 'Результатов на страницу',
'php' => 'Версия PHP',
- 'php_info' => 'PHP info',
+ 'php_info' => 'Информация о PHP',
'php_overview' => 'PHP',
'php_overview_keywords' => 'phpinfo, system, info',
'php_overview_help' => 'PHP System info',
@@ -218,7 +220,7 @@ return [
'webhook_integration_help' => 'Интеграция с :app необязательна, однако конечная точка и канал - обязательны, если Вы планируете её использовать. Для конфигурации интеграции с :app, Вы должны в первую очередь создать исходящий веб-хук на свою учетную запись в :app. Нажмите на кнопку Протестировать Интеграцию с :app чтобы убедится перед сохранением, что Ваши параметры - верны. ',
'webhook_integration_help_button' => 'Как только вы сохраните :app информацию, появится тестовая кнопка.',
'webhook_test_help' => 'Проверьте, правильно ли настроена интеграция :app. ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШЕЕ ОБНОВЛЕННЫЕ :app НАСТРОЙКИ ПРИВЛЕЧЕНИЯ.',
- 'shortcuts_enabled' => 'Enable Shortcuts',
+ 'shortcuts_enabled' => 'Включить ярлыки',
'shortcuts_help_text' => 'Windows: Alt + Access key, Mac: Control + Option + Access key',
'snipe_version' => 'Версия Snipe-IT',
'support_footer' => 'Ссылки на поддержу в нижнем колонтитуле ',
@@ -289,18 +291,18 @@ return [
'zerofill_count' => 'Длина инвентарного номера, включая заполнение нулями',
'username_format_help' => 'Этот параметр используется только в процессе импорта, если имя пользователя не предоставляется и мы должны сгенерировать его для Вас.',
'oauth_title' => 'Настройки OAuth API',
- 'oauth_clients' => 'OAuth Clients',
+ 'oauth_clients' => 'Клиенты OAuth',
'oauth' => 'OAuth',
'oauth_help' => 'Настройки Oauth Endpoint',
'oauth_no_clients' => 'У вас ещё нет клиентов OAuth.',
'oauth_secret' => 'Секретный ключ',
'oauth_authorized_apps' => 'Авторизированные приложения',
'oauth_redirect_url' => 'Ссылка переадресации',
- 'oauth_name_help' => ' Something your users will recognize and trust.',
+ 'oauth_name_help' => ' То, что ваши пользователи распознают и чему доверяют.',
'oauth_scopes' => 'Области видимости',
- 'oauth_callback_url' => 'Your application authorization callback URL.',
- 'create_client' => 'Create Client',
- 'no_scopes' => 'No scopes',
+ 'oauth_callback_url' => 'URL обратного вызова авторизации вашего приложения.',
+ 'create_client' => 'Создать клиента',
+ 'no_scopes' => 'Нет областей действия',
'asset_tag_title' => 'Обновить Настройки Тега Актива',
'barcode_title' => 'Обновить Настройки Штрих-кода',
'barcodes' => 'Штрихкоды',
@@ -375,13 +377,13 @@ return [
'database_driver' => 'Драйвер базы данных',
'bs_table_storage' => 'Хранилище таблицы',
'timezone' => 'Часовой пояс',
- 'profile_edit' => 'Edit Profile',
- 'profile_edit_help' => 'Allow users to edit their own profiles.',
- 'default_avatar' => 'Upload custom default avatar',
- 'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
- 'restore_default_avatar' => 'Restore original system default avatar',
+ 'profile_edit' => 'Редактировать Профиль',
+ 'profile_edit_help' => 'Разрешить пользователям редактировать свои профили.',
+ 'default_avatar' => 'Загрузить аватар по умолчанию',
+ 'default_avatar_help' => 'Это изображение будет отображаться как фото профиля, если у пользователя оно не установлено.',
+ 'restore_default_avatar' => 'Восстановить исходный системный аватар',
'restore_default_avatar_help' => '',
- 'due_checkin_days' => 'Due For Checkin Warning',
- 'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+ 'due_checkin_days' => 'Предупреждение о возврате',
+ 'due_checkin_days_help' => 'Сколько дней до ожидаемого возврата актива должно быть указано на странице «Подлежит возврату»?',
];
diff --git a/resources/lang/ru-RU/admin/settings/message.php b/resources/lang/ru-RU/admin/settings/message.php
index 52f22ec676..4e86e8ce7e 100644
--- a/resources/lang/ru-RU/admin/settings/message.php
+++ b/resources/lang/ru-RU/admin/settings/message.php
@@ -15,7 +15,7 @@ return [
'restore_confirm' => 'Вы уверены, что хотите восстановить базу данных из :filename?'
],
'restore' => [
- 'success' => 'Your system backup has been restored. Please log in again.'
+ 'success' => 'Ваша резервная копия была восстановлена. Пожалуйста, войдите в систему снова.'
],
'purge' => [
'error' => 'Возникла ошибка при попытке очистки. ',
diff --git a/resources/lang/ru-RU/admin/users/message.php b/resources/lang/ru-RU/admin/users/message.php
index 1889feb84c..465e492508 100644
--- a/resources/lang/ru-RU/admin/users/message.php
+++ b/resources/lang/ru-RU/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Вы успешно отклонили актив.',
'bulk_manager_warn' => 'Ваши пользователи были успешно обновлены, однако запись менеджера не была сохранена, потому что выбранный менеджер также присутствовал в редактируемом списке пользователей, и пользователи не могут быть менеджерами самим себе. Пожалуйста выберите ваших пользователей снова, за исключением их менеджера.',
'user_exists' => 'Пользователь уже существует!',
- 'user_not_found' => 'Пользователь не существует.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Поле "Логин" является обязательным',
'user_has_no_assets_assigned' => 'Нет активов закреплённых за этим пользователем.',
'user_password_required' => 'Поле "Пароль" является обязательным.',
@@ -37,22 +37,23 @@ return array(
'update' => 'При изменении пользователя возникла проблема. Пожалуйста попробуйте снова.',
'delete' => 'При удалении пользователя возникла проблема. Пожалуйста попробуйте снова.',
'delete_has_assets' => 'У пользователя есть назначенные ему активы и не может быть удалён.',
- 'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
- 'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
- 'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
- 'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
- 'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+ 'delete_has_assets_var' => 'У этого пользователя все еще есть назначенный актив. Пожалуйста, проверьте его сначала.|Этот пользователь все еще имеет :count назначенных активов. Пожалуйста, проверьте его активы в первую очередь.',
+ 'delete_has_licenses_var' => 'У этого пользователя все еще есть назначенные лицензионные места. Пожалуйста, проверьте их сначала.|У этого пользователя все еще есть назначенные :count лицензионные места. Пожалуйста, проверьте их сначала.',
+ 'delete_has_accessories_var' => 'У этого пользователя все еще есть назначенный аксессуар. Пожалуйста, проверьте его сначала.|У этого пользователя все еще есть назначенные :count аксессуары. Пожалуйста, проверьте его активы сначала.',
+ 'delete_has_locations_var' => 'Этот пользователь все еще управляет местоположением. Сначала выберите другого управляющего.|Этот пользователь все еще управляет :count местоположениями. Сначала выберите другого управляющего.',
+ 'delete_has_users_var' => 'Этот пользователь все еще является руководителем другого пользователя. Сначала выберите другого руководителя для этого пользователя.|Этот пользователь все является руководителем :count пользователей. Сначала выберите для них другого руководителя.',
'unsuspend' => 'При разморозке пользователя возникла проблема. Пожалуйста попробуйте снова.',
'import' => 'При импорте пользователей произошла ошибка. Попробуйте еще раз.',
'asset_already_accepted' => 'Этот актив уже был принят.',
'accept_or_decline' => 'Примите или отклоните актив.',
- 'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+ 'cannot_delete_yourself' => 'Нам было бы очень жаль, если бы вы удалили себя. Пожалуйста, подумайте еще раз.',
'incorrect_user_accepted' => 'Актив, который вы попытались принять, не был записан на вас.',
'ldap_could_not_connect' => 'Не могу подключиться к серверу LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:',
'ldap_could_not_bind' => 'Не могу связаться (bind) с сервером LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера: ',
'ldap_could_not_search' => 'Не могу найти сервер LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:',
'ldap_could_not_get_entries' => 'Не могу загрузить записи с сервера LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:',
'password_ldap' => 'Пароль для этой учетной записи управляется LDAP/Active Directory. Пожалуйста, свяжитесь с департаментом ИТ, чтобы изменить свой пароль. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ru-RU/auth/message.php b/resources/lang/ru-RU/auth/message.php
index b71cf47f8e..1244b0db69 100644
--- a/resources/lang/ru-RU/auth/message.php
+++ b/resources/lang/ru-RU/auth/message.php
@@ -14,8 +14,8 @@ return array(
'success' => 'Вы успешно вошли.',
'code_required' => 'Требуется Двух-Факторный код подтверждения.',
'invalid_code' => 'Недействительный Двух-Факторный код подтверждения.',
- 'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
- 'please_enroll' => 'Please enroll a device in two-factor authentication.',
+ 'enter_two_factor_code' => 'Пожалуйста, введите код двухфакторной аутентификации.',
+ 'please_enroll' => 'Пожалуйста, зарегистрируйте устройство для двухфакторной аутентификации.',
),
'signin' => array(
diff --git a/resources/lang/ru-RU/button.php b/resources/lang/ru-RU/button.php
index 299685d73e..4a43081a3f 100644
--- a/resources/lang/ru-RU/button.php
+++ b/resources/lang/ru-RU/button.php
@@ -7,7 +7,7 @@ return [
'checkin_and_delete' => 'Вернуть все и удалить пользователя',
'delete' => 'Удалить',
'edit' => 'Редактировать',
- 'clone' => 'Clone',
+ 'clone' => 'Клонировать',
'restore' => 'Восстановить',
'remove' => 'Удалить',
'request' => 'Требовать',
@@ -23,12 +23,12 @@ return [
'append' => 'Добавить',
'new' => 'Создать',
'var' => [
- 'clone' => 'Clone :item_type',
- 'edit' => 'Edit :item_type',
- 'delete' => 'Delete :item_type',
- 'restore' => 'Restore :item_type',
- 'create' => 'Create New :item_type',
- 'checkout' => 'Checkout :item_type',
- 'checkin' => 'Checkin :item_type',
+ 'clone' => 'Клонировать :item_type',
+ 'edit' => 'Редактировать :item_type',
+ 'delete' => 'Удалить :item_type',
+ 'restore' => 'Восстановить :item_type',
+ 'create' => 'Создать новый :item_type',
+ 'checkout' => 'Выдать :item_type',
+ 'checkin' => 'Забрать :item_type',
]
];
diff --git a/resources/lang/ru-RU/general.php b/resources/lang/ru-RU/general.php
index edbf7db85c..507d00c4d1 100644
--- a/resources/lang/ru-RU/general.php
+++ b/resources/lang/ru-RU/general.php
@@ -77,7 +77,7 @@ return [
'consumables' => 'Расходные материалы',
'country' => 'Страна',
'could_not_restore' => 'Ошибка восстановления :item_type: :error',
- 'not_deleted' => 'The :item_type was not deleted and therefore cannot be restored',
+ 'not_deleted' => ':item_type не был удален и поэтому не может быть восстановлен',
'create' => 'Создать нового',
'created' => 'Элемент создан',
'created_asset' => 'Создать актив',
@@ -98,7 +98,7 @@ return [
'debug_warning_text' => 'Это приложение выполняется в режиме с включенной отладкой. Это может нарушить конфиденциальность данных, если приложение доступно для внешнего мира. Отключите режим отладки, поменяв значение APP_DEBUG в файле .env на false.',
'delete' => 'Удалить',
'delete_confirm' => 'Вы действительно хотите удалить?',
- 'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+ 'delete_confirm_no_undo' => 'Вы уверены, что хотите удалить :item? Это действие нельзя отменить.',
'deleted' => 'Удалено',
'delete_seats' => 'Удаленные лицензии',
'deletion_failed' => 'Не удалось удалить',
@@ -134,7 +134,7 @@ return [
'lastname_firstinitial' => 'Фамилия Первая буква имени (ivanov_i@example.com)',
'firstinitial.lastname' => 'Первая буква имени и фамилия (i.ivanov@example.com)',
'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
- 'lastnamefirstname' => 'Last Name.First Name (smith.jane@example.com)',
+ 'lastnamefirstname' => 'Фамилия.Имя (smith.jane@example.com)',
'first_name' => 'Имя',
'first_name_format' => 'Имя (jane@example.com)',
'files' => 'Файлы',
@@ -156,9 +156,9 @@ return [
'image_delete' => 'Удалить изображение',
'include_deleted' => 'Включать удаленные активы',
'image_upload' => 'Загрузить изображение',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
- 'filetypes_size_help' => 'The maximum upload size allowed is :size.',
- 'image_filetypes_help' => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+ 'filetypes_accepted_help' => 'Принимаемый тип файлов :types. Максимальный допустимый размер - :size.|Принимаемые типы файлов - :types. Максимальный допустимый размер загружаемых файлов - :size.',
+ 'filetypes_size_help' => 'Максимальный допустимый размер загружаемых файлов: size.',
+ 'image_filetypes_help' => 'Допустимые типы файлов - pg, webp, png, gif, и svg. Максимальный размер файла :size.',
'unaccepted_image_type' => 'Нечитаемый файл изображения. Допустимые типы файлов: jpg, webp, png, gif и svg. Медиа тип этого файла: :mimetype.',
'import' => 'Импорт',
'import_this_file' => 'Сопоставить поля и обработать этот файл',
@@ -183,7 +183,7 @@ return [
'licenses_available' => 'Доступные лицензии',
'licenses' => 'Лицензии',
'list_all' => 'Весь список',
- 'loading' => 'Loading... please wait...',
+ 'loading' => 'Загрузка... пожалуйста, подождите...',
'lock_passwords' => 'Это значение не будет сохранено в демо-версии.',
'feature_disabled' => 'Функция отключена в этой версии.',
'location' => 'Расположение',
@@ -193,7 +193,7 @@ return [
'logout' => 'Выйти',
'lookup_by_tag' => 'Поиск по тегу актива',
'maintenances' => 'Техобслуживание',
- 'manage_api_keys' => 'Manage API keys',
+ 'manage_api_keys' => 'Управление ключами API',
'manufacturer' => 'Производитель',
'manufacturers' => 'Производители',
'markdown' => 'облегченный язык разметки.',
@@ -206,8 +206,8 @@ return [
'new_password' => 'Новый пароль',
'next' => 'Далее',
'next_audit_date' => 'Следующая дата аудита',
- 'next_audit_date_help' => 'If you use auditing in your organization, this is usually automatically calculated based on the asset's last audit date and audit frequency (in Admin Settings > Alerts) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
- 'audit_images_help' => 'You can find audit images in the asset\'s history tab.',
+ 'next_audit_date_help' => 'Если Вы используете аудит в вашей организации, обычно значение вычисляется автоматически на основе даты последнего аудита актива' и частоты аудита (в Настройках Администратора > Предупреждения). Вы можете оставить это поле пустым. Если Вам нужно, Вы можете установить эту дату, но она должна быть позже последней даты аудита. ',
+ 'audit_images_help' => 'Вы можете найти изображения аудита на вкладке «История активов».',
'no_email' => 'Нет адреса электронной почты, связанные с этим пользователем',
'last_audit' => 'Последний аудит',
'new' => 'новое!',
@@ -240,13 +240,13 @@ return [
'restored' => 'восстановлено',
'restore' => 'Восстановить',
'requestable_models' => 'Запрашиваемые модели',
- 'requestable_items' => 'Requestable Items',
+ 'requestable_items' => 'Запрашиваемые элементы',
'requested' => 'Запрошено',
'requested_date' => 'Запрашиваемая дата',
'requested_assets' => 'Запрашиваемые активы',
'requested_assets_menu' => 'Запрошенные активы',
'request_canceled' => 'Запрос отменен',
- 'request_item' => 'Request this item',
+ 'request_item' => 'Запросить этот элемент',
'external_link_tooltip' => 'Внешняя ссылка на',
'save' => 'Сохранить',
'select_var' => 'Выберите :thing... ', // this will eventually replace all of our other selects
@@ -254,7 +254,7 @@ return [
'select_all' => 'Выбрать все',
'search' => 'Поиск',
'select_category' => 'Выберите категорию',
- 'select_datasource' => 'Select a data source',
+ 'select_datasource' => 'Выберите источник данных',
'select_department' => 'Выбрать департамент',
'select_depreciation' => 'Выберите тип амортизации',
'select_location' => 'Выберите местоположение',
@@ -274,12 +274,12 @@ return [
'signed_off_by' => 'Подписано:',
'skin' => 'Оформление',
'webhook_msg_note' => 'Уведомление будет отправлено через webhook',
- 'webhook_test_msg' => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+ 'webhook_test_msg' => 'О, привет! Похоже, что ваша интеграция :app с Snipe-IT работает!',
'some_features_disabled' => 'ДЕМО РЕЖИМ: Некоторые функции отключены.',
'site_name' => 'Название сайта',
'state' => 'Область/Регион',
'status_labels' => 'Этикетки',
- 'status_label' => 'Status Label',
+ 'status_label' => 'Метки статуса',
'status' => 'Статус',
'accept_eula' => 'Соглашение о приемке',
'supplier' => 'Поставщик',
@@ -305,7 +305,7 @@ return [
'user' => 'Пользователь',
'accepted' => 'принято',
'declined' => 'отменено',
- 'declined_note' => 'Declined Notes',
+ 'declined_note' => 'Отклоненные заметки',
'unassigned' => 'Не назначено',
'unaccepted_asset_report' => 'Непринятые активы',
'users' => 'Пользователи',
@@ -340,16 +340,16 @@ return [
'view_all' => 'просмотреть все',
'hide_deleted' => 'Скрыть удаленное',
'email' => 'Email',
- 'do_not_change' => 'Do not change',
- 'bug_report' => 'Report a bug',
+ 'do_not_change' => 'Не изменять',
+ 'bug_report' => 'Сообщить об ошибке',
'user_manual' => 'Руководство пользователя',
'setup_step_1' => 'Шаг 1',
'setup_step_2' => 'Шаг 2',
'setup_step_3' => 'Шаг 3',
'setup_step_4' => 'Шаг 4',
'setup_config_check' => 'Проверка конфигурации',
- 'setup_create_database' => 'Create database tables',
- 'setup_create_admin' => 'Create an admin user',
+ 'setup_create_database' => 'Создание таблиц базы данных',
+ 'setup_create_admin' => 'Создать пользователя с привилегиями администратора',
'setup_done' => 'Готово!',
'bulk_edit_about_to' => 'Вы собираетесь изменить следующее: ',
'checked_out' => 'Выдано',
@@ -406,9 +406,9 @@ return [
'accessory_name' => 'Название аксессуара:',
'clone_item' => 'Клонировать позицию',
'checkout_tooltip' => 'Выдать этот элемент',
- 'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+ 'checkin_tooltip' => 'Пометить этот элемент, чтобы он был доступен для повторного использования, повторного отображения и т.д.',
'checkout_user_tooltip' => 'Выдать эту единицу пользователю',
- 'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+ 'checkin_to_diff_location' => 'Вы можете забрать этот актив в расположение, отличное от указанного для актива по умолчанию :default_location, если оно задано',
'maintenance_mode' => 'Служба временно недоступна для системных обновлений. Пожалуйста, проверьте позже.',
'maintenance_mode_title' => 'Система временно недоступна',
'ldap_import' => 'Пароль пользователя не должен управляться LDAP. (Это позволяет отправлять ссылку на сброс забытого пароля.)',
@@ -419,14 +419,14 @@ return [
'bulk_soft_delete' =>'Также безопасно удалите этих пользователей. Их история активов останется неизменной до тех пор, пока вы не очистите записи в настройках администратора.',
'bulk_checkin_delete_success' => 'Выбранные пользователи были удалены, а их активы перенесены.',
'bulk_checkin_success' => 'Элементы для выбранных пользователей были получены.',
- 'set_to_null' => 'Удалить значения для этого актива|Удалить значения для всех :asset_count активов ',
+ 'set_to_null' => 'Удалить значения для выбранного элемента|Удалить значения для всех :selection_count выбранных элементов ',
'set_users_field_to_null' => 'Удалить значения поля :field этого пользователя|Удалить значения поля :field для всех :user_count пользователей ',
'na_no_purchase_date' => 'N/A - Дата покупки не указана',
'assets_by_status' => 'Активы по статусу',
'assets_by_status_type' => 'Активы по типу статуса',
'pie_chart_type' => 'Тип диаграммы Pie в Дашборде',
'hello_name' => 'Добро пожаловать, :name!',
- 'unaccepted_profile_warning' => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+ 'unaccepted_profile_warning' => 'У вас есть один элемент, требующий подтверждения. Нажмите здесь, чтобы принять или отклонить его | У вас есть :count элементов требующих принятия. Нажмите здесь, чтобы принять или отклонить их',
'start_date' => 'Дата начала',
'end_date' => 'Дата окончания',
'alt_uploaded_image_thumbnail' => 'Загруженная миниатюра',
@@ -509,8 +509,8 @@ return [
'address2' => 'Адрес, строка 2',
'import_note' => 'Импортировано с помощью csv импортера',
],
- 'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
- 'checked_out_to_fields' => 'Checked Out To Fields',
+ 'remove_customfield_association' => 'Удалить это поле из набора полей. Это не удалит пользовательское поле, только связь поля с этим набором.',
+ 'checked_out_to_fields' => 'Перемещено в Поля',
'percent_complete' => '% завершено',
'uploading' => 'Загрузка... ',
'upload_error' => 'Ошибка загрузки файла. Пожалуйста, проверьте, что нет пустых строк и нет повторяющихся названий столбцов.',
@@ -529,7 +529,7 @@ return [
'permission_denied_superuser_demo' => 'В разрешении отказано. Вы не можете обновить информацию пользователя для суперадминов в демо.',
'pwd_reset_not_sent' => 'Пользователь не активирован, синхронизирован LDAP или не имеет адреса электронной почты',
'error_sending_email' => 'Ошибка при отправке письма',
- 'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe return to the dashboard, or contact your administrator.',
+ 'sad_panda' => 'Грустная панда. Вы не авторизованы, чтобы выполнить данную операцию. Может быть, вернитесь на Дашбордили обратитесь к администратору.',
'bulk' => [
'delete' =>
[
@@ -552,15 +552,15 @@ return [
'components' => ':count компонент|:count компонентов',
],
'more_info' => 'Подробнее',
- 'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
- 'whoops' => 'Whoops!',
- 'something_went_wrong' => 'Something went wrong with your request.',
- 'close' => 'Close',
+ 'quickscan_bulk_help' => 'Установка этого флажка приведет к изменению записи об активе с учетом нового местоположения. Если флажок не установлен, то местоположение будет просто отмечено в журнале аудита. Обратите внимание, что если этот актив выписан, то он не изменит местоположение человека, актива или места, на которое он выписан.',
+ 'whoops' => 'Упс!',
+ 'something_went_wrong' => 'Что-то пошло не так с вашим запросом.',
+ 'close' => 'Закрыть',
'expires' => 'Истекает',
- 'map_fields'=> 'Map :item_type Field',
- 'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
- 'label' => 'Label',
- 'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'map_fields'=> 'Сопоставьте поле :item_type',
+ 'remaining_var' => ':count Осталось',
+ 'label' => 'Метка',
+ 'import_asset_tag_exists' => 'Актив с тегом актива :asset_tag уже существует и обновление не было запрошено. Изменения не были произведены.',
+ 'countries_manually_entered_help' => 'Значения со звездочкой (*) были введены вручную и не соответствуют существующим значениям выпадающего списка ISO 3166',
];
diff --git a/resources/lang/ru-RU/localizations.php b/resources/lang/ru-RU/localizations.php
index 1c5963b36d..4d6d6b7a9d 100644
--- a/resources/lang/ru-RU/localizations.php
+++ b/resources/lang/ru-RU/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Выберите язык',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Английский, США',
'en-GB'=> 'Английский, Великобритания',
@@ -41,7 +41,7 @@ return [
'mi-NZ'=> 'Маори',
'mn-MN'=> 'Монгольский',
//'no-NO'=> 'Norwegian',
- 'nb-NO'=> 'Norwegian Bokmål',
+ 'nb-NO'=> 'Норвежский Букмол',
//'nn-NO'=> 'Norwegian Nynorsk',
'fa-IR'=> 'Персидский',
'pl-PL'=> 'Польский',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Зулу',
],
- 'select_country' => 'Выберите страну',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Остров Вознесения',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Эстония',
'EG'=>'Египет',
+ 'GB-ENG'=>'Англия',
'ER'=>'Эритрея',
'ES'=>'Испания',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Нидерланды',
+ 'GB-NIR' => 'Северная Ирландия',
'NO'=>'Норвегия',
'NP'=>'Непал',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Российская Федерация',
'RW'=>'Руанда',
'SA'=>'Саудовская Аравия',
- 'UK'=>'Шотландия',
+ 'GB-SCT'=>'Шотландия',
'SB'=>'Соломоновы острова',
'SC'=>'Сейшелы',
'SS'=>'Южный Судан',
@@ -312,6 +314,7 @@ return [
'VI'=>'Виргинские острова (США)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Уэльс',
'WF'=>'Уоллис и Футуна',
'WS'=>'Samoa',
'YE'=>'Йемен',
diff --git a/resources/lang/ru-RU/mail.php b/resources/lang/ru-RU/mail.php
index 33efa43533..e62c832e5c 100644
--- a/resources/lang/ru-RU/mail.php
+++ b/resources/lang/ru-RU/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Пользователь запросил элемент на веб-сайте',
'acceptance_asset_accepted' => 'Пользователь принял элемент',
'acceptance_asset_declined' => 'Пользователь отклонил элемент',
- 'accessory_name' => 'Аксессуар:',
- 'additional_notes' => 'Дополнительные Примечания:',
+ 'accessory_name' => 'Имя аксессуара',
+ 'additional_notes' => 'Дополнительные Примечания',
'admin_has_created' => 'Администратор создал аккаунт для вас на :web.',
- 'asset' => 'Актив:',
- 'asset_name' => 'Имя актива:',
+ 'asset' => 'Актив',
+ 'asset_name' => 'Имя актива',
'asset_requested' => 'Актив запрошен',
'asset_tag' => 'Тег актива',
'assets_warrantee_alert' => 'Имеется :count актив, гарантия на который истечет в следующ(ие/ий) :threshold дней/день.|Имеется :count активов, гарантия на которые истечет в следующ(ие/ий) :threshold дней/день.',
'assigned_to' => 'Выдано',
'best_regards' => 'С наилучшими пожеланиями,',
- 'canceled' => 'Отменен:',
- 'checkin_date' => 'Дата возврата:',
- 'checkout_date' => 'Дата выдачи:',
+ 'canceled' => 'Отменен',
+ 'checkin_date' => 'Дата возврата',
+ 'checkout_date' => 'Дата привязки',
'checkedout_from' => 'Отключено от',
'checkedin_from' => 'Возврат из',
'checked_into' => 'Выдано',
@@ -49,14 +49,14 @@ return [
'click_to_confirm' => 'Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш :web аккаунт:',
'current_QTY' => 'Текущее количество',
'days' => 'Дни',
- 'expecting_checkin_date' => 'Ожидаемая дата возврата:',
+ 'expecting_checkin_date' => 'Ожидаемая дата возврата',
'expires' => 'Истекает',
'hello' => 'Привет',
'hi' => 'Привет',
'i_have_read' => 'Я прочитал и согласен с условиями использования, и получил этот предмет.',
'inventory_report' => 'Отчет о запасах',
- 'item' => 'Предмет:',
- 'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+ 'item' => 'Предмет',
+ 'item_checked_reminder' => 'Напоминание о том, что в настоящее время у вас есть :count предметов, выданных вам, которые вы не приняли. Пожалуйста, нажмите на ссылку ниже, чтобы принять решение.',
'license_expiring_alert' => 'Имеется :count лицензия, срок которой истечет в следующ(ие/ий) :threshold дней/день.|Имеются :count лицензии, срок которых истечет в следующ(ие/ий) :threshold дней/день.',
'link_to_update_password' => 'Пожалуйста, перейдите по ссылке, чтобы обновить ваш :web пароль:',
'login' => 'Логин:',
@@ -66,11 +66,11 @@ return [
'name' => 'Название',
'new_item_checked' => 'Новый предмет был выдан под вашем именем, подробности ниже.',
'notes' => 'Заметки',
- 'password' => 'Пароль:',
+ 'password' => 'Пароль',
'password_reset' => 'Сброс пароля',
'read_the_terms' => 'Пожалуйста, прочитайте условия использования ниже.',
'read_the_terms_and_click' => 'Пожалуйста, ознакомьтесь с нижеприведёнными условиями использования ПО и нажмите на ссылку внизу, чтобы подтвердить, что и соглашаетесь с условиями использования и получили актив.',
- 'requested' => 'Запрошено:',
+ 'requested' => 'Запрошено',
'reset_link' => 'Ваша ссылка на сброс пароля',
'reset_password' => 'Нажмите здесь, чтобы сбросить свой пароль:',
'rights_reserved' => 'Все права защищены.',
@@ -87,10 +87,10 @@ return [
'upcoming-audits' => ':count активов запланированы для аудита в течение :threshold дней.| :count активов будут запланированы для аудита через :threshold дней.',
'user' => 'Пользователь',
'username' => 'Имя пользователя',
- 'unaccepted_asset_reminder' => 'You have Unaccepted Assets.',
+ 'unaccepted_asset_reminder' => 'У вас есть непринятые активы.',
'welcome' => 'Добро пожаловать, :name',
'welcome_to' => 'Добро пожаловать на :web!',
'your_assets' => 'Посмотреть активы',
'your_credentials' => 'Ваш логин и пароль от Snipe-IT',
- 'mail_sent' => 'Mail sent successfully!',
+ 'mail_sent' => 'Письмо успешно отправлено!',
];
diff --git a/resources/lang/ru-RU/table.php b/resources/lang/ru-RU/table.php
index 9566f58598..986073f166 100644
--- a/resources/lang/ru-RU/table.php
+++ b/resources/lang/ru-RU/table.php
@@ -6,6 +6,6 @@ return array(
'action' => 'Действие',
'by' => 'Кем',
'item' => 'Предмет',
- 'no_matching_records' => 'No matching records found',
+ 'no_matching_records' => 'Подходящие записи не найдены',
);
diff --git a/resources/lang/ru-RU/validation.php b/resources/lang/ru-RU/validation.php
index 44e0e2c220..744aab1910 100644
--- a/resources/lang/ru-RU/validation.php
+++ b/resources/lang/ru-RU/validation.php
@@ -13,148 +13,148 @@ return [
|
*/
- 'accepted' => 'The :attribute field must be accepted.',
- 'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
- 'active_url' => 'The :attribute field must be a valid URL.',
- 'after' => 'The :attribute field must be a date after :date.',
- 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
- 'alpha' => 'The :attribute field must only contain letters.',
- 'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
- 'alpha_num' => 'The :attribute field must only contain letters and numbers.',
- 'array' => 'The :attribute field must be an array.',
- 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
- 'before' => 'The :attribute field must be a date before :date.',
- 'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+ 'accepted' => 'Поле :attribute должно быть принято.',
+ 'accepted_if' => 'Поле :attribute должно быть принято, когда :other равно :value.',
+ 'active_url' => 'Поле :attribute должно быть действительным URL-адресом.',
+ 'after' => 'Поле :attribute должно содержать дату после :date.',
+ 'after_or_equal' => 'Поле :attribute должно содержать дату, которая позже или равна :date.',
+ 'alpha' => 'Поле :attribute должно содержать только буквы.',
+ 'alpha_dash' => 'Поле :attribute должно содержать только буквы, цифры, тире и знаки подчеркивания.',
+ 'alpha_num' => 'Поле :attribute должно содержать только буквы и цифры.',
+ 'array' => 'Поле :attribute должно быть массивом.',
+ 'ascii' => 'Поле :attribute должно содержать только однобайтные буквенно-цифровые символы.',
+ 'before' => 'Поле :attribute должно содержать дату до :date.',
+ 'before_or_equal' => 'Дата в поле :attribute должна быть не позже :date.',
'between' => [
- 'array' => 'The :attribute field must have between :min and :max items.',
- 'file' => 'The :attribute field must be between :min and :max kilobytes.',
- 'numeric' => 'The :attribute field must be between :min and :max.',
- 'string' => 'The :attribute field must be between :min and :max characters.',
+ 'array' => 'Поле :attribute должно быть между :min и :max элементов.',
+ 'file' => 'Поле :attribute должно быть между :min и :max килобайт.',
+ 'numeric' => 'Поле :attribute должно быть между :min и :max.',
+ 'string' => 'Поле :attribute должно содержать от :min до :max символов.',
],
- 'boolean' => 'The :attribute field must be true or false.',
- 'can' => 'The :attribute field contains an unauthorized value.',
- 'confirmed' => 'The :attribute field confirmation does not match.',
- 'contains' => 'The :attribute field is missing a required value.',
- 'current_password' => 'The password is incorrect.',
- 'date' => 'The :attribute field must be a valid date.',
- 'date_equals' => 'The :attribute field must be a date equal to :date.',
- 'date_format' => 'The :attribute field must match the format :format.',
- 'decimal' => 'The :attribute field must have :decimal decimal places.',
- 'declined' => 'The :attribute field must be declined.',
- 'declined_if' => 'The :attribute field must be declined when :other is :value.',
- 'different' => 'The :attribute field and :other must be different.',
- 'digits' => 'The :attribute field must be :digits digits.',
- 'digits_between' => 'The :attribute field must be between :min and :max digits.',
- 'dimensions' => 'The :attribute field has invalid image dimensions.',
+ 'boolean' => 'Поле :attribute должно быть true или false.',
+ 'can' => 'Поле :attribute содержит недопустимое значение.',
+ 'confirmed' => 'Подтверждение поля :attribute не совпадает.',
+ 'contains' => 'В поле :attribute отсутствует обязательное значение.',
+ 'current_password' => 'Неверный пароль.',
+ 'date' => 'Поле :attribute должно содержать допустимую дату.',
+ 'date_equals' => 'Поле :attribute должно содержать значение даты :date.',
+ 'date_format' => 'Поле :attribute должно соответствовать формату :format.',
+ 'decimal' => 'Поле :attribute должно иметь :decimal десятичных знаков.',
+ 'declined' => 'Поле :attribute должно быть отклонено.',
+ 'declined_if' => 'Поле :attribute должно быть отклонено, когда :other равно :value.',
+ 'different' => 'Поле :attribute и :other должны различаться.',
+ 'digits' => 'Поле :attribute должно содержать :digits цифр.',
+ 'digits_between' => 'Поле :attribute должно содержать от :min до :max цифр.',
+ 'dimensions' => 'Поле :attribute имеет неверные размеры изображения.',
'distinct' => 'Поле атрибута: имеет двойное значение.',
- 'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
- 'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
- 'email' => 'The :attribute field must be a valid email address.',
- 'ends_with' => 'The :attribute field must end with one of the following: :values.',
+ 'doesnt_end_with' => 'Поле :attribute не должно заканчиваться одним из следующих значений: :values.',
+ 'doesnt_start_with' => 'Поле :attribute не должно начинаться с одного из следующих значений: :values.',
+ 'email' => 'Поле :attribute должно быть действительным адресом электронной почты.',
+ 'ends_with' => 'Поле :attribute должно заканчиваться одним из следующих значений: :values.',
'enum' => 'Выбранный :attribute неправильный.',
'exists' => 'Выбранный :attribute неправильный.',
- 'extensions' => 'The :attribute field must have one of the following extensions: :values.',
- 'file' => 'The :attribute field must be a file.',
+ 'extensions' => 'Поле :attribute должно иметь одно из следующих расширений: :values.',
+ 'file' => 'Поле :attribute должно быть файлом.',
'filled' => 'Поле атрибута: должно иметь значение.',
'gt' => [
- 'array' => 'The :attribute field must have more than :value items.',
- 'file' => 'The :attribute field must be greater than :value kilobytes.',
- 'numeric' => 'The :attribute field must be greater than :value.',
- 'string' => 'The :attribute field must be greater than :value characters.',
+ 'array' => 'Поле :attribute должно иметь более :value элементов.',
+ 'file' => 'Поле :attribute должно быть больше :value килобайт.',
+ 'numeric' => 'Поле :attribute должно быть больше :value.',
+ 'string' => 'Поле :attribute должно содержать более :value символов.',
],
'gte' => [
- 'array' => 'The :attribute field must have :value items or more.',
- 'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
- 'numeric' => 'The :attribute field must be greater than or equal to :value.',
- 'string' => 'The :attribute field must be greater than or equal to :value characters.',
+ 'array' => 'Поле :attribute должно иметь :value или более элементов.',
+ 'file' => 'Поле :attribute должно быть больше или равно :value килобайт.',
+ 'numeric' => 'Поле :attribute должно быть больше или равно :value.',
+ 'string' => 'Поле :attribute должно содержать :value и более символов.',
],
- 'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
- 'image' => 'The :attribute field must be an image.',
+ 'hex_color' => 'Поле :attribute должно быть допустимым шестнадцатеричным цветом.',
+ 'image' => 'Поле :attribute должно быть изображением.',
'import_field_empty' => 'Значение :fieldname не может быть пустым.',
'in' => 'Выбранный :attribute неправильный.',
- 'in_array' => 'The :attribute field must exist in :other.',
- 'integer' => 'The :attribute field must be an integer.',
- 'ip' => 'The :attribute field must be a valid IP address.',
- 'ipv4' => 'The :attribute field must be a valid IPv4 address.',
- 'ipv6' => 'The :attribute field must be a valid IPv6 address.',
- 'json' => 'The :attribute field must be a valid JSON string.',
- 'list' => 'The :attribute field must be a list.',
- 'lowercase' => 'The :attribute field must be lowercase.',
+ 'in_array' => 'Поле :attribute должно существовать в :other.',
+ 'integer' => 'Поле :attribute должно быть целым числом.',
+ 'ip' => 'Поле :attribute должно быть действительным IP-адресом.',
+ 'ipv4' => 'Поле :attribute должно быть допустимым IPv4 адресом.',
+ 'ipv6' => 'Поле :attribute должно быть допустимым IPv6 адресом.',
+ 'json' => 'Поле :attribute должно быть действительной строкой JSON.',
+ 'list' => 'Поле :attribute должно быть списком.',
+ 'lowercase' => 'Поле :attribute должно быть указано строчными буквами.',
'lt' => [
- 'array' => 'The :attribute field must have less than :value items.',
- 'file' => 'The :attribute field must be less than :value kilobytes.',
- 'numeric' => 'The :attribute field must be less than :value.',
- 'string' => 'The :attribute field must be less than :value characters.',
+ 'array' => 'Поле :attribute должно иметь менее :value элементов.',
+ 'file' => 'Поле :attribute должно быть меньше :value килобайт.',
+ 'numeric' => 'Поле :attribute должно быть меньше :value.',
+ 'string' => 'Поле :attribute должно содержать менее :value символов.',
],
'lte' => [
- 'array' => 'The :attribute field must not have more than :value items.',
- 'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
- 'numeric' => 'The :attribute field must be less than or equal to :value.',
- 'string' => 'The :attribute field must be less than or equal to :value characters.',
+ 'array' => 'Поле :attribute не должно содержать более :value элементов.',
+ 'file' => 'Поле :attribute должно быть меньше или равно :value килобайт.',
+ 'numeric' => 'Поле :attribute должно быть меньше или равно :value.',
+ 'string' => 'Поле :attribute должно содержать :value или менее символов.',
],
- 'mac_address' => 'The :attribute field must be a valid MAC address.',
+ 'mac_address' => 'Поле :attribute должно быть действительным MAC-адресом.',
'max' => [
- 'array' => 'The :attribute field must not have more than :max items.',
- 'file' => 'The :attribute field must not be greater than :max kilobytes.',
- 'numeric' => 'The :attribute field must not be greater than :max.',
- 'string' => 'The :attribute field must not be greater than :max characters.',
+ 'array' => 'Поле :attribute не должно содержать более :value элементов.',
+ 'file' => 'Поле :attribute не должно быть больше :max килобайт.',
+ 'numeric' => 'Поле :attribute не должно быть больше :max.',
+ 'string' => 'Поле :attribute должно быть не длиннее :max символов.',
],
- 'max_digits' => 'The :attribute field must not have more than :max digits.',
- 'mimes' => 'The :attribute field must be a file of type: :values.',
- 'mimetypes' => 'The :attribute field must be a file of type: :values.',
+ 'max_digits' => 'Поле :attribute должно содержать не более :max цифр.',
+ 'mimes' => 'Поле :attribute должно быть файлом типа: :values.',
+ 'mimetypes' => 'Поле :attribute должно быть файлом типа: :values.',
'min' => [
- 'array' => 'The :attribute field must have at least :min items.',
- 'file' => 'The :attribute field must be at least :min kilobytes.',
- 'numeric' => 'The :attribute field must be at least :min.',
- 'string' => 'The :attribute field must be at least :min characters.',
+ 'array' => 'Поле :attribute должно содержать не менее :min элементов.',
+ 'file' => 'Поле :attribute должно быть не менее :min килобайт.',
+ 'numeric' => 'Поле :attribute должно быть не менее :min.',
+ 'string' => 'Поле :attribute должно содержать не менее :min символов.',
],
- 'min_digits' => 'The :attribute field must have at least :min digits.',
- 'missing' => 'The :attribute field must be missing.',
- 'missing_if' => 'The :attribute field must be missing when :other is :value.',
- 'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
- 'missing_with' => 'The :attribute field must be missing when :values is present.',
- 'missing_with_all' => 'The :attribute field must be missing when :values are present.',
- 'multiple_of' => 'The :attribute field must be a multiple of :value.',
+ 'min_digits' => 'Поле :attribute должно содержать не менее :min цифр.',
+ 'missing' => 'Поле :attribute должно отсутствовать.',
+ 'missing_if' => 'Поле :attribute должно быть пропущено, когда :other равно :value.',
+ 'missing_unless' => 'Поле :attribute должно отсутствовать, если только :other не равно :value.',
+ 'missing_with' => 'Поле :attribute должно быть пропущено, если присутствует :values.',
+ 'missing_with_all' => 'Поле :attribute должно быть пропущено, если присутствуют :values.',
+ 'multiple_of' => 'Поле :attribute должно быть кратно :value.',
'not_in' => 'Выбранный :attribute неправильный.',
- 'not_regex' => 'The :attribute field format is invalid.',
- 'numeric' => 'The :attribute field must be a number.',
+ 'not_regex' => 'Поле :attribute имеет неверный формат.',
+ 'numeric' => 'Поле :attribute должно быть числом.',
'password' => [
- 'letters' => 'The :attribute field must contain at least one letter.',
- 'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
- 'numbers' => 'The :attribute field must contain at least one number.',
- 'symbols' => 'The :attribute field must contain at least one symbol.',
- 'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+ 'letters' => 'Поле :attribute должно содержать хотя бы одну букву.',
+ 'mixed' => 'Поле :attribute должно содержать хотя бы одну заглавную букву и одну строчную букву.',
+ 'numbers' => 'Поле :attribute должно содержать хотя бы одно число.',
+ 'symbols' => 'Поле :attribute должно содержать хотя бы один символ.',
+ 'uncompromised' => 'Данный :attribute появился при утечке данных. Пожалуйста, выберите другой :attribute.',
],
- 'percent' => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+ 'percent' => 'Минимальная амортизация должна быть в пределах от 0 до 100, если тип амортизации — процентный.',
'present' => 'Поле атрибута: должно присутствовать.',
- 'present_if' => 'The :attribute field must be present when :other is :value.',
- 'present_unless' => 'The :attribute field must be present unless :other is :value.',
- 'present_with' => 'The :attribute field must be present when :values is present.',
- 'present_with_all' => 'The :attribute field must be present when :values are present.',
- 'prohibited' => 'The :attribute field is prohibited.',
- 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
- 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
- 'prohibits' => 'The :attribute field prohibits :other from being present.',
- 'regex' => 'The :attribute field format is invalid.',
+ 'present_if' => 'Поле :attribute должно присутствовать, когда :other равно :value.',
+ 'present_unless' => 'Поле :attribute должно присутствовать, если только :other не равно :value.',
+ 'present_with' => 'Поле :attribute должно присутствовать, если присутствует :values.',
+ 'present_with_all' => 'Поле :attribute должно присутствовать при наличии :values.',
+ 'prohibited' => 'Поле :attribute запрещено.',
+ 'prohibited_if' => 'Поле :attribute запрещено если :other равно :value.',
+ 'prohibited_unless' => 'Поле :attribute запрещено, если :other не находится в :values.',
+ 'prohibits' => 'Поле :attribute запрещает присутствие :other.',
+ 'regex' => 'Поле :attribute имеет неверный формат.',
'required' => ':attribute обязательное поле.',
- 'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+ 'required_array_keys' => 'Поле :attribute должно содержать записи для: :values.',
'required_if' => ':attribute обязательное поле, когда :other :value.',
- 'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
- 'required_if_declined' => 'The :attribute field is required when :other is declined.',
+ 'required_if_accepted' => 'Поле :attribute является обязательным, если :other принят.',
+ 'required_if_declined' => 'Поле :attribute является обязательным, если :other отклонено.',
'required_unless' => 'Поле атрибута: требуется, если: other находится в: значения.',
'required_with' => ':attribute обязательное поле, когда присутствует :values.',
- 'required_with_all' => 'The :attribute field is required when :values are present.',
+ 'required_with_all' => 'Поле :attribute является обязательным, если присутствуют :values.',
'required_without' => ':attribute обязательное поле, когда отсутствует :values.',
'required_without_all' => 'Поле атрибута: требуется, если ни один из: значений не присутствует.',
- 'same' => 'The :attribute field must match :other.',
+ 'same' => 'Поле :attribute должно соответствовать :other.',
'size' => [
- 'array' => 'The :attribute field must contain :size items.',
- 'file' => 'The :attribute field must be :size kilobytes.',
- 'numeric' => 'The :attribute field must be :size.',
- 'string' => 'The :attribute field must be :size characters.',
+ 'array' => 'Поле :attribute должно содержать :size элементов.',
+ 'file' => 'Поле :attribute должно быть :size килобайт.',
+ 'numeric' => 'Поле :attribute должно быть :size.',
+ 'string' => 'Поле :attribute должно содержать :size символов.',
],
- 'starts_with' => 'The :attribute field must start with one of the following: :values.',
+ 'starts_with' => 'Поле :attribute должно начинаться с одного из следующих значений: :values.',
'string' => 'Атрибут: должен быть строкой.',
'two_column_unique_undeleted' => 'Поле :attribute должно быть уникальным для :table1 и :table2. ',
'unique_undeleted' => 'Свойство :attribute должно быть уникальным.',
@@ -165,13 +165,13 @@ return [
'numbers' => 'Пароль должен содержать хотя бы одну цифру.',
'case_diff' => 'Пароль должен использовать смешанный регистр.',
'symbols' => 'Пароль должен содержать символы.',
- 'timezone' => 'The :attribute field must be a valid timezone.',
+ 'timezone' => 'Поле :attribute должно содержать действительный часовой пояс.',
'unique' => ':attribute уже занят.',
'uploaded' => 'Атрибут: не удалось загрузить.',
- 'uppercase' => 'The :attribute field must be uppercase.',
- 'url' => 'The :attribute field must be a valid URL.',
- 'ulid' => 'The :attribute field must be a valid ULID.',
- 'uuid' => 'The :attribute field must be a valid UUID.',
+ 'uppercase' => 'Поле :attribute должно быть указано заглавными буквами.',
+ 'url' => 'Поле :attribute должно быть действительным URL-адресом.',
+ 'ulid' => 'Поле :attribute должно быть корректным значением UUID.',
+ 'uuid' => 'Поле :attribute должно быть корректным значением UUID.',
/*
|--------------------------------------------------------------------------
@@ -190,8 +190,8 @@ return [
'hashed_pass' => 'Ваш текущий пароль неверен',
'dumbpwd' => 'Этот пароль слишком распространен.',
'statuslabel_type' => 'Вы должны выбрать допустимый тип метки статуса',
- 'custom_field_not_found' => 'This field does not seem to exist, please double check your custom field names.',
- 'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+ 'custom_field_not_found' => 'Похоже, это поле не существует. Пожалуйста, проверьте еще раз имена ваших пользовательских полей.',
+ 'custom_field_not_found_on_model' => 'Это поле существует, но недоступно в наборе полей этой модели актива.',
// date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
// We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
@@ -229,8 +229,8 @@ return [
'generic' => [
'invalid_value_in_field' => 'Недопустимое значение в этом поле',
- 'required' => 'This field is required',
- 'email' => 'Please enter a valid email address',
+ 'required' => 'Это поле является обязательным',
+ 'email' => 'Пожалуйста, введите действительный адрес электронной почты',
],
diff --git a/resources/lang/si-LK/admin/locations/message.php b/resources/lang/si-LK/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/si-LK/admin/locations/message.php
+++ b/resources/lang/si-LK/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/si-LK/admin/settings/general.php b/resources/lang/si-LK/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/si-LK/admin/settings/general.php
+++ b/resources/lang/si-LK/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/si-LK/admin/users/message.php b/resources/lang/si-LK/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/si-LK/admin/users/message.php
+++ b/resources/lang/si-LK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index 70d3ae0961..747651ea7d 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/si-LK/localizations.php b/resources/lang/si-LK/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/si-LK/localizations.php
+++ b/resources/lang/si-LK/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/si-LK/mail.php b/resources/lang/si-LK/mail.php
index 04a26c1768..09fdbcc72f 100644
--- a/resources/lang/si-LK/mail.php
+++ b/resources/lang/si-LK/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'දින',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'සටහන්',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/sk-SK/admin/locations/message.php b/resources/lang/sk-SK/admin/locations/message.php
index 7e76007258..430f2a4482 100644
--- a/resources/lang/sk-SK/admin/locations/message.php
+++ b/resources/lang/sk-SK/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokalita neexistuje.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Táto lokalita je priradená minimálne jednému majetku, preto nemôže byť odstránená. Prosím odstráňte referenciu na túto lokalitu z príslušného majetku a skúste znovu. ',
'assoc_child_loc' => 'Táto lokalita je nadradenou minimálne jednej podradenej lokalite, preto nemôže byť odstránená. Prosím odstráňte referenciu s príslušnej lokality a skúste znovu. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/sk-SK/admin/settings/general.php b/resources/lang/sk-SK/admin/settings/general.php
index 1809cc69b6..dd7e767d29 100644
--- a/resources/lang/sk-SK/admin/settings/general.php
+++ b/resources/lang/sk-SK/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Zálohy',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Obnovenie zo zálohy',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/sk-SK/admin/users/message.php b/resources/lang/sk-SK/admin/users/message.php
index ea9c90bb8c..d5110a642c 100644
--- a/resources/lang/sk-SK/admin/users/message.php
+++ b/resources/lang/sk-SK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Odmietnutie majetku bolo úspešné.',
'bulk_manager_warn' => 'Používatelia boli úspešné aktualizovaný, avčak položka manažér nebola uložená, pretože zvolený manažér sa taktiež nachádzal v zoznam na úpravu a používatel nemôže byť sám sebe manazérom. Prosim zvoľte Vašich používateľov znovu s vynechaním manažéera.',
'user_exists' => 'Používateľ už existuje!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Prihlasovacie meno je povinné',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Heslo je povinné.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nepodarilo sa vyhladať v rámci LDAP serveru. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD a všetky lokality ktoré môžu mať nastavené OU.
Chyba LDAP serveru:',
'ldap_could_not_get_entries' => 'Nepodarilo sa získať záznamy z LDAP servera. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD a všetky lokality ktoré môžu mať nastavené OU.
Chyba LDAP serveru:',
'password_ldap' => 'Heslo pre tento účet je spravované cez LDAP/Active Directory. Pre zmneu hesla prosím kontaktujte Vaše IT oddelenie. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/sk-SK/general.php b/resources/lang/sk-SK/general.php
index 50a3485f9a..e585888765 100644
--- a/resources/lang/sk-SK/general.php
+++ b/resources/lang/sk-SK/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Exspiruje',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/sk-SK/localizations.php b/resources/lang/sk-SK/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/sk-SK/localizations.php
+++ b/resources/lang/sk-SK/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/sk-SK/mail.php b/resources/lang/sk-SK/mail.php
index db926665a8..fef0733887 100644
--- a/resources/lang/sk-SK/mail.php
+++ b/resources/lang/sk-SK/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Názov príslušenstva:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Názov príslušenstva',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Majetok:',
- 'asset_name' => 'Názov assetu/majetku:',
+ 'asset' => 'Majetok',
+ 'asset_name' => 'Názov majetku',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Označenie majetku',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Dátum prijatia:',
- 'checkout_date' => 'Dátum odovzdania:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Dátum prijatia',
+ 'checkout_date' => 'Dátum odovzdania',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Očakávaný dátum prijatia:',
+ 'expecting_checkin_date' => 'Očakávaný dátum prijatia',
'expires' => 'Exspiruje',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Položka:',
+ 'item' => 'Položka',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Názov',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Poznámky',
- 'password' => 'Heslo:',
+ 'password' => 'Heslo',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Vyžiadané:',
+ 'requested' => 'Vyžiadané',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/sl-SI/admin/asset_maintenances/form.php b/resources/lang/sl-SI/admin/asset_maintenances/form.php
index 522c262920..d5b2620bee 100644
--- a/resources/lang/sl-SI/admin/asset_maintenances/form.php
+++ b/resources/lang/sl-SI/admin/asset_maintenances/form.php
@@ -3,7 +3,7 @@
return [
'asset_maintenance_type' => 'Asset Maintenance Type',
'title' => 'Naslov',
- 'start_date' => 'Start Date',
+ 'start_date' => 'Datum začetka',
'completion_date' => 'Completion Date',
'cost' => 'Cena',
'is_warranty' => 'Izboljšanje garancije',
diff --git a/resources/lang/sl-SI/admin/categories/general.php b/resources/lang/sl-SI/admin/categories/general.php
index 94d0916909..eaedce923f 100644
--- a/resources/lang/sl-SI/admin/categories/general.php
+++ b/resources/lang/sl-SI/admin/categories/general.php
@@ -8,8 +8,8 @@ return array(
'clone' => 'Kloniraj Karegorijo',
'create' => 'Ustvari kategorijo',
'edit' => 'Uredi Kategorijo',
- 'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
- 'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+ 'email_will_be_sent_due_to_global_eula' => 'E pošta bo uporabniku poslana ker je v uporabi globalna EULA.',
+ 'email_will_be_sent_due_to_category_eula' => 'E pošta bo bila poslana uporabniku, ker je za to kategorijo v uporabi EULA.',
'eula_text' => 'Kategorija EULA',
'eula_text_help' => 'To polje vam omogoča prilagajanje EULA za določene vrste sredstev. Če imate samo eno EULA za vsa vaša sredstva, lahko potrdite spodnje polje, da uporabite kot privzeto.',
'name' => 'Ime kategorije',
diff --git a/resources/lang/sl-SI/admin/categories/message.php b/resources/lang/sl-SI/admin/categories/message.php
index a9a34d2a95..61981436bb 100644
--- a/resources/lang/sl-SI/admin/categories/message.php
+++ b/resources/lang/sl-SI/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
'update' => array(
'error' => 'Kategorija ni bila posodobljena, poskusite znova',
'success' => 'Kategorija uspešno posodobljena.',
- 'cannot_change_category_type' => 'You cannot change the category type once it has been created',
+ 'cannot_change_category_type' => 'Ne moreš spremeniti tipa kategorije po tem ko je bila kreirana',
),
'delete' => array(
diff --git a/resources/lang/sl-SI/admin/companies/table.php b/resources/lang/sl-SI/admin/companies/table.php
index 5c773973c4..f28188fe08 100644
--- a/resources/lang/sl-SI/admin/companies/table.php
+++ b/resources/lang/sl-SI/admin/companies/table.php
@@ -2,7 +2,7 @@
return array(
'companies' => 'Podjetja',
'create' => 'Ustvari podjetje',
- 'email' => 'Company Email',
+ 'email' => 'E-naslov podjetja',
'title' => 'Podjetje',
'phone' => 'Company Phone',
'update' => 'Posodobi podjetje',
diff --git a/resources/lang/sl-SI/admin/custom_fields/general.php b/resources/lang/sl-SI/admin/custom_fields/general.php
index 6e6ecb074b..8691764ad7 100644
--- a/resources/lang/sl-SI/admin/custom_fields/general.php
+++ b/resources/lang/sl-SI/admin/custom_fields/general.php
@@ -2,11 +2,11 @@
return [
'custom_fields' => 'Polja po meri',
- 'manage' => 'Manage',
+ 'manage' => 'Upravljaj',
'field' => 'Polje',
'about_fieldsets_title' => 'O setih polj',
- 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
- 'custom_format' => 'Custom Regex format...',
+ 'about_fieldsets_text' => 'Seti polj vam omogočajo, da ustvarite skupine polj po meri, ki se pogosto znova uporabijo za določene tipe modelov sredstev.',
+ 'custom_format' => 'Oblika zapisa po meri regex...',
'encrypt_field' => 'Šifriraj vrednost tega polja v bazi podatkov',
'encrypt_field_help' => 'OPOZORILO: Šifriranje polja onemogoča iskanje.',
'encrypted' => 'Šifrirano',
@@ -43,17 +43,17 @@ return [
'add_field_to_fieldset' => 'Add Field to Fieldset',
'make_optional' => 'Required - click to make optional',
'make_required' => 'Optional - click to make required',
- 'reorder' => 'Reorder',
+ 'reorder' => 'Spremeni vrstni red',
'db_field' => 'DB Field',
'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column but should be :expected.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
- 'display_in_user_view_table' => 'Visible to User',
+ 'display_in_user_view_table' => 'Vidno uporabniku',
'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
- 'show_in_listview_short' => 'Show in lists',
+ 'show_in_listview_short' => 'Pokaži v seznamih',
'show_in_requestable_list_short' => 'Show in requestable assets list',
'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
diff --git a/resources/lang/sl-SI/admin/groups/titles.php b/resources/lang/sl-SI/admin/groups/titles.php
index 5af53da68a..dcdf85dad4 100644
--- a/resources/lang/sl-SI/admin/groups/titles.php
+++ b/resources/lang/sl-SI/admin/groups/titles.php
@@ -11,6 +11,6 @@ return [
'allow' => 'Dovoli',
'deny' => 'Zavrni',
'permission' => 'Permission',
- 'grant' => 'Grant',
+ 'grant' => 'Omogoči',
'no_permissions' => 'This group has no permissions.'
];
diff --git a/resources/lang/sl-SI/admin/hardware/form.php b/resources/lang/sl-SI/admin/hardware/form.php
index 2180f99244..13abc4fa5b 100644
--- a/resources/lang/sl-SI/admin/hardware/form.php
+++ b/resources/lang/sl-SI/admin/hardware/form.php
@@ -2,17 +2,17 @@
return [
'bulk_delete' => 'Potrdite množičn izbris sredstev',
- 'bulk_restore' => 'Confirm Bulk Restore Assets',
+ 'bulk_restore' => 'Potrdite množično obnovitev sredstev',
'bulk_delete_help' => 'Pregled sredstev za množično brisanje je v seznamu spodaj. Ko bodo sredstva izbrisana, jih je mogoče obnoviti, vendar ne bodo povezana z nobenimi uporabnikom, kot so jim trenutno dodeljena.',
- 'bulk_restore_help' => 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+ 'bulk_restore_help' => 'Spodaj si oglejte sredstva za obnovo v množičnem stanju. Po obnovitvi ta sredstva ne bodo povezana z nobenim uporabnikom, ki so mu bila prej dodeljena.',
'bulk_delete_warn' => 'Brisali boste: asset_count sredstev.',
- 'bulk_restore_warn' => 'You are about to restore :asset_count assets.',
+ 'bulk_restore_warn' => 'Obnovili boste: asset_count sredstev.',
'bulk_update' => 'Množično posodabljanje sredstev',
'bulk_update_help' => 'Ta obrazec vam omogoča, da posodobite več sredstev hkrati. Izpolnite le polja, ki jih morate spremeniti. Vsa polja, ki ostanejo prazna, bodo ostala nespremenjena. ',
- 'bulk_update_warn' => 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
- 'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
- 'bulk_update_model_prefix' => 'On Models',
- 'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+ 'bulk_update_warn' => 'Urejali boste lastnosti posameznega sredstva.|Urejali boste lastnosti :asset_count sredstev.',
+ 'bulk_update_with_custom_field' => 'Opomnik, da :asset_model_count različni tipi modelov.',
+ 'bulk_update_model_prefix' => 'Na modelih',
+ 'bulk_update_custom_field_unique' => 'To je unikatno polje in ne more biti množično urejeno.',
'checkedout_to' => 'Izdano osebi',
'checkout_date' => 'Datum izdaje',
'checkin_date' => 'Datum sprejema',
@@ -23,7 +23,7 @@ return [
'depreciation' => 'Amortizacija',
'depreciates_on' => 'Amortizacija na',
'default_location' => 'Privzeta lokacija',
- 'default_location_phone' => 'Default Location Phone',
+ 'default_location_phone' => 'Privzeta lokacija telefona',
'eol_date' => 'EOL datum',
'eol_rate' => 'EOL stopnja',
'expected_checkin' => 'Predviden datum dobave',
@@ -39,9 +39,9 @@ return [
'order' => 'Številka naročila',
'qr' => 'QR-koda',
'requestable' => 'Uporabniki lahko zahtevajo to sredstvo',
- 'redirect_to_all' => 'Return to all :type',
- 'redirect_to_type' => 'Go to :type',
- 'redirect_to_checked_out_to' => 'Go to Checked Out to',
+ 'redirect_to_all' => 'Vrni se na vse :tip',
+ 'redirect_to_type' => 'Pojdi na :tip',
+ 'redirect_to_checked_out_to' => 'Pojdite na odjavljeno do',
'select_statustype' => 'Izberite vrsto statusa',
'serial' => 'Serijska številka',
'status' => 'Status',
@@ -50,13 +50,13 @@ return [
'warranty' => 'Garancija',
'warranty_expires' => 'Garancija poteče',
'years' => 'let',
- 'asset_location' => 'Update Asset Location',
- 'asset_location_update_default_current' => 'Update default location AND actual location',
- 'asset_location_update_default' => 'Update only default location',
- 'asset_location_update_actual' => 'Update only actual location',
- 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
- 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
- 'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
- 'optional_infos' => 'Optional Information',
- 'order_details' => 'Order Related Information'
+ 'asset_location' => 'Posodobi lokacijo sredstva',
+ 'asset_location_update_default_current' => 'Posodobi privzeto lokacijo in aktualno lokacijo',
+ 'asset_location_update_default' => 'Posodobi samo privzeto lokacijo',
+ 'asset_location_update_actual' => 'Posodobi samo aktualno lokacijo',
+ 'asset_not_deployable' => 'Tega statusa sredstev ni mogoče uporabiti. Tega sredstva ni mogoče odjaviti.',
+ 'asset_deployable' => 'Ta status se lahko uporabi. To sredstvo je mogoče odjaviti.',
+ 'processing_spinner' => 'Obdelava (pri velikih datotekah lahko traja nekaj časa)',
+ 'optional_infos' => 'Neobvezne informacije',
+ 'order_details' => 'Informacije povezane z naročilom'
];
diff --git a/resources/lang/sl-SI/admin/hardware/general.php b/resources/lang/sl-SI/admin/hardware/general.php
index ffac9330bb..f10fbf8a8c 100644
--- a/resources/lang/sl-SI/admin/hardware/general.php
+++ b/resources/lang/sl-SI/admin/hardware/general.php
@@ -34,10 +34,10 @@ return [
'csv_import_match_first' => 'Try to match users by first name (jane) format',
'csv_import_match_email' => 'Try to match users by email as username',
'csv_import_match_username' => 'Try to match users by username',
- 'error_messages' => 'Error messages:',
- 'success_messages' => 'Success messages:',
- 'alert_details' => 'Please see below for details.',
- 'custom_export' => 'Custom Export',
+ 'error_messages' => 'Sporočila napak:',
+ 'success_messages' => 'Sporočila uspeha:',
+ 'alert_details' => 'Glej dol za detajle.',
+ 'custom_export' => 'Izvoz po meri',
'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
'user_department' => 'User Department',
];
diff --git a/resources/lang/sl-SI/admin/hardware/message.php b/resources/lang/sl-SI/admin/hardware/message.php
index 2b43771bb8..10952eb5c7 100644
--- a/resources/lang/sl-SI/admin/hardware/message.php
+++ b/resources/lang/sl-SI/admin/hardware/message.php
@@ -2,11 +2,11 @@
return [
- 'undeployable' => 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+ 'undeployable' => 'Opozorilo: To sredstvo je bilo označeno kot trenutno nerazdeljeno. Če se je ta status spremenil, posodobite status sredstva.',
'does_not_exist' => 'Sredstvo ne obstaja.',
- 'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
- 'no_tag' => 'No asset tag provided.',
- 'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+ 'does_not_exist_var'=> 'Sredstvo z oznako :oznaka_sredstva ni bilo najdeno.',
+ 'no_tag' => 'Oznaka sredstva ni podana.',
+ 'does_not_exist_or_not_requestable' => 'To sredstvo ne obstaja ali ga ni mogoče zahtevati.',
'assoc_users' => 'To sredstvo je trenutno izdano uporabniku in ga ni mogoče izbrisati. Najprej preverite sredstvo in poskusite znova izbrisati. ',
'warning_audit_date_mismatch' => 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
@@ -21,15 +21,15 @@ return [
'success' => 'Sredstvo je uspešno posodobljeno.',
'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
'nothing_updated' => 'Nobeno polje ni bilo izbrana, zato nebo nič posodobljeno.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
- 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+ 'no_assets_selected' => 'Nobena sredstva niso bila izbrana, zato ni bilo nič izbrisanih.',
+ 'assets_do_not_exist_or_are_invalid' => 'Izbrana sredstva ni mogoče posodobiti.',
],
'restore' => [
'error' => 'Sredstvo ni bilo obnovljeno, poskusite znova',
'success' => 'Sredstvo je bilo uspešno obnovljeno.',
'bulk_success' => 'Sredstvo je bilo uspešno obnovljeno.',
- 'nothing_updated' => 'No assets were selected, so nothing was restored.',
+ 'nothing_updated' => 'Nobeno sredstvo ni bilo izbran, zato nebo nič obnovljeno.',
],
'audit' => [
@@ -57,7 +57,7 @@ return [
'success' => 'Vaša datoteka je bila uvožena',
'file_delete_success' => 'Vaša datoteka je bila uspešno izbrisana',
'file_delete_error' => 'Datoteke ni bilo mogoče izbrisati',
- 'file_missing' => 'The file selected is missing',
+ 'file_missing' => 'Izbrana datoteka manjka',
'file_already_deleted' => 'The file selected was already deleted',
'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
diff --git a/resources/lang/sl-SI/admin/hardware/table.php b/resources/lang/sl-SI/admin/hardware/table.php
index 8739412b90..7e85f453b6 100644
--- a/resources/lang/sl-SI/admin/hardware/table.php
+++ b/resources/lang/sl-SI/admin/hardware/table.php
@@ -5,17 +5,17 @@ return [
'asset_tag' => 'Oznaka sredstva',
'asset_model' => 'Model',
'assigned_to' => 'Dodeljena',
- 'book_value' => 'Current Value',
+ 'book_value' => 'Trenutna vrednost',
'change' => 'Prejeto/Izdano',
'checkout_date' => 'Datum Izdaje',
'checkoutto' => 'Izdano',
- 'components_cost' => 'Total Components Cost',
- 'current_value' => 'Current Value',
+ 'components_cost' => 'Skupna cena komponent',
+ 'current_value' => 'Trenutna vrednost',
'diff' => 'Razlika',
'dl_csv' => 'Prenesi CSV',
'eol' => 'EOL',
'id' => 'ID',
- 'last_checkin_date' => 'Last Checkin Date',
+ 'last_checkin_date' => 'Zadnji datum sprejema',
'location' => 'Lokacija',
'purchase_cost' => 'Cena',
'purchase_date' => 'Kupljeno',
@@ -26,8 +26,8 @@ return [
'days_without_acceptance' => 'Dnevi brez sprejema',
'monthly_depreciation' => 'Mesečna amortizacija',
'assigned_to' => 'Dodeljena',
- 'requesting_user' => 'Requesting User',
- 'requested_date' => 'Requested Date',
- 'changed' => 'Changed',
- 'icon' => 'Icon',
+ 'requesting_user' => 'Uporabnik, ki je vložil zahtevo',
+ 'requested_date' => 'Zahtevan datum',
+ 'changed' => 'Spremenjeno',
+ 'icon' => 'Ikona',
];
diff --git a/resources/lang/sl-SI/admin/labels/message.php b/resources/lang/sl-SI/admin/labels/message.php
index 96785f0754..1f0c0ccdb9 100644
--- a/resources/lang/sl-SI/admin/labels/message.php
+++ b/resources/lang/sl-SI/admin/labels/message.php
@@ -6,6 +6,6 @@ return [
'invalid_return_type' => 'Invalid type returned from :name. Expected :expected, got :actual.',
'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
- 'does_not_exist' => 'Label does not exist',
+ 'does_not_exist' => 'Oznaka ne obstaja',
];
diff --git a/resources/lang/sl-SI/admin/labels/table.php b/resources/lang/sl-SI/admin/labels/table.php
index 184425e95e..e9068ea668 100644
--- a/resources/lang/sl-SI/admin/labels/table.php
+++ b/resources/lang/sl-SI/admin/labels/table.php
@@ -6,10 +6,10 @@ return [
'example_category' => 'Test Category',
'example_location' => 'Building 2',
'example_manufacturer' => 'Test Manufacturing Inc.',
- 'example_model' => 'Test Model',
+ 'example_model' => 'Testiraj model',
'example_supplier' => 'Test Company Limited',
- 'labels_per_page' => 'Labels',
- 'support_fields' => 'Fields',
+ 'labels_per_page' => 'Oznake',
+ 'support_fields' => 'Polja',
'support_asset_tag' => 'Oznaka',
'support_1d_barcode' => '1D',
'support_2d_barcode' => '2D',
diff --git a/resources/lang/sl-SI/admin/licenses/table.php b/resources/lang/sl-SI/admin/licenses/table.php
index f65e454c91..3bf1abe02f 100644
--- a/resources/lang/sl-SI/admin/licenses/table.php
+++ b/resources/lang/sl-SI/admin/licenses/table.php
@@ -4,7 +4,7 @@ return array(
'assigned_to' => 'Dodeljena',
'checkout' => 'Prejeto/Izdano',
- 'deleted_at' => 'Deleted at',
+ 'deleted_at' => 'Izbrisano',
'id' => 'ID',
'license_email' => 'Licenca registrirana na e-pošto',
'license_name' => 'Licencirano na',
diff --git a/resources/lang/sl-SI/admin/locations/message.php b/resources/lang/sl-SI/admin/locations/message.php
index 670f3ad7aa..acd16a2394 100644
--- a/resources/lang/sl-SI/admin/locations/message.php
+++ b/resources/lang/sl-SI/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => 'Lokacija ne obstaja.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'Te lokacije trenutno ni mogoče izbrisati, ker je lokacija zapisa za vsaj eno sredstvo ali uporabnika, ker so ji dodeljena sredstva ali ker je starševska lokacija druge lokacije. Posodobite svoje zapise tako, da se na to lokacijo ne boste več sklicevali, in poskusite znova. ',
'assoc_assets' => 'Ta lokacija je trenutno povezana z vsaj enim sredstvom in je ni mogoče izbrisati. Prosimo, posodobite svoja sredstva, da ne bodo več vsebovali te lokacije in poskusite znova. ',
'assoc_child_loc' => 'Ta lokacija je trenutno starš vsaj ene lokacije otroka in je ni mogoče izbrisati. Posodobite svoje lokacije, da ne bodo več vsebovale te lokacije in poskusite znova. ',
- 'assigned_assets' => 'Assigned Assets',
- 'current_location' => 'Current Location',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'assigned_assets' => 'Dodeljena sredstva',
+ 'current_location' => 'Trenutna lokacija',
+ 'open_map' => 'Odpri v :map_provider_icon Zemljevidih',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => 'Lokacija ni bila obnovljena, poskusite znova',
+ 'success' => 'Lokacija je bila uspešno obnovljena.'
),
'delete' => array(
diff --git a/resources/lang/sl-SI/admin/locations/table.php b/resources/lang/sl-SI/admin/locations/table.php
index 6f8c25a975..529c3492d4 100644
--- a/resources/lang/sl-SI/admin/locations/table.php
+++ b/resources/lang/sl-SI/admin/locations/table.php
@@ -15,16 +15,16 @@ return [
'print_all_assigned' => 'Natisni vse dodeljene',
'name' => 'Ime lokacije',
'address' => 'Naslov',
- 'address2' => 'Address Line 2',
+ 'address2' => 'Druga vrstica naslova',
'zip' => 'Poštna številka',
'locations' => 'Lokacije',
'parent' => 'Starš',
'currency' => 'Lokalna valuta',
'ldap_ou' => 'LDAP Search OU',
- 'user_name' => 'User Name',
+ 'user_name' => 'Uporabniško ime',
'department' => 'Oddelek',
'location' => 'Lokacija',
- 'asset_tag' => 'Assets Tag',
+ 'asset_tag' => 'Oznaka sredstva',
'asset_name' => 'Ime',
'asset_category' => 'Kategorija',
'asset_manufacturer' => 'Proizvajalec',
@@ -32,11 +32,11 @@ return [
'asset_serial' => 'Serijska številka',
'asset_location' => 'Lokacija',
'asset_checked_out' => 'Izdano',
- 'asset_expected_checkin' => 'Expected Checkin',
+ 'asset_expected_checkin' => 'Predviden datum dobave',
'date' => 'Datum:',
- 'phone' => 'Location Phone',
- 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):',
- 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
- 'signed_by_location_manager' => 'Signed By (Location Manager):',
- 'signed_by' => 'Signed Off By:',
+ 'phone' => 'Telefonska št. Lokacije',
+ 'signed_by_asset_auditor' => 'Podpisal/a Je (revizor sredstva):',
+ 'signed_by_finance_auditor' => 'Podpisal/a Je (finančni revizor):',
+ 'signed_by_location_manager' => 'Podpisal/a Je (lokacijski menedžer):',
+ 'signed_by' => 'Odpisal/a Je:',
];
diff --git a/resources/lang/sl-SI/admin/models/message.php b/resources/lang/sl-SI/admin/models/message.php
index e076f7e0b0..7e06321d57 100644
--- a/resources/lang/sl-SI/admin/models/message.php
+++ b/resources/lang/sl-SI/admin/models/message.php
@@ -2,12 +2,12 @@
return array(
- 'deleted' => 'Deleted asset model',
+ 'deleted' => 'Izbrisan model sredstva',
'does_not_exist' => 'Model ne obstaja.',
- 'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
- 'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+ 'no_association' => 'OPOZORILO! Model sredstva za ta element je neveljaven ali manjka!',
+ 'no_association_fix' => 'To bo zrušilo stvari na čudne in grozljive načine. Uredite to sredstvo zdaj in mu dodelite model.',
'assoc_users' => 'Ta model je trenutno povezan z enim ali več sredstvi in ga ni mogoče izbrisati. Prosimo, izbrišite sredstva in poskusite zbrisati znova. ',
- 'invalid_category_type' => 'This category must be an asset category.',
+ 'invalid_category_type' => 'Ta kategorija mora biti kategorija sredstva.',
'create' => array(
'error' => 'Model ni bil ustvarjen, poskusite znova.',
@@ -33,14 +33,14 @@ return array(
'bulkedit' => array(
'error' => 'Polja niso bila spremenjena, nič ni posodobljeno.',
- 'success' => 'Model successfully updated. |:model_count models successfully updated.',
- 'warn' => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+ 'success' => 'Model je bil uspešno posodobljen. |:model_count modeli uspešno posodobljeni.',
+ 'warn' => 'Posodobili boste lastnosti naslednjega modela:|Urejali boste lastnosti naslednjega :model_count modeli:',
),
'bulkdelete' => array(
'error' => 'Modeli niso bili izbrani, nič ni izbrisano.',
- 'success' => 'Model deleted!|:success_count models deleted!',
+ 'success' => 'Model izbrisan!|:success_count modeli izbrisani!',
'success_partial' => ': modeli so bili izbrisani, vendar: fail_count ni bilo mogoče izbrisati, ker so še vedno sredstva, povezana z njimi.'
),
diff --git a/resources/lang/sl-SI/admin/reports/general.php b/resources/lang/sl-SI/admin/reports/general.php
index 932fd8f4c5..cc6beaa752 100644
--- a/resources/lang/sl-SI/admin/reports/general.php
+++ b/resources/lang/sl-SI/admin/reports/general.php
@@ -2,9 +2,9 @@
return [
'info' => 'Izberite možnosti, ki jih želite za poročilo o sredstvih.',
- 'deleted_user' => 'Deleted user',
- 'send_reminder' => 'Send reminder',
- 'reminder_sent' => 'Reminder sent',
+ 'deleted_user' => 'Izbrisan uporabnika',
+ 'send_reminder' => 'Pošlji opomnik',
+ 'reminder_sent' => 'Opomnik poslan',
'acceptance_deleted' => 'Acceptance request deleted',
'acceptance_request' => 'Acceptance request',
'custom_export' => [
diff --git a/resources/lang/sl-SI/admin/settings/general.php b/resources/lang/sl-SI/admin/settings/general.php
index 9cd424b176..432176063b 100644
--- a/resources/lang/sl-SI/admin/settings/general.php
+++ b/resources/lang/sl-SI/admin/settings/general.php
@@ -9,10 +9,10 @@ return [
'ad_append_domain_help' => 'Uporabniku ni potrebno vnesti "uporabnisko-ime@domena.local", vnesejo lahko le "uporabnisko-ime".',
'admin_cc_email' => 'E-pošta v vednost',
'admin_cc_email_help' => 'V kolikor želite poslati kopijo sprejemne/izdajne e-pošte poslane uporabnikom tudi na dodaten e-poštni račun, ga vnesite tu. V nasprotnem primeru pustite polje prazno.',
- 'admin_settings' => 'Admin Settings',
+ 'admin_settings' => 'Adminske nastavitve',
'is_ad' => 'To je strežnik Active Directory',
- 'alerts' => 'Alerts',
- 'alert_title' => 'Update Notification Settings',
+ 'alerts' => 'Opozorila',
+ 'alert_title' => 'Posodobi nastavitve notifikacij',
'alert_email' => 'Pošlji opozorila na',
'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
'alerts_enabled' => 'Opozorila e-pošte so omogočena',
@@ -31,7 +31,9 @@ return [
'backups' => 'Varnostna kopija',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
- 'backups_upload' => 'Upload Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+ 'backups_upload' => 'Naloži varnostno kopijo',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
'backups_logged_out' => 'All existing users, including you, will be logged out once your restore is complete.',
@@ -59,40 +61,40 @@ return [
'barcode_type' => 'Tip 2D črtne kode',
'alt_barcode_type' => 'Tip 1D črtne kode',
'email_logo_size' => 'Square logos in email look best. ',
- 'enabled' => 'Enabled',
+ 'enabled' => 'Omogočeno',
'eula_settings' => 'Nastavitve EULA',
'eula_markdown' => 'Ta EULA dovoljuje Github z okusom markdowna.',
- 'favicon' => 'Favicon',
+ 'favicon' => 'Favikona',
'favicon_format' => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
'favicon_size' => 'Favicons should be square images, 16x16 pixels.',
'footer_text' => 'Dodatno besedilo noge ',
'footer_text_help' => 'To besedilo bo prikazano v desnem delu noge. Povezave so dovoljene z uporabo Gothub okusno markdown. Prelomi vrstic, glave, slike itd. Lahko povzročijo nepredvidljive rezultate.',
'general_settings' => 'Splošne nastavitve',
'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
- 'general_settings_help' => 'Default EULA and more',
+ 'general_settings_help' => 'Privzeta EULA in več',
'generate_backup' => 'Ustvari varnostno kopiranje',
'google_workspaces' => 'Google Workspaces',
'header_color' => 'Barva glave',
'info' => 'Te nastavitve vam omogočajo prilagoditev določenih vidikov vaše namestitve.',
- 'label_logo' => 'Label Logo',
+ 'label_logo' => 'Logotip labele',
'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ',
'laravel' => 'Laravel Version',
'ldap' => 'LDAP',
'ldap_default_group' => 'Default Permissions Group',
'ldap_default_group_info' => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
- 'no_default_group' => 'No Default Group',
- 'ldap_help' => 'LDAP/Active Directory',
- 'ldap_client_tls_key' => 'LDAP Client TLS Key',
- 'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate',
+ 'no_default_group' => 'Brez privzete skupine',
+ 'ldap_help' => 'Active Directory',
+ 'ldap_client_tls_key' => 'LDAP Klientski TLS Ključ',
+ 'ldap_client_tls_cert' => 'LDAP Klientski TLS certifikat',
'ldap_enabled' => 'Omogočen LDAP',
'ldap_integration' => 'Integracija LDAP',
'ldap_settings' => 'Nastavitve LDAP',
'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
- 'ldap_location' => 'LDAP Location',
+ 'ldap_location' => 'LDAP Lokacija',
'ldap_location_help' => 'The Ldap Location field should be used if an OU is not being used in the Base Bind DN. Leave this blank if an OU search is being used.',
'ldap_login_test_help' => 'Vnesite veljavno uporabniško ime in geslo za LDAP iz osnovnega DN, ki ste ga navedli zgoraj, da preizkusite, ali je vaša prijava LDAP konfigurirana pravilno. Najprej morate shraniti posodobljene nastavitve za LDAP.',
'ldap_login_sync_help' => 'To samo testira, če lahko LDAP pravilno sinhronizira. Če vaša poizvedba LDAP Authentication ni pravilna, se uporabniki morda še vedno ne morejo prijaviti. Najprej morate shraniti posodobljene nastavitve za LDAP.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'LDAP menedžer',
'ldap_server' => 'Strežnik LDAP',
'ldap_server_help' => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
'ldap_server_cert' => 'Validacija potrdila SSL LDAP',
@@ -119,25 +121,25 @@ return [
'ldap_activated_flag_help' => 'This value is used to determine whether a synced user can login to Snipe-IT. It does not affect the ability to check items in or out to them, and should be the attribute name within your AD/LDAP, not the value.
If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to 0 or false, user login will be disabled. If the value in the AD/LDAP field is set to 1 or true or any other text means the user can log in. When the field is blank in your AD, we respect the userAccountControl attribute, which usually allows non-suspended users to log in.',
'ldap_emp_num' => 'LDAP številka zaposlenega',
'ldap_email' => 'E-pošta LDAP',
- 'ldap_test' => 'Test LDAP',
- 'ldap_test_sync' => 'Test LDAP Synchronization',
+ 'ldap_test' => 'Testiraj LDAP',
+ 'ldap_test_sync' => 'Testiraj LDAP sinhronizacijo',
'license' => 'Licenca za programsko opremo',
- 'load_remote' => 'Load Remote Avatars',
+ 'load_remote' => 'Naloži oddaljene avatarje',
'load_remote_help_text' => 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
- 'login' => 'Login Attempts',
- 'login_attempt' => 'Login Attempt',
- 'login_ip' => 'IP Address',
- 'login_success' => 'Success?',
- 'login_user_agent' => 'User Agent',
- 'login_help' => 'List of attempted logins',
+ 'login' => 'Poskusi prijave',
+ 'login_attempt' => 'Poskus prijave',
+ 'login_ip' => 'IP naslov',
+ 'login_success' => 'Uspeh?',
+ 'login_user_agent' => 'Uporabniški agent',
+ 'login_help' => 'Seznam poskusov prijav',
'login_note' => 'Opomba za prijavo',
'login_note_help' => 'Na zaslonu za prijavo lahko dodate še nekaj stavkov, na primer za pomoč ljudem, ki so našli izgubljeno ali ukradeno napravo. To polje sprejema Github flavored markdown',
- 'login_remote_user_text' => 'Remote User login options',
- 'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+ 'login_remote_user_text' => 'Možnosti za prijavo oddaljenih uporabnikov',
+ 'login_remote_user_enabled_text' => 'Omogoči prijavo z oddaljenim uporabniškim headerjem',
'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
- 'login_common_disabled_text' => 'Disable other authentication mechanisms',
+ 'login_common_disabled_text' => 'Onemogoči ostale avtentikacijske mehanizme',
'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
- 'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+ 'login_remote_user_custom_logout_url_text' => 'Izpisni URL po meri',
'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
'login_remote_user_header_name_text' => 'Custom user name header',
'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
@@ -150,18 +152,18 @@ return [
'optional' => 'Opcijsko',
'per_page' => 'Rezultatov na stran',
'php' => 'PHP različica',
- 'php_info' => 'PHP info',
+ 'php_info' => 'PHP informacije',
'php_overview' => 'PHP',
- 'php_overview_keywords' => 'phpinfo, system, info',
- 'php_overview_help' => 'PHP System info',
+ 'php_overview_keywords' => 'phpinformacije, sistem, informacije',
+ 'php_overview_help' => 'Php sistemske informacije',
'php_gd_info' => 'Za prikaz QR kod morate namestiti php-gd, glejte navodila za namestitev.',
'php_gd_warning' => 'PHP Obdelava slik in vtičnik GD nista nameščena.',
'pwd_secure_complexity' => 'Zapletenost gesla',
'pwd_secure_complexity_help' => 'Izberite katera pravila zapletenosti gesel želite uveljaviti.',
- 'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
- 'pwd_secure_complexity_letters' => 'Require at least one letter',
- 'pwd_secure_complexity_numbers' => 'Require at least one number',
- 'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+ 'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Geslo ne more biti isto kot ime, priimek, E mail ali uporabniško ime',
+ 'pwd_secure_complexity_letters' => 'Obvezuj k uporabi vsaj ene črke',
+ 'pwd_secure_complexity_numbers' => 'Obvezuj k uporabi vsaj ene številke',
+ 'pwd_secure_complexity_symbols' => 'Obvezuj k uporabi vsaj enega simbola',
'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
'pwd_secure_min' => 'Minimalni znaki gesla',
'pwd_secure_min_help' => 'Najmanjša dovoljena vrednost je 8',
@@ -174,11 +176,11 @@ return [
'saml_help' => 'SAML settings',
'saml_enabled' => 'SAML enabled',
'saml_integration' => 'SAML Integration',
- 'saml_sp_entityid' => 'Entity ID',
+ 'saml_sp_entityid' => 'ID entitete',
'saml_sp_acs_url' => 'Assertion Consumer Service (ACS) URL',
'saml_sp_sls_url' => 'Single Logout Service (SLS) URL',
'saml_sp_x509cert' => 'Public Certificate',
- 'saml_sp_metadata_url' => 'Metadata URL',
+ 'saml_sp_metadata_url' => 'URL metapodatkov',
'saml_idp_metadata' => 'SAML IdP Metadata',
'saml_idp_metadata_help' => 'You can specify the IdP metadata using a URL or XML file.',
'saml_attr_mapping_username' => 'Attribute Mapping - Username',
@@ -204,12 +206,12 @@ return [
'site_name' => 'Ime mesta',
'integrations' => 'Integrations',
'slack' => 'Slack',
- 'general_webhook' => 'General Webhook',
+ 'general_webhook' => 'Splošni webhook',
'ms_teams' => 'Microsoft Teams',
- 'webhook' => ':app',
- 'webhook_presave' => 'Test to Save',
- 'webhook_title' => 'Update Webhook Settings',
- 'webhook_help' => 'Integration settings',
+ 'webhook' => ':aplikacija',
+ 'webhook_presave' => 'Shrani za testiranje',
+ 'webhook_title' => 'Posodobi webhook nastavitve',
+ 'webhook_help' => 'Nastavitve integracij',
'webhook_botname' => ':app Botname',
'webhook_channel' => ':app Channel',
'webhook_endpoint' => ':app Endpoint',
@@ -223,14 +225,14 @@ return [
'snipe_version' => 'Snipe-IT različica',
'support_footer' => 'Povezava do podpore v nogi ',
'support_footer_help' => 'Določite, kdo vidi povezave do informacij o podpori Snipe-IT in uporabniškega priročnika',
- 'version_footer' => 'Version in Footer ',
+ 'version_footer' => 'Verzija v nogi ',
'version_footer_help' => 'Specify who sees the Snipe-IT version and build number.',
'system' => 'Sistemske informacije',
'update' => 'Posodobi nastavitve',
'value' => 'Vrednost',
'brand' => 'Branding',
'brand_keywords' => 'footer, logo, print, theme, skin, header, colors, color, css',
- 'brand_help' => 'Logo, Site Name',
+ 'brand_help' => 'Logotip, ime strani',
'web_brand' => 'Web Branding Type',
'about_settings_title' => 'O nastavitvah',
'about_settings_text' => 'Te nastavitve vam omogočajo prilagoditev določenih vidikov vaše namestitve.',
@@ -299,54 +301,54 @@ return [
'oauth_name_help' => ' Something your users will recognize and trust.',
'oauth_scopes' => 'Scopes',
'oauth_callback_url' => 'Your application authorization callback URL.',
- 'create_client' => 'Create Client',
+ 'create_client' => 'Naredi klienta',
'no_scopes' => 'No scopes',
'asset_tag_title' => 'Update Asset Tag Settings',
'barcode_title' => 'Update Barcode Settings',
- 'barcodes' => 'Barcodes',
+ 'barcodes' => 'Črtne kode',
'barcodes_help_overview' => 'Barcode & QR settings',
'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
'barcodes_spinner' => 'Attempting to delete files...',
'barcode_delete_cache' => 'Delete Barcode Cache',
'branding_title' => 'Update Branding Settings',
'general_title' => 'Update General Settings',
- 'mail_test' => 'Send Test',
+ 'mail_test' => 'Pošlji test',
'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
'filter_by_keyword' => 'Filter by setting keyword',
- 'security' => 'Security',
- 'security_title' => 'Update Security Settings',
+ 'security' => 'Varnost',
+ 'security_title' => 'Posodobi varnostne nastavitve',
'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
'security_help' => 'Two-factor, Password Restrictions',
'groups_keywords' => 'permissions, permission groups, authorization',
'groups_help' => 'Account permission groups',
- 'localization' => 'Localization',
- 'localization_title' => 'Update Localization Settings',
+ 'localization' => 'Lokalizacija',
+ 'localization_title' => 'Posodobi nastavitve lokalizacije',
'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
'localization_help' => 'Language, date display',
- 'notifications' => 'Notifications',
+ 'notifications' => 'Obvestila',
'notifications_help' => 'Email Alerts & Audit Settings',
'asset_tags_help' => 'Incrementing and prefixes',
- 'labels' => 'Labels',
- 'labels_title' => 'Update Label Settings',
+ 'labels' => 'Oznake',
+ 'labels_title' => 'Posodobi nastavitve oznak',
'labels_help' => 'Label sizes & settings',
- 'purge_keywords' => 'permanently delete',
+ 'purge_keywords' => 'izbriši za vedno',
'purge_help' => 'Počisti izbrisane zapise',
'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
'ldap_ad' => 'LDAP/AD',
'employee_number' => 'Employee Number',
- 'create_admin_user' => 'Create a User ::',
+ 'create_admin_user' => 'Ustvari uporabnika ::',
'create_admin_success' => 'Success! Your admin user has been added!',
'create_admin_redirect' => 'Click here to go to your app login!',
- 'setup_migrations' => 'Database Migrations ::',
+ 'setup_migrations' => 'Migracije podatkovne baze ::',
'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
'setup_successful_migrations' => 'Your database tables have been created',
'setup_migration_output' => 'Migration output:',
- 'setup_migration_create_user' => 'Next: Create User',
+ 'setup_migration_create_user' => 'Naslednje: ustvari uporabnika',
'ldap_settings_link' => 'LDAP Settings Page',
'slack_test' => 'Test Integration',
'label2_enable' => 'New Label Engine',
'label2_enable_help' => 'Switch to the new label engine. Note: You will need to save this setting before setting others.',
- 'label2_template' => 'Template',
+ 'label2_template' => 'Predloga',
'label2_template_help' => 'Select which template to use for label generation',
'label2_title' => 'Naslov',
'label2_title_help' => 'The title to show on labels that support it',
@@ -364,8 +366,8 @@ return [
'help_asterisk_bold' => 'Text entered as **text** will be displayed as bold',
'help_blank_to_use' => 'Leave blank to use the value from :setting_name',
'help_default_will_use' => ':default will use the value from :setting_name.
Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see the documentation for more details. ',
- 'default' => 'Default',
- 'none' => 'None',
+ 'default' => 'Privzeto',
+ 'none' => 'Nobena',
'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization's Google developer console .',
'google_login' => 'Google Workspace Login Settings',
'enable_google_login' => 'Enable users to login with Google Workspace',
@@ -375,8 +377,8 @@ return [
'database_driver' => 'Database Driver',
'bs_table_storage' => 'Table Storage',
'timezone' => 'Timezone',
- 'profile_edit' => 'Edit Profile',
- 'profile_edit_help' => 'Allow users to edit their own profiles.',
+ 'profile_edit' => 'Uredi profil',
+ 'profile_edit_help' => 'Omogoči uporabnikom, da urejajo svoje profile.',
'default_avatar' => 'Upload custom default avatar',
'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
'restore_default_avatar' => 'Restore original system default avatar',
diff --git a/resources/lang/sl-SI/admin/settings/message.php b/resources/lang/sl-SI/admin/settings/message.php
index 6f93dd1101..a0cbab22c2 100644
--- a/resources/lang/sl-SI/admin/settings/message.php
+++ b/resources/lang/sl-SI/admin/settings/message.php
@@ -31,19 +31,19 @@ return [
'ldap' => [
'testing' => 'Testing LDAP Connection, Binding & Query ...',
'500' => '500 Server Error. Please check your server logs for more information.',
- 'error' => 'Something went wrong :(',
+ 'error' => 'Nekaj je šlo narobe :(',
'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
- 'testing_authentication' => 'Testing LDAP Authentication...',
- 'authentication_success' => 'User authenticated against LDAP successfully!'
+ 'testing_authentication' => 'Testiranje LDAP Avtentikacije...',
+ 'authentication_success' => 'Uporabnik se je uspešno avtoriziral z LDAP!'
],
'webhook' => [
- 'sending' => 'Sending :app test message...',
- 'success' => 'Your :webhook_name Integration works!',
+ 'sending' => 'Pošiljanje :apikacija testirno sporočilo...',
+ 'success' => 'Tvoj :ime_webhooka integracija deluje!',
'success_pt1' => 'Success! Check the ',
'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
- '500' => '500 Server Error.',
+ '500' => '500 strežniška napaka.',
'error' => 'Something went wrong. :app responded with: :error_message',
'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
- 'error_misc' => 'Something went wrong. :( ',
+ 'error_misc' => 'Nekaj je šlo narobe. :( ',
]
];
diff --git a/resources/lang/sl-SI/admin/settings/table.php b/resources/lang/sl-SI/admin/settings/table.php
index 70192894cf..88ef3653f4 100644
--- a/resources/lang/sl-SI/admin/settings/table.php
+++ b/resources/lang/sl-SI/admin/settings/table.php
@@ -2,5 +2,5 @@
return array(
'created' => 'Ustvarjeno',
- 'size' => 'Size',
+ 'size' => 'Velikost',
);
diff --git a/resources/lang/sl-SI/admin/statuslabels/message.php b/resources/lang/sl-SI/admin/statuslabels/message.php
index 6a85dcd1b5..0586251cf6 100644
--- a/resources/lang/sl-SI/admin/statuslabels/message.php
+++ b/resources/lang/sl-SI/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
return [
'does_not_exist' => 'Oznaka statusa ne obstaja.',
- 'deleted_label' => 'Deleted Status Label',
+ 'deleted_label' => 'Izbrisana statusna oznaka',
'assoc_assets' => 'Ta oznaka statusa je trenutno povezana z vsaj enim sredstvom in je ni mogoče izbrisati. Posodobite svoja sredstva, da ne bodo več v tem stanju in poskusite znova. ',
'create' => [
diff --git a/resources/lang/sl-SI/admin/users/general.php b/resources/lang/sl-SI/admin/users/general.php
index 9a922d6bb9..65e653493e 100644
--- a/resources/lang/sl-SI/admin/users/general.php
+++ b/resources/lang/sl-SI/admin/users/general.php
@@ -17,10 +17,10 @@ return [
'last_login' => 'Zadnja prijava',
'ldap_config_text' => 'Nastavitve konfiguracije LDAP-a lahko najdete v zavihku Admin> Nastavitve. Izbrana lokacija bo nastavljena za vse uvožene uporabnike.',
'print_assigned' => 'Natisni vse dodeljene',
- 'email_assigned' => 'Email List of All Assigned',
- 'user_notified' => 'User has been emailed a list of their currently assigned items.',
- 'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
- 'auto_assign_help' => 'Skip this user in auto assignment of licenses',
+ 'email_assigned' => 'Izpis E pošt od vseh dodeljenih',
+ 'user_notified' => 'Uporabnik je bil po E pošti obveščen o seznamu vseh njemu dodeljenih stvari.',
+ 'auto_assign_label' => 'Vključi tega uporabnika pri samodejni dodelitvi upravičenih licenc',
+ 'auto_assign_help' => 'Preskoči tega uporabnika pri samodejni dodelitvi licenc',
'software_user' => 'Programska oprema izdana osebi :name',
'send_email_help' => 'Obvezno je potrebno navesti e-poštni račun za tega uporabnika kamor bo prejel poverilnice. Pošiljanje poverilnic je mogoče le ob ustvarjanju uporabnika. Gesla so shranjena eno-smerno šifrirano in jih je nemogoče pridobiti po shranjenju.',
'view_user' => 'Ogled uporabnika :name',
@@ -28,27 +28,27 @@ return [
'two_factor_admin_optin_help' => 'Vaše trenutne nastavitve skrbnika omogočajo selektivno uveljavljanje dvotaktne pristnosti. ',
'two_factor_enrolled' => 'Vgrajena naprava 2FA ',
'two_factor_active' => '2FA aktivna ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
- 'activation_status_warning' => 'Do not change activation status',
- 'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
- 'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
- 'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
- 'remove_group_memberships' => 'Remove Group Memberships',
- 'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_assets_status' => 'Update all assets for these users to this status',
- 'checkin_user_properties' => 'Check in all properties associated with these users',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
- 'vip_label' => 'VIP user',
+ 'user_deactivated' => 'Uporabnik se ne more prijaviti',
+ 'user_activated' => 'Uporabnik se lahko prijavi',
+ 'activation_status_warning' => 'Ne spremeni aktivacijskega statusa',
+ 'group_memberships_helpblock' => 'Samo superadmini lahko urejajo članstvo skupinam.',
+ 'superadmin_permission_warning' => 'Samo superadmin lahko dodeli uporabniku superadminske pravice.',
+ 'admin_permission_warning' => 'Samo uporabniki z adminskimi pravicami ali večjimi lahko dodelijo uporabniku adminske pravice.',
+ 'remove_group_memberships' => 'Odstrani članstva skupinam',
+ 'warning_deletion_information' => 'Prijavili boste VSE predmete od spodaj navedenih uporabnikov :seštevek. Imena superadminov so označena z rdečo barvo.',
+ 'update_user_assets_status' => 'Posodobi vsa sredstva za te uporabnike do tega statusa',
+ 'checkin_user_properties' => 'Prijavite vse lastnosti, povezane s temi uporabniki',
+ 'remote_label' => 'To je oddaljen uporabnik',
+ 'remote' => 'Oddaljen',
+ 'remote_help' => 'To je lahko uporabno če rabiš filtrirati oddaljene uporabnike, ki niso nikoli ali redko prišli na fizične lokacije.',
+ 'not_remote_label' => 'To ni oddaljen uporabnik',
+ 'vip_label' => 'VIP uporabnik',
'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
'create_user' => 'Create a user',
'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
'email_credentials' => 'Email credentials',
'email_credentials_text' => 'Email my credentials to the email address above',
- 'next_save_user' => 'Next: Save User',
- 'all_assigned_list_generation' => 'Generated on:',
- 'email_user_creds_on_create' => 'Email this user their credentials?',
+ 'next_save_user' => 'Naslednje: shrani uporabnika',
+ 'all_assigned_list_generation' => 'Ustvarjena na:',
+ 'email_user_creds_on_create' => 'Sporoči temu uporabniku poverilnice po E pošti?',
];
diff --git a/resources/lang/sl-SI/admin/users/message.php b/resources/lang/sl-SI/admin/users/message.php
index 01b0654786..f9ad819dab 100644
--- a/resources/lang/sl-SI/admin/users/message.php
+++ b/resources/lang/sl-SI/admin/users/message.php
@@ -6,9 +6,9 @@ return array(
'declined' => 'To sredstev ste uspešno zavrnili.',
'bulk_manager_warn' => 'Vaši uporabniki so bili uspešno posodobljeni, vendar vnos v upravitelju ni bil shranjen, ker je bil izbran upravitelj tudi na seznamu uporabnikov, ki ga je treba urediti, uporabniki pa morda niso njihovi lastniki. Prosimo, izberite svoje uporabnike, razen upravitelja.',
'user_exists' => 'Uporabnik že obstaja!',
- 'user_not_found' => 'Uporabnik ne obstaja.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Polje za prijavo je obvezno',
- 'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+ 'user_has_no_assets_assigned' => 'Brez sredstev dodeljenih uporabniku.',
'user_password_required' => 'Geslo je obvezno.',
'insufficient_permissions' => 'Nezadostna dovoljenja.',
'user_deleted_warning' => 'Ta uporabnik je bil izbrisan. Tega uporabnika boste morali obnoviti, da ga uredite ali dodelite nova sredstva.',
@@ -41,18 +41,19 @@ return array(
'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
- 'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+ 'delete_has_users_var' => 'Ta uporabnik še vedno upravlja drugega uporabnika. Prosimo, da najprej izberete drugega upravitelja za tega uporabnika.|Ta uporabnik še vedno upravlja :seštevek uporabnikov. Prosimo, da najprej izberete drugega menedžerja zanje.',
'unsuspend' => 'Prišlo je do težave pri od-suspendiranju uporabnika. Prosim poskusite ponovno.',
'import' => 'Pri uvozu uporabnikov je prišlo do težave. Prosim poskusite ponovno.',
'asset_already_accepted' => 'To sredstvo je bilo že sprejeto.',
'accept_or_decline' => 'To sredstev morate sprejeti ali zavrniti.',
- 'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+ 'cannot_delete_yourself' => 'Počutili bi se zelo slabo, če bi se izbrisali, zato razmislite o tem.',
'incorrect_user_accepted' => 'Sredstev, ki ste ga poskušali sprejeti, ni bilo izdano za vas.',
'ldap_could_not_connect' => 'Povezave s strežnikom LDAP ni bilo mogoče vzpostaviti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP.
Napaka strežnika LDAP:',
'ldap_could_not_bind' => 'Povezave s strežnikom LDAP ni bilo mogoče vzpostaviti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP.
Napaka strežnika LDAP: ',
'ldap_could_not_search' => 'Strežnika LDAP ni bilo mogoče najti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP.
Napaka strežnika LDAP:',
'ldap_could_not_get_entries' => 'Vnose iz strežnika LDAP ni bilo mogoče pridobiti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP.
Napaka strežnika LDAP:',
'password_ldap' => 'Geslo za ta račun upravlja LDAP / Active Directory. Za spremembo gesla se obrnite na oddelek IT. ',
+ 'multi_company_items_assigned' => 'Ta uporabnik ima dodeljene predmete, preverite jih pred selitvijo podjetja.'
),
'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
),
'inventorynotification' => array(
- 'error' => 'This user has no email set.',
- 'success' => 'The user has been notified about their current inventory.'
+ 'error' => 'Ta uporabnik ima nastavljene E pošte.',
+ 'success' => 'Uporabnik je bil obveščen o trenutnem inventarju.'
)
);
\ No newline at end of file
diff --git a/resources/lang/sl-SI/admin/users/table.php b/resources/lang/sl-SI/admin/users/table.php
index 801f303d59..432b52ba15 100644
--- a/resources/lang/sl-SI/admin/users/table.php
+++ b/resources/lang/sl-SI/admin/users/table.php
@@ -31,7 +31,7 @@ return array(
'show_deleted' => 'Prikaži izbrisane uporabnike',
'title' => 'Naslov',
'to_restore_them' => 'da jih obnovite.',
- 'total_assets_cost' => "Total Assets Cost",
+ 'total_assets_cost' => "Celotna cena sredstev",
'updateuser' => 'Posodobi uporabnika',
'username' => 'Uporabniško ime',
'user_deleted_text' => 'Ta uporabnik je bil označen kot izbrisan.',
diff --git a/resources/lang/sl-SI/button.php b/resources/lang/sl-SI/button.php
index 4f4a420a76..033460bf6c 100644
--- a/resources/lang/sl-SI/button.php
+++ b/resources/lang/sl-SI/button.php
@@ -18,9 +18,9 @@ return [
'generate_labels' => '{1} Generiraj Oznako|[2,2] Generiraj Oznaki|[3,*] Generiraj Oznake',
'send_password_link' => 'Pošlji povezavo za ponastavitev gesla',
'go' => 'Go',
- 'bulk_actions' => 'Bulk Actions',
- 'add_maintenance' => 'Add Maintenance',
- 'append' => 'Append',
+ 'bulk_actions' => 'Množične akcije',
+ 'add_maintenance' => 'Dodaj vzdrževanje',
+ 'append' => 'Priloži',
'new' => 'Novo',
'var' => [
'clone' => 'Clone :item_type',
diff --git a/resources/lang/sl-SI/general.php b/resources/lang/sl-SI/general.php
index cca4e7041b..da1c3b7cf2 100644
--- a/resources/lang/sl-SI/general.php
+++ b/resources/lang/sl-SI/general.php
@@ -46,9 +46,9 @@ return [
'bulkaudit' => 'Množična revizija',
'bulkaudit_status' => 'Stanje revizije',
'bulk_checkout' => 'Množična izdaja',
- 'bulk_edit' => 'Bulk Edit',
- 'bulk_delete' => 'Bulk Delete',
- 'bulk_actions' => 'Bulk Actions',
+ 'bulk_edit' => 'Množično urejanje',
+ 'bulk_delete' => 'Množični izbris',
+ 'bulk_actions' => 'Množične akcije',
'bulk_checkin_delete' => 'Bulk Checkin / Delete Users',
'byod' => 'BYOD',
'byod_help' => 'This device is owned by the user',
@@ -81,13 +81,13 @@ return [
'create' => 'Ustvari novo',
'created' => 'Ustvarjeno',
'created_asset' => 'ustvarjeno sredstvo',
- 'created_at' => 'Created At',
- 'created_by' => 'Created By',
+ 'created_at' => 'Ustvarjeno',
+ 'created_by' => 'Stvaritelj',
'record_created' => 'Zapis ustvarjen',
'updated_at' => 'Posodobljeno ob',
'currency' => '$', // this is deprecated
'current' => 'Trenutni',
- 'current_password' => 'Current Password',
+ 'current_password' => 'Trenutno geslo',
'customize_report' => 'Customize Report',
'custom_report' => 'Poročilo o sredstvih po meri',
'dashboard' => 'Nadzorna plošča',
@@ -140,11 +140,11 @@ return [
'files' => 'Datoteke',
'file_name' => 'Datoteka',
'file_type' => 'Tip datoteke',
- 'filesize' => 'File Size',
+ 'filesize' => 'Velikost datoteke',
'file_uploads' => 'Nalaganje datotek',
- 'file_upload' => 'File Upload',
+ 'file_upload' => 'Nalaganje datotek',
'generate' => 'Ustvari',
- 'generate_labels' => 'Generate Labels',
+ 'generate_labels' => 'Ustvari oznake',
'github_markdown' => 'To polje omogoča Github z okusom markdowna.',
'groups' => 'Skupine',
'gravatar_email' => 'E-poštni naslov Gravatar',
@@ -170,8 +170,8 @@ return [
'asset_maintenance_report' => 'Poročilo o vzdrževanju sredstev',
'asset_maintenances' => 'Sredstva vzdrževanja',
'item' => 'Element',
- 'item_name' => 'Item Name',
- 'import_file' => 'import CSV file',
+ 'item_name' => 'Ime Artikla',
+ 'import_file' => 'uvozi CSV datoteko',
'import_type' => 'CSV import type',
'insufficient_permissions' => 'Nezadostna dovoljenja!',
'kits' => 'Vnaprej določeni kompleti',
@@ -243,16 +243,16 @@ return [
'requestable_models' => 'Requestable Models',
'requestable_items' => 'Requestable Items',
'requested' => 'Zahtevano',
- 'requested_date' => 'Requested Date',
- 'requested_assets' => 'Requested Assets',
- 'requested_assets_menu' => 'Requested Assets',
+ 'requested_date' => 'Zahtevan datum',
+ 'requested_assets' => 'Zahtevana sredstva',
+ 'requested_assets_menu' => 'Zahtevana sredstva',
'request_canceled' => 'Zahteva je bila preklicana',
'request_item' => 'Request this item',
'external_link_tooltip' => 'External link to',
'save' => 'Shrani',
'select_var' => 'Select :thing... ', // this will eventually replace all of our other selects
'select' => 'Izberite',
- 'select_all' => 'Select All',
+ 'select_all' => 'Izberi vse',
'search' => 'Iskanje',
'select_category' => 'Izberite kategorijo',
'select_datasource' => 'Select a data source',
@@ -338,11 +338,11 @@ return [
'clear_signature' => 'Počisti podpise',
'show_help' => 'Pokaži pomoč',
'hide_help' => 'Skrij pomoč',
- 'view_all' => 'view all',
- 'hide_deleted' => 'Hide Deleted',
+ 'view_all' => 'prikaži vse',
+ 'hide_deleted' => 'Ogled izbrisanih',
'email' => 'E-pošta',
- 'do_not_change' => 'Do not change',
- 'bug_report' => 'Report a bug',
+ 'do_not_change' => 'Ne spreminjaj',
+ 'bug_report' => 'Sporoči hrošča',
'user_manual' => 'User\'s Manual',
'setup_step_1' => 'Step 1',
'setup_step_2' => 'Step 2',
@@ -351,20 +351,20 @@ return [
'setup_config_check' => 'Configuration Check',
'setup_create_database' => 'Create database tables',
'setup_create_admin' => 'Create an admin user',
- 'setup_done' => 'Finished!',
+ 'setup_done' => 'Končano!',
'bulk_edit_about_to' => 'You are about to edit the following: ',
'checked_out' => 'Izdano',
'checked_out_to' => 'Checked out to',
- 'fields' => 'Fields',
+ 'fields' => 'Polja',
'last_checkout' => 'Last Checkout',
'due_to_checkin' => 'The following :count items are due to be checked in soon:',
'expected_checkin' => 'Expected Checkin',
'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
'changed' => 'Changed',
- 'to' => 'To',
+ 'to' => 'Za',
'report_fields_info' => 'Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
If you would like to export only certain assets, use the options below to fine-tune your results.
',
- 'range' => 'Range',
+ 'range' => 'Obseg',
'bom_remark' => 'Add a BOM (byte-order mark) to this CSV',
'improvements' => 'Improvements',
'information' => 'Information',
@@ -381,13 +381,13 @@ return [
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
- 'new_asset' => 'New Asset',
- 'new_license' => 'New License',
- 'new_accessory' => 'New Accessory',
- 'new_consumable' => 'New Consumable',
- 'collapse' => 'Collapse',
- 'assigned' => 'Assigned',
- 'asset_count' => 'Asset Count',
+ 'new_asset' => 'Novo sredstvo',
+ 'new_license' => 'Nova licenca',
+ 'new_accessory' => 'Nov dodatek',
+ 'new_consumable' => 'Nov potrošni material',
+ 'collapse' => 'Strni',
+ 'assigned' => 'Dodeljeno',
+ 'asset_count' => 'Št. vseh sredstev',
'accessories_count' => 'Accessories Count',
'consumables_count' => 'Consumables Count',
'components_count' => 'Components Count',
@@ -395,11 +395,11 @@ return [
'notification_error' => 'Napaka',
'notification_error_hint' => 'Please check the form below for errors',
'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
- 'notification_success' => 'Success',
+ 'notification_success' => 'Uspešno',
'notification_warning' => 'Opozorilo',
'notification_info' => 'Informacije',
'asset_information' => 'Asset Information',
- 'model_name' => 'Model Name',
+ 'model_name' => 'Številka modela',
'asset_name' => 'Ime sredstva',
'consumable_information' => 'Consumable Information:',
'consumable_name' => 'Ime potrošnega materiala:',
@@ -415,12 +415,12 @@ return [
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
- 'additional_files' => 'Additional Files',
+ 'additional_files' => 'Dodatne datoteke',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -428,17 +428,17 @@ return [
'pie_chart_type' => 'Dashboard Pie Chart Type',
'hello_name' => 'Hello, :name!',
'unaccepted_profile_warning' => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
- 'start_date' => 'Start Date',
- 'end_date' => 'End Date',
+ 'start_date' => 'Datum začetka',
+ 'end_date' => 'Datum zaključka',
'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
- 'placeholder_kit' => 'Select a kit',
- 'file_not_found' => 'File not found',
+ 'placeholder_kit' => 'Izberi kit',
+ 'file_not_found' => 'Datoteke ni mogoče najti',
'preview_not_available' => '(no preview)',
'setup' => 'Setup',
'pre_flight' => 'Pre-Flight',
'skip_to_main_content' => 'Skip to main content',
'toggle_navigation' => 'Toggle navigation',
- 'alerts' => 'Alerts',
+ 'alerts' => 'Opozorila',
'tasks_view_all' => 'View all tasks',
'true' => 'True',
'false' => 'False',
@@ -458,7 +458,7 @@ return [
'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
'send_welcome_email_to_users' => ' Send Welcome Email for new Users?',
- 'send_email' => 'Send Email',
+ 'send_email' => 'Pošljite e-pošto',
'call' => 'Call number',
'back_before_importing' => 'Backup before importing?',
'csv_header_field' => 'CSV Header Field',
@@ -472,10 +472,10 @@ return [
'cancel_request' => 'Cancel this item request',
'setup_successful_migrations' => 'Your database tables have been created',
'setup_migration_output' => 'Migration output:',
- 'setup_migration_create_user' => 'Next: Create User',
+ 'setup_migration_create_user' => 'Naslednje: ustvari uporabnika',
'importer_generic_error' => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
- 'confirm' => 'Confirm',
- 'autoassign_licenses' => 'Auto-Assign Licenses',
+ 'confirm' => 'Potrdi',
+ 'autoassign_licenses' => 'Avtomatsko dodeli licence',
'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
@@ -483,7 +483,7 @@ return [
'cannot_be_deleted' => 'This item cannot be deleted',
'cannot_be_edited' => 'This item cannot be edited.',
'undeployable_tooltip' => 'This item cannot be checked out. Check the quantity remaining.',
- 'serial_number' => 'Serial Number',
+ 'serial_number' => 'Serijska številka',
'item_notes' => ':item Notes',
'item_name_var' => ':item Name',
'error_user_company' => 'Checkout target company and asset company do not match',
@@ -524,12 +524,12 @@ return [
'action_permission_generic' => 'You do not have permission to :action this :item_type',
'edit' => 'uredi',
'action_source' => 'Action Source',
- 'or' => 'or',
+ 'or' => 'ali',
'url' => 'URL',
'edit_fieldset' => 'Edit fieldset fields and options',
'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
- 'error_sending_email' => 'Error sending email',
+ 'error_sending_email' => 'Napaka pri pošiljanju e-pošte',
'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe return to the dashboard, or contact your administrator.',
'bulk' => [
'delete' =>
@@ -554,14 +554,14 @@ return [
],
'more_info' => 'Več informacij',
'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
- 'whoops' => 'Whoops!',
+ 'whoops' => 'Ups!',
'something_went_wrong' => 'Something went wrong with your request.',
- 'close' => 'Close',
+ 'close' => 'Zapri',
'expires' => 'Poteče',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
- 'label' => 'Label',
+ 'label' => 'Oznaka',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/sl-SI/localizations.php b/resources/lang/sl-SI/localizations.php
index f335ddc1b3..c9a9cba028 100644
--- a/resources/lang/sl-SI/localizations.php
+++ b/resources/lang/sl-SI/localizations.php
@@ -2,18 +2,18 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
- 'en-US'=> 'English, US',
- 'en-GB'=> 'English, UK',
- 'am-ET' => 'Amharic',
- 'af-ZA'=> 'Afrikaans',
- 'ar-SA'=> 'Arabic',
- 'bg-BG'=> 'Bulgarian',
- 'zh-CN'=> 'Chinese Simplified',
- 'zh-TW'=> 'Chinese Traditional',
- 'ca-ES' => 'Catalan',
- 'hr-HR'=> 'Croatian',
+ 'en-US'=> 'Angleščina, ZDA',
+ 'en-GB'=> 'Angleščina, ZK',
+ 'am-ET' => 'Amharščina',
+ 'af-ZA'=> 'Afriško',
+ 'ar-SA'=> 'Arabščina',
+ 'bg-BG'=> 'Bolgarščina',
+ 'zh-CN'=> 'Kitajščina (Poenostavljena)',
+ 'zh-TW'=> 'Kitajščina (Tradicionalna)',
+ 'ca-ES' => 'Katalonščina',
+ 'hr-HR'=> 'Hrvaščina',
'cs-CZ'=> 'Czech',
'da-DK'=> 'Danish',
'nl-NL'=> 'Dutch',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/sl-SI/mail.php b/resources/lang/sl-SI/mail.php
index 17aae9c740..842a680055 100644
--- a/resources/lang/sl-SI/mail.php
+++ b/resources/lang/sl-SI/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Uporabnik je zahteval sredstev na spletnem mestu',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Ime Dodatka:',
- 'additional_notes' => 'Dodatne opombe:',
+ 'accessory_name' => 'Ime Dodatka',
+ 'additional_notes' => 'Dodatne opombe',
'admin_has_created' => 'Skrbnik vam je ustvaril račun na :web spletni strani.',
- 'asset' => 'Sredstvo:',
- 'asset_name' => 'Ime sredstva:',
+ 'asset' => 'Sredstev',
+ 'asset_name' => 'Ime sredstva',
'asset_requested' => 'Sredstev zahtevano',
'asset_tag' => 'Oznaka sredstva',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Dodeljena',
'best_regards' => 'Lep pozdrav,',
- 'canceled' => 'Preklicana:',
- 'checkin_date' => 'Datum sprejema:',
- 'checkout_date' => 'Datum izdaje:',
+ 'canceled' => 'Preklicana',
+ 'checkin_date' => 'Datum sprejema',
+ 'checkout_date' => 'Datum Izdaje',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Prosimo, kliknite na naslednjo povezavo, da potrdite svoj :spletni račun:',
'current_QTY' => 'Trenutna količina',
'days' => 'Dnevi',
- 'expecting_checkin_date' => 'Predviden datum dobave:',
+ 'expecting_checkin_date' => 'Predviden datum dobave',
'expires' => 'Poteče',
'hello' => 'Pozdravljeni',
'hi' => 'Zdravo',
'i_have_read' => 'Sem prebral oz. prebrala in se strinjam s pogoji uporabe. Potrjujem prejetje opreme.',
- 'inventory_report' => 'Inventory Report',
- 'item' => 'Element:',
+ 'inventory_report' => 'Poročilo o inventarju',
+ 'item' => 'Element',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Prosimo, kliknite na to povezavo, da posodobite svoje: spletno geslo:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ime',
'new_item_checked' => 'Pod vašim imenom je bil izdan nov element, spodaj so podrobnosti.',
'notes' => 'Opombe',
- 'password' => 'Geslo:',
+ 'password' => 'Geslo',
'password_reset' => 'Ponastavitev gesla',
'read_the_terms' => 'Prosimo, preberite pogoje uporabe spodaj.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Zahtevano:',
+ 'requested' => 'Zahtevano',
'reset_link' => 'Povezava za ponastavitev gesla',
'reset_password' => 'Kliknite tukaj, če želite ponastaviti geslo:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/sl-SI/passwords.php b/resources/lang/sl-SI/passwords.php
index 41a87f98ed..9d9fbaa63f 100644
--- a/resources/lang/sl-SI/passwords.php
+++ b/resources/lang/sl-SI/passwords.php
@@ -4,6 +4,6 @@ return [
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
- 'reset' => 'Your password has been reset!',
- 'password_change' => 'Your password has been updated!',
+ 'reset' => 'Geslo je bilo ponastavljeno!',
+ 'password_change' => 'Geslo posodobljeno!',
];
diff --git a/resources/lang/sl-SI/validation.php b/resources/lang/sl-SI/validation.php
index 0c2d690e97..a58c995a02 100644
--- a/resources/lang/sl-SI/validation.php
+++ b/resources/lang/sl-SI/validation.php
@@ -229,7 +229,7 @@ return [
'generic' => [
'invalid_value_in_field' => 'Invalid value included in this field',
- 'required' => 'This field is required',
+ 'required' => 'To polje je obvezno',
'email' => 'Please enter a valid email address',
],
diff --git a/resources/lang/so-SO/admin/locations/message.php b/resources/lang/so-SO/admin/locations/message.php
index 4741833a0c..4514d85f91 100644
--- a/resources/lang/so-SO/admin/locations/message.php
+++ b/resources/lang/so-SO/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Goobtu ma jirto.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Goobtan hadda waxa lala xidhiidhiyaa ugu yaraan hal hanti lamana tirtiri karo. Fadlan cusboonaysii hantidaada si aanay meeshan u tixraacin oo mar kale isku day. ',
'assoc_child_loc' => 'Goobtan hadda waa waalidka ugu yaraan hal meel oo caruur ah lamana tirtiri karo. Fadlan cusboonaysii goobahaaga si aanay mar dambe tixraac goobtan oo isku day mar kale. ',
'assigned_assets' => 'Hantida loo qoondeeyay',
diff --git a/resources/lang/so-SO/admin/settings/general.php b/resources/lang/so-SO/admin/settings/general.php
index 48bab44086..f231d1ea93 100644
--- a/resources/lang/so-SO/admin/settings/general.php
+++ b/resources/lang/so-SO/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Kaabta',
'backups_help' => 'Abuur, soo deji, oo soo celi kaydinta ',
'backups_restoring' => 'Ka soo celinta kaabta',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Soo rar kaabta',
'backups_path' => 'Kaydka serfarka waxa lagu kaydiyaa :path',
'backups_restore_warning' => 'Isticmaal badhanka soo celinta si looga soo celiyo kayd hore.(Tani hadda kuma shaqaynayso kaydinta faylka S3 ama Docker.)
Macluumaadkaaga dhan :app_name iyo wixii faylal ah ee la shubo waxaa gabi ahaanba lagu bedeli doonaawaxa ku jira faylka kaydinta. ',
diff --git a/resources/lang/so-SO/admin/users/message.php b/resources/lang/so-SO/admin/users/message.php
index 0bfdb4decd..c39582a80b 100644
--- a/resources/lang/so-SO/admin/users/message.php
+++ b/resources/lang/so-SO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Si guul leh ayaad u diiday hantidan.',
'bulk_manager_warn' => 'Isticmaalayaashaada si guul leh ayaa loo cusboonaysiiyay, si kastaba ha ahaatee gelitaanka maamulahaaga lama kaydin sababtoo ah maareeyaha aad dooratay sidoo kale waxa uu ku jiray liiska isticmaalayaasha ee la tafatiray, isticmaalayaashuna waxa laga yaabaa in aanay noqon maamulahooda. Fadlan dooro isticmaalayaashaada mar labaad, marka laga reebo maamulaha.',
'user_exists' => 'Isticmaale ayaa hore u jiray!',
- 'user_not_found' => 'Isticmaaluhu ma jiro.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Goobta galitaanka ayaa loo baahan yahay',
'user_has_no_assets_assigned' => 'Ma jirto hanti hadda loo qoondeeyay isticmaalaha.',
'user_password_required' => 'Furaha sirta ah ayaa loo baahan yahay.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Ma baadhi karin server-ka LDAP Fadlan ka hubi server-kaaga LDAP ee ku jira faylka habaynta LDAP.
Khalad ka yimid Server LDAP:',
'ldap_could_not_get_entries' => 'Waa lagu xidhi kari waayay serfarka LDAP Fadlan ka hubi server-kaaga LDAP ee ku jira faylka habaynta LDAP. Khalad ka yimid Server LDAP:',
'password_ldap' => 'Furaha koontada waxaa maamula LDAP/Hagaha Firfircoon. Fadlan la xidhiidh waaxda IT-ga si aad u bedesho eraygaaga sirta ah. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/so-SO/general.php b/resources/lang/so-SO/general.php
index de74074394..502a81f7ec 100644
--- a/resources/lang/so-SO/general.php
+++ b/resources/lang/so-SO/general.php
@@ -418,7 +418,7 @@ return [
'bulk_soft_delete' =>'Sidoo kale jilicsan-tirtir isticmaalayaashan. Taariikhdooda hantiyeed way ahaan doontaa ilaa aad ka nadiifiso diiwaanada la tirtiray ee goobaha maamulka.',
'bulk_checkin_delete_success' => 'Isticmaalayaasha aad dooratay waa la tirtiray oo alaabtooda waa la hubiyay.',
'bulk_checkin_success' => 'Alaabta isticmaalayaasha la xushay waa la hubiyay',
- 'set_to_null' => 'Tirtir qiyamka hantidan|Tirtir qiyamka dhammaan :asset_count hantida ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Tirtir :field qiyamka isticmaalaha|Tirtir :field qiimayaasha dhammaan :user_count isticmaalayaasha ',
'na_no_purchase_date' => 'N/A - Taariikhda iibsi lama bixin',
'assets_by_status' => 'Hantida xaalka',
@@ -558,8 +558,8 @@ return [
'expires' => 'Dhacaya',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/so-SO/localizations.php b/resources/lang/so-SO/localizations.php
index dedafe13cf..6fffc07e34 100644
--- a/resources/lang/so-SO/localizations.php
+++ b/resources/lang/so-SO/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Dooro luqad',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Ingiriis, US',
'en-GB'=> 'Ingiriis, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Dal dooro',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Jasiiradda Ascension',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Masar',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Isbayn',
'ET'=>'Itoobiya',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Nederlaan',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Xiriirka Ruushka',
'RW'=>'Rwanda',
'SA'=>'Sacuudi Carabiya',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'Koonfurta Suudaan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Jasiiradaha Virgin (US)',
'VN'=>'Fiitnaam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis iyo Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/so-SO/mail.php b/resources/lang/so-SO/mail.php
index 2b494ce19c..b148c195ba 100644
--- a/resources/lang/so-SO/mail.php
+++ b/resources/lang/so-SO/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Isticmaaluhu wuxuu ka codsaday shay shabakada',
'acceptance_asset_accepted' => 'Isticmaaluhu waa aqbalay shay',
'acceptance_asset_declined' => 'Isticmaaluhu waa diiday shay',
- 'accessory_name' => 'Magaca Agabka:',
- 'additional_notes' => 'Qoraalo Dheeraad ah:',
+ 'accessory_name' => 'Magaca dheeriga ah',
+ 'additional_notes' => 'Qoraalo Dheeraad ah',
'admin_has_created' => 'Maamule ayaa akoon kaaga sameeyay :web mareegaha',
- 'asset' => 'Hantida:',
- 'asset_name' => 'Magaca Hantida:',
+ 'asset' => 'Hantida',
+ 'asset_name' => 'Magaca Hantida',
'asset_requested' => 'Hantida la codsaday',
'asset_tag' => 'Hantida Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Loo xilsaaray',
'best_regards' => 'Salaan wanagsan',
- 'canceled' => 'La joojiyay:',
- 'checkin_date' => 'Taariikhda la soo galayo:',
- 'checkout_date' => 'Taariikhda Bixinta:',
+ 'canceled' => 'La joojiyay',
+ 'checkin_date' => 'Taariikhda la soo galayo',
+ 'checkout_date' => 'Taariikhda Bixinta',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Laga soo hubiyay',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Fadlan dhagsii xidhiidhka soo socda si aad u xaqiijiso :web akoonkaaga:',
'current_QTY' => 'QTY-da hadda',
'days' => 'Maalmo',
- 'expecting_checkin_date' => 'Taariikhda la filayo:',
+ 'expecting_checkin_date' => 'Taariikhda la filayo',
'expires' => 'Dhacaya',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'Waan akhriyay oo waan aqbalay shuruudaha isticmaalka, waxaana helay shaygan.',
'inventory_report' => 'Warbixinta Alaabada',
- 'item' => 'Shayga:',
+ 'item' => 'Shayga',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Fadlan dhagsii xidhiidhka soo socda si aad u cusboonaysiiso :web eraygaaga sirta ah:',
@@ -66,11 +66,11 @@ return [
'name' => 'Magaca',
'new_item_checked' => 'Shay cusub ayaa lagu hubiyay magacaaga hoostiisa.',
'notes' => 'Xusuusin',
- 'password' => 'Furaha sirta ah:',
+ 'password' => 'Password-ka',
'password_reset' => 'Dib u habaynta erayga sirta ah',
'read_the_terms' => 'Fadlan hoos ka akhri shuruudaha isticmaalka',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'La codsaday:',
+ 'requested' => 'La codsaday',
'reset_link' => 'Xidhiidhka Dib-u-dejinta Furahaaga',
'reset_password' => 'Riix halkan si aad dib ugu dejiso eraygaaga sirta ah:',
'rights_reserved' => 'Dhammaan xuquuqaha way xifdiyeen',
diff --git a/resources/lang/sq-AL/admin/locations/message.php b/resources/lang/sq-AL/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/sq-AL/admin/locations/message.php
+++ b/resources/lang/sq-AL/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/sq-AL/admin/settings/general.php b/resources/lang/sq-AL/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/sq-AL/admin/settings/general.php
+++ b/resources/lang/sq-AL/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/sq-AL/admin/users/message.php b/resources/lang/sq-AL/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/sq-AL/admin/users/message.php
+++ b/resources/lang/sq-AL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/sq-AL/general.php b/resources/lang/sq-AL/general.php
index 7634387906..3092228674 100644
--- a/resources/lang/sq-AL/general.php
+++ b/resources/lang/sq-AL/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/sq-AL/localizations.php b/resources/lang/sq-AL/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/sq-AL/localizations.php
+++ b/resources/lang/sq-AL/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/sq-AL/mail.php b/resources/lang/sq-AL/mail.php
index edb1683200..72fb70db80 100644
--- a/resources/lang/sq-AL/mail.php
+++ b/resources/lang/sq-AL/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/sr-CS/admin/locations/message.php b/resources/lang/sr-CS/admin/locations/message.php
index 4284448c2c..89cb1eb007 100644
--- a/resources/lang/sr-CS/admin/locations/message.php
+++ b/resources/lang/sr-CS/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Lokacija ne postoji.',
- 'assoc_users' => 'Ova lokaciju trenutno nije moguće obrisati zato što je lokacija zapisa barem jedne imovine ili korisnika, ima imovinu dodeljenu njoj, ili je nadlokacija drugoj lokaciji. Molim vas izmenite modele da više ne referenciraju ovu lokaciju i pokušajte ponovo. ',
+ 'assoc_users' => 'Lokacija trenutno nije obrisiva zato što je to lokacija zapisa barem jedne imovine ili korisnika, ima imovinu zaduženju njoj, ili je nadlokacija druge lokacije. Molim vas izmenite vaše podatke tako da više nemaju vezu ka ovoj lokaciji i pokušajte ponovo. ',
'assoc_assets' => 'Ta je lokacija trenutno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte resurs da se više ne referencira na tu lokaciju i pokušajte ponovno. ',
'assoc_child_loc' => 'Ta je lokacija trenutno roditelj najmanje jednoj podredjenoj lokaciji i ne može se izbrisati. Ažurirajte svoje lokacije da se više ne referenciraju na ovu lokaciju i pokušajte ponovo. ',
'assigned_assets' => 'Dodeljena imovina',
diff --git a/resources/lang/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php
index bd1f023127..3077035287 100644
--- a/resources/lang/sr-CS/admin/settings/general.php
+++ b/resources/lang/sr-CS/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Rezervne kopije',
'backups_help' => 'Kreirajte, preuzmite i vratite rezervne kopije ',
'backups_restoring' => 'Vraćanje rezervne kopije',
+ 'backups_clean' => 'Očisti rezervnu kopiju baze podataka pre povraćanja',
+ 'backups_clean_helptext' => "Ovo može biti korisno ako menjate verzije baza popdataka",
'backups_upload' => 'Učitavanje rezervne kopije',
'backups_path' => 'Rezervne kopije se čuvaju na :path',
'backups_restore_warning' => 'Koristite dugme za vraćanje da bi ste vratili na raniju rezervnu kopiju. (Ovo trenutno ne radi sa S3 skladištem datoteka ili Docker-om.)
Vaša kompletna :app_name baza podataka i sve zakačene datoteke će biti potpuno zamenjene sa onim što je u rezervnoj kopiji. ',
diff --git a/resources/lang/sr-CS/admin/users/message.php b/resources/lang/sr-CS/admin/users/message.php
index 27b29f7ada..e095c03f1c 100644
--- a/resources/lang/sr-CS/admin/users/message.php
+++ b/resources/lang/sr-CS/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Uspješno ste odbili ovaj resurs.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'Korisnik već postoji!',
- 'user_not_found' => 'Korisnik ne postoji.',
+ 'user_not_found' => 'Korisnik ne postoji ili vi nemate ovlašćenja da ih vidite.',
'user_login_required' => 'Polje za prijavu je obavezno',
'user_has_no_assets_assigned' => 'Trenutno nema imovine zadužene korisniku.',
'user_password_required' => 'Lozinka je obavezna.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Nije moguće pretražiti LDAP server. Proverite konfiguraciju LDAP servera.
Greška sa LDAP servera:',
'ldap_could_not_get_entries' => 'Nije bilo moguće dobiti zapise sa LDAP servera. Proverite konfiguraciju LDAP servera.
Greška sa LDAP servera:',
'password_ldap' => 'Lozinku za ovaj nalog kontroliše LDAP / Active Directory. Obratite se IT centru za promenu lozinke. ',
+ 'multi_company_items_assigned' => 'Ovaj korisnim ima zaduženu imovinu. Razdužite je pre promene kompanije.'
),
'deletefile' => array(
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index 02183154fb..29c3ad296d 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Privremeno obrišite ove korisnike. Njihova istorija imovine će ostati netaknuta osim/sve dok ne očistite izbrisane zapise u podešavanjima administratora.',
'bulk_checkin_delete_success' => 'Vaši izabrani korisnici su izbrisani i njihove stavke su čekirane.',
'bulk_checkin_success' => 'Stavke za izabrane korisnike su čekirane.',
- 'set_to_null' => 'Obriši vrednosti ove imovine|Obriši vrednosti za svih :asset_count imovina ',
+ 'set_to_null' => 'Obriši vrednosti ovog izbora|Obriši vrednosti svih :selection_count izbora ',
'set_users_field_to_null' => 'Obriši :field vrednosti za ovog korisnika|Obriši :field vrednosti za svih :user_count korisnika ',
'na_no_purchase_date' => 'N/A - Nema datuma porudžbine',
'assets_by_status' => 'Imovina prema statusu',
@@ -559,8 +559,8 @@ return [
'expires' => 'Ističe',
'map_fields'=> 'Mapiraj polje :item_type',
'remaining_var' => ':count preostalo',
- 'assets_in_var' => 'Imovina u :name :type',
'label' => 'Oznaka',
'import_asset_tag_exists' => 'Imovina sa oznakom imovine :asset_tag već postoji i izmena nije zatražena. Nijedna izmena nije izvršena.',
+ 'countries_manually_entered_help' => 'Vrednosti sa zvezdicom (*) su ručno upisane i ne poklapaju se sa postojećim ISO 3166 vrednostima iz padajućeg menija',
];
diff --git a/resources/lang/sr-CS/localizations.php b/resources/lang/sr-CS/localizations.php
index e2b472e677..b203146c2e 100644
--- a/resources/lang/sr-CS/localizations.php
+++ b/resources/lang/sr-CS/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Izaberi jezik',
+ 'select_language' => 'Izaberite jezik',
'languages' => [
'en-US'=> 'Engleski, SAD',
'en-GB'=> 'Engleski, UK',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ekvador',
'EE'=>'Estonija',
'EG'=>'Egipat',
+ 'GB-ENG'=>'Engleska',
'ER'=>'Eritreja',
'ES'=>'Španija',
'ET'=>'Etiopija',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigerija',
'NI'=>'Nikaragva',
'NL'=>'Holandija',
+ 'GB-NIR' => 'Severna Irska',
'NO'=>'Norveška',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Rusija',
'RW'=>'Ruanda',
'SA'=>'Južna Arabija',
- 'UK'=>'Škotska',
+ 'GB-SCT'=>'Škotska',
'SB'=>'Solomonska ostrva',
'SC'=>'Sejšeli',
'SS'=>'Južni Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Devičanska ostrva (SAD)',
'VN'=>'Vijetnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Vels',
'WF'=>'Ostrva Valis i Futuna',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/sr-CS/mail.php b/resources/lang/sr-CS/mail.php
index 2cc442c360..b4bd6eab82 100644
--- a/resources/lang/sr-CS/mail.php
+++ b/resources/lang/sr-CS/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Korisnik je zatražio stavke na Web lokaciji',
'acceptance_asset_accepted' => 'Korisnik je prihvatio stavku',
'acceptance_asset_declined' => 'Korisnik je odbio stavku',
- 'accessory_name' => 'Naziv dodatne opreme, pribora:',
- 'additional_notes' => 'Dodatne napomene:',
+ 'accessory_name' => 'Naziv pribora',
+ 'additional_notes' => 'Dodatne napomene',
'admin_has_created' => 'Administrator je kreirao nalog za vas na na :web vebsajtu.',
- 'asset' => 'Imovina:',
- 'asset_name' => 'Naziv imovine:',
+ 'asset' => 'Imovina',
+ 'asset_name' => 'Naziv imovine',
'asset_requested' => 'Traženo sredstvo',
'asset_tag' => 'Oznaka imovine',
'assets_warrantee_alert' => 'Postoji :stanje licenci koja/e ističe u narednih :treshold dana.|Postoje :count licenci koje ističu u narednih :treshold dana.',
'assigned_to' => 'Dodijeljena',
'best_regards' => 'Srdačan pozdrav',
- 'canceled' => 'Otkazano:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Otkazano',
+ 'checkin_date' => 'Datum razduženja',
+ 'checkout_date' => 'Datum zaduženja',
'checkedout_from' => 'Zaduženo iz',
'checkedin_from' => 'Razduženo od',
'checked_into' => 'Razduženo u',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Kliknite na sljedeći link kako biste potvrdili svoj :web nalog:',
'current_QTY' => 'Trenutna QTY',
'days' => 'Dana',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Očekivani datum razduženja',
'expires' => 'Ističe',
'hello' => 'Zdravo',
'hi' => 'Zdravo',
'i_have_read' => 'Pročitao sam i prihvatam uvete korištenja i primio sam ovu stavku.',
'inventory_report' => 'Izveštaj o zalihama',
- 'item' => 'Artikal:',
+ 'item' => 'Stavka',
'item_checked_reminder' => 'Ovo je podsetnik da trenutno imate :count stavki koje su zadužene vama koje niste prihvatili ili odbili. Molim vas kliknite na vezu ispod da bi ste potvrdili vašu odluku.',
'license_expiring_alert' => 'Postoji :count licenci koja/e ističe u narednih treshold dana.|Postoje :count licencei koje ističu u narednih :treshold dana.',
'link_to_update_password' => 'Kliknite na sledeću vezu kako biste obnovili svoju :web lozinku:',
@@ -66,11 +66,11 @@ return [
'name' => 'Naziv',
'new_item_checked' => 'Nova stavka je proverena pod vašim imenom, detalji su u nastavku.',
'notes' => 'Zabeleške',
- 'password' => 'Lozinka:',
+ 'password' => 'Lozinka',
'password_reset' => 'Ponovno postavljanje lozinke',
'read_the_terms' => 'Pročitajte uslove upotrebe u nastavku.',
'read_the_terms_and_click' => 'Molim vas pročitajte uslove ispod, i kliknite na vezu na dnu da bi ste potvrdili da ste ih pročitali i da se slažete sa uslovima korišćenja, i da ste primili imovinu.',
- 'requested' => 'Traženi:',
+ 'requested' => 'Tražena',
'reset_link' => 'Link za resetovanje lozinke',
'reset_password' => 'Kliknite ovde da biste poništili lozinku:',
'rights_reserved' => 'Sva prava zadržana.',
diff --git a/resources/lang/sv-SE/admin/locations/message.php b/resources/lang/sv-SE/admin/locations/message.php
index aa09ea2b65..49c152fc20 100644
--- a/resources/lang/sv-SE/admin/locations/message.php
+++ b/resources/lang/sv-SE/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Platsen finns inte.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Platsen är associerad med minst en tillgång och kan inte tas bort. Vänligen uppdatera dina tillgångar så dom inte refererar till denna plats och försök igen. ',
'assoc_child_loc' => 'Denna plats är för närvarande överliggande för minst en annan plats och kan inte tas bort. Vänligen uppdatera dina platser så dom inte längre refererar till denna och försök igen.',
'assigned_assets' => 'Tilldelade tillgångar',
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index 39a6481989..d653b9a85b 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Säkerhetskopior',
'backups_help' => 'Skapa, ladda ner och återställ säkerhetskopior ',
'backups_restoring' => 'Återställ från säkerhetskopia',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Ladda upp säkerhetskopia',
'backups_path' => 'Säkerhetskopior på servern lagras i :path',
'backups_restore_warning' => 'Använd återställningsknappen för att återställa från en tidigare säkerhetskopia. (Detta fungerar för närvarande inte med S3-fillagring eller Docker.)
Din hela :app_name databas och alla uppladdade filer kommer att helt ersättas av vad som finns i backupfilen. ',
diff --git a/resources/lang/sv-SE/admin/users/message.php b/resources/lang/sv-SE/admin/users/message.php
index b7390912ab..d411c0fc0b 100644
--- a/resources/lang/sv-SE/admin/users/message.php
+++ b/resources/lang/sv-SE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Du har framgångsrikt nekat den här tillgången.',
'bulk_manager_warn' => 'Dina användare har uppdaterats, men chefsfältet sparades inte eftersom den chef du valt även finns i användarlistan, en användare kanske inte ange sig själv som chef. Vänligen välj dina användare igen, med undantag av chefen.',
'user_exists' => 'Användaren existerar redan!',
- 'user_not_found' => 'Användaren finns inte.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Inloggningsfältet krävs',
'user_has_no_assets_assigned' => 'Inga tillgångar som för närvarande tilldelats användaren.',
'user_password_required' => 'Lösenordet krävs.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Det gick inte att söka på LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Fel från LDAP-servern:',
'ldap_could_not_get_entries' => 'Det gick inte att få poster från LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Fel från LDAP-servern:',
'password_ldap' => 'Lösenordet för det här kontot hanteras av LDAP / Active Directory. Vänligen kontakta din IT-avdelning för att ändra ditt lösenord.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index 2b679f06ce..1888b8dd93 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Samt ta bort dessa användare. Deras tillgångshistorik kommer att förbli intakt om inte/tills du rensar bort borttagna poster i administratörsinställningarna.',
'bulk_checkin_delete_success' => 'Dina valda användare har tagits bort och deras objekt har checkats in.',
'bulk_checkin_success' => 'Objekten för de valda användarna har checkats in.',
- 'set_to_null' => 'Ta bort värden för denna tillgång|Ta bort värden för alla :asset_count tillgångar ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Ta bort :field värden för denna användare|Ta bort :field värden för alla :user_count användare ',
'na_no_purchase_date' => 'N/A - Inget inköpsdatum angivet',
'assets_by_status' => 'Tillgångar efter status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Utgår',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/sv-SE/localizations.php b/resources/lang/sv-SE/localizations.php
index e72abe530e..58b382bba3 100644
--- a/resources/lang/sv-SE/localizations.php
+++ b/resources/lang/sv-SE/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Välj ett språk',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Engelska, USA',
'en-GB'=> 'Engelska, Storbritannien',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Välj ett land',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ön Ascension',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estland',
'EG'=>'Egypten',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spanien',
'ET'=>'Etiopien',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Nederländerna',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norge',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Ryssland',
'RW'=>'Rwanda',
'SA'=>'Saudiarabien',
- 'UK'=>'Skottland',
+ 'GB-SCT'=>'Skottland',
'SB'=>'Salomonöarna',
'SC'=>'Seychellerna',
'SS'=>'Södra Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Jungfruöarna (USA)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis- och Futunaöarna',
'WS'=>'Samoa',
'YE'=>'Jemen',
diff --git a/resources/lang/sv-SE/mail.php b/resources/lang/sv-SE/mail.php
index b56d110774..5c2a46c3e8 100644
--- a/resources/lang/sv-SE/mail.php
+++ b/resources/lang/sv-SE/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'En användare har efterfrågat en artikel webbplatsen',
'acceptance_asset_accepted' => 'En användare har accepterat ett objekt',
'acceptance_asset_declined' => 'En användare har avböjt ett objekt',
- 'accessory_name' => 'Tillbehörsnamn:',
- 'additional_notes' => 'Ytterligare anmärkningar:',
+ 'accessory_name' => 'Tillbehörsnamn',
+ 'additional_notes' => 'Ytterligare anmärkningar',
'admin_has_created' => 'En administratör har skapat ett konto för dig på: webbsidan.',
- 'asset' => 'Tillgång:',
- 'asset_name' => 'Tillgångsnamn:',
+ 'asset' => 'Tillgång',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Tillgången begärd',
'asset_tag' => 'Tillgångstagg',
'assets_warrantee_alert' => 'Det finns :count tillgång med en garanti som löper ut under de kommande :threshold dagar.|Det finns :count tillgångar med garantier som löper ut under de kommande :threshold dagar.',
'assigned_to' => 'Tilldelats',
'best_regards' => 'Vänliga hälsningar,',
- 'canceled' => 'Avbruten:',
- 'checkin_date' => 'Incheckningsdatum:',
- 'checkout_date' => 'Utcheckningsdatum:',
+ 'canceled' => 'Avbruten',
+ 'checkin_date' => 'Incheckningsdatum',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checkade ut från',
'checkedin_from' => 'Incheckad från',
'checked_into' => 'Incheckad',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Vänligen klicka på följande länk för att bekräfta ditt: webbkonto:',
'current_QTY' => 'Nuvarande antal',
'days' => 'dagar',
- 'expecting_checkin_date' => 'Förväntat incheckningsdatum:',
+ 'expecting_checkin_date' => 'Förväntad incheckningsdatum',
'expires' => 'Utgår',
'hello' => 'Hallå',
'hi' => 'Hej',
'i_have_read' => 'Jag har läst och godkänt användarvillkoren och har fått den här produkten.',
'inventory_report' => 'Inventarierapport',
- 'item' => 'Artikel:',
+ 'item' => 'Artikel',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => ':count licens löper ut inom :threshold dagar.|:count licenser löper ut inom :threshold days.',
'link_to_update_password' => 'Vänligen klicka på följande länk för att uppdatera ditt: webblösenord:',
@@ -66,11 +66,11 @@ return [
'name' => 'namn',
'new_item_checked' => 'En ny artikel har blivit utcheckad i ditt namn, se detaljer nedan.',
'notes' => 'anteckningar',
- 'password' => 'Lösenord:',
+ 'password' => 'Lösenord',
'password_reset' => 'Lösenordsåterställning',
'read_the_terms' => 'Läs användarvillkoren nedan.',
'read_the_terms_and_click' => 'Läs användarvillkoren nedan, och klicka på länken längst ner för att bekräfta att du läst och godkänner användarvillkoren och har fått tillgången.',
- 'requested' => 'Begärda:',
+ 'requested' => 'Begärda',
'reset_link' => 'Länk för att återställa ditt lösenord',
'reset_password' => 'Klicka här för att återställa ditt lösenord:',
'rights_reserved' => 'Med ensamrätt.',
diff --git a/resources/lang/ta-IN/admin/locations/message.php b/resources/lang/ta-IN/admin/locations/message.php
index e97f5b4e96..05075c7edd 100644
--- a/resources/lang/ta-IN/admin/locations/message.php
+++ b/resources/lang/ta-IN/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'இருப்பிடம் இல்லை.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'இந்த இடம் தற்போது குறைந்தது ஒரு சொத்துடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த இருப்பிடத்தை இனி குறிப்பிடாமல் உங்கள் சொத்துக்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.',
'assoc_child_loc' => 'இந்த இடம் தற்போது குறைந்தது ஒரு குழந்தையின் இருப்பிடத்தின் பெற்றோர் மற்றும் அதை நீக்க முடியாது. இந்த இருப்பிடத்தை இனி குறிப்பிடாமல் இருக்க உங்கள் இருப்பிடங்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ta-IN/admin/settings/general.php b/resources/lang/ta-IN/admin/settings/general.php
index 12ec590a53..9c14e388b1 100644
--- a/resources/lang/ta-IN/admin/settings/general.php
+++ b/resources/lang/ta-IN/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'காப்புப்பிரதிகளில்',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ta-IN/admin/users/message.php b/resources/lang/ta-IN/admin/users/message.php
index 9176bea4fe..14e1281caa 100644
--- a/resources/lang/ta-IN/admin/users/message.php
+++ b/resources/lang/ta-IN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'இந்த சொத்து வெற்றிகரமாக நிராகரித்தது.',
'bulk_manager_warn' => 'உங்கள் பயனர் வெற்றிகரமாக புதுப்பிக்கப்பட்டிருந்தாலும், உங்கள் மேலாளர் நுழைவு சேமிக்கப்படவில்லை, ஏனெனில் நீங்கள் தேர்ந்தெடுத்த மேலாளர் பயனர் பட்டியலில் திருத்தப்பட வேண்டும், மேலும் பயனர்கள் தங்கள் மேலாளராக இருக்கலாம். மேலாளரைத் தவிர்த்து உங்கள் பயனர்களை மீண்டும் தேர்ந்தெடுக்கவும்.',
'user_exists' => 'பயனர் ஏற்கனவே உள்ளது!',
- 'user_not_found' => 'பயனர் இல்லை.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'உள்நுழைவுத் துறை தேவைப்படுகிறது',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'கடவுச்சொல் தேவை.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'LDAP சேவையகத்தை தேட முடியவில்லை. LDAP கட்டமைப்பு கோப்பில் உங்கள் LDAP சர்வர் கட்டமைப்பை சரிபார்க்கவும்.
LDAP சேவையகத்திலிருந்து பிழை:',
'ldap_could_not_get_entries' => 'LDAP சேவையகத்திலிருந்து உள்ளீடுகளை பெற முடியவில்லை. LDAP கட்டமைப்பு கோப்பில் உங்கள் LDAP சர்வர் கட்டமைப்பை சரிபார்க்கவும்.
LDAP சேவையகத்திலிருந்து பிழை:',
'password_ldap' => 'இந்த கணக்கிற்கான கடவுச்சொல் LDAP / Active Directory மூலம் நிர்வகிக்கப்படுகிறது. உங்கள் கடவுச்சொல்லை மாற்ற உங்கள் IT பிரிவை தொடர்பு கொள்ளவும்.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ta-IN/general.php b/resources/lang/ta-IN/general.php
index b29c97ded8..f448aa0d74 100644
--- a/resources/lang/ta-IN/general.php
+++ b/resources/lang/ta-IN/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'காலாவதியாகிறது',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ta-IN/localizations.php b/resources/lang/ta-IN/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/ta-IN/localizations.php
+++ b/resources/lang/ta-IN/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ta-IN/mail.php b/resources/lang/ta-IN/mail.php
index 36269c9bbe..121e46e3ba 100644
--- a/resources/lang/ta-IN/mail.php
+++ b/resources/lang/ta-IN/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'வலைத்தளத்தில் பயனர் ஒரு உருப்படியைக் கோரியுள்ளார்',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'துணை பெயர்:',
- 'additional_notes' => 'கூடுதல் குறிப்புகள்:',
+ 'accessory_name' => 'துணை பெயர்',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'ஒரு வலைத்தளம் உங்களுக்கு ஒரு கணக்கை உருவாக்கியுள்ளது: இணையத்தளம்.',
- 'asset' => 'சொத்து:',
- 'asset_name' => 'சொத்து பெயர்:',
+ 'asset' => 'சொத்து',
+ 'asset_name' => 'சொத்து பெயர்',
'asset_requested' => 'சொத்து கோரப்பட்டது',
'asset_tag' => 'சொத்து டேக்',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'ஒதுக்கப்படும்',
'best_regards' => 'சிறந்த வாழ்த்துக்கள்,',
- 'canceled' => 'ரத்து செய்தவர்:',
+ 'canceled' => 'Canceled',
'checkin_date' => 'சரி தேதி',
- 'checkout_date' => 'புதுப்பிப்பு தேதி:',
+ 'checkout_date' => 'புதுப்பிப்பு தேதி',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'உங்கள்: இணைய கணக்கை உறுதிப்படுத்த பின்வரும் இணைப்பை கிளிக் செய்யவும்:',
'current_QTY' => 'தற்போதைய QTY',
'days' => 'நாட்களில்',
- 'expecting_checkin_date' => 'எதிர்பார்த்த செக்கின் தேதி:',
+ 'expecting_checkin_date' => 'எதிர்பார்த்த செக்கின் தேதி',
'expires' => 'காலாவதியாகிறது',
'hello' => 'வணக்கம்',
'hi' => 'வணக்கம்',
'i_have_read' => 'நான் பயன்பாட்டு விதிமுறைகளைப் படித்து ஒப்புக்கொள்கிறேன், இந்த உருப்படியைப் பெற்றுள்ளேன்.',
'inventory_report' => 'Inventory Report',
- 'item' => 'பொருள்:',
+ 'item' => 'பொருள்',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'தயவுசெய்து புதுப்பிக்க பின்வரும் இணைப்பை கிளிக் செய்யவும்: உங்கள் இணைய கடவுச்சொல்:',
@@ -66,11 +66,11 @@ return [
'name' => 'பெயர்',
'new_item_checked' => 'உங்கள் பெயரில் ஒரு புதிய உருப்படி சோதிக்கப்பட்டது, விவரங்கள் கீழே உள்ளன.',
'notes' => 'குறிப்புக்கள்',
- 'password' => 'கடவுச்சொல்:',
+ 'password' => 'கடவுச்சொல்',
'password_reset' => 'கடவுச்சொல்லை மீட்டமை',
'read_the_terms' => 'கீழே உள்ள விதிமுறைகளை தயவுசெய்து படித்துப் பாருங்கள்.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'கோரியவர்:',
+ 'requested' => 'கோரப்பட்டது',
'reset_link' => 'உங்கள் கடவுச்சொல்லை மீட்டமை இணைப்பு',
'reset_password' => 'உங்கள் கடவுச்சொல்லை மீட்டமைக்க இங்கே கிளிக் செய்க:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/th-TH/admin/locations/message.php b/resources/lang/th-TH/admin/locations/message.php
index 5daae8baa7..53ee167add 100644
--- a/resources/lang/th-TH/admin/locations/message.php
+++ b/resources/lang/th-TH/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'ไม่มีสถานที่นี้.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับผู้ใช้งานคนใดคนหนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงผู้ใช้งานของท่านไม่ให้มีส่วนเกี่ยวข้องกับสถานที่นี้ และลองอีกครั้ง. ',
'assoc_child_loc' => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับหมวดสถานที่ใดที่หนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงสถานที่ของท่านไม่ให้มีส่วนเกี่ยวข้องกับหมวดสถานที่นี้ และลองอีกครั้ง. ',
'assigned_assets' => 'สินทรัพย์ถูกมอบหมายแล้ว',
diff --git a/resources/lang/th-TH/admin/settings/general.php b/resources/lang/th-TH/admin/settings/general.php
index 067f6de4c0..56426a6782 100644
--- a/resources/lang/th-TH/admin/settings/general.php
+++ b/resources/lang/th-TH/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'สำรอง',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/th-TH/admin/users/message.php b/resources/lang/th-TH/admin/users/message.php
index 2426e9b969..35fd1ca9d8 100644
--- a/resources/lang/th-TH/admin/users/message.php
+++ b/resources/lang/th-TH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'คุณปฏิเสธสินทรัพย์นี้เรียบร้อยแล้ว',
'bulk_manager_warn' => 'ผู้ใช้ของคุณได้รับการอัปเดตแล้วแม้ว่ารายการผู้จัดการจะไม่ได้รับการบันทึกเนื่องจากผู้จัดการที่คุณเลือกอยู่ในรายชื่อผู้ใช้ที่จะแก้ไขและผู้ใช้ต้องไม่เป็นผู้จัดการของตัวเอง โปรดเลือกผู้ใช้ของคุณอีกครั้งโดยไม่รวมผู้จัดการ',
'user_exists' => 'มีผู้ใช้งานนี้แล้ว',
- 'user_not_found' => 'ไม่มีผู้ใช้',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'ต้องการชื่อผู้ใช้งาน',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'ต้องการรหัสผ่าน',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'ไม่สามารถค้นหา LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server:',
'ldap_could_not_get_entries' => 'ไม่สามารถดึงข้อมูลจาก LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server:',
'password_ldap' => 'รหัสผ่านสำหรับบัญชีนี้ได้รับการจัดการโดย LDAP / Active Directory โปรดติดต่อฝ่ายไอทีของคุณเพื่อเปลี่ยนรหัสผ่านของคุณ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/th-TH/general.php b/resources/lang/th-TH/general.php
index 50c6237901..3a24876507 100644
--- a/resources/lang/th-TH/general.php
+++ b/resources/lang/th-TH/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'วันที่หมดอายุ',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/th-TH/localizations.php b/resources/lang/th-TH/localizations.php
index ed1cb1e0ac..fdca1532bd 100644
--- a/resources/lang/th-TH/localizations.php
+++ b/resources/lang/th-TH/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'เลือกภาษา',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/th-TH/mail.php b/resources/lang/th-TH/mail.php
index d8368bac99..e7e85253b3 100644
--- a/resources/lang/th-TH/mail.php
+++ b/resources/lang/th-TH/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'ผู้ใช้ร้องขอรายการบนเว็บไซต์',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'ชื่ออุปกรณ์เสริม:',
- 'additional_notes' => 'หมายเหตุเพิ่มเติม:',
+ 'accessory_name' => 'ชื่ออุปกรณ์เสริม',
+ 'additional_notes' => 'หมายเหตุเพิ่มเติม',
'admin_has_created' => 'ผู้ดูแลระบบได้สร้างบัญชีให้กับคุณบนเว็บไซต์: web',
- 'asset' => 'ทรัพย์สิน:',
- 'asset_name' => 'ชื่อสินทรัพย์:',
+ 'asset' => 'สินทรัพย์',
+ 'asset_name' => 'ชื่อสินทรัพย์',
'asset_requested' => 'สินทรัพย์ที่ขอ',
'asset_tag' => 'แท็กทรัพย์สิน',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'ได้รับมอบหมายให้',
'best_regards' => 'ด้วยความเคารพ,',
- 'canceled' => 'ยกเลิก:',
- 'checkin_date' => 'วันที่เช็คอิน:',
- 'checkout_date' => 'วันที่ชำระเงิน:',
+ 'canceled' => 'ยกเลิก',
+ 'checkin_date' => 'วันที่เช็คอิน',
+ 'checkout_date' => 'ชำระเงินวันที่',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'โปรดคลิกลิงก์ต่อไปนี้เพื่อยืนยันข้อมูล: บัญชีเว็บ:',
'current_QTY' => 'QTY ปัจจุบัน',
'days' => 'วัน',
- 'expecting_checkin_date' => 'คาดว่าวันที่เช็คอิน:',
+ 'expecting_checkin_date' => 'วันที่เช็คอินที่คาดหวังไว้',
'expires' => 'วันที่หมดอายุ',
'hello' => 'สวัสดี',
'hi' => 'สวัสดี',
'i_have_read' => 'ฉันได้อ่านและยอมรับข้อกำหนดในการให้บริการแล้วและได้รับสินค้านี้แล้ว',
'inventory_report' => 'Inventory Report',
- 'item' => 'รายการ:',
+ 'item' => 'รายการ',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'มี: ใบอนุญาตที่จะหมดอายุในวันถัดไป: วันที่กำหนด|มี: ใบอนุญาตที่จะหมดอายุในวันถัดไป: วันที่กำหนด',
'link_to_update_password' => 'โปรดคลิกลิงก์ต่อไปนี้เพื่ออัปเดต: รหัสผ่านเว็บ:',
@@ -66,11 +66,11 @@ return [
'name' => 'ชื่อ',
'new_item_checked' => 'รายการใหม่ได้รับการตรวจสอบภายใต้ชื่อของคุณแล้วรายละเอียดมีดังนี้',
'notes' => 'จดบันทึก',
- 'password' => 'รหัสผ่าน:',
+ 'password' => 'รหัสผ่าน',
'password_reset' => 'รีเซ็ตรหัสผ่าน',
'read_the_terms' => 'โปรดอ่านเงื่อนไขการใช้งานด้านล่างนี้',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'ขอ:',
+ 'requested' => 'คำร้องขอ',
'reset_link' => 'ลิงก์รีเซ็ตรหัสผ่านของคุณ',
'reset_password' => 'คลิกที่นี่เพื่อรีเซ็ตรหัสผ่าน:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/tl-PH/admin/locations/message.php b/resources/lang/tl-PH/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/tl-PH/admin/locations/message.php
+++ b/resources/lang/tl-PH/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/tl-PH/admin/settings/general.php b/resources/lang/tl-PH/admin/settings/general.php
index df154a6b44..01b9bd4c21 100644
--- a/resources/lang/tl-PH/admin/settings/general.php
+++ b/resources/lang/tl-PH/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/tl-PH/admin/users/message.php b/resources/lang/tl-PH/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/tl-PH/admin/users/message.php
+++ b/resources/lang/tl-PH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/tl-PH/general.php b/resources/lang/tl-PH/general.php
index e328108fe4..bb57926ea2 100644
--- a/resources/lang/tl-PH/general.php
+++ b/resources/lang/tl-PH/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/tl-PH/localizations.php b/resources/lang/tl-PH/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/tl-PH/localizations.php
+++ b/resources/lang/tl-PH/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/tl-PH/mail.php b/resources/lang/tl-PH/mail.php
index d345ee6903..74c3b9b40f 100644
--- a/resources/lang/tl-PH/mail.php
+++ b/resources/lang/tl-PH/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Pangalan ng accessory:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Pangalan ng accessory',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Sa Ngalan ng Propyedad:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Sa Ngalan ng Propyedad',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Ang mga araw',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Aytem:',
+ 'item' => 'Aytem',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ngalan',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Ang mga Palatandaan',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/tr-TR/admin/locations/message.php b/resources/lang/tr-TR/admin/locations/message.php
index cf1fa3c3b3..e504c6cfd8 100644
--- a/resources/lang/tr-TR/admin/locations/message.php
+++ b/resources/lang/tr-TR/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Konum mevcut değil.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Bu konum şu anda en az bir varlık ile ilişkili ve silinemez. Lütfen artık bu konumu kullanabilmek için varlık konumlarını güncelleştirin.',
'assoc_child_loc' => 'Bu konum şu anda en az bir alt konum üstüdür ve silinemez. Lütfen artık bu konuma ait alt konumları güncelleyin. ',
'assigned_assets' => 'Atanan Varlıklar',
diff --git a/resources/lang/tr-TR/admin/settings/general.php b/resources/lang/tr-TR/admin/settings/general.php
index 5627f12582..198642eeed 100644
--- a/resources/lang/tr-TR/admin/settings/general.php
+++ b/resources/lang/tr-TR/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Yedekler',
'backups_help' => 'Yedekler oluşturun, indirin ve geri yükleyin ',
'backups_restoring' => 'Yedekten geri dön',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Yedeği yükle',
'backups_path' => 'Yedeklerin sunucuda saklanacağı yer :path',
'backups_restore_warning' => 'Geri yükleme düğmesini kullanınÖnceki bir yedeklemeden geri yüklemek için. (Bu şu anda S3 dosya depolama veya Docker ile çalışmamaktadır.)
Senin:app_name veritabanının tamamı ve yüklenen dosyalar tamamen değiştirilecekYedekleme dosyasında ne olduğuna göre. ',
diff --git a/resources/lang/tr-TR/admin/users/message.php b/resources/lang/tr-TR/admin/users/message.php
index 3060074eca..6ccb22a703 100644
--- a/resources/lang/tr-TR/admin/users/message.php
+++ b/resources/lang/tr-TR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Bu varlığı başarıyla reddettiniz.',
'bulk_manager_warn' => 'Kullanıcılarınızın başarıyla güncelleştirildi, ancak kaydedilmedi Yöneticisi giriş Yöneticisi\'ni seçtiğiniz çünkü aynı zamanda düzenlenecek kullanıcı listesinde oldu ve kullanıcıların kendi yöneticisi olmayabilir. Yine, yönetici hariç olmak üzere, kullanıcılarınızı seçiniz.',
'user_exists' => 'Kullanıcı zaten var!',
- 'user_not_found' => 'Kullanıcı yok.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Oturum açma alanı gerekli',
'user_has_no_assets_assigned' => 'Kullanıcıya zimmetlenmiş bir şey yok.',
'user_password_required' => 'Şifre Gerekli.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'LDAP sunucusuna bağlanamadı. LDAP yapılandırma dosyası LDAP sunucusu yapılandırmanızda gözden geçirin.
LDAP sunucusundan Hata:',
'ldap_could_not_get_entries' => 'LDAP sunucusuna bağlanamadı. LDAP yapılandırma dosyası LDAP sunucusu yapılandırmanızda gözden geçirin.
LDAP sunucusundan Hata:',
'password_ldap' => 'Bu hesabın parolası LDAP / Active Directory tarafından yönetilir. Lütfen şifrenizi değiştirmek için BT departmanınızla iletişime geçin.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/tr-TR/general.php b/resources/lang/tr-TR/general.php
index 2589af2d68..2a5fbd3e05 100644
--- a/resources/lang/tr-TR/general.php
+++ b/resources/lang/tr-TR/general.php
@@ -11,9 +11,9 @@ return [
'activity_report' => 'Aktivite Raporu',
'address' => 'Adres',
'admin' => 'Yönetici',
- 'admin_tooltip' => 'This user has admin privileges',
- 'superuser' => 'Superuser',
- 'superuser_tooltip' => 'This user has superuser privileges',
+ 'admin_tooltip' => 'Kullanici admin yetkisine sahiptir',
+ 'superuser' => 'Super Kullanici',
+ 'superuser_tooltip' => 'Super Kullanici yetkisine sahiptir',
'administrator' => 'Yönetici',
'add_seats' => 'Eklenen kişi sayısı',
'age' => "Yaş",
@@ -77,7 +77,7 @@ return [
'consumables' => 'Sarf Malzemeleri',
'country' => 'Ülke',
'could_not_restore' => ':item_type: :error geri yüklenirken hata oluştu',
- 'not_deleted' => 'The :item_type was not deleted and therefore cannot be restored',
+ 'not_deleted' => 'Bu oge silinmedigi icin geri alma islemi uygulanmaz',
'create' => 'Yeni Oluştur',
'created' => 'Öğe oluşturuldu',
'created_asset' => 'Oluşturulmuş Demirbaş',
@@ -101,7 +101,7 @@ Context | Request Context
',
'delete' => 'Sil',
'delete_confirm' => 'Öğeyi silmek istediğinizden emin misiniz?',
- 'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+ 'delete_confirm_no_undo' => 'Bu ogeyi silmek isteginize eminmisiniz ? Bu islem geri alinamaz.',
'deleted' => 'Silinmiş',
'delete_seats' => 'Silinen Kullanıcı Lisansı Sayısı',
'deletion_failed' => 'Silme başarısız',
@@ -137,7 +137,7 @@ Context | Request Context
'lastname_firstinitial' => 'Soyad ve Adın İlk Harfi (smith_j@example.com)',
'firstinitial.lastname' => 'Adın İlk Harfi ve Soyad (j.smith@example.com)',
'firstnamelastinitial' => 'Ad ve Soyadın İlk Harfi (janes@example.com)',
- 'lastnamefirstname' => 'Last Name.First Name (smith.jane@example.com)',
+ 'lastnamefirstname' => 'Soyisim.isim',
'first_name' => 'Ad',
'first_name_format' => 'Ad (jane@example.com)',
'files' => 'Dosyalar',
@@ -422,7 +422,7 @@ Context | Request Context
'bulk_soft_delete' =>'Ayrıca bu kullanıcıları geçici olarak silin. Yönetici Ayarlarında silinen kayıtları temizlemediğiniz sürece/tasfiye edene kadar bu kişilerin varlık geçmişi olduğu gibi kalacaktır.',
'bulk_checkin_delete_success' => 'Seçtiğiniz kullanıcılar silindi ve öğeleri teslim edildi.',
'bulk_checkin_success' => 'Seçilen kullanıcılar için öğeler iade edildi.',
- 'set_to_null' => 'Bu öğenin değerlerini sil|Tüm :asset_count öğelerinin değerlerini sil ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Sil : Bu kullanıcının bilgileri Sil: bütün kullanıcıların bu alandaki bilgileri :user_count ',
'na_no_purchase_date' => 'Bulunmuyor - Satın alma tarihi belirtilmedi',
'assets_by_status' => 'Duruma Göre Varlıklar',
@@ -562,8 +562,8 @@ Context | Request Context
'expires' => 'Bitiş',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/tr-TR/localizations.php b/resources/lang/tr-TR/localizations.php
index d073c76d3e..b1a1f56247 100644
--- a/resources/lang/tr-TR/localizations.php
+++ b/resources/lang/tr-TR/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Bir dil seçin',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'İngilizce, US',
'en-GB'=> 'İngilizce, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zuluca',
],
- 'select_country' => 'Ülke seçin',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Adası',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ekvador',
'EE'=>'Estonya',
'EG'=>'Mısır',
+ 'GB-ENG'=>'England',
'ER'=>'Eritre',
'ES'=>'İspanya',
'ET'=>'Etiyopya',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nijerya',
'NI'=>'Nikaragua',
'NL'=>'Hollanda',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norveç',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Rusya Federasyonu',
'RW'=>'Ruanda',
'SA'=>'Suudi Arabistan',
- 'UK'=>'İskoçya',
+ 'GB-SCT'=>'İskoçya',
'SB'=>'Solomon Adaları',
'SC'=>'Seyşel Adaları',
'SS'=>'Güney Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Adaları (Abd)',
'VN'=>'Vietnam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis ve Futuna Adaları',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/tr-TR/mail.php b/resources/lang/tr-TR/mail.php
index 805e24f6d4..0a7dbb803c 100644
--- a/resources/lang/tr-TR/mail.php
+++ b/resources/lang/tr-TR/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Bir kullanıcı websitede bir öğe talebinde bulundu',
'acceptance_asset_accepted' => 'Kullanıcı bir öğeyi kabul etti',
'acceptance_asset_declined' => 'Kullanıcı bir öğeyi reddetti',
- 'accessory_name' => 'Aksesuar Adı:',
- 'additional_notes' => 'Ek Notlar:',
+ 'accessory_name' => 'Aksesuar Adı',
+ 'additional_notes' => 'Ek Notlar',
'admin_has_created' => 'Bir yönetici sizin için :web site\'de bir hesap oluşturdu.',
- 'asset' => 'Varlık:',
- 'asset_name' => 'Varlık Adı:',
+ 'asset' => 'Demirbaş',
+ 'asset_name' => 'Demirbaş Adı',
'asset_requested' => 'İstenen varlık',
'asset_tag' => 'Varlık Adı',
'assets_warrantee_alert' => 'Şu var: gelecek vadede garanti süresi dolmuş varlık sayımı: eşik günler. | Şunlar var: gelecek yıl sona ermesi garantili varlıklar sayılır: eşik günleri.',
'assigned_to' => 'Atanmış',
'best_regards' => 'En iyi dileklerimizle,',
- 'canceled' => 'İptal edildi:',
- 'checkin_date' => 'Giriş Tarihi:',
- 'checkout_date' => 'Çıkış Tarihi:',
+ 'canceled' => 'İptal edildi',
+ 'checkin_date' => 'Giriş Tarihi',
+ 'checkout_date' => 'Çıkış Tarihi',
'checkedout_from' => 'Teslim alınan kişi',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Çıkış yapılan',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Lütfen :hesabınızı: onaylamak için aşağıdaki linke tıklayınız:',
'current_QTY' => 'Mevcut miktar',
'days' => 'Günler',
- 'expecting_checkin_date' => 'Beklenen Giriş Tarihi:',
+ 'expecting_checkin_date' => 'Beklenen geri alma tarihi',
'expires' => 'Bitiş',
'hello' => 'Merhaba',
'hi' => 'Merhaba',
'i_have_read' => 'Okudum ve kullanım şartlarını ve bu varlığı kabul ediyorum.',
'inventory_report' => 'Envanter Raporu',
- 'item' => 'Ürün:',
+ 'item' => 'Ürün',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Şu var: bir sonraki günlerde süren lisans sayımı: eşik günleri. | Şunlar var: bir sonraki günlerde süren sayım lisansları: eşik günleri.',
'link_to_update_password' => 'Şifrenizi güncellemek için aşağıdaki linke tıklayınız :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Ad',
'new_item_checked' => 'Yeni varlık altında kullanıma alındı, ayrıntıları aşağıdadır.',
'notes' => 'Notlar',
- 'password' => 'Parola:',
+ 'password' => 'Şifre',
'password_reset' => 'Parola Sıfırlama',
'read_the_terms' => 'Aşağıdaki kullanım koşullarını okuyunuz.',
'read_the_terms_and_click' => 'Lütfen aşağıdaki kullanım koşullarını okuyun ve kullanım koşullarını okuyup kabul ettiğinizi, demirbaşı teslim aldığınızı onaylamak için alttaki bağlantıya tıklayın.',
- 'requested' => 'Talep Edilen:',
+ 'requested' => 'Talep Edilen',
'reset_link' => 'Parola Sıfırlama Bağlantısı',
'reset_password' => 'Şifrenizi sıfırlamak için burayı tıklatın:',
'rights_reserved' => 'Her türlü hakkı saklıdır.',
diff --git a/resources/lang/uk-UA/admin/locations/message.php b/resources/lang/uk-UA/admin/locations/message.php
index bf50a70b4a..3b8b9d2dbc 100644
--- a/resources/lang/uk-UA/admin/locations/message.php
+++ b/resources/lang/uk-UA/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Розташування не існує.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Це розташування в даний час пов\'язано принаймні з одним активом і не може бути видалений. Будь ласка, оновіть ваші медіафайли, щоб більше не посилатися на це розташування і повторіть спробу. ',
'assoc_child_loc' => 'Це місцезнаходження наразі батько принаймні одного дочірнього місця і не може бути видалений. Будь ласка, оновіть ваше місцеположення, щоб більше не посилатися на це місце і повторіть спробу. ',
'assigned_assets' => 'Призначені активи',
diff --git a/resources/lang/uk-UA/admin/settings/general.php b/resources/lang/uk-UA/admin/settings/general.php
index d2234bc541..5829b4d362 100644
--- a/resources/lang/uk-UA/admin/settings/general.php
+++ b/resources/lang/uk-UA/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Резервні копії',
'backups_help' => 'Створення, завантаження і відновлення резервних копій ',
'backups_restoring' => 'Відновлення з резервної копії',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Завантажити резервну копію',
'backups_path' => 'Резервні копії на сервері зберігаються в :path',
'backups_restore_warning' => 'Скористайтеся кнопкою відновлення для відновлення з попередньої резервної копії. (Наразі це не працює зі сховищем файлів S3 або Docker.)
Ваша вся база даних :app_name і всі завантажені файли будуть повністю замінені файлом резервної копії. ',
diff --git a/resources/lang/uk-UA/admin/users/message.php b/resources/lang/uk-UA/admin/users/message.php
index 541f15e33d..80b224fb5a 100644
--- a/resources/lang/uk-UA/admin/users/message.php
+++ b/resources/lang/uk-UA/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Ви успішно відхилили цей актив.',
'bulk_manager_warn' => 'Ваші користувачі успішно оновлені, однак Ваш запис менеджера не було збережено, оскільки обраний вами менеджер також був у списку користувачів, для редагування, і користувачі можуть не бути їх власним керівником. Будь ласка, оберіть ваших користувачів знову, не маючи менеджера.',
'user_exists' => 'Користувач вже існує!',
- 'user_not_found' => 'Користувач не існує.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Поле авторизації є обов\'язковим',
'user_has_no_assets_assigned' => 'Немає медіафайлів в даний час призначених користувачеві.',
'user_password_required' => 'Пароль є обов\'язковим.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Не вдалося знайти сервер LDAP. Будь ласка, перевірте конфігурацію сервера LDAP в файлі конфігурації LDAP.
Помилка від LDAP Server:',
'ldap_could_not_get_entries' => 'Не вдалося отримати записи з сервера LDAP. Перевірте конфігурацію сервера LDAP у файлі конфігурації LDAP.
Помилка сервера LDAP:',
'password_ldap' => 'Пароль для цього облікового запису керується LDAP/Active Directory. Зверніться до свого ІТ-відділу, щоб змінити пароль. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/uk-UA/general.php b/resources/lang/uk-UA/general.php
index ce32c7377b..056b5405ce 100644
--- a/resources/lang/uk-UA/general.php
+++ b/resources/lang/uk-UA/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Також видалити цих користувачів. Їхня історія активів залишиться недоторканою/доки ви не очистите вилучені записи в Налаштуваннях адміністратора.',
'bulk_checkin_delete_success' => 'Ваші обрані користувачі були видалені та їх елементи були відмічені.',
'bulk_checkin_success' => 'Елементи для обраних користувачів були перевірені.',
- 'set_to_null' => 'Видалити значення для цього медіафайлу|Видалити значення для всіх :asset_count активів ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Видалити :field значень для цього користувача|:field значення для всіх :user_count користувачів ',
'na_no_purchase_date' => 'N/A - Дата придбання не вказана',
'assets_by_status' => 'Активи за станом',
@@ -559,8 +559,8 @@ return [
'expires' => 'Термін закінчується',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/uk-UA/localizations.php b/resources/lang/uk-UA/localizations.php
index 737cb4a350..d34b7cb2ca 100644
--- a/resources/lang/uk-UA/localizations.php
+++ b/resources/lang/uk-UA/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Оберіть мову',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'Англійська, США',
'en-GB'=> 'Англійська, Великобританія',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Виберіть країну',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Острів Вознесіння',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Естонія',
'EG'=>'Египет',
+ 'GB-ENG'=>'England',
'ER'=>'Еритрея',
'ES'=>'Іспанія',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Нідерланди',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Норвегія',
'NP'=>'Непал',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Російська Федерація',
'RW'=>'Rwanda',
'SA'=>'Саудівська Аравія',
- 'UK'=>'Шотландія',
+ 'GB-SCT'=>'Шотландія',
'SB'=>'Соломонові острови',
'SC'=>'Seychelles',
'SS'=>'Південний Судан',
@@ -312,6 +314,7 @@ return [
'VI'=>'Віргінські острови (США)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Уолліс і Футуна',
'WS'=>'Samoa',
'YE'=>'Ємен',
diff --git a/resources/lang/uk-UA/mail.php b/resources/lang/uk-UA/mail.php
index 7d5f210ffe..0a0d472cc5 100644
--- a/resources/lang/uk-UA/mail.php
+++ b/resources/lang/uk-UA/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Користувач надіслав запит на об\'єкт на веб-сайті',
'acceptance_asset_accepted' => 'Користувач прийняв позицію',
'acceptance_asset_declined' => 'Користувач відхилив елемент',
- 'accessory_name' => 'Назва аксесуара:',
- 'additional_notes' => 'Додаткові примітки:',
+ 'accessory_name' => 'Назва аксесуара',
+ 'additional_notes' => 'Додаткові примітки',
'admin_has_created' => 'Адміністратор створив вам обліковий запис на веб-сайті.',
- 'asset' => 'Актив:',
- 'asset_name' => 'Найменування Активу:',
+ 'asset' => 'Актив',
+ 'asset_name' => 'Назва активу',
'asset_requested' => 'Запит на актив',
'asset_tag' => 'Тег активу',
'assets_warrantee_alert' => 'В наступні :threshold днів є :count медіафайл з гарантією, яка закінчується в наступні :threshold днів.|В наступних :threshold медіафайлів з гарантіями, що закінчуються в наступні :threshold днів.',
'assigned_to' => 'Відповідальний',
'best_regards' => 'З найкращими побажаннями,',
- 'canceled' => 'Скасовано:',
- 'checkin_date' => 'Дата повернення:',
- 'checkout_date' => 'Дата видачі:',
+ 'canceled' => 'Скасовано',
+ 'checkin_date' => 'Дата повернення',
+ 'checkout_date' => 'Дата видачі',
'checkedout_from' => 'Перевірено з',
'checkedin_from' => 'Відмічено від',
'checked_into' => 'Відмічено від',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Будь-ласка, натисніть на це посилання, щоб підтвердити свій: веб-акаунт:',
'current_QTY' => 'Поточна к-ксть',
'days' => 'Днів',
- 'expecting_checkin_date' => 'Очікувана дата повернення:',
+ 'expecting_checkin_date' => 'Очікувана дата повернення',
'expires' => 'Термін закінчується',
'hello' => 'Привіт',
'hi' => 'Привіт',
'i_have_read' => 'Я прочитав і згоден з умовами використання даного товару.',
'inventory_report' => 'Звіт про запаси',
- 'item' => 'Елемент:',
+ 'item' => 'Елемент',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'В наступні :threshold днів закінчується :count термін дії ліцензії для наступних :threshold днів.|В наступному :threshold строк дії ліцензії.',
'link_to_update_password' => 'Будь-ласка, натисніть на це посилання, щоб оновити свій пароль:',
@@ -66,11 +66,11 @@ return [
'name' => 'Назва',
'new_item_checked' => 'Новий елемент був виданий під вашим ім\'ям, докладніше про це нижче.',
'notes' => 'Примітки.',
- 'password' => 'Пароль:',
+ 'password' => 'Пароль',
'password_reset' => 'Скидання Пароля',
'read_the_terms' => 'Будь ласка, прочитайте умови використання нижче.',
'read_the_terms_and_click' => 'Будь ласка, прочитайте умови використання нижче, і натисніть на посилання внизу, щоб підтвердити, що Ви прочитали та згодні з умовами користування та отримали актив.',
- 'requested' => 'Запрошено користувачем:',
+ 'requested' => 'Запрошено користувачем',
'reset_link' => 'Ваше посилання для скидання пароля',
'reset_password' => 'Натисніть тут для скидання пароля:',
'rights_reserved' => 'Усі права захищені.',
diff --git a/resources/lang/ur-PK/admin/locations/message.php b/resources/lang/ur-PK/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/ur-PK/admin/locations/message.php
+++ b/resources/lang/ur-PK/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/ur-PK/admin/settings/general.php
+++ b/resources/lang/ur-PK/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/ur-PK/admin/users/message.php b/resources/lang/ur-PK/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/ur-PK/admin/users/message.php
+++ b/resources/lang/ur-PK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index 7634387906..3092228674 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/ur-PK/localizations.php b/resources/lang/ur-PK/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/ur-PK/localizations.php
+++ b/resources/lang/ur-PK/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/ur-PK/mail.php b/resources/lang/ur-PK/mail.php
index edb1683200..72fb70db80 100644
--- a/resources/lang/ur-PK/mail.php
+++ b/resources/lang/ur-PK/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Item:',
+ 'item' => 'Item',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/vi-VN/admin/locations/message.php b/resources/lang/vi-VN/admin/locations/message.php
index d1a392d156..d717fdd767 100644
--- a/resources/lang/vi-VN/admin/locations/message.php
+++ b/resources/lang/vi-VN/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Địa phương không tồn tại.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Địa phương này hiện tại đã được liên kết với ít nhất một tài sản và không thể xóa. Xin vui lòng cập nhật tài sản của bạn để không còn liên kết với địa phương này nữa và thử lại. ',
'assoc_child_loc' => 'Địa phương này hiện tại là cấp parent của ít nhật một địa phương con và không thể xóa. Xin vui lòng cập nhật địa phương của bạn để không liên kết đến địa phương này và thử lại. ',
'assigned_assets' => 'Tài sản được giao',
diff --git a/resources/lang/vi-VN/admin/settings/general.php b/resources/lang/vi-VN/admin/settings/general.php
index 687774eadd..8c39fafe83 100644
--- a/resources/lang/vi-VN/admin/settings/general.php
+++ b/resources/lang/vi-VN/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Sao lưu',
'backups_help' => 'Tạo, tải xuống, và khôi phục các dữ liệu ',
'backups_restoring' => 'Đang khôi phục từ bản sao lưu',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Tải lên bản sao lưu',
'backups_path' => 'Những bản sao lưu trên máy chủ được lưu vào :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/vi-VN/admin/users/message.php b/resources/lang/vi-VN/admin/users/message.php
index b732fcc99e..cc3844a4d2 100644
--- a/resources/lang/vi-VN/admin/users/message.php
+++ b/resources/lang/vi-VN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Bạn đã từ chối tài sản này thành công.',
'bulk_manager_warn' => 'Người dùng của bạn đã được cập nhật thành công, tuy nhiên mục nhập của người quản lý của bạn không được lưu bởi vì người quản lý bạn đã chọn cũng nằm trong danh sách người dùng cần chỉnh sửa, và người dùng không phải là người quản lý của họ. Vui lòng chọn người dùng của bạn một lần nữa, ngoại trừ người quản lý.',
'user_exists' => 'Người dùng thật sự tồn tại!',
- 'user_not_found' => 'Người dùng không tồn tại.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Trường đăng nhập thì bắt buộc',
'user_has_no_assets_assigned' => 'Hiện không có tài sản nào được gán cho người dùng.',
'user_password_required' => 'Mật khẩu thì bắt buộc.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Không thể tìm thấy máy chủ LDAP. Xin vui lòng kiểm tra cấu hình cài đặt máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP:',
'ldap_could_not_get_entries' => 'Không thể lấy các mục từ máy chủ LDAP. Xin vui lòng kiểm tra lại cấu hình máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP:',
'password_ldap' => 'Mật khẩu cho tài khoản này được quản lý bởi LDAP / Active Directory. Vui lòng liên hệ với bộ phận CNTT của bạn để thay đổi mật khẩu.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/vi-VN/general.php b/resources/lang/vi-VN/general.php
index dd5f074e7e..b778feca90 100644
--- a/resources/lang/vi-VN/general.php
+++ b/resources/lang/vi-VN/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - Không có dữ liệu ngày mua hàng',
'assets_by_status' => 'Tài sản theo trạng thái',
@@ -559,8 +559,8 @@ return [
'expires' => 'Hết hạn',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/vi-VN/localizations.php b/resources/lang/vi-VN/localizations.php
index 026b67f2eb..fdca1532bd 100644
--- a/resources/lang/vi-VN/localizations.php
+++ b/resources/lang/vi-VN/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Lựa chọn ngôn ngữ',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/vi-VN/mail.php b/resources/lang/vi-VN/mail.php
index b1edbbdf0b..3826fb5039 100644
--- a/resources/lang/vi-VN/mail.php
+++ b/resources/lang/vi-VN/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Người dùng đã yêu cầu một mục trên trang web',
'acceptance_asset_accepted' => 'Người dùng đã chấp nhận',
'acceptance_asset_declined' => 'Người dùng từ chối',
- 'accessory_name' => 'Tên Phụ Kiện:',
- 'additional_notes' => 'Ghi chú bổ sung:',
+ 'accessory_name' => 'Tên Phụ Kiện',
+ 'additional_notes' => 'Ghi chú bổ sung',
'admin_has_created' => 'Người quản trị đã tạo ra một tài khoản cho bạn trên trang web :web.',
- 'asset' => 'Tài sản:',
- 'asset_name' => 'Tên tài sản:',
+ 'asset' => 'Tài sản',
+ 'asset_name' => 'Tên tài sản',
'asset_requested' => 'Tài sản được yêu cầu',
'asset_tag' => 'Thẻ tài sản',
'assets_warrantee_alert' => 'Tài sản có bảo hành sắp hết hạn vào ngày mai: threshold days. | Tài sản có bảo hành sắp hết hạn trong ngày mai: threshold days.',
'assigned_to' => 'Cấp phát cho',
'best_regards' => 'Trân trọng,',
- 'canceled' => 'Đã hủy bỏ:',
- 'checkin_date' => 'Ngày cấp phát:',
- 'checkout_date' => 'Ngày thu hồi:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Ngày Checkin',
+ 'checkout_date' => 'Ngày checkout',
'checkedout_from' => 'Biểu mẫu cấp phát',
'checkedin_from' => 'Biểu mẫu đã kiểm tra',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Vui lòng click chuột lên liên kết bên dưới để xác nhận tài khoản :web của Anh/Chị:',
'current_QTY' => 'QTY hiện tại',
'days' => 'Ngày',
- 'expecting_checkin_date' => 'Dự kiến ngày Checkin:',
+ 'expecting_checkin_date' => 'Ngày mong muốn Checkin',
'expires' => 'Hết hạn',
'hello' => 'xin chào',
'hi' => 'Chào',
'i_have_read' => 'Tôi đã đọc và đồng ý với các điều khoản sử dụng và đã nhận được mục này.',
'inventory_report' => 'Báo cáo kho',
- 'item' => 'Mục:',
+ 'item' => 'Mục',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'Có: giấy phép bản quyền sắp hết hạn trong ngày mai:threshold days. | Có nhiều: giấy phép bản quyên sắp hết hạn trong lần tiếp theo: threshold days.',
'link_to_update_password' => 'Vui lòng nhấp vào liên kết sau để cập nhật: mật khẩu web:',
@@ -66,11 +66,11 @@ return [
'name' => 'Tên',
'new_item_checked' => 'Một mục mới đã được kiểm tra dưới tên của bạn, chi tiết dưới đây.',
'notes' => 'Ghi chú',
- 'password' => 'Mật khẩu:',
+ 'password' => 'Mật khẩu',
'password_reset' => 'Đặt lại mật khẩu',
'read_the_terms' => 'Vui lòng đọc các điều khoản sử dụng bên dưới.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Yêu cầu:',
+ 'requested' => 'Đã yêu cầu',
'reset_link' => 'Liên kết Đặt lại Mật khẩu của bạn',
'reset_password' => 'Nhấn vào đây để đặt lại mật khẩu của bạn:',
'rights_reserved' => 'Bản quyền được bảo hộ.',
diff --git a/resources/lang/zh-CN/account/general.php b/resources/lang/zh-CN/account/general.php
index c0573ba597..7cff54151e 100644
--- a/resources/lang/zh-CN/account/general.php
+++ b/resources/lang/zh-CN/account/general.php
@@ -12,6 +12,6 @@ return array(
'api_reference' => '请检查 API 参考 以找到特定的 API 端点和额外的 API 文档。',
'profile_updated' => '帐户已成功更新',
'no_tokens' => '您还没有创建任何个人访问令牌。',
- 'enable_sounds' => 'Enable sound effects',
- 'enable_confetti' => 'Enable confetti effects',
+ 'enable_sounds' => '启用声音效果',
+ 'enable_confetti' => '启用彩屑效果',
);
diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php
index f610c7af14..d0ac7d2b97 100644
--- a/resources/lang/zh-CN/admin/hardware/message.php
+++ b/resources/lang/zh-CN/admin/hardware/message.php
@@ -58,7 +58,7 @@ return [
'file_delete_success' => '您的文件已成功删除',
'file_delete_error' => '该文件无法被删除',
'file_missing' => '所选文件丢失',
- 'file_already_deleted' => 'The file selected was already deleted',
+ 'file_already_deleted' => '选择的文件已被删除',
'header_row_has_malformed_characters' => '标题行中的一个或多个属性包含格式错误的 UTF-8 字符',
'content_row_has_malformed_characters' => '第一行内容中的一个或多个属性包含格式错误的 UTF-8 字符',
],
diff --git a/resources/lang/zh-CN/admin/kits/general.php b/resources/lang/zh-CN/admin/kits/general.php
index f0b1291453..9f6a4d5e61 100644
--- a/resources/lang/zh-CN/admin/kits/general.php
+++ b/resources/lang/zh-CN/admin/kits/general.php
@@ -47,5 +47,5 @@ return [
'kit_deleted' => '套件已删除',
'kit_model_updated' => '型号已更新',
'kit_model_detached' => '型号已成功分离。',
- 'model_already_attached' => 'Model already attached to kit',
+ 'model_already_attached' => '该型号已附加到套件',
];
diff --git a/resources/lang/zh-CN/admin/locations/message.php b/resources/lang/zh-CN/admin/locations/message.php
index f7cd3a0f74..a9944ad552 100644
--- a/resources/lang/zh-CN/admin/locations/message.php
+++ b/resources/lang/zh-CN/admin/locations/message.php
@@ -3,12 +3,12 @@
return array(
'does_not_exist' => '位置不存在',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => '此位置目前不可删除，因为它是至少是一个资产或用户记录的所在位置，或是有资产分配给它，或是另一个位置的上级位置。请更新您的记录以不再引用此位置，然后重试。 ',
'assoc_assets' => '删除失败，该位置已与其它资产关联。请先更新资产以取消关联，然后重试。 ',
'assoc_child_loc' => '删除失败，该位置是一个或多个子位置的上层节点。请更新地理位置信息以取消关联，然后重试。 ',
'assigned_assets' => '已分配的资产',
'current_location' => '当前地理位置',
- 'open_map' => 'Open in :map_provider_icon Maps',
+ 'open_map' => '在 :map_provider_icon 地图中打开',
'create' => array(
@@ -22,8 +22,8 @@ return array(
),
'restore' => array(
- 'error' => 'Location was not restored, please try again',
- 'success' => 'Location restored successfully.'
+ 'error' => '位置未恢复，请重试',
+ 'success' => '位置恢复成功。'
),
'delete' => array(
diff --git a/resources/lang/zh-CN/admin/models/message.php b/resources/lang/zh-CN/admin/models/message.php
index 231baec68b..a95288d7c0 100644
--- a/resources/lang/zh-CN/admin/models/message.php
+++ b/resources/lang/zh-CN/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
'no_association' => '警告！此物品的资产型号无效或丢失！',
'no_association_fix' => '这将以怪异且可怕的方式破坏一切。立即编辑此资产并为其指定一个型号。',
'assoc_users' => '本模板下目前还有相关的资产，不能被删除，请删除资产以后，再重试。',
- 'invalid_category_type' => 'This category must be an asset category.',
+ 'invalid_category_type' => '此类别必须是一个资产类别。',
'create' => array(
'error' => '模板没有被创建，请重试。',
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index 3254b38c85..e196c04a51 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => '备份',
'backups_help' => '创建、下载、恢复备份 ',
'backups_restoring' => '从备份中还原',
+ 'backups_clean' => '恢复前清理备份数据库',
+ 'backups_clean_helptext' => "如果您数据库版本发生变化，这可能是有用的",
'backups_upload' => '上传备份',
'backups_path' => '服务器上的备份存储在 :path',
'backups_restore_warning' => '使用恢复按钮 从上次备份恢复。 (目前无法使用 S3 文件存储或 Docker容器。)
您的 完整的 :app_name 数据库和任何上传的文件将被备份文件中的内容完全替换 ',
@@ -381,7 +383,7 @@ return [
'default_avatar_help' => '如果用户没有个人资料照片，此图像将作为个人资料显示。',
'restore_default_avatar' => '恢复 原始系统默认头像',
'restore_default_avatar_help' => '',
- 'due_checkin_days' => 'Due For Checkin Warning',
- 'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+ 'due_checkin_days' => '到期归还警告',
+ 'due_checkin_days_help' => '资产应在预计归还多少天前列入“到期归还”页面中？',
];
diff --git a/resources/lang/zh-CN/admin/settings/message.php b/resources/lang/zh-CN/admin/settings/message.php
index ebd59b94fd..d64c142267 100644
--- a/resources/lang/zh-CN/admin/settings/message.php
+++ b/resources/lang/zh-CN/admin/settings/message.php
@@ -15,7 +15,7 @@ return [
'restore_confirm' => '您确定要从 :filename还原您的数据库吗？'
],
'restore' => [
- 'success' => 'Your system backup has been restored. Please log in again.'
+ 'success' => '您的系统备份已恢复。请重新登录。'
],
'purge' => [
'error' => '清除过程中出现了错误。 ',
diff --git a/resources/lang/zh-CN/admin/users/message.php b/resources/lang/zh-CN/admin/users/message.php
index 0f3fa37d64..415642f9ae 100644
--- a/resources/lang/zh-CN/admin/users/message.php
+++ b/resources/lang/zh-CN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => '你已拒绝此项资产。',
'bulk_manager_warn' => '您的用户已成功更新，但是您的经理条目未保存，因为您选择的经理也在要编辑的用户列表中，用户可能不是自己的经理。请再次选择您的用户，不包括经理。',
'user_exists' => '用户已经存在!',
- 'user_not_found' => '用户不存在。',
+ 'user_not_found' => '用户不存在或您没有权限查看。',
'user_login_required' => '登陆字段是必须的',
'user_has_no_assets_assigned' => '目前没有分配给用户的资产。',
'user_password_required' => '密码为必填项',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => '查询LDAP服务器失败，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息:',
'ldap_could_not_get_entries' => '从LDAP服务器获取信息条目失败，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息:',
'password_ldap' => '此帐户的密码由LDAP / Active Directory管理。请联系您的IT部门更改您的密码。',
+ 'multi_company_items_assigned' => '该用户已分配物品，请在移动公司前检查它们。'
),
'deletefile' => array(
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index a5bbe2455d..4bee24f97f 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -77,7 +77,7 @@ return [
'consumables' => '消耗品',
'country' => '国家',
'could_not_restore' => '恢复时出错 :item_type: :error',
- 'not_deleted' => 'The :item_type was not deleted and therefore cannot be restored',
+ 'not_deleted' => ':item_type 未被删除，因此无法恢复',
'create' => '新增',
'created' => '项目已创建',
'created_asset' => '新建资产',
@@ -98,7 +98,7 @@ return [
'debug_warning_text' => '此应用程序运行在生产模式下的调试状态。如果您的应用程序可以被外部访问，这会使敏感数据暴露。通过将 .env 文件中的APP_DEBUG 值设置为 false来 禁用调试模式。',
'delete' => '刪除',
'delete_confirm' => '是否确定删除此项',
- 'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+ 'delete_confirm_no_undo' => '您确定要删除 :item吗？此操作无法撤消。',
'deleted' => '已删除',
'delete_seats' => '已移除空位',
'deletion_failed' => '删除失败',
@@ -158,7 +158,7 @@ return [
'image_upload' => '上传图片',
'filetypes_accepted_help' => '可接受的文件类型是 :type 。允许的最大大小是 :size.|可接受的文件类型是 :type 。允许最大上传大小是 :size。',
'filetypes_size_help' => '允许最大上传大小为 :size',
- 'image_filetypes_help' => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+ 'image_filetypes_help' => '可接受的文件类型是jpg, webp, png, gif, svg和avif。允许最大上传大小为 :size。',
'unaccepted_image_type' => '此图像文件不可读。可接受的文件类型为jpg、webp、png、gif和svg。此文件的 mimetype 类型为：:mimetype。',
'import' => '导入',
'import_this_file' => '映射字段并处理此文件',
@@ -279,7 +279,7 @@ return [
'site_name' => '站点名称',
'state' => '省份',
'status_labels' => '状态标签',
- 'status_label' => 'Status Label',
+ 'status_label' => '状态标签',
'status' => '状态',
'accept_eula' => '接受协议',
'supplier' => '供应商',
@@ -349,7 +349,7 @@ return [
'setup_step_4' => '第 4 步',
'setup_config_check' => '配置检查',
'setup_create_database' => '创建数据库表',
- 'setup_create_admin' => 'Create an admin user',
+ 'setup_create_admin' => '创建管理员用户',
'setup_done' => '完成！',
'bulk_edit_about_to' => '您将要编辑以下内容： ',
'checked_out' => '已借出',
@@ -419,14 +419,14 @@ return [
'bulk_soft_delete' =>'也可以“软删除”这些用户。他们的资产历史将保持不变，除非直到您清理管理设置中删除的记录。',
'bulk_checkin_delete_success' => '您所选的用户已被删除，其名下资产已归还。',
'bulk_checkin_success' => '选中用户的物品已归还。',
- 'set_to_null' => '删除此资产的值|删除所有:asset_count个资产的值 ',
+ 'set_to_null' => '删除此选择的值 |删除所有 :selection_count 个选择的值 ',
'set_users_field_to_null' => '删除此用户的 :field 值|删除所有 :user_count 个用户的 :field 值 ',
'na_no_purchase_date' => 'N/A-未提供购买日期',
'assets_by_status' => '按状态显示的资产',
'assets_by_status_type' => '按状态类型显示的资产',
'pie_chart_type' => '仪表盘饼图类型',
'hello_name' => '您好，:name！',
- 'unaccepted_profile_warning' => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+ 'unaccepted_profile_warning' => '你有一件物品需要接受。点击这里同意或拒绝它 | 您有 :count 件物品需要接受。点击这里同意或拒绝它们',
'start_date' => '开始日期',
'end_date' => '结束日期',
'alt_uploaded_image_thumbnail' => '已上传缩略图',
@@ -559,8 +559,8 @@ return [
'expires' => '过期',
'map_fields'=> '映射 :item_type 字段',
'remaining_var' => '剩余:count个',
- 'assets_in_var' => 'Assets in :name :type',
- 'label' => 'Label',
- 'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'label' => '标签',
+ 'import_asset_tag_exists' => '资产标签为:asset_tag的资产已经存在，且未请求更新。没有做任何更改。',
+ 'countries_manually_entered_help' => '带星号(*) 的值是手动输入的，与现有的 ISO 3166 下拉值不匹配',
];
diff --git a/resources/lang/zh-CN/localizations.php b/resources/lang/zh-CN/localizations.php
index 226e7fcb07..599a81b25d 100644
--- a/resources/lang/zh-CN/localizations.php
+++ b/resources/lang/zh-CN/localizations.php
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => '选择国家',
+ 'select_country' => '选择一个国家或地区',
'countries' => [
'AC'=>'阿森松岛',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'爱沙尼亚',
'EG'=>'埃及',
+ 'GB-ENG'=>'英格兰',
'ER'=>'厄立特里亚',
'ES'=>'西班牙',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'荷兰',
+ 'GB-NIR' => '北爱尔兰',
'NO'=>'挪威',
'NP'=>'尼泊尔',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'俄罗斯联邦',
'RW'=>'Rwanda',
'SA'=>'沙特阿拉伯',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'所罗门群岛',
'SC'=>'Seychelles',
'SS'=>'南苏丹',
@@ -312,6 +314,7 @@ return [
'VI'=>'维尔京群岛(美国)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'威尔士',
'WF'=>'瓦利斯群岛和富图纳群岛',
'WS'=>'Samoa',
'YE'=>'也门',
diff --git a/resources/lang/zh-CN/mail.php b/resources/lang/zh-CN/mail.php
index 8b698e4d44..a09a121faa 100644
--- a/resources/lang/zh-CN/mail.php
+++ b/resources/lang/zh-CN/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => '用户已申请物品',
'acceptance_asset_accepted' => '用户已接受一件物品',
'acceptance_asset_declined' => '用户拒绝了一件物品',
- 'accessory_name' => '配件名称：',
- 'additional_notes' => '备注：',
+ 'accessory_name' => '配件名称',
+ 'additional_notes' => '附加注释',
'admin_has_created' => '管理员已在 :web 为您新增帐号。',
- 'asset' => '资产：',
- 'asset_name' => '资产名称：',
+ 'asset' => '资产',
+ 'asset_name' => '资产名称',
'asset_requested' => '已申请资产',
'asset_tag' => '资产标签',
'assets_warrantee_alert' => '有 :count 个资产保修期将于 :threshold 天到期。|有 :count 个资产 保修期将于 :threshold 天到期。',
'assigned_to' => '已分配给',
'best_regards' => '此致',
- 'canceled' => '已取消：',
- 'checkin_date' => '交回日期：',
- 'checkout_date' => '借出日期：',
+ 'canceled' => '已取消',
+ 'checkin_date' => '登记日期',
+ 'checkout_date' => '借出日期',
'checkedout_from' => '借出自',
'checkedin_from' => '归还自',
'checked_into' => '归还至',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => '请点击链接启用您在 :web 的帐号：',
'current_QTY' => '目前数量',
'days' => '天',
- 'expecting_checkin_date' => '预计归还日期：',
+ 'expecting_checkin_date' => '预计归还日期',
'expires' => '过期',
'hello' => '您好',
'hi' => '您好',
'i_have_read' => '我同意使用条款并确认已收到物品。',
'inventory_report' => '库存报告',
- 'item' => '项目：',
+ 'item' => '项目',
'item_checked_reminder' => '提醒，当前借出给您 :count 件物品，您还没有签收或拒绝。 请点击下面的链接以确认您的决定。',
'license_expiring_alert' => '有：个许可将在：天后到期。|有：个许可将在：天后到期。',
'link_to_update_password' => '请点击以下链接以更新 :web 的密码：',
diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php
index 75c71fd5e9..ff432614de 100644
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/validation.php
@@ -125,7 +125,7 @@ return [
'symbols' => ':attribute 字段必须至少包含一个符号。',
'uncompromised' => '给定的 :attribute 字段出现在数据泄漏中。请选择一个不同的 :attribute 。',
],
- 'percent' => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+ 'percent' => '当折旧类型为百分比时，折旧的最小值必须在0到100之间。',
'present' => '：属性字段必须存在。',
'present_if' => '当 :other 为 :value 时，:attribute 字段必须存在。',
diff --git a/resources/lang/zh-HK/admin/locations/message.php b/resources/lang/zh-HK/admin/locations/message.php
index 488ec9c670..8fd96c2c3d 100644
--- a/resources/lang/zh-HK/admin/locations/message.php
+++ b/resources/lang/zh-HK/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php
index 7ce360edab..9a81886ae8 100644
--- a/resources/lang/zh-HK/admin/settings/general.php
+++ b/resources/lang/zh-HK/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Backups',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/zh-HK/admin/users/message.php b/resources/lang/zh-HK/admin/users/message.php
index 4d014775bd..3f44226335 100644
--- a/resources/lang/zh-HK/admin/users/message.php
+++ b/resources/lang/zh-HK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'You have successfully declined this asset.',
'bulk_manager_warn' => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
'user_exists' => 'User already exists!',
- 'user_not_found' => 'User does not exist.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:',
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index 54767b3089..62e71a76d8 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/zh-HK/localizations.php b/resources/lang/zh-HK/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/zh-HK/localizations.php
+++ b/resources/lang/zh-HK/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/zh-HK/mail.php b/resources/lang/zh-HK/mail.php
index ec57192486..185105d769 100644
--- a/resources/lang/zh-HK/mail.php
+++ b/resources/lang/zh-HK/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Accessory Name:',
- 'additional_notes' => 'Additional Notes:',
+ 'accessory_name' => 'Accessory Name',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.',
- 'asset' => 'Asset:',
- 'asset_name' => 'Asset Name:',
+ 'asset' => 'Asset',
+ 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Assigned To',
'best_regards' => 'Best regards,',
- 'canceled' => 'Canceled:',
- 'checkin_date' => 'Checkin Date:',
- 'checkout_date' => 'Checkout Date:',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => 'Checkin Date',
+ 'checkout_date' => 'Checkout Date',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
'current_QTY' => 'Current QTY',
'days' => 'Days',
- 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expecting_checkin_date' => 'Expected Checkin Date',
'expires' => 'Expires',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
'inventory_report' => 'Inventory Report',
- 'item' => '項目:',
+ 'item' => '項目',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Please click on the following link to update your :web password:',
@@ -66,11 +66,11 @@ return [
'name' => 'Name',
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
'notes' => 'Notes',
- 'password' => 'Password:',
+ 'password' => 'Password',
'password_reset' => 'Password Reset',
'read_the_terms' => 'Please read the terms of use below.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Requested:',
+ 'requested' => 'Requested',
'reset_link' => 'Your Password Reset Link',
'reset_password' => 'Click here to reset your password:',
'rights_reserved' => 'All rights reserved.',
diff --git a/resources/lang/zh-TW/admin/locations/message.php b/resources/lang/zh-TW/admin/locations/message.php
index 9c874b4b98..168669be06 100644
--- a/resources/lang/zh-TW/admin/locations/message.php
+++ b/resources/lang/zh-TW/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => '地點不存在.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => '至少還有一個資產與此位置關聯，目前不能被删除，請檢查後重試。 ',
'assoc_child_loc' => '至少還有一個子項目與此位置關聯，目前不能被删除，請檢查後重試。 ',
'assigned_assets' => '已分配資產',
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 48f8bd926f..617696282f 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => '備份',
'backups_help' => '建立, 下載和還原備份 ',
'backups_restoring' => '從備份還原',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => '上傳備份',
'backups_path' => '伺服器上的備份儲存在 :path',
'backups_restore_warning' => '使用還原按鈕 從之前的備份還原。 (這目前不適用於 S3 檔案儲存或 Docker。)
您的 整個 :app_name 資料庫和所有上傳的檔案將被完全取代 為備份檔案中的內容。',
diff --git a/resources/lang/zh-TW/admin/users/message.php b/resources/lang/zh-TW/admin/users/message.php
index 8c503b7ec2..10973faa21 100644
--- a/resources/lang/zh-TW/admin/users/message.php
+++ b/resources/lang/zh-TW/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => '您已拒絕這項資產。',
'bulk_manager_warn' => '您的使用者已成功更新，但主管條目未保存，因為您選擇的主管也在要編輯的使用者列表中，使用者不能是自己的主管。 請再次選擇您的使用者並排除主管。',
'user_exists' => '使用者已存在！',
- 'user_not_found' => '找不到使用者。',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => '登入欄位是必需的',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => '密碼欄位是必需的',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => '查詢 LDAP 伺服器失敗，請檢查 LDAP 設定文件中的相關設定。
LDAP 伺服器錯誤訊息：',
'ldap_could_not_get_entries' => ' LDAP 伺服器取得資訊條目失敗，請檢查 LDAP 設定文件中的相關設定。
LDAP 伺服器錯誤訊息：',
'password_ldap' => '此帳戶的密碼由 LDAP/AD 管理。若要更改您的密碼，請聯繫您的 IT 部門。 ',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 9378a3b566..6c22c70ade 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'同時將這些使用者標記為已刪除。他們的資產歷史將保持完整，除非/直到您在管理設定中清除已刪除的記錄。',
'bulk_checkin_delete_success' => '您選擇的使用者已被刪除，他們的項目已經歸還。',
'bulk_checkin_success' => '已為選擇的使用者歸還項目。',
- 'set_to_null' => '刪除此資產的值|刪除所有 :asset_count 資產的值 ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => '刪除此使用者的 :field 值|刪除所有 :user_count 使用者的 :field 值 ',
'na_no_purchase_date' => 'N/A - 未提供採購日期',
'assets_by_status' => '按狀態的資產',
@@ -559,8 +559,8 @@ return [
'expires' => '過期',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/zh-TW/localizations.php b/resources/lang/zh-TW/localizations.php
index d5d2a8f7bc..c1e8d0cba5 100644
--- a/resources/lang/zh-TW/localizations.php
+++ b/resources/lang/zh-TW/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => '選擇語言',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> '美式英語',
'en-GB'=> '英式英語',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> '祖魯語',
],
- 'select_country' => '選擇一個國家',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'阿森松島',
@@ -135,6 +135,7 @@ return [
'EC'=>'厄瓜多',
'EE'=>'愛沙尼亞',
'EG'=>'埃及',
+ 'GB-ENG'=>'England',
'ER'=>'厄利垂亞',
'ES'=>'西班牙',
'ET'=>'衣索比亞',
@@ -233,6 +234,7 @@ return [
'NG'=>'奈及利亞',
'NI'=>'尼加拉瓜',
'NL'=>'荷蘭',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'挪威',
'NP'=>'尼泊爾',
'NR'=>'諾魯',
@@ -260,7 +262,7 @@ return [
'RU'=>'俄羅斯',
'RW'=>'盧安達',
'SA'=>'沙烏地阿拉伯',
- 'UK'=>'英國',
+ 'GB-SCT'=>'英國',
'SB'=>'索羅門群島',
'SC'=>'塞席爾',
'SS'=>'南蘇丹',
@@ -312,6 +314,7 @@ return [
'VI'=>'美屬維京群島',
'VN'=>'越南',
'VU'=>'萬那杜',
+ 'GB-WLS' =>'Wales',
'WF'=>'瓦利斯和富圖納群島',
'WS'=>'薩摩亞',
'YE'=>'葉門',
diff --git a/resources/lang/zh-TW/mail.php b/resources/lang/zh-TW/mail.php
index b0e9d63d4d..d60474ff25 100644
--- a/resources/lang/zh-TW/mail.php
+++ b/resources/lang/zh-TW/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => '使用者已申請項目',
'acceptance_asset_accepted' => '使用者已接收一項物品',
'acceptance_asset_declined' => '使用者已拒絕一項物品',
- 'accessory_name' => '配件名稱：',
- 'additional_notes' => '備註：',
+ 'accessory_name' => '配件名稱',
+ 'additional_notes' => 'Additional Notes',
'admin_has_created' => '管理員已在 :web 為您新增帳號',
- 'asset' => '資產：',
- 'asset_name' => '資產名稱：',
+ 'asset' => '資產',
+ 'asset_name' => '資產名稱',
'asset_requested' => '申請資產',
'asset_tag' => '資產標籤',
'assets_warrantee_alert' => '有 :count 項資產的保固將在接下來的 :threshold 天內到期。|有 :count 項資產的保固將在接下來的 :threshold 天內到期。',
'assigned_to' => '分配給',
'best_regards' => 'Best regards,',
- 'canceled' => '取消：',
- 'checkin_date' => '繳回日期：',
- 'checkout_date' => '借出日期：',
+ 'canceled' => 'Canceled',
+ 'checkin_date' => '繳回日期',
+ 'checkout_date' => '借出日期',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => '請點擊鏈結啟用您 :web 的帳戶：',
'current_QTY' => '目前數量',
'days' => '日',
- 'expecting_checkin_date' => '預計歸還日期：',
+ 'expecting_checkin_date' => '預計歸還日期',
'expires' => '過期',
'hello' => 'Hello',
'hi' => 'Hi',
'i_have_read' => '我同意使用條款，並且已經收到物品。',
'inventory_report' => '庫存報告',
- 'item' => '項目：',
+ 'item' => '項目',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => '有 :count 個授權將在 :threshold 天後到期。|有 :count 個授權將在 :threshold 天後到期。',
'link_to_update_password' => '請點擊以下鏈結以更新 :web 的密碼：',
diff --git a/resources/lang/zu-ZA/admin/locations/message.php b/resources/lang/zu-ZA/admin/locations/message.php
index 0c3411081e..f95b61b944 100644
--- a/resources/lang/zu-ZA/admin/locations/message.php
+++ b/resources/lang/zu-ZA/admin/locations/message.php
@@ -3,7 +3,7 @@
return array(
'does_not_exist' => 'Indawo ayikho.',
- 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+ 'assoc_users' => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
'assoc_assets' => 'Le ndawo okwamanje ihlotshaniswa okungenani nefa elilodwa futhi ayikwazi ukususwa. Sicela ubuyekeze izimpahla zakho ukuze ungasaphinde ubhekise le ndawo futhi uzame futhi.',
'assoc_child_loc' => 'Le ndawo okwamanje ungumzali okungenani indawo eyodwa yengane futhi ayikwazi ukususwa. Sicela ubuyekeze izindawo zakho ukuze ungasaphinde ubhekisele kule ndawo bese uyazama futhi.',
'assigned_assets' => 'Assigned Assets',
diff --git a/resources/lang/zu-ZA/admin/settings/general.php b/resources/lang/zu-ZA/admin/settings/general.php
index 7a8cd17b7e..daa42fe32b 100644
--- a/resources/lang/zu-ZA/admin/settings/general.php
+++ b/resources/lang/zu-ZA/admin/settings/general.php
@@ -31,6 +31,8 @@ return [
'backups' => 'Izipele',
'backups_help' => 'Create, download, and restore backups ',
'backups_restoring' => 'Restoring from Backup',
+ 'backups_clean' => 'Clean the backed-up database before restore',
+ 'backups_clean_helptext' => "This can be useful if you're changing between database versions",
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
diff --git a/resources/lang/zu-ZA/admin/users/message.php b/resources/lang/zu-ZA/admin/users/message.php
index cf9786a5ea..538506f044 100644
--- a/resources/lang/zu-ZA/admin/users/message.php
+++ b/resources/lang/zu-ZA/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
'declined' => 'Uye wenqaba ngempumelelo le mali.',
'bulk_manager_warn' => 'Abasebenzisi bakho babuyekezwe ngempumelelo, kodwa ukungena kwakho kwemenenja akulondoloziwe ngoba umphathi oyikhethile naye ohlwini lomsebenzisi oluzohlelwa, futhi abasebenzisi bangase bangabi umphathi wabo. Sicela ukhethe abasebenzisi bakho futhi, ngaphandle kwamenenja.',
'user_exists' => 'Umsebenzisi usuvele ukhona!',
- 'user_not_found' => 'Umsebenzisi akakho.',
+ 'user_not_found' => 'User does not exist or you do not have permission view them.',
'user_login_required' => 'Insimu yokungena ngemvume iyadingeka',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'Iphasiwedi iyadingeka.',
@@ -53,6 +53,7 @@ return array(
'ldap_could_not_search' => 'Ayikwazanga ukusesha isiphakeli se-LDAP. Sicela uhlole ukumisa kweseva yakho ye-LDAP kufayili ye-LDAP config.
Iphutha kusuka kwiseva ye-LDAP:',
'ldap_could_not_get_entries' => 'Ayikwazanga ukungena okuvela kuseva ye-LDAP. Sicela uhlole ukumisa kweseva yakho ye-LDAP kufayili ye-LDAP config.
Iphutha kusuka kwiseva ye-LDAP:',
'password_ldap' => 'Iphasiwedi yale akhawunti ilawulwa yi-LDAP / Active Directory. Sicela uxhumane nomnyango wakho we-IT ukushintsha iphasiwedi yakho.',
+ 'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
),
'deletefile' => array(
diff --git a/resources/lang/zu-ZA/general.php b/resources/lang/zu-ZA/general.php
index dcaab9ed3b..d0ec7c8eda 100644
--- a/resources/lang/zu-ZA/general.php
+++ b/resources/lang/zu-ZA/general.php
@@ -419,7 +419,7 @@ return [
'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
- 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+ 'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ',
'na_no_purchase_date' => 'N/A - No purchase date provided',
'assets_by_status' => 'Assets by Status',
@@ -559,8 +559,8 @@ return [
'expires' => 'Iphelelwa yisikhathi',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
- 'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+ 'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
];
diff --git a/resources/lang/zu-ZA/localizations.php b/resources/lang/zu-ZA/localizations.php
index f335ddc1b3..fdca1532bd 100644
--- a/resources/lang/zu-ZA/localizations.php
+++ b/resources/lang/zu-ZA/localizations.php
@@ -2,7 +2,7 @@
return [
- 'select_language' => 'Select a language',
+ 'select_language' => 'Select a Language',
'languages' => [
'en-US'=> 'English, US',
'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@ return [
'zu-ZA'=> 'Zulu',
],
- 'select_country' => 'Select a country',
+ 'select_country' => 'Select a Country',
'countries' => [
'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@ return [
'EC'=>'Ecuador',
'EE'=>'Estonia',
'EG'=>'Egypt',
+ 'GB-ENG'=>'England',
'ER'=>'Eritrea',
'ES'=>'Spain',
'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@ return [
'NG'=>'Nigeria',
'NI'=>'Nicaragua',
'NL'=>'Netherlands',
+ 'GB-NIR' => 'Northern Ireland',
'NO'=>'Norway',
'NP'=>'Nepal',
'NR'=>'Nauru',
@@ -260,7 +262,7 @@ return [
'RU'=>'Russian Federation',
'RW'=>'Rwanda',
'SA'=>'Saudi Arabia',
- 'UK'=>'Scotland',
+ 'GB-SCT'=>'Scotland',
'SB'=>'Solomon Islands',
'SC'=>'Seychelles',
'SS'=>'South Sudan',
@@ -312,6 +314,7 @@ return [
'VI'=>'Virgin Islands (U.S.)',
'VN'=>'Viet Nam',
'VU'=>'Vanuatu',
+ 'GB-WLS' =>'Wales',
'WF'=>'Wallis And Futuna Islands',
'WS'=>'Samoa',
'YE'=>'Yemen',
diff --git a/resources/lang/zu-ZA/mail.php b/resources/lang/zu-ZA/mail.php
index cbe5598fd5..0a4a928409 100644
--- a/resources/lang/zu-ZA/mail.php
+++ b/resources/lang/zu-ZA/mail.php
@@ -28,19 +28,19 @@ return [
'a_user_requested' => 'Umsebenzisi ucele into ku-website',
'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item',
- 'accessory_name' => 'Igama lokufinyelela:',
- 'additional_notes' => 'Amanothi angeziwe:',
+ 'accessory_name' => 'Igama lokufinyelela',
+ 'additional_notes' => 'Amanothi angeziwe',
'admin_has_created' => 'Umlawuli udale i-akhawunti kuwe: iwebhusayithi yewebhu.',
- 'asset' => 'Impahla:',
- 'asset_name' => 'Igama lomhlaba:',
+ 'asset' => 'Impahla',
+ 'asset_name' => 'Igama lefa',
'asset_requested' => 'Ifa liceliwe',
'asset_tag' => 'Ithegi lefa',
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'assigned_to' => 'Kwabiwa Ku',
'best_regards' => 'Ozithobayo,',
- 'canceled' => 'Ikhanseliwe:',
- 'checkin_date' => 'Usuku lokuhlola:',
- 'checkout_date' => 'Usuku lokuhlola:',
+ 'canceled' => 'Ikhanseliwe',
+ 'checkin_date' => 'Usuku lokuhlola',
+ 'checkout_date' => 'Usuku lokuhlola',
'checkedout_from' => 'Checked out from',
'checkedin_from' => 'Checked in from',
'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@ return [
'click_to_confirm' => 'Sicela uchofoze kusixhumanisi esilandelayo ukuqinisekisa i-akhawunti yakho yewebhu:',
'current_QTY' => 'I-QTY yamanje',
'days' => 'Izinsuku',
- 'expecting_checkin_date' => 'Ilanga le-Checkin elilindelekile:',
+ 'expecting_checkin_date' => 'Ilanga le-Checkin elilindelekile',
'expires' => 'Iphelelwa yisikhathi',
'hello' => 'Sawubona',
'hi' => 'Sawubona',
'i_have_read' => 'Ngifunde futhi ngiyavumelana nemigomo yokusetshenziswa, futhi ngithole le nto.',
'inventory_report' => 'Inventory Report',
- 'item' => 'Into:',
+ 'item' => 'Into',
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'link_to_update_password' => 'Sicela uchofoze kusixhumanisi esilandelayo ukuze ubuyekeze: iphasiwedi yakho yewebhu:',
@@ -66,11 +66,11 @@ return [
'name' => 'Igama',
'new_item_checked' => 'Into entsha ihloliwe ngaphansi kwegama lakho, imininingwane ingezansi.',
'notes' => 'Amanothi',
- 'password' => 'Iphasiwedi:',
+ 'password' => 'Iphasiwedi',
'password_reset' => 'I-Password Setha kabusha',
'read_the_terms' => 'Sicela ufunde imigomo yokusetshenziswa ngezansi.',
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
- 'requested' => 'Ucele:',
+ 'requested' => 'Kuceliwe',
'reset_link' => 'Iphasiwedi yakho Hlaziya kabusha Isixhumanisi',
'reset_password' => 'Chofoza lapha ukuze usethe kabusha iphasiwedi yakho:',
'rights_reserved' => 'All rights reserved.',