snipe-it/resources/lang
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
..
af Updated translations 2022-04-11 15:40:58 +01:00
am Updated translations 2022-04-11 15:40:58 +01:00
ar Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
bg Updated translations 2022-04-11 15:40:58 +01:00
ca Updated translations 2022-04-11 15:40:58 +01:00
cs Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
cy Updated translations 2022-04-11 15:40:58 +01:00
da Updated translations 2022-04-11 15:40:58 +01:00
de Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
el Updated translations 2022-04-11 15:40:58 +01:00
en Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
en-GB Updated translations 2022-04-11 15:40:58 +01:00
en-ID Updated translations 2022-04-11 15:40:58 +01:00
es-CO Updated translations 2022-04-11 15:40:58 +01:00
es-ES Updated translations 2022-04-11 15:40:58 +01:00
es-MX Updated translations 2022-04-11 15:40:58 +01:00
es-VE Updated translations 2022-04-11 15:40:58 +01:00
et Updated translations 2022-04-11 15:40:58 +01:00
fa Updated translations 2022-04-11 15:40:58 +01:00
fi Updated translations 2022-04-11 15:40:58 +01:00
fil Updated translations 2022-04-11 15:40:58 +01:00
fr Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
ga-IE Updated translations 2022-04-11 15:40:58 +01:00
he Updated translations 2022-04-11 15:40:58 +01:00
hr Updated translations 2022-04-11 15:40:58 +01:00
hu Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
id Updated translations 2022-04-11 15:40:58 +01:00
is Updated translations 2022-04-11 15:40:58 +01:00
it Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
iu Updated translations 2022-04-11 15:40:58 +01:00
ja Updated translations 2022-04-11 15:40:58 +01:00
ko Updated translations 2022-04-11 15:40:58 +01:00
lt Updated translations 2022-04-11 15:40:58 +01:00
lv Updated translations 2022-04-11 15:40:58 +01:00
mi Updated translations 2022-04-11 15:40:58 +01:00
mk Updated translations 2022-04-11 15:40:58 +01:00
ml-IN Updated translations 2022-04-11 15:40:58 +01:00
mn Updated translations 2022-04-11 15:40:58 +01:00
ms Updated translations 2022-04-11 15:40:58 +01:00
nl Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
no Updated translations 2022-04-11 15:40:58 +01:00
pl Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
pt-BR Updated translations 2022-04-11 15:40:58 +01:00
pt-PT Updated translations 2022-04-11 15:40:58 +01:00
ro Updated translations 2022-04-11 15:40:58 +01:00
ru Updated translations 2022-04-11 15:40:58 +01:00
si-LK Updated translations 2022-04-11 15:40:58 +01:00
sk Updated translations 2022-04-11 15:40:58 +01:00
sl Updated translations 2022-04-11 15:40:58 +01:00
sr-CS Updated translations 2022-04-11 15:40:58 +01:00
sv-SE Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
ta Updated translations 2022-04-11 15:40:58 +01:00
th Updated translations 2022-04-11 15:40:58 +01:00
tl Updated translations 2022-04-11 15:40:58 +01:00
tr Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
uk Updated translations 2022-04-11 15:40:58 +01:00
ur-PK Updated translations 2022-04-11 15:40:58 +01:00
vendor/backup Revert "Updated translations" 2020-10-08 18:43:06 -07:00
vi Updated translations 2022-04-11 15:40:58 +01:00
zh-CN Updated translations 2022-04-11 15:40:58 +01:00
zh-HK Updated translations 2022-04-11 15:40:58 +01:00
zh-TW Updated translations 2022-04-11 15:40:58 +01:00
zu Updated translations 2022-04-11 15:40:58 +01:00