DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources/lang
History
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
2021-10-20 17:26:41 -07:00
..
af Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
am Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ar Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
bg Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ca Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
cs Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
cy Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
da Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
de Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
el Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
en Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
en-GB Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
en-ID Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
es-CO Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
es-ES Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
es-MX Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
es-VE Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
et Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
fa Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
fi Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
fil Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
fr Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ga-IE Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
he Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
hr Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
hu Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
id Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
is Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
it Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
iu Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ja Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ko Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
lt Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
lv Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
mi Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
mk Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ml-IN Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
mn Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ms Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
nl Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
no Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
pl Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
pt-BR Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
pt-PT Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ro Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ru Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
si-LK Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
sk Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
sl Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
sr-CS Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
sv-SE Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ta Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
th Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
tl Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
tr Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
uk Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
ur-PK Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
vendor/backup Revert "Updated translations" 2020-10-08 18:43:06 -07:00
vi Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
zh-CN Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
zh-HK Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
zh-TW Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
zu Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00