Compare commits

...

44 Commits

Author SHA1 Message Date
snipe f1488767f8 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
2022-07-05 16:41:00 -07:00
snipe 2d5755c1dd Bumped version
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 16:40:17 -07:00
snipe acc2e12f12 Merge remote-tracking branch 'origin/develop' 2022-07-05 16:35:34 -07:00
snipe eb2793bfa7 Added @reederda
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 16:35:12 -07:00
snipe 1a05843183 Merge pull request #11462 from reederda/develop
Fixed #NA: typo
2022-07-05 16:33:09 -07:00
snipe ef17fd41f7 Merge branch 'develop' into develop 2022-07-05 16:26:53 -07:00
snipe 7bdbbbee50 Branch in config set to master
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 16:20:33 -07:00
snipe 2e800e6a0d Merge pull request #11467 from snipe/translations/updated_strings
Updated translations
2022-07-05 16:19:46 -07:00
snipe dae53a1128 Updated translations
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 16:18:53 -07:00
Daniel Reeder 7772ef22db Quick typo fix 2022-07-04 21:57:54 +00:00
snipe 2137c4e897 Back to develop
Signed-off-by: snipe <snipe@snipe.net>
2022-07-04 10:12:25 -07:00
snipe 4a0e51bf34 Merge remote-tracking branch 'origin/develop' 2022-07-04 10:11:05 -07:00
snipe 9f581a7677 Merge pull request #11460 from mikeroq/fix_missing_use_statement
Fixes #11459 Missing import for Setting model in AcceptanceController
2022-07-04 10:07:54 -07:00
mikeroq be8869978d Added import for Setting model 2022-07-04 07:29:01 -05:00
snipe e550fb1a52 Merge pull request #11447 from snipe/dependabot/github_actions/docker/metadata-action-4
Bump docker/metadata-action from 3 to 4
2022-07-03 20:04:15 -07:00
snipe fc65bb020f Merge pull request #11446 from snipe/dependabot/github_actions/docker/login-action-2
Bump docker/login-action from 1 to 2
2022-07-03 20:03:50 -07:00
snipe a4dfdcd90d Merge pull request #11450 from snipe/dependabot/github_actions/docker/build-push-action-3
Bump docker/build-push-action from 2 to 3
2022-07-03 20:03:32 -07:00
snipe 16d2e34148 Merge pull request #11448 from snipe/dependabot/github_actions/docker/setup-buildx-action-2
Bump docker/setup-buildx-action from 1 to 2
2022-07-03 20:03:08 -07:00
snipe 567eefab1a Merge pull request #11449 from snipe/dependabot/github_actions/github/codeql-action-2
Bump github/codeql-action from 1 to 2
2022-07-03 20:02:31 -07:00
snipe 1ef20ec622 Merge remote-tracking branch 'origin/develop' 2022-07-02 13:08:59 -07:00
snipe afab167e8c Fixed restore button in listings
Signed-off-by: snipe <snipe@snipe.net>
2022-07-02 13:08:46 -07:00
snipe af14ee0d47 Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
2022-07-02 13:07:29 -07:00
Mike Roquemore 0a5ca6eb25 Change restore route to POST instead of GET 2022-07-02 14:34:43 -05:00
Mike Roquemore 6e9f24c08f Change restore route to POST instead of GET 2022-07-02 14:34:23 -05:00
Mike Roquemore 07ac4087a3 Remove link from alert since there is already a restore button on the side 2022-07-02 14:34:22 -05:00
Mike Roquemore 1650c9f878 Remove duplicate users routes 2022-07-02 14:34:22 -05:00
Mike Roquemore 123963c14c Modify genericActionsFormatter restore link to be a button instead since it's in a form.
Changed user restore route to POST
2022-07-02 14:34:22 -05:00
snipe 9a0b677dac Merge remote-tracking branch 'origin/develop' 2022-07-01 14:31:29 -07:00
snipe b44f27dafa Add @mikeroq as a contributor 2022-07-01 14:31:07 -07:00
snipe 92d46edca3 Cleaned up logging output
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 13:33:58 -07:00
dependabot[bot] 471cf117ab Bump docker/build-push-action from 2 to 3
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 18:36:55 +00:00
dependabot[bot] bf78bd4b8b Bump github/codeql-action from 1 to 2
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 18:36:50 +00:00
dependabot[bot] a0a0d7e344 Bump docker/setup-buildx-action from 1 to 2
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 18:36:45 +00:00
dependabot[bot] a9361571d6 Bump docker/metadata-action from 3 to 4
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 18:36:41 +00:00
dependabot[bot] 1a13be9b5d Bump docker/login-action from 1 to 2
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 18:36:36 +00:00
snipe 0ed84c83c8 Merge pull request #11437 from turrisxyz/Dependabot-GitHub-Actions
chore: Included githubactions in the dependabot config
2022-07-01 11:35:58 -07:00
snipe 9670ca3b8a Merge remote-tracking branch 'origin/develop' 2022-07-01 11:26:46 -07:00
snipe d4476cb10b Merge pull request #11445 from snipe/fixes/11444
Replicates #11444
2022-07-01 11:26:25 -07:00
snipe 45c616639c Replicates #11444
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 11:21:02 -07:00
snipe eedd646c28 Merge remote-tracking branch 'origin/develop' 2022-06-30 21:10:46 -07:00
snipe acbd4deb1b Merge pull request #11440 from snipe/fixes/check_for_image_on_signing
Fixed #11393 - reject acceptance if no file is present
2022-06-30 21:09:16 -07:00
snipe 4e547a3639 Fixed typos :(
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:06:36 -07:00
snipe b910db0617 Fixed #11393 - reject acceptance if no file is present
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:01:58 -07:00
naveen cfa301f5ae chore: Included githubactions in the dependabot config
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.

Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot

GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-07-01 01:33:50 +00:00
158 changed files with 625 additions and 537 deletions
+20
View File
@@ -2646,6 +2646,26 @@
"contributions": [
"code"
]
},
{
"login": "mikeroq",
"name": "Mike Roquemore",
"avatar_url": "https://avatars.githubusercontent.com/u/55674383?v=4",
"profile": "https://github.com/mikeroq",
"contributions": [
"code"
]
},
{
"login": "reederda",
"name": "Daniel Reeder",
"avatar_url": "https://avatars.githubusercontent.com/u/7991086?v=4",
"profile": "https://github.com/reederda",
"contributions": [
"translations",
"translation",
"code"
]
}
]
}
+6
View File
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
+3 -3
View File
@@ -30,10 +30,10 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
+1 -1
View File
@@ -52,6 +52,6 @@ jobs:
# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: results.sarif
+4 -4
View File
@@ -45,13 +45,13 @@ jobs:
# https://github.com/docker/setup-buildx-action
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
# https://github.com/docker/login-action
- name: Login to DockerHub
# Only login if not a PR, as PRs only trigger a Docker build and not a push
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -63,7 +63,7 @@ jobs:
# Get Metadata for docker_build step below
- name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
id: meta_build
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: snipe/snipe-it
tags: ${{ env.IMAGE_TAGS }}
@@ -72,7 +72,7 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push 'snipe-it' image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile.alpine
+4 -4
View File
@@ -45,13 +45,13 @@ jobs:
# https://github.com/docker/setup-buildx-action
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
# https://github.com/docker/login-action
- name: Login to DockerHub
# Only login if not a PR, as PRs only trigger a Docker build and not a push
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -63,7 +63,7 @@ jobs:
# Get Metadata for docker_build step below
- name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
id: meta_build
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: snipe/snipe-it
tags: ${{ env.IMAGE_TAGS }}
@@ -72,7 +72,7 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push 'snipe-it' image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile
+2 -2
View File
@@ -1,5 +1,5 @@
![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
[![All Contributors](https://img.shields.io/badge/all_contributors-291-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
[![All Contributors](https://img.shields.io/badge/all_contributors-292-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
## Snipe-IT - Open Source Asset Management System
@@ -132,7 +132,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
| [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
| [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") |
| [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") |
| [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") |
| [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") |
<!-- ALL-CONTRIBUTORS-LIST:END -->
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -12,6 +12,7 @@ use App\Models\Asset;
use App\Models\CheckoutAcceptance;
use App\Models\Company;
use App\Models\Contracts\Acceptable;
use App\Models\Setting;
use App\Models\User;
use App\Models\AssetModel;
use App\Models\Accessory;
@@ -110,12 +111,7 @@ class AcceptanceController extends Controller
Storage::makeDirectory('private_uploads/signatures', 775);
}
/**
* Check for the eula-pdfs directory
*/
if (! Storage::exists('private_uploads/eula-pdfs')) {
Storage::makeDirectory('private_uploads/eula-pdfs', 775);
}
$item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
$display_model = '';
@@ -126,13 +122,33 @@ class AcceptanceController extends Controller
if ($request->input('asset_acceptance') == 'accepted') {
// The item was accepted, check for a signature
if ($request->filled('signature_output')) {
$sig_filename = 'siglog-'.Str::uuid().'-'.date('Y-m-d-his').'.png';
$data_uri = $request->input('signature_output');
$encoded_image = explode(',', $data_uri);
$decoded_image = base64_decode($encoded_image[1]);
Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image);
/**
* Check for the eula-pdfs directory
*/
if (! Storage::exists('private_uploads/eula-pdfs')) {
Storage::makeDirectory('private_uploads/eula-pdfs', 775);
}
if (Setting::getSettings()->require_accept_signature == '1') {
// Check if the signature directory exists, if not create it
if (!Storage::exists('private_uploads/signatures')) {
Storage::makeDirectory('private_uploads/signatures', 775);
}
// The item was accepted, check for a signature
if ($request->filled('signature_output')) {
$sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
$data_uri = $request->input('signature_output');
$encoded_image = explode(',', $data_uri);
$decoded_image = base64_decode($encoded_image[1]);
Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);
// No image data is present, kick them back.
// This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
} else {
return redirect()->back()->with('error', trans('general.shitty_browser'));
}
}
@@ -39,10 +39,6 @@ class BulkAssetsController extends Controller
$bulk_back_url = request()->headers->get('referer');
session(['bulk_back_url' => $bulk_back_url]);
\Log::debug('Back to url: '.$bulk_back_url);
$asset_ids = array_values(array_unique($request->input('ids')));
if ($request->filled('bulk_actions')) {
+1 -1
View File
@@ -313,7 +313,7 @@ class Ldap extends Model
$ldap_controls = [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'iscritical' => false, 'value' => ['size'=> $count == -1||$count>$page_size ? $page_size : $count, 'cookie' => $cookie]]];
//}
$search_results = ldap_search($ldapconn, $base_dn, $filter, [], 0, /* $page_size */ -1, -1, LDAP_DEREF_NEVER, $ldap_controls); // TODO - I hate the @, and I hate that we get a full page even if we ask for 10 records. Can we use an ldap_control?
\Log::debug("did the search run? I guess so if you got here!");
\Log::debug("LDAP search executed successfully.");
if (! $search_results) {
return redirect()->route('users.index')->with('error', trans('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn)); // TODO this is never called in any routed context - only from the Artisan command. So this redirect will never work.
}
+5 -5
View File
@@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.6',
'full_app_version' => 'v6.0.6 - build 8300-gdf1e2687d',
'build_version' => '8300',
'app_version' => 'v6.0.7',
'full_app_version' => 'v6.0.7 - build 8351-gacc2e12f1',
'build_version' => '8351',
'prerelease_version' => '',
'hash_version' => 'gdf1e2687d',
'full_hash' => 'v6.0.6-172-gdf1e2687d',
'hash_version' => 'gacc2e12f1',
'full_hash' => 'v6.0.7-42-gacc2e12f1',
'branch' => 'master',
);
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1
View File
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - Klicken, um erforderlich zu machen',
'reorder' => 'Sortieren',
'db_field' => 'Datenbankfeld',
'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
'db_convert_warning' => 'WARNUNG. Dieses Feld befindet sich in der Tabelle mit benutzerdefinierten Feldern als <code>:db_column</code> sollte aber <code>:expected</code> sein.',
'is_unique' => 'Dieser Wert muss für jedes Asset eindeutig sein',
'unique' => 'Einzigartig',
];
@@ -51,7 +51,7 @@ return array(
'fieldset_default_value' => array(
'error' => 'Error validating default fieldset values.',
'error' => 'Fehler beim Überprüfen der Standardfeldsatzwerte.',
),
+2 -2
View File
@@ -46,6 +46,6 @@ return [
'asset_not_deployable' => 'Dieses Asset ist nicht verfügbar und kann nicht herausgegeben werden.',
'asset_deployable' => 'Dieses Asset ist verfügbar und kann herausgegeben werden.',
'processing_spinner' => 'Wird verarbeitet...',
'optional_infos' => 'Optional Information',
'order_details' => 'Order Related Information'
'optional_infos' => 'Optionale Informationen',
'order_details' => 'Bestellinformationen'
];
+3 -3
View File
@@ -17,8 +17,8 @@ return [
'last_login' => 'Letzte Anmeldung',
'ldap_config_text' => 'Die LDAP Konfigurations Einstellungen finden Sie hier Admin -> Einstellungen. Der (optional) wählbare Standort wird für alle importierten Benutzer gesetzt.',
'print_assigned' => 'Alles zugewiesene drucken',
'email_assigned' => 'Email List of All Assigned',
'user_notified' => 'User has been emailed a list of their currently assigned items.',
'email_assigned' => 'Alles zugewiesene per Mail zusenden',
'user_notified' => 'Der Benutzer hat eine Liste seiner aktuell zugewiesenen Artikel per E-Mail erhalten.',
'software_user' => 'Software herausgegeben an :name',
'send_email_help' => 'Sie müssen eine E-Mail-Adresse angeben, um dem Benutzer Zugangsdaten zu zusenden. Das Versenden von Zugangsdaten ist nur bei der Erstellung eines Benutzers möglich. Passwörter werden in einem Einweg-Hash gespeichert und können danach nicht mehr ausgelesen werden.',
'view_user' => 'Benutzer :name ansehen',
@@ -35,7 +35,7 @@ return [
'remove_group_memberships' => 'Gruppenmitgliedschaften entfernen',
'warning_deletion' => 'WARNUNG:',
'warning_deletion_information' => 'Sie sind dabei, die :count unten aufgelisteten Benutzer zu löschen. Super-Admin-Namen sind rot markiert.',
'update_user_assets_status' => 'Update all assets for these users to this status',
'update_user_assets_status' => 'Alle Assets für diese Benutzer auf diesen Status aktualisieren',
'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
'remote_label' => 'Dies ist ein externer Benutzer',
'remote' => 'Extern',
+9 -8
View File
@@ -65,8 +65,8 @@ return [
'create' => 'Hinzufügen',
'created' => 'Eintrag erstellt',
'created_asset' => 'Asset angelegt',
'created_at' => 'Created At',
'created_by' => 'Created By',
'created_at' => 'Erstellt am',
'created_by' => 'Erstellt von',
'record_created' => 'Eintrag erstellt',
'updated_at' => 'Aktualisiert am',
'currency' => '€', // this is deprecated
@@ -101,7 +101,7 @@ return [
'employee_number' => 'Mitarbeiternummer',
'email_domain_help' => 'Dies wird verwendet, um E-Mail-Adressen beim Importieren zu generieren',
'error' => 'Fehler',
'example' => 'Example: ',
'example' => 'Beispiel: ',
'filastname_format' => 'Initial des Vornamen + Nachname (jsmith@example.com)',
'firstname_lastname_format' => 'Vorname Nachname (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Vorname Nachname (max_mustermann@beispiel.com)',
@@ -258,7 +258,7 @@ return [
'undeployable' => 'Nicht herausgebbar',
'unknown_admin' => 'Unbekannter Administrator',
'username_format' => 'Format der Benutzernamen',
'username' => 'Username',
'username' => 'Benutzername',
'update' => 'Aktualisieren',
'upload_filetypes_help' => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf und rar. Maximale Uploadgröße beträgt :size.',
'uploaded' => 'Hochgeladen',
@@ -309,7 +309,7 @@ return [
'last_checkout' => 'Letzte Herausgabe',
'due_to_checkin' => 'Folgende :count Elemente werden demnächst zurückgenommen:',
'expected_checkin' => 'Erwartetes Rückgabedatum',
'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an Sie herausgegeben sind. Wenn Sie der Meinung sind, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den Sie nie erhalten haben), senden Sie bitte eine E-Mail an :reply_to_name unter :reply_to_addresse.',
'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an Sie herausgegeben sind. Wenn Sie der Meinung sind, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den Sie nie erhalten haben), senden Sie bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
'changed' => 'Geändert',
'to' => 'An',
'report_fields_info' => '<p>Wählen Sie die Felder aus, die Sie in Ihren benutzerdefinierten Bericht einfügen möchten, und klicken Sie auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und Sie können sie in Excel öffnen.</p>
@@ -360,8 +360,9 @@ return [
'maintenance_mode' => 'Der Dienst ist wegen Wartungsarbeiten vorübergehend nicht verfügbar. Bitte versuchen Sie es später noch einmal.',
'maintenance_mode_title' => 'System vorübergehend nicht verfügbar',
'ldap_import' => 'Benutzerkennwort sollte nicht von LDAP verwaltet werden. (Dies erlaubt es Ihnen, vergessene Passwortanfragen zu senden.)',
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'purge_not_allowed' => 'Löschen von "gelöschten Daten" wurde in der .env-Datei verboten. Kontaktieren Sie den Support oder Ihren Systemadministrator.',
'backup_delete_not_allowed' => 'Das Löschen von Sicherungen wurde in der .env-Datei verboten. Kontaktieren Sie den Support oder Ihren Systemadministrator.',
'additional_files' => 'Zusätzliche Dateien',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+4 -4
View File
@@ -1,8 +1,8 @@
<?php
return [
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
'reset' => 'Your password has been reset!',
'sent' => 'Wenn ein passender Benutzer mit einer gültigen E-Mail-Adresse in unserem System existiert, wurde eine E-Mail zur Wiederherstellung des Passworts gesendet.',
'user' => 'Wenn ein passender Benutzer mit einer gültigen E-Mail-Adresse in unserem System existiert, wurde eine E-Mail zur Wiederherstellung des Passworts gesendet.',
'token' => 'Dieser Token zum Zurücksetzen des Passworts ist ungültig oder abgelaufen oder entspricht nicht dem angegebenen Benutzernamen.',
'reset' => 'Ihr Passwort wurde zurückgesetzt!',
];
+2 -2
View File
@@ -15,7 +15,7 @@ return array(
"password" => "Das Passwort muss Sechs Zeichen haben und übereinstimmen.",
"user" => "Benutzername oder Email-Adresse sind falsch",
"token" => 'This password reset token is invalid or expired, or does not match the username provided.',
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
"token" => 'Dieser Token zum Zurücksetzen des Passworts ist ungültig oder abgelaufen oder entspricht nicht dem angegebenen Benutzernamen.',
'sent' => 'Wenn ein passender Benutzer mit einer gültigen E-Mail-Adresse in unserem System existiert, wurde eine E-Mail zur Wiederherstellung des Passworts gesendet.',
);
+5 -5
View File
@@ -91,11 +91,11 @@ return [
'url' => ':attribute Format ist ungültig.',
'unique_undeleted' => 'Die Variable :attribute muss eindeutig sein.',
'non_circular' => 'Das :attribute darf keinen Zirkelbezug ergeben.',
'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
'letters' => 'Password must contain at least one letter.',
'numbers' => 'Password must contain at least one number.',
'case_diff' => 'Password must use mixed case.',
'symbols' => 'Password must contain symbols.',
'disallow_same_pwd_as_user_fields' => 'Das Passwort muss sich vom Nutzernamen unterscheiden.',
'letters' => 'Das Passwort muss mindestens einen Buchstaben beinhalten.',
'numbers' => 'Das Passwort muss mindestens eine Zahl beinhalten.',
'case_diff' => 'Das Passwort muss Groß- und Kleinschreibung beinhalten.',
'symbols' => 'Das Passwort muss Sonderzeichen beinhalten.',
'gte' => [
'numeric' => 'Wert darf nicht negativ sein'
],
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+3 -3
View File
@@ -13,8 +13,8 @@ return array(
|
*/
'failed' => 'These credentials do not match our records.',
'password' => 'The provided password is incorrect.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
'failed' => 'Sisestatud mandaadid ei ühti meie andmetega.',
'password' => 'Sisestatud parool on vale.',
'throttle' => 'Liiga palju ebaõnnestunud sisselogimiskatseid. Palun proovi uuesti :seconds sekundi pärast.',
);
+4 -4
View File
@@ -4,13 +4,13 @@ return [
'send_password_link' => 'Saada parooli taastamise link',
'email_reset_password' => 'E-posti parool lähtesta',
'reset_password' => 'Taasta parool',
'saml_login' => 'Login via SAML',
'saml_login' => 'Logi sisse SAML-i kaudu',
'login' => 'Logi sisse',
'login_prompt' => 'Palun logi sisse',
'forgot_password' => 'Ma unustasin oma parooli',
'ldap_reset_password' => 'Please click here to reset your LDAP password',
'ldap_reset_password' => 'LDAP parooli lähtestamiseks klõpsake siin',
'remember_me' => 'Jäta mind meelde',
'username_help_top' => 'Enter your <strong>username</strong> to be emailed a password reset link.',
'username_help_bottom' => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
'username_help_top' => 'Parooli lähtestamiseks sisesta oma <strong>kasutajanimi</strong>.',
'username_help_bottom' => 'Kasutajanimi ja e-posti aadress <em>võivad</em> olla samad, aga ei pruugi olla. Kui oled kasutajanime unustanud, võta ühendust oma süsteemiadministraatoriga. <br><br><strong>Kasutajatele ilma liidetud e-posti aadressita ei saa parooli lähtestamise linki saata.</strong> ',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+4 -4
View File
@@ -13,13 +13,13 @@ return [
|
*/
'more_info_title' => 'More Info',
'more_info_title' => 'Rohkem infot',
'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
'audit_help' => 'Selle kasti valimine muudab vahendi teavet, et näidata selle uut asukohta. Kui seda ei valita, salvestatakse asukoht ainult logisse. <br><br> Pange tähele, et kui vahend on juba üle antud, siis see ei muuda selle isiku või vahendi asukohta, kellele see on üle antud.',
'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.',
'assets' => 'Vahendeid saab tuvastada ja jälgida seerianumbri või seadme identifikaatori abil. Tavaliselt määratletakse ja registreeritakse seerianumber või identifikaator väärtuslikele vahenditele, mille individuaalne tuvastamine on oluline.',
'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
'categories' => 'Kategooriad aitavad sul asju organiseerida. Kategooriad võivad olla näiteks: &quot;Lauaarvutid&quot;,&quot;Sülearvutid&quot;,&quot;Mobiiltelefonid&quot;,&quot;Tahvelarvutid&quot; jne, kuid võid kasutada kategooriaid igat moodi, mis tundub sulle endale mõistlik.',
'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+2 -1
View File
@@ -332,7 +332,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -366,5 +366,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Catégorie invalide',
'dashboard_info' => 'Ceci est votre tableau de bord. Il y en a beaucoup d\'autres comme lui, mais celui-ci est le vôtre.',
'60_percent_warning' => 'Terminé à 60% (avertissement)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'Nouvel actif',
'new_license' => 'Nouvelle licence',
'new_accessory' => 'Nouvel accessoire',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1
View File
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
@@ -12,7 +12,7 @@ return array(
'require_acceptance' => 'Richiedere agli utenti di confermare l\'accettazione di attività in questa categoria.',
'no_default_eula' => 'Non è stata trovata EULA predefinita. Aggiungine un altra nei settaggi.',
'total' => 'Totale',
'remaining' => 'Utilità',
'remaining' => 'Disponib',
'update' => 'Aggiorna Accessorio',
'use_default_eula' => 'Usa <a href="#" data-toggle="modal" data-target="#eulaModal">L\'EULA predefinita</a> invece.',
'use_default_eula_disabled' => '<del>Usa L\'EULA predefinita.</del> Nessuna EULA predefinita è in uso. Per favore aggiungine una nei Settaggi.',
@@ -2,11 +2,11 @@
return [
'custom_fields' => 'Campi Personalizzati',
'manage' => 'Manage',
'manage' => 'Gestire',
'field' => 'Campo',
'about_fieldsets_title' => 'Fileldsets',
'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
'custom_format' => 'Custom Regex format...',
'about_fieldsets_text' => 'I set di campi consentono di creare gruppi di campi personalizzati che vengono spesso riutilizzati per tipi di modelli di asset specifici.',
'custom_format' => 'Formato Regex personalizzato...',
'encrypt_field' => 'Crittografare il valore di questo campo nel database',
'encrypt_field_help' => 'ATTENZIONE: Se il campo viene crittografato non sarà possibile cercarlo.',
'encrypted' => 'Crittografato',
@@ -27,21 +27,21 @@ return [
'used_by_models' => 'Usato dai Modelli',
'order' => 'Ordine',
'create_fieldset' => 'Nuovo fieldset',
'create_fieldset_title' => 'Create a new fieldset',
'create_fieldset_title' => 'Crea un nuovo fieldset',
'create_field' => 'Nuovo campo personalizzato',
'create_field_title' => 'Create a new custom field',
'create_field_title' => 'Crea un nuovo campo personalizzato',
'value_encrypted' => 'Il valore di questo campo viene crittografato nel database. Solo gli utenti amministratori saranno in grado di visualizzare il valore decrittografato',
'show_in_email' => 'Includere il valore di questo campo nelle e-mail di checkout inviate all\'utente? I campi crittografati non possono essere inclusi nelle e-mail.',
'help_text' => 'Help Text',
'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
'about_custom_fields_title' => 'About Custom Fields',
'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
'add_field_to_fieldset' => 'Add Field to Fieldset',
'make_optional' => 'Required - click to make optional',
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
'help_text' => 'Testo guida',
'help_text_description' => 'Questo è un testo facoltativo che apparirà sotto gli elementi del modulo durante la modifica di una risorsa per fornire il contesto sul campo.',
'about_custom_fields_title' => 'Informazioni sui campi personalizzati',
'about_custom_fields_text' => 'I campi personalizzati consentono di aggiungere attributi arbitrari alle risorse.',
'add_field_to_fieldset' => 'Aggiungi campo a Fieldset',
'make_optional' => 'Obbligatorio: fare clic per renderlo opzionale',
'make_required' => 'Facoltativo: fare clic per renderlo obbligatorio',
'reorder' => 'Riordina',
'db_field' => 'Campo DB',
'db_convert_warning' => 'AVVERTIMENTO. Questo campo è nella tabella dei campi personalizzati come <code>:db_column</code> ma dovrebbe essere <code>:expected</code>.',
'is_unique' => 'Questo valore deve essere univoco per tutti i beni',
'unique' => 'Univoco',
];
@@ -51,7 +51,7 @@ return array(
'fieldset_default_value' => array(
'error' => 'Error validating default fieldset values.',
'error' => 'Errore durante la convalida dei valori fieldset predefiniti.',
),
+2 -2
View File
@@ -46,6 +46,6 @@ return [
'asset_not_deployable' => 'Lo stato del bene è "Non Assegnabile". Non puoi fare il check-out di questo bene.',
'asset_deployable' => 'Lo stato del bene è "Assegnabile". Puoi fare il check-out di questo bene.',
'processing_spinner' => 'Elaborazione...',
'optional_infos' => 'Optional Information',
'order_details' => 'Order Related Information'
'optional_infos' => 'Informazioni Opzionali',
'order_details' => 'Informazioni relative all\'ordine'
];
+1 -1
View File
@@ -10,7 +10,7 @@ return [
'checkin' => 'Ingresso Asset',
'checkout' => 'Asset Checkout',
'clone' => 'Copia Asset',
'deployable' => 'Distribuibile',
'deployable' => 'Assegnabile',
'deleted' => 'Questo bene è stato eliminato.',
'edit' => 'Modifica Asset',
'model_deleted' => 'Questo modello di asset è stato eliminato. Devi ripristinare il modello prima di poter ripristinare il bene.',
+1 -1
View File
@@ -45,7 +45,7 @@ return [
'import' => [
'error' => 'Alcuni elementi non sono stati importati correttamente.',
'errorDetail' => 'Gli elementi seguenti non sono stati importati correttamente a causa di errori.',
'errorDetail' => 'Gli articoli seguenti non sono stati importati correttamente a causa di errori.',
'success' => 'Il file è stato importato con successo',
'file_delete_success' => 'Il file è stato cancellato con successo',
'file_delete_error' => 'Impossibile eliminare il file',
+33 -33
View File
@@ -13,38 +13,38 @@ return [
'none_licenses' => 'Non ci sono abbastanza licenze disponibili da assegnare per :license. Ulteriori :qty sono richieste. ',
'none_consumables' => 'Non ci sono abbastanza consumabili disponibili da assegnare per :consumable. Ulteriori :qty sono richiesti. ',
'none_accessory' => 'Non ci sono abbastanza accessori disponibili da assegnare per :accessory. Ulteriori :qty sono richiesti. ',
'append_accessory' => 'Append Accessory',
'update_appended_accessory' => 'Update appended Accessory',
'append_consumable' => 'Append Consumable',
'update_appended_consumable' => 'Update appended Consumable',
'append_license' => 'Append license',
'update_appended_license' => 'Update appended license',
'append_model' => 'Append model',
'update_appended_model' => 'Update appended model',
'license_error' => 'License already attached to kit',
'license_added_success' => 'License added successfully',
'license_updated' => 'License was successfully updated',
'license_none' => 'License does not exist',
'license_detached' => 'License was successfully detached',
'consumable_added_success' => 'Consumable added successfully',
'consumable_updated' => 'Consumable was successfully updated',
'consumable_error' => 'Consumable already attached to kit',
'consumable_deleted' => 'Delete was successful',
'consumable_none' => 'Consumable does not exist',
'consumable_detached' => 'Consumable was successfully detached',
'accessory_added_success' => 'Accessory added successfully',
'accessory_updated' => 'Accessory was successfully updated',
'accessory_detached' => 'Accessory was successfully detached',
'accessory_error' => 'Accessory already attached to kit',
'accessory_deleted' => 'Delete was successful',
'accessory_none' => 'Accessory does not exist',
'checkout_success' => 'Checkout was successful',
'checkout_error' => 'Checkout error',
'kit_none' => 'Kit does not exist',
'kit_created' => 'Kit was successfully created',
'kit_updated' => 'Kit was successfully updated',
'kit_not_found' => 'Kit not found',
'kit_deleted' => 'Kit was successfully deleted',
'kit_model_updated' => 'Model was successfully updated',
'append_accessory' => 'Aggiungi accessorio',
'update_appended_accessory' => 'Aggiorna accessorio aggiunto',
'append_consumable' => 'Aggiungi consumabile',
'update_appended_consumable' => 'Aggiornare il materiale di consumo aggiunto',
'append_license' => 'Aggiungi licenza',
'update_appended_license' => 'Aggiorna licenza aggiunta',
'append_model' => 'Aggiungi modello',
'update_appended_model' => 'Aggiorna il modello aggiunto',
'license_error' => 'Licenza già allegata al kit',
'license_added_success' => 'Licenza aggiunta con successo',
'license_updated' => 'La licenza è stata aggiornata correttamente',
'license_none' => 'La licenza non esiste',
'license_detached' => 'La licenza è stata staccata con successo',
'consumable_added_success' => 'Materiale di consumo aggiunto correttamente',
'consumable_updated' => 'Il materiale di consumo è stato aggiornato correttamente',
'consumable_error' => 'Consumabile già allegato al kit',
'consumable_deleted' => 'Eliminazione riuscita',
'consumable_none' => 'Il materiale di consumo non esiste',
'consumable_detached' => 'Il materiale di consumo è stato staccato con successo',
'accessory_added_success' => 'Accessorio aggiunto con successo',
'accessory_updated' => 'L\'accessorio è stato aggiornato correttamente',
'accessory_detached' => 'L\'accessorio è stato scollegato correttamente',
'accessory_error' => 'Accessorio già allegato al kit',
'accessory_deleted' => 'Eliminazione riuscita',
'accessory_none' => 'L\'accessorio non esiste',
'checkout_success' => 'L\'assegnazione è andata a buon fine',
'checkout_error' => 'Errore nell\'assegnazione',
'kit_none' => 'Il kit non esiste',
'kit_created' => 'Il kit è stato creato con successo',
'kit_updated' => 'Il kit è stato aggiornato con successo',
'kit_not_found' => 'Kit non trovato',
'kit_deleted' => 'Il kit è stato eliminato con successo',
'kit_model_updated' => 'Il modello è stato aggiornato correttamente',
'kit_model_detached' => 'Model was successfully detached',
];
+3 -3
View File
@@ -3,7 +3,7 @@
return array(
'asset' => 'Bene',
'checkin' => 'Disassegnare',
'checkin' => 'Riassegna',
'create' => 'Crea Licenza',
'expiration' => 'Data di scadenza',
'license_key' => 'Chiave licenza',
@@ -12,8 +12,8 @@ return array(
'no_depreciation' => 'Non svaluta',
'purchase_order' => 'Acquisto numero d\'ordine',
'reassignable' => 'Reassegnabile',
'remaining_seats' => 'Sedili rimanenti',
'seats' => 'Sedili',
'remaining_seats' => 'Licenze disponibili',
'seats' => 'Licenze',
'termination_date' => 'Data di estinzione',
'to_email' => 'Licenza Email',
'to_name' => 'Licenza Nome',
+5 -5
View File
@@ -2,9 +2,9 @@
return [
'info' => 'Selezionare le opzioni desiderate per il vostro report di beni.',
'deleted_user' => 'Deleted user',
'send_reminder' => 'Send reminder',
'reminder_sent' => 'Reminder sent',
'acceptance_deleted' => 'Acceptance request deleted',
'acceptance_request' => 'Acceptance request'
'deleted_user' => 'Utente eliminato',
'send_reminder' => 'Invia promemoria',
'reminder_sent' => 'Promemoria spedito',
'acceptance_deleted' => 'Richiesta di accettazione eliminata',
'acceptance_request' => 'Richiesta di accettazione'
];
@@ -7,7 +7,7 @@ return array(
'color' => 'Colore del grafico',
'default_label' => 'Etichetta predefinita',
'default_label_help' => 'Viene utilizzato per garantire che le etichette di stato più comuni vengano visualizzate nella parte superiore della casella di selezione durante la creazione / modifica delle risorse.',
'deployable' => 'Distribuibile',
'deployable' => 'Assegnabile',
'info' => 'Le etichette di stato sono usate per descrivere i vari stati dei beni. Essi possono essere fuori per la riparazione, perso o rubato, etc. È possibile creare nuove etichette di stato per schierabili, in attesa e dei beni archiviati.',
'name' => 'Nome Stato',
'pending' => 'In attesa',
+3 -3
View File
@@ -17,8 +17,8 @@ return [
'last_login' => 'Ultimo accesso',
'ldap_config_text' => 'Le impostazioni di configurazione di LDAP possono essere trovate su Admin > Impostazioni. La posizione selezionata (facoltativa) verrà impostata per tutti gli utenti importati.',
'print_assigned' => 'Stampa tutti assegnati',
'email_assigned' => 'Email List of All Assigned',
'user_notified' => 'User has been emailed a list of their currently assigned items.',
'email_assigned' => 'Elenco e-mail di tutti assegnati',
'user_notified' => 'All\'utente è stato inviato tramite e-mail un elenco degli elementi attualmente assegnati.',
'software_user' => 'Software estratto a :name',
'send_email_help' => 'Devi fornire un indirizzo email all\'utente per inviare loro le credenziali. L\'inoltro delle credenziali via email avviene solo durante la creazione dell\'utente. La password è memorizzata in un hash unidirezionale e non può essere recuperata, una volta salvata.',
'view_user' => 'Visualizza Utente :name',
@@ -35,7 +35,7 @@ return [
'remove_group_memberships' => 'Rimuove Membri del Gruppo',
'warning_deletion' => 'ATTENZIONE:',
'warning_deletion_information' => 'Stai per eliminare :count utenti listati qui sotto. I superamministratori sono evidenziati in rosso.',
'update_user_assets_status' => 'Update all assets for these users to this status',
'update_user_assets_status' => 'Aggiorna tutti i beni per questi utenti a questo stato',
'checkin_user_properties' => 'Esegui il check-in di tutte le proprietà associate a questi utenti',
'remote_label' => 'Questo è un utente remoto',
'remote' => 'Remoto',
+39 -38
View File
@@ -45,7 +45,7 @@ return [
'change' => 'Dentro fuori',
'changeemail' => 'Modifica indirizzo email',
'changepassword' => 'Modifica password',
'checkin' => 'Carica',
'checkin' => 'Riassegna',
'checkin_from' => 'Carica da',
'checkout' => 'Assegna',
'checkouts_count' => 'Ritiri',
@@ -65,8 +65,8 @@ return [
'create' => 'Crea',
'created' => 'Articolo creato',
'created_asset' => 'Asset creato',
'created_at' => 'Created At',
'created_by' => 'Created By',
'created_at' => 'Creato a',
'created_by' => 'Creato da',
'record_created' => 'Record creato',
'updated_at' => 'Aggiornato a',
'currency' => '$', // this is deprecated
@@ -87,7 +87,7 @@ return [
'deletion_failed' => 'Eliminazione fallita',
'departments' => 'dipartimenti',
'department' => 'Dipartimento',
'deployed' => 'Distribuita',
'deployed' => 'Assegnato',
'depreciation' => 'Obsoleti',
'depreciations' => 'Deprezzamenti',
'depreciation_report' => 'Report degli Obsoleti',
@@ -101,7 +101,7 @@ return [
'employee_number' => 'Numero Dipendente',
'email_domain_help' => 'Questo viene utilizzato per generare indirizzi e-mail durante l\'importazione',
'error' => 'Errore',
'example' => 'Example: ',
'example' => 'Esempio: ',
'filastname_format' => 'Prima cognome iniziale (jsmith@example.com)',
'firstname_lastname_format' => 'Nome cognome (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Nome cognome (jane.smith@example.com)',
@@ -199,7 +199,7 @@ return [
'quantity_minimum' => 'Hai :count elementi sotto o prossimi alla soglia del livello di quantità minima',
'quickscan_checkin' => 'Check-in a Scansione Rapida',
'quickscan_checkin_status' => 'Stato Check-in',
'ready_to_deploy' => 'Pronto per il rilascio',
'ready_to_deploy' => 'Pronto per l\'assegnazione',
'recent_activity' => 'Attività Recenti',
'remaining' => 'Rimanente',
'remove_company' => 'Rimuovi associazioni azienda',
@@ -258,7 +258,7 @@ return [
'undeployable' => 'Non consegnabile',
'unknown_admin' => 'Amministratore sconosciuto',
'username_format' => 'Formato di nome utente',
'username' => 'Username',
'username' => 'Nome utente',
'update' => 'Aggiorna',
'upload_filetypes_help' => 'I tipi di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, e rar. La dimensione massima di upload è di :size.',
'uploaded' => 'Caricato',
@@ -309,7 +309,7 @@ return [
'last_checkout' => 'Ultima Assegnazione',
'due_to_checkin' => 'I seguenti :count elementi sono in attesa di essere bloccati entro breve:',
'expected_checkin' => 'Atteso Blocco',
'reminder_checked_out_items' => 'Questo è un promemoria dei tuoi elementi attualmente sbloccati. Se ritieni che questo elenco non sia esatta (manca qualcosa o compare qualcosa che non ti è stato mai assegnato), invia una mail a :reply_to_name all\'indirizzo :reply_to_address.',
'reminder_checked_out_items' => 'Questo è un promemoria dei beni a te associati. Se ritieni che questo elenco non sia esatto (manca qualcosa o compare qualcosa che non ti è stato mai assegnato), invia una mail a :reply_to_name all\'indirizzo :reply_to_address.',
'changed' => 'Modificato',
'to' => 'A',
'report_fields_info' => '<p>Seleziona i campi che vuoi inserire nel tuo report personalizzato e clicca su Genera. Il file (custom-asset_report-YYYY-mm-dd.csv) verrà scaricato automaticamente e potrà essere aperto in Excel.</p>
@@ -329,39 +329,40 @@ return [
'invalid_category' => 'Categoria non valida',
'dashboard_info' => 'Questa è la tua dashboard. Ce ne sono tante, ma questa è solo tua.',
'60_percent_warning' => 'Completo al 60% (Avvertimento)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
'new_consumable' => 'New Consumable',
'collapse' => 'Collapse',
'assigned' => 'Assigned',
'asset_count' => 'Asset Count',
'accessories_count' => 'Accessories Count',
'consumables_count' => 'Consumables Count',
'components_count' => 'Components Count',
'licenses_count' => 'Licenses Count',
'notification_error' => 'Error:',
'notification_error_hint' => 'Please check the form below for errors',
'notification_success' => 'Success:',
'notification_warning' => 'Warning:',
'dashboard_empty' => 'Sembra che tu non abbia ancora aggiunto nulla, quindi non abbiamo nulla di eccezionale da mostrare. Inizia aggiungendo subito alcuni beni, accessori, materiali di consumo o licenze!',
'new_asset' => 'Nuovo bene',
'new_license' => 'Nuova licenza',
'new_accessory' => 'Nuovo accessorio',
'new_consumable' => 'Nuovo consumabile',
'collapse' => 'Riduci',
'assigned' => 'Assegnato',
'asset_count' => 'Quantità beni',
'accessories_count' => 'Quantità accessori',
'consumables_count' => 'Quantità Consumabili',
'components_count' => 'Quantità Componenti',
'licenses_count' => 'Quantità licenze',
'notification_error' => 'Errore:',
'notification_error_hint' => 'Si prega di controllare il modulo sottostante per eventuali errori',
'notification_success' => 'Riuscito:',
'notification_warning' => 'Attenzione:',
'notification_info' => 'Info:',
'asset_information' => 'Asset Information',
'model_name' => 'Model Name:',
'asset_name' => 'Asset Name:',
'consumable_information' => 'Consumable Information:',
'consumable_name' => 'Consumable Name:',
'accessory_information' => 'Accessory Information:',
'accessory_name' => 'Accessory Name:',
'clone_item' => 'Clone Item',
'checkout_tooltip' => 'Check this item out',
'checkin_tooltip' => 'Check this item in',
'checkout_user_tooltip' => 'Check this item out to a user',
'asset_information' => 'Informazioni bene',
'model_name' => 'Nome Modello:',
'asset_name' => 'Nome bene:',
'consumable_information' => 'Informazioni sui consumabili:',
'consumable_name' => 'Nome Consumabile:',
'accessory_information' => 'Informazioni Accessori:',
'accessory_name' => 'Nome Accessorio:',
'clone_item' => 'Clona oggetto',
'checkout_tooltip' => 'Assegna questo articolo',
'checkin_tooltip' => 'Riassegna questo articolo',
'checkout_user_tooltip' => 'Assegna questo articolo a un utente',
'maintenance_mode' => 'Servizio temporaneamente non disponibile per aggiornamenti. Si prega di riprovare più tardi.',
'maintenance_mode_title' => 'Sistema Temporaneamente Non Disponibile',
'ldap_import' => 'La password dell\'utente non deve essere gestita da LDAP. (Consente di inviare le richieste di password dimenticate.)',
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'purge_not_allowed' => 'L\'eliminazione dei dati eliminati è stata disabilitata nel file .env. Contattare l\'assistenza o l\'amministratore di sistema.',
'backup_delete_not_allowed' => 'L\'eliminazione dei backup è stata disabilitata nel file .env. Contattare l\'assistenza o l\'amministratore di sistema.',
'additional_files' => 'File aggiuntivi',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1 -1
View File
@@ -59,7 +59,7 @@ return [
'test_mail_text' => 'Questo è un test del Snipe-IT Asset Management System. Se hai questo, la posta è in funzione :)',
'the_following_item' => 'La seguente voce è stata selezionata:',
'low_inventory_alert' => 'C\'è :count elemento che è al di sotto del livello di scorta minima o lo sarà a breve. |Ci sono :count elementi che sono al di sotto del livello di scorta minima o lo saranno a breve.',
'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.',
'assets_warrantee_alert' => 'C\'è :count bene con garanzia in scadenza nei prossimi :threshold giorni.|Ci sono :count beni con garanzia in scadenza nei prossimi :threshold giorni.',
'license_expiring_alert' => 'Tra :threshold giorni sta per scadere :count licenza. |Tra :threshold giorni stanno per scadere :count licenze.',
'to_reset' => 'Per reimpostare la tua password web, compila questo modulo:',
'type' => 'Tipo',
+4 -4
View File
@@ -1,8 +1,8 @@
<?php
return [
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
'reset' => 'Your password has been reset!',
'sent' => 'Se nel nostro sistema esiste un utente corrispondente con un indirizzo e-mail valido, è stata inviata un\'e-mail di recupero password.',
'user' => 'Se nel nostro sistema esiste un utente corrispondente con un indirizzo e-mail valido, è stata inviata un\'e-mail di recupero password.',
'token' => 'Questo token di reimpostazione della password non è valido o è scaduto oppure non corrisponde al nome utente fornito.',
'reset' => 'La tua password è stata resettata!',
];
+2 -2
View File
@@ -15,7 +15,7 @@ return array(
"password" => "Le passwords devono essere almeno di 6 caratteri e uguali alla conferma.",
"user" => "Nome utente o indirizzo email non corretto",
"token" => 'This password reset token is invalid or expired, or does not match the username provided.',
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
"token" => 'Questo token di reimpostazione della password non è valido o è scaduto oppure non corrisponde al nome utente fornito.',
'sent' => 'Se nel nostro sistema esiste un utente corrispondente con un indirizzo e-mail valido, è stata inviata un\'e-mail di recupero password.',
);
+1 -1
View File
@@ -5,6 +5,6 @@ return array(
'actions' => 'Azioni',
'action' => 'Azione',
'by' => 'per',
'item' => 'Oggetto',
'item' => 'Articolo',
);
+5 -5
View File
@@ -91,11 +91,11 @@ return [
'url' => 'Il formato dell\' :attribute è invalido.',
'unique_undeleted' => 'L\'attributo deve essere univoco.',
'non_circular' => ':attribute non deve creare un riferimento circolare.',
'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
'letters' => 'Password must contain at least one letter.',
'numbers' => 'Password must contain at least one number.',
'case_diff' => 'Password must use mixed case.',
'symbols' => 'Password must contain symbols.',
'disallow_same_pwd_as_user_fields' => 'La password non può essere uguale al nome utente.',
'letters' => 'La password deve contenere almeno una lettera.',
'numbers' => 'La password deve contenere almeno un numero.',
'case_diff' => 'La password deve utilizzare maiuscole e minuscole.',
'symbols' => 'La password deve contenere simboli.',
'gte' => [
'numeric' => 'Il valore non può essere negativo'
],
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
@@ -41,7 +41,7 @@ return [
'make_required' => 'オプション - クリックで必須にします',
'reorder' => '並べ替え',
'db_field' => 'DBフィールド',
'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
'db_convert_warning' => '警告。このフィールドは <code>:db_column</code> としてカスタムフィールドテーブルにありますが、 <code>:expected</code> でなければなりません。',
'is_unique' => 'この値はすべての資産で一意である必要があります',
'unique' => '一意',
];
@@ -51,7 +51,7 @@ return array(
'fieldset_default_value' => array(
'error' => 'Error validating default fieldset values.',
'error' => 'デフォルトのフィールドセット値の検証中にエラーが発生しました。',
),
+1
View File
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+4 -4
View File
@@ -1,8 +1,8 @@
<?php
return [
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
'reset' => 'Your password has been reset!',
'sent' => 'このシステムにそのメールアドレスが存在する場合は、パスワード回復用のメールが送信されました。',
'user' => '有効なメールアドレスを持つ一致するユーザーがシステムに存在する場合、パスワード復元メールが送信されました。',
'token' => 'このパスワードリセットトークンは無効または期限切れです。または指定されたユーザー名と一致しません。',
'reset' => 'パスワードがリセットされました!',
];
+2 -2
View File
@@ -15,7 +15,7 @@ return array(
"password" => "パスワードは6文字以上および確認用と一致する必要があります。",
"user" => "ユーザー名またはメールアドレスが不正です。",
"token" => 'This password reset token is invalid or expired, or does not match the username provided.',
'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
"token" => 'このパスワードリセットトークンは無効または期限切れです。または指定されたユーザー名と一致しません。',
'sent' => 'このシステムにそのメールアドレスが存在する場合は、パスワード回復用のメールが送信されました。',
);
+5 -5
View File
@@ -91,11 +91,11 @@ return [
'url' => ':attribute フォーマットが不正です。',
'unique_undeleted' => ':attribute は 一意の値である必要があります。',
'non_circular' => ':attribute は、循環参照を作成してはいけません。',
'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
'letters' => 'Password must contain at least one letter.',
'numbers' => 'Password must contain at least one number.',
'case_diff' => 'Password must use mixed case.',
'symbols' => 'Password must contain symbols.',
'disallow_same_pwd_as_user_fields' => 'パスワードはユーザー名と同じにすることはできません。',
'letters' => 'パスワードには英字が1文字以上必要です。',
'numbers' => 'パスワードには数字が1つ以上必要です。',
'case_diff' => 'パスワードは英字と数字を混在させる必要があります。',
'symbols' => 'パスワードには記号を含める必要があります',
'gte' => [
'numeric' => '負の値にすることはできません'
],
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% 완료(경고)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => '새 자산',
'new_license' => '새 라이센스',
'new_accessory' => '새 부속품',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1
View File
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1
View File
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Błędna kategoria',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'Nowy środek trwały',
'new_license' => 'Nowa licencja',
'new_accessory' => 'Nowe akcesorium',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1
View File
@@ -364,5 +364,6 @@ Resultados da Sincronização',
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Categoria inválida',
'dashboard_info' => 'Este é o seu painel. Há muitos como este, mas este é o seu.',
'60_percent_warning' => '60% Completo (aviso)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'Novo Artigo',
'new_license' => 'Nova Licença',
'new_accessory' => 'Novo Acessório',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Неверная категория',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% выполнено (предупреждение)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'Создать актив',
'new_license' => 'New License',
'new_accessory' => 'Создать аксессуар',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -329,7 +329,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+1
View File
@@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+2 -1
View File
@@ -330,7 +330,7 @@ return [
'invalid_category' => 'Invalid category',
'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
'60_percent_warning' => '60% Complete (warning)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
'new_accessory' => 'New Accessory',
@@ -364,5 +364,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];
+5 -5
View File
@@ -1,12 +1,12 @@
<?php
return array(
'personal_api_keys' => 'Personal API Keys',
'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
will not be visible to you again.',
'api_base_url' => 'Your API base url is located at:',
'personal_api_keys' => 'Lični API kključevi',
'api_key_warning' => 'Pri generisanju API tokena, obavezno ga odmah kopirajte jer oni
vam neće ponovo biti vidljivi.',
'api_base_url' => 'Vaša osnovna adresa API-ja se nalazi u:',
'api_base_url_endpoint' => '/&lt;endpoint&gt;',
'api_token_expiration_time' => 'API tokens are set to expire in:',
'api_token_expiration_time' => 'API tokeni će isteći za:',
'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to
find specific API endpoints and additional API documentation.',
);
+6 -6
View File
@@ -40,12 +40,12 @@ return [
'warranty' => 'Garancija',
'warranty_expires' => 'Garancija ističe',
'years' => 'godina',
'asset_location' => 'Update Asset Location',
'asset_location_update_default_current' => 'Update default location AND actual location',
'asset_location_update_default' => 'Update only default location',
'asset_location' => 'Izmeni lokaciju imovine',
'asset_location_update_default_current' => 'Izmeni predefinisanu i stvarnu lokaciju',
'asset_location_update_default' => 'Izmeni samo predefinisanu lokaciju',
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
'optional_infos' => 'Optional Information',
'order_details' => 'Order Related Information'
'processing_spinner' => 'Obrada...',
'optional_infos' => 'Opcione informacije',
'order_details' => 'Redosledne informacije'
];
@@ -6,12 +6,12 @@ return [
'archived' => 'Arhivirano',
'asset' => 'Imovina',
'bulk_checkout' => 'Checkout Assets',
'bulk_checkin' => 'Checkin Assets',
'bulk_checkin' => 'Razduži imovinu',
'checkin' => 'Checkin Asset',
'checkout' => 'Checkout Asset',
'clone' => 'Kloniraj imovinu',
'deployable' => 'Može se razmestiti',
'deleted' => 'This asset has been deleted.',
'deleted' => 'Imovina je obrisana.',
'edit' => 'Uređivanje imovine',
'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',
@@ -22,7 +22,7 @@ return [
'pending' => 'U čekanju',
'undeployable' => 'Ne može da se razmesti',
'view' => 'Prikaz imovine',
'csv_error' => 'You have an error in your CSV file:',
'csv_error' => 'Postoji greška u tvojoj CSV datoteci:',
'import_text' => '
<p>
Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &gt; General Settings.
@@ -4,7 +4,7 @@ return [
'undeployable' => '<strong>Upozorenje: </strong> Ovaj resurs, imovina je označena kao trenutno nedeljiva. Ako se ovaj status promenio, ažurirajte status imovine.',
'does_not_exist' => 'Imovina ne postoji.',
'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
'does_not_exist_or_not_requestable' => 'Imovina ne postoji ili se ne može zatražiti.',
'assoc_users' => 'Ovaj je resurs trenutno poveren korisniku i ne može se izbrisati. Najprije proverite resurs, a zatim ponovo pokušajte brisanje. ',
'create' => [
@@ -4,11 +4,11 @@ return [
'asset_tag' => 'Oznaka imovine',
'asset_model' => 'Model',
'book_value' => 'Current Value',
'book_value' => 'Trenutna vrednost',
'change' => 'U/I',
'checkout_date' => 'Datum odjave',
'checkoutto' => 'Odjavljen',
'current_value' => 'Current Value',
'current_value' => 'Trenutna vrednost',
'diff' => 'Diff',
'dl_csv' => 'Download CSV',
'eol' => 'EOL',
@@ -22,9 +22,9 @@ return [
'image' => 'Slika uređaja',
'days_without_acceptance' => 'Days Without Acceptance',
'monthly_depreciation' => 'Monthly Depreciation',
'assigned_to' => 'Assigned To',
'requesting_user' => 'Requesting User',
'requested_date' => 'Requested Date',
'changed' => 'Changed',
'icon' => 'Icon',
'assigned_to' => 'Zadužen',
'requesting_user' => 'Zahtevalac',
'requested_date' => 'Datum zahteva',
'changed' => 'Izmenjeno',
'icon' => 'Ikonica',
];
+13 -13
View File
@@ -11,8 +11,8 @@ return [
'country' => 'Zemlja',
'create' => 'Kreiraj lokaciju',
'update' => 'Ažuriraj lokaciju',
'print_assigned' => 'Print Assigned',
'print_all_assigned' => 'Print All Assigned',
'print_assigned' => 'Oštampaj zaduženo',
'print_all_assigned' => 'Oštampaj sve zaduženo',
'name' => 'Naziv lokacije',
'address' => 'Adresa',
'zip' => 'Poštanski broj',
@@ -20,19 +20,19 @@ return [
'parent' => 'Parent',
'currency' => 'Valuta lokacije',
'ldap_ou' => 'LDAP pretraživanje OU',
'user_name' => 'User Name',
'department' => 'Department',
'location' => 'Location',
'user_name' => 'Korisničko ime',
'department' => 'Sektor',
'location' => 'Lokacija',
'asset_tag' => 'Assets Tag',
'asset_name' => 'Name',
'asset_category' => 'Category',
'asset_manufacturer' => 'Manufacturer',
'asset_name' => 'Naziv',
'asset_category' => 'Kategorija',
'asset_manufacturer' => 'Proizvođač',
'asset_model' => 'Model',
'asset_serial' => 'Serial',
'asset_location' => 'Location',
'asset_checked_out' => 'Checked Out',
'asset_expected_checkin' => 'Expected Checkin',
'date' => 'Date:',
'asset_serial' => 'Serijski broj',
'asset_location' => 'Lokacija',
'asset_checked_out' => 'Zaduženo',
'asset_expected_checkin' => 'Očekivano razduživanje',
'date' => 'Datum:',
'signed_by_asset_auditor' => 'Signed By (Asset Auditor):',
'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
'signed_by_location_manager' => 'Signed By (Location Manager):',
+3 -3
View File
@@ -17,8 +17,8 @@ return [
'last_login' => 'Poslednja prijava',
'ldap_config_text' => 'Postavke LDAP konfiguracije mogu se pronaći u Administrator> Postavke. Odabrana lokacija (opcionalno) će biti podešena za sve importovane korisnike.',
'print_assigned' => 'Print All Assigned',
'email_assigned' => 'Email List of All Assigned',
'user_notified' => 'User has been emailed a list of their currently assigned items.',
'email_assigned' => 'Pošalji spisak svega zaduženog',
'user_notified' => 'Korisniku je poslata poruka sa spiskom svega zaduženog na njegovo ime.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Prikaži korisnika :name',
@@ -35,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
'update_user_assets_status' => 'Update all assets for these users to this status',
'update_user_assets_status' => 'Uredi svu imovinu ovih korisnika u ovaj status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
+3 -3
View File
@@ -13,8 +13,8 @@ return array(
|
*/
'failed' => 'These credentials do not match our records.',
'password' => 'The provided password is incorrect.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
'failed' => 'Ovi kredencijali se ne poklapaju sa našim podacima.',
'password' => 'Unešena lozinka nije ispravna.',
'throttle' => 'Previše pokušaja prijave. Molim vas pokušajte ponovo za :seconds sekundi.',
);
+1 -1
View File
@@ -10,7 +10,7 @@ return [
'restore' => 'Vratiti',
'remove' => 'Ukloni',
'request' => 'Zahtev',
'submit' => 'Pošalji',
'submit' => 'Podnesi',
'upload' => 'Upload',
'select_file' => 'Odaberite datoteku...',
'select_files' => 'Odaberite datoteke...',

Some files were not shown because too many files have changed in this diff Show More