diff --git a/changelog.md b/changelog.md
index aab89373ff..3cb78b4f12 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,25 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## 5.6.10 - 2022-01-10
+
+### Added
+- Add currency MXN
+- [Issue 5503](https://github.com/firefly-iii/firefly-iii/issues/5503) option to set PostgreSQL schema.
+
+### Changed
+- All IBANs will get their spaces stripped, but displayed with spaces.
+
+### Removed
+- Remove confirmation popup from rule selection.
+- Remove some debug logging
+
+### Fixed
+- Empty opening balance won't show as "0.00"
+- Display of build and date had a newline.
+- Nullpointer in account validator
+- [Issue 5510](https://github.com/firefly-iii/firefly-iii/issues/5510) Fix bad translation
+
## 5.6.9 - 2022-01-02
### Added
diff --git a/composer.lock b/composer.lock
index a993a38018..62734dbf0e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -552,16 +552,16 @@
},
{
"name": "doctrine/dbal",
- "version": "3.2.0",
+ "version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "5d54f63541d7bed1156cb5c9b79274ced61890e4"
+ "reference": "4caf37acf14b513a91dd4f087f7eda424fa25542"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/5d54f63541d7bed1156cb5c9b79274ced61890e4",
- "reference": "5d54f63541d7bed1156cb5c9b79274ced61890e4",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/4caf37acf14b513a91dd4f087f7eda424fa25542",
+ "reference": "4caf37acf14b513a91dd4f087f7eda424fa25542",
"shasum": ""
},
"require": {
@@ -576,14 +576,14 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
- "phpstan/phpstan": "1.2.0",
+ "phpstan/phpstan": "1.3.0",
"phpstan/phpstan-strict-rules": "^1.1",
- "phpunit/phpunit": "9.5.10",
+ "phpunit/phpunit": "9.5.11",
"psalm/plugin-phpunit": "0.16.1",
- "squizlabs/php_codesniffer": "3.6.1",
+ "squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
- "vimeo/psalm": "4.13.0"
+ "vimeo/psalm": "4.16.1"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -643,7 +643,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.2.0"
+ "source": "https://github.com/doctrine/dbal/tree/3.2.1"
},
"funding": [
{
@@ -659,7 +659,7 @@
"type": "tidelift"
}
],
- "time": "2021-11-26T21:00:12+00:00"
+ "time": "2022-01-05T08:52:06+00:00"
},
{
"name": "doctrine/deprecations",
@@ -971,16 +971,16 @@
},
{
"name": "dragonmantank/cron-expression",
- "version": "v3.1.0",
+ "version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"
+ "reference": "47c53bbb260d3c398fba9bfa9683dcf67add2579"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c",
- "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/47c53bbb260d3c398fba9bfa9683dcf67add2579",
+ "reference": "47c53bbb260d3c398fba9bfa9683dcf67add2579",
"shasum": ""
},
"require": {
@@ -1020,7 +1020,7 @@
],
"support": {
"issues": "https://github.com/dragonmantank/cron-expression/issues",
- "source": "https://github.com/dragonmantank/cron-expression/tree/v3.1.0"
+ "source": "https://github.com/dragonmantank/cron-expression/tree/v3.2.3"
},
"funding": [
{
@@ -1028,7 +1028,7 @@
"type": "github"
}
],
- "time": "2020-11-24T19:55:57+00:00"
+ "time": "2022-01-06T05:35:07+00:00"
},
{
"name": "egulias/email-validator",
@@ -1847,16 +1847,16 @@
},
{
"name": "laravel/framework",
- "version": "v8.77.1",
+ "version": "v8.78.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "994dbac5c6da856c77c81a411cff5b7d31519ca8"
+ "reference": "16359b5ebafba6579b397d7505b082a6d1bb2e31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/994dbac5c6da856c77c81a411cff5b7d31519ca8",
- "reference": "994dbac5c6da856c77c81a411cff5b7d31519ca8",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/16359b5ebafba6579b397d7505b082a6d1bb2e31",
+ "reference": "16359b5ebafba6579b397d7505b082a6d1bb2e31",
"shasum": ""
},
"require": {
@@ -2015,7 +2015,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-12-21T20:22:29+00:00"
+ "time": "2022-01-05T14:52:50+00:00"
},
{
"name": "laravel/passport",
@@ -2671,31 +2671,31 @@
},
{
"name": "league/csv",
- "version": "9.7.4",
+ "version": "9.8.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/csv.git",
- "reference": "002f55f649e7511710dc7154ff44c7be32c8195c"
+ "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/csv/zipball/002f55f649e7511710dc7154ff44c7be32c8195c",
- "reference": "002f55f649e7511710dc7154ff44c7be32c8195c",
+ "url": "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
+ "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-mbstring": "*",
- "php": "^7.3 || ^8.0"
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
"ext-curl": "*",
"ext-dom": "*",
- "friendsofphp/php-cs-fixer": "^3.0",
- "phpstan/phpstan": "^1.0",
+ "friendsofphp/php-cs-fixer": "^v3.4.0",
+ "phpstan/phpstan": "^1.3.0",
"phpstan/phpstan-phpunit": "^1.0.0",
- "phpstan/phpstan-strict-rules": "^1.0",
- "phpunit/phpunit": "^9.5"
+ "phpstan/phpstan-strict-rules": "^1.1.0",
+ "phpunit/phpunit": "^9.5.11"
},
"suggest": {
"ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes",
@@ -2728,7 +2728,7 @@
}
],
"description": "CSV data manipulation made easy in PHP",
- "homepage": "http://csv.thephpleague.com",
+ "homepage": "https://csv.thephpleague.com",
"keywords": [
"convert",
"csv",
@@ -2751,7 +2751,7 @@
"type": "github"
}
],
- "time": "2021-11-30T07:09:34+00:00"
+ "time": "2022-01-04T00:13:07+00:00"
},
{
"name": "league/event",
@@ -4132,16 +4132,16 @@
},
{
"name": "predis/predis",
- "version": "v1.1.9",
+ "version": "v1.1.10",
"source": {
"type": "git",
"url": "https://github.com/predis/predis.git",
- "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259"
+ "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259",
- "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259",
+ "url": "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e",
+ "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e",
"shasum": ""
},
"require": {
@@ -4186,7 +4186,7 @@
],
"support": {
"issues": "https://github.com/predis/predis/issues",
- "source": "https://github.com/predis/predis/tree/v1.1.9"
+ "source": "https://github.com/predis/predis/tree/v1.1.10"
},
"funding": [
{
@@ -4194,7 +4194,7 @@
"type": "github"
}
],
- "time": "2021-10-05T19:02:38+00:00"
+ "time": "2022-01-05T17:46:08+00:00"
},
{
"name": "psr/cache",
@@ -5840,21 +5840,24 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+ "reference": "30885182c981ab175d4d034db0f6f469898070ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
- "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+ "reference": "30885182c981ab175d4d034db0f6f469898070ab",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-ctype": "*"
+ },
"suggest": {
"ext-ctype": "For best performance"
},
@@ -5899,7 +5902,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
},
"funding": [
{
@@ -5915,25 +5918,28 @@
"type": "tidelift"
}
],
- "time": "2021-02-19T12:13:01+00:00"
+ "time": "2021-10-20T20:35:02+00:00"
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
+ "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
- "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40",
+ "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-iconv": "*"
+ },
"suggest": {
"ext-iconv": "For best performance"
},
@@ -5979,7 +5985,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-iconv/tree/v1.24.0"
},
"funding": [
{
@@ -5995,20 +6001,20 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:27:20+00:00"
+ "time": "2022-01-04T09:04:05+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.23.1",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
+ "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
- "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+ "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
"shasum": ""
},
"require": {
@@ -6060,7 +6066,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
},
"funding": [
{
@@ -6076,20 +6082,20 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T12:26:48+00:00"
+ "time": "2021-11-23T21:10:46+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
+ "reference": "749045c69efb97c70d25d7463abba812e91f3a44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
- "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
+ "reference": "749045c69efb97c70d25d7463abba812e91f3a44",
"shasum": ""
},
"require": {
@@ -6147,7 +6153,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
},
"funding": [
{
@@ -6163,11 +6169,11 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:27:20+00:00"
+ "time": "2021-09-14T14:02:44+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -6231,7 +6237,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
},
"funding": [
{
@@ -6251,21 +6257,24 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.23.1",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
+ "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
- "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+ "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-mbstring": "*"
+ },
"suggest": {
"ext-mbstring": "For best performance"
},
@@ -6311,7 +6320,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
},
"funding": [
{
@@ -6327,11 +6336,11 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T12:26:48+00:00"
+ "time": "2021-11-30T18:21:41+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
@@ -6387,7 +6396,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
},
"funding": [
{
@@ -6407,16 +6416,16 @@
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
+ "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
- "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
+ "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
"shasum": ""
},
"require": {
@@ -6466,7 +6475,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
},
"funding": [
{
@@ -6482,20 +6491,20 @@
"type": "tidelift"
}
],
- "time": "2021-02-19T12:13:01+00:00"
+ "time": "2021-06-05T21:20:04+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.23.1",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
+ "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
- "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
+ "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
"shasum": ""
},
"require": {
@@ -6549,7 +6558,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
},
"funding": [
{
@@ -6565,20 +6574,20 @@
"type": "tidelift"
}
],
- "time": "2021-07-28T13:41:28+00:00"
+ "time": "2021-09-13T13:58:33+00:00"
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "e66119f3de95efc359483f810c4c3e6436279436"
+ "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436",
- "reference": "e66119f3de95efc359483f810c4c3e6436279436",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+ "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
"shasum": ""
},
"require": {
@@ -6628,7 +6637,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
},
"funding": [
{
@@ -6644,7 +6653,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-21T13:25:03+00:00"
+ "time": "2021-09-13T13:58:11+00:00"
},
{
"name": "symfony/process",
@@ -7370,16 +7379,16 @@
},
{
"name": "twig/twig",
- "version": "v3.3.4",
+ "version": "v3.3.7",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "65cb6f0b956485e1664f13d023c55298a4bb59ca"
+ "reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/65cb6f0b956485e1664f13d023c55298a4bb59ca",
- "reference": "65cb6f0b956485e1664f13d023c55298a4bb59ca",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
+ "reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
"shasum": ""
},
"require": {
@@ -7430,7 +7439,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.3.4"
+ "source": "https://github.com/twigphp/Twig/tree/v3.3.7"
},
"funding": [
{
@@ -7442,7 +7451,7 @@
"type": "tidelift"
}
],
- "time": "2021-11-25T13:46:55+00:00"
+ "time": "2022-01-03T21:15:37+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -7745,21 +7754,21 @@
},
{
"name": "barryvdh/laravel-ide-helper",
- "version": "v2.10.0",
+ "version": "v2.11.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
- "reference": "73b1012b927633a1b4cd623c2e6b1678e6faef08"
+ "reference": "f2a7f9d84f628cb50e1b0dc302f10d2ba945b0ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/73b1012b927633a1b4cd623c2e6b1678e6faef08",
- "reference": "73b1012b927633a1b4cd623c2e6b1678e6faef08",
+ "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f2a7f9d84f628cb50e1b0dc302f10d2ba945b0ea",
+ "reference": "f2a7f9d84f628cb50e1b0dc302f10d2ba945b0ea",
"shasum": ""
},
"require": {
"barryvdh/reflection-docblock": "^2.0.6",
- "composer/composer": "^1.6 || ^2",
+ "composer/composer": "^1.10.23 || ^2.1.9",
"doctrine/dbal": "^2.6 || ^3",
"ext-json": "*",
"illuminate/console": "^8",
@@ -7823,15 +7832,19 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
- "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.10.0"
+ "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.11.0"
},
"funding": [
+ {
+ "url": "https://fruitcake.nl",
+ "type": "custom"
+ },
{
"url": "https://github.com/barryvdh",
"type": "github"
}
],
- "time": "2021-04-09T06:17:55+00:00"
+ "time": "2022-01-03T20:47:54+00:00"
},
{
"name": "barryvdh/reflection-docblock",
@@ -7963,16 +7976,16 @@
},
{
"name": "composer/composer",
- "version": "2.2.3",
+ "version": "2.2.4",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a"
+ "reference": "8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a",
- "reference": "3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a",
+ "url": "https://api.github.com/repos/composer/composer/zipball/8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f",
+ "reference": "8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f",
"shasum": ""
},
"require": {
@@ -8042,7 +8055,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
- "source": "https://github.com/composer/composer/tree/2.2.3"
+ "source": "https://github.com/composer/composer/tree/2.2.4"
},
"funding": [
{
@@ -8058,7 +8071,7 @@
"type": "tidelift"
}
],
- "time": "2021-12-31T11:18:53+00:00"
+ "time": "2022-01-08T11:30:42+00:00"
},
{
"name": "composer/metadata-minifier",
@@ -8202,16 +8215,16 @@
},
{
"name": "composer/semver",
- "version": "3.2.6",
+ "version": "3.2.7",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "83e511e247de329283478496f7a1e114c9517506"
+ "reference": "deac27056b57e46faf136fae7b449eeaa71661ee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
- "reference": "83e511e247de329283478496f7a1e114c9517506",
+ "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee",
+ "reference": "deac27056b57e46faf136fae7b449eeaa71661ee",
"shasum": ""
},
"require": {
@@ -8263,7 +8276,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.2.6"
+ "source": "https://github.com/composer/semver/tree/3.2.7"
},
"funding": [
{
@@ -8279,7 +8292,7 @@
"type": "tidelift"
}
],
- "time": "2021-10-25T11:34:17+00:00"
+ "time": "2022-01-04T09:57:54+00:00"
},
{
"name": "composer/spdx-licenses",
@@ -8363,16 +8376,16 @@
},
{
"name": "composer/xdebug-handler",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
+ "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
- "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
+ "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
"shasum": ""
},
"require": {
@@ -8409,7 +8422,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
- "source": "https://github.com/composer/xdebug-handler/tree/2.0.3"
+ "source": "https://github.com/composer/xdebug-handler/tree/2.0.4"
},
"funding": [
{
@@ -8425,7 +8438,7 @@
"type": "tidelift"
}
],
- "time": "2021-12-08T13:07:32+00:00"
+ "time": "2022-01-04T17:06:45+00:00"
},
{
"name": "doctrine/instantiator",
@@ -8563,16 +8576,16 @@
},
{
"name": "filp/whoops",
- "version": "2.14.4",
+ "version": "2.14.5",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "f056f1fe935d9ed86e698905a957334029899895"
+ "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895",
- "reference": "f056f1fe935d9ed86e698905a957334029899895",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
+ "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
"shasum": ""
},
"require": {
@@ -8622,7 +8635,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.14.4"
+ "source": "https://github.com/filp/whoops/tree/2.14.5"
},
"funding": [
{
@@ -8630,7 +8643,7 @@
"type": "github"
}
],
- "time": "2021-10-03T12:00:00+00:00"
+ "time": "2022-01-07T12:00:00+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -8907,9 +8920,6 @@
"require": {
"php": "^7.1 || ^8.0"
},
- "replace": {
- "myclabs/deep-copy": "self.version"
- },
"require-dev": {
"doctrine/collections": "^1.0",
"doctrine/common": "^2.6",
@@ -9227,16 +9237,16 @@
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.5.1",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
+ "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
- "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+ "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
"shasum": ""
},
"require": {
@@ -9271,9 +9281,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
},
- "time": "2021-10-02T14:08:47+00:00"
+ "time": "2022-01-04T19:58:01+00:00"
},
{
"name": "phpspec/prophecy",
@@ -11095,5 +11105,5 @@
"ext-xmlwriter": "*"
},
"platform-dev": [],
- "plugin-api-version": "2.1.0"
+ "plugin-api-version": "2.2.0"
}
diff --git a/config/firefly.php b/config/firefly.php
index c82c4742f4..1b4e5efe8c 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -101,7 +101,7 @@ return [
'webhooks' => true,
'handle_debts' => true,
],
- 'version' => '5.6.9',
+ 'version' => '5.6.10',
'api_version' => '1.5.5',
'db_version' => 18,
diff --git a/resources/lang/bg_BG/firefly.php b/resources/lang/bg_BG/firefly.php
index e412c3e121..57f047576d 100644
--- a/resources/lang/bg_BG/firefly.php
+++ b/resources/lang/bg_BG/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Три месеца (тримесечие)',
'pref_6M' => 'Шест месеца',
'pref_1Y' => 'Една година',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Езици',
'pref_locale' => 'Локални настройки',
'pref_languages_help' => 'Firefly III поддържа няколко езика. Кой предпочиташ?',
diff --git a/resources/lang/cs_CZ/firefly.php b/resources/lang/cs_CZ/firefly.php
index cdcc3b2d4f..660855c100 100644
--- a/resources/lang/cs_CZ/firefly.php
+++ b/resources/lang/cs_CZ/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tři měsíce (čtvrtletí)',
'pref_6M' => 'Šest měsíců',
'pref_1Y' => 'Jeden rok',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Jazyky',
'pref_locale' => 'Místní nastavení',
'pref_languages_help' => 'Firefly III podporuje několik jazyků – ve kterém ho chcete používat?',
diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index ab582c53aa..2a66b21138 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Drei Monate (Quartal)',
'pref_6M' => 'Sechs Monate',
'pref_1Y' => 'Ein Jahr',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Sprachen',
'pref_locale' => 'Lokale Einstellungen',
'pref_languages_help' => 'Firefly III unterstützt mehrere Sprachen. Welche möchten Sie nutzen?',
diff --git a/resources/lang/el_GR/firefly.php b/resources/lang/el_GR/firefly.php
index e08011133e..0b01d4ef83 100644
--- a/resources/lang/el_GR/firefly.php
+++ b/resources/lang/el_GR/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Τρεις μήνες (τρίμηνο)',
'pref_6M' => 'Έξι μήνες (εξάμηνο)',
'pref_1Y' => 'Ένα έτος',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Γλώσσες',
'pref_locale' => 'Ρυθμίσεις τοποθεσίας',
'pref_languages_help' => 'Το Firefly III υποστηρίζει διάφορες γλώσσες. Ποιά προτιμάτε;',
diff --git a/resources/lang/en_GB/firefly.php b/resources/lang/en_GB/firefly.php
index d291118a06..add662c6b4 100644
--- a/resources/lang/en_GB/firefly.php
+++ b/resources/lang/en_GB/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Three months (quarter)',
'pref_6M' => 'Six months',
'pref_1Y' => 'One year',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Languages',
'pref_locale' => 'Locale settings',
'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index a3af0c2d65..49907ef9e1 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Three months (quarter)',
'pref_6M' => 'Six months',
'pref_1Y' => 'One year',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Languages',
'pref_locale' => 'Locale settings',
'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 8b0a0e66ad..ad9e9f08c2 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tres meses (trimestre)',
'pref_6M' => 'Seis meses',
'pref_1Y' => 'Un año',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Idiomas',
'pref_locale' => 'Configuración del idioma',
'pref_languages_help' => 'Firefly III soporta varios idiomas. ¿Cuál prefieres?',
diff --git a/resources/lang/fi_FI/firefly.php b/resources/lang/fi_FI/firefly.php
index 35e1d6239a..cf95aaa9a4 100644
--- a/resources/lang/fi_FI/firefly.php
+++ b/resources/lang/fi_FI/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Kolme kuukautta (vuosineljännes)',
'pref_6M' => 'Kuusi kuukautta',
'pref_1Y' => 'Yksi vuosi',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Kielet',
'pref_locale' => 'Alueasetukset',
'pref_languages_help' => 'Firefly III tukee useita kieliä. Mitä niistä haluat käyttää?',
diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index e9fc5988ea..36ebfc21a4 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Trois mois (trimestre)',
'pref_6M' => 'Six mois',
'pref_1Y' => 'Un an',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Langues',
'pref_locale' => 'Paramètres régionaux',
'pref_languages_help' => 'Firefly III prend en charge plusieurs langues. Laquelle préférez-vous ?',
diff --git a/resources/lang/hu_HU/firefly.php b/resources/lang/hu_HU/firefly.php
index ae9fad8840..7baef90bd1 100644
--- a/resources/lang/hu_HU/firefly.php
+++ b/resources/lang/hu_HU/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Három hónap (negyedév)',
'pref_6M' => 'Hat hónap',
'pref_1Y' => 'Egy év',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Nyelvek',
'pref_locale' => 'Területi beállítások',
'pref_languages_help' => 'A Firefly III több nyelven is elérhető. Melyiket szeretné használni?',
diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php
index aa306d0bf0..e23e7717be 100644
--- a/resources/lang/id_ID/firefly.php
+++ b/resources/lang/id_ID/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tiga bulan (seperempat)',
'pref_6M' => 'Enam bulan',
'pref_1Y' => 'Satu tahun',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Bahasa',
'pref_locale' => 'Locale settings',
'pref_languages_help' => 'Firefly III mendukung beberapa bahasa. Mana yang kamu suka?',
diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php
index b1e75f1eaf..b3e9cce5a7 100644
--- a/resources/lang/it_IT/firefly.php
+++ b/resources/lang/it_IT/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tre mesi (trimestre)',
'pref_6M' => 'Sei mesi',
'pref_1Y' => 'Un anno',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Lingue',
'pref_locale' => 'Impostazioni regionali',
'pref_languages_help' => 'Firefly III supporta diverse lingue. Quale di queste preferisci?',
diff --git a/resources/lang/ja_JP/firefly.php b/resources/lang/ja_JP/firefly.php
index c9ca3ecd03..a44865080a 100644
--- a/resources/lang/ja_JP/firefly.php
+++ b/resources/lang/ja_JP/firefly.php
@@ -190,7 +190,7 @@ return [
'transfer_exchange_rate_instructions' => '出金元資産口座「@source_name」は @source_currency の取引のみ受け付けます。 送金先資産口座「@dest_name」は @dest_currency でのみ取引を受け付けます。両方の通貨で正しく送金額を入力する必要があります。',
'transaction_data' => '取引データ',
'invalid_server_configuration' => '無効なサーバー構成',
- 'invalid_locale_settings' => 'Firefly III に必要なパッケージが不足しているため、金額を整形できません。 これを行う説明はここにあります。',
+ 'invalid_locale_settings' => 'Firefly III に必要なパッケージが不足しているため、金額を整形できません。 解決するための説明はここにあります。',
'quickswitch' => 'クイックスイッチ',
'sign_in_to_start' => 'サインインしてセッションを開始',
'sign_in' => 'サインイン',
@@ -347,10 +347,10 @@ return [
'search_modifier_date_is_day' => ':value月内日の取引',
'search_modifier_date_before_year' => ':value年以前または年内の取引',
'search_modifier_date_before_month' => ':value月以前または月内の取引',
- 'search_modifier_date_before_day' => 'Transaction before or on day of month ":value"',
- 'search_modifier_date_after_year' => 'Transaction is in or after year ":value"',
- 'search_modifier_date_after_month' => 'Transaction is in or after month ":value"',
- 'search_modifier_date_after_day' => 'Transaction is after or on day of month ":value"',
+ 'search_modifier_date_before_day' => '「:value」中またはそれ以前の取引',
+ 'search_modifier_date_after_year' => '「:value」中またはそれ以降の取引',
+ 'search_modifier_date_after_month' => '「:value」中またはそれ以降の取引',
+ 'search_modifier_date_after_day' => '「:value」日以降の取引',
'update_rule_from_query' => '検索クエリからルール「:rule」を更新',
'create_rule_from_query' => '検索クエリから新しいルールを作成',
'rule_from_search_words' => 'ルールエンジンは「:string」をうまく扱えません。 検索クエリに提案されたルールは、異なる結果をもたらす可能性があります。ルールのトリガーは慎重に検証してください。',
@@ -650,10 +650,17 @@ return [
'pref_view_range_help' => 'いくつかのチャートは自動的に期間でグループ化されます。予算も期間にグループ化されます。どの期間を設定しますか？',
'pref_1D' => '1日',
'pref_1W' => 'YYYY年w[週目]',
- 'pref_1M' => '一か月',
+ 'pref_1M' => '1ヵ月',
'pref_3M' => '3ヶ月 (四半期)',
'pref_6M' => '6ヶ月',
'pref_1Y' => '1年',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => '言語',
'pref_locale' => 'ロケール設定',
'pref_languages_help' => 'Firefly III は多言語に対応しています。どれがお好みですか？',
@@ -686,9 +693,9 @@ return [
'pref_home_show_deposits_info' => 'ホーム画面にはすでに支出口座が表示されています。収入口座も表示しますか？',
'pref_home_do_show_deposits' => 'はい、表示します',
'successful_count' => ':count 通のエラーがあります',
- 'list_page_size_title' => 'このページのヘルプ',
+ 'list_page_size_title' => 'ページの表示件数',
'list_page_size_help' => 'あらゆるリスト (アカウント、取引など) のページあたりの最大表示数です。',
- 'list_page_size_label' => 'このページのヘルプ',
+ 'list_page_size_label' => 'ページの表示件数',
'between_dates' => ':nameカテゴリの:startから:endまでのすべての取引',
'pref_optional_fields_transaction' => '取引間のリンクを削除する',
'pref_optional_fields_transaction_help' => 'デフォルトでは、新しい取引を作成するとき、すべての項目が有効ではありません (乱雑になるため)。 以下にて、あなたが便利と思う項目を有効にすることができます。すでに入力されている項目は、無効であっても設定に関係なく表示されます。',
@@ -760,7 +767,7 @@ return [
'delete_your_account' => '削除',
'delete_your_account_help' => 'アカウントを削除すると、口座や取引など Firefly III に保存したすべてのもの が削除されます。',
'delete_your_account_password' => 'パスワードを変更する',
- 'password' => 'パスワードがリセットされました！',
+ 'password' => 'パスワード',
'are_you_sure' => '本当によろしいですか？これを元に戻すことはできません。',
'delete_account_button' => '削除',
'invalid_current_password' => 'パスワードリセットトークンが正しくありません。',
@@ -1245,7 +1252,7 @@ return [
'create_new_object' => '作成',
'empty' => 'この自動補完ドロップダウン/テキストボックスで支払いを選択または入力します。現金入金を行う場合は空のままにします。',
'all_other_budgets' => '(その他の予算すべて)',
- 'all_other_accounts' => 'この欄のすべてのアカウントは一致している必要があります。',
+ 'all_other_accounts' => '(その他のアカウントすべて)',
'expense_per_source_account' => '支出アカウント（資産勘定）',
'expense_per_destination_account' => '支出先アカウント（支出元アカウント
）',
@@ -1430,11 +1437,11 @@ return [
'quick_link_examples' => 'これらは始めるためのリンクの例です。 (？)ボタンからのヘルプページで、すべてのレポートと使用できるマジックワードについての情報を確認してください。',
'quick_link_default_report' => 'デフォルト',
'quick_link_audit_report' => '取引',
- 'report_this_month_quick' => 'この欄のすべてのアカウントは一致している必要があります。',
- 'report_last_month_quick' => 'この欄のすべてのアカウントは一致している必要があります。',
- 'report_this_year_quick' => 'この欄のすべてのアカウントは一致している必要があります。',
+ 'report_this_month_quick' => '今月の全アカウント',
+ 'report_last_month_quick' => '先月の全アカウント',
+ 'report_this_year_quick' => '今年の全アカウント',
'report_this_fiscal_year_quick' => '現在の会計年度のすべての口座',
- 'report_all_time_quick' => 'この欄のすべてのアカウントは一致している必要があります。',
+ 'report_all_time_quick' => '全期間の全アカウント',
'reports_can_bookmark' => 'レポートはブックマークできることを忘れないでください。',
'incomeVsExpenses' => '支出',
'accountBalances' => '貯蓄口座',
diff --git a/resources/lang/nb_NO/firefly.php b/resources/lang/nb_NO/firefly.php
index 71c6221498..cb43ca8de7 100644
--- a/resources/lang/nb_NO/firefly.php
+++ b/resources/lang/nb_NO/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tre måneder (kvartal)',
'pref_6M' => 'Seks måneder',
'pref_1Y' => 'Ett år',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Språk',
'pref_locale' => 'Locale settings',
'pref_languages_help' => 'Firefly III støtter flere språk. Hvilket foretrekker du?',
diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 848a47ea07..11bb891353 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Drie maanden (kwartaal)',
'pref_6M' => 'Zes maanden',
'pref_1Y' => 'Eén jaar',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Talen',
'pref_locale' => 'Lokale instellingen',
'pref_languages_help' => 'Firefly III ondersteunt meerdere talen. Welke heeft jouw voorkeur?',
diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 0495179f1f..16b9b16208 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Trzy miesiące (kwartał)',
'pref_6M' => 'Sześć miesięcy',
'pref_1Y' => 'Rok',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Języki',
'pref_locale' => 'Ustawienia regionalne',
'pref_languages_help' => 'Firefly III obsługuje kilka języków. Który wolisz?',
diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 9793766133..b7333e0db7 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Trimestral',
'pref_6M' => 'Semestral',
'pref_1Y' => 'Um ano',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Idiomas',
'pref_locale' => 'Configurações regionais',
'pref_languages_help' => 'Firefly III suporta muitos idiomas. Qual você prefere?',
diff --git a/resources/lang/pt_PT/firefly.php b/resources/lang/pt_PT/firefly.php
index 066a6eab9a..7ff7e8ece9 100644
--- a/resources/lang/pt_PT/firefly.php
+++ b/resources/lang/pt_PT/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Três meses (trimestre)',
'pref_6M' => 'Seis meses',
'pref_1Y' => 'Um ano',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Idiomas',
'pref_locale' => 'Definições locais',
'pref_languages_help' => 'Firefly III suporta vários idiomas. Qual prefere?',
diff --git a/resources/lang/ro_RO/firefly.php b/resources/lang/ro_RO/firefly.php
index 612ccfff91..d91f8d667c 100644
--- a/resources/lang/ro_RO/firefly.php
+++ b/resources/lang/ro_RO/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Trei luni (trimestru)',
'pref_6M' => 'Șase luni',
'pref_1Y' => 'Un an',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Limbi',
'pref_locale' => 'Setările locale',
'pref_languages_help' => 'Firefly III acceptă mai multe limbi. Pe care o preferați?',
diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index f9f4e22f0a..29a62d6d7b 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Три месяца (квартал)',
'pref_6M' => 'Шесть месяцев',
'pref_1Y' => 'Один год',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Языки',
'pref_locale' => 'Региональные настройки',
'pref_languages_help' => 'Firefly III поддерживает несколько языков. Какой язык вы предпочитаете?',
diff --git a/resources/lang/sk_SK/firefly.php b/resources/lang/sk_SK/firefly.php
index 8853f6982f..4a4d1209e3 100644
--- a/resources/lang/sk_SK/firefly.php
+++ b/resources/lang/sk_SK/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tri mesiace (štvrťrok)',
'pref_6M' => 'Šesť mesiacov',
'pref_1Y' => 'Jeden rok',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Jazyky',
'pref_locale' => 'Miestne nastavenia',
'pref_languages_help' => 'Firefly III podporuje niekoľko jazykov – v ktorom ho chcete používať?',
diff --git a/resources/lang/sv_SE/firefly.php b/resources/lang/sv_SE/firefly.php
index 51b1ab5a05..d05b2ec88d 100644
--- a/resources/lang/sv_SE/firefly.php
+++ b/resources/lang/sv_SE/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Tre månader (kvartal)',
'pref_6M' => 'Sex månader',
'pref_1Y' => 'Ett år',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Språk',
'pref_locale' => 'Nationella inställningar',
'pref_languages_help' => 'Firefly III stödjer flera språk. Vilket föredrar du?',
diff --git a/resources/lang/tr_TR/firefly.php b/resources/lang/tr_TR/firefly.php
index 80c6704276..b5c4b71585 100644
--- a/resources/lang/tr_TR/firefly.php
+++ b/resources/lang/tr_TR/firefly.php
@@ -655,6 +655,13 @@ return [
'pref_3M' => 'Üç ay (çeyrek)',
'pref_6M' => 'Altı ay',
'pref_1Y' => 'Bir yıl',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Diller',
'pref_locale' => 'Locale settings',
'pref_languages_help' => 'Firefly III birçok dili destekliyor. Hangisini tercih edersiniz?',
diff --git a/resources/lang/vi_VN/firefly.php b/resources/lang/vi_VN/firefly.php
index 3e75550287..2999225571 100644
--- a/resources/lang/vi_VN/firefly.php
+++ b/resources/lang/vi_VN/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => 'Ba tháng (quý)',
'pref_6M' => 'Sáu tháng',
'pref_1Y' => 'Một năm',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => 'Ngôn ngữ',
'pref_locale' => 'Thiết lập địa phương',
'pref_languages_help' => 'Firefly III hỗ trợ một số ngôn ngữ. Bạn thích cái nào hơn?',
diff --git a/resources/lang/zh_CN/firefly.php b/resources/lang/zh_CN/firefly.php
index 24216b587f..ce9ab48824 100644
--- a/resources/lang/zh_CN/firefly.php
+++ b/resources/lang/zh_CN/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => '3个月 (1季度)',
'pref_6M' => '6个月',
'pref_1Y' => '1年',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => '语言',
'pref_locale' => '区域设置',
'pref_languages_help' => 'Firefly III 支持多语言，请问您倾向于哪个语言？',
diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 48752cc8a7..330173221f 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -654,6 +654,13 @@ return [
'pref_3M' => '3個月 (季)',
'pref_6M' => '6個月',
'pref_1Y' => '1年',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
'pref_languages' => '語言',
'pref_locale' => 'Locale settings',
'pref_languages_help' => 'Firefly III 支援多種語言，您想顯示哪一種？',