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 43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
2022-01-12 20:51:33 -08:00
..
af Merge master down into develop 2021-12-16 14:26:24 -08:00
am Merge master down into develop 2021-12-16 14:26:24 -08:00
ar Merge master down into develop 2021-12-16 14:26:24 -08:00
bg Merge master down into develop 2021-12-16 14:26:24 -08:00
ca Merge master down into develop 2021-12-16 14:26:24 -08:00
cs Merge master down into develop 2021-12-16 14:26:24 -08:00
cy Merge master down into develop 2021-12-16 14:26:24 -08:00
da Merge master down into develop 2021-12-16 14:26:24 -08:00
de Merge master down into develop 2021-12-16 14:26:24 -08:00
el Merge master down into develop 2021-12-16 14:26:24 -08:00
en Merge master into develop 2022-01-12 20:51:33 -08:00
en-GB Changed phrasing of "SAML Force Login" to "SAML Default Login" (English only at this point) 2021-12-18 11:56:36 -05:00
en-ID Changed phrasing of "SAML Force Login" to "SAML Default Login" (English only at this point) 2021-12-18 11:56:36 -05:00
es-CO Merge master down into develop 2021-12-16 14:26:24 -08:00
es-ES Merge master down into develop 2021-12-16 14:26:24 -08:00
es-MX Merge master down into develop 2021-12-16 14:26:24 -08:00
es-VE Merge master down into develop 2021-12-16 14:26:24 -08:00
et Merge master down into develop 2021-12-16 14:26:24 -08:00
fa Merge master down into develop 2021-12-16 14:26:24 -08:00
fi Merge master down into develop 2021-12-16 14:26:24 -08:00
fil Merge master down into develop 2021-12-16 14:26:24 -08:00
fr Merge master down into develop 2021-12-16 14:26:24 -08:00
ga-IE Merge master down into develop 2021-12-16 14:26:24 -08:00
he Merge master down into develop 2021-12-16 14:26:24 -08:00
hr Merge master down into develop 2021-12-16 14:26:24 -08:00
hu Merge master down into develop 2021-12-16 14:26:24 -08:00
id Merge master down into develop 2021-12-16 14:26:24 -08:00
is Merge master down into develop 2021-12-16 14:26:24 -08:00
it Merge master down into develop 2021-12-16 14:26:24 -08:00
iu Merge master down into develop 2021-12-16 14:26:24 -08:00
ja Merge master down into develop 2021-12-16 14:26:24 -08:00
ko Merge master down into develop 2021-12-16 14:26:24 -08:00
lt Merge master down into develop 2021-12-16 14:26:24 -08:00
lv Merge master down into develop 2021-12-16 14:26:24 -08:00
mi Merge master down into develop 2021-12-16 14:26:24 -08:00
mk Merge master down into develop 2021-12-16 14:26:24 -08:00
ml-IN Merge master down into develop 2021-12-16 14:26:24 -08:00
mn Merge master down into develop 2021-12-16 14:26:24 -08:00
ms Merge master down into develop 2021-12-16 14:26:24 -08:00
nl Merge master down into develop 2021-12-16 14:26:24 -08:00
no Merge master down into develop 2021-12-16 14:26:24 -08:00
pl Merge master down into develop 2021-12-16 14:26:24 -08:00
pt-BR Merge master down into develop 2021-12-16 14:26:24 -08:00
pt-PT Merge master down into develop 2021-12-16 14:26:24 -08:00
ro Merge master down into develop 2021-12-16 14:26:24 -08:00
ru Merge master down into develop 2021-12-16 14:26:24 -08:00
si-LK Merge master down into develop 2021-12-16 14:26:24 -08:00
sk Merge master down into develop 2021-12-16 14:26:24 -08:00
sl Merge master down into develop 2021-12-16 14:26:24 -08:00
sr-CS Merge master down into develop 2021-12-16 14:26:24 -08:00
sv-SE Merge master down into develop 2021-12-16 14:26:24 -08:00
ta Merge master down into develop 2021-12-16 14:26:24 -08:00
th Merge master down into develop 2021-12-16 14:26:24 -08:00
tl Merge master down into develop 2021-12-16 14:26:24 -08:00
tr Merge master down into develop 2021-12-16 14:26:24 -08:00
uk Merge master down into develop 2021-12-16 14:26:24 -08:00
ur-PK Merge master down into develop 2021-12-16 14:26:24 -08:00
vendor/backup Revert "Updated translations" 2020-10-08 18:43:06 -07:00
vi Merge master down into develop 2021-12-16 14:26:24 -08:00
zh-CN Merge master down into develop 2021-12-16 14:26:24 -08:00
zh-HK Merge master down into develop 2021-12-16 14:26:24 -08:00
zh-TW Merge master down into develop 2021-12-16 14:26:24 -08:00
zu Merge master down into develop 2021-12-16 14:26:24 -08:00