IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7102 from firefly-iii/final-60

Browse Source 
Final 60
This commit is contained in:
James Cole 2023-03-02 21:19:40 +01:00 committed by GitHub
commit 1ddcc51c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 881 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
.ci/php-cs-fixer/composer.lock generated
View File

@ -737,16 +737,16 @@
},
{
"name": "symfony/console",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "3e294254f2191762c1d137aed4b94e966965e985"
"reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/3e294254f2191762c1d137aed4b94e966965e985",
"reference": "3e294254f2191762c1d137aed4b94e966965e985",
"url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
"reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
"shasum": ""
},
"require": {
@ -813,7 +813,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.2.5"
"source": "https://github.com/symfony/console/tree/v6.2.7"
},
"funding": [
{
@ -829,20 +829,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-02-25T17:00:03+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.2.0",
"version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
"reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
"reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
"shasum": ""
},
"require": {
@ -880,7 +880,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
},
"funding": [
{
@ -896,20 +896,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T10:21:52+00:00"
"time": "2023-03-01T10:25:55+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68"
"reference": "404b307de426c1c488e5afad64403e5f145e82a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
"reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/404b307de426c1c488e5afad64403e5f145e82a5",
"reference": "404b307de426c1c488e5afad64403e5f145e82a5",
"shasum": ""
},
"require": {
@ -963,7 +963,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v6.2.5"
"source": "https://github.com/symfony/event-dispatcher/tree/v6.2.7"
},
"funding": [
{
@ -979,20 +979,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v3.2.0",
"version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "0782b0b52a737a05b4383d0df35a474303cabdae"
"reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae",
"reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
"reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
"shasum": ""
},
"require": {
@ -1042,7 +1042,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0"
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1"
},
"funding": [
{
@ -1058,20 +1058,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T10:21:52+00:00"
"time": "2023-03-01T10:32:47+00:00"
},
{
"name": "symfony/filesystem",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593"
"reference": "82b6c62b959f642d000456f08c6d219d749215b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/e59e8a4006afd7f5654786a83b4fcb8da98f4593",
"reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3",
"reference": "82b6c62b959f642d000456f08c6d219d749215b3",
"shasum": ""
},
"require": {
@ -1105,7 +1105,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v6.2.5"
"source": "https://github.com/symfony/filesystem/tree/v6.2.7"
},
"funding": [
{
@ -1121,20 +1121,20 @@
"type": "tidelift"
}
],
"time": "2023-01-20T17:45:48+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/finder",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c"
"reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/c90dc446976a612e3312a97a6ec0069ab0c2099c",
"reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c",
"url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb",
"reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb",
"shasum": ""
},
"require": {
@ -1169,7 +1169,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v6.2.5"
"source": "https://github.com/symfony/finder/tree/v6.2.7"
},
"funding": [
{
@ -1185,20 +1185,20 @@
"type": "tidelift"
}
],
"time": "2023-01-20T17:45:48+00:00"
"time": "2023-02-16T09:57:23+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "e8324d44f5af99ec2ccec849934a242f64458f86"
"reference": "aa0e85b53bbb2b4951960efd61d295907eacd629"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/e8324d44f5af99ec2ccec849934a242f64458f86",
"reference": "e8324d44f5af99ec2ccec849934a242f64458f86",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/aa0e85b53bbb2b4951960efd61d295907eacd629",
"reference": "aa0e85b53bbb2b4951960efd61d295907eacd629",
"shasum": ""
},
"require": {
@ -1236,7 +1236,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v6.2.5"
"source": "https://github.com/symfony/options-resolver/tree/v6.2.7"
},
"funding": [
{
@ -1252,7 +1252,7 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -1748,16 +1748,16 @@
},
{
"name": "symfony/process",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7"
"reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
"reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
"url": "https://api.github.com/repos/symfony/process/zipball/680e8a2ea6b3f87aecc07a6a65a203ae573d1902",
"reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902",
"shasum": ""
},
"require": {
@ -1789,7 +1789,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v6.2.5"
"source": "https://github.com/symfony/process/tree/v6.2.7"
},
"funding": [
{
@ -1805,20 +1805,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-02-24T10:42:00+00:00"
},
{
"name": "symfony/service-contracts",
"version": "v3.2.0",
"version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75"
"reference": "a8c9cedf55f314f3a186041d19537303766df09a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75",
"reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/a8c9cedf55f314f3a186041d19537303766df09a",
"reference": "a8c9cedf55f314f3a186041d19537303766df09a",
"shasum": ""
},
"require": {
@ -1874,7 +1874,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.2.0"
"source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
},
"funding": [
{
@ -1890,20 +1890,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T10:21:52+00:00"
"time": "2023-03-01T10:32:47+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "00b6ac156aacffc53487c930e0ab14587a6607f6"
"reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/00b6ac156aacffc53487c930e0ab14587a6607f6",
"reference": "00b6ac156aacffc53487c930e0ab14587a6607f6",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
"reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
"shasum": ""
},
"require": {
@ -1936,7 +1936,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/stopwatch/tree/v6.2.5"
"source": "https://github.com/symfony/stopwatch/tree/v6.2.7"
},
"funding": [
{
@ -1952,20 +1952,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:36:55+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/string",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0"
"reference": "67b8c1eec78296b85dc1c7d9743830160218993d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
"reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
"url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d",
"reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
"shasum": ""
},
"require": {
@ -2022,7 +2022,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.2.5"
"source": "https://github.com/symfony/string/tree/v6.2.7"
},
"funding": [
{
@ -2038,7 +2038,7 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-02-24T10:42:00+00:00"
}
],
"packages-dev": [],

2
changelog.md
View File

@ -8,7 +8,7 @@ This is release **6.0.0** of Firefly III.
### Warnings
- The upgrade is not backwards compatible for people who manage outgoing loans (money borrowed to other people). Transactions will be removed or changed. See [this Gist](https://gist.github.com/JC5/909385c5086f9e07ba2c32e047446d68) for more information.
- The upgrade may not be backwards compatible for people who manage outgoing loans (money borrowed to other people). Transactions will be removed or changed. See [this Gist](https://gist.github.com/JC5/909385c5086f9e07ba2c32e047446d68) for more information.
- You will need to make a backup of your database.
- You must use PHP 8.2 or use the Docker container.

394
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
frontend/package.json
View File

@ -18,7 +18,7 @@
"core-js": "^3.6.5",
"date-fns": "^2.28.0",
"pinia": "^2.0.14",
"quasar": "^2.11.6",
"quasar": "^2.11.7",
"vue": "3",
"vue-i18n": "^9.0.0",
"vue-router": "^4.0.0",
@ -26,7 +26,7 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.13.14",
"@quasar/app-webpack": "^3.7.1",
"@quasar/app-webpack": "^3.7.2",
"@types/node": "^12.20.21",
"@typescript-eslint/eslint-plugin": "^4.16.1",
"@typescript-eslint/parser": "^4.16.1",

16
frontend/yarn.lock
View File

@ -1342,10 +1342,10 @@
resolved "https://registry.yarnpkg.com/@positron/stack-trace/-/stack-trace-1.0.0.tgz#14fcc712a530038ef9be1ce6952315a839f466a8"
integrity sha1-FPzHEqUwA475vhzmlSMVqDn0Zqg=
"@quasar/app-webpack@^3.7.1":
version "3.7.1"
resolved "https://registry.yarnpkg.com/@quasar/app-webpack/-/app-webpack-3.7.1.tgz#c2d9f826ac240894b033ab4c2364726101f5a216"
integrity sha512-gy77FP3PY/T2HDUa7cGU7oHKbdTmHUOLT4YBd/HvIsIHenjmZCaj/g+ero1kuoKRBy00Y5CalM5tDJnhO8PXOQ==
"@quasar/app-webpack@^3.7.2":
version "3.7.2"
resolved "https://registry.yarnpkg.com/@quasar/app-webpack/-/app-webpack-3.7.2.tgz#feaea083d79c5e6c62052dfe87a6e7df73d44e5e"
integrity sha512-OztjmlXaLqjBRm6YPV9/Q+WfXhdu9mcXk5OXExyEpzCII7dfa4m1UMzp+AOsgDXUgoSBt5Wg1WmAICLnKELAjw==
dependencies:
"@quasar/babel-preset-app" "2.0.2"
"@quasar/fastclick" "1.1.5"
@ -5388,10 +5388,10 @@ qs@6.9.7:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
quasar@^2.11.6:
version "2.11.6"
resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.11.6.tgz#9d200a0de44dc235915fee3ea3ff5673045fdcbc"
integrity sha512-jJniWqTtfLHDuAT1YNx6ZZdZU7nM8vwscyM7IxmijaHq+fDpgjaujDQUlJWgn5ZMkqe3Yvg93MgSxjcL71oJIw==
quasar@^2.11.7:
version "2.11.7"
resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.11.7.tgz#0371d2cbe299305a0949332d2a3fc6929a70e2f6"
integrity sha512-OzDwYfoSwZbwqfNWz9Bfn1mhGE8YMxpTLhPvVkQU87ePF6qFj4aWttcTUifXITKldOAZziN1Mmv8VLQyITHwiw==
queue-microtask@^1.2.2:
version "1.2.3"

2
public/v1/js/create_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/edit.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/show.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v3/css/vendor.973c97fc.css → public/v3/css/vendor.b7419aa9.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/v3/index.html
View File

@ -1 +1 @@
<!DOCTYPE html><html><head><base href=/v3/ ><title>Firefly III</title><meta charset=utf-8><meta content="Personal finances manager" name=description><meta content="telephone=no" name=format-detection><meta content=no name=msapplication-tap-highlight><meta content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width" name=viewport><link href=favicon-32x32.png rel=icon sizes=32x32 type=image/png><link href=favicon-16x16.png rel=icon sizes=16x16 type=image/png><link href=maskable76.png rel=apple-touch-icon sizes=76x76><link href=maskable120.png rel=apple-touch-icon sizes=120x120><link href=maskable152.png rel=apple-touch-icon sizes=152x152><link href=apple-touch-icon.png rel=apple-touch-icon sizes=180x180><link color=#3c8dbc href=safari-pinned-tab.svg rel=mask-icon><link href=maskable192.png rel=icon sizes=192x192><link href=maskable128.png rel=icon sizes=128x128><link href=manifest.webmanifest rel=manifest><meta content=#1e6581 name=msapplication-TileColor><meta content=maskable512.png name=msapplication-TileImage><meta content=no name=msapplication-tap-highlight><meta content="Firefly III" name=application-name><meta content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir" name=robots><meta content=yes name=apple-mobile-web-app-capable><meta content="Firefly III" name=apple-mobile-web-app-title><meta content="Firefly III" name=application-name><meta content=#3c8dbc name=msapplication-TileColor><meta content="mstile-144x144.png?v=3e8AboOwbd" name=msapplication-TileImage><meta content=#3c8dbc name=theme-color><script defer src=/v3/js/vendor.aba07782.js></script><script defer src=/v3/js/app.8ad7cfe1.js></script><link href=/v3/css/vendor.973c97fc.css rel=stylesheet><link href=/v3/css/app.50c7ba73.css rel=stylesheet></head><body><div id=q-app></div></body></html>
<!DOCTYPE html><html><head><base href=/v3/ ><title>Firefly III</title><meta charset=utf-8><meta content="Personal finances manager" name=description><meta content="telephone=no" name=format-detection><meta content=no name=msapplication-tap-highlight><meta content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width" name=viewport><link href=favicon-32x32.png rel=icon sizes=32x32 type=image/png><link href=favicon-16x16.png rel=icon sizes=16x16 type=image/png><link href=maskable76.png rel=apple-touch-icon sizes=76x76><link href=maskable120.png rel=apple-touch-icon sizes=120x120><link href=maskable152.png rel=apple-touch-icon sizes=152x152><link href=apple-touch-icon.png rel=apple-touch-icon sizes=180x180><link color=#3c8dbc href=safari-pinned-tab.svg rel=mask-icon><link href=maskable192.png rel=icon sizes=192x192><link href=maskable128.png rel=icon sizes=128x128><link href=manifest.webmanifest rel=manifest><meta content=#1e6581 name=msapplication-TileColor><meta content=maskable512.png name=msapplication-TileImage><meta content=no name=msapplication-tap-highlight><meta content="Firefly III" name=application-name><meta content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir" name=robots><meta content=yes name=apple-mobile-web-app-capable><meta content="Firefly III" name=apple-mobile-web-app-title><meta content="Firefly III" name=application-name><meta content=#3c8dbc name=msapplication-TileColor><meta content="mstile-144x144.png?v=3e8AboOwbd" name=msapplication-TileImage><meta content=#3c8dbc name=theme-color><script defer src=/v3/js/vendor.43fbf1b0.js></script><script defer src=/v3/js/app.8ad7cfe1.js></script><link href=/v3/css/vendor.b7419aa9.css rel=stylesheet><link href=/v3/css/app.50c7ba73.css rel=stylesheet></head><body><div id=q-app></div></body></html>

2
public/v3/js/vendor.aba07782.js → public/v3/js/vendor.43fbf1b0.js vendored
View File

File diff suppressed because one or more lines are too long

22
resources/assets/js/locales/ru.json
View File

@ -92,18 +92,18 @@
"multi_account_warning_withdrawal": "\u0418\u043c\u0435\u0439\u0442\u0435 \u0432 \u0432\u0438\u0434\u0443, \u0447\u0442\u043e \u0441\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0432 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u0430\u0441\u0442\u044f\u0445 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0431\u0443\u0434\u0435\u0442 \u0442\u0430\u043a\u0438\u043c \u0436\u0435, \u043a\u0430\u043a \u0432 \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u0440\u0430\u0441\u0445\u043e\u0434\u0430.",
"multi_account_warning_deposit": "\u0418\u043c\u0435\u0439\u0442\u0435 \u0432 \u0432\u0438\u0434\u0443, \u0447\u0442\u043e \u0441\u0447\u0451\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0432 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u0430\u0441\u0442\u044f\u0445 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0431\u0443\u0434\u0435\u0442 \u0442\u0430\u043a\u0438\u043c \u0436\u0435, \u043a\u0430\u043a \u0432 \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u0434\u043e\u0445\u043e\u0434\u0430.",
"multi_account_warning_transfer": "\u0418\u043c\u0435\u0439\u0442\u0435 \u0432 \u0432\u0438\u0434\u0443, \u0447\u0442\u043e \u0441\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0438 \u0441\u0447\u0451\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0432 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u0430\u0441\u0442\u044f\u0445 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0431\u0443\u0434\u0443\u0442 \u0442\u0430\u043a\u0438\u043c\u0438 \u0436\u0435, \u043a\u0430\u043a \u0432 \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u043f\u0435\u0440\u0435\u0432\u043e\u0434\u0430.",
"webhook_trigger_STORE_TRANSACTION": "After transaction creation",
"webhook_trigger_UPDATE_TRANSACTION": "After transaction update",
"webhook_trigger_DESTROY_TRANSACTION": "After transaction delete",
"webhook_response_TRANSACTIONS": "Transaction details",
"webhook_response_ACCOUNTS": "Account details",
"webhook_response_none_NONE": "No details",
"webhook_trigger_STORE_TRANSACTION": "\u041f\u043e\u0441\u043b\u0435 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
"webhook_trigger_UPDATE_TRANSACTION": "\u041f\u043e\u0441\u043b\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
"webhook_trigger_DESTROY_TRANSACTION": "\u041f\u043e\u0441\u043b\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
"webhook_response_TRANSACTIONS": "\u0414\u0435\u0442\u0430\u043b\u0438 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438",
"webhook_response_ACCOUNTS": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e\u0431 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438",
"webhook_response_none_NONE": "\u041d\u0435\u0442 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0445 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u0439",
"webhook_delivery_JSON": "JSON",
"actions": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f",
"meta_data": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435",
"webhook_messages": "Webhook message",
"webhook_messages": "\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
"inactive": "\u041d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0439",
"no_webhook_messages": "There are no webhook messages",
"no_webhook_messages": "\u041d\u0435\u0442 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 \u043e\u0442 \u0432\u0435\u0431\u0445\u0443\u043a\u043e\u0432",
"inspect": "Inspect",
"create_new_webhook": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0432\u0435\u0431\u0445\u0443\u043a",
"webhooks": "\u0412\u0435\u0431-\u0445\u0443\u043a\u0438",
@ -111,11 +111,11 @@
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",
"edit_webhook_js": "Edit webhook \"{title}\"",
"edit_webhook_js": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0431\u0445\u0443\u043a \"{title}\"",
"webhook_was_triggered": "The webhook was triggered on the indicated transaction. Please wait for results to appear.",
"view_message": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f",
"view_attempts": "View failed attempts",
"message_content_title": "Webhook message content",
"view_attempts": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u044b\u0445 \u043f\u043e\u043f\u044b\u0442\u043e\u043a",
"message_content_title": "\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f webhook",
"message_content_help": "This is the content of the message that was sent (or tried) using this webhook.",
"attempt_content_title": "Webhook attempts",
"attempt_content_help": "These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.",

2
resources/lang/de_DE/config.php
View File

@ -71,7 +71,7 @@ return [
'specific_day_js' => 'D. MMMM YYYY',
//'week_in_year' => 'Week %V, %G',
'week_in_year_js' => '[Week] W, GGGG',
'week_in_year_js' => '[KW] W, GGGG',
'week_in_year_fns' => "'Woche' ww/yyyy",
//'year' => '%Y',

2
resources/lang/es_ES/config.php
View File

@ -71,7 +71,7 @@ return [
'specific_day_js' => 'D MMMM YYYY',
//'week_in_year' => 'Week %V, %G',
'week_in_year_js' => '[Week] W, GGGG',
'week_in_year_js' => '[Week] W, GGG',
'week_in_year_fns' => "'Semana' w, yyyy",
//'year' => '%Y',

62
resources/lang/es_ES/firefly.php
View File

@ -432,49 +432,49 @@ return [
'search_modifier_source_account_nr_contains' => 'El número de cuenta de origen (IBAN) contiene ":value"',
'search_modifier_not_source_account_nr_contains' => 'El número de la cuenta de origen (IBAN) no contiene ":value"',
'search_modifier_source_account_nr_starts' => 'El número de cuenta de origen (IBAN) comienza con ":value"',
'search_modifier_not_source_account_nr_starts' => 'Source account number (IBAN) does not start with ":value"',
'search_modifier_source_account_nr_ends' => 'Source account number (IBAN) ends on ":value"',
'search_modifier_not_source_account_nr_ends' => 'Source account number (IBAN) does not end on ":value"',
'search_modifier_not_source_account_nr_starts' => 'El número de cuenta de origen (IBAN) no comienza con ":value"',
'search_modifier_source_account_nr_ends' => 'El número de cuenta fuente (IBAN) termina en ":value"',
'search_modifier_not_source_account_nr_ends' => 'El número de cuenta de origen (IBAN) no termina en ":value"',
'search_modifier_destination_account_is' => 'El nombre de la cuenta de destino es exactamente ":value"',
'search_modifier_not_destination_account_is' => 'Destination account name is not ":value"',
'search_modifier_not_destination_account_is' => 'El nombre de cuenta de destino no es ":value"',
'search_modifier_destination_account_contains' => 'El nombre de la cuenta de destino contiene ":value"',
'search_modifier_not_destination_account_contains' => 'Destination account name does not contain ":value"',
'search_modifier_not_destination_account_contains' => 'El nombre de cuenta de destino no contiene ":value"',
'search_modifier_destination_account_starts' => 'El nombre de cuenta de destino comienza con ":value"',
'search_modifier_not_destination_account_starts' => 'Destination account name does not start with ":value"',
'search_modifier_destination_account_ends' => 'Destination account name ends on ":value"',
'search_modifier_not_destination_account_ends' => 'Destination account name does not end on ":value"',
'search_modifier_not_destination_account_starts' => 'El nombre de cuenta de destino no comienza con ":value"',
'search_modifier_destination_account_ends' => 'El nombre de la cuenta de destino termina en ":value"',
'search_modifier_not_destination_account_ends' => 'El nombre de la cuenta de destino no termina en ":value"',
'search_modifier_destination_account_id' => 'El ID de la cuenta de destino es :value',
'search_modifier_not_destination_account_id' => 'Destination account ID is not :value',
'search_modifier_destination_is_cash' => 'Destination account is the "(cash)" account',
'search_modifier_not_destination_is_cash' => 'Destination account is not the "(cash)" account',
'search_modifier_source_is_cash' => 'Source account is the "(cash)" account',
'search_modifier_not_source_is_cash' => 'Source account is not the "(cash)" account',
'search_modifier_not_destination_account_id' => 'El ID de cuenta de destino no es :value',
'search_modifier_destination_is_cash' => 'La cuenta de destino es la cuenta "(efectivo)"',
'search_modifier_not_destination_is_cash' => 'La cuenta de destino no es la cuenta "(efectivo)"',
'search_modifier_source_is_cash' => 'La cuenta de origen es la cuenta "(efectivo)"',
'search_modifier_not_source_is_cash' => 'La cuenta de origen no es la cuenta "(efectivo)"',
'search_modifier_destination_account_nr_is' => 'El número de cuenta de destino (IBAN) es ":value"',
'search_modifier_not_destination_account_nr_is' => 'Destination account number (IBAN) is ":value"',
'search_modifier_not_destination_account_nr_is' => 'El número de cuenta de destino (IBAN) es ":value"',
'search_modifier_destination_account_nr_contains' => 'El número de cuenta de destino (IBAN) contiene ":value"',
'search_modifier_not_destination_account_nr_contains' => 'Destination account number (IBAN) does not contain ":value"',
'search_modifier_not_destination_account_nr_contains' => 'El número de cuenta de destino (IBAN) no contiene ":value"',
'search_modifier_destination_account_nr_starts' => 'El número de cuenta de destino (IBAN) comienza con ":value"',
'search_modifier_not_destination_account_nr_starts' => 'Destination account number (IBAN) does not start with ":value"',
'search_modifier_not_destination_account_nr_starts' => 'El número de cuenta de destino (IBAN) no comienza con ":value"',
'search_modifier_destination_account_nr_ends' => 'El número de cuenta de destino (IBAN) termina con ":value"',
'search_modifier_not_destination_account_nr_ends' => 'Destination account number (IBAN) does not end with ":value"',
'search_modifier_not_destination_account_nr_ends' => 'El número de cuenta de destino (IBAN) no termina con ":value"',
'search_modifier_account_id' => 'El ID de cuenta de origen o destino es/son: :value',
'search_modifier_not_account_id' => 'Source or destination account ID\'s is/are not: :value',
'search_modifier_not_account_id' => 'Los ID de la cuenta de origen o destino no es/son: :value',
'search_modifier_category_is' => 'La categoría es ":value"',
'search_modifier_not_category_is' => 'Category is not ":value"',
'search_modifier_not_category_is' => 'La categoría no es ":value"',
'search_modifier_budget_is' => 'El presupuesto es ":value"',
'search_modifier_not_budget_is' => 'Budget is not ":value"',
'search_modifier_not_budget_is' => 'El presupuesto no es ":value"',
'search_modifier_bill_is' => 'La factura es ":value"',
'search_modifier_not_bill_is' => 'Bill is not ":value"',
'search_modifier_not_bill_is' => 'La factura no es ":value"',
'search_modifier_transaction_type' => 'El tipo de transacción es ":value"',
'search_modifier_not_transaction_type' => 'Transaction type is not ":value"',
'search_modifier_not_transaction_type' => 'El tipo de transacción no es ":value"',
'search_modifier_tag_is' => 'La etiqueta es ":value"',
'search_modifier_not_tag_is' => 'No tag is ":value"',
'search_modifier_not_tag_is' => 'Ninguna etiqueta es ":value"',
'search_modifier_date_on_year' => 'El año de la transacción es ":value"',
'search_modifier_not_date_on_year' => 'Transaction is not in year ":value"',
'search_modifier_not_date_on_year' => 'El año de la transacción no es ":value"',
'search_modifier_date_on_month' => 'El mes de la transacción es ":value"',
'search_modifier_not_date_on_month' => 'Transaction is not in month ":value"',
'search_modifier_not_date_on_month' => 'El mes de la transacción no es ":value"',
'search_modifier_date_on_day' => 'El día de la transacción es ":value"',
'search_modifier_not_date_on_day' => 'Transaction is not on day of month ":value"',
'search_modifier_not_date_on_day' => 'La transacción no es el día del mes ":value"',
'search_modifier_date_before_year' => 'El año de la transacción es anterior o igual a ":value"',
'search_modifier_date_before_month' => 'El mes de la transacción es anterior o igual a ":value"',
'search_modifier_date_before_day' => 'El día de la transacción es anterior o igual a ":value"',
@ -485,15 +485,15 @@ return [
// new
'search_modifier_tag_is_not' => 'La etiqueta no es ":value"',
'search_modifier_not_tag_is_not' => 'Tag is ":value"',
'search_modifier_not_tag_is_not' => 'La etiqueta es ":value"',
'search_modifier_account_is' => 'Cualquier cuenta es ":value"',
'search_modifier_not_account_is' => 'Neither account is ":value"',
'search_modifier_not_account_is' => 'Ninguna cuenta es ":value"',
'search_modifier_account_contains' => 'Cualquier cuenta contiene ":value"',
'search_modifier_not_account_contains' => 'Neither account contains ":value"',
'search_modifier_not_account_contains' => 'Ninguna cuenta contiene ":value"',
'search_modifier_account_ends' => 'Cualquier cuenta termina con ":value"',
'search_modifier_not_account_ends' => 'Neither account ends with ":value"',
'search_modifier_not_account_ends' => 'Ninguna cuenta termina con ":value"',
'search_modifier_account_starts' => 'Cualquier cuenta comienza con ":value"',
'search_modifier_not_account_starts' => 'Neither account starts with ":value"',
'search_modifier_not_account_starts' => 'Ninguna cuenta comienza con ":value"',
'search_modifier_account_nr_is' => 'Número / IBAN de cualquier cuenta es ":value"',
'search_modifier_not_account_nr_is' => 'Neither account number / IBAN is ":value"',
'search_modifier_account_nr_contains' => 'Número de cuenta / IBAN de cualquier cuenta contiene ":value"',

1082
resources/lang/ko_KR/firefly.php
View File

File diff suppressed because it is too large Load Diff

2
resources/lang/sv_SE/firefly.php
View File

@ -1638,7 +1638,7 @@ return [
'make_default_currency' => 'Gör till standard',
'default_currency' => 'standard',
'currency_is_disabled' => 'Inaktiverad',
'enable_currency' => 'Aktiverad',
'enable_currency' => 'Aktivera',
'disable_currency' => 'Inaktivera',
'currencies_default_disabled' => 'De flesta valutor är inaktiverade som standard. För att använda dem, så måste de aktiveras först.',
'currency_is_now_enabled' => 'Valuta ":name" har aktiverats',

30
yarn.lock
View File

@ -1201,9 +1201,9 @@
integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
"@types/node@*":
version "18.14.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f"
integrity sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ==
version "18.14.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.4.tgz#0e64ec0b35a772e1e3d849f9a0ff61782d0cb647"
integrity sha512-VhCw7I7qO2X49+jaKcAUwi3rR+hbxT5VcYF493+Z5kMLI0DL568b7JI4IDJaxWFH0D/xwmGJNoXisyX+w7GH/g==
"@types/parse-json@^4.0.0":
version "4.0.0"
@ -1907,9 +1907,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449:
version "1.0.30001457"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz#6af34bb5d720074e2099432aa522c21555a18301"
integrity sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==
version "1.0.30001458"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz#871e35866b4654a7d25eccca86864f411825540c"
integrity sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==
chalk@^2.0.0:
version "2.4.2"
@ -2155,9 +2155,9 @@ cookie@0.5.0:
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
core-js-compat@^3.25.1:
version "3.28.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.28.0.tgz#c08456d854608a7264530a2afa281fadf20ecee6"
integrity sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==
version "3.29.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.29.0.tgz#1b8d9eb4191ab112022e7f6364b99b65ea52f528"
integrity sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==
dependencies:
browserslist "^4.21.5"
@ -2520,9 +2520,9 @@ ee-first@1.1.1:
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
electron-to-chromium@^1.4.284:
version "1.4.310"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.310.tgz#cb85dc8ceac536e99b20a364d7ab00ea35168f9e"
integrity sha512-/xlATgfwkm5uDDwLw5nt/MNEf7c1oazLURMZLy39vOioGYyYzLWIDT8fZMJak6qTiAJ7udFTy7JG7ziyjNutiA==
version "1.4.316"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.316.tgz#7f2cfda199ae1a32a69b3eb9046b8b0640086064"
integrity sha512-9urqVpdeJYAwVL/sBjsX2pSlgYI/b4nOqC6UaNa0xlq1VUbXLRhERWlxcQ4FWfUOQQxSSxN/taFtapEcwg5tVA==
elliptic@^6.5.3:
version "6.5.4"
@ -3432,9 +3432,9 @@ laravel-mix@^6.0:
yargs "^17.2.1"
lilconfig@^2.0.3, lilconfig@^2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
version "2.1.0"
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
lines-and-columns@^1.1.6:
version "1.2.4"