= comparisonInt;
- break;
- }
- }
-
- if (comparisonCheck || "".concat(value).toLowerCase().includes(s)) {
- return true;
- }
+ if (comparisonCheck || "".concat(value).toLowerCase().includes(searchText)) {
+ return true;
}
}
}
@@ -5219,7 +5306,7 @@
if (opts.smartDisplay) {
if (pageList.length < 2 || opts.totalRows <= pageList[0]) {
- this.$pagination.find('span.page-list').hide();
+ this.$pagination.find('div.page-list').hide();
}
} // when data is empty, hide the pagination
@@ -5290,6 +5377,10 @@
}, {
key: "onPagePre",
value: function onPagePre(event) {
+ if ($__default['default'](event.target).hasClass('disabled')) {
+ return;
+ }
+
event.preventDefault();
if (this.options.pageNumber - 1 === 0) {
@@ -5304,6 +5395,10 @@
}, {
key: "onPageNext",
value: function onPageNext(event) {
+ if ($__default['default'](event.target).hasClass('disabled')) {
+ return;
+ }
+
event.preventDefault();
if (this.options.pageNumber + 1 > this.options.totalPages) {
@@ -5348,10 +5443,10 @@
style = Utils.calculateObjectValue(this.options, this.options.rowStyle, [item, i], style);
if (style && style.css) {
- for (var _i7 = 0, _Object$entries6 = Object.entries(style.css); _i7 < _Object$entries6.length; _i7++) {
- var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2),
- key = _Object$entries6$_i[0],
- value = _Object$entries6$_i[1];
+ for (var _i8 = 0, _Object$entries7 = Object.entries(style.css); _i8 < _Object$entries7.length; _i8++) {
+ var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2),
+ key = _Object$entries7$_i[0],
+ value = _Object$entries7$_i[1];
csses.push("".concat(key, ": ").concat(value));
}
@@ -5360,20 +5455,20 @@
attributes = Utils.calculateObjectValue(this.options, this.options.rowAttributes, [item, i], attributes);
if (attributes) {
- for (var _i8 = 0, _Object$entries7 = Object.entries(attributes); _i8 < _Object$entries7.length; _i8++) {
- var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2),
- _key2 = _Object$entries7$_i[0],
- _value = _Object$entries7$_i[1];
+ for (var _i9 = 0, _Object$entries8 = Object.entries(attributes); _i9 < _Object$entries8.length; _i9++) {
+ var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2),
+ _key2 = _Object$entries8$_i[0],
+ _value = _Object$entries8$_i[1];
htmlAttributes.push("".concat(_key2, "=\"").concat(Utils.escapeHTML(_value), "\""));
}
}
if (item._data && !Utils.isEmptyObject(item._data)) {
- for (var _i9 = 0, _Object$entries8 = Object.entries(item._data); _i9 < _Object$entries8.length; _i9++) {
- var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2),
- k = _Object$entries8$_i[0],
- v = _Object$entries8$_i[1];
+ for (var _i10 = 0, _Object$entries9 = Object.entries(item._data); _i10 < _Object$entries9.length; _i10++) {
+ var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2),
+ k = _Object$entries9$_i[0],
+ v = _Object$entries9$_i[1];
// ignore data-index
if (k === 'index') {
@@ -5484,10 +5579,10 @@
if (cellStyle.css) {
var csses_ = [];
- for (var _i10 = 0, _Object$entries9 = Object.entries(cellStyle.css); _i10 < _Object$entries9.length; _i10++) {
- var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2),
- _key3 = _Object$entries9$_i[0],
- _value2 = _Object$entries9$_i[1];
+ for (var _i11 = 0, _Object$entries10 = Object.entries(cellStyle.css); _i11 < _Object$entries10.length; _i11++) {
+ var _Object$entries10$_i = _slicedToArray(_Object$entries10[_i11], 2),
+ _key3 = _Object$entries10$_i[0],
+ _value2 = _Object$entries10$_i[1];
csses_.push("".concat(_key3, ": ").concat(_value2));
}
@@ -5501,7 +5596,7 @@
value = typeof value === 'undefined' || value === null ? _this7.options.undefinedText : value;
}
- if (column.searchable && _this7.searchText && _this7.options.searchHighlight) {
+ if (column.searchable && _this7.searchText && _this7.options.searchHighlight && !(column.checkbox || column.radio)) {
var defValue = '';
var regExp = new RegExp("(".concat(_this7.searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), ")"), 'gim');
var marker = '$1';
@@ -5511,6 +5606,7 @@
// value can contains a HTML tags
var textContent = new DOMParser().parseFromString(value.toString(), 'text/html').documentElement.textContent;
var textReplaced = textContent.replace(regExp, marker);
+ textContent = textContent.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
defValue = value.replace(new RegExp("(>\\s*)(".concat(textContent, ")(\\s*)"), 'gm'), "$1".concat(textReplaced, "$3"));
} else {
// but usually not
@@ -5521,10 +5617,10 @@
}
if (item["_".concat(field, "_data")] && !Utils.isEmptyObject(item["_".concat(field, "_data")])) {
- for (var _i11 = 0, _Object$entries10 = Object.entries(item["_".concat(field, "_data")]); _i11 < _Object$entries10.length; _i11++) {
- var _Object$entries10$_i = _slicedToArray(_Object$entries10[_i11], 2),
- _k = _Object$entries10$_i[0],
- _v = _Object$entries10$_i[1];
+ for (var _i12 = 0, _Object$entries11 = Object.entries(item["_".concat(field, "_data")]); _i12 < _Object$entries11.length; _i12++) {
+ var _Object$entries11$_i = _slicedToArray(_Object$entries11[_i12], 2),
+ _k = _Object$entries11$_i[0],
+ _v = _Object$entries11$_i[1];
// ignore data-index
if (_k === 'index') {
@@ -5570,7 +5666,7 @@
}
}, {
key: "initBody",
- value: function initBody(fixedScroll) {
+ value: function initBody(fixedScroll, updatedUid) {
var _this8 = this;
var data = this.getData();
@@ -5590,6 +5686,7 @@
var rows = [];
var trFragments = $__default['default'](document.createDocumentFragment());
var hasTr = false;
+ var toExpand = [];
this.autoMergeCells = Utils.checkAutoMergeCells(data.slice(this.pageFrom - 1, this.pageTo));
for (var i = this.pageFrom - 1; i < this.pageTo; i++) {
@@ -5598,6 +5695,22 @@
hasTr = hasTr || !!tr;
if (tr && typeof tr === 'string') {
+ var uniqueId = this.options.uniqueId;
+
+ if (uniqueId && item.hasOwnProperty(uniqueId)) {
+ var itemUniqueId = item[uniqueId];
+ var oldTr = this.$body.find(Utils.sprintf('> tr[data-uniqueid="%s"][data-has-detail-view]', itemUniqueId));
+ var oldTrNext = oldTr.next();
+
+ if (oldTrNext.is('tr.detail-view')) {
+ toExpand.push(i);
+
+ if (!updatedUid || itemUniqueId !== updatedUid) {
+ tr += oldTrNext[0].outerHTML;
+ }
+ }
+ }
+
if (!this.options.virtualScroll) {
trFragments.append(tr);
} else {
@@ -5622,22 +5735,28 @@
scrollEl: this.$tableBody[0],
contentEl: this.$body[0],
itemHeight: this.options.virtualScrollItemHeight,
- callback: function callback() {
+ callback: function callback(startIndex, endIndex) {
_this8.fitHeader();
_this8.initBodyEvent();
+
+ _this8.trigger('virtual-scroll', startIndex, endIndex);
}
});
}
+ toExpand.forEach(function (index) {
+ _this8.expandRow(index);
+ });
+
if (!fixedScroll) {
this.scrollTo(0);
}
this.initBodyEvent();
- this.updateSelected();
this.initFooter();
this.resetView();
+ this.updateSelected();
if (this.options.sidePagination !== 'server') {
this.options.totalRows = data.length;
@@ -5791,9 +5910,9 @@
if (this.options.pagination && this.options.sidePagination === 'server') {
params.offset = this.options.pageSize === this.options.formatAllRows() ? 0 : this.options.pageSize * (this.options.pageNumber - 1);
- params.limit = this.options.pageSize === this.options.formatAllRows() ? this.options.totalRows : this.options.pageSize;
+ params.limit = this.options.pageSize;
- if (params.limit === 0) {
+ if (params.limit === 0 || this.options.pageSize === this.options.formatAllRows()) {
delete params.limit;
}
}
@@ -5855,11 +5974,17 @@
_this10.hideLoading();
}
- if (_this10.options.sidePagination === 'server' && res[_this10.options.totalField] > 0 && !res[_this10.options.dataField].length) {
+ if (_this10.options.sidePagination === 'server' && _this10.options.pageNumber > 1 && res[_this10.options.totalField] > 0 && !res[_this10.options.dataField].length) {
_this10.updatePagination();
}
},
error: function error(jqXHR) {
+ // abort ajax by multiple request
+ if (jqXHR && jqXHR.status === 0 && _this10._xhrAbort) {
+ _this10._xhrAbort = false;
+ return;
+ }
+
var data = [];
if (_this10.options.sidePagination === 'server') {
@@ -5880,6 +6005,8 @@
Utils.calculateObjectValue(this, this.options.ajax, [request], null);
} else {
if (this._xhr && this._xhr.readyState !== 4) {
+ this._xhrAbort = true;
+
this._xhr.abort();
}
@@ -6120,10 +6247,10 @@
style = Utils.calculateObjectValue(null, this.options.footerStyle, [column]);
if (style && style.css) {
- for (var _i12 = 0, _Object$entries11 = Object.entries(style.css); _i12 < _Object$entries11.length; _i12++) {
- var _Object$entries11$_i = _slicedToArray(_Object$entries11[_i12], 2),
- key = _Object$entries11$_i[0],
- _value3 = _Object$entries11$_i[1];
+ for (var _i13 = 0, _Object$entries12 = Object.entries(style.css); _i13 < _Object$entries12.length; _i13++) {
+ var _Object$entries12$_i = _slicedToArray(_Object$entries12[_i13], 2),
+ key = _Object$entries12$_i[0],
+ _value3 = _Object$entries12$_i[1];
csses.push("".concat(key, ": ").concat(_value3));
}
@@ -6325,10 +6452,10 @@
if (params && params.formatted) {
data.forEach(function (row) {
- for (var _i13 = 0, _Object$entries12 = Object.entries(row); _i13 < _Object$entries12.length; _i13++) {
- var _Object$entries12$_i = _slicedToArray(_Object$entries12[_i13], 2),
- key = _Object$entries12$_i[0],
- value = _Object$entries12$_i[1];
+ for (var _i14 = 0, _Object$entries13 = Object.entries(row); _i14 < _Object$entries13.length; _i14++) {
+ var _Object$entries13$_i = _slicedToArray(_Object$entries13[_i14], 2),
+ key = _Object$entries13$_i[0],
+ value = _Object$entries13$_i[1];
var column = _this17.columns[_this17.fieldsColumnsIndex[key]];
@@ -6505,7 +6632,7 @@
id = id.toString();
} else if (typeof rowUniqueId === 'number') {
if (Number(rowUniqueId) === rowUniqueId && rowUniqueId % 1 === 0) {
- id = parseInt(id);
+ id = parseInt(id, 10);
} else if (rowUniqueId === Number(rowUniqueId) && rowUniqueId !== 0) {
id = parseFloat(id);
}
@@ -6523,6 +6650,7 @@
key: "updateByUniqueId",
value: function updateByUniqueId(params) {
var allParams = Array.isArray(params) ? params : [params];
+ var updatedUid = null;
var _iterator7 = _createForOfIteratorHelper(allParams),
_step7;
@@ -6546,6 +6674,8 @@
} else {
$__default['default'].extend(this.options.data[rowId], _params2.row);
}
+
+ updatedUid = _params2.id;
}
} catch (err) {
_iterator7.e(err);
@@ -6556,7 +6686,7 @@
this.initSearch();
this.initPagination();
this.initSort();
- this.initBody(true);
+ this.initBody(true, updatedUid);
}
}, {
key: "removeByUniqueId",
@@ -6828,7 +6958,7 @@
var colspan = options.colspan || 1;
var i;
var j;
- var $tr = this.$body.find('>tr');
+ var $tr = this.$body.find('>tr[data-index]');
col += Utils.getDetailViewIndexOffset(this.options);
var $td = $tr.eq(row).find('>td').eq(col);
@@ -6971,9 +7101,10 @@
if (obj.values.includes(row[obj.field])) {
var $el = _this24.$selectItem.filter(':enabled').filter(Utils.sprintf('[data-index="%s"]', i));
+ var onlyCurrentPage = obj.hasOwnProperty('onlyCurrentPage') ? obj.onlyCurrentPage : false;
$el = checked ? $el.not(':checked') : $el.filter(':checked');
- if (!$el.length) {
+ if (!$el.length && onlyCurrentPage) {
return;
}
@@ -7022,7 +7153,6 @@
this.options.height = params.height;
}
- this.$selectAll.prop('checked', this.$selectItem.length > 0 && this.$selectItem.length === this.$selectItem.filter(':checked').length);
this.$tableContainer.toggleClass('has-card-view', this.options.cardView);
if (!this.options.cardView && this.options.showHeader && this.options.height) {
@@ -7112,6 +7242,7 @@
var text = this.options.showButtonText ? this.options.pagination ? this.options.formatPaginationSwitchUp() : this.options.formatPaginationSwitchDown() : '';
this.$toolbar.find('button[name="paginationSwitch"]').html("".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon), " ").concat(text));
this.updatePagination();
+ this.trigger('toggle-pagination', this.options.pagination);
}
}, {
key: "toggleFullscreen",
@@ -7223,14 +7354,14 @@
var row = this.data[index];
var $tr = this.$body.find(Utils.sprintf('> tr[data-index="%s"][data-has-detail-view]', index));
- if ($tr.next().is('tr.detail-view')) {
- return;
- }
-
if (this.options.detailViewIcon) {
$tr.find('a.detail-icon').html(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.detailClose));
}
+ if ($tr.next().is('tr.detail-view')) {
+ return;
+ }
+
$tr.after(Utils.sprintf(' |
', $tr.children('td').length));
var $element = $tr.next().find('td');
var detailFormatter = _columnDetailFormatter || this.options.detailFormatter;
@@ -7561,9 +7692,10 @@
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global_1 =
- /* global globalThis -- safe */
+ // eslint-disable-next-line es/no-global-this -- safe
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
+ // eslint-disable-next-line no-restricted-globals -- safe
check(typeof self == 'object' && self) ||
check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
// eslint-disable-next-line no-new-func -- fallback
@@ -7579,21 +7711,23 @@
// Detect IE8's incomplete defineProperty implementation
var descriptors = !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7;
});
- var nativePropertyIsEnumerable = {}.propertyIsEnumerable;
+ var $propertyIsEnumerable = {}.propertyIsEnumerable;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
// Nashorn ~ JDK8 bug
- var NASHORN_BUG = getOwnPropertyDescriptor$1 && !nativePropertyIsEnumerable.call({ 1: 2 }, 1);
+ var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
// `Object.prototype.propertyIsEnumerable` method implementation
// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
var f$4 = NASHORN_BUG ? function propertyIsEnumerable(V) {
var descriptor = getOwnPropertyDescriptor$1(this, V);
return !!descriptor && descriptor.enumerable;
- } : nativePropertyIsEnumerable;
+ } : $propertyIsEnumerable;
var objectPropertyIsEnumerable = {
f: f$4
@@ -7673,20 +7807,22 @@
// Thank's IE8 for his funny defineProperty
var ie8DomDefine = !descriptors && !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- requied for testing
return Object.defineProperty(documentCreateElement('div'), 'a', {
get: function () { return 7; }
}).a != 7;
});
- var nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+ var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
// `Object.getOwnPropertyDescriptor` method
// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
- var f$3 = descriptors ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+ var f$3 = descriptors ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
O = toIndexedObject(O);
P = toPrimitive(P, true);
if (ie8DomDefine) try {
- return nativeGetOwnPropertyDescriptor(O, P);
+ return $getOwnPropertyDescriptor(O, P);
} catch (error) { /* empty */ }
if (has$1(O, P)) return createPropertyDescriptor(!objectPropertyIsEnumerable.f.call(O, P), O[P]);
};
@@ -7701,16 +7837,17 @@
} return it;
};
- var nativeDefineProperty = Object.defineProperty;
+ // eslint-disable-next-line es/no-object-defineproperty -- safe
+ var $defineProperty = Object.defineProperty;
// `Object.defineProperty` method
// https://tc39.es/ecma262/#sec-object.defineproperty
- var f$2 = descriptors ? nativeDefineProperty : function defineProperty(O, P, Attributes) {
+ var f$2 = descriptors ? $defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
P = toPrimitive(P, true);
anObject(Attributes);
if (ie8DomDefine) try {
- return nativeDefineProperty(O, P, Attributes);
+ return $defineProperty(O, P, Attributes);
} catch (error) { /* empty */ }
if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported');
if ('value' in Attributes) O[P] = Attributes.value;
@@ -7760,7 +7897,7 @@
(module.exports = function (key, value) {
return sharedStore[key] || (sharedStore[key] = value !== undefined ? value : {});
})('versions', []).push({
- version: '3.9.1',
+ version: '3.10.1',
mode: 'global',
copyright: '© 2021 Denis Pushkarev (zloirock.ru)'
});
@@ -7972,6 +8109,7 @@
// `Object.getOwnPropertyNames` method
// https://tc39.es/ecma262/#sec-object.getownpropertynames
+ // eslint-disable-next-line es/no-object-getownpropertynames -- safe
var f$1 = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return objectKeysInternal(O, hiddenKeys);
};
@@ -7980,6 +8118,7 @@
f: f$1
};
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
var f = Object.getOwnPropertySymbols;
var objectGetOwnPropertySymbols = {
@@ -8079,6 +8218,7 @@
// `IsArray` abstract operation
// https://tc39.es/ecma262/#sec-isarray
+ // eslint-disable-next-line es/no-array-isarray -- safe
var isArray = Array.isArray || function isArray(arg) {
return classofRaw(arg) == 'Array';
};
@@ -8117,16 +8257,19 @@
var engineV8Version = version && +version;
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
var nativeSymbol = !!Object.getOwnPropertySymbols && !fails(function () {
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- required for testing
return !Symbol.sham &&
// Chrome 38 Symbol has incorrect toString conversion
// Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
(engineIsNode ? engineV8Version === 38 : engineV8Version > 37 && engineV8Version < 41);
});
+ /* eslint-disable es/no-symbol -- required for testing */
+
+
var useSymbolAsUid = nativeSymbol
- /* global Symbol -- safe */
&& !Symbol.sham
&& typeof Symbol.iterator == 'symbol';
@@ -8228,12 +8371,14 @@
// `Object.keys` method
// https://tc39.es/ecma262/#sec-object.keys
+ // eslint-disable-next-line es/no-object-keys -- safe
var objectKeys = Object.keys || function keys(O) {
return objectKeysInternal(O, enumBugKeys);
};
// `Object.defineProperties` method
// https://tc39.es/ecma262/#sec-object.defineproperties
+ // eslint-disable-next-line es/no-object-defineproperties -- safe
var objectDefineProperties = descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = objectKeys(Properties);
@@ -8497,6 +8642,7 @@
// https://tc39.es/ecma262/#sec-array.prototype.foreach
var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+ // eslint-disable-next-line es/no-array-prototype-foreach -- safe
} : [].forEach;
for (var COLLECTION_NAME in domIterables) {
@@ -8946,9 +9092,10 @@
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global_1 =
- /* global globalThis -- safe */
+ // eslint-disable-next-line es/no-global-this -- safe
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
+ // eslint-disable-next-line no-restricted-globals -- safe
check(typeof self == 'object' && self) ||
check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
// eslint-disable-next-line no-new-func -- fallback
@@ -8964,21 +9111,23 @@
// Detect IE8's incomplete defineProperty implementation
var descriptors = !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7;
});
- var nativePropertyIsEnumerable = {}.propertyIsEnumerable;
+ var $propertyIsEnumerable = {}.propertyIsEnumerable;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
// Nashorn ~ JDK8 bug
- var NASHORN_BUG = getOwnPropertyDescriptor$1 && !nativePropertyIsEnumerable.call({ 1: 2 }, 1);
+ var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
// `Object.prototype.propertyIsEnumerable` method implementation
// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
var f$4 = NASHORN_BUG ? function propertyIsEnumerable(V) {
var descriptor = getOwnPropertyDescriptor$1(this, V);
return !!descriptor && descriptor.enumerable;
- } : nativePropertyIsEnumerable;
+ } : $propertyIsEnumerable;
var objectPropertyIsEnumerable = {
f: f$4
@@ -9058,20 +9207,22 @@
// Thank's IE8 for his funny defineProperty
var ie8DomDefine = !descriptors && !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- requied for testing
return Object.defineProperty(documentCreateElement('div'), 'a', {
get: function () { return 7; }
}).a != 7;
});
- var nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+ var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
// `Object.getOwnPropertyDescriptor` method
// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
- var f$3 = descriptors ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+ var f$3 = descriptors ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
O = toIndexedObject(O);
P = toPrimitive(P, true);
if (ie8DomDefine) try {
- return nativeGetOwnPropertyDescriptor(O, P);
+ return $getOwnPropertyDescriptor(O, P);
} catch (error) { /* empty */ }
if (has$1(O, P)) return createPropertyDescriptor(!objectPropertyIsEnumerable.f.call(O, P), O[P]);
};
@@ -9086,16 +9237,17 @@
} return it;
};
- var nativeDefineProperty = Object.defineProperty;
+ // eslint-disable-next-line es/no-object-defineproperty -- safe
+ var $defineProperty = Object.defineProperty;
// `Object.defineProperty` method
// https://tc39.es/ecma262/#sec-object.defineproperty
- var f$2 = descriptors ? nativeDefineProperty : function defineProperty(O, P, Attributes) {
+ var f$2 = descriptors ? $defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
P = toPrimitive(P, true);
anObject(Attributes);
if (ie8DomDefine) try {
- return nativeDefineProperty(O, P, Attributes);
+ return $defineProperty(O, P, Attributes);
} catch (error) { /* empty */ }
if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported');
if ('value' in Attributes) O[P] = Attributes.value;
@@ -9145,7 +9297,7 @@
(module.exports = function (key, value) {
return sharedStore[key] || (sharedStore[key] = value !== undefined ? value : {});
})('versions', []).push({
- version: '3.9.1',
+ version: '3.10.1',
mode: 'global',
copyright: '© 2021 Denis Pushkarev (zloirock.ru)'
});
@@ -9357,6 +9509,7 @@
// `Object.getOwnPropertyNames` method
// https://tc39.es/ecma262/#sec-object.getownpropertynames
+ // eslint-disable-next-line es/no-object-getownpropertynames -- safe
var f$1 = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return objectKeysInternal(O, hiddenKeys);
};
@@ -9365,6 +9518,7 @@
f: f$1
};
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
var f = Object.getOwnPropertySymbols;
var objectGetOwnPropertySymbols = {
@@ -9499,6 +9653,7 @@
// `IsArray` abstract operation
// https://tc39.es/ecma262/#sec-isarray
+ // eslint-disable-next-line es/no-array-isarray -- safe
var isArray = Array.isArray || function isArray(arg) {
return classofRaw(arg) == 'Array';
};
@@ -9525,16 +9680,19 @@
var engineV8Version = version && +version;
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
var nativeSymbol = !!Object.getOwnPropertySymbols && !fails(function () {
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- required for testing
return !Symbol.sham &&
// Chrome 38 Symbol has incorrect toString conversion
// Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
(engineIsNode ? engineV8Version === 38 : engineV8Version > 37 && engineV8Version < 41);
});
+ /* eslint-disable es/no-symbol -- required for testing */
+
+
var useSymbolAsUid = nativeSymbol
- /* global Symbol -- safe */
&& !Symbol.sham
&& typeof Symbol.iterator == 'symbol';
@@ -9638,12 +9796,14 @@
// `Object.keys` method
// https://tc39.es/ecma262/#sec-object.keys
+ // eslint-disable-next-line es/no-object-keys -- safe
var objectKeys = Object.keys || function keys(O) {
return objectKeysInternal(O, enumBugKeys);
};
// `Object.defineProperties` method
// https://tc39.es/ecma262/#sec-object.defineproperties
+ // eslint-disable-next-line es/no-object-defineproperties -- safe
var objectDefineProperties = descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = objectKeys(Properties);
@@ -9784,7 +9944,7 @@
return RegExp(s, f);
}
- var UNSUPPORTED_Y$1 = fails(function () {
+ var UNSUPPORTED_Y$2 = fails(function () {
// babel-minify transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
var re = RE('a', 'y');
re.lastIndex = 2;
@@ -9799,15 +9959,12 @@
});
var regexpStickyHelpers = {
- UNSUPPORTED_Y: UNSUPPORTED_Y$1,
+ UNSUPPORTED_Y: UNSUPPORTED_Y$2,
BROKEN_CARET: BROKEN_CARET
};
var nativeExec = RegExp.prototype.exec;
- // This always refers to the native implementation, because the
- // String#replace polyfill uses ./fix-regexp-well-known-symbol-logic.js,
- // which loads this file before patching the method.
- var nativeReplace = String.prototype.replace;
+ var nativeReplace = shared('native-string-replace', String.prototype.replace);
var patchedExec = nativeExec;
@@ -9819,19 +9976,19 @@
return re1.lastIndex !== 0 || re2.lastIndex !== 0;
})();
- var UNSUPPORTED_Y = regexpStickyHelpers.UNSUPPORTED_Y || regexpStickyHelpers.BROKEN_CARET;
+ var UNSUPPORTED_Y$1 = regexpStickyHelpers.UNSUPPORTED_Y || regexpStickyHelpers.BROKEN_CARET;
// nonparticipating capturing group, copied from es5-shim's String#split patch.
// eslint-disable-next-line regexp/no-assertion-capturing-group, regexp/no-empty-group -- required for testing
var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
- var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y;
+ var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y$1;
if (PATCH) {
patchedExec = function exec(str) {
var re = this;
var lastIndex, reCopy, match, i;
- var sticky = UNSUPPORTED_Y && re.sticky;
+ var sticky = UNSUPPORTED_Y$1 && re.sticky;
var flags = regexpFlags.call(re);
var source = re.source;
var charsAdded = 0;
@@ -9901,7 +10058,6 @@
-
var SPECIES$3 = wellKnownSymbol('species');
var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
@@ -9920,6 +10076,7 @@
// IE <= 11 replaces $0 with the whole match, as if it was $&
// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
var REPLACE_KEEPS_$0 = (function () {
+ // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
return 'a'.replace(/./, '$0') === '$0';
})();
@@ -9989,7 +10146,7 @@
) {
var nativeRegExpMethod = /./[SYMBOL];
var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
- if (regexp.exec === regexpExec) {
+ if (regexp.exec === RegExp.prototype.exec) {
if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
// The native String method already delegates to @@method (this
// polyfilled function), leasing to infinite recursion.
@@ -10091,13 +10248,11 @@
return regexpExec.call(R, S);
};
+ var UNSUPPORTED_Y = regexpStickyHelpers.UNSUPPORTED_Y;
var arrayPush = [].push;
var min$1 = Math.min;
var MAX_UINT32 = 0xFFFFFFFF;
- // babel-minify transpiles RegExp('x', 'y') -> /x/y and it causes SyntaxError
- var SUPPORTS_Y = !fails(function () { return !RegExp(MAX_UINT32, 'y'); });
-
// @@split logic
fixRegexpWellKnownSymbolLogic('split', 2, function (SPLIT, nativeSplit, maybeCallNative) {
var internalSplit;
@@ -10180,11 +10335,11 @@
var flags = (rx.ignoreCase ? 'i' : '') +
(rx.multiline ? 'm' : '') +
(rx.unicode ? 'u' : '') +
- (SUPPORTS_Y ? 'y' : 'g');
+ (UNSUPPORTED_Y ? 'g' : 'y');
// ^(? + rx + ) is needed, in combination with some S slicing, to
// simulate the 'y' flag.
- var splitter = new C(SUPPORTS_Y ? rx : '^(?:' + rx.source + ')', flags);
+ var splitter = new C(UNSUPPORTED_Y ? '^(?:' + rx.source + ')' : rx, flags);
var lim = limit === undefined ? MAX_UINT32 : limit >>> 0;
if (lim === 0) return [];
if (S.length === 0) return regexpExecAbstract(splitter, S) === null ? [S] : [];
@@ -10192,12 +10347,12 @@
var q = 0;
var A = [];
while (q < S.length) {
- splitter.lastIndex = SUPPORTS_Y ? q : 0;
- var z = regexpExecAbstract(splitter, SUPPORTS_Y ? S : S.slice(q));
+ splitter.lastIndex = UNSUPPORTED_Y ? 0 : q;
+ var z = regexpExecAbstract(splitter, UNSUPPORTED_Y ? S.slice(q) : S);
var e;
if (
z === null ||
- (e = min$1(toLength(splitter.lastIndex + (SUPPORTS_Y ? 0 : q)), S.length)) === p
+ (e = min$1(toLength(splitter.lastIndex + (UNSUPPORTED_Y ? q : 0)), S.length)) === p
) {
q = advanceStringIndex(S, q, unicodeMatching);
} else {
@@ -10214,7 +10369,7 @@
return A;
}
];
- }, !SUPPORTS_Y);
+ }, UNSUPPORTED_Y);
var floor = Math.floor;
var replace = ''.replace;
@@ -10417,14 +10572,16 @@
}
});
- var nativeAssign = Object.assign;
+ // eslint-disable-next-line es/no-object-assign -- safe
+ var $assign = Object.assign;
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
var defineProperty = Object.defineProperty;
// `Object.assign` method
// https://tc39.es/ecma262/#sec-object.assign
- var objectAssign = !nativeAssign || fails(function () {
+ var objectAssign = !$assign || fails(function () {
// should have correct order of operations (Edge bug)
- if (descriptors && nativeAssign({ b: 1 }, nativeAssign(defineProperty({}, 'a', {
+ if (descriptors && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
enumerable: true,
get: function () {
defineProperty(this, 'b', {
@@ -10436,12 +10593,12 @@
// should work with symbols and should have deterministic property order (V8 bug)
var A = {};
var B = {};
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- safe
var symbol = Symbol();
var alphabet = 'abcdefghijklmnopqrst';
A[symbol] = 7;
alphabet.split('').forEach(function (chr) { B[chr] = chr; });
- return nativeAssign({}, A)[symbol] != 7 || objectKeys(nativeAssign({}, B)).join('') != alphabet;
+ return $assign({}, A)[symbol] != 7 || objectKeys($assign({}, B)).join('') != alphabet;
}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
var T = toObject(target);
var argumentsLength = arguments.length;
@@ -10459,10 +10616,11 @@
if (!descriptors || propertyIsEnumerable.call(S, key)) T[key] = S[key];
}
} return T;
- } : nativeAssign;
+ } : $assign;
// `Object.assign` method
// https://tc39.es/ecma262/#sec-object.assign
+ // eslint-disable-next-line es/no-object-assign -- required for testing
_export({ target: 'Object', stat: true, forced: Object.assign !== objectAssign }, {
assign: objectAssign
});
@@ -10582,6 +10740,7 @@
// https://tc39.es/ecma262/#sec-array.prototype.foreach
var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+ // eslint-disable-next-line es/no-array-prototype-foreach -- safe
} : [].forEach;
for (var COLLECTION_NAME in domIterables) {
@@ -10637,6 +10796,7 @@
$__default['default'].extend($__default['default'].fn.bootstrapTable.defaults.icons, {
export: {
bootstrap3: 'glyphicon-export icon-share',
+ bootstrap5: 'bi-download',
materialize: 'file_download',
'bootstrap-table': 'icon-download'
}[$__default['default'].fn.bootstrapTable.theme] || 'fa-download'
@@ -10672,8 +10832,8 @@
_createClass(_class, [{
key: "initToolbar",
value: function initToolbar() {
- var _get2,
- _this = this;
+ var _this = this,
+ _get2;
var o = this.options;
var exportTypes = o.exportTypes;
@@ -10696,7 +10856,36 @@
this.buttons = Object.assign(this.buttons, {
export: {
- html: exportTypes.length === 1 ? "\n \n \n
\n ") : "\n \n \n
\n ")
+ html: function html() {
+ if (exportTypes.length === 1) {
+ return "\n \n \n
\n ");
+ }
+
+ var html = [];
+ html.push("\n \n \n ").concat(_this.constants.html.toolbarDropdown[0], "\n "));
+
+ var _iterator = _createForOfIteratorHelper(exportTypes),
+ _step;
+
+ try {
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
+ var type = _step.value;
+
+ if (TYPE_NAME.hasOwnProperty(type)) {
+ var $item = $__default['default'](Utils.sprintf(_this.constants.html.pageDropdownItem, '', TYPE_NAME[type]));
+ $item.attr('data-type', type);
+ html.push($item.prop('outerHTML'));
+ }
+ }
+ } catch (err) {
+ _iterator.e(err);
+ } finally {
+ _iterator.f();
+ }
+
+ html.push(_this.constants.html.toolbarDropdown[1], '
');
+ return html.join('');
+ }
}
});
}
@@ -10713,40 +10902,14 @@
return;
}
- var $menu = $__default['default'](this.constants.html.toolbarDropdown.join(''));
- var $items = this.$export;
+ this.updateExportButton();
+ var $exportButtons = this.$export.find('[data-type]');
- if (exportTypes.length > 1) {
- this.$export.append($menu); // themes support
-
- if ($menu.children().length) {
- $menu = $menu.children().eq(0);
- }
-
- var _iterator = _createForOfIteratorHelper(exportTypes),
- _step;
-
- try {
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
- var type = _step.value;
-
- if (TYPE_NAME.hasOwnProperty(type)) {
- var $item = $__default['default'](Utils.sprintf(this.constants.html.pageDropdownItem, '', TYPE_NAME[type]));
- $item.attr('data-type', type);
- $menu.append($item);
- }
- }
- } catch (err) {
- _iterator.e(err);
- } finally {
- _iterator.f();
- }
-
- $items = $menu.children();
+ if (exportTypes.length === 1) {
+ $exportButtons = this.$export.find('button');
}
- this.updateExportButton();
- $items.click(function (e) {
+ $exportButtons.click(function (e) {
e.preventDefault();
var type = $__default['default'](e.currentTarget).data('type');
var exportOptions = {
@@ -11164,9 +11327,10 @@
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global_1 =
- /* global globalThis -- safe */
+ // eslint-disable-next-line es/no-global-this -- safe
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
+ // eslint-disable-next-line no-restricted-globals -- safe
check(typeof self == 'object' && self) ||
check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
// eslint-disable-next-line no-new-func -- fallback
@@ -11182,21 +11346,23 @@
// Detect IE8's incomplete defineProperty implementation
var descriptors = !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7;
});
- var nativePropertyIsEnumerable = {}.propertyIsEnumerable;
+ var $propertyIsEnumerable = {}.propertyIsEnumerable;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
// Nashorn ~ JDK8 bug
- var NASHORN_BUG = getOwnPropertyDescriptor$1 && !nativePropertyIsEnumerable.call({ 1: 2 }, 1);
+ var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
// `Object.prototype.propertyIsEnumerable` method implementation
// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
var f$4 = NASHORN_BUG ? function propertyIsEnumerable(V) {
var descriptor = getOwnPropertyDescriptor$1(this, V);
return !!descriptor && descriptor.enumerable;
- } : nativePropertyIsEnumerable;
+ } : $propertyIsEnumerable;
var objectPropertyIsEnumerable = {
f: f$4
@@ -11276,20 +11442,22 @@
// Thank's IE8 for his funny defineProperty
var ie8DomDefine = !descriptors && !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- requied for testing
return Object.defineProperty(documentCreateElement('div'), 'a', {
get: function () { return 7; }
}).a != 7;
});
- var nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+ var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
// `Object.getOwnPropertyDescriptor` method
// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
- var f$3 = descriptors ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+ var f$3 = descriptors ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
O = toIndexedObject(O);
P = toPrimitive(P, true);
if (ie8DomDefine) try {
- return nativeGetOwnPropertyDescriptor(O, P);
+ return $getOwnPropertyDescriptor(O, P);
} catch (error) { /* empty */ }
if (has$1(O, P)) return createPropertyDescriptor(!objectPropertyIsEnumerable.f.call(O, P), O[P]);
};
@@ -11304,16 +11472,17 @@
} return it;
};
- var nativeDefineProperty = Object.defineProperty;
+ // eslint-disable-next-line es/no-object-defineproperty -- safe
+ var $defineProperty = Object.defineProperty;
// `Object.defineProperty` method
// https://tc39.es/ecma262/#sec-object.defineproperty
- var f$2 = descriptors ? nativeDefineProperty : function defineProperty(O, P, Attributes) {
+ var f$2 = descriptors ? $defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
P = toPrimitive(P, true);
anObject(Attributes);
if (ie8DomDefine) try {
- return nativeDefineProperty(O, P, Attributes);
+ return $defineProperty(O, P, Attributes);
} catch (error) { /* empty */ }
if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported');
if ('value' in Attributes) O[P] = Attributes.value;
@@ -11363,7 +11532,7 @@
(module.exports = function (key, value) {
return sharedStore[key] || (sharedStore[key] = value !== undefined ? value : {});
})('versions', []).push({
- version: '3.9.1',
+ version: '3.10.1',
mode: 'global',
copyright: '© 2021 Denis Pushkarev (zloirock.ru)'
});
@@ -11575,6 +11744,7 @@
// `Object.getOwnPropertyNames` method
// https://tc39.es/ecma262/#sec-object.getownpropertynames
+ // eslint-disable-next-line es/no-object-getownpropertynames -- safe
var f$1 = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return objectKeysInternal(O, hiddenKeys);
};
@@ -11583,6 +11753,7 @@
f: f$1
};
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
var f = Object.getOwnPropertySymbols;
var objectGetOwnPropertySymbols = {
@@ -11682,6 +11853,7 @@
// `IsArray` abstract operation
// https://tc39.es/ecma262/#sec-isarray
+ // eslint-disable-next-line es/no-array-isarray -- safe
var isArray = Array.isArray || function isArray(arg) {
return classofRaw(arg) == 'Array';
};
@@ -11720,16 +11892,19 @@
var engineV8Version = version && +version;
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
var nativeSymbol = !!Object.getOwnPropertySymbols && !fails(function () {
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- required for testing
return !Symbol.sham &&
// Chrome 38 Symbol has incorrect toString conversion
// Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
(engineIsNode ? engineV8Version === 38 : engineV8Version > 37 && engineV8Version < 41);
});
+ /* eslint-disable es/no-symbol -- required for testing */
+
+
var useSymbolAsUid = nativeSymbol
- /* global Symbol -- safe */
&& !Symbol.sham
&& typeof Symbol.iterator == 'symbol';
@@ -11870,7 +12045,7 @@
return RegExp(s, f);
}
- var UNSUPPORTED_Y$1 = fails(function () {
+ var UNSUPPORTED_Y$2 = fails(function () {
// babel-minify transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
var re = RE('a', 'y');
re.lastIndex = 2;
@@ -11885,15 +12060,12 @@
});
var regexpStickyHelpers = {
- UNSUPPORTED_Y: UNSUPPORTED_Y$1,
+ UNSUPPORTED_Y: UNSUPPORTED_Y$2,
BROKEN_CARET: BROKEN_CARET
};
var nativeExec = RegExp.prototype.exec;
- // This always refers to the native implementation, because the
- // String#replace polyfill uses ./fix-regexp-well-known-symbol-logic.js,
- // which loads this file before patching the method.
- var nativeReplace = String.prototype.replace;
+ var nativeReplace = shared('native-string-replace', String.prototype.replace);
var patchedExec = nativeExec;
@@ -11905,19 +12077,19 @@
return re1.lastIndex !== 0 || re2.lastIndex !== 0;
})();
- var UNSUPPORTED_Y = regexpStickyHelpers.UNSUPPORTED_Y || regexpStickyHelpers.BROKEN_CARET;
+ var UNSUPPORTED_Y$1 = regexpStickyHelpers.UNSUPPORTED_Y || regexpStickyHelpers.BROKEN_CARET;
// nonparticipating capturing group, copied from es5-shim's String#split patch.
// eslint-disable-next-line regexp/no-assertion-capturing-group, regexp/no-empty-group -- required for testing
var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
- var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y;
+ var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y$1;
if (PATCH) {
patchedExec = function exec(str) {
var re = this;
var lastIndex, reCopy, match, i;
- var sticky = UNSUPPORTED_Y && re.sticky;
+ var sticky = UNSUPPORTED_Y$1 && re.sticky;
var flags = regexpFlags.call(re);
var source = re.source;
var charsAdded = 0;
@@ -11987,7 +12159,6 @@
-
var SPECIES$1 = wellKnownSymbol('species');
var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
@@ -12006,6 +12177,7 @@
// IE <= 11 replaces $0 with the whole match, as if it was $&
// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
var REPLACE_KEEPS_$0 = (function () {
+ // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
return 'a'.replace(/./, '$0') === '$0';
})();
@@ -12075,7 +12247,7 @@
) {
var nativeRegExpMethod = /./[SYMBOL];
var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
- if (regexp.exec === regexpExec) {
+ if (regexp.exec === RegExp.prototype.exec) {
if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
// The native String method already delegates to @@method (this
// polyfilled function), leasing to infinite recursion.
@@ -12183,13 +12355,11 @@
return regexpExec.call(R, S);
};
+ var UNSUPPORTED_Y = regexpStickyHelpers.UNSUPPORTED_Y;
var arrayPush = [].push;
var min$1 = Math.min;
var MAX_UINT32 = 0xFFFFFFFF;
- // babel-minify transpiles RegExp('x', 'y') -> /x/y and it causes SyntaxError
- var SUPPORTS_Y = !fails(function () { return !RegExp(MAX_UINT32, 'y'); });
-
// @@split logic
fixRegexpWellKnownSymbolLogic('split', 2, function (SPLIT, nativeSplit, maybeCallNative) {
var internalSplit;
@@ -12272,11 +12442,11 @@
var flags = (rx.ignoreCase ? 'i' : '') +
(rx.multiline ? 'm' : '') +
(rx.unicode ? 'u' : '') +
- (SUPPORTS_Y ? 'y' : 'g');
+ (UNSUPPORTED_Y ? 'g' : 'y');
// ^(? + rx + ) is needed, in combination with some S slicing, to
// simulate the 'y' flag.
- var splitter = new C(SUPPORTS_Y ? rx : '^(?:' + rx.source + ')', flags);
+ var splitter = new C(UNSUPPORTED_Y ? '^(?:' + rx.source + ')' : rx, flags);
var lim = limit === undefined ? MAX_UINT32 : limit >>> 0;
if (lim === 0) return [];
if (S.length === 0) return regexpExecAbstract(splitter, S) === null ? [S] : [];
@@ -12284,12 +12454,12 @@
var q = 0;
var A = [];
while (q < S.length) {
- splitter.lastIndex = SUPPORTS_Y ? q : 0;
- var z = regexpExecAbstract(splitter, SUPPORTS_Y ? S : S.slice(q));
+ splitter.lastIndex = UNSUPPORTED_Y ? 0 : q;
+ var z = regexpExecAbstract(splitter, UNSUPPORTED_Y ? S.slice(q) : S);
var e;
if (
z === null ||
- (e = min$1(toLength(splitter.lastIndex + (SUPPORTS_Y ? 0 : q)), S.length)) === p
+ (e = min$1(toLength(splitter.lastIndex + (UNSUPPORTED_Y ? q : 0)), S.length)) === p
) {
q = advanceStringIndex(S, q, unicodeMatching);
} else {
@@ -12306,7 +12476,7 @@
return A;
}
];
- }, !SUPPORTS_Y);
+ }, UNSUPPORTED_Y);
var floor = Math.floor;
var replace = ''.replace;
@@ -12571,6 +12741,7 @@
// https://tc39.es/ecma262/#sec-array.prototype.foreach
var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+ // eslint-disable-next-line es/no-array-prototype-foreach -- safe
} : [].forEach;
for (var COLLECTION_NAME in domIterables) {
@@ -12648,12 +12819,14 @@
// `Object.keys` method
// https://tc39.es/ecma262/#sec-object.keys
+ // eslint-disable-next-line es/no-object-keys -- safe
var objectKeys = Object.keys || function keys(O) {
return objectKeysInternal(O, enumBugKeys);
};
// `Object.defineProperties` method
// https://tc39.es/ecma262/#sec-object.defineproperties
+ // eslint-disable-next-line es/no-object-defineproperties -- safe
var objectDefineProperties = descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = objectKeys(Properties);
@@ -12804,6 +12977,7 @@
// `SameValue` abstract operation
// https://tc39.es/ecma262/#sec-samevalue
+ // eslint-disable-next-line es/no-object-is -- safe
var sameValue = Object.is || function is(x, y) {
// eslint-disable-next-line no-self-compare -- NaN check
return x === y ? x !== 0 || 1 / x === 1 / y : x != x && y != y;
@@ -12848,9 +13022,11 @@
cookieIds: {
sortOrder: 'bs.table.sortOrder',
sortName: 'bs.table.sortName',
+ sortPriority: 'bs.table.sortPriority',
pageNumber: 'bs.table.pageNumber',
pageList: 'bs.table.pageList',
columns: 'bs.table.columns',
+ cardView: 'bs.table.cardView',
searchText: 'bs.table.searchText',
reorderColumns: 'bs.table.reorderColumns',
filterControl: 'bs.table.filterControl',
@@ -13106,7 +13282,7 @@
cookieSecure: null,
cookieSameSite: 'Lax',
cookieIdTable: '',
- cookiesEnabled: ['bs.table.sortOrder', 'bs.table.sortName', 'bs.table.pageNumber', 'bs.table.pageList', 'bs.table.columns', 'bs.table.searchText', 'bs.table.filterControl', 'bs.table.filterBy', 'bs.table.reorderColumns'],
+ cookiesEnabled: ['bs.table.sortOrder', 'bs.table.sortName', 'bs.table.sortPriority', 'bs.table.pageNumber', 'bs.table.pageList', 'bs.table.columns', 'bs.table.searchText', 'bs.table.filterControl', 'bs.table.filterBy', 'bs.table.reorderColumns', 'bs.table.cardView'],
cookieStorage: 'cookieStorage',
// localStorage, sessionStorage, customStorage
cookieCustomStorageGet: null,
@@ -13232,35 +13408,57 @@
if (this.options.sortName === undefined || this.options.sortOrder === undefined) {
UtilsCookie.deleteCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortName);
UtilsCookie.deleteCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortOrder);
- return;
+ } else {
+ this.options.sortPriority = null;
+ UtilsCookie.deleteCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortPriority);
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortOrder, this.options.sortOrder);
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortName, this.options.sortName);
}
-
- UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortOrder, this.options.sortOrder);
- UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortName, this.options.sortName);
}
}, {
- key: "onPageNumber",
- value: function onPageNumber() {
+ key: "onMultipleSort",
+ value: function onMultipleSort() {
var _get5;
for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
args[_key4] = arguments[_key4];
}
- (_get5 = _get(_getPrototypeOf(_class.prototype), "onPageNumber", this)).call.apply(_get5, [this].concat(args));
+ (_get5 = _get(_getPrototypeOf(_class.prototype), "onMultipleSort", this)).call.apply(_get5, [this].concat(args));
- UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
+ if (this.options.sortPriority === undefined) {
+ UtilsCookie.deleteCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortPriority);
+ } else {
+ this.options.sortName = undefined;
+ this.options.sortOrder = undefined;
+ UtilsCookie.deleteCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortName);
+ UtilsCookie.deleteCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortOrder);
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortPriority, JSON.stringify(this.options.sortPriority));
+ }
}
}, {
- key: "onPageListChange",
- value: function onPageListChange() {
+ key: "onPageNumber",
+ value: function onPageNumber() {
var _get6;
for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
args[_key5] = arguments[_key5];
}
- (_get6 = _get(_getPrototypeOf(_class.prototype), "onPageListChange", this)).call.apply(_get6, [this].concat(args));
+ (_get6 = _get(_getPrototypeOf(_class.prototype), "onPageNumber", this)).call.apply(_get6, [this].concat(args));
+
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
+ }
+ }, {
+ key: "onPageListChange",
+ value: function onPageListChange() {
+ var _get7;
+
+ for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+ args[_key6] = arguments[_key6];
+ }
+
+ (_get7 = _get(_getPrototypeOf(_class.prototype), "onPageListChange", this)).call.apply(_get7, [this].concat(args));
UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageList, this.options.pageSize);
UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
@@ -13268,39 +13466,39 @@
}, {
key: "onPagePre",
value: function onPagePre() {
- var _get7;
-
- for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
- args[_key6] = arguments[_key6];
- }
-
- (_get7 = _get(_getPrototypeOf(_class.prototype), "onPagePre", this)).call.apply(_get7, [this].concat(args));
-
- UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
- }
- }, {
- key: "onPageNext",
- value: function onPageNext() {
var _get8;
for (var _len7 = arguments.length, args = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
args[_key7] = arguments[_key7];
}
- (_get8 = _get(_getPrototypeOf(_class.prototype), "onPageNext", this)).call.apply(_get8, [this].concat(args));
+ (_get8 = _get(_getPrototypeOf(_class.prototype), "onPagePre", this)).call.apply(_get8, [this].concat(args));
UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
}
}, {
- key: "_toggleColumn",
- value: function _toggleColumn() {
+ key: "onPageNext",
+ value: function onPageNext() {
var _get9;
for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
args[_key8] = arguments[_key8];
}
- (_get9 = _get(_getPrototypeOf(_class.prototype), "_toggleColumn", this)).call.apply(_get9, [this].concat(args));
+ (_get9 = _get(_getPrototypeOf(_class.prototype), "onPageNext", this)).call.apply(_get9, [this].concat(args));
+
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
+ }
+ }, {
+ key: "_toggleColumn",
+ value: function _toggleColumn() {
+ var _get10;
+
+ for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
+ args[_key9] = arguments[_key9];
+ }
+
+ (_get10 = _get(_getPrototypeOf(_class.prototype), "_toggleColumn", this)).call.apply(_get10, [this].concat(args));
UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns().map(function (column) {
return column.field;
@@ -13309,18 +13507,25 @@
}, {
key: "_toggleAllColumns",
value: function _toggleAllColumns() {
- var _get10;
+ var _get11;
- for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
- args[_key9] = arguments[_key9];
+ for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
+ args[_key10] = arguments[_key10];
}
- (_get10 = _get(_getPrototypeOf(_class.prototype), "_toggleAllColumns", this)).call.apply(_get10, [this].concat(args));
+ (_get11 = _get(_getPrototypeOf(_class.prototype), "_toggleAllColumns", this)).call.apply(_get11, [this].concat(args));
UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns().map(function (column) {
return column.field;
})));
}
+ }, {
+ key: "toggleView",
+ value: function toggleView() {
+ _get(_getPrototypeOf(_class.prototype), "toggleView", this).call(this);
+
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.cardView, this.options.cardView);
+ }
}, {
key: "selectPage",
value: function selectPage(page) {
@@ -13342,17 +13547,17 @@
}, {
key: "initHeader",
value: function initHeader() {
- var _get11;
+ var _get12;
if (this.options.reorderableColumns) {
this.columnsSortOrder = JSON.parse(UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.reorderColumns));
}
- for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
- args[_key10] = arguments[_key10];
+ for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
+ args[_key11] = arguments[_key11];
}
- (_get11 = _get(_getPrototypeOf(_class.prototype), "initHeader", this)).call.apply(_get11, [this].concat(args));
+ (_get12 = _get(_getPrototypeOf(_class.prototype), "initHeader", this)).call.apply(_get12, [this].concat(args));
}
}, {
key: "persistReorderColumnsState",
@@ -13362,13 +13567,13 @@
}, {
key: "filterBy",
value: function filterBy() {
- var _get12;
+ var _get13;
- for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
- args[_key11] = arguments[_key11];
+ for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
+ args[_key12] = arguments[_key12];
}
- (_get12 = _get(_getPrototypeOf(_class.prototype), "filterBy", this)).call.apply(_get12, [this].concat(args));
+ (_get13 = _get(_getPrototypeOf(_class.prototype), "filterBy", this)).call.apply(_get13, [this].concat(args));
UtilsCookie.setCookie(this, UtilsCookie.cookieIds.filterBy, JSON.stringify(this.filterColumns));
}
@@ -13390,9 +13595,11 @@
var sortOrderCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortOrder);
var sortOrderNameCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortName);
+ var sortPriorityCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.sortPriority);
var pageNumberCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.pageNumber);
var pageListCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.pageList);
var searchTextCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.searchText);
+ var cardViewCookie = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.cardView);
var columnsCookieValue = UtilsCookie.getCookie(this, this.options.cookieIdTable, UtilsCookie.cookieIds.columns);
if (typeof columnsCookieValue === 'boolean' && !columnsCookieValue) {
@@ -13405,18 +13612,42 @@
columnsCookie = JSON.parse(columnsCookieValue);
} catch (e) {
throw new Error('Could not parse the json of the columns cookie!', columnsCookieValue);
+ }
+
+ try {
+ sortPriorityCookie = JSON.parse(sortPriorityCookie);
+ } catch (e) {
+ throw new Error('Could not parse the json of the sortPriority cookie!', sortPriorityCookie);
} // sortOrder
- this.options.sortOrder = sortOrderCookie ? sortOrderCookie : this.options.sortOrder; // sortName
+ this.options.sortOrder = undefined; // sortName
+
+ this.options.sortName = undefined;
+
+ if (!sortPriorityCookie) {
+ // sortOrder
+ this.options.sortOrder = sortOrderCookie ? sortOrderCookie : this.options.sortOrder; // sortName
+
+ this.options.sortName = sortOrderNameCookie ? sortOrderNameCookie : this.options.sortName;
+ } // sortPriority
+
+
+ this.options.sortPriority = sortPriorityCookie ? sortPriorityCookie : this.options.sortPriority;
+
+ if (this.options.sortOrder || this.options.sortName) {
+ // sortPriority
+ this.options.sortPriority = null;
+ } // pageNumber
- this.options.sortName = sortOrderNameCookie ? sortOrderNameCookie : this.options.sortName; // pageNumber
this.options.pageNumber = pageNumberCookie ? +pageNumberCookie : this.options.pageNumber; // pageSize
this.options.pageSize = pageListCookie ? pageListCookie === this.options.formatAllRows() ? pageListCookie : +pageListCookie : this.options.pageSize; // searchText
- this.options.searchText = searchTextCookie ? searchTextCookie : '';
+ this.options.searchText = searchTextCookie ? searchTextCookie : ''; // cardView
+
+ this.options.cardView = cardViewCookie === 'true' ? cardViewCookie : false;
if (columnsCookie) {
var _iterator = _createForOfIteratorHelper(this.columns),
@@ -13425,7 +13656,7 @@
try {
var _loop = function _loop() {
var column = _step.value;
- column.visible = columnsCookie.filter(function (columnField) {
+ var filteredColumns = columnsCookie.filter(function (columnField) {
if (_this.isSelectionColumn(column)) {
return true;
}
@@ -13441,7 +13672,8 @@
}
return columnField === column.field;
- }).length > 0 || !column.switchable;
+ });
+ column.visible = (filteredColumns.length > 0 || !column.switchable) && column.visible;
};
for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -13717,9 +13949,10 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global_1 =
- /* global globalThis -- safe */
+ // eslint-disable-next-line es/no-global-this -- safe
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
+ // eslint-disable-next-line no-restricted-globals -- safe
check(typeof self == 'object' && self) ||
check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
// eslint-disable-next-line no-new-func -- fallback
@@ -13735,21 +13968,23 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// Detect IE8's incomplete defineProperty implementation
var descriptors = !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7;
});
- var nativePropertyIsEnumerable = {}.propertyIsEnumerable;
+ var $propertyIsEnumerable = {}.propertyIsEnumerable;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
// Nashorn ~ JDK8 bug
- var NASHORN_BUG = getOwnPropertyDescriptor$1 && !nativePropertyIsEnumerable.call({ 1: 2 }, 1);
+ var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
// `Object.prototype.propertyIsEnumerable` method implementation
// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
var f$4 = NASHORN_BUG ? function propertyIsEnumerable(V) {
var descriptor = getOwnPropertyDescriptor$1(this, V);
return !!descriptor && descriptor.enumerable;
- } : nativePropertyIsEnumerable;
+ } : $propertyIsEnumerable;
var objectPropertyIsEnumerable = {
f: f$4
@@ -13829,20 +14064,22 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// Thank's IE8 for his funny defineProperty
var ie8DomDefine = !descriptors && !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- requied for testing
return Object.defineProperty(documentCreateElement('div'), 'a', {
get: function () { return 7; }
}).a != 7;
});
- var nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+ var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
// `Object.getOwnPropertyDescriptor` method
// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
- var f$3 = descriptors ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+ var f$3 = descriptors ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
O = toIndexedObject(O);
P = toPrimitive(P, true);
if (ie8DomDefine) try {
- return nativeGetOwnPropertyDescriptor(O, P);
+ return $getOwnPropertyDescriptor(O, P);
} catch (error) { /* empty */ }
if (has$1(O, P)) return createPropertyDescriptor(!objectPropertyIsEnumerable.f.call(O, P), O[P]);
};
@@ -13857,16 +14094,17 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
} return it;
};
- var nativeDefineProperty = Object.defineProperty;
+ // eslint-disable-next-line es/no-object-defineproperty -- safe
+ var $defineProperty = Object.defineProperty;
// `Object.defineProperty` method
// https://tc39.es/ecma262/#sec-object.defineproperty
- var f$2 = descriptors ? nativeDefineProperty : function defineProperty(O, P, Attributes) {
+ var f$2 = descriptors ? $defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
P = toPrimitive(P, true);
anObject(Attributes);
if (ie8DomDefine) try {
- return nativeDefineProperty(O, P, Attributes);
+ return $defineProperty(O, P, Attributes);
} catch (error) { /* empty */ }
if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported');
if ('value' in Attributes) O[P] = Attributes.value;
@@ -13916,7 +14154,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
(module.exports = function (key, value) {
return sharedStore[key] || (sharedStore[key] = value !== undefined ? value : {});
})('versions', []).push({
- version: '3.9.1',
+ version: '3.10.1',
mode: 'global',
copyright: '© 2021 Denis Pushkarev (zloirock.ru)'
});
@@ -14128,6 +14366,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `Object.getOwnPropertyNames` method
// https://tc39.es/ecma262/#sec-object.getownpropertynames
+ // eslint-disable-next-line es/no-object-getownpropertynames -- safe
var f$1 = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return objectKeysInternal(O, hiddenKeys);
};
@@ -14136,6 +14375,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
f: f$1
};
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
var f = Object.getOwnPropertySymbols;
var objectGetOwnPropertySymbols = {
@@ -14235,6 +14475,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `IsArray` abstract operation
// https://tc39.es/ecma262/#sec-isarray
+ // eslint-disable-next-line es/no-array-isarray -- safe
var isArray = Array.isArray || function isArray(arg) {
return classofRaw(arg) == 'Array';
};
@@ -14273,16 +14514,19 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
var engineV8Version = version && +version;
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
var nativeSymbol = !!Object.getOwnPropertySymbols && !fails(function () {
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- required for testing
return !Symbol.sham &&
// Chrome 38 Symbol has incorrect toString conversion
// Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
(engineIsNode ? engineV8Version === 38 : engineV8Version > 37 && engineV8Version < 41);
});
+ /* eslint-disable es/no-symbol -- required for testing */
+
+
var useSymbolAsUid = nativeSymbol
- /* global Symbol -- safe */
&& !Symbol.sham
&& typeof Symbol.iterator == 'symbol';
@@ -14480,12 +14724,14 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `Object.keys` method
// https://tc39.es/ecma262/#sec-object.keys
+ // eslint-disable-next-line es/no-object-keys -- safe
var objectKeys = Object.keys || function keys(O) {
return objectKeysInternal(O, enumBugKeys);
};
// `Object.defineProperties` method
// https://tc39.es/ecma262/#sec-object.defineproperties
+ // eslint-disable-next-line es/no-object-defineproperties -- safe
var objectDefineProperties = descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = objectKeys(Properties);
@@ -14764,8 +15010,11 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
if (top > start && top <= end) {
// ensure clone and source column widths are the same
- this.$stickyHeader.find('tr:eq(0)').find('th').each(function (index, el) {
- $__default['default'](el).css('min-width', _this4.$header.find('tr:eq(0)').find('th').eq(index).css('width'));
+ this.$stickyHeader.find('tr').each(function (indexRows, rows) {
+ var columns = $__default['default'](rows).find('th');
+ columns.each(function (indexColumns, celd) {
+ $__default['default'](celd).css('min-width', _this4.$header.find("tr:eq(".concat(indexRows, ")")).find("th:eq(".concat(indexColumns, ")")).css('width'));
+ });
}); // match bootstrap table style
this.$stickyContainer.show().addClass('fix-sticky fixed-table-container'); // stick it in position
@@ -15098,9 +15347,10 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global_1 =
- /* global globalThis -- safe */
+ // eslint-disable-next-line es/no-global-this -- safe
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
+ // eslint-disable-next-line no-restricted-globals -- safe
check(typeof self == 'object' && self) ||
check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
// eslint-disable-next-line no-new-func -- fallback
@@ -15116,21 +15366,23 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// Detect IE8's incomplete defineProperty implementation
var descriptors = !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7;
});
- var nativePropertyIsEnumerable = {}.propertyIsEnumerable;
+ var $propertyIsEnumerable = {}.propertyIsEnumerable;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
// Nashorn ~ JDK8 bug
- var NASHORN_BUG = getOwnPropertyDescriptor$1 && !nativePropertyIsEnumerable.call({ 1: 2 }, 1);
+ var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
// `Object.prototype.propertyIsEnumerable` method implementation
// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
var f$4 = NASHORN_BUG ? function propertyIsEnumerable(V) {
var descriptor = getOwnPropertyDescriptor$1(this, V);
return !!descriptor && descriptor.enumerable;
- } : nativePropertyIsEnumerable;
+ } : $propertyIsEnumerable;
var objectPropertyIsEnumerable = {
f: f$4
@@ -15210,20 +15462,22 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// Thank's IE8 for his funny defineProperty
var ie8DomDefine = !descriptors && !fails(function () {
+ // eslint-disable-next-line es/no-object-defineproperty -- requied for testing
return Object.defineProperty(documentCreateElement('div'), 'a', {
get: function () { return 7; }
}).a != 7;
});
- var nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+ // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+ var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
// `Object.getOwnPropertyDescriptor` method
// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
- var f$3 = descriptors ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+ var f$3 = descriptors ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
O = toIndexedObject(O);
P = toPrimitive(P, true);
if (ie8DomDefine) try {
- return nativeGetOwnPropertyDescriptor(O, P);
+ return $getOwnPropertyDescriptor(O, P);
} catch (error) { /* empty */ }
if (has$1(O, P)) return createPropertyDescriptor(!objectPropertyIsEnumerable.f.call(O, P), O[P]);
};
@@ -15238,16 +15492,17 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
} return it;
};
- var nativeDefineProperty = Object.defineProperty;
+ // eslint-disable-next-line es/no-object-defineproperty -- safe
+ var $defineProperty = Object.defineProperty;
// `Object.defineProperty` method
// https://tc39.es/ecma262/#sec-object.defineproperty
- var f$2 = descriptors ? nativeDefineProperty : function defineProperty(O, P, Attributes) {
+ var f$2 = descriptors ? $defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
P = toPrimitive(P, true);
anObject(Attributes);
if (ie8DomDefine) try {
- return nativeDefineProperty(O, P, Attributes);
+ return $defineProperty(O, P, Attributes);
} catch (error) { /* empty */ }
if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported');
if ('value' in Attributes) O[P] = Attributes.value;
@@ -15297,7 +15552,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
(module.exports = function (key, value) {
return sharedStore[key] || (sharedStore[key] = value !== undefined ? value : {});
})('versions', []).push({
- version: '3.9.1',
+ version: '3.10.1',
mode: 'global',
copyright: '© 2021 Denis Pushkarev (zloirock.ru)'
});
@@ -15509,6 +15764,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `Object.getOwnPropertyNames` method
// https://tc39.es/ecma262/#sec-object.getownpropertynames
+ // eslint-disable-next-line es/no-object-getownpropertynames -- safe
var f$1 = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return objectKeysInternal(O, hiddenKeys);
};
@@ -15517,6 +15773,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
f: f$1
};
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
var f = Object.getOwnPropertySymbols;
var objectGetOwnPropertySymbols = {
@@ -15654,10 +15911,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
};
var nativeExec = RegExp.prototype.exec;
- // This always refers to the native implementation, because the
- // String#replace polyfill uses ./fix-regexp-well-known-symbol-logic.js,
- // which loads this file before patching the method.
- var nativeReplace = String.prototype.replace;
+ var nativeReplace = shared('native-string-replace', String.prototype.replace);
var patchedExec = nativeExec;
@@ -15766,16 +16020,19 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
var engineV8Version = version && +version;
+ // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
var nativeSymbol = !!Object.getOwnPropertySymbols && !fails(function () {
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- required for testing
return !Symbol.sham &&
// Chrome 38 Symbol has incorrect toString conversion
// Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
(engineIsNode ? engineV8Version === 38 : engineV8Version > 37 && engineV8Version < 41);
});
+ /* eslint-disable es/no-symbol -- required for testing */
+
+
var useSymbolAsUid = nativeSymbol
- /* global Symbol -- safe */
&& !Symbol.sham
&& typeof Symbol.iterator == 'symbol';
@@ -15800,7 +16057,6 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
-
var SPECIES$2 = wellKnownSymbol('species');
var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
@@ -15819,6 +16075,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// IE <= 11 replaces $0 with the whole match, as if it was $&
// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
var REPLACE_KEEPS_$0 = (function () {
+ // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
return 'a'.replace(/./, '$0') === '$0';
})();
@@ -15888,7 +16145,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
) {
var nativeRegExpMethod = /./[SYMBOL];
var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
- if (regexp.exec === regexpExec) {
+ if (regexp.exec === RegExp.prototype.exec) {
if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
// The native String method already delegates to @@method (this
// polyfilled function), leasing to infinite recursion.
@@ -15921,6 +16178,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `SameValue` abstract operation
// https://tc39.es/ecma262/#sec-samevalue
+ // eslint-disable-next-line es/no-object-is -- safe
var sameValue = Object.is || function is(x, y) {
// eslint-disable-next-line no-self-compare -- NaN check
return x === y ? x !== 0 || 1 / x === 1 / y : x != x && y != y;
@@ -15975,6 +16233,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `Object.keys` method
// https://tc39.es/ecma262/#sec-object.keys
+ // eslint-disable-next-line es/no-object-keys -- safe
var objectKeys = Object.keys || function keys(O) {
return objectKeysInternal(O, enumBugKeys);
};
@@ -15985,14 +16244,16 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
return Object(requireObjectCoercible(argument));
};
- var nativeAssign = Object.assign;
+ // eslint-disable-next-line es/no-object-assign -- safe
+ var $assign = Object.assign;
+ // eslint-disable-next-line es/no-object-defineproperty -- required for testing
var defineProperty = Object.defineProperty;
// `Object.assign` method
// https://tc39.es/ecma262/#sec-object.assign
- var objectAssign = !nativeAssign || fails(function () {
+ var objectAssign = !$assign || fails(function () {
// should have correct order of operations (Edge bug)
- if (descriptors && nativeAssign({ b: 1 }, nativeAssign(defineProperty({}, 'a', {
+ if (descriptors && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
enumerable: true,
get: function () {
defineProperty(this, 'b', {
@@ -16004,12 +16265,12 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// should work with symbols and should have deterministic property order (V8 bug)
var A = {};
var B = {};
- /* global Symbol -- required for testing */
+ // eslint-disable-next-line es/no-symbol -- safe
var symbol = Symbol();
var alphabet = 'abcdefghijklmnopqrst';
A[symbol] = 7;
alphabet.split('').forEach(function (chr) { B[chr] = chr; });
- return nativeAssign({}, A)[symbol] != 7 || objectKeys(nativeAssign({}, B)).join('') != alphabet;
+ return $assign({}, A)[symbol] != 7 || objectKeys($assign({}, B)).join('') != alphabet;
}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
var T = toObject(target);
var argumentsLength = arguments.length;
@@ -16027,10 +16288,11 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
if (!descriptors || propertyIsEnumerable.call(S, key)) T[key] = S[key];
}
} return T;
- } : nativeAssign;
+ } : $assign;
// `Object.assign` method
// https://tc39.es/ecma262/#sec-object.assign
+ // eslint-disable-next-line es/no-object-assign -- required for testing
_export({ target: 'Object', stat: true, forced: Object.assign !== objectAssign }, {
assign: objectAssign
});
@@ -16087,6 +16349,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `IsArray` abstract operation
// https://tc39.es/ecma262/#sec-isarray
+ // eslint-disable-next-line es/no-array-isarray -- safe
var isArray = Array.isArray || function isArray(arg) {
return classofRaw(arg) == 'Array';
};
@@ -16177,6 +16440,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
// `Object.defineProperties` method
// https://tc39.es/ecma262/#sec-object.defineproperties
+ // eslint-disable-next-line es/no-object-defineproperties -- safe
var objectDefineProperties = descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = objectKeys(Properties);
@@ -16422,6 +16686,8 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
}
});
+ /* eslint-disable es/no-array-prototype-indexof -- required for testing */
+
var $indexOf = arrayIncludes.indexOf;
@@ -16572,7 +16838,7 @@ if(r.bookProps){v.Props=u;v.Custprops=d}if(r.bookSheets&&typeof i!=="undefined")
},
bootstrap5: {
icons: {
- advancedSearchIcon: 'fa-chevron-down'
+ advancedSearchIcon: 'bi-chevron-down'
},
html: {
modal: "\n \n "
diff --git a/public/js/snipeit.js b/public/js/snipeit.js
index cfa646d9e..81c79c884 100644
--- a/public/js/snipeit.js
+++ b/public/js/snipeit.js
@@ -172,6 +172,36 @@ pieOptions = {
$el.on('click', '.delete-asset', events['click']);
};
+ return {
+ render: render
+ };
+
+ // confirm restore modal
+ Components.modals.confirmRestore = function () {
+ var $el = $('table');
+
+ var events = {
+ 'click': function click(evnt) {
+ var $context = $(this);
+ var $dataConfirmModal = $('#restoreConfirmModal');
+ var href = $context.attr('href');
+ var message = $context.attr('data-content');
+ var title = $context.attr('data-title');
+
+ $('#myModalLabel').text(title);
+ $dataConfirmModal.find('.modal-body').text(message);
+ $('#confirmRestoreForm').attr('action', href);
+ $dataConfirmModal.modal({
+ show: true
+ });
+ return false;
+ }
+ };
+
+ var render = function render() {
+ $el.on('click', '.restore-modal', events['click']);
+ };
+
return {
render: render
};
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index e799f5307..038314dd4 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
{
- "/js/build/app.js": "/js/build/app.js?id=6c5036c859d48a7904ea",
+ "/js/build/app.js": "/js/build/app.js?id=16ac5c8f218827150ce0",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc",
- "/css/build/overrides.css": "/css/build/overrides.css?id=0e07ce3ea6499c4b1858",
- "/css/build/app.css": "/css/build/app.css?id=9e8e65cb121c994114f1",
+ "/css/build/overrides.css": "/css/build/overrides.css?id=b1866ec98d44c0a8ceea",
+ "/css/build/app.css": "/css/build/app.css?id=61d5535cb27cce41d422",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=65ca7a34198fa16ba846",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=83271cb3576583918804",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=d81888449b72ecd8dd24",
@@ -18,15 +18,15 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=efda2335fa5243175850",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c24716a423d375902723",
- "/css/dist/all.css": "/css/dist/all.css?id=faf79327f38c87dd2894",
+ "/css/dist/all.css": "/css/dist/all.css?id=3480eded2be4cd65a83e",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
- "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e",
+ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e",
"/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c",
- "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=867755a1544f6c0ea828",
- "/js/dist/all.js": "/js/dist/all.js?id=3612a8d74beac5d5cf2d",
+ "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=0f09ee116517a9573dd0",
+ "/js/dist/all.js": "/js/dist/all.js?id=fbc9a3fb41192f2724e8",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6e35fb4cb2f1063b3047",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133",
diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
index 83970614e..86a83ace2 100644
--- a/resources/assets/js/components/importer/importer-file.vue
+++ b/resources/assets/js/components/importer/importer-file.vue
@@ -158,6 +158,7 @@
consumables: [
{id: 'item_no', text: "Item Number"},
{id: 'model_number', text: "Model Number"},
+ {id: 'min_amt', text: "Minimum Quantity"},
],
licenses: [
{id: 'asset_tag', text: 'Assigned To Asset'},
@@ -216,6 +217,7 @@
.concat(this.columnOptions.accessories)
.sort(sorter);
case 'consumable':
+ console.log('Returned consumable');
return this.columnOptions.general
.concat(this.columnOptions.consumables)
.sort(sorter);
@@ -309,4 +311,4 @@
select2: require('../select2.vue').default
}
}
-
\ No newline at end of file
+
diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js
index 880260508..f55d16a87 100755
--- a/resources/assets/js/snipeit.js
+++ b/resources/assets/js/snipeit.js
@@ -84,6 +84,37 @@ var baseUrl = $('meta[name="baseUrl"]').attr('content');
var Components = {};
Components.modals = {};
+ // confirm restore modal
+ Components.modals.confirmRestore = function() {
+ var $el = $('table');
+
+ var events = {
+ 'click': function(evnt) {
+ var $context = $(this);
+ var $restoreConfirmModal = $('#restoreConfirmModal');
+ var href = $context.attr('href');
+ var message = $context.attr('data-content');
+ var title = $context.attr('data-title');
+
+ $('#restoreConfirmModalLabel').text(title);
+ $restoreConfirmModal.find('.modal-body').text(message);
+ $('#restoreForm').attr('action', href);
+ $restoreConfirmModal.modal({
+ show: true
+ });
+ return false;
+ }
+ };
+
+ var render = function() {
+ $el.on('click', '.restore-asset', events['click']);
+ };
+
+ return {
+ render: render
+ };
+ };
+
// confirm delete modal
Components.modals.confirmDelete = function() {
var $el = $('table');
@@ -121,6 +152,7 @@ var baseUrl = $('meta[name="baseUrl"]').attr('content');
* Component definition stays out of load event, execution only happens.
*/
$(function() {
+ new Components.modals.confirmRestore().render();
new Components.modals.confirmDelete().render();
});
}(jQuery, window.snipeit.settings));
@@ -301,11 +333,11 @@ $(document).ready(function () {
});
// makes sure we're not selecting the same thing twice for multiples
- var filteredResponse = response.items.filter(function(item) {
+ var filteredResponse = response.results.filter(function(item) {
return currentlySelected.indexOf(+item.id) < 0;
});
- var first = (currentlySelected.length > 0) ? filteredResponse[0] : response.items[0];
+ var first = (currentlySelected.length > 0) ? filteredResponse[0] : response.results[0];
if(first && first.id) {
first.selected = true;
@@ -519,7 +551,7 @@ $(document).ready(function () {
for (var i = 0; i < this.files.length; i++) {
total_size += this.files[i].size;
- $(id + '-info').append('' + this.files[i].name + ' (' + formatBytes(this.files[i].size) + ') ');
+ $(id + '-info').append('' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ') ');
}
console.log('Max size is: ' + max_size);
@@ -540,6 +572,9 @@ $(document).ready(function () {
});
+function htmlEntities(str) {
+ return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"');
+}
@@ -565,4 +600,4 @@ $(document).ready(function () {
});
};
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 122302513..210d59274 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -144,6 +144,8 @@ a.accordion-header {
.main-header .sidebar-toggle:before {
content: "\f0c9";
+ font-weight: 900;
+ font-family: 'Font Awesome\ 5 Free';
}
.direct-chat-contacts {
diff --git a/resources/lang/af/admin/depreciations/general.php b/resources/lang/af/admin/depreciations/general.php
index 7ee137cd7..59bbb71c3 100644
--- a/resources/lang/af/admin/depreciations/general.php
+++ b/resources/lang/af/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Waardevermindering Naam',
'number_of_months' => 'Aantal maande',
'update' => 'Werk waardevermindering op',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/af/admin/hardware/general.php b/resources/lang/af/admin/hardware/general.php
index 750335389..de5c21786 100644
--- a/resources/lang/af/admin/hardware/general.php
+++ b/resources/lang/af/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Klone Bate',
'deployable' => 'verbintenis',
- 'deleted' => 'Hierdie bate is verwyder. Klik hier om dit te herstel.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Wysig bate',
- 'model_deleted' => 'Hierdie batesmodel is uitgevee. Jy moet die model herstel voordat jy die Bate kan herstel.
Klik hier om die model te herstel.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'versoek',
'restore' => 'Herstel bate',
diff --git a/resources/lang/af/admin/models/general.php b/resources/lang/af/admin/models/general.php
index 5274b166e..dd1a0e87a 100644
--- a/resources/lang/af/admin/models/general.php
+++ b/resources/lang/af/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Oor Asset Models',
'about_models_text' => 'Batemodelle is \'n manier om identiese bates te groepeer. "MBP 2013", "IPhone 6s", ens.',
- 'deleted' => 'Hierdie model is verwyder. Klik hier om dit te herstel.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
index 289640e9d..aa286fde5 100644
--- a/resources/lang/af/general.php
+++ b/resources/lang/af/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Verwyder Maatskappyvereniging',
'reports' => 'Berigte',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'versoek',
'request_canceled' => 'Versoek gekanselleer',
'save' => 'Save',
diff --git a/resources/lang/am/admin/depreciations/general.php b/resources/lang/am/admin/depreciations/general.php
index 1fca0e2cb..a5dec994c 100644
--- a/resources/lang/am/admin/depreciations/general.php
+++ b/resources/lang/am/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return array(
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
);
diff --git a/resources/lang/am/admin/hardware/general.php b/resources/lang/am/admin/hardware/general.php
index f1fcd4731..af2be65fc 100644
--- a/resources/lang/am/admin/hardware/general.php
+++ b/resources/lang/am/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/am/admin/models/general.php b/resources/lang/am/admin/models/general.php
index 3281cfe0f..d2d77e0e8 100644
--- a/resources/lang/am/admin/models/general.php
+++ b/resources/lang/am/admin/models/general.php
@@ -3,7 +3,7 @@
return array(
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/am/general.php b/resources/lang/am/general.php
index 539a01a13..446957c9a 100644
--- a/resources/lang/am/general.php
+++ b/resources/lang/am/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/ar/admin/depreciations/general.php b/resources/lang/ar/admin/depreciations/general.php
index 48342e87d..aa8f97bae 100644
--- a/resources/lang/ar/admin/depreciations/general.php
+++ b/resources/lang/ar/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'اسم الاستهلاك',
'number_of_months' => 'عدد الأشهر',
'update' => 'تحديث الاستهلاك',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ar/admin/hardware/general.php b/resources/lang/ar/admin/hardware/general.php
index d55ff5427..1f72b91e0 100644
--- a/resources/lang/ar/admin/hardware/general.php
+++ b/resources/lang/ar/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'اخراج الأصل',
'clone' => 'استنساخ الأصل',
'deployable' => 'قابل للتوزيع',
- 'deleted' => 'تم حذف هذا الأصل. انقر هنا لاستعادته .',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'تعديل الأصل',
- 'model_deleted' => 'تم حذف موديل الأصل هذا. يجب عليك استعادة الموديل قبل أن تتمكن من استعادة الأصل.
انقر هنا لاستعادة الموديل.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'قابل للطلب',
'requested' => 'تم الطلب',
'restore' => 'استعادة الأصل',
diff --git a/resources/lang/ar/admin/models/general.php b/resources/lang/ar/admin/models/general.php
index 4d6c5463a..24ee0d959 100644
--- a/resources/lang/ar/admin/models/general.php
+++ b/resources/lang/ar/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'حول موديلات الأصول',
'about_models_text' => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.',
- 'deleted' => 'تم حذف هذا الموديل. انقر هنا لاستعادته .',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'حذف موديلات الاصول بالجملة',
'bulk_delete_help' => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
'bulk_delete_warn' => 'أنت على وشك حذف :model_count من موديلات الأصول.',
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
index 656d20d24..0b9980e29 100644
--- a/resources/lang/ar/general.php
+++ b/resources/lang/ar/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'إزالة جمعية الشركة',
'reports' => 'التقارير',
'restored' => 'المعاد',
+ 'restore' => 'Restore',
'requested' => 'طلب',
'request_canceled' => 'تم إلغاء الطلب',
'save' => 'حفظ',
diff --git a/resources/lang/bg/admin/depreciations/general.php b/resources/lang/bg/admin/depreciations/general.php
index 7fd6a938b..2cd93e808 100644
--- a/resources/lang/bg/admin/depreciations/general.php
+++ b/resources/lang/bg/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Амортизация',
'number_of_months' => 'Брой месеци',
'update' => 'Обновяване на амортизация',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/bg/admin/hardware/general.php b/resources/lang/bg/admin/hardware/general.php
index 879c621a9..86547bd9a 100644
--- a/resources/lang/bg/admin/hardware/general.php
+++ b/resources/lang/bg/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Проверка на активите',
'clone' => 'Копиране на актив',
'deployable' => 'Може да бъде предоставен',
- 'deleted' => 'Активът беше изтрит. Възстановяване.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Редакция на актив',
- 'model_deleted' => 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.
Възстановяване на модел.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Може да бъде изискван',
'requested' => 'Изискан',
'restore' => 'Възстановяване на актив',
diff --git a/resources/lang/bg/admin/models/general.php b/resources/lang/bg/admin/models/general.php
index 8a3abef6e..2bce3d912 100644
--- a/resources/lang/bg/admin/models/general.php
+++ b/resources/lang/bg/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Относно модели на актив',
'about_models_text' => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.',
- 'deleted' => 'Моделът беше изтрит. Възстановяване.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Масово изтриване на модели на активите',
'bulk_delete_help' => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
'bulk_delete_warn' => 'Ще бъдат изтрити :model_count модели на активи.',
diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php
index 7547bfb43..87a9a78b5 100644
--- a/resources/lang/bg/general.php
+++ b/resources/lang/bg/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Премахване на асоциация към компания',
'reports' => 'Справки',
'restored' => 'възстановени',
+ 'restore' => 'Restore',
'requested' => 'Изискан',
'request_canceled' => 'Заявка отменена',
'save' => 'Запис',
diff --git a/resources/lang/ca/admin/depreciations/general.php b/resources/lang/ca/admin/depreciations/general.php
index 1fca0e2cb..a5dec994c 100644
--- a/resources/lang/ca/admin/depreciations/general.php
+++ b/resources/lang/ca/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return array(
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
);
diff --git a/resources/lang/ca/admin/hardware/general.php b/resources/lang/ca/admin/hardware/general.php
index f1fcd4731..af2be65fc 100644
--- a/resources/lang/ca/admin/hardware/general.php
+++ b/resources/lang/ca/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/ca/admin/models/general.php b/resources/lang/ca/admin/models/general.php
index 3281cfe0f..d2d77e0e8 100644
--- a/resources/lang/ca/admin/models/general.php
+++ b/resources/lang/ca/admin/models/general.php
@@ -3,7 +3,7 @@
return array(
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/ca/general.php b/resources/lang/ca/general.php
index 16c9baa15..5eee58d05 100644
--- a/resources/lang/ca/general.php
+++ b/resources/lang/ca/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/cs/admin/depreciations/general.php b/resources/lang/cs/admin/depreciations/general.php
index 2e3496ac1..449088f92 100644
--- a/resources/lang/cs/admin/depreciations/general.php
+++ b/resources/lang/cs/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Jméno amortizace',
'number_of_months' => 'Počet měsíců',
'update' => 'Aktualizovat amortizaci',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/cs/admin/hardware/general.php b/resources/lang/cs/admin/hardware/general.php
index 93e4863b8..6d1b8579a 100644
--- a/resources/lang/cs/admin/hardware/general.php
+++ b/resources/lang/cs/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Pokladní majetek',
'clone' => 'Klonovat majetek',
'deployable' => 'Připraveno k nasazení',
- 'deleted' => 'Toto zařízení bylo odstraněno. Klepněte zde pro jeho obnovení.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Upravit majetek',
- 'model_deleted' => 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, klepněte zde
a obnovte nejdříve jeho model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Lze vyžádat',
'requested' => 'Požadováno',
'restore' => 'Obnovit zařízení',
diff --git a/resources/lang/cs/admin/models/general.php b/resources/lang/cs/admin/models/general.php
index a7fe2793c..71748aa81 100644
--- a/resources/lang/cs/admin/models/general.php
+++ b/resources/lang/cs/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'O modelech majetku',
'about_models_text' => 'Modely majetku jsou způsoby seskupení shodných majetků. "MBP 2013", "iPhone 6s" atd.',
- 'deleted' => 'Model byl vymazán. Klikněte sem pro jeho obnovení.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Hromadné mazání modelů majetku',
'bulk_delete_help' => 'Pomocí zaškrtávacích kolonek potvrďte smazání označených modelů majetku. Modely majetku, ke kterým je přiřazen majetek nemohou být smazány dokud jim přiřazený majetek nebude přeřazen k jinému modulu.',
'bulk_delete_warn' => 'Chystáte se smazat :model_count asset models.',
diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php
index a978a5311..eee066d5e 100644
--- a/resources/lang/cs/general.php
+++ b/resources/lang/cs/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Odstraňte sdružení společnosti',
'reports' => 'Reporty',
'restored' => 'obnoveno',
+ 'restore' => 'Restore',
'requested' => 'Požadováno',
'request_canceled' => 'Žádost zrušena',
'save' => 'Uložit',
diff --git a/resources/lang/cy/admin/depreciations/general.php b/resources/lang/cy/admin/depreciations/general.php
index 5624f9dd4..d676e6cec 100644
--- a/resources/lang/cy/admin/depreciations/general.php
+++ b/resources/lang/cy/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Enw Dibrisiant',
'number_of_months' => 'Nifer o Fisoedd',
'update' => 'Diweddaru Dibrisiant',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/cy/admin/hardware/general.php b/resources/lang/cy/admin/hardware/general.php
index e047f918e..077b5727d 100644
--- a/resources/lang/cy/admin/hardware/general.php
+++ b/resources/lang/cy/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Nodi Asedau Allan',
'clone' => 'Dyblygu Ased',
'deployable' => 'Gellir ei ddefnyddio',
- 'deleted' => 'Mae\'r ased yma wedi dileu. Cliciwch yma i\'w adfer.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Addasu Ased',
- 'model_deleted' => 'Mae\'r model yma o ased wedi\'i dileu. Rhaid i chi adfer y model cyn fedrwch chi adfer y\'r ased.
Cliciwch yma i adfer yr ased.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Ar gael',
'requested' => 'Gofynnwyd amdano',
'restore' => 'Adfer Ased',
diff --git a/resources/lang/cy/admin/models/general.php b/resources/lang/cy/admin/models/general.php
index 645a53163..ecd35826a 100644
--- a/resources/lang/cy/admin/models/general.php
+++ b/resources/lang/cy/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Amdan Modelau',
'about_models_text' => 'Mae modelau o asedau yn ffordd o creu grwp o asedau. "iPhone 7, Samsung TAB 4, ayyb.',
- 'deleted' => 'Mae\'r model yma wedi dileu. Cliciwch yma i\'w adfer.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Dileu Nifer o Modelau',
'bulk_delete_help' => 'Rhowch tic yn y bocsys isod i cadarnhau dileu y model. Nid oes modd dileu modelau sydd hefo asedau yn ei erbyn.',
'bulk_delete_warn' => 'Rydych am dileu :model_count o asedau.',
diff --git a/resources/lang/cy/general.php b/resources/lang/cy/general.php
index 1b8dfaa4e..3eda2bebf 100644
--- a/resources/lang/cy/general.php
+++ b/resources/lang/cy/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Dileu Cymdeithas y Cwmni',
'reports' => 'Adroddiadau',
'restored' => 'wedi adfer',
+ 'restore' => 'Restore',
'requested' => 'Gofynnwyd amdano',
'request_canceled' => 'Cais wedi dileu',
'save' => 'Cadw',
diff --git a/resources/lang/da/admin/depreciations/general.php b/resources/lang/da/admin/depreciations/general.php
index 2fa70f1dd..3a77a799b 100644
--- a/resources/lang/da/admin/depreciations/general.php
+++ b/resources/lang/da/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Afskrivningnavn',
'number_of_months' => 'Antal måneder',
'update' => 'Opdater Afskrivninger',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/da/admin/hardware/general.php b/resources/lang/da/admin/hardware/general.php
index e7f2b1f46..44572d958 100644
--- a/resources/lang/da/admin/hardware/general.php
+++ b/resources/lang/da/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Klonaktiver',
'deployable' => 'Deployable',
- 'deleted' => 'Dette aktiv er blevet slettet. Klik her for at gendanne det.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Rediger aktiv',
- 'model_deleted' => 'Denne aktivmodel er blevet slettet. Du skal gendanne modellen, før du kan gendanne Asset.
Klik her for at gendanne model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'kan anmodes',
'requested' => 'Anmodet',
'restore' => 'Gendan aktiv',
diff --git a/resources/lang/da/admin/models/general.php b/resources/lang/da/admin/models/general.php
index e6fd56632..d7d354449 100644
--- a/resources/lang/da/admin/models/general.php
+++ b/resources/lang/da/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Om aktiv modeller',
'about_models_text' => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.',
- 'deleted' => 'Denne model er blevet slettet. Klik her for at gendanne den.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Slet flere aktivmodeller',
'bulk_delete_help' => 'Brug checkboksene nedenfor til at bekræfte sletning af valgte aktivmodeller. Aktivmodeller med tilknyttede aktiver kan ikke slettes før aktivet er knyttet til en anden model.',
'bulk_delete_warn' => 'Du er ved at slette :model_count aktivmodeller.',
diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php
index 1b5318b1b..af663e5c8 100644
--- a/resources/lang/da/general.php
+++ b/resources/lang/da/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Fjern association med selskab',
'reports' => 'Rapporter',
'restored' => 'gendannet',
+ 'restore' => 'Restore',
'requested' => 'Anmodet',
'request_canceled' => 'Anmodning Annulleret',
'save' => 'Gem',
diff --git a/resources/lang/de/admin/depreciations/general.php b/resources/lang/de/admin/depreciations/general.php
index ed937636f..cf5a44858 100644
--- a/resources/lang/de/admin/depreciations/general.php
+++ b/resources/lang/de/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Abschreibungs Name',
'number_of_months' => 'Anzahl der Monate',
'update' => 'Abschreibung aktualisieren',
+ 'depreciation_min' => 'Minimaler Wert nach Abschreibung'
];
diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php
index 44681ca95..7eaac5bee 100644
--- a/resources/lang/de/admin/hardware/general.php
+++ b/resources/lang/de/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Asset herausgeben',
'clone' => 'Asset duplizieren',
'deployable' => 'Einsetzbar',
- 'deleted' => 'Dieses Asset wurde gelöscht. Zur Wiederherstellung hier klicken.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Asset bearbeiten',
- 'model_deleted' => 'Dieses Asset wurde gelöscht. Sie müssen das Modell Wiederherstellen bevor Sie das Asset Wiederherstellen können
klicken Sie hier um das Modell wiederherzustellen.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Anforderbar',
'requested' => 'Angefordert',
'restore' => 'Asset wiederherstellen',
diff --git a/resources/lang/de/admin/models/general.php b/resources/lang/de/admin/models/general.php
index 6dfda5163..d030b73f9 100644
--- a/resources/lang/de/admin/models/general.php
+++ b/resources/lang/de/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Über Asset-Modelle',
'about_models_text' => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.',
- 'deleted' => 'Dieses Modell wurde gelöscht.klicken Sie hier um es Wiederzuherstellen.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Massenlöschen von Asset-Modellen',
'bulk_delete_help' => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle die noch zugewiesene Assets haben können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderem Asset-Modell zugewiesen werden.',
'bulk_delete_warn' => 'Sie sind im Begriff :model_count Asset-Modelle zu löschen.',
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
index 7fc9da1b8..2522da9c7 100644
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Firmenzuordnung entfernen',
'reports' => 'Berichte',
'restored' => 'wiederhergestellt',
+ 'restore' => 'Restore',
'requested' => 'Angefragt',
'request_canceled' => 'Anfrage abgebrochen',
'save' => 'Speichern',
diff --git a/resources/lang/el/admin/depreciations/general.php b/resources/lang/el/admin/depreciations/general.php
index dbde844ef..02578a214 100644
--- a/resources/lang/el/admin/depreciations/general.php
+++ b/resources/lang/el/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Όνομα απόσβεσης',
'number_of_months' => 'Αριθμός των μηνών',
'update' => 'Ενημέρωση αποσβέσεων',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/el/admin/hardware/general.php b/resources/lang/el/admin/hardware/general.php
index 8a876010d..07b1ea5a4 100644
--- a/resources/lang/el/admin/hardware/general.php
+++ b/resources/lang/el/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Ταμείο ελέγχου',
'clone' => 'Κλώνος χρήστη',
'deployable' => 'Προς ανάπτυξη',
- 'deleted' => 'Αυτό το στοιχείο έχει διαγραφεί. Κάντε κλικ εδώ για να την επαναφέρετε.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Επεξεργασία παγίων',
- 'model_deleted' => 'Αυτό το μοντέλο περιουσιακών στοιχείων έχει διαγραφεί. Πρέπει να επαναφέρετε το μοντέλο για να μπορέσετε να επαναφέρετε το Asset.
Κάντε κλικ εδώ για να επαναφέρετε το μοντέλο.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Επαναληπτικό',
'requested' => 'Ζητήθηκαν',
'restore' => 'Επαναφορά παγίου',
diff --git a/resources/lang/el/admin/models/general.php b/resources/lang/el/admin/models/general.php
index 08a2124b9..000ceb825 100644
--- a/resources/lang/el/admin/models/general.php
+++ b/resources/lang/el/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Σχετικά με τους τύπους παγίων',
'about_models_text' => 'Τα μοντέλα περιουσιακών στοιχείων είναι ένας τρόπος για να ομαδοποιήσετε ταυτόσημα περιουσιακά στοιχεία "MBP 2013", "IPhone 6s" κ.λπ.',
- 'deleted' => 'Αυτό το μοντέλο έχει διαγραφεί. Κάντε κλικ εδώ για να την επαναφέρετε.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Μαζική διαγραφή μοντέλου Asset',
'bulk_delete_help' => 'Χρησιμοποιήστε τα παρακάτω πλαίσια ελέγχου για να επιβεβαιώσετε τη διαγραφή των επιλεγμένων μοντέλων στοιχείων. Τα μοντέλα στοιχείων που έχουν στοιχεία που σχετίζονται με αυτά δεν μπορούν να διαγραφούν έως ότου τα στοιχεία συσχετιστούν με διαφορετικό μοντέλο.',
'bulk_delete_warn' => 'Πρόκειται να διαγράψετε: asset_count περιουσιακών στοιχείων.',
diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php
index 59ac7bb68..286f7a87f 100644
--- a/resources/lang/el/general.php
+++ b/resources/lang/el/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Κατάργηση σύνδεσης εταιρείας',
'reports' => 'Αναφορές',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Ζητήθηκαν',
'request_canceled' => 'Το αίτημα ακυρώθηκε',
'save' => 'Αποθήκευση',
diff --git a/resources/lang/en-GB/admin/depreciations/general.php b/resources/lang/en-GB/admin/depreciations/general.php
index e0b02c009..e6c86b9ff 100644
--- a/resources/lang/en-GB/admin/depreciations/general.php
+++ b/resources/lang/en-GB/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/en-GB/admin/hardware/general.php b/resources/lang/en-GB/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/en-GB/admin/hardware/general.php
+++ b/resources/lang/en-GB/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/en-GB/admin/models/general.php b/resources/lang/en-GB/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/en-GB/admin/models/general.php
+++ b/resources/lang/en-GB/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index a5ae8a269..f1ee4504c 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -14,7 +14,7 @@ return array(
'alerts_enabled' => 'Alerts Enabled',
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
- 'allow_user_skin' => 'Erlaube Benutzer Skin',
+ 'allow_user_skin' => 'Allow User Skin',
'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
'asset_ids' => 'Asset IDs',
'audit_interval' => 'Audit Interval',
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index b26a01f69..46c672b3d 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/en-ID/admin/depreciations/general.php b/resources/lang/en-ID/admin/depreciations/general.php
index ca716e652..1d7883927 100644
--- a/resources/lang/en-ID/admin/depreciations/general.php
+++ b/resources/lang/en-ID/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nama Penyusutan',
'number_of_months' => 'Jumlah Bulan',
'update' => 'Perbarui pengurangan',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php
index 5521cebf1..ed2e3e202 100644
--- a/resources/lang/en-ID/admin/hardware/general.php
+++ b/resources/lang/en-ID/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Periksa aset',
'clone' => 'Gandakan aset',
'deployable' => 'Bisa dicairkan',
- 'deleted' => 'Aset ini telah dihapus Klik di sini untuk memulihkannya.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'Model Aset ini telah dihapus. Anda harus mengembalikan model sebelum mengembalikan Aset.
Klik di sini untuk memulihkan modelnya.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Permintaan',
'requested' => 'Diminta',
'restore' => 'Kembalikan Aset',
diff --git a/resources/lang/en-ID/admin/models/general.php b/resources/lang/en-ID/admin/models/general.php
index 21cf9ca3d..06f08ced7 100644
--- a/resources/lang/en-ID/admin/models/general.php
+++ b/resources/lang/en-ID/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Tentang Model Aset',
'about_models_text' => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.',
- 'deleted' => 'Model ini telah dihapus. Klik di sini untuk memulihkannya.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk hapus model aset',
'bulk_delete_help' => 'Gunakan kotak centang di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.',
'bulk_delete_warn' => 'Anda akan menghapus: model aset model_count.',
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 0ff5592c5..9907d313d 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Hapus Asosiasi Perusahaan',
'reports' => 'Laporan',
'restored' => 'dikembalikan',
+ 'restore' => 'Restore',
'requested' => 'Diminta',
'request_canceled' => 'Permintaan dibatalkan',
'save' => 'Simpan',
diff --git a/resources/lang/en/admin/categories/general.php b/resources/lang/en/admin/categories/general.php
index e9fdcf992..b4b428c6b 100644
--- a/resources/lang/en/admin/categories/general.php
+++ b/resources/lang/en/admin/categories/general.php
@@ -17,7 +17,7 @@ return [
'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
'update' => 'Update Category',
'use_default_eula' => 'Use the primary default EULA instead.',
- 'use_default_eula_column' => 'Use default EULA',
'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.',
+ 'use_default_eula_column' => 'Use default EULA',
];
diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/en/admin/hardware/general.php
+++ b/resources/lang/en/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/en/admin/models/general.php b/resources/lang/en/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/en/admin/models/general.php
+++ b/resources/lang/en/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 96e9baeb9..ca028be15 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -62,8 +62,6 @@ return [
'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ',
'laravel' => 'Laravel Version',
'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate',
- 'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
- 'ldap_client_tls_key' => 'LDAP Client-Side TLS key',
'ldap_enabled' => 'LDAP enabled',
'ldap_integration' => 'LDAP Integration',
'ldap_settings' => 'LDAP Settings',
diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php
index c859e63a2..ff9f38317 100644
--- a/resources/lang/en/admin/users/message.php
+++ b/resources/lang/en/admin/users/message.php
@@ -15,6 +15,7 @@ return [
'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
'password_reset_sent' => 'A password reset link has been sent to :email!',
+
'success' => [
'create' => 'User was successfully created.',
'update' => 'User was successfully updated.',
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 6a0971cb0..c16d464da 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -113,6 +113,8 @@
'image' => 'Image',
'image_delete' => 'Delete Image',
'image_upload' => 'Upload Image',
+ 'filetypes_accepted_help' => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
+ 'filetypes_size_help' => 'Max upload size allowed is :size.',
'image_filetypes_help' => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
'import' => 'Import',
'importing' => 'Importing',
@@ -177,6 +179,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php
index 6471289e0..db5e15713 100644
--- a/resources/lang/en/mail.php
+++ b/resources/lang/en/mail.php
@@ -60,7 +60,7 @@ return [
'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
'the_following_item' => 'The following item has been checked in: ',
'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
- 'assets_warrantee_alert' => 'There is :count asset with a warrantee expiring in the next :threshold days.|There are :count assets with warrantees expiring in the next :threshold days.',
+ 'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'to_reset' => 'To reset your :web password, complete this form:',
'type' => 'Type',
diff --git a/resources/lang/es-CO/admin/depreciations/general.php b/resources/lang/es-CO/admin/depreciations/general.php
index 9eba2c65b..5ca4dc75f 100644
--- a/resources/lang/es-CO/admin/depreciations/general.php
+++ b/resources/lang/es-CO/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nombre de Depreciación',
'number_of_months' => 'Número de Meses',
'update' => 'Actualizar Depreciación',
+ 'depreciation_min' => 'Valor mínimo después de depreciación'
];
diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php
index 5e6648e8e..bcf75f450 100644
--- a/resources/lang/es-CO/admin/hardware/general.php
+++ b/resources/lang/es-CO/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Asignar Equipo',
'clone' => 'Clonar Equipo',
'deployable' => 'Desplegable',
- 'deleted' => 'Este equipo ha sido eliminado. Click aquí para restaurarlo.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editar Equipo',
- 'model_deleted' => 'Este modelo de equipo ha sido borrado. Debes restaurar el modelo antes de poder restaurar el equipo.
Hacer click aquí para restaurar el modelo.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Puede Solicitarse',
'requested' => 'Solicitado',
'restore' => 'Restaurar equipo',
diff --git a/resources/lang/es-CO/admin/models/general.php b/resources/lang/es-CO/admin/models/general.php
index 90bca950a..f85f093e8 100644
--- a/resources/lang/es-CO/admin/models/general.php
+++ b/resources/lang/es-CO/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Acerca de modelos de activos',
'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Borrar Grandes Modelos de Activos',
'bulk_delete_help' => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.',
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 04bbf3a59..8a1615469 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Eliminar Asociación de compañía',
'reports' => 'Informes',
'restored' => 'restaurado',
+ 'restore' => 'Restore',
'requested' => 'Solicitado',
'request_canceled' => 'Solicitud Cancelada',
'save' => 'Guardar',
diff --git a/resources/lang/es-ES/admin/depreciations/general.php b/resources/lang/es-ES/admin/depreciations/general.php
index f5f35588a..e68a9fa11 100644
--- a/resources/lang/es-ES/admin/depreciations/general.php
+++ b/resources/lang/es-ES/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nombre Amortización',
'number_of_months' => 'Meses',
'update' => 'Actualizar Amortización',
+ 'depreciation_min' => 'Valor mínimo después de la depreciación'
];
diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php
index a80910ee6..5e5165517 100644
--- a/resources/lang/es-ES/admin/hardware/general.php
+++ b/resources/lang/es-ES/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Activo de pago',
'clone' => 'Clonar Equipo',
'deployable' => 'Desplegable',
- 'deleted' => 'Este equipo ha sido eliminado. Click aqui para restaurarlot.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editar Equipo',
- 'model_deleted' => 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.
Hacer click aquí para restaurar el modelo.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requerible',
'requested' => 'Solicitado',
'restore' => 'Restaurar equipo',
diff --git a/resources/lang/es-ES/admin/models/general.php b/resources/lang/es-ES/admin/models/general.php
index 90bca950a..f85f093e8 100644
--- a/resources/lang/es-ES/admin/models/general.php
+++ b/resources/lang/es-ES/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Acerca de modelos de activos',
'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Borrar Grandes Modelos de Activos',
'bulk_delete_help' => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.',
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 268399c20..bb15ea9c7 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Eliminar Asociación de compañía',
'reports' => 'Informes',
'restored' => 'restaurado',
+ 'restore' => 'Restore',
'requested' => 'Solicitado',
'request_canceled' => 'Solicitud Cancelada',
'save' => 'Guardar',
diff --git a/resources/lang/es-MX/admin/depreciations/general.php b/resources/lang/es-MX/admin/depreciations/general.php
index f5f35588a..80f58e4ab 100644
--- a/resources/lang/es-MX/admin/depreciations/general.php
+++ b/resources/lang/es-MX/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nombre Amortización',
'number_of_months' => 'Meses',
'update' => 'Actualizar Amortización',
+ 'depreciation_min' => 'Valor mínimo después de depreciado'
];
diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php
index 0547326e3..c56ab30c6 100644
--- a/resources/lang/es-MX/admin/hardware/general.php
+++ b/resources/lang/es-MX/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Activo de pago',
'clone' => 'Clonar Equipo',
'deployable' => 'Desplegable',
- 'deleted' => 'Este equipo ha sido eliminado. Click aqui para restaurarlot.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editar Equipo',
- 'model_deleted' => 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.
Hacer click aquí para restaurar el modelo.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requerible',
'requested' => 'Solicitado',
'restore' => 'Restaurar equipo',
diff --git a/resources/lang/es-MX/admin/models/general.php b/resources/lang/es-MX/admin/models/general.php
index 3f7b53f56..b1ffcb9f3 100644
--- a/resources/lang/es-MX/admin/models/general.php
+++ b/resources/lang/es-MX/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Acerca de modelos de activos',
'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Borrar Grandes Modelos de Activos',
'bulk_delete_help' => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.',
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index 128f81a19..59b52d490 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Eliminar Asociación de compañía',
'reports' => 'Informes',
'restored' => 'restaurado',
+ 'restore' => 'Restore',
'requested' => 'Solicitado',
'request_canceled' => 'Solicitud Cancelada',
'save' => 'Guardar',
diff --git a/resources/lang/es-VE/admin/depreciations/general.php b/resources/lang/es-VE/admin/depreciations/general.php
index dbe8fedcb..3dfb028fb 100644
--- a/resources/lang/es-VE/admin/depreciations/general.php
+++ b/resources/lang/es-VE/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nombre de Depreciación',
'number_of_months' => 'Número de Meses',
'update' => 'Actualizar Depreciación',
+ 'depreciation_min' => 'Valor mínimo después de la depreciación'
];
diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php
index f2ad99e2c..8bb7102ff 100644
--- a/resources/lang/es-VE/admin/hardware/general.php
+++ b/resources/lang/es-VE/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Retirar Activo',
'clone' => 'Clonar Activo',
'deployable' => 'Enviable',
- 'deleted' => 'Este activo ha sido borrado. Click aquí para restaurarlos.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editar Activo',
- 'model_deleted' => 'Este modelo de activos ha sido borrado. Debes restaurar el modelo antes de poder restaurar los activos.
Click aquí para restaurar el modelo.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Solicitable',
'requested' => 'Solicitado',
'restore' => 'Restaurar Activo',
diff --git a/resources/lang/es-VE/admin/models/general.php b/resources/lang/es-VE/admin/models/general.php
index 92e527b0e..541dc18d5 100644
--- a/resources/lang/es-VE/admin/models/general.php
+++ b/resources/lang/es-VE/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Acerca de los Modelos de Activos',
'about_models_text' => 'Los Modelos de Activos son un grupo de activos idénticos. "MBP 2013", "iPhone 6S", etc.',
- 'deleted' => 'Este modelo ha sido borrado. Click aquí para restaurarlo.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Eliminación Masiva de Modelos de Activos',
'bulk_delete_help' => 'Usa las casillas abajo para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activo que tienen distintos activos asociados con ellos no pueden ser borrados hasta que los activos sean asociados a un modelo diferente.',
'bulk_delete_warn' => 'Estás a punto de borrar :model_count modelos de activo.',
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index 3359374c9..e7f012000 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Eliminar Asociación de la Compañía',
'reports' => 'Reportes',
'restored' => 'restaurado',
+ 'restore' => 'Restore',
'requested' => 'Solicitado',
'request_canceled' => 'Solicitud Cancelada',
'save' => 'Guardar',
diff --git a/resources/lang/et/admin/depreciations/general.php b/resources/lang/et/admin/depreciations/general.php
index db85afe76..c8cac4ed9 100644
--- a/resources/lang/et/admin/depreciations/general.php
+++ b/resources/lang/et/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Amortisatsiooni nimi',
'number_of_months' => 'Kuude arv',
'update' => 'Kulumi ajakohastamine',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/et/admin/hardware/general.php b/resources/lang/et/admin/hardware/general.php
index 17fc08e34..44d94a3e2 100644
--- a/resources/lang/et/admin/hardware/general.php
+++ b/resources/lang/et/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Klooni vahend',
'deployable' => 'Käivitatav',
- 'deleted' => 'See vara on kustutatud. Klõpsake selle taastamiseks klõpsake siia.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Muuda vahendit',
- 'model_deleted' => 'See varade mudel on kustutatud. Enne varade taastamist peate mudeleid taastada. 123._5_0_321 Klõpsake mudeli taastamiseks siin.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Taodeldav',
'requested' => 'Taotletud',
'restore' => 'Taasta vara',
diff --git a/resources/lang/et/admin/models/general.php b/resources/lang/et/admin/models/general.php
index b2bab7baf..01ddb256d 100644
--- a/resources/lang/et/admin/models/general.php
+++ b/resources/lang/et/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Mudelitest',
'about_models_text' => 'Mudelid on selleks, et vahendeid grupeerida. "MBP 2013", "IPhone 6d", jne.',
- 'deleted' => 'See mudel on kustutatud. Kliki siin selle taastamiseks.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php
index 17e1897b0..2993511fd 100644
--- a/resources/lang/et/general.php
+++ b/resources/lang/et/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Eemalda ettevõtteühing',
'reports' => 'Aruanded',
'restored' => 'taastatud',
+ 'restore' => 'Restore',
'requested' => 'Taotletud',
'request_canceled' => 'Taotlus tühistati',
'save' => 'Salvesta',
diff --git a/resources/lang/fa/admin/accessories/message.php b/resources/lang/fa/admin/accessories/message.php
index e62b5df4b..96b6bd522 100644
--- a/resources/lang/fa/admin/accessories/message.php
+++ b/resources/lang/fa/admin/accessories/message.php
@@ -2,7 +2,7 @@
return [
- 'does_not_exist' => 'The accessory [:id] does not exist.',
+ 'does_not_exist' => 'ابزار/وسیله [:id] وجود ندارد.',
'assoc_users' => 'این وسیله هم اکنون:آیتم های چک شده به کاربران را حساب کنید.لطفا در لوازم جانبی چک کنید و دوباره امتحان کنید',
'create' => [
diff --git a/resources/lang/fa/admin/asset_maintenances/general.php b/resources/lang/fa/admin/asset_maintenances/general.php
index 3b99098ec..acb2d8563 100644
--- a/resources/lang/fa/admin/asset_maintenances/general.php
+++ b/resources/lang/fa/admin/asset_maintenances/general.php
@@ -8,7 +8,7 @@
'repair' => 'بازسازی',
'maintenance' => 'نگهداشت',
'upgrade' => 'ارتقا',
- 'calibration' => 'Calibration',
- 'software_support' => 'Software Support',
- 'hardware_support' => 'Hardware Support',
+ 'calibration' => 'کالیبره کردن',
+ 'software_support' => 'پشتیبانی نرمافزار',
+ 'hardware_support' => 'پشتیبانی سختافزار',
];
diff --git a/resources/lang/fa/admin/depreciations/general.php b/resources/lang/fa/admin/depreciations/general.php
index f48f75a9c..a966f33f1 100644
--- a/resources/lang/fa/admin/depreciations/general.php
+++ b/resources/lang/fa/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'نام استهلاک',
'number_of_months' => 'تعداد ماه ها',
'update' => 'کمبود به روزرسانی',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/fa/admin/hardware/general.php b/resources/lang/fa/admin/hardware/general.php
index fe5750348..09339fc0b 100644
--- a/resources/lang/fa/admin/hardware/general.php
+++ b/resources/lang/fa/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'دارایی پرداخت',
'clone' => 'دارایی شگرف',
'deployable' => 'گسترش',
- 'deleted' => 'این دارایی حذف شده است. اینجا به بازگرداندن آن کلیک کنید .',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'ویرایش دارایی',
- 'model_deleted' => 'این مدل دارایی حذف شده است. شما باید مدل بازگرداندن قبل از شما می توانید دارایی بازگرداندن کنید.
برای بازگرداندن مدل را اینجا را کلیک کنید.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'در خواست شد',
'requested' => 'درخواست شده',
'restore' => 'بازیابی دارایی',
diff --git a/resources/lang/fa/admin/models/general.php b/resources/lang/fa/admin/models/general.php
index c6aa189cd..08b636bcc 100644
--- a/resources/lang/fa/admin/models/general.php
+++ b/resources/lang/fa/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'درباره مدل های دارایی',
'about_models_text' => 'مدل های دارایی یک راه برای گروه بندی دارایی های یکسان هستند. "MBP 2013"، "IPhone 6s" و غیره',
- 'deleted' => 'این مدل حذف شده است. اینجا برای بازگرداندن کلیک کنید it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php
index 3aec724cf..023a4d4f6 100644
--- a/resources/lang/fa/general.php
+++ b/resources/lang/fa/general.php
@@ -179,6 +179,7 @@
'remove_company' => 'حذف انجمن شرکت',
'reports' => 'گزارشها',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'در خواست شده',
'request_canceled' => 'درخواست لغو شد',
'save' => 'ذخیره کردن',
diff --git a/resources/lang/fi/admin/depreciations/general.php b/resources/lang/fi/admin/depreciations/general.php
index 80eec3d9a..c0f77c8bf 100644
--- a/resources/lang/fi/admin/depreciations/general.php
+++ b/resources/lang/fi/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Poiston nimi',
'number_of_months' => 'Kuukausien lukumäärä',
'update' => 'Päivitä poistot',
+ 'depreciation_min' => 'Minimiarvo poistojen jälkeen'
];
diff --git a/resources/lang/fi/admin/hardware/general.php b/resources/lang/fi/admin/hardware/general.php
index 832d5fd7e..720007d54 100644
--- a/resources/lang/fi/admin/hardware/general.php
+++ b/resources/lang/fi/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Luovuta laite',
'clone' => 'Monista laite',
'deployable' => 'Käyttöönotettavissa',
- 'deleted' => 'Tämä laite on poistettu. Klikkaa tästä palauttaaksesi sen.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Muokkaa laitetta',
- 'model_deleted' => 'Tämä laitemalli on poistettu. Sinun on palautettava malli ennen kuin voit palauttaa laitteen.
Klikkaa tästä palauttaaksesi mallin.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Pyydettävissä',
'requested' => 'Pyydetty',
'restore' => 'Palauta laite',
diff --git a/resources/lang/fi/admin/models/general.php b/resources/lang/fi/admin/models/general.php
index 8cdca9361..db5e09aea 100644
--- a/resources/lang/fi/admin/models/general.php
+++ b/resources/lang/fi/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Tietoja laitemalleista',
'about_models_text' => 'Laitemalleilla ryhmitellään samankaltaiset laitteet. "Elitebook 820 G3", "IPhone 6s" jne.',
- 'deleted' => 'Tämä malli on poistettu. Vaihda tästä palauttaaksesi sen.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Massapoista laitemalleja',
'bulk_delete_help' => 'Käytä alla olevia valintaruutuja vahvistaaksesi laitemallien poistaminen. Laitemalleja, joissa on niihin liittyviä laitteita, ei voida poistaa ennen kuin laitteet on liitetty toiseen malliin.',
'bulk_delete_warn' => 'Olet poistamassa :model_count laitemallia.',
diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php
index 8ae0dcd02..9e227135a 100644
--- a/resources/lang/fi/general.php
+++ b/resources/lang/fi/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Poista',
'reports' => 'Raportit',
'restored' => 'palautettu',
+ 'restore' => 'Restore',
'requested' => 'Pyydetty',
'request_canceled' => 'Pyyntö peruutettu',
'save' => 'Tallenna',
diff --git a/resources/lang/fil/admin/depreciations/general.php b/resources/lang/fil/admin/depreciations/general.php
index a71875d68..bb6dd3a39 100644
--- a/resources/lang/fil/admin/depreciations/general.php
+++ b/resources/lang/fil/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Ang Pangalan ng Depresasyon',
'number_of_months' => 'Ang Bilang ng mga Buwan',
'update' => 'I-update ang Depresasyon',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/fil/admin/hardware/general.php b/resources/lang/fil/admin/hardware/general.php
index 0241ca872..f6f76a7b9 100644
--- a/resources/lang/fil/admin/hardware/general.php
+++ b/resources/lang/fil/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'I-checkout ang Asset',
'clone' => 'I-clone ang Asset',
'deployable' => 'Pwedeng mai-deploy',
- 'deleted' => 'Ang asset na ito ay nai-delete na. I-klick dito para ibalik sa dati.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'I-edit ang Asset',
- 'model_deleted' => 'Ang model ng mga Asset na ito ay nai-delete na. Dapat mo munang ibalik sa dati ang model bago ibalik sa dati ang Asset.
I-klick dito para ibalik sa dati ang model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Pwedeng Ma-rekwest',
'requested' => 'Ni-rekwest',
'restore' => 'Ibalik sa dati ang Asset',
diff --git a/resources/lang/fil/admin/models/general.php b/resources/lang/fil/admin/models/general.php
index e494ba183..bda8bb8e1 100644
--- a/resources/lang/fil/admin/models/general.php
+++ b/resources/lang/fil/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Ang Tungkol sa mga Modelo ng Asset',
'about_models_text' => 'Ang mga Modelo ng Asset ay isang paraan para i-grupo ang magkakaparehong mga asset. "MBP 2013", "IPhone 6s", atbp.',
- 'deleted' => 'Ang modelong ito ay nai-delete na. I-klik dito para maibalik sa dati.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Ang Maramihang Pag-delete sa mga Modelo ng Asset',
'bulk_delete_help' => 'Gamitin ang mga checkboxes sa ibaba para i-komperma ang pag-delete sa mga napiling mga modelo ng asset. Ang mga modelo ng asset na mayroong mga asset na nai-ugnay sa mga ito ay hindi pwedeng i-delete hanggang sa ang lahat ng mga asset ay nai-ugnay sa ibat-ibang modelo.',
'bulk_delete_warn' => 'Ikaw ay mag-delete ng :model_count mga modelo ng asset.',
diff --git a/resources/lang/fil/general.php b/resources/lang/fil/general.php
index 18f765fe8..e17d23231 100644
--- a/resources/lang/fil/general.php
+++ b/resources/lang/fil/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Tanggalin ang Assosasyon ng Kompanya',
'reports' => 'Mga Ulat',
'restored' => 'ibinalik sa dati',
+ 'restore' => 'Restore',
'requested' => 'Ang Nirekwest',
'request_canceled' => 'Ang mga Rekwest ay Nakansela',
'save' => 'I-save',
diff --git a/resources/lang/fr/admin/depreciations/general.php b/resources/lang/fr/admin/depreciations/general.php
index f3bed046a..1cfd3ff04 100644
--- a/resources/lang/fr/admin/depreciations/general.php
+++ b/resources/lang/fr/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nom d\'Amortissement',
'number_of_months' => 'Mois',
'update' => 'Actualiser l\'amortissement',
+ 'depreciation_min' => 'Valeur minimale après amortissement'
];
diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php
index d975bf8f8..6451bb04b 100644
--- a/resources/lang/fr/admin/hardware/general.php
+++ b/resources/lang/fr/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Commander l\'actif',
'clone' => 'Cloner le Bien',
'deployable' => 'Déployable',
- 'deleted' => 'Cet actif a été détruit. Cliquez ici pour le restaurer.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editer le Bien',
- 'model_deleted' => 'Ce modèle d\'actif a été supprimé. Vous devez le restaurer avant de restaurer l\'actif.
Cliquez ici pour le restaurer.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Réquisitionnable',
'requested' => 'Demandé',
'restore' => 'Restaurer l\'actif',
diff --git a/resources/lang/fr/admin/models/general.php b/resources/lang/fr/admin/models/general.php
index d8d9f6527..2ecd09b12 100644
--- a/resources/lang/fr/admin/models/general.php
+++ b/resources/lang/fr/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'A propos des modèles actifs',
'about_models_text' => 'Les modèles actifs sont une façon de regrouper les actifs identiques. « MBP 2013", « IPhone 6 s », etc.',
- 'deleted' => 'Ce modèle a été détruit. Cliquez ici pour le restaurer.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Suppression en masse des modèles d\'actifs',
'bulk_delete_help' => 'Cochez la case ci-dessous pour confirmer la suppression des modèles d\'actifs sélectionnés. Les modèles d\'actifs associés à des actifs ne peuvent pas être supprimés tant que les actifs ne sont pas associés à un modèle différent.',
'bulk_delete_warn' => 'Vous êtes sur le points de suppimer :model_count modèles d\'actifs.',
diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php
index 6af49daf3..a25365f80 100644
--- a/resources/lang/fr/general.php
+++ b/resources/lang/fr/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Retirer l\'association avec l\'organisation',
'reports' => 'Rapports',
'restored' => 'restauré',
+ 'restore' => 'Restore',
'requested' => 'Demandé',
'request_canceled' => 'Demande annulée',
'save' => 'Sauvegarder',
diff --git a/resources/lang/ga-IE/admin/depreciations/general.php b/resources/lang/ga-IE/admin/depreciations/general.php
index ad04513ad..974fcf92e 100644
--- a/resources/lang/ga-IE/admin/depreciations/general.php
+++ b/resources/lang/ga-IE/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Ainm Dímheas',
'number_of_months' => 'Líon na Míonna',
'update' => 'Dímheas Nuashonraigh',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ga-IE/admin/hardware/general.php b/resources/lang/ga-IE/admin/hardware/general.php
index 1e2cc4048..82e22f0d9 100644
--- a/resources/lang/ga-IE/admin/hardware/general.php
+++ b/resources/lang/ga-IE/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Seiceáil Seiceáil',
'clone' => 'Sócmhainn Clón',
'deployable' => 'Infheidhmithe',
- 'deleted' => 'Scriosadh an tsócmhainn seo. Cliceáil anseo chun é a chur ar ais.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Athraigh Sócmhainn',
- 'model_deleted' => 'Scriosadh an tsamhail Sócmhainní seo. Caithfidh tú an tsamhail a chur ar ais sular féidir leat an Sócmhainn a athbhunú.
Cliceáil anseo chun an tsamhail a chur ar ais.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Inrianaithe',
'requested' => 'Iarrtar',
'restore' => 'Athchóirigh Sócmhainn',
diff --git a/resources/lang/ga-IE/admin/models/general.php b/resources/lang/ga-IE/admin/models/general.php
index 2faf9f326..e705301c6 100644
--- a/resources/lang/ga-IE/admin/models/general.php
+++ b/resources/lang/ga-IE/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Maidir le Múnlaí Sócmhainne',
'about_models_text' => 'Tá modhanna sócmhainne ina bhealach chun sócmhainní comhionanna a ghrúpáil. "MBP 2013", "iPhone 6s", etc.',
- 'deleted' => 'Scriosadh an múnla seo. Cliceáil anseo chun é a chur ar ais.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index 7483e27b6..4082c4acb 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Bain Cuideachta Chomhlachais',
'reports' => 'Tuarascálacha',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Iarrtar',
'request_canceled' => 'Iarratas Ar Ceal',
'save' => 'Sábháil',
diff --git a/resources/lang/he/admin/depreciations/general.php b/resources/lang/he/admin/depreciations/general.php
index 2ab968882..c9cc3bcfe 100644
--- a/resources/lang/he/admin/depreciations/general.php
+++ b/resources/lang/he/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'שם פחת',
'number_of_months' => 'מספר החודשים',
'update' => 'עדכון פחת',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/he/admin/hardware/general.php b/resources/lang/he/admin/hardware/general.php
index e3555b6df..719f18502 100644
--- a/resources/lang/he/admin/hardware/general.php
+++ b/resources/lang/he/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'רכוש Checkout',
'clone' => 'נכס משוכפל',
'deployable' => 'ניתן לפריסה',
- 'deleted' => 'הנכס הזה נמחק. לחץ כאן כדי לשחזר אותו .',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'ערוך נכס',
- 'model_deleted' => 'מודל נכסים זה נמחק. עליך לשחזר את המודל לפני שתוכל לשחזר את הנכס
לחץ כאן כדי לשחזר את המודל .',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'ניתן לבקש',
'requested' => 'מבוקש',
'restore' => 'שחזור נכס',
diff --git a/resources/lang/he/admin/models/general.php b/resources/lang/he/admin/models/general.php
index 3417dfcd2..7d98ce709 100644
--- a/resources/lang/he/admin/models/general.php
+++ b/resources/lang/he/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'על מודלים הנכסים',
'about_models_text' => 'מודלים של נכסים הם דרך לקבץ נכסים זהים. "MBP 2013", "iPhone 6s", וכו \'',
- 'deleted' => 'מודל זה נמחק. לחץ כאן כדי לשחזר אותו .',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php
index b1848d81f..1ea277800 100644
--- a/resources/lang/he/general.php
+++ b/resources/lang/he/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'הסר התאחדות החברה',
'reports' => 'דיווחים',
'restored' => 'שוחזר',
+ 'restore' => 'Restore',
'requested' => 'מבוקש',
'request_canceled' => 'הבקשה בוטלה',
'save' => 'להציל',
diff --git a/resources/lang/hr/admin/depreciations/general.php b/resources/lang/hr/admin/depreciations/general.php
index 95c38f0a1..f786ce817 100644
--- a/resources/lang/hr/admin/depreciations/general.php
+++ b/resources/lang/hr/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Naziv amortizacije',
'number_of_months' => 'Broj mjeseci',
'update' => 'Ažuriraj amortizaciju',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/hr/admin/hardware/general.php b/resources/lang/hr/admin/hardware/general.php
index 682937096..6e2053e89 100644
--- a/resources/lang/hr/admin/hardware/general.php
+++ b/resources/lang/hr/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Asset Checkout',
'clone' => 'Klonska imovina',
'deployable' => 'razmjestiti',
- 'deleted' => 'Ova je imovina izbrisana. Kliknite ovdje da biste ga vratili.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Uređivanje imovine',
- 'model_deleted' => 'Model ove stavke je izbrisan. Morate vratiti model prije nego što vratite Asset.
Kliknite ovdje da biste vratili model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Traženi',
'restore' => 'Vraćanje imovine',
diff --git a/resources/lang/hr/admin/models/general.php b/resources/lang/hr/admin/models/general.php
index 93e487b8c..d1f4c70c3 100644
--- a/resources/lang/hr/admin/models/general.php
+++ b/resources/lang/hr/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'O modelu imovine',
'about_models_text' => 'Modeli imovine su način grupiranja identične imovine. "MBP 2013", "IPhone 6s" itd.',
- 'deleted' => 'Ovaj je model izbrisan. Kliknite ovdje da biste ga vratili.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Skupno brisanje modela imovine',
'bulk_delete_help' => 'Koristeći checkbox-ove niže potvrdite brisanje odabranih modela imovine. Modeli imovine koji na sebi imaju povezanu imovinu se ne mogu brisati dok se imovina ne poveže sa drugim modelom.',
'bulk_delete_warn' => 'Izbrisati ćete :model_count model(a) imovine.',
diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php
index 964c9b5a1..b519e7a5c 100644
--- a/resources/lang/hr/general.php
+++ b/resources/lang/hr/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Ukloni Udruženje tvrtki',
'reports' => 'Izvještaji',
'restored' => 'obnovljeno',
+ 'restore' => 'Restore',
'requested' => 'Traženi',
'request_canceled' => 'Zahtjev je otkazan',
'save' => 'Uštedjeti',
diff --git a/resources/lang/hu/admin/depreciations/general.php b/resources/lang/hu/admin/depreciations/general.php
index d20d51aca..9033768e2 100644
--- a/resources/lang/hu/admin/depreciations/general.php
+++ b/resources/lang/hu/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Értékcsökkenés neve',
'number_of_months' => 'Hónapok száma',
'update' => 'Értékcsökkenés frissítése',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/hu/admin/hardware/general.php b/resources/lang/hu/admin/hardware/general.php
index 580ea321a..6bdb89e77 100644
--- a/resources/lang/hu/admin/hardware/general.php
+++ b/resources/lang/hu/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Eszköz klónozása',
'deployable' => 'Kiadható',
- 'deleted' => 'Ez az eszköz törölve lett. Kattintson ide a visszaállításához.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Eszköz módosítása',
- 'model_deleted' => 'Ez az Eszközök modell törölve lett. Vissza kell állítania a modellt, mielőtt visszaállíthatja az Eszközt.
Kattintson ide a modell visszaállításához.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'lehívási',
'requested' => 'Kérve',
'restore' => 'Visszaállítás eszköz',
diff --git a/resources/lang/hu/admin/models/general.php b/resources/lang/hu/admin/models/general.php
index 80f18e259..b309e9e6c 100644
--- a/resources/lang/hu/admin/models/general.php
+++ b/resources/lang/hu/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Az Asset Models-ról',
'about_models_text' => 'Az eszköz-modellek lehetővé teszik az azonos eszközök csoportosítását. "MBP 2013", "IPhone 6s" stb.',
- 'deleted' => 'Ez a modell törölve lett. Itt visszaállíthatod.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Eszköz modellek csoportos törlése',
'bulk_delete_help' => 'Az alábbi jelölőnégyzetek segítségével, kérem, erősítse meg, hogy valóban törölni szeretné a kiválasztott eszköz modelleket! Azok az eszköz modellek, melyeknek vannak hozzárendelt eszközei, egészen addig nem törölhetőek, amíg ezeket az eszközöket egy másik modellhez nem rendeli.',
'bulk_delete_warn' => 'Törlődni fog :model_count eszköz modell.',
diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php
index c8d7f60a2..c8d340723 100644
--- a/resources/lang/hu/general.php
+++ b/resources/lang/hu/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Vállati kapcsolat megszüntetése',
'reports' => 'Jelentések',
'restored' => 'visszaállítva',
+ 'restore' => 'Restore',
'requested' => 'Kérve',
'request_canceled' => 'A kérelem törölve',
'save' => 'Mentés',
diff --git a/resources/lang/id/admin/depreciations/general.php b/resources/lang/id/admin/depreciations/general.php
index a4ce2f5f4..88f2c8d73 100644
--- a/resources/lang/id/admin/depreciations/general.php
+++ b/resources/lang/id/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nama Penyusutan',
'number_of_months' => 'Jumlah bulan',
'update' => 'Perbaharui Penyusutan',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php
index 1f6081df0..988dcc51c 100644
--- a/resources/lang/id/admin/hardware/general.php
+++ b/resources/lang/id/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Aset Checkout',
'clone' => 'Klon Aset',
'deployable' => 'Dapat digunakan',
- 'deleted' => 'Aset ini telah di hapus. Klik disini untuk memulihkan.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Sunting Aset',
- 'model_deleted' => 'Model aset telah di hapus. Anda harus memulihkan model dahulu sebelum memulihkan aset.
Klik disini untuk memulihkan model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Dapat diminta',
'requested' => 'Telah diminta',
'restore' => 'Mengembalikan aset',
diff --git a/resources/lang/id/admin/models/general.php b/resources/lang/id/admin/models/general.php
index 54702d193..8e717eb43 100644
--- a/resources/lang/id/admin/models/general.php
+++ b/resources/lang/id/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Tentang Model Aset',
'about_models_text' => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.',
- 'deleted' => 'Model ini telah dihapus. Click di sini untuk memulihkan.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Menghapus massal aset model',
'bulk_delete_help' => 'Centang kotak di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.',
'bulk_delete_warn' => 'Anda akan menghapus :model_count asset models.',
diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php
index 8c0fc3d3a..360b6f1f1 100644
--- a/resources/lang/id/general.php
+++ b/resources/lang/id/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Hapus Asosiasi Perusahaan',
'reports' => 'Laporan',
'restored' => 'kembalikan',
+ 'restore' => 'Restore',
'requested' => 'Diminta',
'request_canceled' => 'Permintaan Dibatalkan',
'save' => 'Simpan',
diff --git a/resources/lang/is/admin/depreciations/general.php b/resources/lang/is/admin/depreciations/general.php
index 81fb66eb5..844e5d962 100644
--- a/resources/lang/is/admin/depreciations/general.php
+++ b/resources/lang/is/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return array(
'depreciation_name' => 'Heiti fyrningarflokks',
'number_of_months' => 'Fjöldi mánaða',
'update' => 'Uppfæra fyrningarflokk',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
);
diff --git a/resources/lang/is/admin/hardware/general.php b/resources/lang/is/admin/hardware/general.php
index 547b97034..cba616417 100644
--- a/resources/lang/is/admin/hardware/general.php
+++ b/resources/lang/is/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
'checkout' => 'Ráðstafa eign',
'clone' => 'Clone Asset',
'deployable' => 'Nothæfar',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Breyta eign',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/is/admin/models/general.php b/resources/lang/is/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/is/admin/models/general.php
+++ b/resources/lang/is/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/is/admin/suppliers/message.php b/resources/lang/is/admin/suppliers/message.php
index 5460f8eeb..614c3768e 100644
--- a/resources/lang/is/admin/suppliers/message.php
+++ b/resources/lang/is/admin/suppliers/message.php
@@ -11,7 +11,7 @@ return array(
),
'update' => array(
- 'error' => 'Supplier was not updated, please try again',
+ 'error' => 'Þessi birgi var ekki skráður. Vinsamlegast reyndu aftur',
'success' => 'Supplier updated successfully.'
),
diff --git a/resources/lang/is/button.php b/resources/lang/is/button.php
index a18e1c9a8..bf78c2b2b 100644
--- a/resources/lang/is/button.php
+++ b/resources/lang/is/button.php
@@ -1,6 +1,6 @@
'Aðgerðir',
'add' => 'Bæta við nýjum',
'cancel' => 'Hætta við',
@@ -11,7 +11,7 @@ return [
'request' => 'Óska eftir',
'submit' => 'Staðfesta',
'upload' => 'Hlaða upp',
- 'select_file' => 'Velja skrá...',
+ 'select_file' => 'Velja skrá...',
'select_files' => 'Velja skrár...',
- 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels',
-];
+ 'generate_labels' => 'Útbúa límmiða',
+);
diff --git a/resources/lang/is/general.php b/resources/lang/is/general.php
index f0f52f0a1..8c04a02f2 100644
--- a/resources/lang/is/general.php
+++ b/resources/lang/is/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Skýrslur',
'restored' => 'endurheimt',
+ 'restore' => 'Restore',
'requested' => 'Óskað eftir',
'request_canceled' => 'Beiðni endurkölluð',
'save' => 'Vista',
diff --git a/resources/lang/it/admin/depreciations/general.php b/resources/lang/it/admin/depreciations/general.php
index 733a34565..d30f344b5 100644
--- a/resources/lang/it/admin/depreciations/general.php
+++ b/resources/lang/it/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nome Obsolescenza',
'number_of_months' => 'Numero di Mesi',
'update' => 'Aggiorna l\'ammortamento',
+ 'depreciation_min' => 'Valore minimo di svalutazione'
];
diff --git a/resources/lang/it/admin/hardware/general.php b/resources/lang/it/admin/hardware/general.php
index e562867dc..404e8e3d2 100644
--- a/resources/lang/it/admin/hardware/general.php
+++ b/resources/lang/it/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Asset Checkout',
'clone' => 'Copia Asset',
'deployable' => 'Distribuibile',
- 'deleted' => 'Questo asset è stato cancellato. Clicca qui per ripristinarlo.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Modifica Asset',
- 'model_deleted' => 'Questo modello di Asset è stato cancellato. Devi ripristinare il modello prima di poter ripristinare L\'asset.
Clicca qui per ripristinare il modello.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Disponibile',
'requested' => 'richiesto',
'restore' => 'Ripristina Asset',
diff --git a/resources/lang/it/admin/models/general.php b/resources/lang/it/admin/models/general.php
index 785223fb4..b60c9e0b9 100644
--- a/resources/lang/it/admin/models/general.php
+++ b/resources/lang/it/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Informazioni sui modelli di Asset',
'about_models_text' => 'I modelli sono un modo per raggruppare Asset identici. "MBP 2016", "IPhone 6s", etc.',
- 'deleted' => 'Questo modello è stato eliminato.Clicca qui per ripristinarlo.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Eliminazione di massa di modelli Asset',
'bulk_delete_help' => 'Utilizza le caselle di controllo in basso per confermare la cancellazione dei modelli di asset selezionati. I modelli di asset con asset ad essi associati non possono essere eliminati finché le risorse non sono associate a un modello diverso.',
'bulk_delete_warn' => 'Stai per cancellare :asset_count assets.',
diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php
index 092bf5040..8971b2f3b 100644
--- a/resources/lang/it/general.php
+++ b/resources/lang/it/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Rimuovi associazioni azienda',
'reports' => 'Reports',
'restored' => 'ripristinato',
+ 'restore' => 'Restore',
'requested' => 'Richiesto',
'request_canceled' => 'Richiesta annullata',
'save' => 'Salva',
diff --git a/resources/lang/iu/admin/depreciations/general.php b/resources/lang/iu/admin/depreciations/general.php
index e0b02c009..e6c86b9ff 100644
--- a/resources/lang/iu/admin/depreciations/general.php
+++ b/resources/lang/iu/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/iu/admin/hardware/general.php b/resources/lang/iu/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/iu/admin/hardware/general.php
+++ b/resources/lang/iu/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/iu/admin/models/general.php b/resources/lang/iu/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/iu/admin/models/general.php
+++ b/resources/lang/iu/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/iu/general.php b/resources/lang/iu/general.php
index 9bb3f84e4..c1931af8d 100644
--- a/resources/lang/iu/general.php
+++ b/resources/lang/iu/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/ja/admin/depreciations/general.php b/resources/lang/ja/admin/depreciations/general.php
index aab918f72..c48af9782 100644
--- a/resources/lang/ja/admin/depreciations/general.php
+++ b/resources/lang/ja/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => '減価償却名',
'number_of_months' => '月数',
'update' => '減価償却の更新',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php
index b2c4f5866..d37d1f50a 100644
--- a/resources/lang/ja/admin/hardware/general.php
+++ b/resources/lang/ja/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => '資産をチェックアウト',
'clone' => '資産を複製',
'deployable' => '配備可能',
- 'deleted' => 'この資産は削除されました。復元するにはココをクリックして下さい。',
+ 'deleted' => 'This asset has been deleted.',
'edit' => '資産を編集',
- 'model_deleted' => 'この資産型番は削除されました。資産を戻すためには型番を復元する必要があります。
型番を復元するにはココをクリックして下さい。',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => '要求可能',
'requested' => '要求済',
'restore' => '資産を復元',
diff --git a/resources/lang/ja/admin/kits/general.php b/resources/lang/ja/admin/kits/general.php
index 0dfad8246..233edf96e 100644
--- a/resources/lang/ja/admin/kits/general.php
+++ b/resources/lang/ja/admin/kits/general.php
@@ -1,17 +1,17 @@
'About Predefined Kits',
- 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
- 'checkout' => 'Checkout Kit ',
- 'create_success' => 'Kit was successfully created.',
- 'create' => 'Create Predefined Kit',
- 'update' => 'Update Predefined Kit',
- 'delete_success' => 'Kit was successfully deleted.',
- 'update_success' => 'Kit was successfully updated.',
- 'none_models' => 'There are not enough available assets for :model to checkout. :qty are required. ',
- 'none_licenses' => 'There are not enough available seats for :license to checkout. :qty are required. ',
- 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ',
- 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ',
+return array(
+ 'about_kits_title' => '製品セットについて',
+ 'about_kits_text' => '製品セットを用いると、アイテム（アセット、ライセンスなど）のコレクションをすばやくユーザーに払い出す（チェックアウトする）ことができます。例えば、組織のオンボーディングプロセスが一貫している場合に、すべてのユーザーが同じアイテムを使用する場合に役立ちます。',
+ 'checkout' => 'チェックアウト',
+ 'create_success' => '製品セットは正常に作成されました。',
+ 'create' => '製品セットを作成',
+ 'update' => '製品セットを更新',
+ 'delete_success' => '製品セットは正常に削除されました。',
+ 'update_success' => '製品セットは正常に更新されました。',
+ 'none_models' => ':modelをチェックアウトするのに十分な資産がありません。:qtyが必要です。 ',
+ 'none_licenses' => ':licenseをチェックアウトするのに十分なシートがありません。:qtyが必要です。 ',
+ 'none_consumables' => ':consumableをチェックアウトするのに十分な数がありません。:qtyが必要です。 ',
+ 'none_accessory' => ':accessoryをチェックアウトするのに十分な数がありません。:qtyが必要です。 ',
-];
+);
diff --git a/resources/lang/ja/admin/models/general.php b/resources/lang/ja/admin/models/general.php
index 7b763a40a..e72bcb7fb 100644
--- a/resources/lang/ja/admin/models/general.php
+++ b/resources/lang/ja/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => '資産モデルについて',
'about_models_text' => '資産モデルは、同一資産をグループ化する方法です。(例:「MBP 2013」、「IPhone 6」など)',
- 'deleted' => 'この型番は削除されました。元に戻すにはココをクリックして下さい。.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => '資産モデルの一括削除',
'bulk_delete_help' => '下のチェックボックスを使用して、選択した資産モデルの削除を確認します。資産が関連付けられている資産モデルは、資産が別のモデルに関連付けられるまで削除できません。',
'bulk_delete_warn' => ':model_count 件の資産モデルを削除しようとしています。',
diff --git a/resources/lang/ja/auth/general.php b/resources/lang/ja/auth/general.php
index 2fb1fe62b..81cf25a53 100644
--- a/resources/lang/ja/auth/general.php
+++ b/resources/lang/ja/auth/general.php
@@ -11,5 +11,5 @@ return [
'ldap_reset_password' => 'LDAPパスワードをリセットするにはここをクリックしてください',
'remember_me' => 'ログイン状態を維持する',
'username_help_top' => 'パスワードリセットリンクを送信する対象の ユーザー名 を入力してください。',
- 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.
Usernames without an associated email address will not be emailed a password reset link. ',
+ 'username_help_bottom' => 'ユーザー名とメールアドレスは、設定によって同じ場合もありますが、そうでない場合もあります。ユーザー名を思い出せない場合は、管理者にお問い合わせください。
メールアドレスが関連付けられていないユーザー名には、パスワードリセットのリンクがメールで送信されません。 ',
];
diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php
index 8e4931c3e..658faea33 100644
--- a/resources/lang/ja/general.php
+++ b/resources/lang/ja/general.php
@@ -90,12 +90,12 @@
'firstname_lastname_format' => '名 姓 (jane.smith@example.com)',
'firstname_lastname_underscore_format' => '名 姓 (jane_smith@example.com)',
'lastnamefirstinitial_format' => '姓 イニシャル（smithj@example.com）',
- 'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+ 'firstintial_dot_lastname_format' => '名のイニシャルと姓 (j.smith@example.com)',
'first' => '最初',
- 'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
- 'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
- 'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
- 'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
+ 'firstnamelastname' => '名と姓 (janesmith@example.com)',
+ 'lastname_firstinitial' => '姓と名のイニシャル (smith_j@example.com)',
+ 'firstinitial.lastname' => '名のイニシャルと姓 (j.smith@example.com)',
+ 'firstnamelastinitial' => '名のイニシャルと姓 (janes@example.com)',
'first_name' => '姓',
'first_name_format' => '名 (jane@example.com)',
'files' => 'ファイル',
@@ -122,7 +122,7 @@
'asset_maintenances' => '資産管理',
'item' => 'アイテム',
'insufficient_permissions' => '権限が不足しています。',
- 'kits' => 'Predefined Kits',
+ 'kits' => '製品セット',
'language' => '言語',
'last' => '最後',
'last_login' => '最終ログイン',
@@ -137,7 +137,7 @@
'feature_disabled' => 'この機能は、デモインストールでは無効化されています。',
'location' => '設置場所',
'locations' => '設置場所の数',
- 'logo_size' => 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide. ',
+ 'logo_size' => '正方形のロゴの場合は、「ロゴ＋文字」で表示されます。ロゴの最大表示サイズは、縦50px×横500pxです。 ',
'logout' => 'ログアウト',
'lookup_by_tag' => '資産タグで参照',
'maintenances' => 'メンテナンス',
@@ -176,6 +176,7 @@
'remove_company' => '会社の団体を取り除く',
'reports' => 'レポート',
'restored' => '復元',
+ 'restore' => 'Restore',
'requested' => '要求済',
'request_canceled' => 'リクエストキャンセル',
'save' => '保存',
@@ -199,7 +200,7 @@
'sign_in' => 'サインイン',
'signature' => '署名',
'skin' => 'スキン',
- 'slack_test_msg' => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+ 'slack_test_msg' => 'こんにちは！SlackとSnipe-ITの連携がうまくいっているようです！',
'some_features_disabled' => 'デモモード ： いくつかの機能はこのインストールでは無効化されます',
'site_name' => 'サイト名',
'state' => '都道府県',
@@ -227,7 +228,7 @@
'declined' => '却下済',
'unaccepted_asset_report' => '未許可資産',
'users' => '利用者',
- 'viewall' => 'View All',
+ 'viewall' => 'すべて表示',
'viewassets' => '割当済み資産を表示',
'website' => 'ウェブサイト',
'welcome' => 'ようこそ、 :name さん',
@@ -236,14 +237,14 @@
'zip' => '郵便番号',
'noimage' => 'イメージはアップロードされていません または イメージは見つかりませんでした',
'token_expired' => 'セッションが失効しました。再度ログインしてください。',
- 'login_enabled' => 'Login Enabled',
- 'audit_due' => 'Due for Audit',
- 'audit_overdue' => 'Overdue for Audit',
- 'accept' => 'Accept :asset',
- 'i_accept' => 'I accept',
- 'i_decline' => 'I decline',
- 'sign_tos' => 'Sign below to indicate that you agree to the terms of service:',
- 'clear_signature' => 'Clear Signature',
+ 'login_enabled' => 'ログイン可能',
+ 'audit_due' => '監査期日',
+ 'audit_overdue' => '監査期日を超過',
+ 'accept' => ':assetを承認',
+ 'i_accept' => '承認',
+ 'i_decline' => '却下',
+ 'sign_tos' => '利用規約に同意された方は、ご署名ください。',
+ 'clear_signature' => '署名をクリア',
'show_help' => 'ヘルプを表示',
'hide_help' => 'ヘルプを非表示',
];
diff --git a/resources/lang/ko/admin/depreciations/general.php b/resources/lang/ko/admin/depreciations/general.php
index 0bfcb1a5c..f2d449784 100644
--- a/resources/lang/ko/admin/depreciations/general.php
+++ b/resources/lang/ko/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => '감가 상각 명',
'number_of_months' => '개월 수',
'update' => '감가 상각 갱신',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ko/admin/hardware/general.php b/resources/lang/ko/admin/hardware/general.php
index 395bf6384..e93983116 100644
--- a/resources/lang/ko/admin/hardware/general.php
+++ b/resources/lang/ko/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => '반출 자산',
'clone' => '자산 복제',
'deployable' => '사용가능',
- 'deleted' => '이 자산은 삭제되었습니다. 복원하려면 여기를 클릭하세요.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => '자산 수정',
- 'model_deleted' => '이 자산 모델은 삭제되었습니다. 자산을 복원하기 전에 모델을 복원해야 합니다.
모델을 복원하려면 여기를 클릭하세요.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => '요청가능',
'requested' => '요청됨',
'restore' => '자산 복원',
diff --git a/resources/lang/ko/admin/models/general.php b/resources/lang/ko/admin/models/general.php
index 1f33741f9..0dc6ef3ab 100644
--- a/resources/lang/ko/admin/models/general.php
+++ b/resources/lang/ko/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => '자산 모델이란',
'about_models_text' => '자산 모델은 동일한 자산들을 그룹화 하는 방법입니다. "MBP 2013", "IPhone 6들", 등등.',
- 'deleted' => '이 모델은 삭제되었습니다. 복원 하려면 여기를 클릭하세요.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => '자산 모델 대량 삭제',
'bulk_delete_help' => '선택한 자산 모델의 삭제를 확인하려면 아래 체크박스를 사용하십시오. 자산에 연결된 자산 모델은 자산이 다른 모델과 연결될 때까지 삭제할 수 없습니다.',
'bulk_delete_warn' => '다음을 삭제하려 합니다:model_count asset models.',
diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php
index 9b55a8122..324cd06fd 100644
--- a/resources/lang/ko/general.php
+++ b/resources/lang/ko/general.php
@@ -176,6 +176,7 @@
'remove_company' => '공급자 연결 제거',
'reports' => '보고서',
'restored' => '복원됨',
+ 'restore' => 'Restore',
'requested' => '요청됨',
'request_canceled' => '요청 취소',
'save' => '저장',
diff --git a/resources/lang/lt/admin/depreciations/general.php b/resources/lang/lt/admin/depreciations/general.php
index 97ea5903d..3aada18c1 100644
--- a/resources/lang/lt/admin/depreciations/general.php
+++ b/resources/lang/lt/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nusidėvėjimo pavadinimas',
'number_of_months' => 'Mėnesių skaičius',
'update' => 'Atnaujinti nusidėvėjimą',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/lt/admin/hardware/general.php b/resources/lang/lt/admin/hardware/general.php
index d66d2cbb1..31dc14fa9 100644
--- a/resources/lang/lt/admin/hardware/general.php
+++ b/resources/lang/lt/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Patikros turtas',
'clone' => 'Kopijuoti įrangą',
'deployable' => 'Naudojamas',
- 'deleted' => 'Ši įranga buvo ištrinta. Paspauskit čia ją atkurti.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Keisti įrangą',
- 'model_deleted' => 'Įrangos modelis buvo ištrintas. Jūs privalote atkurti modelį prieš atkurdami įrangą.
Spauskite čia atkurti modelį.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Reiklaujamas',
'requested' => 'Užklausta',
'restore' => 'Atkurti įrangą',
diff --git a/resources/lang/lt/admin/models/general.php b/resources/lang/lt/admin/models/general.php
index 63b4fbff3..38f205085 100644
--- a/resources/lang/lt/admin/models/general.php
+++ b/resources/lang/lt/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Apie turto modelius',
'about_models_text' => 'Turto modeliai yra būdas grupuoti identišką turtą. "MBP 2013", "IPhone 6s" ir kt.',
- 'deleted' => 'Šis modelis ištrintas. Spauskite atkurti modelį čia.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Ištrinti pažymėtus turto modelius',
'bulk_delete_help' => '„Pažymėkite žemiau esantį langelį, kad patvirtintumėte pasirinktų turto modelių ištrynimą. Turto modeliai, kuriuose yra su jais susijęs turtas, negali būti ištrinti, išskyrus tuos atvejus, kai tas turtas yra susietas su kitu modeliu.“.',
'bulk_delete_warn' => 'Ketinate ištrinti :model_count turto modelius.',
diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php
index 723936c68..6b530beb0 100644
--- a/resources/lang/lt/general.php
+++ b/resources/lang/lt/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Panaikinti kompanijos asociaciją',
'reports' => 'Ataskaitos',
'restored' => 'atkurta',
+ 'restore' => 'Restore',
'requested' => 'Užklausta',
'request_canceled' => 'Prašymas atšauktas',
'save' => 'Išsaugoti',
diff --git a/resources/lang/lv/admin/depreciations/general.php b/resources/lang/lv/admin/depreciations/general.php
index 81be6da6f..f029af4fa 100644
--- a/resources/lang/lv/admin/depreciations/general.php
+++ b/resources/lang/lv/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nolietojuma nosaukums',
'number_of_months' => 'Mēnešu skaits',
'update' => 'Atjaunināt nolietojumu',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/lv/admin/hardware/general.php b/resources/lang/lv/admin/hardware/general.php
index 460184019..de4e26c43 100644
--- a/resources/lang/lv/admin/hardware/general.php
+++ b/resources/lang/lv/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Izvietojams',
- 'deleted' => 'Šis īpašums ir dzēsts. Noklikšķiniet šeit, lai to atjaunotu.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Rediģēt īpašumu',
- 'model_deleted' => 'Šis Assets modelis ir izdzēsts. Jums ir jāatjauno modelis, lai varētu atjaunot Asset.
Noklikšķiniet šeit, lai atjaunotu modeli.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Pieļaujams',
'requested' => 'Pieprasīts',
'restore' => 'Atjaunot aktīvus',
diff --git a/resources/lang/lv/admin/models/general.php b/resources/lang/lv/admin/models/general.php
index ced11fcd1..e765e2ce4 100644
--- a/resources/lang/lv/admin/models/general.php
+++ b/resources/lang/lv/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Par īpašuma modeļiem',
'about_models_text' => 'Aktīvu modeļi ir veids, kā grupēt identiskus aktīvus. "MBP 2013", "IPhone 6s" uc',
- 'deleted' => 'Šis modelis ir dzēsts. Noklikšķiniet šeit, lai to atjaunotu.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Līdzekļu modeļu lielapjoma dzēšana',
'bulk_delete_help' => 'Lai apstiprinātu izvēlēto līdzekļu modeļu dzēšanu, ir jāatzīmē zemāk esošās izvēles rūtiņas. Līdzekļu modeļi, kuriem ir piesaistīti aktīvi, nevar tikt dzēsti, kamēr līdzekļi nav piesaistīti citam modelim.',
'bulk_delete_warn' => 'Tiks dzēsti :model_count līdzekļu modeļi.',
diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php
index 41c4e640d..18665df6c 100644
--- a/resources/lang/lv/general.php
+++ b/resources/lang/lv/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Noņemt uzņēmumu asociāciju',
'reports' => 'Ziņojumi',
'restored' => 'atjaunots',
+ 'restore' => 'Restore',
'requested' => 'Pieprasīts',
'request_canceled' => 'Pieprasījums atcelts',
'save' => 'Saglabājiet',
diff --git a/resources/lang/mi/admin/depreciations/general.php b/resources/lang/mi/admin/depreciations/general.php
index 33cb4fa38..4a2d2ce4d 100644
--- a/resources/lang/mi/admin/depreciations/general.php
+++ b/resources/lang/mi/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Te Ingoa Taweke',
'number_of_months' => 'Tau o Marama',
'update' => 'Whakahouhia te whakahekenga',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/mi/admin/hardware/general.php b/resources/lang/mi/admin/hardware/general.php
index 19ec3961d..547cb2446 100644
--- a/resources/lang/mi/admin/hardware/general.php
+++ b/resources/lang/mi/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Whakaritehia te Ahua',
'clone' => 'Te Tino Tae',
'deployable' => 'Kaore e taea',
- 'deleted' => 'Kua mukua tenei taonga. Kia tuhia ki konei hei whakaora i te reira.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Whakatikahia te Ahua',
- 'model_deleted' => 'Kua mukua tenei tauira Ahua. Me whakahou e koe te tauira i mua i to hokinga mai i te Asset.
Kia huri ki konei kia whakahokia mai te tauira.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Ka taea te tuku',
'requested' => 'I tonohia',
'restore' => 'Whakaorangia te Ahua',
diff --git a/resources/lang/mi/admin/models/general.php b/resources/lang/mi/admin/models/general.php
index 2f8d673db..31c7a97c5 100644
--- a/resources/lang/mi/admin/models/general.php
+++ b/resources/lang/mi/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Mō nga tauira Ahua',
'about_models_text' => 'Ko nga Momo Ahuatanga he huarahi ki te whakariterite i nga rawa taatai. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'Kua mukua tenei tauira. Kua tuhia ki konei hei whakaora i te reira.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/mi/general.php b/resources/lang/mi/general.php
index 915957262..7fc63b38c 100644
--- a/resources/lang/mi/general.php
+++ b/resources/lang/mi/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Tangohia te Kamupene Kamupene',
'reports' => 'Ngā pūrongo',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'I tonohia',
'request_canceled' => 'Tono Whakamutua',
'save' => 'Tiaki',
diff --git a/resources/lang/mk/admin/depreciations/general.php b/resources/lang/mk/admin/depreciations/general.php
index 753192d1b..0eed649d9 100644
--- a/resources/lang/mk/admin/depreciations/general.php
+++ b/resources/lang/mk/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Име на амортизационен план',
'number_of_months' => 'Број на месеци',
'update' => 'Ажурирај амортизационен план',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/mk/admin/hardware/general.php b/resources/lang/mk/admin/hardware/general.php
index 6a30fcf73..d43d66689 100644
--- a/resources/lang/mk/admin/hardware/general.php
+++ b/resources/lang/mk/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Задолжи основно средство',
'clone' => 'Клонирај основно средство',
'deployable' => 'Распоредливи',
- 'deleted' => 'Ова средство е избришано. Кликнете овде за да го вратите.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Уредување на основно средство',
- 'model_deleted' => 'Овој модел на основни средства е избришан. Мора да го вратите моделот пред да можете да го вратите основното средство.
Кликни тука за да го вратиш моделот.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Може да се побара',
'requested' => 'Побарано',
'restore' => 'Врати основно средство',
diff --git a/resources/lang/mk/admin/models/general.php b/resources/lang/mk/admin/models/general.php
index 545f6f983..5638d1658 100644
--- a/resources/lang/mk/admin/models/general.php
+++ b/resources/lang/mk/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'За моделите на основни средства',
'about_models_text' => 'Моделите на основни средства служат да се групираат идентични средства. Пр. "IPhone 6s", "ThinkPad T470" итн.',
- 'deleted' => 'Овој модел е избришан. Кликнете овде за да го вратите.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Масовно бришење на модели',
'bulk_delete_help' => 'Користете ги полињата подолу за да го потврдите бришењето на избраните модели. Моделите кои имаат основни средства поврзани со нив не може да се избришат додека средствата не се поврзанат со друг модел.',
'bulk_delete_warn' => 'Ќе избришете :model_count модели.',
diff --git a/resources/lang/mk/general.php b/resources/lang/mk/general.php
index 60a775344..423b00911 100644
--- a/resources/lang/mk/general.php
+++ b/resources/lang/mk/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Отстрани поврзување со компанија',
'reports' => 'Извештаи',
'restored' => 'вратено',
+ 'restore' => 'Restore',
'requested' => 'Побарано',
'request_canceled' => 'Барањето е откажано',
'save' => 'Зачувај',
diff --git a/resources/lang/ml-IN/admin/depreciations/general.php b/resources/lang/ml-IN/admin/depreciations/general.php
index e0b02c009..e6c86b9ff 100644
--- a/resources/lang/ml-IN/admin/depreciations/general.php
+++ b/resources/lang/ml-IN/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ml-IN/admin/hardware/general.php b/resources/lang/ml-IN/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/ml-IN/admin/hardware/general.php
+++ b/resources/lang/ml-IN/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/ml-IN/admin/models/general.php b/resources/lang/ml-IN/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/ml-IN/admin/models/general.php
+++ b/resources/lang/ml-IN/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index 9bb3f84e4..c1931af8d 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/mn/admin/depreciations/general.php b/resources/lang/mn/admin/depreciations/general.php
index e023a663d..d46c4b0dc 100644
--- a/resources/lang/mn/admin/depreciations/general.php
+++ b/resources/lang/mn/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Элэгдэл Нэр',
'number_of_months' => 'Сарын тоо',
'update' => 'Элэгдэл шинэчлэх',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/mn/admin/hardware/general.php b/resources/lang/mn/admin/hardware/general.php
index b5437436a..2a651cefb 100644
--- a/resources/lang/mn/admin/hardware/general.php
+++ b/resources/lang/mn/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Тооцоот Хөрөнгийн',
'clone' => 'Clone Asset',
'deployable' => 'Даалгавартай',
- 'deleted' => 'Энэ хөрөнгө устгагдсан байна. Дахин оруулна уу.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Хөрөнгийг засварлах',
- 'model_deleted' => 'Энэ активын загвар устгагдсан байна. Хөрөнгийг сэргээхээс өмнө загварыг сэргээх хэрэгтэй.
Загвар-г сэргээхийн тулд энд дарна уу.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Уучлаарай',
'requested' => 'Хүсэлт гаргасан',
'restore' => 'Хөрөнгийг дахин сэргээх',
diff --git a/resources/lang/mn/admin/models/general.php b/resources/lang/mn/admin/models/general.php
index 37c5819c3..25d7618d4 100644
--- a/resources/lang/mn/admin/models/general.php
+++ b/resources/lang/mn/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Активын загварууд',
'about_models_text' => 'Хөрөнгийн загвар нь ижил төрлийн хөрөнгийг бүлэглэх арга юм. "MBP 2013", "IPhone 6s", гэх мэт.',
- 'deleted' => 'Энэ загварыг устгасан. Дахин оруулна уу.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Бөөнөөр хөрөнгийн загварыг устгах',
'bulk_delete_help' => 'Сонгосон хөрөнгийн загварыг устгахыг баталгаажуулж доорх хайрцгийг ашиглана уу. Хөрөнгөтэй холбоотой хөрөнгийн загварыг өөр загвартай холбох хүртэл устгах боломжгүй.',
'bulk_delete_warn' => 'Та :asset_count ширхэг хөрөнгийн загвар устгах гэж байна.',
diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php
index a9f21bb5a..c59a25acc 100644
--- a/resources/lang/mn/general.php
+++ b/resources/lang/mn/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Компанийн холбоог устгах',
'reports' => 'Тайлан',
'restored' => 'сэргээгдсэн',
+ 'restore' => 'Restore',
'requested' => 'Хүсэлт гаргасан',
'request_canceled' => 'Хүсэлтийг цуцалсан',
'save' => 'Хадгалах',
diff --git a/resources/lang/ms/admin/depreciations/general.php b/resources/lang/ms/admin/depreciations/general.php
index bc75e6698..47bf5cc8f 100644
--- a/resources/lang/ms/admin/depreciations/general.php
+++ b/resources/lang/ms/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nama Susut Nilai',
'number_of_months' => 'Bilangan Bulan',
'update' => 'Kemas kini Susutnilai',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ms/admin/hardware/general.php b/resources/lang/ms/admin/hardware/general.php
index 6bb40ab7d..cb6cf3376 100644
--- a/resources/lang/ms/admin/hardware/general.php
+++ b/resources/lang/ms/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Aset Checkout',
'clone' => 'Pendua Harta',
'deployable' => 'Deployable',
- 'deleted' => 'Aset ini telah dipadamkan. Klik di sini untuk memulihkannya.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Kemaskini Harta',
- 'model_deleted' => 'Model Aset ini telah dipadam. Anda mesti memulihkan model sebelum anda boleh memulihkan Asset.
Klik di sini untuk memulihkan model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Diminta',
'requested' => 'Diminta',
'restore' => 'Pulihkan Asset',
diff --git a/resources/lang/ms/admin/models/general.php b/resources/lang/ms/admin/models/general.php
index 15aff4021..9c19dbb47 100644
--- a/resources/lang/ms/admin/models/general.php
+++ b/resources/lang/ms/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Mengenai Model Asset',
'about_models_text' => 'Model Aset adalah cara untuk mengumpulkan aset yang sama. "MBP 2013", "IPhone 6s", dan sebagainya.',
- 'deleted' => 'Model ini telah dipadamkan. Klik di sini untuk memulihkannya.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Padam Secara Pukal Model Aset',
'bulk_delete_help' => 'Gunakan kotak semakan di bawah untuk mengesahkan penghapusan model aset terpilih. Model aset yang mempunyai aset yang berkaitan dengannya tidak boleh dihapuskan sehingga aset dikaitkan dengan model yang berbeza.',
'bulk_delete_warn' => 'Anda akan hapus :model_count model aset.',
diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php
index d80b154c3..feedcf5a0 100644
--- a/resources/lang/ms/general.php
+++ b/resources/lang/ms/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Keluarkan Persatuan Syarikat',
'reports' => 'Laporan',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Diminta',
'request_canceled' => 'Permintaan Dibatalkan',
'save' => 'Simpan',
diff --git a/resources/lang/nl/admin/depreciations/general.php b/resources/lang/nl/admin/depreciations/general.php
index 72ee8bccb..52c502628 100644
--- a/resources/lang/nl/admin/depreciations/general.php
+++ b/resources/lang/nl/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Afschrijvingsnaam',
'number_of_months' => 'Aantal maanden',
'update' => 'Afschrijving bijwerken',
+ 'depreciation_min' => 'Minimale waarde na afschrijving'
];
diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php
index 1f3d46a94..682774805 100644
--- a/resources/lang/nl/admin/hardware/general.php
+++ b/resources/lang/nl/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Asset uitchecken',
'clone' => 'Dupliceer Asset',
'deployable' => 'Uitgeefbaar',
- 'deleted' => 'Dit asset is verwijderd. Klik hier om het te herstellen.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Asset bewerken',
- 'model_deleted' => 'Dit Assets model is verwijderd. U moet het model herstellen voordat u het Asset kunt herstellen.
Klik hier om het model te herstellen.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Aanvraagbaar',
'requested' => 'Aangevraagd',
'restore' => 'Herstel Asset',
diff --git a/resources/lang/nl/admin/models/general.php b/resources/lang/nl/admin/models/general.php
index 90b2dfbae..968b1a447 100644
--- a/resources/lang/nl/admin/models/general.php
+++ b/resources/lang/nl/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Over Asset Modellen',
'about_models_text' => 'Assetmodellen zijn een manier om identieke assets te groeperen. "MBP 2013", "iPhone 6s", enz.',
- 'deleted' => 'Dit asset is verwijderd. Klik hier om het te herstellen.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'In bulk verwijderen van assetmodellen',
'bulk_delete_help' => 'Gebruik de selectievakjes hieronder om het verwijderen van de geselecteerde assetmodellen te bevestigen. Assetmodellen waarbij assets gekoppeld zijn, kunnen niet verwijderd worden totdat de assets gekoppeld zijn aan een ander model.',
'bulk_delete_warn' => 'Je staat op het punt om :model_count assetmodellen te verwijderen.',
diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php
index 4a8240a1a..da5f9cad4 100644
--- a/resources/lang/nl/general.php
+++ b/resources/lang/nl/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Verwijder bedrijfsverbinding',
'reports' => 'Rapporten',
'restored' => 'hersteld',
+ 'restore' => 'Restore',
'requested' => 'Aangevraagd',
'request_canceled' => 'Aanvraag geannuleerd',
'save' => 'Opslaan',
diff --git a/resources/lang/no/admin/depreciations/general.php b/resources/lang/no/admin/depreciations/general.php
index 0aef1ff61..52fc626c4 100644
--- a/resources/lang/no/admin/depreciations/general.php
+++ b/resources/lang/no/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Avskrivningsnavn',
'number_of_months' => 'Antall måneder',
'update' => 'Oppdater avskrivninger',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php
index 2360993d3..24d496817 100644
--- a/resources/lang/no/admin/hardware/general.php
+++ b/resources/lang/no/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Sjekk ut asset',
'clone' => 'Klon eiendel',
'deployable' => 'Utleverbar',
- 'deleted' => 'Denne eiendelen har blitt slettet. Klikk for å gjenopprette den.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Rediger eiendel',
- 'model_deleted' => 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.
Klikk her for å gjenopprette modellen.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Forespørrbar',
'requested' => 'Forespurt',
'restore' => 'Gjenopprett eiendel',
diff --git a/resources/lang/no/admin/models/general.php b/resources/lang/no/admin/models/general.php
index ea633beee..f8c759668 100644
--- a/resources/lang/no/admin/models/general.php
+++ b/resources/lang/no/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Om asset modeller',
'about_models_text' => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'Denne modellen er slettet. Klikk her for å gjenopprette.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk slett modeller',
'bulk_delete_help' => 'Bruk merkeboksene nedenfor til å bekrefte sletting av de merkede modellene. Modeller som har eiendeler tilknyttet kan ikke slettes før eiendelene har blitt tilknyttet en annen modell.',
'bulk_delete_warn' => 'Du er i ferd med å slette :model_count modeller.',
diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php
index 8a6fb4a8b..68bf2f669 100644
--- a/resources/lang/no/general.php
+++ b/resources/lang/no/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Fjern tilknytning til bedrift',
'reports' => 'Rapporter',
'restored' => 'gjenopprettet',
+ 'restore' => 'Restore',
'requested' => 'Forespurt',
'request_canceled' => 'Forespørsel avbrutt',
'save' => 'Lagre',
diff --git a/resources/lang/pl/admin/depreciations/general.php b/resources/lang/pl/admin/depreciations/general.php
index 00d5c5983..2eac13ae6 100644
--- a/resources/lang/pl/admin/depreciations/general.php
+++ b/resources/lang/pl/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nazwa amortyzacji',
'number_of_months' => 'Numer miesiąca',
'update' => 'Aktualizuj amortyzację',
+ 'depreciation_min' => 'Minimalna wartość po spadku wartości'
];
diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php
index 1b63c2bd2..724b589d2 100644
--- a/resources/lang/pl/admin/hardware/general.php
+++ b/resources/lang/pl/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Przypisz zasób',
'clone' => 'Klonuj zasób',
'deployable' => 'Gotowe do wdrożenia',
- 'deleted' => 'To aktywo zostało usunięte. Kliknij tutaj, aby je przywrócić.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edytuj zasób',
- 'model_deleted' => 'Model aktywa został usunięty. Należy przywrócić model przed przywróceniem aktywa.
Kliknij tutaj aby przywrócić model/.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Żądane',
'requested' => 'Zamówione',
'restore' => 'Przywróć aktywa',
diff --git a/resources/lang/pl/admin/models/general.php b/resources/lang/pl/admin/models/general.php
index 5aaf26113..4ca81431e 100644
--- a/resources/lang/pl/admin/models/general.php
+++ b/resources/lang/pl/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'O Modelach aktywów',
'about_models_text' => 'Modele aktywów są sposobem grupowania identycznych aktywów. "MBP 2013", "IPhone 6s", itp.',
- 'deleted' => 'Model został usunięty. Kliknij aby przywrócić.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Zbiorcze usuwanie modeli aktywów',
'bulk_delete_help' => 'Użyj poniższych pól wyboru, aby potwierdzić usunięcie wybranych modeli zasobów. Modele zasobów z którymi są powiązane zasoby, nie mogą zostać usunięte, dopóki zasoby nie zostaną powiązane z innym modelem.',
'bulk_delete_warn' => 'Zamierzasz usunąć :model_count modeli aktywów.',
diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php
index 3950bd7a3..1a2d5f605 100644
--- a/resources/lang/pl/general.php
+++ b/resources/lang/pl/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Usuń powiązanie firmy',
'reports' => 'Raporty',
'restored' => 'przywrócone',
+ 'restore' => 'Restore',
'requested' => 'Wymagane',
'request_canceled' => 'Żądanie anulowane',
'save' => 'Zapisz',
diff --git a/resources/lang/pl/mail.php b/resources/lang/pl/mail.php
index 4ffe0200a..4afcf9eae 100644
--- a/resources/lang/pl/mail.php
+++ b/resources/lang/pl/mail.php
@@ -9,7 +9,7 @@ return [
'asset' => 'Sprzęt:',
'asset_name' => 'Nazwa sprzętu:',
'asset_requested' => 'Wystosowane zapotrzebowanie na sprzęt',
- 'asset_tag' => 'Artykół Tag',
+ 'asset_tag' => 'Tag sprzętu',
'assigned_to' => 'Przypisane do',
'best_regards' => 'Pozdrawiam',
'canceled' => 'Anulowane:',
diff --git a/resources/lang/pt-BR/admin/depreciations/general.php b/resources/lang/pt-BR/admin/depreciations/general.php
index fdc1c0b9c..7ac282408 100644
--- a/resources/lang/pt-BR/admin/depreciations/general.php
+++ b/resources/lang/pt-BR/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nome da Depreciação',
'number_of_months' => 'Número de Meses',
'update' => 'Atualizar Depreciação',
+ 'depreciation_min' => 'Valor Mínimo após Depreciação'
];
diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php
index e17dcf153..9f85a2596 100644
--- a/resources/lang/pt-BR/admin/hardware/general.php
+++ b/resources/lang/pt-BR/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout de Ativo',
'clone' => 'Clonar Ativo',
'deployable' => 'Implementável',
- 'deleted' => 'Este ativo foi excluído. Clique aqui para restaurá-lo.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editar Ativo',
- 'model_deleted' => 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.
Clique aqui para restaurar o modelo.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Solicitável',
'requested' => 'Solicitado',
'restore' => 'Restaurar Ativo',
diff --git a/resources/lang/pt-BR/admin/models/general.php b/resources/lang/pt-BR/admin/models/general.php
index 4e52e9ed8..a7298d6fc 100644
--- a/resources/lang/pt-BR/admin/models/general.php
+++ b/resources/lang/pt-BR/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Sobre os Modelos de Ativos',
'about_models_text' => 'Os Modelos dos ativos são uma maneira para agrupar ativos idênticos. "MBP 2013", "iPhone 6s", etc.',
- 'deleted' => 'Este modelo foi excluído. Clique aqui para o restaurar.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk deletar modelos de ativos',
'bulk_delete_help' => 'Use a caixa abaixo para confirmar a exlusão dos modelos de ativos selecionados. Modelos de ativos que tem ativos associados a eles não podem ser deletados a não ser que esses ativos sejam associados a um modelo diferente.',
'bulk_delete_warn' => 'Você está prestes a exluir :model_count asset models.',
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index 7a5d333ef..535f920d1 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remover associação de empresa',
'reports' => 'Relatórios',
'restored' => 'restaurado',
+ 'restore' => 'Restore',
'requested' => 'Solicitado',
'request_canceled' => 'Pedido cancelado',
'save' => 'Salvar',
diff --git a/resources/lang/pt-PT/admin/depreciations/general.php b/resources/lang/pt-PT/admin/depreciations/general.php
index 3e7f14380..e5ddf2d6c 100644
--- a/resources/lang/pt-PT/admin/depreciations/general.php
+++ b/resources/lang/pt-PT/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nome da depreciação',
'number_of_months' => 'Número de mêses',
'update' => 'Actualizar depreciação',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php
index eb6291d70..0f3413c8c 100644
--- a/resources/lang/pt-PT/admin/hardware/general.php
+++ b/resources/lang/pt-PT/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Ativo de compras',
'clone' => 'Clonar Ativo',
'deployable' => 'Implementável',
- 'deleted' => 'Este ativo foi removido. Clique aqui para restaurar.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editar artigo',
- 'model_deleted' => 'Este modelo de ativo foi removido. Deve restaurar o modelo para poder restaurar o Ativo.
Clique aqui para restaurar o modelo.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Solicitavel',
'requested' => 'Requisitado',
'restore' => 'Restaurar ativo',
diff --git a/resources/lang/pt-PT/admin/models/general.php b/resources/lang/pt-PT/admin/models/general.php
index b941b7ac2..31dc2787d 100644
--- a/resources/lang/pt-PT/admin/models/general.php
+++ b/resources/lang/pt-PT/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Sobre os modelos dos artigos',
'about_models_text' => 'Os Modelos dos artigos são uma maneira para agrupar artigos idênticos. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'O modelo foi removido. Clique aqui para o restaurar.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Eliminar modelos de artigos em massa',
'bulk_delete_help' => 'Use as caixas de selecção abaixo para confirmar a eliminação dos modelos de artigos selecionados. Modelos de artigos que contenham artigos associados não serão eliminados até que estes artigos sejam associados a um modelo diferente.',
'bulk_delete_warn' => 'Esta prestes a eliminar :model_count modelos de artigos.',
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index 824fc8598..aac569c5a 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remover associação de empresa',
'reports' => 'Relatórios',
'restored' => 'restaurado',
+ 'restore' => 'Restore',
'requested' => 'Solicitado',
'request_canceled' => 'Pedido cancelado',
'save' => 'Guardar',
diff --git a/resources/lang/ro/admin/depreciations/general.php b/resources/lang/ro/admin/depreciations/general.php
index 72ae25fe8..abb936017 100644
--- a/resources/lang/ro/admin/depreciations/general.php
+++ b/resources/lang/ro/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Nume depreciere',
'number_of_months' => 'Numarul de luni',
'update' => 'Actualizați amortizarea',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ro/admin/hardware/general.php b/resources/lang/ro/admin/hardware/general.php
index c0997717f..fd01e1ab7 100644
--- a/resources/lang/ro/admin/hardware/general.php
+++ b/resources/lang/ro/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Cloneaza activ',
'deployable' => 'Lansabil',
- 'deleted' => 'Acest activ a fost șters. Faceți clic aici pentru a le restabili.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Editeaza activ',
- 'model_deleted' => 'Acest model de Active a fost șters. Trebuie să restabiliți modelul înainte de a putea să-l restabiliți. 123_45_0_321 Faceți clic aici pentru a restabili modelul.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Solicitat',
'restore' => 'Restabilirea activului',
diff --git a/resources/lang/ro/admin/models/general.php b/resources/lang/ro/admin/models/general.php
index dd3d631db..35cc654b4 100644
--- a/resources/lang/ro/admin/models/general.php
+++ b/resources/lang/ro/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Despre modelele de active',
'about_models_text' => 'Modelele de activ sunt o modalitate de a grupa active identice. "MBP 2013", "iPhone 6s" etc.',
- 'deleted' => 'Modelul a fost sters. Apasati aici pentru a-l restaura.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Stergere in masa a modelelor de echipamente',
'bulk_delete_help' => 'Utilizați casetele de selectare de mai jos pentru a confirma ștergerea modelelor de echipamente selectate. Modelele care au echipamente asociate cu acestea nu pot fi șterse până când activele nu sunt asociate cu un alt model.',
'bulk_delete_warn' => 'Sunteți pe cale să ștergeți modelul de echipament: model_count.',
diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php
index b3bb5f76e..b38d257a6 100644
--- a/resources/lang/ro/admin/settings/general.php
+++ b/resources/lang/ro/admin/settings/general.php
@@ -43,13 +43,13 @@ return [
'display_eol' => 'Arata EOL in tabel',
'display_qr' => 'Afișați codurile pătrată',
'display_alt_barcode' => 'Afișați coduri de bare 1D',
- 'email_logo' => 'Email Logo',
+ 'email_logo' => 'Logo e-mail',
'barcode_type' => 'Tip de cod de bare 2D',
'alt_barcode_type' => 'Tip de cod de bare 1D',
'email_logo_size' => 'Square logos in email look best. ',
'eula_settings' => 'Setările EULA',
'eula_markdown' => 'Această licență EULA permite Github aromdown markdown.',
- 'favicon' => 'Favicon',
+ 'favicon' => 'Pictogramă',
'favicon_format' => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
'favicon_size' => 'Favicons should be square images, 16x16 pixels.',
'footer_text' => 'Textul suplimentar în subsol ',
@@ -58,7 +58,7 @@ return [
'generate_backup' => 'Generați Backup',
'header_color' => 'Culoarea antetului',
'info' => 'Aceste setari va lasa sa modificati anumite aspecte ale instalarii.',
- 'label_logo' => 'Label Logo',
+ 'label_logo' => 'Sigla etichetei',
'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ',
'laravel' => 'Versiune Laravel',
'ldap_enabled' => 'LDAP activat',
diff --git a/resources/lang/ro/admin/users/general.php b/resources/lang/ro/admin/users/general.php
index ff390201a..4a1e070ff 100644
--- a/resources/lang/ro/admin/users/general.php
+++ b/resources/lang/ro/admin/users/general.php
@@ -1,7 +1,8 @@
'This user can login',
+
+return array(
+ 'activated_help_text' => 'Acest utilizator se poate conecta',
'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
'assets_user' => 'Activul desemnat catre :name',
'bulk_update_warn' => 'Sunteți pe punctul de a edita proprietățile utilizatorilor: user_count. Rețineți că nu puteți modifica propriile atribute ale utilizatorilor utilizând acest formular și trebuie să efectuați modificări individuale ale propriului dvs. utilizator.',
@@ -12,7 +13,7 @@ return [
'edit' => 'Editeaza utilizator',
'filetype_info' => 'Tipurile de fișiere permise sunt png, gif, jpg, jpeg, doc, docx, pdf, txt, zip și rar.',
'history_user' => 'Istoric pentru :name',
- 'info' => 'Info',
+ 'info' => 'Info',
'restore_user' => 'Faceți clic aici pentru a le restaura.',
'last_login' => 'Ultima logare',
'ldap_config_text' => 'Setările de configurare LDAP pot fi găsite pe Administrator> Setări. Locația selectată (opțional) va fi setată pentru toți utilizatorii importați.',
@@ -24,4 +25,4 @@ return [
'two_factor_admin_optin_help' => 'Setările dvs. actuale de administrare permit executarea selectivă a autentificării cu două factori.',
'two_factor_enrolled' => 'Dispozitivul 2FA Înregistrat',
'two_factor_active' => '2FA Active',
- ];
+ );
diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php
index c22a52280..d13bb7987 100644
--- a/resources/lang/ro/general.php
+++ b/resources/lang/ro/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Eliminați asocierea companiilor',
'reports' => 'Rapoarte',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Cereri',
'request_canceled' => 'Cerere anulată',
'save' => 'Salveaza',
diff --git a/resources/lang/ru/admin/depreciations/general.php b/resources/lang/ru/admin/depreciations/general.php
index 1b2963637..325ce7fdd 100644
--- a/resources/lang/ru/admin/depreciations/general.php
+++ b/resources/lang/ru/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Название амортизации',
'number_of_months' => 'Количество месяцев',
'update' => 'Обновить амортизацию',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ru/admin/hardware/general.php b/resources/lang/ru/admin/hardware/general.php
index a153f7854..5ef3078a4 100644
--- a/resources/lang/ru/admin/hardware/general.php
+++ b/resources/lang/ru/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Выдать актив пользователю',
'clone' => 'Клонировать актив',
'deployable' => 'Доступные',
- 'deleted' => 'Этот актив был удален. Нажмите, чтобы восстановить.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Редактировать актив',
- 'model_deleted' => 'Эта модель актива была удалена. Необходимо сначала восстановить модель актива прежде чем восстанавливать сам актив.
Нажмите здесь, чтобы восстановить модель.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Готов к выдаче',
'requested' => 'Запрошенное',
'restore' => 'Восстановить актив',
diff --git a/resources/lang/ru/admin/models/general.php b/resources/lang/ru/admin/models/general.php
index 8fbc01e29..a81922408 100644
--- a/resources/lang/ru/admin/models/general.php
+++ b/resources/lang/ru/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'О моделях активов',
'about_models_text' => 'Модели активов это способ группировки идентичных активов. Например, "MacBookPro 2013, iPhone 6s", и т. д.',
- 'deleted' => 'Эта модель была удалена. Нажмите здесь, чтобы восстановить.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Массовое удаление моделей активов',
'bulk_delete_help' => 'Установите флажки ниже, чтобы подтвердить удаление выбранных моделей активов. Модели, имеющие связанные с ними активы, не могут быть удалены до тех пор, пока активы не будут связаны с другой моделью.',
'bulk_delete_warn' => 'Вы собираетесь удалить :model_count моделей активов.',
diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php
index bc63098f3..2701edde0 100644
--- a/resources/lang/ru/general.php
+++ b/resources/lang/ru/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Удалить привязку компании',
'reports' => 'Отчеты',
'restored' => 'восстановлено',
+ 'restore' => 'Restore',
'requested' => 'Запрошено',
'request_canceled' => 'Запрос отменен',
'save' => 'Сохранить',
diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php
index 4847e5193..a78e59fba 100644
--- a/resources/lang/ru/mail.php
+++ b/resources/lang/ru/mail.php
@@ -20,10 +20,10 @@ return [
'click_on_the_link_asset' => 'Пожалуйста, перейдите по ссылке внизу, чтобы подтвердить получение актива.',
'Confirm_Asset_Checkin' => 'Подтверждение возврата активов',
'Confirm_Accessory_Checkin' => 'Подтвердить возврат аксессуара',
- 'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
- 'Confirm_license_delivery' => 'License delivery confirmation',
- 'Confirm_asset_delivery' => 'Asset delivery confirmation',
- 'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+ 'Confirm_accessory_delivery' => 'Подтвердить доставку аксессуара',
+ 'Confirm_license_delivery' => 'Подтвердите получение лицензии',
+ 'Confirm_asset_delivery' => 'Подтвердить доставку актива',
+ 'Confirm_consumable_delivery' => 'Подтвердить доставку расходников',
'current_QTY' => 'Текущее количество',
'Days' => 'Дни',
'days' => 'Дни',
diff --git a/resources/lang/si-LK/admin/depreciations/general.php b/resources/lang/si-LK/admin/depreciations/general.php
index 1fca0e2cb..a5dec994c 100644
--- a/resources/lang/si-LK/admin/depreciations/general.php
+++ b/resources/lang/si-LK/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return array(
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
);
diff --git a/resources/lang/si-LK/admin/hardware/general.php b/resources/lang/si-LK/admin/hardware/general.php
index f1fcd4731..af2be65fc 100644
--- a/resources/lang/si-LK/admin/hardware/general.php
+++ b/resources/lang/si-LK/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/si-LK/admin/models/general.php b/resources/lang/si-LK/admin/models/general.php
index 3281cfe0f..d2d77e0e8 100644
--- a/resources/lang/si-LK/admin/models/general.php
+++ b/resources/lang/si-LK/admin/models/general.php
@@ -3,7 +3,7 @@
return array(
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index 539a01a13..446957c9a 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/sk/admin/depreciations/general.php b/resources/lang/sk/admin/depreciations/general.php
index 60ffbdcc8..8f8250c0e 100644
--- a/resources/lang/sk/admin/depreciations/general.php
+++ b/resources/lang/sk/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return array(
'depreciation_name' => 'Názov odpisovania',
'number_of_months' => 'Počet mesiacov',
'update' => 'Upraviť odpisovanie',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
);
diff --git a/resources/lang/sk/admin/hardware/general.php b/resources/lang/sk/admin/hardware/general.php
index f33503a59..4eafc6bf6 100644
--- a/resources/lang/sk/admin/hardware/general.php
+++ b/resources/lang/sk/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
'checkout' => 'Vyskladniť majetok',
'clone' => 'Duplikovať majetok',
'deployable' => 'Vyskladniteľný',
- 'deleted' => 'Tento majetok bol odstránený. Kliknite sem pre jeho obnovenie.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Upraviť majetok',
- 'model_deleted' => 'Tento model majetku bol odstránený. Pred obnovením majetku musíte najprv obnoviť model.
Pre obnovenie modelu kliknite sem.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Vyžiadateľný',
'requested' => 'Vyžiadané',
'restore' => 'Obnoviť majetok',
diff --git a/resources/lang/sk/admin/models/general.php b/resources/lang/sk/admin/models/general.php
index 3281cfe0f..d2d77e0e8 100644
--- a/resources/lang/sk/admin/models/general.php
+++ b/resources/lang/sk/admin/models/general.php
@@ -3,7 +3,7 @@
return array(
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/sk/general.php b/resources/lang/sk/general.php
index 539a01a13..446957c9a 100644
--- a/resources/lang/sk/general.php
+++ b/resources/lang/sk/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/sl/admin/depreciations/general.php b/resources/lang/sl/admin/depreciations/general.php
index 4ca4be5ac..2710cccf8 100644
--- a/resources/lang/sl/admin/depreciations/general.php
+++ b/resources/lang/sl/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Ime amortizacije',
'number_of_months' => 'Število mesecev',
'update' => 'Posodobi amortizacijo',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/sl/admin/hardware/general.php b/resources/lang/sl/admin/hardware/general.php
index ca9d916e0..0eee65ec5 100644
--- a/resources/lang/sl/admin/hardware/general.php
+++ b/resources/lang/sl/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Izdaja sredstev',
'clone' => 'Klonska sredstvo',
'deployable' => 'Razdeljeno',
- 'deleted' => 'To sredstvo je bilo izbrisano. Kliknite tukaj, da ga obnovite.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Urejanje sredstva',
- 'model_deleted' => 'Ta model sredsteva je bil izbrisan. Pred obnovitvijo sredstva morate obnoviti model.
Kliknite tukaj, da obnovite model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Zahtevano',
'requested' => 'Zahtevano',
'restore' => 'Obnovitev sredstev',
diff --git a/resources/lang/sl/admin/models/general.php b/resources/lang/sl/admin/models/general.php
index 94efac83d..f78ee3924 100644
--- a/resources/lang/sl/admin/models/general.php
+++ b/resources/lang/sl/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'O modelih sredstev',
'about_models_text' => 'Modeli sredstev so način za združevanje identičnih sredstev. "MBP 2013", "IPhone 6s" itd.',
- 'deleted' => 'Ta model je bil izbrisan. Kliknite tukaj, da ga obnovite.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Množično brisanje modelov sredstva',
'bulk_delete_help' => 'S potrditvenimi polji spodaj potrdite izbris izbranih modelov sredstev. Modelov sredstev, ki imajo z njimi povezana sredstva, ni mogoče izbrisati, dokler sredstva niso povezana z drugačnim modelom.',
'bulk_delete_warn' => 'Izbrisali boste :modelov_count modelov sredstev.',
diff --git a/resources/lang/sl/general.php b/resources/lang/sl/general.php
index 518ecc9f6..3ffcb52d7 100644
--- a/resources/lang/sl/general.php
+++ b/resources/lang/sl/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Odstrani povezavo do podjetja',
'reports' => 'Poročila',
'restored' => 'obnovljena',
+ 'restore' => 'Restore',
'requested' => 'Zahtevano',
'request_canceled' => 'Zahteva je bila preklicana',
'save' => 'Shrani',
diff --git a/resources/lang/sr-CS/admin/accessories/message.php b/resources/lang/sr-CS/admin/accessories/message.php
index f80643a3f..223354ebf 100644
--- a/resources/lang/sr-CS/admin/accessories/message.php
+++ b/resources/lang/sr-CS/admin/accessories/message.php
@@ -2,7 +2,7 @@
return [
- 'does_not_exist' => 'The accessory [:id] does not exist.',
+ 'does_not_exist' => 'Pribor [:Id] ne postoji.',
'assoc_users' => 'Ovaj pribor trenutno ima :count stavku označenu korisnicima. Proverite pribor i pokušajte ponovo. ',
'create' => [
diff --git a/resources/lang/sr-CS/admin/asset_maintenances/general.php b/resources/lang/sr-CS/admin/asset_maintenances/general.php
index 1c4031777..381b7cf3f 100644
--- a/resources/lang/sr-CS/admin/asset_maintenances/general.php
+++ b/resources/lang/sr-CS/admin/asset_maintenances/general.php
@@ -9,6 +9,6 @@
'maintenance' => 'Održavanje',
'upgrade' => 'Nadogradnja',
'calibration' => 'Calibration',
- 'software_support' => 'Software Support',
- 'hardware_support' => 'Hardware Support',
+ 'software_support' => 'Podrška Softver',
+ 'hardware_support' => 'Podrška Hardware',
];
diff --git a/resources/lang/sr-CS/admin/depreciations/general.php b/resources/lang/sr-CS/admin/depreciations/general.php
index 6cefe0cea..8456f982a 100644
--- a/resources/lang/sr-CS/admin/depreciations/general.php
+++ b/resources/lang/sr-CS/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Naziv amortizacije',
'number_of_months' => 'Broj meseci',
'update' => 'Ažuriraj amortizaciju',
+ 'depreciation_min' => 'Minimalna vrednost nakon amortizacije'
];
diff --git a/resources/lang/sr-CS/admin/hardware/general.php b/resources/lang/sr-CS/admin/hardware/general.php
index cf89f0bb4..dac937017 100644
--- a/resources/lang/sr-CS/admin/hardware/general.php
+++ b/resources/lang/sr-CS/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Kloniraj imovinu',
'deployable' => 'Može se razmestiti',
- 'deleted' => 'Ova je imovina izbrisana. Kliknite ovdje da biste je vratili.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Uređivanje imovine',
- 'model_deleted' => 'Model ove stavke je izbrisan. Morate vratiti model prije nego što vratite Asset.
Kliknite ovde da biste vratili model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Može da se potražuje',
'requested' => 'Zatraženo',
'restore' => 'Restore Asset',
diff --git a/resources/lang/sr-CS/admin/models/general.php b/resources/lang/sr-CS/admin/models/general.php
index c59854046..4b42fe622 100644
--- a/resources/lang/sr-CS/admin/models/general.php
+++ b/resources/lang/sr-CS/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'O modelu imovine',
'about_models_text' => 'Modeli imovine su način grupisanja identične imovine. "MBP 2013", "IPhone 6s" itd.',
- 'deleted' => 'Ovaj je model izbrisan. Kliknite ovde da biste ga vratili.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Skupno brisanje modela imovine',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'Želite da obrišete :model_count asset models.',
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index ed3237cb9..7490d6134 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Ukloni asocijaciju sa firmom',
'reports' => 'Izveštaji',
'restored' => 'vraćeno u prethodno stanje',
+ 'restore' => 'Restore',
'requested' => 'Tražena',
'request_canceled' => 'Zahtev je otkazan',
'save' => 'Sačuvaj',
diff --git a/resources/lang/sv-SE/admin/depreciations/general.php b/resources/lang/sv-SE/admin/depreciations/general.php
index c96f70bcf..d30c3dcbb 100644
--- a/resources/lang/sv-SE/admin/depreciations/general.php
+++ b/resources/lang/sv-SE/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Avskrivningsnamn',
'number_of_months' => 'Antal Månader',
'update' => 'Uppdatera avskrivningar',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/sv-SE/admin/hardware/general.php b/resources/lang/sv-SE/admin/hardware/general.php
index 832949dc7..cb24dd856 100644
--- a/resources/lang/sv-SE/admin/hardware/general.php
+++ b/resources/lang/sv-SE/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Klon tillgång',
'deployable' => 'Deployable',
- 'deleted' => 'Den här tillgången har tagits bort. Klicka här för att återställa det.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Redigera tillgång',
- 'model_deleted' => 'Denna tillgångsmodell har raderats. Du måste återställa modellen innan du kan återställa Asset.
Klick här för att återställa modellen.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Tillgängliga',
'requested' => 'Begärda',
'restore' => 'Återställ tillgången',
diff --git a/resources/lang/sv-SE/admin/models/general.php b/resources/lang/sv-SE/admin/models/general.php
index 193d00c4c..f0de34fe4 100644
--- a/resources/lang/sv-SE/admin/models/general.php
+++ b/resources/lang/sv-SE/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Om modeller',
'about_models_text' => 'Modeller är ett sätt att gruppera identiska tillgångar. "Galaxy S20", "iPhone 12", etc.',
- 'deleted' => 'Den här modellen har tagits bort. Klicka här för att återskapa.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Radera modeller',
'bulk_delete_help' => 'Använd kryssrutan här under för att bekräfta borttagning av valda modeller. Modeller som har tillgångar kopplade till sig kan inte raderas innan dessa är kopplade till en annan modell.',
'bulk_delete_warn' => 'Du håller på att ta bort: model_count modeller.',
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index 419182bdf..a7372e83b 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Ta bort företagsföreningen',
'reports' => 'Rapporter',
'restored' => 'återställd',
+ 'restore' => 'Restore',
'requested' => 'Begärda',
'request_canceled' => 'Förfrågan annulleras',
'save' => 'Spara',
diff --git a/resources/lang/ta/admin/depreciations/general.php b/resources/lang/ta/admin/depreciations/general.php
index bbcc9bdd3..410cdf8ac 100644
--- a/resources/lang/ta/admin/depreciations/general.php
+++ b/resources/lang/ta/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'தேய்மானி பெயர்',
'number_of_months' => 'மாதங்களின் எண்ணிக்கை',
'update' => 'தேய்மானம் புதுப்பிக்கவும்',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ta/admin/hardware/general.php b/resources/lang/ta/admin/hardware/general.php
index 113c9ff19..c4f78bc7a 100644
--- a/resources/lang/ta/admin/hardware/general.php
+++ b/resources/lang/ta/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'சரிபார்ப்புச் சொத்து',
'clone' => 'குளோன் சொத்து',
'deployable' => 'அணியப்படுத்தக்',
- 'deleted' => 'இந்த சொத்து நீக்கப்பட்டது. அதை மீட்டமைக்க இங்கு கிளிக் செய்க. .',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'சொத்து திருத்து',
- 'model_deleted' => 'இந்த சொத்து மாடல் நீக்கப்பட்டது. நீங்கள் சொத்து மீட்டமைக்கப்படுவதற்கு முன் மாடலை நீங்கள் மீட்டெடுக்க வேண்டும்.
model ஐ மீட்டமைக்க இங்கே கிளிக் செய்க.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'கோரப்பட்டது',
'restore' => 'சொத்து மீட்டமை',
diff --git a/resources/lang/ta/admin/models/general.php b/resources/lang/ta/admin/models/general.php
index 04bb24352..4eb03f9dd 100644
--- a/resources/lang/ta/admin/models/general.php
+++ b/resources/lang/ta/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'சொத்து மாடல்களைப் பற்றி',
'about_models_text' => 'சொத்து மாதிரிகள் ஒரே மாதிரியான சொத்துக்களை குழுவாக மாற்றுகின்றன. "MBP 2013", "ஐபோன் 6s", முதலியன',
- 'deleted' => 'இந்த மாதிரி நீக்கப்பட்டது. அதை மீட்டமைக்க இங்கு கிளிக் செய்க. .',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php
index 092446f6f..691290674 100644
--- a/resources/lang/ta/general.php
+++ b/resources/lang/ta/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'நிறுவன சங்கத்தை அகற்று',
'reports' => 'அறிக்கைகள்',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'கோரப்பட்டது',
'request_canceled' => 'கோரிக்கை ரத்து செய்யப்பட்டது',
'save' => 'சேமி',
diff --git a/resources/lang/th/admin/depreciations/general.php b/resources/lang/th/admin/depreciations/general.php
index 1eb8ffd54..1015d3f93 100644
--- a/resources/lang/th/admin/depreciations/general.php
+++ b/resources/lang/th/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'ชื่อค่าเสื่อมราคา',
'number_of_months' => 'จำนวนเดือน',
'update' => 'อัปเดตค่าเสื่อมราคา',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/th/admin/hardware/general.php b/resources/lang/th/admin/hardware/general.php
index 0d83abf81..cbf70f5c0 100644
--- a/resources/lang/th/admin/hardware/general.php
+++ b/resources/lang/th/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'ตรวจสอบสินทรัพย์',
'clone' => 'คัดลอกแบบสินทรัพย์',
'deployable' => 'สามารถใช้งานได้',
- 'deleted' => 'สินทรัพย์นี้ถูกลบแล้ว คลิกที่นี่เพื่อกู้คืน.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'แก้ไขสินทรัพย์',
- 'model_deleted' => 'รุ่นสินทรัพย์นี้ถูกลบ ก่อนที่คุณจะสามารถกู้คืนสินทรัพย์นี้ คุณต้องกู้คืนรุ่นสินทรัพย์นี้
คลิกที่นี่เพื้อกู้คืนรุ่น.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'ร้องขอได้',
'requested' => 'การขอใช้บริการ',
'restore' => 'กู้คืนสินทรัพย์',
diff --git a/resources/lang/th/admin/models/general.php b/resources/lang/th/admin/models/general.php
index edf863e11..34212d704 100644
--- a/resources/lang/th/admin/models/general.php
+++ b/resources/lang/th/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'เกี่ยวกับโมเดลสินทรัพย์',
'about_models_text' => 'โมเดลสินทรัพย์คือวิธีการจัดกลุ่มเนื้อหาที่เหมือนกัน "MBP 2013", "IPhone 6s" ฯลฯ',
- 'deleted' => 'โมเดลนี้ถูกลบแล้ว Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'การลบรายการเป็นกลุ่ม',
'bulk_delete_help' => 'ใช้ช่องทำเครื่องหมายด้านล่างเพื่อยืนยันการลบโมเดลเนื้อหาที่เลือก โมเดลสินทรัพย์ที่มีเนื้อหาเกี่ยวข้องกับเนื้อหาเหล่านั้นไม่สามารถลบออกได้จนกว่าสินทรัพย์จะเชื่อมโยงกับโมเดลอื่น',
'bulk_delete_warn' => 'คุณกำลังจะลบ: asset_count',
diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php
index 0b1781d43..5ce8781f4 100644
--- a/resources/lang/th/general.php
+++ b/resources/lang/th/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'นำออกสมาคม บริษัท',
'reports' => 'รายงาน',
'restored' => 'คืนค่า',
+ 'restore' => 'Restore',
'requested' => 'คำร้องขอ',
'request_canceled' => 'คำขอยกเลิกแล้ว',
'save' => 'บันทึก',
diff --git a/resources/lang/tl/admin/depreciations/general.php b/resources/lang/tl/admin/depreciations/general.php
index e0b02c009..e6c86b9ff 100644
--- a/resources/lang/tl/admin/depreciations/general.php
+++ b/resources/lang/tl/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/tl/admin/hardware/general.php b/resources/lang/tl/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/tl/admin/hardware/general.php
+++ b/resources/lang/tl/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/tl/admin/models/general.php b/resources/lang/tl/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/tl/admin/models/general.php
+++ b/resources/lang/tl/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/tl/general.php b/resources/lang/tl/general.php
index 9bb3f84e4..c1931af8d 100644
--- a/resources/lang/tl/general.php
+++ b/resources/lang/tl/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/tr/admin/depreciations/general.php b/resources/lang/tr/admin/depreciations/general.php
index c710cea18..47b427964 100644
--- a/resources/lang/tr/admin/depreciations/general.php
+++ b/resources/lang/tr/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Amortisman Adı',
'number_of_months' => 'Ay Sayısı',
'update' => 'Değer Kaybını Güncelle',
+ 'depreciation_min' => 'Değişiklik sonrası minumum değer'
];
diff --git a/resources/lang/tr/admin/hardware/general.php b/resources/lang/tr/admin/hardware/general.php
index cdd2677fb..c5e3565a3 100644
--- a/resources/lang/tr/admin/hardware/general.php
+++ b/resources/lang/tr/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Ödenme Öğe',
'clone' => 'Demirbaşı Kopyala',
'deployable' => 'Dağıtılabilir',
- 'deleted' => 'Bu demirbaş silindi. Geri getirmek için tıklayınız.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Demirbaşı Düzenle',
- 'model_deleted' => 'Bu demirbaş modeli silindi. Bu demirbaşı geri getirmek için önce modeli geri getiriniz.
Modeli geri getirmek için tıklayınız.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Talep edilebilir',
'requested' => 'Talep edildi',
'restore' => 'Demirbaşı Geri Getir',
diff --git a/resources/lang/tr/admin/models/general.php b/resources/lang/tr/admin/models/general.php
index f1806a249..2653cefc1 100644
--- a/resources/lang/tr/admin/models/general.php
+++ b/resources/lang/tr/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Varlık Modelleri Hakkında',
'about_models_text' => 'Varlık Modelleri, özdeş varlıkları gruplamanın bir yoludur. Örn: "Tiny M73", "Samsung A7", vb.',
- 'deleted' => 'Model silindi. Geri getirmek için buraya tıklayınız.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Varlık Modellerini Toplu Silme',
'bulk_delete_help' => 'Seçilen varlık modelleri silme işlemini onaylamak için aşağıdaki onay kutularını kullanın. Başka bir varlık modeli ile ilişkilendirilmiş olan varlık modelleri, başka bir varlık modeli ile ilişkilendirilmeden silinemez.',
'bulk_delete_warn' => ':model_count varlık modellerini silmek üzeresiniz.',
diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php
index cf791957a..00ae2dc5e 100644
--- a/resources/lang/tr/general.php
+++ b/resources/lang/tr/general.php
@@ -179,6 +179,7 @@ Context | Request Context
'remove_company' => 'Firma bağlantısını sil',
'reports' => 'Raporlar',
'restored' => 'geri yüklendi',
+ 'restore' => 'Restore',
'requested' => 'Talep Edilen',
'request_canceled' => 'Talep iptal edildi',
'save' => 'Kaydet',
diff --git a/resources/lang/uk/admin/depreciations/general.php b/resources/lang/uk/admin/depreciations/general.php
index 041b64d04..e848d825b 100644
--- a/resources/lang/uk/admin/depreciations/general.php
+++ b/resources/lang/uk/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Кількість місяців',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/uk/admin/hardware/general.php b/resources/lang/uk/admin/hardware/general.php
index c14a76e52..f7f274cf5 100644
--- a/resources/lang/uk/admin/hardware/general.php
+++ b/resources/lang/uk/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Видати актив',
'clone' => 'Клонувати актив',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Редагувати актив',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/uk/admin/models/general.php b/resources/lang/uk/admin/models/general.php
index 24858c418..ae3ed8994 100644
--- a/resources/lang/uk/admin/models/general.php
+++ b/resources/lang/uk/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Про моделі активів',
'about_models_text' => 'Моделі активів це спосіб групування ідентичних активів. Наприклад, «Lenovo G700», «Nokia 3310», тощо.',
- 'deleted' => 'Цю мадель видалено. Натисніть для її відновлення.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/uk/general.php b/resources/lang/uk/general.php
index f18ff6bfe..3b97644fd 100644
--- a/resources/lang/uk/general.php
+++ b/resources/lang/uk/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Звіти',
'restored' => 'відновлено',
+ 'restore' => 'Restore',
'requested' => 'Запрошено користувачем',
'request_canceled' => 'Запит скасовано',
'save' => 'Зберегти',
diff --git a/resources/lang/ur-PK/admin/depreciations/general.php b/resources/lang/ur-PK/admin/depreciations/general.php
index e0b02c009..e6c86b9ff 100644
--- a/resources/lang/ur-PK/admin/depreciations/general.php
+++ b/resources/lang/ur-PK/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/ur-PK/admin/hardware/general.php b/resources/lang/ur-PK/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/ur-PK/admin/hardware/general.php
+++ b/resources/lang/ur-PK/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/ur-PK/admin/models/general.php b/resources/lang/ur-PK/admin/models/general.php
index 6b3893234..046fd562e 100644
--- a/resources/lang/ur-PK/admin/models/general.php
+++ b/resources/lang/ur-PK/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'About Asset Models',
'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
- 'deleted' => 'This model has been deleted. Click here to restore it.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index 9bb3f84e4..c1931af8d 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/vi/admin/depreciations/general.php b/resources/lang/vi/admin/depreciations/general.php
index 8f3afd9b5..bd45ee262 100644
--- a/resources/lang/vi/admin/depreciations/general.php
+++ b/resources/lang/vi/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Tên khấu hao',
'number_of_months' => 'Số lượng tháng',
'update' => 'Cập nhật khấu hao',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/vi/admin/hardware/general.php b/resources/lang/vi/admin/hardware/general.php
index fe8b90f34..1db379cd8 100644
--- a/resources/lang/vi/admin/hardware/general.php
+++ b/resources/lang/vi/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Tài sản thanh toán',
'clone' => 'Nhân đôi tài sản',
'deployable' => 'Cho phép cấp phát',
- 'deleted' => 'Tài sản này đã bị xóa. Nhấn vào đây để phục hồi.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Sửa tài sản',
- 'model_deleted' => 'Kiểu tài sản này đã bị xóa. Bạn phải phục hồi kiểu tài sản trước khi bạn phục hồi Tài sản.
Nhấn vào đây để phục hồi kiểu tài sản.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Cho phép đề xuất',
'requested' => 'Yêu cầu',
'restore' => 'Phục hồi tài sản',
diff --git a/resources/lang/vi/admin/models/general.php b/resources/lang/vi/admin/models/general.php
index 15fabe32d..4c085343b 100644
--- a/resources/lang/vi/admin/models/general.php
+++ b/resources/lang/vi/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Giới thiệu về Mô hình Tài sản',
'about_models_text' => 'Mô hình Tài sản là một cách để nhóm các tài sản giống nhau. "MBP 2013", "IPhone 6", v.v ...',
- 'deleted' => 'Model này đã bị xoá. Bấm vào đây để khôi phục lại.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Xóa hàng loạt Kiểu tài sản',
'bulk_delete_help' => 'Sử dụng hộp kiểm bên dưới để xác nhận việc sẽ xóa kiểu tài sản đã lựa chọn. Kiểu tài sản đó có liên kết với tài sản thì sẽ không thể xóa cho đến khi tài sản đó được chuyển đến kiểu tài sản khác.',
'bulk_delete_warn' => 'Bạn sắp xóa :model_count asset models.',
diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php
index c8fbef223..736328c46 100644
--- a/resources/lang/vi/general.php
+++ b/resources/lang/vi/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Xóa Hiệp hội Công ty',
'reports' => 'Các báo cáo',
'restored' => 'khôi phục',
+ 'restore' => 'Restore',
'requested' => 'Đã yêu cầu',
'request_canceled' => 'Yêu cầu Đã Hủy',
'save' => 'Lưu',
diff --git a/resources/lang/zh-CN/admin/depreciations/general.php b/resources/lang/zh-CN/admin/depreciations/general.php
index 62deac96a..96f2918cc 100644
--- a/resources/lang/zh-CN/admin/depreciations/general.php
+++ b/resources/lang/zh-CN/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => '折旧名称',
'number_of_months' => '月数',
'update' => '更新折旧',
+ 'depreciation_min' => '最底折旧值'
];
diff --git a/resources/lang/zh-CN/admin/hardware/general.php b/resources/lang/zh-CN/admin/hardware/general.php
index f90cdd3c1..4ed665959 100644
--- a/resources/lang/zh-CN/admin/hardware/general.php
+++ b/resources/lang/zh-CN/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => '借出资产',
'clone' => '复制资产',
'deployable' => '可部署',
- 'deleted' => '该资产已删除。 点击此处恢复.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => '编辑资产',
- 'model_deleted' => '这个资产模型将被删除，恢复资产之前需要先恢复模型。
单击这里备份模型.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => '可申领',
'requested' => '已申请',
'restore' => '还原资产',
diff --git a/resources/lang/zh-CN/admin/models/general.php b/resources/lang/zh-CN/admin/models/general.php
index 165236383..0cce521bb 100644
--- a/resources/lang/zh-CN/admin/models/general.php
+++ b/resources/lang/zh-CN/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => '关于资产型号',
'about_models_text' => '资产型号是将相同资产分组的一种方式。"MBP 2013"、"IPhone 6s"等。',
- 'deleted' => '此型号已被删除。点击此处恢复。',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => '批量删除资产型号',
'bulk_delete_help' => '使用下面的复选框确认删除所选资产型号。若有与之关联的资产，该资产型号则不能删除，除非将关联资产关联到别的资产型号。',
'bulk_delete_warn' => '您即将删除:model_count资产型号。',
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index e89f07ed9..111d1488c 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -176,6 +176,7 @@
'remove_company' => '移除公司关联',
'reports' => '报告',
'restored' => '恢复',
+ 'restore' => 'Restore',
'requested' => '已申请',
'request_canceled' => '取消请求',
'save' => '保存',
diff --git a/resources/lang/zh-HK/admin/depreciations/general.php b/resources/lang/zh-HK/admin/depreciations/general.php
index e21ef85f9..a5dec994c 100644
--- a/resources/lang/zh-HK/admin/depreciations/general.php
+++ b/resources/lang/zh-HK/admin/depreciations/general.php
@@ -1,12 +1,13 @@
'關於資產折舊',
- 'about_depreciations' => '您可以設置資產折舊期限',
- 'asset_depreciations' => '資產折舊',
- 'create' => '新建折舊',
- 'depreciation_name' => '折舊名稱',
- 'number_of_months' => '月數',
- 'update' => '更新折舊',
+return array(
+ 'about_asset_depreciations' => 'About Asset Depreciations',
+ 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+ 'asset_depreciations' => 'Asset Depreciations',
+ 'create' => 'Create Depreciation',
+ 'depreciation_name' => 'Depreciation Name',
+ 'number_of_months' => 'Number of Months',
+ 'update' => 'Update Depreciation',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
-];
+);
diff --git a/resources/lang/zh-HK/admin/hardware/general.php b/resources/lang/zh-HK/admin/hardware/general.php
index c5e5a483a..80a2c14e5 100644
--- a/resources/lang/zh-HK/admin/hardware/general.php
+++ b/resources/lang/zh-HK/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
- 'deleted' => 'This asset has been deleted. Click here to restore it.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
- 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'restore' => 'Restore Asset',
diff --git a/resources/lang/zh-HK/admin/models/general.php b/resources/lang/zh-HK/admin/models/general.php
index ae7a7a422..d2d77e0e8 100644
--- a/resources/lang/zh-HK/admin/models/general.php
+++ b/resources/lang/zh-HK/admin/models/general.php
@@ -1,18 +1,18 @@
'關於資產型號',
- 'about_models_text' => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。',
- 'deleted' => '此型號已被刪除。點擊此處恢復。',
- 'bulk_delete' => '批次刪除資產型號',
- 'bulk_delete_help' => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。',
- 'bulk_delete_warn' => '您即將刪除資產型號 :model_count。',
- 'restore' => '恢復型號',
- 'requestable' => '使用者可申請此型號',
- 'show_mac_address' => '在型號資產中顯示MAC地址',
- 'view_deleted' => '檢視已刪除',
- 'view_models' => '檢視型號',
- 'fieldset' => '欄位集',
- 'no_custom_field' => '沒有自訂欄位',
- 'add_default_values' => '新增預設值',
-];
+return array(
+ 'about_models_title' => 'About Asset Models',
+ 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
+ 'deleted' => 'This model has been deleted.',
+ 'bulk_delete' => 'Bulk Delete Asset Models',
+ 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+ 'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
+ 'restore' => 'Restore Model',
+ 'requestable' => 'Users may request this model',
+ 'show_mac_address' => 'Show MAC address field in assets in this model',
+ 'view_deleted' => 'View Deleted',
+ 'view_models' => 'View Models',
+ 'fieldset' => 'Fieldset',
+ 'no_custom_field' => 'No custom fields',
+ 'add_default_values' => 'Add default values',
+);
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index 9bb3f84e4..c1931af8d 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Remove Company Association',
'reports' => 'Reports',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Requested',
'request_canceled' => 'Request Canceled',
'save' => 'Save',
diff --git a/resources/lang/zh-TW/admin/depreciations/general.php b/resources/lang/zh-TW/admin/depreciations/general.php
index e21ef85f9..8c5760727 100644
--- a/resources/lang/zh-TW/admin/depreciations/general.php
+++ b/resources/lang/zh-TW/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => '折舊名稱',
'number_of_months' => '月數',
'update' => '更新折舊',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php
index db1f57fc0..b82ed8b85 100644
--- a/resources/lang/zh-TW/admin/hardware/general.php
+++ b/resources/lang/zh-TW/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => '借出資產',
'clone' => '複製資產',
'deployable' => '可部署',
- 'deleted' => '此資產已刪除。點擊此處恢復.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => '編輯資產',
- 'model_deleted' => '此資產型號已被刪除，恢復資產前需要先恢復型號。
點擊此處恢復型號。',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => '可申領',
'requested' => '已申領',
'restore' => '還原資產',
diff --git a/resources/lang/zh-TW/admin/models/general.php b/resources/lang/zh-TW/admin/models/general.php
index ae7a7a422..8932563bc 100644
--- a/resources/lang/zh-TW/admin/models/general.php
+++ b/resources/lang/zh-TW/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => '關於資產型號',
'about_models_text' => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。',
- 'deleted' => '此型號已被刪除。點擊此處恢復。',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => '批次刪除資產型號',
'bulk_delete_help' => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。',
'bulk_delete_warn' => '您即將刪除資產型號 :model_count。',
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 042893247..8e69a4acb 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -176,6 +176,7 @@
'remove_company' => '移除公司關聯',
'reports' => '報告',
'restored' => '還原',
+ 'restore' => 'Restore',
'requested' => '已申請',
'request_canceled' => '取消申請',
'save' => '儲存',
diff --git a/resources/lang/zu/admin/depreciations/general.php b/resources/lang/zu/admin/depreciations/general.php
index 99f5e909a..0e5806dcc 100644
--- a/resources/lang/zu/admin/depreciations/general.php
+++ b/resources/lang/zu/admin/depreciations/general.php
@@ -8,5 +8,6 @@ return [
'depreciation_name' => 'Igama lokunciphisa',
'number_of_months' => 'Inani lezinyanga',
'update' => 'Buyekeza ukwehla kwenani',
+ 'depreciation_min' => 'Minimum Value after Depreciation'
];
diff --git a/resources/lang/zu/admin/hardware/general.php b/resources/lang/zu/admin/hardware/general.php
index 9a49c9014..946d1c756 100644
--- a/resources/lang/zu/admin/hardware/general.php
+++ b/resources/lang/zu/admin/hardware/general.php
@@ -10,9 +10,9 @@ return [
'checkout' => 'I-Asset ye-Checkout',
'clone' => 'Clone Asset',
'deployable' => 'Iyasebenza',
- 'deleted' => 'Lefa isusiwe. Chofoza lapha ukuze ubuyiselwe.',
+ 'deleted' => 'This asset has been deleted.',
'edit' => 'Hlela Impahla',
- 'model_deleted' => 'Le model ye-Assets isusiwe. Kumelwe ubuyisele imodeli ngaphambi kokuthi ubuyisele i-Asset.
Chofoza lapha ukuze ubuyisele imodeli.',
+ 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'requestable' => 'Iyadingeka',
'requested' => 'Kuceliwe',
'restore' => 'Buyisela imali',
diff --git a/resources/lang/zu/admin/models/general.php b/resources/lang/zu/admin/models/general.php
index e217426f1..7c7941bfa 100644
--- a/resources/lang/zu/admin/models/general.php
+++ b/resources/lang/zu/admin/models/general.php
@@ -3,7 +3,7 @@
return [
'about_models_title' => 'Mayelana namamodeli asefa',
'about_models_text' => 'Amamodeli asefa kuyindlela yokuqoqa amafa afanayo. "MBP 2013", "IPhone 6s", njll.',
- 'deleted' => 'Le model isusiwe. Chofoza lapha ukuze ubuyiselwe.',
+ 'deleted' => 'This model has been deleted.',
'bulk_delete' => 'Bulk Delete Asset Models',
'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
'bulk_delete_warn' => 'You are about to delete :model_count asset models.',
diff --git a/resources/lang/zu/general.php b/resources/lang/zu/general.php
index 1e86c3340..572430783 100644
--- a/resources/lang/zu/general.php
+++ b/resources/lang/zu/general.php
@@ -176,6 +176,7 @@
'remove_company' => 'Susa Inkampani Yenkampani',
'reports' => 'Imibiko',
'restored' => 'restored',
+ 'restore' => 'Restore',
'requested' => 'Kuceliwe',
'request_canceled' => 'Isicelo sikhanseliwe',
'save' => 'Londoloza',
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 1ddba08a2..465034062 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -125,10 +125,10 @@
@if ($snipeSettings->two_factor_enabled=='1')
- 
