snipe-it/resources/lang
snipe 533649f24e Merge branch 'develop' into dev-master-integration
# Conflicts:
#	.gitignore
#	.travis.yml
#	app/Console/Commands/LdapSync.php
#	app/Console/Commands/SendExpectedCheckinAlerts.php
#	app/Console/Commands/SendExpirationAlerts.php
#	app/Console/Commands/SendInventoryAlerts.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/Importer.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/License.php
#	app/Models/Location.php
#	app/Models/Recipients/AlertRecipient.php
#	app/Models/User.php
#	app/Providers/AppServiceProvider.php
#	composer.json
#	composer.lock
#	config/trustedproxy.php
#	config/version.php
#	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/js/components/importer/importer-file.vue
#	resources/lang/ar/admin/settings/general.php
#	resources/lang/bg/admin/settings/general.php
#	resources/lang/en-ID/admin/settings/general.php
#	resources/lang/en-ID/passwords.php
#	resources/lang/en/passwords.php
#	resources/lang/es-CO/passwords.php
#	resources/lang/es-ES/passwords.php
#	resources/lang/es-MX/passwords.php
#	resources/lang/es-VE/passwords.php
#	resources/lang/fi/admin/settings/general.php
#	resources/lang/id/admin/settings/general.php
#	resources/lang/id/passwords.php
#	resources/lang/ja/passwords.php
#	resources/lang/nl/passwords.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/passwords.php
#	resources/lang/pt-BR/admin/settings/general.php
#	resources/lang/pt-BR/passwords.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/admin/statuslabels/table.php
#	resources/lang/ru/passwords.php
#	resources/lang/sr-CS/general.php
#	resources/lang/sr-CS/mail.php
#	resources/lang/sv-SE/admin/settings/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/passwords.php
#	resources/lang/vi/admin/models/message.php
#	resources/lang/vi/admin/users/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/views/importer/import.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/partials/forms/edit/image-upload.blade.php
#	resources/views/users/edit.blade.php
#	resources/views/users/view.blade.php
#	tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
..
af Updated languages 2019-02-13 03:56:18 -08:00
ar Updated languages 2019-02-13 03:56:18 -08:00
bg Updated languages 2019-02-13 03:56:18 -08:00
cs Updated languages 2019-02-13 03:56:18 -08:00
da Updated languages 2019-02-13 03:56:18 -08:00
de Updated languages 2019-02-13 03:56:18 -08:00
el Updated languages 2019-02-13 03:56:18 -08:00
en Merge branch 'develop' into dev-master-integration 2019-02-13 06:42:52 -08:00
en-GB Updated languages 2019-02-13 03:56:18 -08:00
en-ID Updated languages 2019-02-13 03:56:18 -08:00
es-CO Updated languages 2019-02-13 03:56:18 -08:00
es-ES Updated languages 2019-02-13 03:56:18 -08:00
es-MX Updated languages 2019-02-13 03:56:18 -08:00
es-VE Updated languages 2019-02-13 03:56:18 -08:00
et Updated languages 2019-02-13 03:56:18 -08:00
fa Updated languages 2019-02-13 03:56:18 -08:00
fi Updated languages 2019-02-13 03:56:18 -08:00
fil Updated languages 2019-02-13 03:56:18 -08:00
fr Updated languages 2019-02-13 03:56:18 -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 languages 2019-02-13 03:56:18 -08:00
hu Updated languages 2019-02-13 03:56:18 -08:00
id Updated languages 2019-02-13 03:56:18 -08:00
is Updated languages 2019-02-13 03:56:18 -08:00
is 2 Updated language strings 2018-09-28 11:54:52 -07:00
it Updated languages 2019-02-13 03:56:18 -08:00
ja Updated languages 2019-02-13 03:56:18 -08:00
ko Updated languages 2019-02-13 03:56:18 -08:00
lt Updated languages 2019-02-13 03:56:18 -08:00
lv Updated languages 2019-02-13 03:56:18 -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 Updated languages 2019-02-13 03:56:18 -08:00
ms Updated languages 2019-02-13 03:56:18 -08:00
nl Updated languages 2019-02-13 03:56:18 -08:00
no Updated languages 2019-02-13 03:56:18 -08:00
pl Updated languages 2019-02-13 03:56:18 -08:00
pt-BR Updated languages 2019-02-13 03:56:18 -08:00
pt-PT Updated languages 2019-02-13 03:56:18 -08:00
ro Updated languages 2019-02-13 03:56:18 -08:00
ru Updated languages 2019-02-13 03:56:18 -08:00
sl Updated languages 2019-02-13 03:56:18 -08:00
sr-CS Updated languages 2019-02-13 03:56:18 -08:00
sv-SE Updated languages 2019-02-13 03:56:18 -08:00
ta Updated languages 2019-02-13 03:56:18 -08:00
th Updated languages 2019-02-13 03:56:18 -08:00
tl Updated languages 2019-02-13 03:56:18 -08:00
tr Updated languages 2019-02-13 03:56:18 -08:00
uk Updated languages 2019-02-13 03:56:18 -08:00
ur-PK Updated languages 2019-02-13 03:56:18 -08:00
vendor/backup Spatie backup lang updates 2018-07-24 21:13:02 -07:00
vi Updated languages 2019-02-13 03:56:18 -08:00
zh-CN Updated languages 2019-02-13 03:56:18 -08: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