diff --git a/app/config/version.php b/app/config/version.php index d39de957af..6a64e4e081 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0.5-pre', - 'hash_version' => 'v2.0.5-pre-185-g0f33bad', + 'hash_version' => 'v2.0.5-pre-191-g948be5c', ); \ No newline at end of file diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php index b7f00827f2..97fd5cf2e3 100755 --- a/app/controllers/admin/LicensesController.php +++ b/app/controllers/admin/LicensesController.php @@ -781,7 +781,8 @@ class LicensesController extends AdminController // Show the page $license_options = array('0' => 'Top Level') + License::lists('name', 'id'); - $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No'); + $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No'); + $company_list = Company::getSelectList(); //clone the orig $license = clone $license_to_clone; $license->id = null; @@ -790,7 +791,13 @@ class LicensesController extends AdminController // Show the page $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id'); $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id'); - return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list); + return View::make('backend/licenses/edit') + ->with('license_options',$license_options) + ->with('depreciation_list',$depreciation_list) + ->with('supplier_list',$supplier_list) + ->with('license',$license) + ->with('maintained_list',$maintained_list) + ->with('company_list',$company_list); } diff --git a/app/lang/ar/admin/accessories/message.php b/app/lang/ar/admin/accessories/message.php index 113559e067..9cf0e1a3d7 100755 --- a/app/lang/ar/admin/accessories/message.php +++ b/app/lang/ar/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'هذه الفئة غير موجودة.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'تم إخراج :count عنصر من هذا الملحق للمستخدمين، الرجاء إيداع الملحقات ثم حاول مرة أخرى. ', 'create' => array( - 'error' => 'فشل إنشاء التصنيف، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم إنشاء الفئة بنجاح.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'فشل تحديث التصنيف، الرجاء المحاولة مرة أخرى', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'لم يتم إخراج الملحق، الرجاء المحاولة مرة أخرى', 'success' => 'تم إخراج الملحق بنجاح.', diff --git a/app/lang/ar/admin/hardware/table.php b/app/lang/ar/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/ar/admin/hardware/table.php +++ b/app/lang/ar/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/ar/admin/settings/general.php b/app/lang/ar/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/ar/admin/settings/general.php +++ b/app/lang/ar/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php index f6ee6a7eba..3d6d268da0 100755 --- a/app/lang/ar/general.php +++ b/app/lang/ar/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'ترجيع', 'city' => 'المدينة', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'الدولة', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'الإسم الأخير', + 'last_name' => 'الإسم الأخير', 'license' => 'الرخص', 'license_report' => 'License Report', 'licenses_available' => 'الرخص المتاحة', @@ -140,4 +143,5 @@ 'years' => 'سنوات', 'yes' => 'نعم', 'zip' => 'الرمز البريدي', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/bg/admin/accessories/general.php b/app/lang/bg/admin/accessories/general.php index 2ec1b90cf5..05230a854d 100755 --- a/app/lang/bg/admin/accessories/general.php +++ b/app/lang/bg/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Аксесоарите са всички неща, които се изписват на потребителите, но нямат сериен номер (или няма нужда да бъдат конкретно проследявани). Например, това са мишки, клавиатури и др.', 'accessory_category' => 'Категория аксесоари', 'accessory_name' => 'Аксесоар', - 'cost' => 'Purchase Cost', + 'cost' => 'Стойност на закупуване', 'create' => 'Създаване на аксесоар', - 'date' => 'Purchase Date', + 'date' => 'Дата на закупуване', 'eula_text' => 'EULA на категорията', 'eula_text_help' => 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.', 'require_acceptance' => 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.', 'no_default_eula' => 'Няма EULA по подразбиране. Добавете я в Настройки.', - 'order' => 'Order Number', + 'order' => 'Номер на поръчка', 'qty' => 'Количество', 'total' => 'Oбщо', 'remaining' => 'Наличност', diff --git a/app/lang/bg/admin/accessories/message.php b/app/lang/bg/admin/accessories/message.php index 2a24addd11..33b13e03c9 100755 --- a/app/lang/bg/admin/accessories/message.php +++ b/app/lang/bg/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Няма такава категория.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'От този аксесоар са предадени :count броя на потребителите. Моля впишете обратно нови или върнати и опитайте отново.', 'create' => array( - 'error' => 'Категорията не беше създадена. Моля опитайте отново.', - 'success' => 'Категорията е създадена.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Категорията не беше обновена. Моля опитайте отново.', - 'success' => 'Категорията е обновена.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Проблем при изтриване на категорията. Моля опитайте отново.', 'success' => 'Категорията бе изтрита успешно.' ), - + 'checkout' => array( 'error' => 'Аксесоарът не беше изписан. Моля опитайте отново.', 'success' => 'Аксесоарът изписан успешно.', diff --git a/app/lang/bg/admin/consumables/general.php b/app/lang/bg/admin/consumables/general.php index 31bd321427..2ced766048 100755 --- a/app/lang/bg/admin/consumables/general.php +++ b/app/lang/bg/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => 'Относно консумативите', 'about_consumables_text' => 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.', 'consumable_name' => 'Консуматив', - 'cost' => 'Purchase Cost', + 'cost' => 'Стойност на закупуване', 'create' => 'Създаване на консуматив', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => 'Дата на закупуване', + 'order' => 'Номер на поръчка', 'remaining' => 'Остава', 'total' => 'Oбщо', 'update' => 'Обновяване на консуматив', diff --git a/app/lang/bg/admin/hardware/table.php b/app/lang/bg/admin/hardware/table.php index 8212d46f2b..4b0d0954e9 100755 --- a/app/lang/bg/admin/hardware/table.php +++ b/app/lang/bg/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Сериен номер', 'status' => 'Статус', 'title' => 'Актив ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Дни без да е предаден' ); diff --git a/app/lang/bg/admin/locations/table.php b/app/lang/bg/admin/locations/table.php index 44de80b405..2452a6b180 100755 --- a/app/lang/bg/admin/locations/table.php +++ b/app/lang/bg/admin/locations/table.php @@ -1,8 +1,8 @@ 'Assets RTD', - 'assets_checkedout' => 'Assets Assigned', + 'assets_rtd' => 'Бракувани активи', + 'assets_checkedout' => 'Изписани активи', 'id' => 'ID', 'city' => 'Град', 'state' => 'Област', diff --git a/app/lang/bg/admin/settings/general.php b/app/lang/bg/admin/settings/general.php index d1a89dd1e5..cb47920eab 100755 --- a/app/lang/bg/admin/settings/general.php +++ b/app/lang/bg/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Цвят на хедъра', 'info' => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.', 'laravel' => 'Версия на Laravel', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', + 'load_remote_text' => 'Отдалечени скриптове', + 'load_remote_help_text' => 'Тази Snipe-IT инсталация може да зарежда и изпълнява външни скриптове.', 'logo' => 'Лого', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'незадължително', 'per_page' => 'Резултати на страница', 'php' => 'PHP версия', @@ -48,7 +66,7 @@ return array( 'system' => 'Информация за системата', 'update' => 'Обновяване на настройките', 'value' => 'Стойност', - 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'brand' => 'Брандиране', + 'about_settings_title' => 'Относно настройките', + 'about_settings_text' => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.', ); diff --git a/app/lang/bg/general.php b/app/lang/bg/general.php index 4e607ac469..3bb27fdc3a 100755 --- a/app/lang/bg/general.php +++ b/app/lang/bg/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Форма за вписване', 'checkout' => 'Изписване', 'city' => 'Град', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Консуматив', 'consumables' => 'Консумативи', 'country' => 'Държава', @@ -43,7 +45,7 @@ 'date' => 'Дата', 'delete' => 'Изтриване', 'deleted' => 'Изтрито', - 'delete_seats' => 'Deleted Seats', + 'delete_seats' => 'Изтрити работни места за лиценз', 'deployed' => 'Изписани', 'depreciation_report' => 'Справка за амортизации', 'download' => 'Изтегляне', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Справка за поддръжка на активи', 'asset_maintenances' => 'Поддръжки на активи', 'item' => 'Информация', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Последна', - 'last_name' => 'Фамилия', + 'last_name' => 'Фамилия', 'license' => 'Лиценз', 'license_report' => 'Справка за лицензите', 'licenses_available' => 'налични лицензи', @@ -140,4 +143,5 @@ 'years' => 'години', 'yes' => 'Да', 'zip' => 'Пощенски код', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/cs/admin/accessories/message.php b/app/lang/cs/admin/accessories/message.php index 132dd46168..d27d5a241c 100755 --- a/app/lang/cs/admin/accessories/message.php +++ b/app/lang/cs/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategorie neexistuje.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Tato kategorie má nyní :count položek k předání uživatelům. Zkontrolujte převzetí příslušenství a zkuste to znovu. ', 'create' => array( - 'error' => 'Kategorie nevytvořena, zkuste to znovu.', - 'success' => 'Kategorie úspěšně vytvořena.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategorie neaktualizována, zkuste to znovu', - 'success' => 'Kategorie úspěšně aktualizována.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Vyskytl se problém při mazání kategorie. Zkuste to znovu.', 'success' => 'Kategorie byla úspěšně smazána.' ), - + 'checkout' => array( 'error' => 'Příslušenství nebylo převzato, zkuste to znovu', 'success' => 'Příslušenství úspěšně předáno.', diff --git a/app/lang/cs/admin/hardware/table.php b/app/lang/cs/admin/hardware/table.php index 3d938795a9..6150fad3f7 100755 --- a/app/lang/cs/admin/hardware/table.php +++ b/app/lang/cs/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Sériové číslo', 'status' => 'Stav', 'title' => 'Majetek ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/cs/admin/settings/general.php b/app/lang/cs/admin/settings/general.php index 18314e9518..b7437b947c 100755 --- a/app/lang/cs/admin/settings/general.php +++ b/app/lang/cs/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Barva záhlaví', 'info' => 'Tato nastavení umožňují zvolit určité prvky instalace.', 'laravel' => 'Verze Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'volitelný', 'per_page' => 'Výsledků na stránku', 'php' => 'Verze PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Hodnota', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php index 57a8dd82a1..1a80be2429 100755 --- a/app/lang/cs/general.php +++ b/app/lang/cs/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Převzít od', 'checkout' => 'Výdej', 'city' => 'Město', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Země', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Položka', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Poslední', - 'last_name' => 'Příjmení', + 'last_name' => 'Příjmení', 'license' => 'Licence', 'license_report' => 'Report licencí', 'licenses_available' => 'dostupných licencí', @@ -140,4 +143,5 @@ 'years' => 'roky', 'yes' => 'Ano', 'zip' => 'PSČ', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/da/admin/accessories/general.php b/app/lang/da/admin/accessories/general.php index aa3600b071..a0a084f860 100755 --- a/app/lang/da/admin/accessories/general.php +++ b/app/lang/da/admin/accessories/general.php @@ -5,18 +5,18 @@ return array( 'about_accessories_text' => 'Tilbehør er alt du udleverer til brugere men som ikke har et serienummer (eller som du er ligeglad med følge præcist). For eksempel, computermus eller tastaturer.', 'accessory_category' => 'Tilbehør Kategori', 'accessory_name' => 'Tilbehør Navn', - 'cost' => 'Purchase Cost', - 'create' => 'Create Accessory', - 'date' => 'Purchase Date', + 'cost' => 'Indkøbspris', + 'create' => 'Opret tilbehør', + 'date' => 'Købsdato', 'eula_text' => 'Slutbrugerlicenskategori', 'eula_text_help' => 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.', 'require_acceptance' => 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.', 'no_default_eula' => 'Ingen primær standard slutbrugerlicens blev fundet. Tilføj en under Indstillinger.', - 'order' => 'Order Number', + 'order' => 'Ordrenummer', 'qty' => 'STK', 'total' => 'I alt', 'remaining' => 'Tilgængelig', - 'update' => 'Update Accessory', + 'update' => 'Opdater tilbehør', 'use_default_eula' => 'Brug den primære standard slutbrugerlicens i stedet for.', 'use_default_eula_disabled' => 'Brug den primære standard slutbrugerlicens i stedet for. Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.', diff --git a/app/lang/da/admin/accessories/message.php b/app/lang/da/admin/accessories/message.php index 324a4bbd2a..b681b5b712 100755 --- a/app/lang/da/admin/accessories/message.php +++ b/app/lang/da/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategorien eksisterer ikke.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.', 'create' => array( - 'error' => 'Kategorien blev ikke oprettet, prøv igen.', - 'success' => 'Kategorien blev oprettet.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategorien blev ikke opdateret, prøv igen', - 'success' => 'Kategorien blev opdateret.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Der opstod et problem under sletning af kategorien. Prøv igen.', 'success' => 'Kategorien blev slettet.' ), - + 'checkout' => array( 'error' => 'Tilbehør blev ikke tjekket ud, prøv igen', 'success' => 'Tilbehør er tjekket ud.', diff --git a/app/lang/da/admin/accessories/table.php b/app/lang/da/admin/accessories/table.php index 5d5859e9a8..7298f8e58b 100755 --- a/app/lang/da/admin/accessories/table.php +++ b/app/lang/da/admin/accessories/table.php @@ -1,7 +1,7 @@ 'Download CSV', + 'dl_csv' => 'Hent CSV', 'eula_text' => 'Slutbrugerlicens', 'id' => 'ID', 'require_acceptance' => 'Accept', diff --git a/app/lang/da/admin/hardware/table.php b/app/lang/da/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/da/admin/hardware/table.php +++ b/app/lang/da/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/da/admin/settings/general.php b/app/lang/da/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/da/admin/settings/general.php +++ b/app/lang/da/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/da/auth/message.php b/app/lang/da/auth/message.php index a9f3772549..c08d31dca3 100755 --- a/app/lang/da/auth/message.php +++ b/app/lang/da/auth/message.php @@ -3,7 +3,7 @@ return array( 'account_already_exists' => 'En konto med denne e-mail eksisterer allerede.', - 'account_not_found' => 'The username or password is incorrect.', + 'account_not_found' => 'Brugernavn eller kodeord er forkert.', 'account_not_activated' => 'Denne brugerkonto er ikke aktiveret.', 'account_suspended' => 'Denne brugerkonto er suspenderet.', 'account_banned' => 'Denne brugerkonto er blokeret.', diff --git a/app/lang/da/button.php b/app/lang/da/button.php index 76662577e6..e6d8ccb69d 100755 --- a/app/lang/da/button.php +++ b/app/lang/da/button.php @@ -8,7 +8,7 @@ return array( 'delete' => 'Slet', 'edit' => 'Rediger', 'restore' => 'Gendan', - 'request' => 'Request', + 'request' => 'Anmodning', 'submit' => 'Send', 'upload' => 'Upload', diff --git a/app/lang/da/general.php b/app/lang/da/general.php index 27ff485e9b..4489f5ad2c 100755 --- a/app/lang/da/general.php +++ b/app/lang/da/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Tjek Ud', 'city' => 'By', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Land', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Efternavn', + 'last_name' => 'Efternavn', 'license' => 'Licens', 'license_report' => 'Licensrapport', 'licenses_available' => 'Tilgængelige licenser', @@ -140,4 +143,5 @@ 'years' => 'år', 'yes' => 'Ja', 'zip' => 'Postnummer', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/de/admin/accessories/general.php b/app/lang/de/admin/accessories/general.php index 5c14a69d14..95519e67cd 100755 --- a/app/lang/de/admin/accessories/general.php +++ b/app/lang/de/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Ein Zubehör ist alles was Sie an einem Benutzer ausgeben können, jedoch keine Seriennummer besitzt (oder wo es keinen Sinn macht eben diese zu verwalten). Zum Beispiel: Computer Mäuse und Tastaturen.', 'accessory_category' => 'Züberhor Kategorie', 'accessory_name' => 'Zubehör Name', - 'cost' => 'Purchase Cost', + 'cost' => 'Einkaufspreis', 'create' => 'Zubehör neu erstellen', - 'date' => 'Purchase Date', + 'date' => 'Kaufdatum', 'eula_text' => 'Kategorie EULA', 'eula_text_help' => 'Dieses Feld erlaubt Ihnen die EULA Ihren Bedürfnissen nach Asset Typ anzupassen.Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb um die Standard EULA zu verwenden.', 'require_acceptance' => 'Erfordert die Zustimmung der Assets in dieser Kategorie durch den Benutzer.', 'no_default_eula' => 'Keine Standard EULA gefunden. Fügen Sie eine in den Einstellungen hinzu.', - 'order' => 'Order Number', + 'order' => 'Bestellnummer', 'qty' => 'Anzahl', 'total' => 'Gesamt', 'remaining' => 'Verfügbar', diff --git a/app/lang/de/admin/accessories/message.php b/app/lang/de/admin/accessories/message.php index 258c8686cf..88a6a68c16 100755 --- a/app/lang/de/admin/accessories/message.php +++ b/app/lang/de/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Diese Kategorie existiert nicht.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Dieses Zubehör ist derzeit an :count Benutzern zur Verwendung ausgegeben worden. Bitte buchen Sie das Zubehör wieder ein und versuchen es dann noch Einmal. ', 'create' => array( - 'error' => 'Die Kategorie wurde nicht erstellt, bitte versuchen Sie es erneut.', - 'success' => 'Die Kategorie wurde erfolgreich erstellt.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Die Kategorie konnte nicht aktualisiert werden, bitte versuchen Sie es erneut', - 'success' => 'Die Kategorie wurde erfolgreich aktualisiert.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Beim Löschen der Kategorie ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.', 'success' => 'Die Kategorie wurde erfolgreich gelöscht.' ), - + 'checkout' => array( 'error' => 'Zubehör konnte nicht ausgebucht werden, bitte versuchen Sie es erneut', 'success' => 'Zubehör erfolgreich ausgebucht.', diff --git a/app/lang/de/admin/consumables/general.php b/app/lang/de/admin/consumables/general.php index 9829afd7a4..a63a9da76f 100755 --- a/app/lang/de/admin/consumables/general.php +++ b/app/lang/de/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => 'Details Verbrauchsmaterialien', 'about_consumables_text' => 'Verbrauchsmaterialien sind alle Dinge, die gekauft und mit der Zeit aufgebraucht werden, wie z.B. Druckerpatronen oder Kopierpapier.', 'consumable_name' => 'Name des Verbrauchsmaterials', - 'cost' => 'Purchase Cost', + 'cost' => 'Einkaufspreis', 'create' => 'Verbrauchsmaterial erstellen', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => 'Kaufdatum', + 'order' => 'Bestellnummer', 'remaining' => 'übrig', 'total' => 'Gesamt', 'update' => 'Verbrauchsmaterial überarbeiten', diff --git a/app/lang/de/admin/hardware/table.php b/app/lang/de/admin/hardware/table.php index 8535b7df18..fb1469b72c 100755 --- a/app/lang/de/admin/hardware/table.php +++ b/app/lang/de/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Seriennummer', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Tage ohne Akzeptierung' ); diff --git a/app/lang/de/admin/locations/table.php b/app/lang/de/admin/locations/table.php index baab63b170..4ff4522e93 100755 --- a/app/lang/de/admin/locations/table.php +++ b/app/lang/de/admin/locations/table.php @@ -1,8 +1,8 @@ 'Assets RTD', - 'assets_checkedout' => 'Assets Assigned', + 'assets_rtd' => 'Asset bereit zum Herausgeben', + 'assets_checkedout' => 'Zugewiesene Assets', 'id' => 'ID', 'city' => 'Stadt', 'state' => 'Bundesland', diff --git a/app/lang/de/admin/settings/general.php b/app/lang/de/admin/settings/general.php index 4b95bf6b80..b140a1c0ac 100755 --- a/app/lang/de/admin/settings/general.php +++ b/app/lang/de/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Farbe der Kopfzeile', 'info' => 'Mit diesen Einstellungen können Sie verschieden Aspekte Ihrer Installation bearbeiten.', 'laravel' => 'Laravel Version', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', + 'load_remote_text' => 'Remote Skripte', + 'load_remote_help_text' => 'Diese Installation von Snipe-IT kann Skripte von außerhalb laden.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Ergebnisse pro Seite', 'php' => 'PHP Version', @@ -49,6 +67,6 @@ return array( 'update' => 'Einstellungen übernehmen', 'value' => 'Wert', 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_title' => 'Über Einstellungen', + 'about_settings_text' => 'Mit diesen Einstellungen können Sie verschiedene Aspekte Ihrer Installation anpassen.', ); diff --git a/app/lang/de/general.php b/app/lang/de/general.php index d541c09e10..c4e051a0a8 100755 --- a/app/lang/de/general.php +++ b/app/lang/de/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Einchecken von', 'checkout' => 'Checkout Asset to User', 'city' => 'Stadt', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Verbrauchsmaterial', 'consumables' => 'Verbrauchsmaterialien', 'country' => 'Land', @@ -43,7 +45,7 @@ 'date' => 'Purchase Date', 'delete' => 'Löschen', 'deleted' => 'Gelöscht', - 'delete_seats' => 'Deleted Seats', + 'delete_seats' => 'Gelöschte Lizenzen', 'deployed' => 'Herausgegeben', 'depreciation_report' => 'Abschreibunsgreport', 'download' => 'Download', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Wartungsbericht', 'asset_maintenances' => 'Asset Wartungen', 'item' => 'Gegenstand', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Letztes', - 'last_name' => 'Familienname', + 'last_name' => 'Familienname', 'license' => 'Lizenz', 'license_report' => 'Lizenz Report', 'licenses_available' => 'Verfügbare Lizenzen', @@ -140,4 +143,5 @@ 'years' => 'Jahre', 'yes' => 'Ja', 'zip' => 'Postal Code', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/en-GB/admin/accessories/message.php b/app/lang/en-GB/admin/accessories/message.php index 62f179c5a1..e324708ff3 100755 --- a/app/lang/en-GB/admin/accessories/message.php +++ b/app/lang/en-GB/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/en-GB/admin/hardware/table.php b/app/lang/en-GB/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/en-GB/admin/hardware/table.php +++ b/app/lang/en-GB/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/en-GB/admin/settings/general.php b/app/lang/en-GB/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/en-GB/admin/settings/general.php +++ b/app/lang/en-GB/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php index cdad4e1b78..91eed71c20 100755 --- a/app/lang/en-GB/general.php +++ b/app/lang/en-GB/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Checkout', 'city' => 'City', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Last Name', + 'last_name' => 'Last Name', 'license' => 'License', 'license_report' => 'License Report', 'licenses_available' => 'licenses available', @@ -140,4 +143,5 @@ 'years' => 'years', 'yes' => 'Yes', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/en-ID/admin/accessories/message.php b/app/lang/en-ID/admin/accessories/message.php index 52e5a3b870..278d8269a5 100755 --- a/app/lang/en-ID/admin/accessories/message.php +++ b/app/lang/en-ID/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategori tidak ada.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Aksesori saat ini memiliki :count item untuk pengguna. Silahkan cek di aksesoris dan dan coba lagi. ', 'create' => array( - 'error' => 'Kategori gagal dibuat, silakan coba lagi.', - 'success' => 'Kategori berhasil disimpan.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategori tidak terupdate, silakan coba lagi', - 'success' => 'Kategori berhasil diupdate.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Ada masalah menghapus kategori. Silakan coba lagi.', 'success' => 'Kategori berhasil dihapus.' ), - + 'checkout' => array( 'error' => 'Aksesori belum diperiksa, silakan coba lagi', 'success' => 'Aksesori berhasil diperiksa.', diff --git a/app/lang/en-ID/admin/hardware/table.php b/app/lang/en-ID/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/en-ID/admin/hardware/table.php +++ b/app/lang/en-ID/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/en-ID/admin/settings/general.php b/app/lang/en-ID/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/en-ID/admin/settings/general.php +++ b/app/lang/en-ID/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/en-ID/general.php b/app/lang/en-ID/general.php index 697f285dae..026a6c9068 100755 --- a/app/lang/en-ID/general.php +++ b/app/lang/en-ID/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Checkout', 'city' => 'City', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Last Name', + 'last_name' => 'Last Name', 'license' => 'License', 'license_report' => 'License Report', 'licenses_available' => 'licenses available', @@ -140,4 +143,5 @@ 'years' => 'years', 'yes' => 'Yes', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/es-CO/admin/accessories/message.php b/app/lang/es-CO/admin/accessories/message.php index bbcd8c0cc5..95c12a695d 100755 --- a/app/lang/es-CO/admin/accessories/message.php +++ b/app/lang/es-CO/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Categoría inexistente.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/es-CO/admin/hardware/table.php b/app/lang/es-CO/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/es-CO/admin/hardware/table.php +++ b/app/lang/es-CO/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/es-CO/admin/settings/general.php b/app/lang/es-CO/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/es-CO/admin/settings/general.php +++ b/app/lang/es-CO/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/es-CO/general.php b/app/lang/es-CO/general.php index c9ddda5ab5..8fa01f3f1a 100755 --- a/app/lang/es-CO/general.php +++ b/app/lang/es-CO/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Checkout', 'city' => 'City', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Last Name', + 'last_name' => 'Last Name', 'license' => 'License', 'license_report' => 'License Report', 'licenses_available' => 'licenses available', @@ -140,4 +143,5 @@ 'years' => 'years', 'yes' => 'Yes', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/es-ES/admin/accessories/message.php b/app/lang/es-ES/admin/accessories/message.php index 183cd20897..fc73ad3f51 100755 --- a/app/lang/es-ES/admin/accessories/message.php +++ b/app/lang/es-ES/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Categoría inexistente.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ', 'create' => array( - 'error' => 'La categoría no se ha creado, inténtalo de nuevo.', - 'success' => 'Categoría creada correctamente.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'La categoría no se ha actualizado, inténtalo de nuevo', - 'success' => 'Categoría actualizada correctamente.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', 'success' => 'La categoría fue eliminada exitosamente.' ), - + 'checkout' => array( 'error' => 'El accesorio no fue retirado, por favor vuelva a intentarlo', 'success' => 'Accesorio retirado correctamente.', diff --git a/app/lang/es-ES/admin/hardware/table.php b/app/lang/es-ES/admin/hardware/table.php index 67d4f2e282..eac1987632 100755 --- a/app/lang/es-ES/admin/hardware/table.php +++ b/app/lang/es-ES/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'N. Serie', 'status' => 'Estado', 'title' => 'Equipo ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Días Sin Aceptación' ); diff --git a/app/lang/es-ES/admin/settings/general.php b/app/lang/es-ES/admin/settings/general.php index 210bc25220..22d3023ba5 100755 --- a/app/lang/es-ES/admin/settings/general.php +++ b/app/lang/es-ES/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Color de encabezado', 'info' => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.', 'laravel' => 'Versión de Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'opcional', 'per_page' => 'Resultados por página', 'php' => 'Versión de PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Valor', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php index 7c4cc529dd..e518fb9d31 100755 --- a/app/lang/es-ES/general.php +++ b/app/lang/es-ES/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Devolución de', 'checkout' => 'Asignar a un usuario', 'city' => 'Ciudad', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumible', 'consumables' => 'Consumibles', 'country' => 'Pais', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Reporte de Mantenimiento de Equipo', 'asset_maintenances' => 'Mantenimientos de Equipo', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Último', - 'last_name' => 'Apellidos', + 'last_name' => 'Apellidos', 'license' => 'Licencia', 'license_report' => 'Reporte de Licencias', 'licenses_available' => 'licencias libres', @@ -140,4 +143,5 @@ 'years' => 'años', 'yes' => 'Si', 'zip' => 'Códio Postal', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/fi/admin/accessories/message.php b/app/lang/fi/admin/accessories/message.php index f000bd921c..0ca8b5ab9c 100755 --- a/app/lang/fi/admin/accessories/message.php +++ b/app/lang/fi/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Luokkaa ei löydy.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Luokkaa ei päivitetty, yritä uudelleen', - 'success' => 'Luokka päivitettiin onnistuneesti.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/fi/admin/hardware/table.php b/app/lang/fi/admin/hardware/table.php index c2eebbd75a..76a8276eec 100755 --- a/app/lang/fi/admin/hardware/table.php +++ b/app/lang/fi/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Sarjanumero', 'status' => 'Tila', 'title' => 'Laite ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/fi/admin/settings/general.php b/app/lang/fi/admin/settings/general.php index 30354ee2e9..8bb3852e09 100755 --- a/app/lang/fi/admin/settings/general.php +++ b/app/lang/fi/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Yläosion logo', 'info' => 'Näiden asetusten avulla voit mukauttaa tiettyjä toimintoja.', 'laravel' => 'Versio Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'valinnainen', 'per_page' => 'Tuloksia Per Sivu', 'php' => 'Versio PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Arvo', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php index 958662acce..3d0f8f8352 100755 --- a/app/lang/fi/general.php +++ b/app/lang/fi/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Luovuta', 'city' => 'Kaupunki', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Maa', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Sukunimi', + 'last_name' => 'Sukunimi', 'license' => 'Lisenssi', 'license_report' => 'Lisenssiraportti', 'licenses_available' => 'Vapaana olevat lisenssit', @@ -140,4 +143,5 @@ 'years' => 'vuotta', 'yes' => 'Kyllä', 'zip' => 'Postinumero', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/fr/admin/accessories/message.php b/app/lang/fr/admin/accessories/message.php index 434fb3c310..9269971eab 100755 --- a/app/lang/fr/admin/accessories/message.php +++ b/app/lang/fr/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'La catégorie n\'éxiste pas.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Cet accessoire à présentement des items d\'attribué à des utilisateurs. S\'il vous plaît vérifier l\'accessoire et veuillez réessayer. ', 'create' => array( - 'error' => 'La catégorie n\'a pas été crée, veuillez essayer à nouveau.', - 'success' => 'Catégorie créée avec succès.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Catégorie n\'a pas été actualisée, veuillez réessayer', - 'success' => 'Catégorie actualisée correctement.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Problème lors de l\'effacement de cette catégorie. Veuillez réessayer.', 'success' => 'Catégorie effacée.' ), - + 'checkout' => array( 'error' => 'Cet accessoire n\'est pas attribué. Veuillez réessayer', 'success' => 'Accessoire attribué correctement.', diff --git a/app/lang/fr/admin/hardware/table.php b/app/lang/fr/admin/hardware/table.php index 9fe71b0051..e97502f377 100755 --- a/app/lang/fr/admin/hardware/table.php +++ b/app/lang/fr/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Numéro de série', 'status' => 'Statut', 'title' => 'Actif ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Jours sans acceptation' ); diff --git a/app/lang/fr/admin/settings/general.php b/app/lang/fr/admin/settings/general.php index 8d7e40030c..5163c8c82c 100755 --- a/app/lang/fr/admin/settings/general.php +++ b/app/lang/fr/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Couleur de l\'en-tête', 'info' => 'Ces paramètres vous permettent de personnaliser certains aspects de votre installation.', 'laravel' => 'Version de Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'facultatif', 'per_page' => 'Résultats par page', 'php' => 'Version de PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Valeur', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/fr/general.php b/app/lang/fr/general.php index 7ffbcbfbdb..96a0aa2025 100755 --- a/app/lang/fr/general.php +++ b/app/lang/fr/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Dissocier de', 'checkout' => 'Associer', 'city' => 'Ville', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Fourniture', 'consumables' => 'Fournitures', 'country' => 'Pays', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Rapport sur l\'entretien d\'actif', 'asset_maintenances' => 'Entretien d\'actifs', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Dernier', - 'last_name' => 'Nom', + 'last_name' => 'Nom', 'license' => 'Licence', 'license_report' => 'Rapport de licence', 'licenses_available' => 'Licences disponibles', @@ -140,4 +143,5 @@ 'years' => 'années', 'yes' => 'Oui', 'zip' => 'Code postal', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/hr/admin/accessories/message.php b/app/lang/hr/admin/accessories/message.php index 62f179c5a1..e324708ff3 100755 --- a/app/lang/hr/admin/accessories/message.php +++ b/app/lang/hr/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/hr/admin/hardware/table.php b/app/lang/hr/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/hr/admin/hardware/table.php +++ b/app/lang/hr/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/hr/admin/settings/general.php b/app/lang/hr/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/hr/admin/settings/general.php +++ b/app/lang/hr/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/hr/general.php b/app/lang/hr/general.php index c9ddda5ab5..8fa01f3f1a 100755 --- a/app/lang/hr/general.php +++ b/app/lang/hr/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Checkout', 'city' => 'City', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Last Name', + 'last_name' => 'Last Name', 'license' => 'License', 'license_report' => 'License Report', 'licenses_available' => 'licenses available', @@ -140,4 +143,5 @@ 'years' => 'years', 'yes' => 'Yes', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/hu/admin/accessories/message.php b/app/lang/hu/admin/accessories/message.php index 62f179c5a1..e324708ff3 100755 --- a/app/lang/hu/admin/accessories/message.php +++ b/app/lang/hu/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/hu/admin/hardware/table.php b/app/lang/hu/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/hu/admin/hardware/table.php +++ b/app/lang/hu/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/hu/admin/settings/general.php b/app/lang/hu/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/hu/admin/settings/general.php +++ b/app/lang/hu/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php index ac3922f6ed..37c53c3a44 100755 --- a/app/lang/hu/general.php +++ b/app/lang/hu/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Checkout', 'city' => 'Város', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Ország', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Vezetéknév', + 'last_name' => 'Vezetéknév', 'license' => 'License', 'license_report' => 'License Report', 'licenses_available' => 'licenses available', @@ -140,4 +143,5 @@ 'years' => 'years', 'yes' => 'Igen', 'zip' => 'Irányítószám', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/it/admin/accessories/message.php b/app/lang/it/admin/accessories/message.php index c047e7c309..c3e4e59f3d 100755 --- a/app/lang/it/admin/accessories/message.php +++ b/app/lang/it/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'La categoria non Esiste', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Questo accessorio ha attualmente :count elementi controllati agli utenti. Si prega di controllare negli accessori e e riprovare. ', 'create' => array( - 'error' => 'La categoria non è stata creata, si prega di riprovare.', - 'success' => 'Categoria creata con successo.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'La categoria non è stata aggiornata, si prega di rirpovare', - 'success' => 'Categoria aggiornata con successo.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Si è verificato un problema cercando di eliminare la categoria. Riprova.', 'success' => 'La categoria è stata eliminata con successo.' ), - + 'checkout' => array( 'error' => 'L\'accessorio non è stato estratto, si prega di riprovare', 'success' => 'Accessorio estratto con successo.', diff --git a/app/lang/it/admin/hardware/table.php b/app/lang/it/admin/hardware/table.php index 2736932568..6971eb50d3 100755 --- a/app/lang/it/admin/hardware/table.php +++ b/app/lang/it/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Seriale', 'status' => 'Stato', 'title' => 'Bene ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Giorni senza accettazione' ); diff --git a/app/lang/it/admin/settings/general.php b/app/lang/it/admin/settings/general.php index b42f7f04e3..562cefb131 100755 --- a/app/lang/it/admin/settings/general.php +++ b/app/lang/it/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Colore intestazione', 'info' => 'Queste impostazioni consentono di personalizzare alcuni aspetti della vostra installazione.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'facoltativo', 'per_page' => 'Risultati per Pagina', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Valore', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/it/general.php b/app/lang/it/general.php index 8fb99ee80b..03a277d701 100755 --- a/app/lang/it/general.php +++ b/app/lang/it/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Carica da', 'checkout' => 'Scarica', 'city' => 'Città', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumabile', 'consumables' => 'Consumabili', 'country' => 'Paese', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Rapporto manutenzione prodotto', 'asset_maintenances' => 'Manutenzione Prodotto', 'item' => 'Articolo', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Ultimo', - 'last_name' => 'Cognome', + 'last_name' => 'Cognome', 'license' => 'Licenza', 'license_report' => 'Report Licenze', 'licenses_available' => 'Licenze Disponibili', @@ -140,4 +143,5 @@ 'years' => 'anni', 'yes' => 'SÌ', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/ja/admin/accessories/general.php b/app/lang/ja/admin/accessories/general.php index 44367f923c..ff679eb510 100755 --- a/app/lang/ja/admin/accessories/general.php +++ b/app/lang/ja/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => '付属品は利用者に支給されますが、シリアル番号がありません。（付属品を厳密に追跡する必要はありません。）例えば、マウスやキーボードなど。', 'accessory_category' => '付属品カテゴリー', 'accessory_name' => '付属品名', - 'cost' => 'Purchase Cost', + 'cost' => '購入費用', 'create' => '付属品の作成', - 'date' => 'Purchase Date', + 'date' => '購入日', 'eula_text' => 'EULAカテゴリー', 'eula_text_help' => 'このフィールドは特殊なタイプの資産のためにEULAをカスタマイズすることが許可されています。全ての資産に一つだけEULAを適用する場合、以下の初期値を利用するにチェックすることも可能です。', 'require_acceptance' => 'このカテゴリの資産を承認するための利用者が必要です。', 'no_default_eula' => 'EULAの初期値が見つかりませんでした。最低1つは設定して下さい。', - 'order' => 'Order Number', + 'order' => '注文番号', 'qty' => '数量', 'total' => '合計', 'remaining' => '利用可', diff --git a/app/lang/ja/admin/accessories/message.php b/app/lang/ja/admin/accessories/message.php index de19f1c2b8..8f5da08d39 100755 --- a/app/lang/ja/admin/accessories/message.php +++ b/app/lang/ja/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'カテゴリーが存在しません。', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'この付属品は、利用者に :count 個チェックされていません。もう一度、付属品をチェックして下さい。 ', 'create' => array( - 'error' => 'カテゴリーが作成されていません。もう一度、やり直して下さい。', - 'success' => 'カテゴリーの作成に成功しました。' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'カテゴリーが更新されていません。もう一度、やり直して下さい。', - 'success' => 'カテゴリーの更新に成功しました。' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'このカテゴリーを削除する際に問題が発生しました。もう一度、やり直して下さい。', 'success' => 'カテゴリーの削除に成功しました。' ), - + 'checkout' => array( 'error' => '付属品がチェックされませんでした。もう一度、やり直して下さい。', 'success' => '付属品のチェックが終了しました。', diff --git a/app/lang/ja/admin/consumables/general.php b/app/lang/ja/admin/consumables/general.php index b2c4d8cc8b..cdb4c4065b 100755 --- a/app/lang/ja/admin/consumables/general.php +++ b/app/lang/ja/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => '消耗品について', 'about_consumables_text' => '消耗品は購入時から使い切るまで存在します。例えば、プリンターのインクやコピー用紙など', 'consumable_name' => '消耗品名', - 'cost' => 'Purchase Cost', + 'cost' => '購入費用', 'create' => '消耗品を作成', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => '購入日', + 'order' => '注文番号', 'remaining' => '残数', 'total' => '合計', 'update' => '消耗品を更新', diff --git a/app/lang/ja/admin/consumables/message.php b/app/lang/ja/admin/consumables/message.php index 23736eb24d..3fe47177b9 100755 --- a/app/lang/ja/admin/consumables/message.php +++ b/app/lang/ja/admin/consumables/message.php @@ -15,9 +15,9 @@ return array( ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this consumable?', + 'confirm' => 'この消耗品を削除しますか？', 'error' => '消耗品の削除に失敗しました。もう一度試して下さい。', - 'success' => 'The consumable was deleted successfully.' + 'success' => '消耗品は削除されました。' ), 'checkout' => array( diff --git a/app/lang/ja/admin/hardware/table.php b/app/lang/ja/admin/hardware/table.php index 6d48d788e4..99467c102a 100755 --- a/app/lang/ja/admin/hardware/table.php +++ b/app/lang/ja/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'シリアル', 'status' => '状態', 'title' => '資産 ', + 'image' => 'Device Image', 'days_without_acceptance' => '未受理期間' ); diff --git a/app/lang/ja/admin/locations/table.php b/app/lang/ja/admin/locations/table.php index 1b6f5a61d6..7e4f7beeea 100755 --- a/app/lang/ja/admin/locations/table.php +++ b/app/lang/ja/admin/locations/table.php @@ -1,8 +1,8 @@ 'Assets RTD', - 'assets_checkedout' => 'Assets Assigned', + 'assets_rtd' => '資産RTD', + 'assets_checkedout' => '資産割当先', 'id' => 'ID', 'city' => '市区町村', 'state' => '都道府県', diff --git a/app/lang/ja/admin/settings/general.php b/app/lang/ja/admin/settings/general.php index e074bddfc0..c16d3493d4 100755 --- a/app/lang/ja/admin/settings/general.php +++ b/app/lang/ja/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'ヘッダーカラー', 'info' => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。', 'laravel' => 'Laravelバージョン', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', + 'load_remote_text' => 'リモートスクリプト', + 'load_remote_help_text' => 'Snipe-ITのインストールは、外部からスクリプトを読み込むことが可能です。', 'logo' => 'ロゴ', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'オプション', 'per_page' => 'ページ毎の結果', 'php' => 'PHPバージョン', @@ -48,7 +66,7 @@ return array( 'system' => 'システム情報', 'update' => '設定を更新', 'value' => '価値', - 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'brand' => 'ブランディング', + 'about_settings_title' => '設定について', + 'about_settings_text' => 'これらの設定は、あなたのインストレーションの特性に合わせてカスタマイズできます。', ); diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php index 2019b9f096..c8b5eb9be9 100755 --- a/app/lang/ja/general.php +++ b/app/lang/ja/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'チェックイン元', 'checkout' => 'チェックアウト', 'city' => '市区町村', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => '消耗品', 'consumables' => '消耗品数', 'country' => '国', @@ -43,7 +45,7 @@ 'date' => '日付', 'delete' => '削除', 'deleted' => '削除しました。', - 'delete_seats' => 'Deleted Seats', + 'delete_seats' => 'ライセンスを削除', 'deployed' => '配備済', 'depreciation_report' => '減価償却レポート', 'download' => 'ダウンロード', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => '資産管理レポート', 'asset_maintenances' => '資産管理', 'item' => 'アイテム', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => '最後', - 'last_name' => '姓', + 'last_name' => '姓', 'license' => 'ライセンス', 'license_report' => 'ライセンスレポート', 'licenses_available' => '利用可能なライセンス', @@ -140,4 +143,5 @@ 'years' => '年', 'yes' => 'はい', 'zip' => '郵便番号', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/ko/admin/accessories/message.php b/app/lang/ko/admin/accessories/message.php index f254e105f1..150d9cb40f 100755 --- a/app/lang/ko/admin/accessories/message.php +++ b/app/lang/ko/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => '분류가 존재하지 않습니다.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => '이 부속품은 현재 사용자에게 :count 개가 반출 되었습니다. 이 부속품을 반입하고 다시 시도해 주세요. ', 'create' => array( - 'error' => '분류가 생성되지 않았습니다. 다시 시도해 주세요', - 'success' => '분류가 생성되었습니다.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => '분류가 갱신되지 않았습니다. 다시 시도해 주세요', - 'success' => '분류가 갱신되었습니다.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => '분류 삭제 중 문제가 발생했습니다. 다시 시도해 주세요.', 'success' => '분류가 삭제되었습니다' ), - + 'checkout' => array( 'error' => '부속품이 반출되지 않았습니다. 다시 시도해 주세요.', 'success' => '부속품이 반출 되었습니다.', diff --git a/app/lang/ko/admin/hardware/table.php b/app/lang/ko/admin/hardware/table.php index d6dd5dd284..c7d269dba2 100755 --- a/app/lang/ko/admin/hardware/table.php +++ b/app/lang/ko/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => '일련번호', 'status' => '상태', 'title' => '자산 ', + 'image' => 'Device Image', 'days_without_acceptance' => '미 승인 기간' ); diff --git a/app/lang/ko/admin/settings/general.php b/app/lang/ko/admin/settings/general.php index aa53988bc4..4dbd1b51c0 100755 --- a/app/lang/ko/admin/settings/general.php +++ b/app/lang/ko/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => '머릿말 색상', 'info' => '이 설정들은 설치본의 특정 분야를 설정하는 것입니다.', 'laravel' => 'Laravel 버전', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => '로고', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => '선택 사항', 'per_page' => '페이지 당 결과', 'php' => 'PHP 버전', @@ -50,5 +68,5 @@ return array( 'value' => '가치', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ko/general.php b/app/lang/ko/general.php index e49b3af7b8..9d16811b01 100755 --- a/app/lang/ko/general.php +++ b/app/lang/ko/general.php @@ -30,6 +30,8 @@ 'checkin_from' => '반입처', 'checkout' => '반출', 'city' => '시', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => '소모품', 'consumables' => '소모품', 'country' => '국가명', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => '자산 관리 보고서', 'asset_maintenances' => '자산 관리', 'item' => '항목', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => '마지막', - 'last_name' => '성', + 'last_name' => '성', 'license' => '라이선스', 'license_report' => '라이선스 보고서', 'licenses_available' => '사용가능 라이선스', @@ -140,4 +143,5 @@ 'years' => '년', 'yes' => '네', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/lt/admin/accessories/message.php b/app/lang/lt/admin/accessories/message.php index 1ade476543..2a15d7443e 100755 --- a/app/lang/lt/admin/accessories/message.php +++ b/app/lang/lt/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Tokios kategorijos nėra.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Ši įranga šiuo metu turi:count vienetus išduotus vartotojams. Prašome patikrinkite irangos meniu ir bandykite dar kartą. ', 'create' => array( - 'error' => 'Kategorijos sukurti nepavyko, prašome badykite dar kartą.', - 'success' => 'Sėkmingai sukurta nauja kategorija.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategorija neatnaujinta, prašome pabandykite dar kartą', - 'success' => 'Kategorijos atnaujinimas sėkmingas.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Nepavyko ištrinti kategorijos. Prašome bandykite dar kartą.', 'success' => 'Kategorija sėkmingai ištrinta.' ), - + 'checkout' => array( 'error' => 'Įrangos nepavyko išimti, prašome bandykite dar kartą', 'success' => 'Įranga sėkmingai išimta.', diff --git a/app/lang/lt/admin/hardware/table.php b/app/lang/lt/admin/hardware/table.php index 012b41f6e8..a0622cf65a 100755 --- a/app/lang/lt/admin/hardware/table.php +++ b/app/lang/lt/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serijinis numeris', 'status' => 'Būklė', 'title' => 'Įranga ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Dienų skaičius be priėmimo' ); diff --git a/app/lang/lt/admin/settings/general.php b/app/lang/lt/admin/settings/general.php index c5b0f8145e..0bf3424365 100755 --- a/app/lang/lt/admin/settings/general.php +++ b/app/lang/lt/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Atraštės spalva', 'info' => 'Šie nustatymai leidžia jums pasirinkti savus diegimo nustatymus.', 'laravel' => 'Laravel versija', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logotipas', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'pasirinktinai', 'per_page' => 'Rezultatai puslapyje', 'php' => 'PHP versija', @@ -50,5 +68,5 @@ return array( 'value' => 'Vertė', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/lt/general.php b/app/lang/lt/general.php index ce7ded088c..adfe5be678 100755 --- a/app/lang/lt/general.php +++ b/app/lang/lt/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Pridėti iš', 'checkout' => 'Išimti', 'city' => 'Miestas', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Suvartojama įranga', 'consumables' => 'Suvartojama įranga', 'country' => 'Šalis', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Įrangos priežiūros ataskaita', 'asset_maintenances' => 'Įrangos priežiūros', 'item' => 'Įranga', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Paskutinis', - 'last_name' => 'Pavardė', + 'last_name' => 'Pavardė', 'license' => 'Licenzija', 'license_report' => 'Licenzijų ataskaitą', 'licenses_available' => 'laisvos licenzijos', @@ -140,4 +143,5 @@ 'years' => 'metai', 'yes' => 'Taip', 'zip' => 'Pašto kodas', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/ms/admin/accessories/message.php b/app/lang/ms/admin/accessories/message.php index 62f179c5a1..e324708ff3 100755 --- a/app/lang/ms/admin/accessories/message.php +++ b/app/lang/ms/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/ms/admin/hardware/table.php b/app/lang/ms/admin/hardware/table.php index a7d3099c05..77dd904e31 100755 --- a/app/lang/ms/admin/hardware/table.php +++ b/app/lang/ms/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Siri', 'status' => 'Status', 'title' => 'Harta ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/ms/admin/settings/general.php b/app/lang/ms/admin/settings/general.php index 052cf40a86..b3df7c7c45 100755 --- a/app/lang/ms/admin/settings/general.php +++ b/app/lang/ms/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'Tetapan ini membenarkan anda menyesuaikan sesetengah aspek pemasangan anda.', 'laravel' => 'Versi Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Senarai Setiap Mukasurat', 'php' => 'Versi PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Nilai', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php index cd9f971e3d..ccbc943b60 100755 --- a/app/lang/ms/general.php +++ b/app/lang/ms/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Agihkan', 'city' => 'Bandar', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Negara', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Nama Keluarga', + 'last_name' => 'Nama Keluarga', 'license' => 'Lesen', 'license_report' => 'Laporan Lesen', 'licenses_available' => 'Lesen Yang Ada', @@ -140,4 +143,5 @@ 'years' => 'tahun', 'yes' => 'Ya', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/nl/admin/accessories/message.php b/app/lang/nl/admin/accessories/message.php index 62f179c5a1..e324708ff3 100755 --- a/app/lang/nl/admin/accessories/message.php +++ b/app/lang/nl/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/nl/admin/hardware/table.php b/app/lang/nl/admin/hardware/table.php index 866c3baa01..ac3b427ffd 100755 --- a/app/lang/nl/admin/hardware/table.php +++ b/app/lang/nl/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serienummer', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/nl/admin/manufacturers/message.php b/app/lang/nl/admin/manufacturers/message.php index 6586d2af44..2213828a25 100755 --- a/app/lang/nl/admin/manufacturers/message.php +++ b/app/lang/nl/admin/manufacturers/message.php @@ -2,23 +2,23 @@ return array( - 'does_not_exist' => 'Manufacturer does not exist.', - 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', + 'does_not_exist' => 'Fabrikant bestaat niet.', + 'assoc_users' => 'Deze fabrikant is verbonden met 1 of meerdere modellen en kan hierdoor niet verwijderd worden. Controleer de modellen zodat er geen verbinding meer is met deze fabrikant en probeer opnieuw. ', 'create' => array( - 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' + 'error' => 'Fabrikant was niet aangemaakt, Probeer opnieuw.', + 'success' => 'Fabrikant aangemaakt.' ), 'update' => array( - 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' + 'error' => 'Fabrikant niet bijgewerkt, probeer opnieuw', + 'success' => 'Fabrikant succesvol bijgewerkt.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this manufacturer?', - 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' + 'confirm' => 'Weet u zeker dat deze fabrikant verwijderd kan worden?', + 'error' => 'Er was een probleem bij het verwijderen. Probeer opnieuw.', + 'success' => 'Fabrikant succesvol verwijderd.' ) ); diff --git a/app/lang/nl/admin/settings/general.php b/app/lang/nl/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/nl/admin/settings/general.php +++ b/app/lang/nl/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php index bf643bf864..228c19e727 100755 --- a/app/lang/nl/general.php +++ b/app/lang/nl/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Afrekenen', 'city' => 'Plaats', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Verbruiksartikelen', 'consumables' => 'Verbruiksartikelen', 'country' => 'Land', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Artikel', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Laatste', - 'last_name' => 'Achternaam', + 'last_name' => 'Achternaam', 'license' => 'Licentie', 'license_report' => 'Licentierapport', 'licenses_available' => 'beschikbare licenties', @@ -140,4 +143,5 @@ 'years' => 'jaren', 'yes' => 'Ja', 'zip' => 'Postcode', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/no/admin/accessories/message.php b/app/lang/no/admin/accessories/message.php index 309f8df0d8..ffffae2952 100755 --- a/app/lang/no/admin/accessories/message.php +++ b/app/lang/no/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategori eksisterer ikke.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Dette tilbehøret har for øyeblikket :count enheter utsjekket til brukere. Sjekk inn tilbehøret og prøv igjen. ', 'create' => array( - 'error' => 'Kategori ble ikke opprettet. Prøv igjen.', - 'success' => 'Vellykket opprettelse av kategori.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategori ble ikke opprettet. Prøv igjen', - 'success' => 'Vellykket opprettelse av kategori.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Det oppstod et problem under sletting av kategori. Prøv igjen.', 'success' => 'Vellykket sletting av kategori.' ), - + 'checkout' => array( 'error' => 'Tilbehør ble ikke sjekket ut. Prøv igjen', 'success' => 'Vellykket utsjekking av tilbehør.', diff --git a/app/lang/no/admin/hardware/table.php b/app/lang/no/admin/hardware/table.php index d54c059fe3..c460312bb1 100755 --- a/app/lang/no/admin/hardware/table.php +++ b/app/lang/no/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serienummer', 'status' => 'Status', 'title' => 'Eiendel ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Dager uten aksept' ); diff --git a/app/lang/no/admin/settings/general.php b/app/lang/no/admin/settings/general.php index f3d86df11c..ef59028ce0 100755 --- a/app/lang/no/admin/settings/general.php +++ b/app/lang/no/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Overskriftsfarge', 'info' => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.', 'laravel' => 'Laravel-versjon', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'valgfri', 'per_page' => 'Resultater pr side', 'php' => 'PHP-versjon', @@ -50,5 +68,5 @@ return array( 'value' => 'Verdi', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/no/general.php b/app/lang/no/general.php index 7562c00c5d..fc487157ff 100755 --- a/app/lang/no/general.php +++ b/app/lang/no/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Innsjekk fra', 'checkout' => 'Sjekk ut', 'city' => 'By', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Forbruksvare', 'consumables' => 'Forbruksvarer', 'country' => 'Land', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Rapport Vedlikehold av eiendeler', 'asset_maintenances' => 'Vedlikehold av eiendeler', 'item' => 'Enhet', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Siste', - 'last_name' => 'Etternavn', + 'last_name' => 'Etternavn', 'license' => 'Lisens', 'license_report' => 'Lisensrapport', 'licenses_available' => 'Tilgjengelige lisenser', @@ -140,4 +143,5 @@ 'years' => 'år', 'yes' => 'Ja', 'zip' => 'Postnummer', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/pl/admin/accessories/general.php b/app/lang/pl/admin/accessories/general.php index 95b9de6a08..837c722a9e 100755 --- a/app/lang/pl/admin/accessories/general.php +++ b/app/lang/pl/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Akcesoria to coś co wydajesz dla użytkowników, a które nie mają numerów seryjny ch(lub nie zależy Ci na śledzeniu ich niepowtarzalności). Na przykład, myszy i klawiatury komputerowe.', 'accessory_category' => 'Kategorie Akcesoriów', 'accessory_name' => 'Nazwa akcesoriów', - 'cost' => 'Purchase Cost', + 'cost' => 'Koszt zakupu', 'create' => 'Utwórz akcesorium', - 'date' => 'Purchase Date', + 'date' => 'Data Zakupu', 'eula_text' => 'Kategoria EULA', 'eula_text_help' => 'To pole pozwala dostosować EULA dla określonych rodzajów aktywów. Jeśli masz tylko jeden EULA dla wszystkich swoich aktywów, można zaznaczyć poniższe pole, aby korzystać z podstawowej domyślnej.', 'require_acceptance' => 'Wymaga od użytkowników, aby potwierdzić akceptację aktywów w tej kategorii.', 'no_default_eula' => 'Nie znaleziono domyślnego EULA. Dodaj jeden w Ustawieniach.', - 'order' => 'Order Number', + 'order' => 'Numer zamówienia', 'qty' => 'Ilość', 'total' => 'Suma', 'remaining' => 'Dostępne', diff --git a/app/lang/pl/admin/accessories/message.php b/app/lang/pl/admin/accessories/message.php index c376f305a6..1c5687423a 100755 --- a/app/lang/pl/admin/accessories/message.php +++ b/app/lang/pl/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategoria nie istnieje.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Akcesoria z tej kategorii zostały wydane do :count użytkowników. Zbierz akcesoria i spróbuj ponownie. ', 'create' => array( - 'error' => 'Kategoria nie została stworzona, spróbuj ponownie.', - 'success' => 'Kategoria stworzona pomyślnie.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategoria nie została zaktualizowana, spróbuj ponownie', - 'success' => 'Kategoria została pomyślnie zaktualizowana.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Wystąpił błąd podczas usuwania. Spróbuj ponownie.', 'success' => 'Kategoria usunięta pomyślnie.' ), - + 'checkout' => array( 'error' => 'Akcesoria nie zostały przypisane, spróbuj ponownie', 'success' => 'Akcesoria przypisany pomyślnie.', diff --git a/app/lang/pl/admin/consumables/general.php b/app/lang/pl/admin/consumables/general.php index aa7dcecc0e..e844265e3b 100755 --- a/app/lang/pl/admin/consumables/general.php +++ b/app/lang/pl/admin/consumables/general.php @@ -1,14 +1,14 @@ 'About Consumables', + 'about_consumables_title' => 'Materiały eksploatacyjne', 'about_consumables_text' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.', - 'consumable_name' => 'Consumable Name', - 'cost' => 'Purchase Cost', - 'create' => 'Create Consumable', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'consumable_name' => 'Nazwa materiału eksploatacyjnego', + 'cost' => 'Koszt zakupu', + 'create' => 'Utwórz materiał eksploatacyjny', + 'date' => 'Data zakupu', + 'order' => 'Numer zamówienia', 'remaining' => 'Pozostało', 'total' => 'Łącznie', - 'update' => 'Update Consumable', + 'update' => 'Aktualizuj materiał eksploatacyjny', ); diff --git a/app/lang/pl/admin/hardware/table.php b/app/lang/pl/admin/hardware/table.php index 0d19e9e247..d46666c079 100755 --- a/app/lang/pl/admin/hardware/table.php +++ b/app/lang/pl/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Nr. seryjny', 'status' => 'Status', 'title' => 'Nabytek', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/pl/admin/settings/general.php b/app/lang/pl/admin/settings/general.php index ab8b620232..6df3b4ef6b 100755 --- a/app/lang/pl/admin/settings/general.php +++ b/app/lang/pl/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Kolor nagłówka', 'info' => 'Te ustawienia pozwalają ci zdefiniować najważniejsze szczegóły twojej instalacji.', 'laravel' => 'Wersja Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'opcjonalny', 'per_page' => 'Wyników na stronie', 'php' => 'Wersja PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Wartość', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/pl/general.php b/app/lang/pl/general.php index 4ce2ab1700..2b4bd5df10 100755 --- a/app/lang/pl/general.php +++ b/app/lang/pl/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Przypisz', 'city' => 'Miasto', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Kraj', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Przedmiot', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Ostatni', - 'last_name' => 'Nazwisko', + 'last_name' => 'Nazwisko', 'license' => 'Licencja', 'license_report' => 'Raport Licencji', 'licenses_available' => 'Dostępne licencje', @@ -140,4 +143,5 @@ 'years' => 'Lata', 'yes' => 'Tak', 'zip' => 'Kod pocztowy', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/pt-BR/admin/accessories/message.php b/app/lang/pt-BR/admin/accessories/message.php index d2f23bdaf9..7e66242333 100755 --- a/app/lang/pt-BR/admin/accessories/message.php +++ b/app/lang/pt-BR/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'A categoria não existe.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Este acessório tem atualmente :count itens alocado para os usuários. Por favor, verifique em acessórios e e tente novamente. ', 'create' => array( - 'error' => 'A categoria não foi criada, tente novamente.', - 'success' => 'Categoria criada com sucesso.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'A categoria não foi atualizada, tente novamente', - 'success' => 'Categoria atualizada com sucesso.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Houve um problema ao excluir a categoria. Tente novamente.', 'success' => 'A categoria foi excluída com sucesso.' ), - + 'checkout' => array( 'error' => 'O acessório não foi alocado, por favor tente novamente', 'success' => 'Acessório alocado com sucesso.', diff --git a/app/lang/pt-BR/admin/hardware/table.php b/app/lang/pt-BR/admin/hardware/table.php index f65216a1d0..4b70b25978 100755 --- a/app/lang/pt-BR/admin/hardware/table.php +++ b/app/lang/pt-BR/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Ativo ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Dias sem que fosse aceito' ); diff --git a/app/lang/pt-BR/admin/settings/general.php b/app/lang/pt-BR/admin/settings/general.php index d7eb0089a3..cf1c114755 100755 --- a/app/lang/pt-BR/admin/settings/general.php +++ b/app/lang/pt-BR/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Cor do Cabeçalho', 'info' => 'Estas configurações deixam-lhe personalizar certos aspectos da sua instalação.', 'laravel' => 'Versão do Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'Opcional', 'per_page' => 'Resultados Por Página', 'php' => 'Versão do PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Valor', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/pt-BR/general.php b/app/lang/pt-BR/general.php index 5bcf82b26f..35768a49ce 100755 --- a/app/lang/pt-BR/general.php +++ b/app/lang/pt-BR/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Verificando', 'checkout' => 'Check-out', 'city' => 'Cidade', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumíveis', 'consumables' => 'Consumíveis', 'country' => 'País', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Relatório de Manutenção em Ativo', 'asset_maintenances' => 'Manutenções em Ativo', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Última', - 'last_name' => 'Último Nome', + 'last_name' => 'Último Nome', 'license' => 'Licença', 'license_report' => 'Relatório da Licença', 'licenses_available' => 'licenças disponíveis', @@ -140,4 +143,5 @@ 'years' => 'anos', 'yes' => 'Sim', 'zip' => 'Cep', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/pt-PT/admin/accessories/message.php b/app/lang/pt-PT/admin/accessories/message.php index 2619d074fc..e817355951 100755 --- a/app/lang/pt-PT/admin/accessories/message.php +++ b/app/lang/pt-PT/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'A categoria não existe.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Esta acessório tem atualmente :count items alocados a utilizadores. Por favor, devolva-os e tente novamente. ', 'create' => array( - 'error' => 'Não foi possível criar a categoria, por favor tente novamente.', - 'success' => 'Categoria criada com sucesso.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Categoria não atualizada, por favor tente novamente', - 'success' => 'Categoria atualizada com sucesso.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Ocorreu um problema ao remover a categoria. Por favor, tente novamente.', 'success' => 'A categoria foi removida com sucesso.' ), - + 'checkout' => array( 'error' => 'O acessório não foi alocado. Por favor, tente novamente', 'success' => 'Acessório alocado com sucesso.', diff --git a/app/lang/pt-PT/admin/hardware/table.php b/app/lang/pt-PT/admin/hardware/table.php index bf791d2785..9a7042a44b 100755 --- a/app/lang/pt-PT/admin/hardware/table.php +++ b/app/lang/pt-PT/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Nº de Série', 'status' => 'Estado', 'title' => 'Artigo ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Dias sem aceitação' ); diff --git a/app/lang/pt-PT/admin/settings/general.php b/app/lang/pt-PT/admin/settings/general.php index 8ccca7fd3b..396a9285e3 100755 --- a/app/lang/pt-PT/admin/settings/general.php +++ b/app/lang/pt-PT/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Cor do cabeçalho', 'info' => 'Estas configurações permitem costumizar certos aspetos desta instalação.', 'laravel' => 'Versão do Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'opcional', 'per_page' => 'Resultados por página', 'php' => 'Versão do PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Valor', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/pt-PT/general.php b/app/lang/pt-PT/general.php index 07eedf8d97..7688838956 100755 --- a/app/lang/pt-PT/general.php +++ b/app/lang/pt-PT/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Devolver de', 'checkout' => 'Alocar', 'city' => 'Cidade', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumível', 'consumables' => 'Consumíveis', 'country' => 'País', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Relatório de Manutenção de Artigos', 'asset_maintenances' => 'Manutenções de Artigos', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Última', - 'last_name' => 'Apelido', + 'last_name' => 'Apelido', 'license' => 'Licença', 'license_report' => 'Relatório de Licenças', 'licenses_available' => 'Licenças disponíveis', @@ -140,4 +143,5 @@ 'years' => 'anos', 'yes' => 'Sim', 'zip' => 'Código Postal', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/ro/admin/accessories/message.php b/app/lang/ro/admin/accessories/message.php index 62f179c5a1..e324708ff3 100755 --- a/app/lang/ro/admin/accessories/message.php +++ b/app/lang/ro/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/ro/admin/hardware/table.php b/app/lang/ro/admin/hardware/table.php index 4a1af0e432..7d3e0c13a5 100755 --- a/app/lang/ro/admin/hardware/table.php +++ b/app/lang/ro/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serie', 'status' => 'Statut', 'title' => 'Activ ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/ro/admin/settings/general.php b/app/lang/ro/admin/settings/general.php index a99c72dbd9..58384ef21d 100755 --- a/app/lang/ro/admin/settings/general.php +++ b/app/lang/ro/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'Aceste setari va lasa sa modificati anumite aspecte ale instalarii.', 'laravel' => 'Versiune Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Rezultate pe pagina', 'php' => 'Versiune PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Valoare', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ro/general.php b/app/lang/ro/general.php index f92047c7bc..89b5d15171 100755 --- a/app/lang/ro/general.php +++ b/app/lang/ro/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Preda', 'city' => 'Oras', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Tara', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Nume', + 'last_name' => 'Nume', 'license' => 'Licenta', 'license_report' => 'Raport licente', 'licenses_available' => 'Licente disponibile', @@ -140,4 +143,5 @@ 'years' => 'ani', 'yes' => 'Da', 'zip' => 'Cod postal', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/ru/admin/accessories/general.php b/app/lang/ru/admin/accessories/general.php index f01574ec11..b81b41b03d 100755 --- a/app/lang/ru/admin/accessories/general.php +++ b/app/lang/ru/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Аксессуарами является все то, что выдается пользователям, но не имеет серийного номера или не требует учёта. Например, компьютерные мыши и клавиатуры.', 'accessory_category' => 'Категория аксессуара', 'accessory_name' => 'Имя аксессуара', - 'cost' => 'Purchase Cost', + 'cost' => 'Стоимость закупки', 'create' => 'Создать аксесуар', - 'date' => 'Purchase Date', + 'date' => 'Дата закупки', 'eula_text' => 'Категория EULA', 'eula_text_help' => 'Это поле позволяет персонализировать пользовательские соглашения для определенных типов активов. Если у вас только одно пользовательское соглашение для всех активов, вы можете отметить чекбокс внизу, чтобы использовать основное соглашение по умолчанию.', 'require_acceptance' => 'Требовать обязательного подтверждения пользователем прием активов в этой категории.', 'no_default_eula' => 'Не найдено пользовательского соглашения по умолчанию. Добавьте его в Настройках.', - 'order' => 'Order Number', + 'order' => 'Номер заказа', 'qty' => 'Кол-во', 'total' => 'Всего', 'remaining' => 'Наличие', diff --git a/app/lang/ru/admin/accessories/message.php b/app/lang/ru/admin/accessories/message.php index 9bd9568f37..2cfaf8527b 100755 --- a/app/lang/ru/admin/accessories/message.php +++ b/app/lang/ru/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Категория не существует.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Данный аксессуар выдан пользователям в количестве :count. Сделайте возврат аксессуара и попробуйте снова. ', 'create' => array( - 'error' => 'Категория не создана, пожалуйста попробуйте снова.', - 'success' => 'Категория успешно создана.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Категория не изменена, пожалуйста попробуйте снова', - 'success' => 'Категория успешно изменена.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'При удалении категории возникла проблема. Пожалуйста попробуйте снова.', 'success' => 'Категория успешно удалена.' ), - + 'checkout' => array( 'error' => 'Ошибка при выдаче аксессуара. Повторите попытку', 'success' => 'Аксессуар успешно выдан.', diff --git a/app/lang/ru/admin/consumables/general.php b/app/lang/ru/admin/consumables/general.php index f71caf5ead..300a39ee55 100755 --- a/app/lang/ru/admin/consumables/general.php +++ b/app/lang/ru/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => 'Про расходные материалы', 'about_consumables_text' => 'Расходные материалы это все приобретённые товары, которые израсходуются в процессе использования. Например, чернило для принтера или копировальная бумага.', 'consumable_name' => 'Название расходного материала', - 'cost' => 'Purchase Cost', + 'cost' => 'Стоимость закупки', 'create' => 'Создать расходный материал', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => 'Дата закупки', + 'order' => 'Номер заказа', 'remaining' => 'Осталось', 'total' => 'Всего', 'update' => 'Обновить расходный материал', diff --git a/app/lang/ru/admin/hardware/table.php b/app/lang/ru/admin/hardware/table.php index 8687e0eddc..73f523dfbb 100755 --- a/app/lang/ru/admin/hardware/table.php +++ b/app/lang/ru/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Серийный номер', 'status' => 'Статус', 'title' => 'Актив ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/ru/admin/licenses/message.php b/app/lang/ru/admin/licenses/message.php index 126ed63aa4..b13f4efb28 100755 --- a/app/lang/ru/admin/licenses/message.php +++ b/app/lang/ru/admin/licenses/message.php @@ -22,7 +22,7 @@ return array( 'upload' => array( 'error' => 'Не удалось загрузить файл(ы). Повторите попытку.', 'success' => 'Файл(ы) успешно загружены.', - 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', + 'nofiles' => 'Не выбрано ни одного файла для загрузки или файл, который вы пытаетесь загрузить, слишком большой', 'invalidfiles' => 'Один или несколько ваших файлов слишком большого размера или имеют неподдерживаемый формат. Разрешены только следующие форматы файлов: png, gif, jpg, doc, docx, pdf, txt.', ), diff --git a/app/lang/ru/admin/models/message.php b/app/lang/ru/admin/models/message.php index f324a7c30a..22eada7a6d 100755 --- a/app/lang/ru/admin/models/message.php +++ b/app/lang/ru/admin/models/message.php @@ -9,7 +9,7 @@ return array( 'create' => array( 'error' => 'Модель не была создана, повторите еще раз.', 'success' => 'Модель успешно создана.', - 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', + 'duplicate_set' => 'Модель с таким именем, производителем и номером уже существует.', ), 'update' => array( diff --git a/app/lang/ru/admin/settings/general.php b/app/lang/ru/admin/settings/general.php index 0b6468c7de..f4281f8a57 100755 --- a/app/lang/ru/admin/settings/general.php +++ b/app/lang/ru/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Цвет заголовка', 'info' => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.', 'laravel' => 'Версия Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Логотип', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'не обязательно', 'per_page' => 'Результатов на страницу', 'php' => 'Версия PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Значение', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ru/admin/users/general.php b/app/lang/ru/admin/users/general.php index 6438391b4a..26daff09ee 100755 --- a/app/lang/ru/admin/users/general.php +++ b/app/lang/ru/admin/users/general.php @@ -7,11 +7,11 @@ return array( 'clone' => 'Клонировать пользователя', 'contact_user' => 'Связаться с :name', 'edit' => 'Редактировать пользователя', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', + 'filetype_info' => 'Разрешенные типы файлов: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.', 'history_user' => 'История для :name', 'last_login' => 'Последний вход', - 'ldap_config_text' => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.', - 'ldap_text' => 'Connect to LDAP and create users. Passwords will be auto-generated.', + 'ldap_config_text' => 'Конфигурация LDAP находится в каталоге app/config в файле ldap.php. Выбранное местоположение будет установлено для всех импортированных пользователей. Необходимо чтобы существовало хотя бы одно местонахождение для использования этой функции.', + 'ldap_text' => 'Подключиться к LDAP и создать пользователей. Пароли будут созданы автоматически.', 'software_user' => 'Программное обеспечение привязано к :name', 'view_user' => 'Показать пользователя :name', 'usercsv' => 'CSV файл', diff --git a/app/lang/ru/admin/users/message.php b/app/lang/ru/admin/users/message.php index c5e82731de..f5c4ff7f14 100755 --- a/app/lang/ru/admin/users/message.php +++ b/app/lang/ru/admin/users/message.php @@ -2,15 +2,15 @@ return array( - 'accepted' => 'You have successfully accepted this asset.', - 'declined' => 'You have successfully declined this asset.', + 'accepted' => 'Вы успешно приняли актив.', + 'declined' => 'Вы успешно отклонили актив.', 'user_exists' => 'Пользователь уже существует!', 'user_not_found' => 'Пользователь [:id] не существует.', 'user_login_required' => 'Поле "Логин" является обязательным', 'user_password_required' => 'Поле "Пароль" является обязательным.', 'insufficient_permissions' => 'Недостаточно прав.', 'user_deleted_warning' => 'Этот пользователь был удален. Вы должны его восстановить чтобы иметь возможность его редактировать или привязывать новые активы.', - 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', + 'ldap_not_configured' => 'Интеграция с LDAP не настроена для этой инсталляции.', 'success' => array( @@ -32,7 +32,7 @@ return array( 'unsuspend' => 'При разморозке пользователя возникла проблема. Пожалуйста попробуйте снова.', 'import' => 'При импорте пользователей произошла ошибка. Попробуйте еще раз.', 'asset_already_accepted' => 'Этот актив уже был принят.', - 'accept_or_decline' => 'You must either accept or decline this asset.', + 'accept_or_decline' => 'Примите или отклоните актив.', 'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', 'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server: ', '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:', @@ -40,15 +40,15 @@ return array( ), 'deletefile' => array( - 'error' => 'File not deleted. Please try again.', - 'success' => 'File successfully deleted.', + 'error' => 'Не удалось удалить файл. Повторите попытку.', + 'success' => 'Файл успешно удален.', ), 'upload' => array( - 'error' => 'File(s) not uploaded. Please try again.', - 'success' => 'File(s) successfully uploaded.', - 'nofiles' => 'You did not select any files for upload', - 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', + 'error' => 'Не удалось загрузить файл(ы). Повторите попытку.', + 'success' => 'Файл(ы) успешно загружены.', + 'nofiles' => 'Не выбраны файлы для загрузки', + 'invalidfiles' => 'Один или несколько ваших файлов слишком большого размера или имеют неподдерживаемый формат. Разрешены только следующие форматы файлов: png, gif, jpg, doc, docx, pdf, txt.', ), ); diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php index 7d0fcb2f53..3c4a8484f3 100755 --- a/app/lang/ru/general.php +++ b/app/lang/ru/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Возврат из', 'checkout' => 'Отвязать', 'city' => 'Город', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Расходный материал', 'consumables' => 'Расходные материалы', 'country' => 'Страна', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Отчет по обслуживанию', 'asset_maintenances' => 'Активы на обслуживании', 'item' => 'Предмет', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'В конец', - 'last_name' => 'Фамилия', + 'last_name' => 'Фамилия', 'license' => 'Лицензия', 'license_report' => 'Отчет по лицензиям', 'licenses_available' => 'Доступные лицензии', @@ -140,4 +143,5 @@ 'years' => 'Лет', 'yes' => 'Да', 'zip' => 'Почтовый индекс', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/sv-SE/admin/accessories/message.php b/app/lang/sv-SE/admin/accessories/message.php index 3db2bf9da2..e324708ff3 100755 --- a/app/lang/sv-SE/admin/accessories/message.php +++ b/app/lang/sv-SE/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategorin existerar inte.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( - 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.' ), - + 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', diff --git a/app/lang/sv-SE/admin/hardware/table.php b/app/lang/sv-SE/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/sv-SE/admin/hardware/table.php +++ b/app/lang/sv-SE/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/sv-SE/admin/settings/general.php b/app/lang/sv-SE/admin/settings/general.php index d4f404c00c..bf02983e66 100755 --- a/app/lang/sv-SE/admin/settings/general.php +++ b/app/lang/sv-SE/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', @@ -50,5 +68,5 @@ return array( 'value' => 'Value', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/sv-SE/general.php b/app/lang/sv-SE/general.php index 61ee0ba6f4..a995297144 100755 --- a/app/lang/sv-SE/general.php +++ b/app/lang/sv-SE/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checka in från', 'checkout' => 'Checka ut', 'city' => 'Ort', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Land', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Last', - 'last_name' => 'Efternamn', + 'last_name' => 'Efternamn', 'license' => 'Licens', 'license_report' => 'License Report', 'licenses_available' => 'tillgängliga licenser', @@ -140,4 +143,5 @@ 'years' => 'år', 'yes' => 'Ja', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/th/admin/accessories/message.php b/app/lang/th/admin/accessories/message.php index 9a6a6b3cd5..a60ae1bd1b 100755 --- a/app/lang/th/admin/accessories/message.php +++ b/app/lang/th/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'ยังไม่มีหมวดหมู่', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'อุปกรณ์เสริมนี้ได้เช็คเอ้าท์ให้ผู้ใช้งานแล้วจำนวน :count รายการในปัจจุบัน กรุณาเช็คอินอุปกรณ์เสริม และลองอีกครั้ง ', 'create' => array( - 'error' => 'ยังไม่ได้สร้างหมวดหมู่ กรุณาลองอีกครั้ง', - 'success' => 'สร้างหมวดหมู่เรียบร้อยแล้ว' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'ยังไม่ได้ปรับปรุงหมวดหมู่ กรุณาลองอีกครั้ง', - 'success' => 'ปรับปรุงหมวดหมู่เรียบร้อยแล้ว' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'มีปัญหาขณะลบหมวดหมู่นี้ กรุณาลองอีกครั้ง', 'success' => 'ลบหมวดหมู่เรียบร้อยแล้ว' ), - + 'checkout' => array( 'error' => 'อุปกรณ์เสริมยังไม่ถูกเช็คเอ้าท์ กรุณาลองอีกครั้ง', 'success' => 'อุปกรณ์เสริมเช็คเอ้าท์เรียบร้อยแล้ว', diff --git a/app/lang/th/admin/hardware/table.php b/app/lang/th/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/th/admin/hardware/table.php +++ b/app/lang/th/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/th/admin/settings/general.php b/app/lang/th/admin/settings/general.php index 48f65a10c3..e069fd01f7 100755 --- a/app/lang/th/admin/settings/general.php +++ b/app/lang/th/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'สีส่วนหัว', 'info' => 'การตั้งค่าเหล่านี้ช่วยให้คุณสามารถปรับแต่งลักษณะบางอย่าง', 'laravel' => 'เวอร์ชั่น Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'โลโก้', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'ออฟชั่นเสริม', 'per_page' => 'ผลการค้นหาต่อหน้า', 'php' => 'เวอร์ชัน PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'มูลค่า', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/th/general.php b/app/lang/th/general.php index be11c42221..da1ce56058 100755 --- a/app/lang/th/general.php +++ b/app/lang/th/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'เช็คอินจาก', 'checkout' => 'เช็คเอาท์', 'city' => 'เมือง', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'การใช้งาน', 'consumables' => 'การใช้งาน', 'country' => 'ประเทศ', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'รายงานการซ่อมบำรุงสินทรัพย์', 'asset_maintenances' => 'ซ่อมบำรุงสินทรัพย์', 'item' => 'รายการ', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'สุดท้าย', - 'last_name' => 'นามสกุล', + 'last_name' => 'นามสกุล', 'license' => 'ลิขสิทธิ์', 'license_report' => 'รายงานลิขสิทธิ์', 'licenses_available' => 'ลิขสิทธิ์พร้อมใช้', @@ -140,4 +143,5 @@ 'years' => 'ปี', 'yes' => 'ใช่', 'zip' => 'รหัสไปรษณีย์', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/tr/admin/accessories/message.php b/app/lang/tr/admin/accessories/message.php index 2232b55e9e..d7c30fd692 100755 --- a/app/lang/tr/admin/accessories/message.php +++ b/app/lang/tr/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Kategori mevcut değil.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Bu aksesuardan :count adet kullanıcılara çıkış yapıldı. Lütfen aksesuar girişi yapınız ve tekrar deneyin.', 'create' => array( - 'error' => 'Kategori oluşturulamadı. Lütfen tekrar deneyiniz.', - 'success' => 'Kategori oluşturuldu.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Kategori güncellenemedi, Lütfen tekrar deneyin', - 'success' => 'Kategori güncellendi.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Bu kategoriyi silerken bir hata ile karşılaşıldı. Lütfen tekrar deneyin.', 'success' => 'Kategori silindi.' ), - + 'checkout' => array( 'error' => 'Aksesuar çıkışı yapılamadı, lütfen tekrar deneyin', 'success' => 'Aksesuar çıkışı yapıldı.', diff --git a/app/lang/tr/admin/hardware/table.php b/app/lang/tr/admin/hardware/table.php index 2e8a1c7a74..67b728a129 100755 --- a/app/lang/tr/admin/hardware/table.php +++ b/app/lang/tr/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Seri No', 'status' => 'Durum', 'title' => 'Demirbaş ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/tr/admin/settings/general.php b/app/lang/tr/admin/settings/general.php index 988c3ec770..090d57f52d 100755 --- a/app/lang/tr/admin/settings/general.php +++ b/app/lang/tr/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Başlık rengi', 'info' => 'Bu ayarlardan kurulum görünüşünüzü kişiselleştirebilirsiniz.', 'laravel' => 'Laravel Version', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'İsteğe bağlı', 'per_page' => 'Sayfa başına sonuç sayısı', 'php' => 'PHP Versiyonu', @@ -50,5 +68,5 @@ return array( 'value' => 'Değer', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/tr/general.php b/app/lang/tr/general.php index 033afe4f39..261fff3d41 100755 --- a/app/lang/tr/general.php +++ b/app/lang/tr/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin from', 'checkout' => 'Checkout', 'city' => 'Şehir', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Sarf Malzeme', 'consumables' => 'Sarf Malzemeleri', 'country' => 'Ülke', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Son', - 'last_name' => 'Last Name', + 'last_name' => 'Last Name', 'license' => 'License', 'license_report' => 'License Report', 'licenses_available' => 'licenses available', @@ -140,4 +143,5 @@ 'years' => 'Yıl', 'yes' => 'Evet', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/tr/pagination.php b/app/lang/tr/pagination.php index b573b51e91..e80c32d160 100755 --- a/app/lang/tr/pagination.php +++ b/app/lang/tr/pagination.php @@ -13,8 +13,8 @@ return array( | */ - 'previous' => '« Previous', + 'previous' => '« Önceki', - 'next' => 'Next »', + 'next' => 'Sonraki »', ); diff --git a/app/lang/tr/reminders.php b/app/lang/tr/reminders.php index f782bdb878..502a349cec 100755 --- a/app/lang/tr/reminders.php +++ b/app/lang/tr/reminders.php @@ -13,12 +13,12 @@ return array( | */ - "password" => "Passwords must be six characters and match the confirmation.", + "password" => "Şifre en az 6 karakter olmalı ve birbiriyle eşleşmeli.", "user" => "Kullanıcı adı veya e-mail adresi hatalı", "token" => "This password reset token is invalid.", - "sent" => "If a matching email address was found, a password reminder has been sent!", + "sent" => "Eşleşen email bulunsaydı, şifre gönderilirdi!", ); diff --git a/app/lang/vi/admin/accessories/message.php b/app/lang/vi/admin/accessories/message.php index bb27ac68d7..1d67d33ddc 100755 --- a/app/lang/vi/admin/accessories/message.php +++ b/app/lang/vi/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Hạng mục không tồn tại.', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => 'Phụ kiện này hiện có :count cái đã giao cho người dùng. Bạn hãy nhập lại vào trong phần phụ kiện và thử lại lần nữa. ', 'create' => array( - 'error' => 'Hạng mục chưa được tạo. Bạn hãy thử lại.', - 'success' => 'Hạng mục đã được khởi tạo thành công.' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => 'Hạng mục chưa được cập nhật. Bạn hãy thử lại', - 'success' => 'Hạng mục được cập nhật thành công.' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => 'Có vấn đề xảy ra khi xoá hạng mục này. Bạn hãy thử lại.', 'success' => 'Hạng mục này đã được xoá thành công.' ), - + 'checkout' => array( 'error' => 'Phụ kiện chưa được xuất kho. Bạn hãy thử lại', 'success' => 'Phụ kiện được xuất kho thành công.', diff --git a/app/lang/vi/admin/hardware/table.php b/app/lang/vi/admin/hardware/table.php index 511017ea7f..fe46f427cf 100755 --- a/app/lang/vi/admin/hardware/table.php +++ b/app/lang/vi/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Sê-ri', 'status' => 'Tình trạng', 'title' => 'Tài sản ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Những ngày không chấp nhận' ); diff --git a/app/lang/vi/admin/settings/general.php b/app/lang/vi/admin/settings/general.php index 554abe374e..07e175f92e 100755 --- a/app/lang/vi/admin/settings/general.php +++ b/app/lang/vi/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => 'Màu Header', 'info' => 'Các thiết lập này cho phép bạn tùy chỉnh một số khía cạnh của quá trình cài đặt.', 'laravel' => 'Phiên bản Laravel', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => 'tùy ý', 'per_page' => 'Kết quả trên trang', 'php' => 'Phiên bản PHP', @@ -50,5 +68,5 @@ return array( 'value' => 'Giá trị', 'brand' => 'Branding', 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/vi/general.php b/app/lang/vi/general.php index 8f85f92c05..13dd683320 100755 --- a/app/lang/vi/general.php +++ b/app/lang/vi/general.php @@ -30,6 +30,8 @@ 'checkin_from' => 'Checkin từ', 'checkout' => 'Checkout', 'city' => 'Thành phố', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => 'Vật tư phụ', 'consumables' => 'Vật tư phụ', 'country' => 'Nước', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => 'Báo cáo tài sản bảo trì', 'asset_maintenances' => 'Tài sản đang bảo trì', 'item' => 'Mục', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => 'Cuối', - 'last_name' => 'Tên', + 'last_name' => 'Tên', 'license' => 'Bản quyền', 'license_report' => 'Báo cáo bản quyền', 'licenses_available' => 'bản quyền sẵn có', @@ -140,4 +143,5 @@ 'years' => 'năm', 'yes' => 'Yes', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/lang/zh-CN/admin/accessories/general.php b/app/lang/zh-CN/admin/accessories/general.php index 67a1ff2649..a9e4817d2a 100755 --- a/app/lang/zh-CN/admin/accessories/general.php +++ b/app/lang/zh-CN/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => '配件就是你发给用户，但没有一个序列号（或者你不在乎唯一序列号标识）。例如，计算机鼠标或键盘。', 'accessory_category' => '配件类别', 'accessory_name' => '配件名称', - 'cost' => 'Purchase Cost', + 'cost' => '采购成本', 'create' => '新增配件', - 'date' => 'Purchase Date', + 'date' => '采购日期', 'eula_text' => '类别的最终用户许可协议', 'eula_text_help' => '此字段允许您自定义的EULA（最终用户许可协议）为特定类型的资产。如果您所有资产只有一个EULA（最终用户许可协议），你可以检查下面的框中使用默认设置。', 'require_acceptance' => '要求用户确认接受这一类的资产。', 'no_default_eula' => '没有发现默认EULA（最终用户许可协议）。请在设置中添加一个。', - 'order' => 'Order Number', + 'order' => '订单号', 'qty' => '数量', 'total' => '共计', 'remaining' => '可用', diff --git a/app/lang/zh-CN/admin/accessories/message.php b/app/lang/zh-CN/admin/accessories/message.php index 50781cdb0a..9240288256 100755 --- a/app/lang/zh-CN/admin/accessories/message.php +++ b/app/lang/zh-CN/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => '分类不存在。', + 'does_not_exist' => 'Accessory does not exist.', 'assoc_users' => '配件目前状态：可用数量不足，请检查改配件再重试。', 'create' => array( - 'error' => '分类创建失败，请重试。', - 'success' => '分类创建成功。' + 'error' => 'Accessory was not created, please try again.', + 'success' => 'Accessory created successfully.' ), 'update' => array( - 'error' => '分类创建失败，请重试', - 'success' => '分类更新成功。' + 'error' => 'Accessory was not updated, please try again', + 'success' => 'Accessory updated successfully.' ), 'delete' => array( @@ -20,7 +20,7 @@ return array( 'error' => '删除分类出现异常，请重试。', 'success' => '分类已经被成功删除。' ), - + 'checkout' => array( 'error' => '配件不能被预订，请重试。', 'success' => '配件成功预订。', diff --git a/app/lang/zh-CN/admin/consumables/general.php b/app/lang/zh-CN/admin/consumables/general.php index fdff5b422f..6fc22dd033 100755 --- a/app/lang/zh-CN/admin/consumables/general.php +++ b/app/lang/zh-CN/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => '关于耗材', 'about_consumables_text' => '所谓耗材是指从购买后会慢慢消耗并最终用尽的物品，例如打印机墨水，复印纸等等。', 'consumable_name' => '耗材名称', - 'cost' => 'Purchase Cost', + 'cost' => '采购成本', 'create' => '创建耗材', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => '采购日期', + 'order' => '订单号', 'remaining' => '剩余', 'total' => '总计', 'update' => '更新耗材', diff --git a/app/lang/zh-CN/admin/hardware/table.php b/app/lang/zh-CN/admin/hardware/table.php index db55692dd6..0b22ef9502 100755 --- a/app/lang/zh-CN/admin/hardware/table.php +++ b/app/lang/zh-CN/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => '序列号', 'status' => '状态', 'title' => '资产', + 'image' => 'Device Image', 'days_without_acceptance' => '过期天数' ); diff --git a/app/lang/zh-CN/admin/locations/table.php b/app/lang/zh-CN/admin/locations/table.php index e3c21fdfd5..e12834e4b8 100755 --- a/app/lang/zh-CN/admin/locations/table.php +++ b/app/lang/zh-CN/admin/locations/table.php @@ -1,8 +1,8 @@ 'Assets RTD', - 'assets_checkedout' => 'Assets Assigned', + 'assets_rtd' => '设备RTD', + 'assets_checkedout' => '持有人', 'id' => '编号', 'city' => '城市', 'state' => '省份', diff --git a/app/lang/zh-CN/admin/settings/general.php b/app/lang/zh-CN/admin/settings/general.php index f1626dcab3..f6905971da 100755 --- a/app/lang/zh-CN/admin/settings/general.php +++ b/app/lang/zh-CN/admin/settings/general.php @@ -26,9 +26,27 @@ return array( 'header_color' => '标题颜色', 'info' => '这些设置允许您自定义安装的某些方面', 'laravel' => 'Laravel版本', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'ldap_enabled' => 'LDAP enabled', + 'ldap_integration' => 'LDAP Integration', + 'ldap_settings' => 'LDAP Settings', + 'ldap_server' => 'LDAP Server', + 'ldap_uname' => 'LDAP Bind Username', + 'ldap_pword' => 'LDAP Bind Password', + 'ldap_basedn' => 'Base Bind DN', + 'ldap_filter' => 'LDAP Filter', + 'ldap_username_field' => 'Username Field', + 'ldap_lname_field' => 'Last Name', + 'ldap_fname_field' => 'LDAP First Name', + 'ldap_auth_filter_query' => 'LDAP Authentication query', + 'ldap_version' => 'LDAP Version', + 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_email' => 'LDAP Email', + 'load_remote_text' => '外部脚本', + 'load_remote_help_text' => '允许Snipe-IT安装外部的加载脚本。', 'logo' => '徽标', + 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', + 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'optional' => '可选', 'per_page' => '每页搜索结果', 'php' => 'PHP版本', @@ -48,7 +66,7 @@ return array( 'system' => '系统信息', 'update' => '更新设置', 'value' => '价值', - 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'brand' => '品牌', + 'about_settings_title' => '设置', + 'about_settings_text' => '这些设置允许您自定义您的安装偏好', ); diff --git a/app/lang/zh-CN/admin/users/general.php b/app/lang/zh-CN/admin/users/general.php index 49df8ebb11..4f06af57c0 100755 --- a/app/lang/zh-CN/admin/users/general.php +++ b/app/lang/zh-CN/admin/users/general.php @@ -10,7 +10,7 @@ return array( 'filetype_info' => '允许的文件类型有： png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar', 'history_user' => ':name的历史', 'last_login' => '上一次登陆', - 'ldap_config_text' => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.', + 'ldap_config_text' => '可在app/config文件夹中找到LDAP配置文件ldap.php。所选的位置将应用于所有导入文件的用户。您将需要至少一个位置才能使用这项功能。', 'ldap_text' => '连接到LDAP并创建用户。用户密码将自动生成。', 'software_user' => ':name 借走的软件', 'view_user' => '查看用户： :name', diff --git a/app/lang/zh-CN/general.php b/app/lang/zh-CN/general.php index d48277bc9d..f9b3806e54 100755 --- a/app/lang/zh-CN/general.php +++ b/app/lang/zh-CN/general.php @@ -30,6 +30,8 @@ 'checkin_from' => '输入来源', 'checkout' => '借出', 'city' => '城市', + 'companies' => 'Companies', + 'company' => 'Company', 'consumable' => '消耗品', 'consumables' => '消耗品', 'country' => '国家', @@ -66,8 +68,9 @@ 'asset_maintenance_report' => '资产维修报表', 'asset_maintenances' => '资产维修', 'item' => '条目', + 'insufficient_permissions' => 'Insufficient permissions!', 'last' => '最后页', - 'last_name' => '姓氏', + 'last_name' => '姓氏', 'license' => '授权许可', 'license_report' => '授权许可报告', 'licenses_available' => '可用许可', @@ -140,4 +143,5 @@ 'years' => '年', 'yes' => '是', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ];