DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/resources/lang/en-US/admin
History
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	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/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
2024-06-17 11:18:33 +01:00
..
accessories Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
asset_maintenances Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
categories Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
companies added moar translations 2024-01-16 12:05:09 -08:00
components Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
consumables Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
custom_fields Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
departments Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
depreciations Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
groups Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
hardware Fixed typo 2024-06-01 00:42:16 +01:00
kits Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
labels adds translations for Label example 2024-01-16 10:47:45 -08:00
licenses Merge pull request #14587 from Godmartinz/License-export-button 2024-04-24 04:42:56 +01:00
locations Fixed translation string 2024-06-03 16:40:52 +01:00
manufacturers Moved URL string to general 2024-01-24 14:46:52 +00:00
models Fixed typo 2024-01-26 15:17:59 +00:00
reports Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
settings Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 2024-05-16 15:06:05 +01:00
statuslabels Use correct language codes, updated strings 2023-12-19 17:23:16 +00:00
suppliers Moved URL string to general 2024-01-24 14:46:52 +00:00
users Fixed some missing strings and checks 2024-06-01 04:01:04 +01:00