DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/resources/lang
History
snipe 453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master 
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Models/Ldap.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	tests/unit/UserTest.php
2020-08-31 12:44:03 -07:00
..
af Updated languages 2019-02-13 03:56:18 -08:00
ar Updated language strings 2019-05-21 19:17:00 -07:00
bg Updated language strings 2019-05-21 19:17:00 -07:00
cs Updated languages 2019-02-13 03:56:18 -08:00
cy Updated translations 2019-12-06 12:03:04 -08:00
da Updated languages 2019-02-13 03:56:18 -08:00
de Added: allow appending of domain name to username when user tries to login (#7790) 2020-02-04 12:47:49 -08:00
el Updated translations 2019-12-06 12:03:04 -08:00
en Merge branch 'develop' into integrations/2020-08-31-dev-into-master 2020-08-31 12:44:03 -07:00
en-GB Squashed commit of the following: 2020-08-31 12:17:19 -07:00
en-ID Updated language strings 2019-05-21 19:17:00 -07:00
es-CO Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
es-ES Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
es-MX Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
es-VE Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
et Updated translations 2019-12-06 12:03:04 -08:00
fa Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
fi Updated translations 2019-12-06 12:03:04 -08:00
fil Updated languages 2019-02-13 03:56:18 -08:00
fr Updated translations 2019-12-06 12:03:04 -08:00
ga-IE Updated languages 2019-02-13 03:56:18 -08:00
he Updated languages 2019-02-13 03:56:18 -08:00
hr Updated translations 2019-12-06 12:03:04 -08:00
hu Updated translations 2019-12-06 12:03:04 -08:00
id Updated language strings 2019-05-21 19:17:00 -07:00
is Updated translations 2019-12-06 12:03:04 -08:00
it Updated languages 2019-02-13 03:56:18 -08:00
iu Updated translations 2019-12-06 12:03:04 -08:00
ja Updated translations 2019-12-06 12:03:04 -08:00
ko Updated languages 2019-02-13 03:56:18 -08:00
lt Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
lv Updated translations 2019-12-06 12:03:04 -08:00
mi Updated languages 2019-02-13 03:56:18 -08:00
mk Updated languages 2019-02-13 03:56:18 -08:00
mn Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
ms Updated translations 2019-12-06 12:03:04 -08:00
nl Updated translations 2019-12-06 12:03:04 -08:00
no Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
pl Updated translations 2019-12-06 12:03:04 -08:00
pt-BR Updated language strings 2019-05-21 19:17:00 -07:00
pt-PT Updated translations 2019-12-06 12:03:04 -08:00
ro Updated languages 2019-02-13 03:56:18 -08:00
ru Added #6489: show asset assignments under user assignments (#7293) 2019-12-06 10:57:48 -08:00
sl Updated languages 2019-02-13 03:56:18 -08:00
sr-CS Updated language strings 2019-05-21 19:17:00 -07:00
sv-SE Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
ta Updated languages 2019-02-13 03:56:18 -08:00
th Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
tl Updated translations 2019-12-06 12:03:04 -08:00
tr Updated language strings 2019-05-21 19:17:00 -07:00
uk Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
ur-PK Updated translations 2019-12-06 12:03:04 -08:00
vendor/backup Added spatie language files 2019-05-22 00:51:00 -07:00
vi Updated translations 2019-12-06 12:03:04 -08:00
zh-CN Updated language strings 2019-05-21 19:17:00 -07:00
zh-HK Updated languages 2019-02-13 03:56:18 -08:00
zh-TW Updated languages 2019-02-13 03:56:18 -08:00
zu Updated languages 2019-02-13 03:56:18 -08:00