diff --git a/.env.example b/.env.example
index ee694fa0fb..39034bade4 100644
--- a/.env.example
+++ b/.env.example
@@ -111,7 +111,10 @@ REDIS_PATH=
# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
REDIS_HOST=127.0.0.1
REDIS_PORT=6379
-REDIS_PASSWORD=null
+
+# Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
+REDIS_USERNAME=
+REDIS_PASSWORD=
# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
REDIS_DB="0"
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 0429630ee8..94d28acc35 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -24,6 +24,7 @@ namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
@@ -97,4 +98,16 @@ class PiggyBankEvent extends Model
{
return $this->belongsTo(TransactionJournal::class);
}
+
+ /**
+ * Get the amount
+ *
+ * @return Attribute
+ */
+ protected function amount(): Attribute
+ {
+ return Attribute::make(
+ get: fn($value) => (string) $value,
+ );
+ }
}
diff --git a/app/TransactionRules/Actions/ConvertToDeposit.php b/app/TransactionRules/Actions/ConvertToDeposit.php
index 5419dc9f1b..f469c90b40 100644
--- a/app/TransactionRules/Actions/ConvertToDeposit.php
+++ b/app/TransactionRules/Actions/ConvertToDeposit.php
@@ -126,7 +126,7 @@ class ConvertToDeposit implements ActionInterface
DB::table('transaction_journals')
->where('id', '=', $journal['transaction_journal_id'])
- ->update(['transaction_type_id' => $newType->id]);
+ ->update(['transaction_type_id' => $newType->id, 'bill_id' => null]);
Log::debug('Converted withdrawal to deposit.');
@@ -168,7 +168,7 @@ class ConvertToDeposit implements ActionInterface
DB::table('transaction_journals')
->where('id', '=', $journal['transaction_journal_id'])
- ->update(['transaction_type_id' => $newType->id]);
+ ->update(['transaction_type_id' => $newType->id, 'bill_id' => null]);
Log::debug('Converted transfer to deposit.');
diff --git a/app/TransactionRules/Actions/ConvertToTransfer.php b/app/TransactionRules/Actions/ConvertToTransfer.php
index 718ea1953e..341a9bed08 100644
--- a/app/TransactionRules/Actions/ConvertToTransfer.php
+++ b/app/TransactionRules/Actions/ConvertToTransfer.php
@@ -135,7 +135,7 @@ class ConvertToTransfer implements ActionInterface
DB::table('transaction_journals')
->where('id', '=', $journal['transaction_journal_id'])
- ->update(['transaction_type_id' => $newType->id]);
+ ->update(['transaction_type_id' => $newType->id, 'bill_id' => null]);
Log::debug('Converted withdrawal to transfer.');
@@ -175,7 +175,7 @@ class ConvertToTransfer implements ActionInterface
DB::table('transaction_journals')
->where('id', '=', $journal['transaction_journal_id'])
- ->update(['transaction_type_id' => $newType->id]);
+ ->update(['transaction_type_id' => $newType->id, 'bill_id' => null]);
Log::debug('Converted deposit to transfer.');
diff --git a/composer.json b/composer.json
index 64655b1234..3411bdab3a 100644
--- a/composer.json
+++ b/composer.json
@@ -91,7 +91,7 @@
"laravel/framework": "^9",
"laravel/passport": "10.*",
"laravel/sanctum": "^2.14",
- "laravel/ui": "^3.4",
+ "laravel/ui": "^4.0",
"laravelcollective/html": "6.*",
"league/commonmark": "2.*",
"league/csv": "^9.7",
diff --git a/composer.lock b/composer.lock
index 57dd5e8d19..5ae8f04504 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "fe512cbab520033cc8d5fbd1eb2636f9",
+ "content-hash": "37e7ff45a477ff489460c722b513f610",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -1314,24 +1314,24 @@
},
{
"name": "graham-campbell/result-type",
- "version": "v1.0.4",
+ "version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git",
- "reference": "0690bde05318336c7221785f2a932467f98b64ca"
+ "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca",
- "reference": "0690bde05318336c7221785f2a932467f98b64ca",
+ "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
+ "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
"shasum": ""
},
"require": {
- "php": "^7.0 || ^8.0",
- "phpoption/phpoption": "^1.8"
+ "php": "^7.2.5 || ^8.0",
+ "phpoption/phpoption": "^1.9"
},
"require-dev": {
- "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+ "phpunit/phpunit": "^8.5.28 || ^9.5.21"
},
"type": "library",
"autoload": {
@@ -1360,7 +1360,7 @@
],
"support": {
"issues": "https://github.com/GrahamCampbell/Result-Type/issues",
- "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4"
+ "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
},
"funding": [
{
@@ -1372,7 +1372,7 @@
"type": "tidelift"
}
],
- "time": "2021-11-21T21:41:47+00:00"
+ "time": "2022-07-30T15:56:11+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -1854,16 +1854,16 @@
},
{
"name": "laravel/framework",
- "version": "v9.21.6",
+ "version": "v9.22.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "569d7a2e361895f90e66bb4e02db89c27691a0e7"
+ "reference": "b3b3dd43b9899f23df6d1d3e5390bd4662947a46"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/569d7a2e361895f90e66bb4e02db89c27691a0e7",
- "reference": "569d7a2e361895f90e66bb4e02db89c27691a0e7",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/b3b3dd43b9899f23df6d1d3e5390bd4662947a46",
+ "reference": "b3b3dd43b9899f23df6d1d3e5390bd4662947a46",
"shasum": ""
},
"require": {
@@ -2030,7 +2030,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2022-07-22T14:16:44+00:00"
+ "time": "2022-07-26T16:16:33+00:00"
},
{
"name": "laravel/passport",
@@ -2235,32 +2235,32 @@
},
{
"name": "laravel/ui",
- "version": "v3.4.6",
+ "version": "v4.0.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
- "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c"
+ "reference": "e6291e8083cb5255511eacd6da0ec078210beabd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c",
- "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c",
+ "url": "https://api.github.com/repos/laravel/ui/zipball/e6291e8083cb5255511eacd6da0ec078210beabd",
+ "reference": "e6291e8083cb5255511eacd6da0ec078210beabd",
"shasum": ""
},
"require": {
- "illuminate/console": "^8.42|^9.0",
- "illuminate/filesystem": "^8.42|^9.0",
- "illuminate/support": "^8.82|^9.0",
- "illuminate/validation": "^8.42|^9.0",
- "php": "^7.3|^8.0"
+ "illuminate/console": "^9.21",
+ "illuminate/filesystem": "^9.21",
+ "illuminate/support": "^9.21",
+ "illuminate/validation": "^9.21",
+ "php": "^8.0"
},
"require-dev": {
- "orchestra/testbench": "^6.23|^7.0"
+ "orchestra/testbench": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev"
+ "dev-master": "4.x-dev"
},
"laravel": {
"providers": [
@@ -2290,9 +2290,9 @@
"ui"
],
"support": {
- "source": "https://github.com/laravel/ui/tree/v3.4.6"
+ "source": "https://github.com/laravel/ui/tree/v4.0.0"
},
- "time": "2022-05-20T13:38:08+00:00"
+ "time": "2022-07-25T10:21:27+00:00"
},
{
"name": "laravelcollective/html",
@@ -2503,16 +2503,16 @@
},
{
"name": "league/commonmark",
- "version": "2.3.4",
+ "version": "2.3.5",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "155ec1c95626b16fda0889cf15904d24890a60d5"
+ "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/155ec1c95626b16fda0889cf15904d24890a60d5",
- "reference": "155ec1c95626b16fda0889cf15904d24890a60d5",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/84d74485fdb7074f4f9dd6f02ab957b1de513257",
+ "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257",
"shasum": ""
},
"require": {
@@ -2534,13 +2534,13 @@
"github/gfm": "0.29.0",
"michelf/php-markdown": "^1.4",
"nyholm/psr7": "^1.5",
- "phpstan/phpstan": "^0.12.88 || ^1.0.0",
- "phpunit/phpunit": "^9.5.5",
+ "phpstan/phpstan": "^1.8.2",
+ "phpunit/phpunit": "^9.5.21",
"scrutinizer/ocular": "^1.8.1",
- "symfony/finder": "^5.3",
+ "symfony/finder": "^5.3 | ^6.0",
"symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
- "unleashedtech/php-coding-standard": "^3.1",
- "vimeo/psalm": "^4.7.3"
+ "unleashedtech/php-coding-standard": "^3.1.1",
+ "vimeo/psalm": "^4.24.0"
},
"suggest": {
"symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -2605,7 +2605,7 @@
"type": "tidelift"
}
],
- "time": "2022-07-17T16:25:47+00:00"
+ "time": "2022-07-29T10:59:45+00:00"
},
{
"name": "league/config",
@@ -2829,16 +2829,16 @@
},
{
"name": "league/flysystem",
- "version": "3.1.1",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "1a941703dfb649f9b821e7bc425e782f576a805e"
+ "reference": "ed0ecc7f9b5c2f4a9872185846974a808a3b052a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1a941703dfb649f9b821e7bc425e782f576a805e",
- "reference": "1a941703dfb649f9b821e7bc425e782f576a805e",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/ed0ecc7f9b5c2f4a9872185846974a808a3b052a",
+ "reference": "ed0ecc7f9b5c2f4a9872185846974a808a3b052a",
"shasum": ""
},
"require": {
@@ -2899,7 +2899,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/3.1.1"
+ "source": "https://github.com/thephpleague/flysystem/tree/3.2.0"
},
"funding": [
{
@@ -2915,7 +2915,7 @@
"type": "tidelift"
}
],
- "time": "2022-07-18T09:59:40+00:00"
+ "time": "2022-07-26T07:26:36+00:00"
},
{
"name": "league/fractal",
@@ -3405,16 +3405,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.59.1",
+ "version": "2.60.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5"
+ "reference": "00a259ae02b003c563158b54fb6743252b638ea6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5",
- "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/00a259ae02b003c563158b54fb6743252b638ea6",
+ "reference": "00a259ae02b003c563158b54fb6743252b638ea6",
"shasum": ""
},
"require": {
@@ -3503,7 +3503,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-29T21:43:55+00:00"
+ "time": "2022-07-27T15:57:48+00:00"
},
{
"name": "nette/schema",
@@ -4076,29 +4076,33 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.8.1",
+ "version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"
+ "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
- "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
+ "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
"shasum": ""
},
"require": {
- "php": "^7.0 || ^8.0"
+ "php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4.1",
- "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+ "bamarni/composer-bin-plugin": "^1.8",
+ "phpunit/phpunit": "^8.5.28 || ^9.5.21"
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": true
+ },
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -4131,7 +4135,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
- "source": "https://github.com/schmittjoh/php-option/tree/1.8.1"
+ "source": "https://github.com/schmittjoh/php-option/tree/1.9.0"
},
"funding": [
{
@@ -4143,7 +4147,7 @@
"type": "tidelift"
}
],
- "time": "2021-12-04T23:24:31+00:00"
+ "time": "2022-07-30T15:51:26+00:00"
},
{
"name": "phpseclib/phpseclib",
@@ -5620,21 +5624,20 @@
},
{
"name": "symfony/console",
- "version": "v6.1.2",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "7a86c1c42fbcb69b59768504c7bca1d3767760b7"
+ "reference": "09b8e50f09bf0e5bbde9b61b19d7f53751114725"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/7a86c1c42fbcb69b59768504c7bca1d3767760b7",
- "reference": "7a86c1c42fbcb69b59768504c7bca1d3767760b7",
+ "url": "https://api.github.com/repos/symfony/console/zipball/09b8e50f09bf0e5bbde9b61b19d7f53751114725",
+ "reference": "09b8e50f09bf0e5bbde9b61b19d7f53751114725",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.1|^3",
+ "php": ">=8.0.2",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/string": "^5.4|^6.0"
@@ -5696,7 +5699,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.1.2"
+ "source": "https://github.com/symfony/console/tree/v6.0.11"
},
"funding": [
{
@@ -5712,24 +5715,24 @@
"type": "tidelift"
}
],
- "time": "2022-06-26T13:01:30+00:00"
+ "time": "2022-07-22T14:17:38+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v6.1.0",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "05c40f02f621609404b8820ff8bc39acb46e19cf"
+ "reference": "ab2746acddc4f03a7234c8441822ac5d5c63efe9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/05c40f02f621609404b8820ff8bc39acb46e19cf",
- "reference": "05c40f02f621609404b8820ff8bc39acb46e19cf",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab2746acddc4f03a7234c8441822ac5d5c63efe9",
+ "reference": "ab2746acddc4f03a7234c8441822ac5d5c63efe9",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.0.2"
},
"type": "library",
"autoload": {
@@ -5761,7 +5764,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v6.1.0"
+ "source": "https://github.com/symfony/css-selector/tree/v6.0.11"
},
"funding": [
{
@@ -5777,29 +5780,29 @@
"type": "tidelift"
}
],
- "time": "2022-02-25T11:15:52+00:00"
+ "time": "2022-06-27T17:10:44+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.1.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918"
+ "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
- "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+ "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.0.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.1-dev"
+ "dev-main": "3.0-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5828,7 +5831,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.1.1"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
},
"funding": [
{
@@ -5844,24 +5847,24 @@
"type": "tidelift"
}
],
- "time": "2022-02-25T11:15:52+00:00"
+ "time": "2022-01-02T09:55:41+00:00"
},
{
"name": "symfony/error-handler",
- "version": "v6.1.0",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "d02c662651e5de760bb7d5e94437113309e8f8a0"
+ "reference": "cb302377e1b862540436f22be9ff07079a5836ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/d02c662651e5de760bb7d5e94437113309e8f8a0",
- "reference": "d02c662651e5de760bb7d5e94437113309e8f8a0",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/cb302377e1b862540436f22be9ff07079a5836ae",
+ "reference": "cb302377e1b862540436f22be9ff07079a5836ae",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"psr/log": "^1|^2|^3",
"symfony/var-dumper": "^5.4|^6.0"
},
@@ -5899,7 +5902,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v6.1.0"
+ "source": "https://github.com/symfony/error-handler/tree/v6.0.11"
},
"funding": [
{
@@ -5915,24 +5918,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-23T10:32:57+00:00"
+ "time": "2022-07-29T07:39:48+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v6.1.0",
+ "version": "v6.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347"
+ "reference": "5c85b58422865d42c6eb46f7693339056db098a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a0449a7ad7daa0f7c0acd508259f80544ab5a347",
- "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5c85b58422865d42c6eb46f7693339056db098a8",
+ "reference": "5c85b58422865d42c6eb46f7693339056db098a8",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/event-dispatcher-contracts": "^2|^3"
},
"conflict": {
@@ -5982,7 +5985,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.1.0"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.9"
},
"funding": [
{
@@ -5998,24 +6001,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-05T16:51:07+00:00"
+ "time": "2022-05-05T16:45:52+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v3.1.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "02ff5eea2f453731cfbc6bc215e456b781480448"
+ "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/02ff5eea2f453731cfbc6bc215e456b781480448",
- "reference": "02ff5eea2f453731cfbc6bc215e456b781480448",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
+ "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"psr/event-dispatcher": "^1"
},
"suggest": {
@@ -6024,7 +6027,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.1-dev"
+ "dev-main": "3.0-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -6061,7 +6064,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.1"
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
},
"funding": [
{
@@ -6077,27 +6080,24 @@
"type": "tidelift"
}
],
- "time": "2022-02-25T11:15:52+00:00"
+ "time": "2022-01-02T09:55:41+00:00"
},
{
"name": "symfony/finder",
- "version": "v6.1.0",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "45b8beb69d6eb3b05a65689ebfd4222326773f8f"
+ "reference": "09cb683ba5720385ea6966e5e06be2a34f2568b1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/45b8beb69d6eb3b05a65689ebfd4222326773f8f",
- "reference": "45b8beb69d6eb3b05a65689ebfd4222326773f8f",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/09cb683ba5720385ea6966e5e06be2a34f2568b1",
+ "reference": "09cb683ba5720385ea6966e5e06be2a34f2568b1",
"shasum": ""
},
"require": {
- "php": ">=8.1"
- },
- "require-dev": {
- "symfony/filesystem": "^6.0"
+ "php": ">=8.0.2"
},
"type": "library",
"autoload": {
@@ -6125,7 +6125,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.1.0"
+ "source": "https://github.com/symfony/finder/tree/v6.0.11"
},
"funding": [
{
@@ -6141,24 +6141,24 @@
"type": "tidelift"
}
],
- "time": "2022-04-15T08:08:08+00:00"
+ "time": "2022-07-29T07:39:48+00:00"
},
{
"name": "symfony/http-client",
- "version": "v6.1.2",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
- "reference": "ea1af6c8cc479147d67a3fead457dd7b06261041"
+ "reference": "49bef7df70f84a4f5d516eb268963779ca80320d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client/zipball/ea1af6c8cc479147d67a3fead457dd7b06261041",
- "reference": "ea1af6c8cc479147d67a3fead457dd7b06261041",
+ "url": "https://api.github.com/repos/symfony/http-client/zipball/49bef7df70f84a4f5d516eb268963779ca80320d",
+ "reference": "49bef7df70f84a4f5d516eb268963779ca80320d",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"psr/log": "^1|^2|^3",
"symfony/http-client-contracts": "^3",
"symfony/service-contracts": "^1.0|^2|^3"
@@ -6209,7 +6209,7 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-client/tree/v6.1.2"
+ "source": "https://github.com/symfony/http-client/tree/v6.0.11"
},
"funding": [
{
@@ -6225,24 +6225,24 @@
"type": "tidelift"
}
],
- "time": "2022-06-19T13:02:30+00:00"
+ "time": "2022-07-28T13:39:17+00:00"
},
{
"name": "symfony/http-client-contracts",
- "version": "v3.1.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
- "reference": "fd038f08c623ab5d22b26e9ba35afe8c79071800"
+ "reference": "4184b9b63af1edaf35b6a7974c6f1f9f33294129"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/fd038f08c623ab5d22b26e9ba35afe8c79071800",
- "reference": "fd038f08c623ab5d22b26e9ba35afe8c79071800",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/4184b9b63af1edaf35b6a7974c6f1f9f33294129",
+ "reference": "4184b9b63af1edaf35b6a7974c6f1f9f33294129",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.0.2"
},
"suggest": {
"symfony/http-client-implementation": ""
@@ -6250,7 +6250,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.1-dev"
+ "dev-main": "3.0-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -6260,10 +6260,7 @@
"autoload": {
"psr-4": {
"Symfony\\Contracts\\HttpClient\\": ""
- },
- "exclude-from-classmap": [
- "/Test/"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -6290,7 +6287,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/http-client-contracts/tree/v3.1.1"
+ "source": "https://github.com/symfony/http-client-contracts/tree/v3.0.2"
},
"funding": [
{
@@ -6306,24 +6303,24 @@
"type": "tidelift"
}
],
- "time": "2022-04-22T07:30:54+00:00"
+ "time": "2022-04-12T16:11:42+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v6.1.2",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "86119d294e51afe4d8e07da96b63332bd1f3f52c"
+ "reference": "69302fb4a7d65f6373c60b6d9ca89b91d2c9e0e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/86119d294e51afe4d8e07da96b63332bd1f3f52c",
- "reference": "86119d294e51afe4d8e07da96b63332bd1f3f52c",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/69302fb4a7d65f6373c60b6d9ca89b91d2c9e0e6",
+ "reference": "69302fb4a7d65f6373c60b6d9ca89b91d2c9e0e6",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-mbstring": "~1.1"
},
@@ -6362,7 +6359,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v6.1.2"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.0.11"
},
"funding": [
{
@@ -6378,26 +6375,26 @@
"type": "tidelift"
}
],
- "time": "2022-06-19T13:21:48+00:00"
+ "time": "2022-07-22T16:13:32+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.1.2",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "8aaede489900dda61aee208557f63bfa1bca0877"
+ "reference": "961268a36f3fa4bda9fde1400d2ae7004318b717"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8aaede489900dda61aee208557f63bfa1bca0877",
- "reference": "8aaede489900dda61aee208557f63bfa1bca0877",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/961268a36f3fa4bda9fde1400d2ae7004318b717",
+ "reference": "961268a36f3fa4bda9fde1400d2ae7004318b717",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"psr/log": "^1|^2|^3",
- "symfony/error-handler": "^6.1",
+ "symfony/error-handler": "^5.4|^6.0",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/http-foundation": "^5.4|^6.0",
"symfony/polyfill-ctype": "^1.8"
@@ -6405,9 +6402,9 @@
"conflict": {
"symfony/browser-kit": "<5.4",
"symfony/cache": "<5.4",
- "symfony/config": "<6.1",
+ "symfony/config": "<5.4",
"symfony/console": "<5.4",
- "symfony/dependency-injection": "<6.1",
+ "symfony/dependency-injection": "<5.4",
"symfony/doctrine-bridge": "<5.4",
"symfony/form": "<5.4",
"symfony/http-client": "<5.4",
@@ -6424,10 +6421,10 @@
"require-dev": {
"psr/cache": "^1.0|^2.0|^3.0",
"symfony/browser-kit": "^5.4|^6.0",
- "symfony/config": "^6.1",
+ "symfony/config": "^5.4|^6.0",
"symfony/console": "^5.4|^6.0",
"symfony/css-selector": "^5.4|^6.0",
- "symfony/dependency-injection": "^6.1",
+ "symfony/dependency-injection": "^5.4|^6.0",
"symfony/dom-crawler": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0",
"symfony/finder": "^5.4|^6.0",
@@ -6437,7 +6434,6 @@
"symfony/stopwatch": "^5.4|^6.0",
"symfony/translation": "^5.4|^6.0",
"symfony/translation-contracts": "^1.1|^2|^3",
- "symfony/uid": "^5.4|^6.0",
"twig/twig": "^2.13|^3.0.4"
},
"suggest": {
@@ -6472,7 +6468,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v6.1.2"
+ "source": "https://github.com/symfony/http-kernel/tree/v6.0.11"
},
"funding": [
{
@@ -6488,25 +6484,25 @@
"type": "tidelift"
}
],
- "time": "2022-06-26T17:06:14+00:00"
+ "time": "2022-07-29T12:37:40+00:00"
},
{
"name": "symfony/mailer",
- "version": "v6.1.2",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
- "reference": "8fa150355115ea09238858ae3cfaf249fd1fd5ed"
+ "reference": "4a787a257addd412eac53157d459f87f8e335037"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mailer/zipball/8fa150355115ea09238858ae3cfaf249fd1fd5ed",
- "reference": "8fa150355115ea09238858ae3cfaf249fd1fd5ed",
+ "url": "https://api.github.com/repos/symfony/mailer/zipball/4a787a257addd412eac53157d459f87f8e335037",
+ "reference": "4a787a257addd412eac53157d459f87f8e335037",
"shasum": ""
},
"require": {
"egulias/email-validator": "^2.1.10|^3",
- "php": ">=8.1",
+ "php": ">=8.0.2",
"psr/event-dispatcher": "^1",
"psr/log": "^1|^2|^3",
"symfony/event-dispatcher": "^5.4|^6.0",
@@ -6546,7 +6542,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/mailer/tree/v6.1.2"
+ "source": "https://github.com/symfony/mailer/tree/v6.0.11"
},
"funding": [
{
@@ -6562,24 +6558,24 @@
"type": "tidelift"
}
],
- "time": "2022-06-19T13:21:48+00:00"
+ "time": "2022-07-27T15:50:26+00:00"
},
{
"name": "symfony/mailgun-mailer",
- "version": "v6.1.0",
+ "version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailgun-mailer.git",
- "reference": "44d3c15049d84f5165917a6190f06adbe64d71dd"
+ "reference": "f0d032c26683b26f4bc26864e09b1e08fa55226e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/44d3c15049d84f5165917a6190f06adbe64d71dd",
- "reference": "44d3c15049d84f5165917a6190f06adbe64d71dd",
+ "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/f0d032c26683b26f4bc26864e09b1e08fa55226e",
+ "reference": "f0d032c26683b26f4bc26864e09b1e08fa55226e",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/mailer": "^5.4|^6.0"
},
"require-dev": {
@@ -6611,7 +6607,7 @@
"description": "Symfony Mailgun Mailer Bridge",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/mailgun-mailer/tree/v6.1.0"
+ "source": "https://github.com/symfony/mailgun-mailer/tree/v6.0.7"
},
"funding": [
{
@@ -6627,24 +6623,24 @@
"type": "tidelift"
}
],
- "time": "2022-04-01T07:15:35+00:00"
+ "time": "2022-03-24T17:11:42+00:00"
},
{
"name": "symfony/mime",
- "version": "v6.1.1",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "56508865dd883dce3c863af11b3e8053adab30d7"
+ "reference": "c6f16f6789587348f6518b193d3499c0e1f5e5c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/56508865dd883dce3c863af11b3e8053adab30d7",
- "reference": "56508865dd883dce3c863af11b3e8053adab30d7",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/c6f16f6789587348f6518b193d3499c0e1f5e5c5",
+ "reference": "c6f16f6789587348f6518b193d3499c0e1f5e5c5",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0"
},
@@ -6692,7 +6688,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v6.1.1"
+ "source": "https://github.com/symfony/mime/tree/v6.0.11"
},
"funding": [
{
@@ -6708,7 +6704,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-09T12:51:38+00:00"
+ "time": "2022-07-20T13:45:53+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -7367,20 +7363,20 @@
},
{
"name": "symfony/process",
- "version": "v6.1.0",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "318718453c2be58266f1a9e74063d13cb8dd4165"
+ "reference": "44270a08ccb664143dede554ff1c00aaa2247a43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/318718453c2be58266f1a9e74063d13cb8dd4165",
- "reference": "318718453c2be58266f1a9e74063d13cb8dd4165",
+ "url": "https://api.github.com/repos/symfony/process/zipball/44270a08ccb664143dede554ff1c00aaa2247a43",
+ "reference": "44270a08ccb664143dede554ff1c00aaa2247a43",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.0.2"
},
"type": "library",
"autoload": {
@@ -7408,7 +7404,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v6.1.0"
+ "source": "https://github.com/symfony/process/tree/v6.0.11"
},
"funding": [
{
@@ -7424,7 +7420,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-11T12:12:29+00:00"
+ "time": "2022-06-27T17:10:44+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -7516,20 +7512,20 @@
},
{
"name": "symfony/routing",
- "version": "v6.1.1",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "8f068b792e515b25e26855ac8dc7fe800399f3e5"
+ "reference": "434b64f7d3a582ec33fcf69baaf085473e67d639"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/8f068b792e515b25e26855ac8dc7fe800399f3e5",
- "reference": "8f068b792e515b25e26855ac8dc7fe800399f3e5",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/434b64f7d3a582ec33fcf69baaf085473e67d639",
+ "reference": "434b64f7d3a582ec33fcf69baaf085473e67d639",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.0.2"
},
"conflict": {
"doctrine/annotations": "<1.12",
@@ -7584,7 +7580,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v6.1.1"
+ "source": "https://github.com/symfony/routing/tree/v6.0.11"
},
"funding": [
{
@@ -7600,24 +7596,24 @@
"type": "tidelift"
}
],
- "time": "2022-06-08T12:21:15+00:00"
+ "time": "2022-07-20T13:45:53+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v3.1.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239"
+ "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239",
- "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
+ "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"psr/container": "^2.0"
},
"conflict": {
@@ -7629,7 +7625,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.1-dev"
+ "dev-main": "3.0-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7639,10 +7635,7 @@
"autoload": {
"psr-4": {
"Symfony\\Contracts\\Service\\": ""
- },
- "exclude-from-classmap": [
- "/Test/"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -7669,7 +7662,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.1.1"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.0.2"
},
"funding": [
{
@@ -7685,24 +7678,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-30T19:18:58+00:00"
+ "time": "2022-05-30T19:17:58+00:00"
},
{
"name": "symfony/string",
- "version": "v6.1.2",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "1903f2879875280c5af944625e8246d81c2f0604"
+ "reference": "042b6bf0f6ccca6d456a0572eb788cfb8b1ff809"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/1903f2879875280c5af944625e8246d81c2f0604",
- "reference": "1903f2879875280c5af944625e8246d81c2f0604",
+ "url": "https://api.github.com/repos/symfony/string/zipball/042b6bf0f6ccca6d456a0572eb788cfb8b1ff809",
+ "reference": "042b6bf0f6ccca6d456a0572eb788cfb8b1ff809",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-grapheme": "~1.0",
"symfony/polyfill-intl-normalizer": "~1.0",
@@ -7754,7 +7747,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.1.2"
+ "source": "https://github.com/symfony/string/tree/v6.0.11"
},
"funding": [
{
@@ -7770,24 +7763,24 @@
"type": "tidelift"
}
],
- "time": "2022-06-26T16:35:04+00:00"
+ "time": "2022-07-27T15:50:26+00:00"
},
{
"name": "symfony/translation",
- "version": "v6.1.0",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "b254416631615bc6fe49b0a67f18658827288147"
+ "reference": "55ffbe4b690156100af1ae42e1f94c5873085bca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/b254416631615bc6fe49b0a67f18658827288147",
- "reference": "b254416631615bc6fe49b0a67f18658827288147",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/55ffbe4b690156100af1ae42e1f94c5873085bca",
+ "reference": "55ffbe4b690156100af1ae42e1f94c5873085bca",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^2.3|^3.0"
},
@@ -7812,7 +7805,6 @@
"symfony/http-kernel": "^5.4|^6.0",
"symfony/intl": "^5.4|^6.0",
"symfony/polyfill-intl-icu": "^1.21",
- "symfony/routing": "^5.4|^6.0",
"symfony/service-contracts": "^1.1.2|^2|^3",
"symfony/yaml": "^5.4|^6.0"
},
@@ -7850,7 +7842,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v6.1.0"
+ "source": "https://github.com/symfony/translation/tree/v6.0.11"
},
"funding": [
{
@@ -7866,24 +7858,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-11T12:12:29+00:00"
+ "time": "2022-07-20T13:45:53+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v3.1.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc"
+ "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/606be0f48e05116baef052f7f3abdb345c8e02cc",
- "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282",
+ "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.0.2"
},
"suggest": {
"symfony/translation-implementation": ""
@@ -7891,7 +7883,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.1-dev"
+ "dev-main": "3.0-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7901,10 +7893,7 @@
"autoload": {
"psr-4": {
"Symfony\\Contracts\\Translation\\": ""
- },
- "exclude-from-classmap": [
- "/Test/"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -7931,7 +7920,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v3.1.1"
+ "source": "https://github.com/symfony/translation-contracts/tree/v3.0.2"
},
"funding": [
{
@@ -7947,24 +7936,24 @@
"type": "tidelift"
}
],
- "time": "2022-06-27T17:24:16+00:00"
+ "time": "2022-06-27T17:10:44+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.1.0",
+ "version": "v6.0.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "98587d939cb783aa04e828e8fa857edaca24c212"
+ "reference": "2672bdc01c1971e3d8879ce153ec4c3621be5f07"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/98587d939cb783aa04e828e8fa857edaca24c212",
- "reference": "98587d939cb783aa04e828e8fa857edaca24c212",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2672bdc01c1971e3d8879ce153ec4c3621be5f07",
+ "reference": "2672bdc01c1971e3d8879ce153ec4c3621be5f07",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.0.2",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
@@ -8019,7 +8008,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.1.0"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.0.11"
},
"funding": [
{
@@ -8035,7 +8024,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-21T13:34:40+00:00"
+ "time": "2022-07-20T13:45:53+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -10751,7 +10740,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=8.1",
+ "php": ">=8",
"ext-bcmath": "*",
"ext-curl": "*",
"ext-fileinfo": "*",
@@ -10770,7 +10759,7 @@
},
"platform-dev": [],
"platform-overrides": {
- "php": "8.1.6"
+ "php": "8.0.19"
},
"plugin-api-version": "2.3.0"
}
diff --git a/config/database.php b/config/database.php
index 6d017ae602..c2ed4fbd78 100644
--- a/config/database.php
+++ b/config/database.php
@@ -159,6 +159,7 @@ return [
'path' => envNonEmpty('REDIS_PATH'),
'host' => envNonEmpty('REDIS_HOST', '127.0.0.1'),
'port' => envNonEmpty('REDIS_PORT', 6379),
+ 'username' => env('REDIS_USERNAME'),
'password' => env('REDIS_PASSWORD', null),
'database' => env('REDIS_CACHE_DB', '1'),
],
diff --git a/public/serviceworker.js b/public/serviceworker.js
deleted file mode 100644
index 1eb9b19f82..0000000000
--- a/public/serviceworker.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * serviceworker.js
- * Copyright (c) 2021 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-let staticCachePrefix = "firefly-III-"
-let staticCacheName = staticCachePrefix + new Date().getTime();
-let cachedFiles = [
- '/offline',
- '/v2/plugins/local-fonts/gf-source.css',
- '/v2/css/app.css',
-];
-
-// Create cache on install
-self.addEventListener("install", event => {
- this.skipWaiting();
- event.waitUntil(
- caches.open(staticCacheName).then(cache => cache.addAll(cachedFiles))
- )
-});
-
-// Clear cache on activate
-self.addEventListener('activate', event => {
- event.waitUntil(
- caches.keys().then(cacheNames => {
- return Promise.all(
- cacheNames
- .filter(cacheName => (cacheName.startsWith(staticCachePrefix)))
- .filter(cacheName => (cacheName !== staticCacheName))
- .map(cacheName => caches.delete(cacheName))
- );
- })
- );
-});
-
-// Serve from Cache or return the offline page
-self.addEventListener("fetch", event => {
- event.respondWith(
- caches.match(event.request)
- .then(response => (response || fetch(event.request)))
- .catch(() => caches.match('offline'))
- )
-});
diff --git a/resources/lang/bg_BG/config.php b/resources/lang/bg_BG/config.php
index e98de920b3..15ef672b97 100644
--- a/resources/lang/bg_BG/config.php
+++ b/resources/lang/bg_BG/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/bg_BG/errors.php b/resources/lang/bg_BG/errors.php
index 46962b01c5..2c4251c759 100644
--- a/resources/lang/bg_BG/errors.php
+++ b/resources/lang/bg_BG/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Веднага се връщам!',
'check_back' => 'Firefly III е изключен за някаква необходима поддръжка. Моля, проверете отново след секунда.',
'error_occurred' => 'Опаааа! Случи се грешка.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'За съжаление от тази грешка не се възстановява :(. Firefly III се счупи. Грешката е:',
'error' => 'Грешка',
'error_location' => 'Тази грешка се появи във файл ":file" на ред: :line с код: :code.',
diff --git a/resources/lang/cs_CZ/config.php b/resources/lang/cs_CZ/config.php
index 134d6da745..499fed5e12 100644
--- a/resources/lang/cs_CZ/config.php
+++ b/resources/lang/cs_CZ/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/cs_CZ/errors.php b/resources/lang/cs_CZ/errors.php
index 8d3773e3a0..ffef8fe8bf 100644
--- a/resources/lang/cs_CZ/errors.php
+++ b/resources/lang/cs_CZ/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Hned jsme zpět!',
'check_back' => 'Firefly III je vypnutý kvůli nezbytné údržbě. Zkuste to prosím později.',
'error_occurred' => 'Jejda! Došlo k chybě.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Bohužel, tato chyba je neopravitelná :(. Firefly III se pokazil. Chyba je:',
'error' => 'Chyba',
'error_location' => 'Došlo k chybě v souboru :file na řádku :line s kódem :code.',
diff --git a/resources/lang/de_DE/config.php b/resources/lang/de_DE/config.php
index fe132af7f6..db5adde9c8 100644
--- a/resources/lang/de_DE/config.php
+++ b/resources/lang/de_DE/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q. Quartal YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'QQQ, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/de_DE/email.php b/resources/lang/de_DE/email.php
index a71a811439..24436af47b 100644
--- a/resources/lang/de_DE/email.php
+++ b/resources/lang/de_DE/email.php
@@ -52,8 +52,8 @@ return [
'registered_welcome' => 'Willkommen bei [Firefly III](:address). Ihre Registrierung ist abgeschlossen und diese E-Mail erhalten Sie zur Bestätigung. Hurra!',
'registered_pw' => 'Wenn Sie Ihr Passwort bereits vergessen haben, setzen Sie es bitte mit dem [Tool zum Zurücksetzen des Passworts](:address/password/reset) zurück.',
'registered_help' => 'Es gibt ein Hilfe-Icon in der oberen rechten Ecke jeder Seite. Wenn Sie Hilfe benötigen, klicken Sie dort drauf!',
- 'registered_doc_html' => 'If you haven\'t already, please read the [grand theory](https://docs.firefly-iii.org/about-firefly-iii/personal-finances).',
- 'registered_doc_text' => 'If you haven\'t already, please also read the first use guide and the full description.',
+ 'registered_doc_html' => 'Falls Sie es noch nicht getan haben, lesen Sie bitte die [Große Theorie] (https://docs.firefly-iii.org/about-firefly-iii/personal-finances).',
+ 'registered_doc_text' => 'Falls Sie es noch nicht getan haben, lesen Sie bitte auch die Anleitung zur ersten Benutzung und die vollständige Beschreibung.',
'registered_closing' => 'Viel Spaß!',
'registered_firefly_iii_link' => 'Firefly III:',
'registered_pw_reset_link' => 'Passwort zurücksetzen:',
@@ -73,7 +73,7 @@ return [
// OAuth token created
'oauth_created_subject' => 'Ein neuer OAuth Client wurde erstellt',
- 'oauth_created_body' => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL `:url`.',
+ 'oauth_created_body' => 'Jemand (hoffentlich Sie) hat gerade einen neuen Firefly III API OAuth Client für Ihr Benutzerkonto erstellt. Er trägt die Bezeichnung ":name" und hat die Callback-URL `:url`.',
'oauth_created_explanation' => 'Mit diesem Client können Sie über die API von Firefly III auf **alle** Ihrer Finanzdaten zugreifen.',
'oauth_created_undo' => 'Wenn Sie es nicht waren, widerrufen Sie diesen Client bitte so schnell wie möglich unter „:url”',
@@ -104,14 +104,14 @@ return [
'new_journals_header' => 'Firefly III hat eine Transaktion für Sie erstellt. Sie finden sie in Ihrer Firefly III Installation:|Firefly III hat :count Transaktionen für Sie erstellt. Sie können sie in Ihrer Firefly III Installation finden:',
// bill warning
- 'bill_warning_subject_end_date' => 'Your bill ":name" is due to end in :diff days',
- 'bill_warning_subject_now_end_date' => 'Your bill ":name" is due to end TODAY',
- 'bill_warning_subject_extension_date' => 'Your bill ":name" is due to be extended or cancelled in :diff days',
- 'bill_warning_subject_now_extension_date' => 'Your bill ":name" is due to be extended or cancelled TODAY',
- 'bill_warning_end_date' => 'Your bill **":name"** is due to end on :date. This moment will pass in about **:diff days**.',
- 'bill_warning_extension_date' => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
- 'bill_warning_end_date_zero' => 'Your bill **":name"** is due to end on :date. This moment will pass **TODAY!**',
- 'bill_warning_extension_date_zero' => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
- 'bill_warning_please_action' => 'Please take the appropriate action.',
+ 'bill_warning_subject_end_date' => 'Ihre Rechnung ":name" wird in :diff Tagen fällig',
+ 'bill_warning_subject_now_end_date' => 'Ihre Rechnung ":name" wird HEUTE fällig',
+ 'bill_warning_subject_extension_date' => 'Ihre Rechnung ":name" wird in :diff Tagen verlängert oder storniert',
+ 'bill_warning_subject_now_extension_date' => 'Ihre Rechnung ":name" wird HEUTE verlängert oder storniert',
+ 'bill_warning_end_date' => 'Ihre Rechnung **":name"** wird am :date enden. Dieser Zeitpunkt wird in **:diff Tagen** vergehen.',
+ 'bill_warning_extension_date' => 'Ihre Rechnung **":name"** wird am :date verlängert oder storniert. Dieser Zeitpunkt wird in **:diff Tagen** vergehen.',
+ 'bill_warning_end_date_zero' => 'Ihre Rechnung **":name"** wird am :date enden. Dieser Zeitpunkt wird **HEUTE!** vergehen',
+ 'bill_warning_extension_date_zero' => 'Ihre Rechnung **":name"** wird am :date verlängert oder storniert. Dieser Zeitpunkt wird **HEUTE!** vergehen',
+ 'bill_warning_please_action' => 'Bitte ergreifen Sie die entsprechende Maßnahme.',
];
diff --git a/resources/lang/de_DE/errors.php b/resources/lang/de_DE/errors.php
index e6007513f0..8cb6ddd59b 100644
--- a/resources/lang/de_DE/errors.php
+++ b/resources/lang/de_DE/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Gleich wieder zurück!',
'check_back' => 'Firefly III ist für eine notwendige Wartung nicht verfügbar. Bitte versuchen Sie es in einer Sekunde noch einmal.',
'error_occurred' => 'Hoppla! Ein Fehler ist aufgetreten.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Leider konnte dieser Fehler nicht wiederhergestellt werden :(. Firefly III ist kaputt. Der Fehler ist:',
'error' => 'Fehler',
'error_location' => 'Dieser Fehler ist in der Datei :file in Zeile :line mit dem Code :code aufgetreten.',
diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index c452935c53..169b09d9ca 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -356,16 +356,16 @@ return [
// new
- 'search_modifier_tag_is_not' => 'No tag is ":value"',
+ 'search_modifier_tag_is_not' => 'Kein Schlagwort lautet ":value"',
'search_modifier_account_is' => 'Beide Konten sind ":value"',
'search_modifier_account_contains' => 'Beide Konten enthalten ":value"',
'search_modifier_account_ends' => 'Beide Konten enden mit ":value"',
'search_modifier_account_starts' => 'Beide Konten beginnen mit ":value"',
'search_modifier_account_nr_is' => 'Beide Kontonummern / IBANs sind ":value"',
- 'search_modifier_account_nr_contains' => 'Either account number / IBAN contains ":value"',
+ 'search_modifier_account_nr_contains' => 'Beide Kontonummer / IBAN enthalten ":value"',
'search_modifier_account_nr_ends' => 'Beide Kontonummern /IBANs enden mit ":value"',
- 'search_modifier_account_nr_starts' => 'Either account number / IBAN starts with ":value"',
+ 'search_modifier_account_nr_starts' => 'Beide Kontonummer / IBAN beginnen mit ":value"',
'search_modifier_category_contains' => 'Kategorie beinhaltet ":value"',
'search_modifier_category_ends' => 'Kategorie endet mit ":value"',
'search_modifier_category_starts' => 'Kategorie beginnt mit ":value"',
@@ -378,127 +378,127 @@ return [
'search_modifier_external_id_contains' => 'Externe ID enthält ":value"',
'search_modifier_external_id_ends' => 'Externe ID endet mit ":value"',
'search_modifier_external_id_starts' => 'Externe ID beginnt mit ":value"',
- 'search_modifier_internal_reference_contains' => 'Internal reference contains ":value"',
- 'search_modifier_internal_reference_ends' => 'Internal reference ends with ":value"',
- 'search_modifier_internal_reference_starts' => 'Internal reference starts with ":value"',
+ 'search_modifier_internal_reference_contains' => 'Interne Referenz beinhaltet ":value"',
+ 'search_modifier_internal_reference_ends' => 'Interne Referenz endet mit ":value"',
+ 'search_modifier_internal_reference_starts' => 'Interne Referenz beginnt mit ":value"',
'search_modifier_external_url_is' => 'Externe URL ist ":value"',
'search_modifier_external_url_contains' => 'Externe URL enthält ":value"',
'search_modifier_external_url_ends' => 'Externe URL endet mit ":value"',
'search_modifier_external_url_starts' => 'Externe URL beginnt mit ":value"',
'search_modifier_has_no_attachments' => 'Transaktion hat keine Anhänge',
- 'search_modifier_account_is_cash' => 'Either account is a cash account.',
+ 'search_modifier_account_is_cash' => 'Beide Konten sind Geldbörsen.',
'search_modifier_journal_id' => 'Transaktions-Journal-ID ist ":value"',
'search_modifier_recurrence_id' => 'Die Dauerauftrags-ID ist ":value"',
- 'search_modifier_foreign_amount_is' => 'The foreign amount is ":value"',
- 'search_modifier_foreign_amount_less' => 'The foreign amount is less than ":value"',
- 'search_modifier_foreign_amount_more' => 'The foreign amount is more than ":value"',
+ 'search_modifier_foreign_amount_is' => 'Der Fremdbetrag lautet ":value"',
+ 'search_modifier_foreign_amount_less' => 'Der Fremdbetrag ist geringer als ":value"',
+ 'search_modifier_foreign_amount_more' => 'Der Fremdbetrag ist höher als ":value"',
// date fields
- 'search_modifier_interest_date_on' => 'Transaction interest date is ":value"',
- 'search_modifier_interest_date_on_year' => 'Transaction interest date is in year ":value"',
- 'search_modifier_interest_date_on_month' => 'Transaction interest date is in month ":value"',
- 'search_modifier_interest_date_on_day' => 'Transaction interest date is on day of month ":value"',
- 'search_modifier_interest_date_before_year' => 'Transaction interest date is before or in year ":value"',
- 'search_modifier_interest_date_before_month' => 'Transaction interest date is before or in month ":value"',
- 'search_modifier_interest_date_before_day' => 'Transaction interest date is before or on day of month ":value"',
- 'search_modifier_interest_date_after_year' => 'Transaction interest date is after or in year ":value"',
- 'search_modifier_interest_date_after_month' => 'Transaction interest date is after or in month ":value"',
- 'search_modifier_interest_date_after_day' => 'Transaction interest date is after or on day of month ":value"',
- 'search_modifier_book_date_on_year' => 'Transaction book date is in year ":value"',
- 'search_modifier_book_date_on_month' => 'Transaction book date is in month ":value"',
- 'search_modifier_book_date_on_day' => 'Transaction book date is on day of month ":value"',
- 'search_modifier_book_date_before_year' => 'Transaction book date is before or in year ":value"',
- 'search_modifier_book_date_before_month' => 'Transaction book date is before or in month ":value"',
- 'search_modifier_book_date_before_day' => 'Transaction book date is before or on day of month ":value"',
- 'search_modifier_book_date_after_year' => 'Transaction book date is after or in year ":value"',
- 'search_modifier_book_date_after_month' => 'Transaction book date is after or in month ":value"',
- 'search_modifier_book_date_after_day' => 'Transaction book date is after or on day of month ":value"',
- 'search_modifier_process_date_on_year' => 'Transaction process date is in year ":value"',
- 'search_modifier_process_date_on_month' => 'Transaction process date is in month ":value"',
- 'search_modifier_process_date_on_day' => 'Transaction process date is on day of month ":value"',
- 'search_modifier_process_date_before_year' => 'Transaction process date is before or in year ":value"',
- 'search_modifier_process_date_before_month' => 'Transaction process date is before or in month ":value"',
- 'search_modifier_process_date_before_day' => 'Transaction process date is before or on day of month ":value"',
- 'search_modifier_process_date_after_year' => 'Transaction process date is after or in year ":value"',
- 'search_modifier_process_date_after_month' => 'Transaction process date is after or in month ":value"',
- 'search_modifier_process_date_after_day' => 'Transaction process date is after or on day of month ":value"',
- 'search_modifier_due_date_on_year' => 'Transaction due date is in year ":value"',
- 'search_modifier_due_date_on_month' => 'Transaction due date is in month ":value"',
- 'search_modifier_due_date_on_day' => 'Transaction due date is on day of month ":value"',
- 'search_modifier_due_date_before_year' => 'Transaction due date is before or in year ":value"',
- 'search_modifier_due_date_before_month' => 'Transaction due date is before or in month ":value"',
- 'search_modifier_due_date_before_day' => 'Transaction due date is before or on day of month ":value"',
- 'search_modifier_due_date_after_year' => 'Transaction due date is after or in year ":value"',
- 'search_modifier_due_date_after_month' => 'Transaction due date is after or in month ":value"',
- 'search_modifier_due_date_after_day' => 'Transaction due date is after or on day of month ":value"',
- 'search_modifier_payment_date_on_year' => 'Transaction payment date is in year ":value"',
- 'search_modifier_payment_date_on_month' => 'Transaction payment date is in month ":value"',
- 'search_modifier_payment_date_on_day' => 'Transaction payment date is on day of month ":value"',
- 'search_modifier_payment_date_before_year' => 'Transaction payment date is before or in year ":value"',
- 'search_modifier_payment_date_before_month' => 'Transaction payment date is before or in month ":value"',
- 'search_modifier_payment_date_before_day' => 'Transaction payment date is before or on day of month ":value"',
- 'search_modifier_payment_date_after_year' => 'Transaction payment date is after or in year ":value"',
- 'search_modifier_payment_date_after_month' => 'Transaction payment date is after or in month ":value"',
- 'search_modifier_payment_date_after_day' => 'Transaction payment date is after or on day of month ":value"',
- 'search_modifier_invoice_date_on_year' => 'Transaction invoice date is in year ":value"',
- 'search_modifier_invoice_date_on_month' => 'Transaction invoice date is in month ":value"',
- 'search_modifier_invoice_date_on_day' => 'Transaction invoice date is on day of month ":value"',
- 'search_modifier_invoice_date_before_year' => 'Transaction invoice date is before or in year ":value"',
- 'search_modifier_invoice_date_before_month' => 'Transaction invoice date is before or in month ":value"',
- 'search_modifier_invoice_date_before_day' => 'Transaction invoice date is before or on day of month ":value"',
- 'search_modifier_invoice_date_after_year' => 'Transaction invoice date is after or in year ":value"',
- 'search_modifier_invoice_date_after_month' => 'Transaction invoice date is after or in month ":value"',
- 'search_modifier_invoice_date_after_day' => 'Transaction invoice date is after or on day of month ":value"',
+ 'search_modifier_interest_date_on' => 'Transaktion Zinstermin ist am ":value"',
+ 'search_modifier_interest_date_on_year' => 'Transaktion Zinstermin ist im Jahr ":value"',
+ 'search_modifier_interest_date_on_month' => 'Transaktion Zinstermin ist im Monat ":value"',
+ 'search_modifier_interest_date_on_day' => 'Transaktion Zinstermin ist am Tag des Monats ":value"',
+ 'search_modifier_interest_date_before_year' => 'Transaktion Zinstermin ist vor dem oder im Jahr ":value"',
+ 'search_modifier_interest_date_before_month' => 'Transaktion Zinstermin ist vor dem oder im Monat ":value"',
+ 'search_modifier_interest_date_before_day' => 'Transaktion Zinstermin ist vor dem oder am Tag des Monats ":value"',
+ 'search_modifier_interest_date_after_year' => 'Transaktion Zinstermin ist nach dem oder im Jahr ":value"',
+ 'search_modifier_interest_date_after_month' => 'Transaktion Zinstermin ist nach dem oder im Monat ":value"',
+ 'search_modifier_interest_date_after_day' => 'Transaktion Zinstermin ist nach dem oder am Tag des Monats ":value"',
+ 'search_modifier_book_date_on_year' => 'Transaktion Buchungstermin ist im Jahr ":value"',
+ 'search_modifier_book_date_on_month' => 'Transaktion Buchungstermin ist im Monat ":value"',
+ 'search_modifier_book_date_on_day' => 'Transaktion Buchungstermin ist am Tag des Monats ":value"',
+ 'search_modifier_book_date_before_year' => 'Transaktion Buchungstermin ist vor dem oder im Jahr ":value"',
+ 'search_modifier_book_date_before_month' => 'Transaktion Buchungstermin ist vor dem oder im Monat ":value"',
+ 'search_modifier_book_date_before_day' => 'Transaktion Buchungstermin ist vor dem oder am Tag des Monats ":value"',
+ 'search_modifier_book_date_after_year' => 'Transaktion Buchungstermin ist nach dem oder im Jahr ":value"',
+ 'search_modifier_book_date_after_month' => 'Transaktion Buchungstermin ist nach dem oder im Monat ":value"',
+ 'search_modifier_book_date_after_day' => 'Transaktion Buchungstermin ist nach dem oder am Tag des Monats ":value"',
+ 'search_modifier_process_date_on_year' => 'Transaktion Erfassungsdatum ist im Jahr ":value"',
+ 'search_modifier_process_date_on_month' => 'Transaktion Erfassungsdatum ist im Monat ":value"',
+ 'search_modifier_process_date_on_day' => 'Transaktion Erfassungsdatum ist am Tag des Monats ":value"',
+ 'search_modifier_process_date_before_year' => 'Transaktion Erfassungsdatum ist vor dem oder im Jahr ":value"',
+ 'search_modifier_process_date_before_month' => 'Transaktion Erfassungsdatum ist vor dem oder im Monat ":value"',
+ 'search_modifier_process_date_before_day' => 'Transaktion Erfassungsdatum ist vor dem oder am Tag des Monats ":value"',
+ 'search_modifier_process_date_after_year' => 'Transaktion Erfassungsdatum ist nach dem oder im Jahr ":value"',
+ 'search_modifier_process_date_after_month' => 'Transaktion Erfassungsdatum ist nach dem oder im Monat ":value"',
+ 'search_modifier_process_date_after_day' => 'Transaktion Erfassungsdatum ist nach dem oder am Tag des Monats ":value"',
+ 'search_modifier_due_date_on_year' => 'Transaktion Fälligkeitstermin ist im Jahr ":value"',
+ 'search_modifier_due_date_on_month' => 'Transaktion Fälligkeitstermin ist im Monat ":value"',
+ 'search_modifier_due_date_on_day' => 'Transaktion Fälligkeitstermin ist am Tag des Monats ":value"',
+ 'search_modifier_due_date_before_year' => 'Transaktion Fälligkeitstermin ist vor dem oder im Jahr ":value"',
+ 'search_modifier_due_date_before_month' => 'Transaktion Fälligkeitstermin ist vor dem oder im Monat ":value"',
+ 'search_modifier_due_date_before_day' => 'Transaktion Fälligkeitstermin ist vor dem oder am Tag des Monats ":value"',
+ 'search_modifier_due_date_after_year' => 'Transaktion Fälligkeitstermin ist nach dem oder im Jahr ":value"',
+ 'search_modifier_due_date_after_month' => 'Transaktion Fälligkeitstermin ist nach dem oder im Monat ":value"',
+ 'search_modifier_due_date_after_day' => 'Transaktion Fälligkeitstermin ist nach dem oder am Tag des Monats ":value"',
+ 'search_modifier_payment_date_on_year' => 'Transaktion Zahlungsdatum ist im Jahr ":value"',
+ 'search_modifier_payment_date_on_month' => 'Transaktion Zahlungsdatum ist im Monat ":value"',
+ 'search_modifier_payment_date_on_day' => 'Transaktion Zahlungsdatum ist am Tag des Monats ":value"',
+ 'search_modifier_payment_date_before_year' => 'Transaktion Zahlungsdatum ist vor dem oder im Jahr ":value"',
+ 'search_modifier_payment_date_before_month' => 'Transaktion Zahlungsdatum ist vor dem oder im Monat ":value"',
+ 'search_modifier_payment_date_before_day' => 'Transaktion Zahlungsdatum ist vor dem oder am Tag des Monats ":value"',
+ 'search_modifier_payment_date_after_year' => 'Transaktion Zahlungsdatum ist nach dem oder im Jahr ":value"',
+ 'search_modifier_payment_date_after_month' => 'Transaktion Zahlungsdatum ist nach dem oder im Monat ":value"',
+ 'search_modifier_payment_date_after_day' => 'Transaktion Zahlungsdatum ist nach dem oder am Tag des Monats ":value"',
+ 'search_modifier_invoice_date_on_year' => 'Transaktion Rechnungsdatum ist im Jahr ":value"',
+ 'search_modifier_invoice_date_on_month' => 'Transaktion Rechnungsdatum ist im Monat ":value"',
+ 'search_modifier_invoice_date_on_day' => 'Transaktion Rechnungsdatum ist am Tag des Monats ":value"',
+ 'search_modifier_invoice_date_before_year' => 'Transaktion Rechnungsdatum ist vor dem oder im Jahr ":value"',
+ 'search_modifier_invoice_date_before_month' => 'Transaktion Rechnungsdatum ist vor dem oder im Monat ":value"',
+ 'search_modifier_invoice_date_before_day' => 'Transaktion Rechnungsdatum ist vor dem oder am Tag des Monats ":value"',
+ 'search_modifier_invoice_date_after_year' => 'Transaktion Rechnungsdatum ist nach dem oder im Jahr ":value"',
+ 'search_modifier_invoice_date_after_month' => 'Transaktion Rechnungsdatum ist nach dem oder im Monat ":value"',
+ 'search_modifier_invoice_date_after_day' => 'Transaktion Rechnungsdatum ist nach dem oder am Tag des Monats ":value"',
// other dates
- 'search_modifier_updated_at_on_year' => 'Transaction was last updated in year ":value"',
- 'search_modifier_updated_at_on_month' => 'Transaction was last updated in month ":value"',
- 'search_modifier_updated_at_on_day' => 'Transaction was last updated on day of month ":value"',
- 'search_modifier_updated_at_before_year' => 'Transaction was last updated in or before year ":value"',
- 'search_modifier_updated_at_before_month' => 'Transaction was last updated in or before month ":value"',
- 'search_modifier_updated_at_before_day' => 'Transaction was last updated on or before day of month ":value"',
- 'search_modifier_updated_at_after_year' => 'Transaction was last updated in or after year ":value"',
- 'search_modifier_updated_at_after_month' => 'Transaction was last updated in or after month ":value"',
- 'search_modifier_updated_at_after_day' => 'Transaction was last updated on or after day of month ":value"',
- 'search_modifier_created_at_on_year' => 'Transaction was created in year ":value"',
- 'search_modifier_created_at_on_month' => 'Transaction was created in month ":value"',
- 'search_modifier_created_at_on_day' => 'Transaction was created on day of month ":value"',
- 'search_modifier_created_at_before_year' => 'Transaction was created in or before year ":value"',
- 'search_modifier_created_at_before_month' => 'Transaction was created in or before month ":value"',
- 'search_modifier_created_at_before_day' => 'Transaction was created on or before day of month ":value"',
- 'search_modifier_created_at_after_year' => 'Transaction was created in or after year ":value"',
- 'search_modifier_created_at_after_month' => 'Transaction was created in or after month ":value"',
- 'search_modifier_created_at_after_day' => 'Transaction was created on or after day of month ":value"',
- 'search_modifier_interest_date_before' => 'Transaction interest date is on or before ":value"',
- 'search_modifier_interest_date_after' => 'Transaction interest date is on or after ":value"',
- 'search_modifier_book_date_on' => 'Transaction book date is on ":value"',
- 'search_modifier_book_date_before' => 'Transaction book date is on or before ":value"',
- 'search_modifier_book_date_after' => 'Transaction book date is on or after ":value"',
- 'search_modifier_process_date_on' => 'Transaction process date is on ":value"',
- 'search_modifier_process_date_before' => 'Transaction process date is on or before ":value"',
- 'search_modifier_process_date_after' => 'Transaction process date is on or after ":value"',
- 'search_modifier_due_date_on' => 'Transaction due date is on ":value"',
- 'search_modifier_due_date_before' => 'Transaction due date is on or before ":value"',
- 'search_modifier_due_date_after' => 'Transaction due date is on or after ":value"',
- 'search_modifier_payment_date_on' => 'Transaction payment date is on ":value"',
- 'search_modifier_payment_date_before' => 'Transaction payment date is on or before ":value"',
- 'search_modifier_payment_date_after' => 'Transaction payment date is on or after ":value"',
- 'search_modifier_invoice_date_on' => 'Transaction invoice date is on ":value"',
- 'search_modifier_invoice_date_before' => 'Transaction invoice date is on or before ":value"',
- 'search_modifier_invoice_date_after' => 'Transaction invoice date is on or after ":value"',
- 'search_modifier_created_at_on' => 'Transaction was created on ":value"',
- 'search_modifier_created_at_before' => 'Transaction was created on or before ":value"',
- 'search_modifier_created_at_after' => 'Transaction was created on or after ":value"',
- 'search_modifier_updated_at_on' => 'Transaction was updated on ":value"',
- 'search_modifier_updated_at_before' => 'Transaction was updated on or before ":value"',
- 'search_modifier_updated_at_after' => 'Transaction was updated on or after ":value"',
- 'search_modifier_attachment_name_is' => 'Any attachment\'s name is ":value"',
- 'search_modifier_attachment_name_contains' => 'Any attachment\'s name contains ":value"',
- 'search_modifier_attachment_name_starts' => 'Any attachment\'s name starts with ":value"',
- 'search_modifier_attachment_name_ends' => 'Any attachment\'s name ends with ":value"',
- 'search_modifier_attachment_notes_are' => 'Any attachment\'s notes are ":value"',
- 'search_modifier_attachment_notes_contains' => 'Any attachment\'s notes contain ":value"',
- 'search_modifier_attachment_notes_starts' => 'Any attachment\'s notes start with ":value"',
- 'search_modifier_attachment_notes_ends' => 'Any attachment\'s notes end is ":value"',
+ 'search_modifier_updated_at_on_year' => 'Transaktion wurde zuletzt im Jahr ":value" aktualisiert',
+ 'search_modifier_updated_at_on_month' => 'Transaktion wurde zuletzt im Monat ":value" aktualisiert',
+ 'search_modifier_updated_at_on_day' => 'Transaktion wurde zuletzt am Tag des Monats ":value" aktualisiert',
+ 'search_modifier_updated_at_before_year' => 'Transaktion wurde zuletzt im oder vor dem Jahr ":value" aktualisiert',
+ 'search_modifier_updated_at_before_month' => 'Transaktion wurde zuletzt im oder vor dem Monat ":value" aktualisiert',
+ 'search_modifier_updated_at_before_day' => 'Transaktion wurde zuletzt am oder vor dem Tag des Monats ":value" aktualisiert',
+ 'search_modifier_updated_at_after_year' => 'Transaktion wurde zuletzt im oder nach dem Jahr ":value" aktualisiert',
+ 'search_modifier_updated_at_after_month' => 'Transaktion wurde zuletzt im oder nach dem Monat ":value" aktualisiert',
+ 'search_modifier_updated_at_after_day' => 'Transaktion wurde zuletzt am oder nach dem Tag des Monats ":value" aktualisiert',
+ 'search_modifier_created_at_on_year' => 'Transaktion wurde im Jahr ":value" erstellt',
+ 'search_modifier_created_at_on_month' => 'Transaktion wurde im Monat ":value" erstellt',
+ 'search_modifier_created_at_on_day' => 'Transaktion wurde am Tag des Monats ":value" erstellt',
+ 'search_modifier_created_at_before_year' => 'Transaktion wurde im oder vor dem Jahr ":value" erstellt',
+ 'search_modifier_created_at_before_month' => 'Transaktion wurde im oder vor dem Monat ":value" erstellt',
+ 'search_modifier_created_at_before_day' => 'Transaktion wurde am oder vor dem Tag des Monats ":value" erstellt',
+ 'search_modifier_created_at_after_year' => 'Transaktion wurde im oder nach dem Jahr ":value" erstellt',
+ 'search_modifier_created_at_after_month' => 'Transaktion wurde im oder nach dem Monat ":value" erstellt',
+ 'search_modifier_created_at_after_day' => 'Transaktion wurde am oder nach dem Tag des Monats ":value" erstellt',
+ 'search_modifier_interest_date_before' => 'Transaktion Zinstermin ist am oder vor dem ":value"',
+ 'search_modifier_interest_date_after' => 'Transaktion Zinstermin ist am oder nach dem ":value"',
+ 'search_modifier_book_date_on' => 'Transaktion Buchungstermin ist am ":value"',
+ 'search_modifier_book_date_before' => 'Transaktion Buchungstermin ist am oder vor dem ":value"',
+ 'search_modifier_book_date_after' => 'Transaktion Buchungstermin ist am oder nach dem ":value"',
+ 'search_modifier_process_date_on' => 'Transaktion Erfassungsdatum ist am ":value"',
+ 'search_modifier_process_date_before' => 'Transaktion Erfassungsdatum ist am oder vor dem ":value"',
+ 'search_modifier_process_date_after' => 'Transaktion Erfassungsdatum ist am oder nach dem ":value"',
+ 'search_modifier_due_date_on' => 'Transaktion Fälligkeitstermin ist am ":value"',
+ 'search_modifier_due_date_before' => 'Transaktion Fälligkeitstermin ist am oder vor dem ":value"',
+ 'search_modifier_due_date_after' => 'Transaktion Fälligkeitstermin ist am oder nach dem ":value"',
+ 'search_modifier_payment_date_on' => 'Transaktion Zahlungsdatum ist am ":value"',
+ 'search_modifier_payment_date_before' => 'Transaktion Zahlungsdatum ist am oder vor dem ":value"',
+ 'search_modifier_payment_date_after' => 'Transaktion Zahlungsdatum ist am oder nach dem ":value"',
+ 'search_modifier_invoice_date_on' => 'Transaktion Rechnungsdatum ist am ":value"',
+ 'search_modifier_invoice_date_before' => 'Transaktion Rechnungsdatum ist am oder vor dem ":value"',
+ 'search_modifier_invoice_date_after' => 'Transaktion Rechnungsdatum ist am oder nach dem ":value"',
+ 'search_modifier_created_at_on' => 'Transaktion wurde am ":value" erstellt',
+ 'search_modifier_created_at_before' => 'Transaktion wurde am oder vor dem ":value" erstellt',
+ 'search_modifier_created_at_after' => 'Transaktion wurde am oder nach dem ":value" erstellt',
+ 'search_modifier_updated_at_on' => 'Transaktion wurde aktualisiert am ":value"',
+ 'search_modifier_updated_at_before' => 'Transaktion wurde aktualisiert am oder vor dem ":value"',
+ 'search_modifier_updated_at_after' => 'Transaktion wurde aktualisiert am oder nach dem ":value"',
+ 'search_modifier_attachment_name_is' => 'Der Name eines Anhangs lautet ":value"',
+ 'search_modifier_attachment_name_contains' => 'Der Name eines Anhangs beinhaltet ":value"',
+ 'search_modifier_attachment_name_starts' => 'Der Name eines Anhangs beginnt mit ":value"',
+ 'search_modifier_attachment_name_ends' => 'Der Name eines Anhangs endet mit ":value"',
+ 'search_modifier_attachment_notes_are' => 'Notizen des Anhangs lauten ":value"',
+ 'search_modifier_attachment_notes_contains' => 'Notizen des Anhangs beinhalten ":value"',
+ 'search_modifier_attachment_notes_starts' => 'Notizen des Anhangs beginnen mit ":value"',
+ 'search_modifier_attachment_notes_ends' => 'Notizen des Anhangs enden mit ":value"',
'update_rule_from_query' => 'Regel „:rule” aus Suchanfrage aktualisieren',
'create_rule_from_query' => 'Neue Regel aus Suchanfrage erstellen',
'rule_from_search_words' => 'Die Regel-Modul hat Schwierigkeiten „:string” zu verarbeiten. Die vorgeschlagene Regel, die Ihrer Suchanfrage entspricht, kann zu unterschiedlichen Ergebnissen führen. Bitte überprüfen Sie die Regelauslöser sorgfältig.',
@@ -605,14 +605,14 @@ return [
'rule_trigger_source_account_is' => 'Quellkonto-Name lautet ":trigger_value"',
'rule_trigger_source_account_contains_choice' => 'Quellkonto-Name enhält..',
'rule_trigger_source_account_contains' => 'Quellkonto-Name enthält ":trigger_value"',
- 'rule_trigger_account_id_choice' => 'Either account ID is exactly..',
- 'rule_trigger_account_id' => 'Either account ID is exactly :trigger_value',
+ 'rule_trigger_account_id_choice' => 'Beide Konto IDs sind exakt..',
+ 'rule_trigger_account_id' => 'Beide Konto IDs sind exakt :trigger_value',
'rule_trigger_source_account_id_choice' => 'Quellkonto ID ist genau..',
'rule_trigger_source_account_id' => 'Quellkonto ID ist genau :trigger_value',
'rule_trigger_destination_account_id_choice' => 'Zielkonto ID ist genau..',
'rule_trigger_destination_account_id' => 'Quellkonto ID ist genau :trigger_value',
- 'rule_trigger_account_is_cash_choice' => 'Either account is cash',
- 'rule_trigger_account_is_cash' => 'Either account is cash',
+ 'rule_trigger_account_is_cash_choice' => 'Beide Konten sind Bargeld',
+ 'rule_trigger_account_is_cash' => 'Beide Konten sind Bargeld',
'rule_trigger_source_is_cash_choice' => 'Quellkonto ist (bar)',
'rule_trigger_source_is_cash' => 'Quellkonto ist (bar)',
'rule_trigger_destination_is_cash_choice' => 'Zielkonto ist (bar)',
@@ -647,8 +647,8 @@ return [
'rule_trigger_category_is' => 'Kategorie ist ":trigger_value"',
'rule_trigger_amount_less_choice' => 'Betrag ist geringer als..',
'rule_trigger_amount_less' => 'Betrag ist kleiner als :trigger_value',
- 'rule_trigger_amount_is_choice' => 'Amount is..',
- 'rule_trigger_amount_is' => 'Amount is :trigger_value',
+ 'rule_trigger_amount_is_choice' => 'Betrag lautet..',
+ 'rule_trigger_amount_is' => 'Betrag lautet :trigger_value',
'rule_trigger_amount_more_choice' => 'Betrag ist mehr als..',
'rule_trigger_amount_more' => 'Betrag ist größer als :trigger_value',
'rule_trigger_description_starts_choice' => 'Beschreibung beginnt mit..',
@@ -659,20 +659,20 @@ return [
'rule_trigger_description_contains' => 'Beschreibung enthält ":trigger_value"',
'rule_trigger_description_is_choice' => 'Beschreibung ist..',
'rule_trigger_description_is' => 'Beschreibung ist ":trigger_value"',
- 'rule_trigger_date_on_choice' => 'Transaction date is..',
- 'rule_trigger_date_on' => 'Transaction date is ":trigger_value"',
+ 'rule_trigger_date_on_choice' => 'Buchungsdatum lautet..',
+ 'rule_trigger_date_on' => 'Buchungsdatum lautet ":trigger_value"',
'rule_trigger_date_before_choice' => 'Buchungsdatum ist vor …',
'rule_trigger_date_before' => 'Buchungsdatum ist vor „:trigger_value”',
'rule_trigger_date_after_choice' => 'Buchungsdatum ist nach …',
'rule_trigger_date_after' => 'Buchungsdatum ist nach „:trigger_value”',
- 'rule_trigger_created_at_on_choice' => 'Transaction was made on..',
- 'rule_trigger_created_at_on' => 'Transaction was made on ":trigger_value"',
- 'rule_trigger_updated_at_on_choice' => 'Transaction was last edited on..',
- 'rule_trigger_updated_at_on' => 'Transaction was last edited on ":trigger_value"',
+ 'rule_trigger_created_at_on_choice' => 'Transaktion wurde gemacht am..',
+ 'rule_trigger_created_at_on' => 'Transaktion wurde gemacht am ":trigger_value"',
+ 'rule_trigger_updated_at_on_choice' => 'Transaktion wurde zuletzt bearbeitet am..',
+ 'rule_trigger_updated_at_on' => 'Transaktion wurde zuletzt bearbeitet am ":trigger_value"',
'rule_trigger_budget_is_choice' => 'Budget ist..',
'rule_trigger_budget_is' => 'Budget ist „:trigger_value”',
- 'rule_trigger_tag_is_choice' => 'Any tag is..',
- 'rule_trigger_tag_is' => 'Any tag is ":trigger_value"',
+ 'rule_trigger_tag_is_choice' => 'Irgendein Schlagwort lautet..',
+ 'rule_trigger_tag_is' => 'Irgendein Schlagwort lautet ":trigger_value"',
'rule_trigger_currency_is_choice' => 'Buchungswährung ist …',
'rule_trigger_currency_is' => 'Buchungswährung ist „:trigger_value”',
'rule_trigger_foreign_currency_is_choice' => 'Fremdwährung der Buchung ist …',
@@ -699,12 +699,12 @@ return [
'rule_trigger_any_notes' => 'Die Buchung hat (beliebige) Notizen',
'rule_trigger_no_notes_choice' => 'Hat keine Notizen',
'rule_trigger_no_notes' => 'Buchung hat keine Notizen',
- 'rule_trigger_notes_is_choice' => 'Notes are..',
- 'rule_trigger_notes_is' => 'Notes are ":trigger_value"',
- 'rule_trigger_notes_contains_choice' => 'Notes contain..',
- 'rule_trigger_notes_contains' => 'Notes contain ":trigger_value"',
- 'rule_trigger_notes_starts_choice' => 'Notes start with..',
- 'rule_trigger_notes_starts' => 'Notes start with ":trigger_value"',
+ 'rule_trigger_notes_is_choice' => 'Notizen lauten..',
+ 'rule_trigger_notes_is' => 'Notizen lauten ":trigger_value"',
+ 'rule_trigger_notes_contains_choice' => 'Notizen beinhalten..',
+ 'rule_trigger_notes_contains' => 'Notizen beinhalten ":trigger_value"',
+ 'rule_trigger_notes_starts_choice' => 'Notizen beginnen mit..',
+ 'rule_trigger_notes_starts' => 'Notizen beginnen mit ":trigger_value"',
'rule_trigger_notes_ends_choice' => 'Notizen enden mit..',
'rule_trigger_notes_ends' => 'Notizen enden mit ":trigger_value"',
'rule_trigger_bill_is_choice' => 'Rechnung ist..',
@@ -723,25 +723,25 @@ return [
'rule_trigger_id' => 'Buchungskennung lautet „:trigger_value”',
// new values:
- 'rule_trigger_user_action_choice' => 'User action is ":trigger_value"',
- 'rule_trigger_tag_is_not_choice' => 'No tag is ":trigger_value"',
- 'rule_trigger_tag_is_not' => 'No tag is..',
- 'rule_trigger_account_is_choice' => 'Either account is exactly..',
- 'rule_trigger_account_is' => 'Either account is exactly ":trigger_value"',
- 'rule_trigger_account_contains_choice' => 'Either account contains..',
- 'rule_trigger_account_contains' => 'Either account contains ":trigger_value"',
- 'rule_trigger_account_ends_choice' => 'Either account ends with..',
- 'rule_trigger_account_ends' => 'Either account ends with ":trigger_value"',
- 'rule_trigger_account_starts_choice' => 'Either account starts with..',
- 'rule_trigger_account_starts' => 'Either account starts with ":trigger_value"',
- 'rule_trigger_account_nr_is_choice' => 'Either account number / IBAN is..',
- 'rule_trigger_account_nr_is' => 'Either account number / IBAN is ":trigger_value"',
- 'rule_trigger_account_nr_contains_choice' => 'Either account number / IBAN contains..',
- 'rule_trigger_account_nr_contains' => 'Either account number / IBAN contains ":trigger_value"',
+ 'rule_trigger_user_action_choice' => 'Die Nutzeraktion ist ":trigger_value"',
+ 'rule_trigger_tag_is_not_choice' => 'Kein Schlagwort lautet ":trigger_value"',
+ 'rule_trigger_tag_is_not' => 'Kein Schlagwort lautet..',
+ 'rule_trigger_account_is_choice' => 'Beide Konten lauten exakt..',
+ 'rule_trigger_account_is' => 'Beide Konten lauten exakt ":trigger_value"',
+ 'rule_trigger_account_contains_choice' => 'Beide Konten beinhalten..',
+ 'rule_trigger_account_contains' => 'Beide Konten beinhalten ":trigger_value"',
+ 'rule_trigger_account_ends_choice' => 'Beide Konten enden mit..',
+ 'rule_trigger_account_ends' => 'Beide Konten enden mit ":trigger_value"',
+ 'rule_trigger_account_starts_choice' => 'Beide Konten beginnen mit..',
+ 'rule_trigger_account_starts' => 'Beide Konten beginnen mit ":trigger_value"',
+ 'rule_trigger_account_nr_is_choice' => 'Beide Kontonummer / IBAN lauten..',
+ 'rule_trigger_account_nr_is' => 'Beide Kontonummer / IBAN lauten ":trigger_value"',
+ 'rule_trigger_account_nr_contains_choice' => 'Beide Kontonummer / IBAN enthalten..',
+ 'rule_trigger_account_nr_contains' => 'Beide Kontonummer / IBAN enthalten ":trigger_value"',
'rule_trigger_account_nr_ends_choice' => 'Entweder Kontonummer oder IBAN enden auf..',
'rule_trigger_account_nr_ends' => 'Entweder Kontonummer oder IBAN enden auf ":trigger_value"',
'rule_trigger_account_nr_starts_choice' => 'Entweder Kontonummer oder IBAN beginnen mit..',
- 'rule_trigger_account_nr_starts' => 'Either account number / IBAN starts with ":trigger_value"',
+ 'rule_trigger_account_nr_starts' => 'Beide Kontonummer / IBAN beginnen mit ":trigger_value"',
'rule_trigger_category_contains_choice' => 'Kategorie enthält..',
'rule_trigger_category_contains' => 'Kategorie enthält ":trigger_value"',
'rule_trigger_category_ends_choice' => 'Kategorie endet mit..',
@@ -754,102 +754,102 @@ return [
'rule_trigger_budget_ends' => 'Budget endet mit ":trigger_value"',
'rule_trigger_budget_starts_choice' => 'Budget beginnt mit..',
'rule_trigger_budget_starts' => 'Budget beginnt mit ":trigger_value"',
- 'rule_trigger_bill_contains_choice' => 'Bill contains..',
- 'rule_trigger_bill_contains' => 'Bill contains ":trigger_value"',
- 'rule_trigger_bill_ends_choice' => 'Bill ends with..',
- 'rule_trigger_bill_ends' => 'Bill ends with ":trigger_value"',
- 'rule_trigger_bill_starts_choice' => 'Bill starts with..',
- 'rule_trigger_bill_starts' => 'Bill starts with ":trigger_value"',
+ 'rule_trigger_bill_contains_choice' => 'Rechnung beinhaltet..',
+ 'rule_trigger_bill_contains' => 'Rechnung beinhaltet ":trigger_value"',
+ 'rule_trigger_bill_ends_choice' => 'Rechnung endet mit..',
+ 'rule_trigger_bill_ends' => 'Rechnung endet mit ":trigger_value"',
+ 'rule_trigger_bill_starts_choice' => 'Rechnung beginnt mit..',
+ 'rule_trigger_bill_starts' => 'Rechnung beginnt mit ":trigger_value"',
'rule_trigger_external_id_contains_choice' => 'Externe ID enthält..',
'rule_trigger_external_id_contains' => 'Externe ID enthält ":trigger_value"',
'rule_trigger_external_id_ends_choice' => 'Externe ID endet mit..',
'rule_trigger_external_id_ends' => 'Externe ID endet mit ":trigger_value"',
'rule_trigger_external_id_starts_choice' => 'Externe ID startet mit..',
'rule_trigger_external_id_starts' => 'Externe ID beginnt mit ":trigger_value"',
- 'rule_trigger_internal_reference_contains_choice' => 'Internal reference contains..',
- 'rule_trigger_internal_reference_contains' => 'Internal reference contains ":trigger_value"',
- 'rule_trigger_internal_reference_ends_choice' => 'Internal reference ends with..',
- 'rule_trigger_internal_reference_ends' => 'Internal reference ends with ":trigger_value"',
- 'rule_trigger_internal_reference_starts_choice' => 'Internal reference starts with..',
- 'rule_trigger_internal_reference_starts' => 'Internal reference starts with ":trigger_value"',
+ 'rule_trigger_internal_reference_contains_choice' => 'Interne Referenz beinhaltet..',
+ 'rule_trigger_internal_reference_contains' => 'Interne Referenz beinhaltet ":trigger_value"',
+ 'rule_trigger_internal_reference_ends_choice' => 'Interne Referenz endet mit..',
+ 'rule_trigger_internal_reference_ends' => 'Interne Referenz endet mit ":trigger_value"',
+ 'rule_trigger_internal_reference_starts_choice' => 'Interne Referenz beginnt mit..',
+ 'rule_trigger_internal_reference_starts' => 'Interne Referenz beginnt mit ":trigger_value"',
'rule_trigger_external_url_is_choice' => 'Exterme URL ist..',
'rule_trigger_external_url_is' => 'Externe URL ist ":trigger_value"',
'rule_trigger_external_url_contains_choice' => 'Externe URL enthält..',
- 'rule_trigger_external_url_contains' => 'External URL contains ":trigger_value"',
- 'rule_trigger_external_url_ends_choice' => 'External URL ends with..',
- 'rule_trigger_external_url_ends' => 'External URL ends with ":trigger_value"',
- 'rule_trigger_external_url_starts_choice' => 'External URL starts with..',
- 'rule_trigger_external_url_starts' => 'External URL starts with ":trigger_value"',
+ 'rule_trigger_external_url_contains' => 'Externe URL beinhaltet ":trigger_value"',
+ 'rule_trigger_external_url_ends_choice' => 'Externe URL endet mit..',
+ 'rule_trigger_external_url_ends' => 'Externe URL endet mit ":trigger_value"',
+ 'rule_trigger_external_url_starts_choice' => 'Externe URL beginnt mit..',
+ 'rule_trigger_external_url_starts' => 'Externe URL beginnt mit ":trigger_value"',
'rule_trigger_has_no_attachments_choice' => 'Hat keine Anhänge',
'rule_trigger_has_no_attachments' => 'Transaktion hat keine Anhänge',
'rule_trigger_recurrence_id_choice' => 'Dauerauftrags-ID ist..',
'rule_trigger_recurrence_id' => 'Dauerauftrags-ID ist ":trigger_value"',
- 'rule_trigger_interest_date_on_choice' => 'Interest date is on..',
- 'rule_trigger_interest_date_on' => 'Interest date is on ":trigger_value"',
- 'rule_trigger_interest_date_before_choice' => 'Interest date is before..',
+ 'rule_trigger_interest_date_on_choice' => 'Zinstermin ist am..',
+ 'rule_trigger_interest_date_on' => 'Zinstermin ist am ":trigger_value"',
+ 'rule_trigger_interest_date_before_choice' => 'Zinstermin ist vor dem..',
'rule_trigger_interest_date_before' => 'Das Zinsdatum liegt vor dem „:trigger_value”',
- 'rule_trigger_interest_date_after_choice' => 'Interest date is after..',
+ 'rule_trigger_interest_date_after_choice' => 'Zinstermin ist nach dem..',
'rule_trigger_interest_date_after' => 'Das Zinsdatum liegt nach dem „:trigger_value”',
- 'rule_trigger_book_date_on_choice' => 'Book date is on..',
- 'rule_trigger_book_date_on' => 'Book date is on ":trigger_value"',
- 'rule_trigger_book_date_before_choice' => 'Book date is before..',
- 'rule_trigger_book_date_before' => 'Book date is before ":trigger_value"',
- 'rule_trigger_book_date_after_choice' => 'Book date is after..',
- 'rule_trigger_book_date_after' => 'Book date is after ":trigger_value"',
- 'rule_trigger_process_date_on_choice' => 'Process date is on..',
- 'rule_trigger_process_date_on' => 'Process date is ":trigger_value"',
- 'rule_trigger_process_date_before_choice' => 'Process date is before..',
- 'rule_trigger_process_date_before' => 'Process date is before ":trigger_value"',
- 'rule_trigger_process_date_after_choice' => 'Process date is after..',
- 'rule_trigger_process_date_after' => 'Process date is after ":trigger_value"',
- 'rule_trigger_due_date_on_choice' => 'Due date is on..',
- 'rule_trigger_due_date_on' => 'Due date is on ":trigger_value"',
- 'rule_trigger_due_date_before_choice' => 'Due date is before..',
- 'rule_trigger_due_date_before' => 'Due date is before ":trigger_value"',
- 'rule_trigger_due_date_after_choice' => 'Due date is after..',
- 'rule_trigger_due_date_after' => 'Due date is after ":trigger_value"',
- 'rule_trigger_payment_date_on_choice' => 'Payment date is on..',
- 'rule_trigger_payment_date_on' => 'Payment date is on ":trigger_value"',
- 'rule_trigger_payment_date_before_choice' => 'Payment date is before..',
- 'rule_trigger_payment_date_before' => 'Payment date is before ":trigger_value"',
- 'rule_trigger_payment_date_after_choice' => 'Payment date is after..',
- 'rule_trigger_payment_date_after' => 'Payment date is after ":trigger_value"',
- 'rule_trigger_invoice_date_on_choice' => 'Invoice date is on..',
- 'rule_trigger_invoice_date_on' => 'Invoice date is on ":trigger_value"',
- 'rule_trigger_invoice_date_before_choice' => 'Invoice date is before..',
- 'rule_trigger_invoice_date_before' => 'Invoice date is before ":trigger_value"',
- 'rule_trigger_invoice_date_after_choice' => 'Invoice date is after..',
- 'rule_trigger_invoice_date_after' => 'Invoice date is after ":trigger_value"',
- 'rule_trigger_created_at_before_choice' => 'Transaction was created before..',
- 'rule_trigger_created_at_before' => 'Transaction was created before ":trigger_value"',
- 'rule_trigger_created_at_after_choice' => 'Transaction was created after..',
- 'rule_trigger_created_at_after' => 'Transaction was created after ":trigger_value"',
- 'rule_trigger_updated_at_before_choice' => 'Transaction was last updated before..',
- 'rule_trigger_updated_at_before' => 'Transaction was last updated before ":trigger_value"',
- 'rule_trigger_updated_at_after_choice' => 'Transaction was last updated after..',
- 'rule_trigger_updated_at_after' => 'Transaction was last updated after ":trigger_value"',
- 'rule_trigger_foreign_amount_is_choice' => 'Foreign amount is exactly..',
- 'rule_trigger_foreign_amount_is' => 'Foreign amount is exactly ":trigger_value"',
- 'rule_trigger_foreign_amount_less_choice' => 'Foreign amount is less than..',
- 'rule_trigger_foreign_amount_less' => 'Foreign amount is less than ":trigger_value"',
- 'rule_trigger_foreign_amount_more_choice' => 'Foreign amount is more than..',
- 'rule_trigger_foreign_amount_more' => 'Foreign amount is more than ":trigger_value"',
- 'rule_trigger_attachment_name_is_choice' => 'Any attachment\'s name is..',
- 'rule_trigger_attachment_name_is' => 'Any attachment\'s name is ":trigger_value"',
- 'rule_trigger_attachment_name_contains_choice' => 'Any attachment\'s name contains..',
- 'rule_trigger_attachment_name_contains' => 'Any attachment\'s name contains ":trigger_value"',
- 'rule_trigger_attachment_name_starts_choice' => 'Any attachment\'s name starts with..',
- 'rule_trigger_attachment_name_starts' => 'Any attachment\'s name starts with ":trigger_value"',
- 'rule_trigger_attachment_name_ends_choice' => 'Any attachment\'s name ends with..',
- 'rule_trigger_attachment_name_ends' => 'Any attachment\'s name ends with ":trigger_value"',
- 'rule_trigger_attachment_notes_are_choice' => 'Any attachment\'s notes are..',
- 'rule_trigger_attachment_notes_are' => 'Any attachment\'s notes are ":trigger_value"',
- 'rule_trigger_attachment_notes_contains_choice' => 'Any attachment\'s notes contain..',
- 'rule_trigger_attachment_notes_contains' => 'Any attachment\'s notes contain ":trigger_value"',
- 'rule_trigger_attachment_notes_starts_choice' => 'Any attachment\'s notes start with..',
- 'rule_trigger_attachment_notes_starts' => 'Any attachment\'s notes start with ":trigger_value"',
- 'rule_trigger_attachment_notes_ends_choice' => 'Any attachment\'s notes end with..',
- 'rule_trigger_attachment_notes_ends' => 'Any attachment\'s notes end with ":trigger_value"',
+ 'rule_trigger_book_date_on_choice' => 'Buchungstermin ist am..',
+ 'rule_trigger_book_date_on' => 'Buchungstermin ist am ":trigger_value"',
+ 'rule_trigger_book_date_before_choice' => 'Buchungstermin ist vor dem..',
+ 'rule_trigger_book_date_before' => 'Buchungstermin ist vor dem ":trigger_value"',
+ 'rule_trigger_book_date_after_choice' => 'Buchungstermin ist nach dem..',
+ 'rule_trigger_book_date_after' => 'Buchungstermin ist nach dem ":trigger_value"',
+ 'rule_trigger_process_date_on_choice' => 'Erfassungsdatum ist am..',
+ 'rule_trigger_process_date_on' => 'Erfassungsdatum lautet ":trigger_value"',
+ 'rule_trigger_process_date_before_choice' => 'Erfassungsdatum ist vor dem..',
+ 'rule_trigger_process_date_before' => 'Erfassungsdatum ist vor dem ":trigger_value"',
+ 'rule_trigger_process_date_after_choice' => 'Erfassungsdatum ist nach dem..',
+ 'rule_trigger_process_date_after' => 'Erfassungsdatum ist nach dem ":trigger_value"',
+ 'rule_trigger_due_date_on_choice' => 'Fälligkeitstermin ist am..',
+ 'rule_trigger_due_date_on' => 'Fälligkeitstermin ist am ":trigger_value"',
+ 'rule_trigger_due_date_before_choice' => 'Fälligkeitstermin ist vor dem..',
+ 'rule_trigger_due_date_before' => 'Fälligkeitstermin ist vor dem ":trigger_value"',
+ 'rule_trigger_due_date_after_choice' => 'Fälligkeitstermin ist nach dem..',
+ 'rule_trigger_due_date_after' => 'Fälligkeitstermin ist nach dem ":trigger_value"',
+ 'rule_trigger_payment_date_on_choice' => 'Zahlungsdatum ist am..',
+ 'rule_trigger_payment_date_on' => 'Zahlungsdatum ist am ":trigger_value"',
+ 'rule_trigger_payment_date_before_choice' => 'Zahlungsdatum ist vor dem..',
+ 'rule_trigger_payment_date_before' => 'Zahlungsdatum ist vor dem ":trigger_value"',
+ 'rule_trigger_payment_date_after_choice' => 'Zahlungsdatum ist nach..',
+ 'rule_trigger_payment_date_after' => 'Zahlungsdatum ist nach dem ":trigger_value"',
+ 'rule_trigger_invoice_date_on_choice' => 'Rechnungsdatum ist am..',
+ 'rule_trigger_invoice_date_on' => 'Rechnungsdatum ist am ":trigger_value"',
+ 'rule_trigger_invoice_date_before_choice' => 'Rechnungsdatum ist vor dem..',
+ 'rule_trigger_invoice_date_before' => 'Rechnungsdatum ist vor dem ":trigger_value"',
+ 'rule_trigger_invoice_date_after_choice' => 'Rechnungsdatum ist nach dem..',
+ 'rule_trigger_invoice_date_after' => 'Rechnungsdatum ist nach dem ":trigger_value"',
+ 'rule_trigger_created_at_before_choice' => 'Transaktion wurde erstellt vor dem..',
+ 'rule_trigger_created_at_before' => 'Transaktion wurde erstellt vor dem ":trigger_value"',
+ 'rule_trigger_created_at_after_choice' => 'Transaktion wurde erstellt nach dem..',
+ 'rule_trigger_created_at_after' => 'Transaktion wurde erstellt nach dem ":trigger_value"',
+ 'rule_trigger_updated_at_before_choice' => 'Transaktion wurde zuletzt aktualisiert vor dem..',
+ 'rule_trigger_updated_at_before' => 'Transaktion wurde zuletzt aktualisiert vor dem ":trigger_value"',
+ 'rule_trigger_updated_at_after_choice' => 'Transaktion wurde zuletzt aktualisiert nach dem..',
+ 'rule_trigger_updated_at_after' => 'Transaktion wurde zuletzt aktualisiert nach dem ":trigger_value"',
+ 'rule_trigger_foreign_amount_is_choice' => 'Fremdbetrag ist exakt..',
+ 'rule_trigger_foreign_amount_is' => 'Fremdbetrag ist exakt ":trigger_value"',
+ 'rule_trigger_foreign_amount_less_choice' => 'Fremdbetrag ist geringer als..',
+ 'rule_trigger_foreign_amount_less' => 'Fremdbetrag ist geringer als ":trigger_value"',
+ 'rule_trigger_foreign_amount_more_choice' => 'Fremdbetrag ist höher als..',
+ 'rule_trigger_foreign_amount_more' => 'Fremdbetrag ist höher als ":trigger_value"',
+ 'rule_trigger_attachment_name_is_choice' => 'Der Name eines Anhangs lautet..',
+ 'rule_trigger_attachment_name_is' => 'Der Name eines Anhangs lautet ":trigger_value"',
+ 'rule_trigger_attachment_name_contains_choice' => 'Der Name eines Anhangs beinhaltet..',
+ 'rule_trigger_attachment_name_contains' => 'Der Name eines Anhangs beinhaltet ":trigger_value"',
+ 'rule_trigger_attachment_name_starts_choice' => 'Der Name eines Anhangs beginnt mit..',
+ 'rule_trigger_attachment_name_starts' => 'Der Name eines Anhangs beginnt mit ":trigger_value"',
+ 'rule_trigger_attachment_name_ends_choice' => 'Der Name eines Anhangs endet mit..',
+ 'rule_trigger_attachment_name_ends' => 'Der Name eines Anhangs endet mit ":trigger_value"',
+ 'rule_trigger_attachment_notes_are_choice' => 'Notizen des Anhangs lauten..',
+ 'rule_trigger_attachment_notes_are' => 'Notizen des Anhangs lauten ":trigger_value"',
+ 'rule_trigger_attachment_notes_contains_choice' => 'Notizen des Anhangs beinhalten..',
+ 'rule_trigger_attachment_notes_contains' => 'Notizen des Anhangs beinhalten ":trigger_value"',
+ 'rule_trigger_attachment_notes_starts_choice' => 'Notizen des Anhangs beginnen mit..',
+ 'rule_trigger_attachment_notes_starts' => 'Notizen des Anhangs beginnen mit ":trigger_value"',
+ 'rule_trigger_attachment_notes_ends_choice' => 'Notizen des Anhangs enden mit..',
+ 'rule_trigger_attachment_notes_ends' => 'Notizen des Anhangs enden mit ":trigger_value"',
// actions
'rule_action_delete_transaction_choice' => 'Buchung löschen (!)',
@@ -1310,10 +1310,10 @@ return [
'running_again_loss' => 'Zuvor verknüpfte Buchungen mit dieser Rechnung können ihre Verbindung verlieren, wenn sie (nicht mehr) der/den Regel(n) entsprechen.',
'bill_related_rules' => 'Regeln mit Verknüpfung zu dieser Rechnung',
'repeats' => 'Wiederholungen',
- 'bill_end_date_help' => 'Optional field. The bill is expected to end on this date.',
- 'bill_extension_date_help' => 'Optional field. The bill must be extended (or cancelled) on or before this date.',
- 'bill_end_index_line' => 'This bill ends on :date',
- 'bill_extension_index_line' => 'This bill must be extended or cancelled on :date',
+ 'bill_end_date_help' => 'Optionales Feld. Die Rechnung wird voraussichtlich an diesem Datum enden.',
+ 'bill_extension_date_help' => 'Optionales Feld. Die Rechnung muss an oder vor diesem Datum verlängert (oder storniert) werden.',
+ 'bill_end_index_line' => 'Diese Rechnung endet am :date',
+ 'bill_extension_index_line' => 'Diese Rechnung muss am :date verlängert oder storniert werden',
'connected_journals' => 'Verknüpfte Buchungen',
'auto_match_on' => 'Automatisch von Firefly III zugeordnet',
'auto_match_off' => 'Nicht automatisch von Firefly III zugeordnet',
diff --git a/resources/lang/el_GR/config.php b/resources/lang/el_GR/config.php
index bcbe4e13e6..079ebbbf6b 100644
--- a/resources/lang/el_GR/config.php
+++ b/resources/lang/el_GR/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/el_GR/email.php b/resources/lang/el_GR/email.php
index 562383589a..58fd63d759 100644
--- a/resources/lang/el_GR/email.php
+++ b/resources/lang/el_GR/email.php
@@ -65,9 +65,9 @@ return [
'email_change_body_to_old' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you **must** follow the "undo"-link below to protect your account!',
'email_change_ignore' => 'Αν ξεκινήσατε αυτήν την αλλαγή, μπορείτε να αγνοήσετε με ασφάλεια αυτό το μήνυμα.',
'email_change_old' => 'Η παλιά διεύθυνση ηλεκτρονικού ταχυδρομείου ήταν: :email',
- 'email_change_old_strong' => 'The old email address was: **:email**',
+ 'email_change_old_strong' => 'Η παλιά διεύθυνση ηλεκτρονικού ταχυδρομείου ήταν: **:email**',
'email_change_new' => 'Η νέα διεύθυνση ηλεκτρονικού ταχυδρομείου είναι: :email',
- 'email_change_new_strong' => 'The new email address is: **:email**',
+ 'email_change_new_strong' => 'Η νέα διεύθυνση ηλεκτρονικού ταχυδρομείου είναι: **:email**',
'email_change_instructions' => 'Δεν μπορείτε να χρησιμοποιήσετε το Firefly III μέχρι να επιβεβαιώσετε αυτήν την αλλαγή. Ακολουθήστε τον παρακάτω σύνδεσμο για να το κάνετε.',
'email_change_undo_link' => 'Για να αναιρέσετε την αλλαγή, ακολουθήστε αυτόν τον σύνδεσμο:',
diff --git a/resources/lang/el_GR/errors.php b/resources/lang/el_GR/errors.php
index d705e18084..4ea68c8cf1 100644
--- a/resources/lang/el_GR/errors.php
+++ b/resources/lang/el_GR/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Επιστρέφω αμέσως!',
'check_back' => 'Το Firefly III είναι εκτός λειτουργίας για κάποια απαραίτητη συντήρηση. Ελέγξτε ξανά σε ένα δευτερόλεπτο.',
'error_occurred' => 'Ωχ! Παρουσιάστηκε σφάλμα.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Δυστυχώς, αυτό το σφάλμα δεν ήταν δυνατό να ξεπεραστεί :(. Το Firefly III δε λειτουργεί. Το σφάλμα είναι:',
'error' => 'Σφάλμα',
'error_location' => 'Αυτό το σφάλμα προέκυψε στο αρχείο :file στη γραμμή :line με κώδικα :code.',
diff --git a/resources/lang/el_GR/firefly.php b/resources/lang/el_GR/firefly.php
index cf520267e6..f8e131231e 100644
--- a/resources/lang/el_GR/firefly.php
+++ b/resources/lang/el_GR/firefly.php
@@ -31,7 +31,7 @@ return [
'split' => 'Διαχωρισμός',
'single_split' => 'Διαχωρισμός',
'clone' => 'Κλωνοποίηση',
- 'confirm_action' => 'Confirm action',
+ 'confirm_action' => 'Επιβεβαίωση ενέργειας',
'last_seven_days' => 'Τελευταίες επτά ημέρες',
'last_thirty_days' => 'Τελευταίες τριάντα ημέρες',
'last_180_days' => 'Τελευταίες 180 ημέρες',
@@ -315,7 +315,7 @@ return [
'search_modifier_notes_is' => 'The transaction notes are exactly ":value"',
'search_modifier_no_notes' => 'Η συναλλαγή δεν έχει σημειώσεις',
'search_modifier_any_notes' => 'Η συναλλαγή πρέπει να έχει σημειώσεις',
- 'search_modifier_amount_is' => 'Amount is exactly :value',
+ 'search_modifier_amount_is' => 'Το ποσό είναι ακριβώς :value',
'search_modifier_amount_less' => 'Το ποσό είναι μικρότερο ή ίσο με :value',
'search_modifier_amount_more' => 'Το ποσό είναι μεγαλύτερο ή ίσο με :value',
'search_modifier_source_account_is' => 'Το όνομα του λογαριασμού προέλευσης είναι ακριβώς ":value"',
@@ -344,9 +344,9 @@ return [
'search_modifier_bill_is' => 'Το πάγιο έξοδο είναι ":value"',
'search_modifier_transaction_type' => 'Ο τύπος συναλλαγής είναι ":value"',
'search_modifier_tag_is' => 'Η ετικέτα είναι ":value"',
- 'search_modifier_date_on_year' => 'Transaction is in year ":value"',
- 'search_modifier_date_on_month' => 'Transaction is in month ":value"',
- 'search_modifier_date_on_day' => 'Transaction is on day of month ":value"',
+ 'search_modifier_date_on_year' => 'Η συναλλαγή είναι στο έτος ":value"',
+ 'search_modifier_date_on_month' => 'Η συναλλαγή είναι στον μήνα ":value"',
+ 'search_modifier_date_on_day' => 'Η συναλλαγή είναι την ημέρα του μήνα ":value"',
'search_modifier_date_before_year' => 'Η συναλλαγή είναι πριν ή μέσα στο έτος ":value"',
'search_modifier_date_before_month' => 'Η συναλλαγή είναι πριν ή μέσα στο μήνα ":value"',
'search_modifier_date_before_day' => 'Η συναλλαγή είναι πριν ή την ημέρα του μήνα ":value"',
@@ -356,7 +356,7 @@ return [
// new
- 'search_modifier_tag_is_not' => 'No tag is ":value"',
+ 'search_modifier_tag_is_not' => 'Δεν υπάρχει ετικέτα ":value"',
'search_modifier_account_is' => 'Either account is ":value"',
'search_modifier_account_contains' => 'Either account contains ":value"',
@@ -366,12 +366,12 @@ return [
'search_modifier_account_nr_contains' => 'Either account number / IBAN contains ":value"',
'search_modifier_account_nr_ends' => 'Either account number / IBAN ends with ":value"',
'search_modifier_account_nr_starts' => 'Either account number / IBAN starts with ":value"',
- 'search_modifier_category_contains' => 'Category contains ":value"',
- 'search_modifier_category_ends' => 'Category ends with ":value"',
- 'search_modifier_category_starts' => 'Category starts with ":value"',
- 'search_modifier_budget_contains' => 'Budget contains ":value"',
- 'search_modifier_budget_ends' => 'Budget ends with ":value"',
- 'search_modifier_budget_starts' => 'Budget starts with ":value"',
+ 'search_modifier_category_contains' => 'Η κατηγορία περιέχει ":value"',
+ 'search_modifier_category_ends' => 'Η κατηγορία τελειώνει σε ":value"',
+ 'search_modifier_category_starts' => 'Η κατηγορία αρχίζει με ":value"',
+ 'search_modifier_budget_contains' => 'Ο προϋπολογισμός περιέχει ":value"',
+ 'search_modifier_budget_ends' => 'Ο προϋπολογισμός τελειώνει σε ":value"',
+ 'search_modifier_budget_starts' => 'Ο προϋπολογισμός αρχίζει με ":value"',
'search_modifier_bill_contains' => 'Bill contains ":value"',
'search_modifier_bill_ends' => 'Bill ends with ":value"',
'search_modifier_bill_starts' => 'Bill starts with ":value"',
@@ -671,8 +671,8 @@ return [
'rule_trigger_updated_at_on' => 'Transaction was last edited on ":trigger_value"',
'rule_trigger_budget_is_choice' => 'Ο προϋπολογισμός είναι..',
'rule_trigger_budget_is' => 'Ο προϋπολογισμός είναι ":trigger_value"',
- 'rule_trigger_tag_is_choice' => 'Any tag is..',
- 'rule_trigger_tag_is' => 'Any tag is ":trigger_value"',
+ 'rule_trigger_tag_is_choice' => 'Οποιαδήποτε ετικέτα είναι..',
+ 'rule_trigger_tag_is' => 'Οποιαδήποτε ετικέτα είναι ":trigger_value"',
'rule_trigger_currency_is_choice' => 'Το νόμισμα της συναλλαγής είναι..',
'rule_trigger_currency_is' => 'Το νόμισμα της συναλλαγής είναι ":trigger_value"',
'rule_trigger_foreign_currency_is_choice' => 'Το ξένο νόμισμα της συναλλαγής είναι..',
@@ -699,11 +699,11 @@ return [
'rule_trigger_any_notes' => 'Η συναλλαγή έχει (οποιεσδήποτε) σημειώσεις',
'rule_trigger_no_notes_choice' => 'Δεν έχει σημειώσεις',
'rule_trigger_no_notes' => 'Η συναλλαγή δεν έχει σημειώσεις',
- 'rule_trigger_notes_is_choice' => 'Notes are..',
- 'rule_trigger_notes_is' => 'Notes are ":trigger_value"',
- 'rule_trigger_notes_contains_choice' => 'Notes contain..',
- 'rule_trigger_notes_contains' => 'Notes contain ":trigger_value"',
- 'rule_trigger_notes_starts_choice' => 'Notes start with..',
+ 'rule_trigger_notes_is_choice' => 'Οι σημειώσεις είναι..',
+ 'rule_trigger_notes_is' => 'Οι σημειώσεις είναι ":trigger_value"',
+ 'rule_trigger_notes_contains_choice' => 'Οι σημειώσεις περιέχουν..',
+ 'rule_trigger_notes_contains' => 'Οι σημειώσεις περιέχουν ":trigger_value"',
+ 'rule_trigger_notes_starts_choice' => 'Οι σημειώσεις αρχίζουν με..',
'rule_trigger_notes_starts' => 'Notes start with ":trigger_value"',
'rule_trigger_notes_ends_choice' => 'Notes end with..',
'rule_trigger_notes_ends' => 'Notes end with ":trigger_value"',
@@ -732,8 +732,8 @@ return [
'rule_trigger_account_contains' => 'Either account contains ":trigger_value"',
'rule_trigger_account_ends_choice' => 'Either account ends with..',
'rule_trigger_account_ends' => 'Either account ends with ":trigger_value"',
- 'rule_trigger_account_starts_choice' => 'Either account starts with..',
- 'rule_trigger_account_starts' => 'Either account starts with ":trigger_value"',
+ 'rule_trigger_account_starts_choice' => 'Οποιοσδήποτε λογαριασμός αρχίζει με..',
+ 'rule_trigger_account_starts' => 'Οποιοσδήποτε λογαριασμός αρχίζει με ":trigger_value"',
'rule_trigger_account_nr_is_choice' => 'Either account number / IBAN is..',
'rule_trigger_account_nr_is' => 'Either account number / IBAN is ":trigger_value"',
'rule_trigger_account_nr_contains_choice' => 'Either account number / IBAN contains..',
diff --git a/resources/lang/en_GB/config.php b/resources/lang/en_GB/config.php
index 5d9a497a01..5a96a15e90 100644
--- a/resources/lang/en_GB/config.php
+++ b/resources/lang/en_GB/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/en_GB/errors.php b/resources/lang/en_GB/errors.php
index b63c231504..a62e78ebcf 100644
--- a/resources/lang/en_GB/errors.php
+++ b/resources/lang/en_GB/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Be right back!',
'check_back' => 'Firefly III is down for some necessary maintenance. Please check back in a second.',
'error_occurred' => 'Whoops! An error occurred.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Unfortunately, this error was not recoverable :(. Firefly III broke. The error is:',
'error' => 'Error',
'error_location' => 'This error occured in file :file on line :line with code :code.',
diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php
index d0e1be9b49..deb62f0c6d 100644
--- a/resources/lang/en_US/config.php
+++ b/resources/lang/en_US/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php
index bdc5c70330..93411d53d6 100644
--- a/resources/lang/es_ES/config.php
+++ b/resources/lang/es_ES/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Trimestre' Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/es_ES/errors.php b/resources/lang/es_ES/errors.php
index d0f907c177..34f3a80f16 100644
--- a/resources/lang/es_ES/errors.php
+++ b/resources/lang/es_ES/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => '¡Enseguida vuelvo!',
'check_back' => 'Firefly III está apagado para el mantenimiento necesario. Por favor, vuelva en un segundo.',
'error_occurred' => '¡Uy! un error ha ocurrido.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Desafortunadamente, este error no se pudo recuperar :(. Firefly III se rompió. El error es:',
'error' => 'Error',
'error_location' => 'Este error ocurrió en el archivo ":file" en línea :line con código :code.',
diff --git a/resources/lang/fi_FI/config.php b/resources/lang/fi_FI/config.php
index ae7c1b55a9..4515d84a1c 100644
--- a/resources/lang/fi_FI/config.php
+++ b/resources/lang/fi_FI/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/fi_FI/errors.php b/resources/lang/fi_FI/errors.php
index 2a724855b3..1d5fcfd54a 100644
--- a/resources/lang/fi_FI/errors.php
+++ b/resources/lang/fi_FI/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Palaan pian!',
'check_back' => 'Firefly III tekee joitain tarpeellisia huoltotoimenpiteitä. Ole hyvä ja yritä uudelleen hetken kuluttua.',
'error_occurred' => 'Hupsista! Tapahtui virhe.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Valitettavasti tästä virheestä ei pystytä palautumaan :(. Firefly III meni rikki. Virhe on:',
'error' => 'Virhe',
'error_location' => 'Tämä virhe tapahtui tiedostossa :file rivillä :line koodilla :code.',
diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php
index 45f923e332..2b72dd942c 100644
--- a/resources/lang/fr_FR/config.php
+++ b/resources/lang/fr_FR/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/fr_FR/errors.php b/resources/lang/fr_FR/errors.php
index db79262883..7da4b907e5 100644
--- a/resources/lang/fr_FR/errors.php
+++ b/resources/lang/fr_FR/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Je reviens tout de suite !',
'check_back' => 'Firefly III est fermé pour cause de maintenace. Veuillez revenir dans une seconde.',
'error_occurred' => 'Oups ! Une erreur est survenue.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Malheureusement, cette erreur n\'a pas pu être récupérée :(. Firefly III s\'est cassé. L\'erreur est :',
'error' => 'Erreur',
'error_location' => 'Cette erreur est survenue dans le fichier ":file" à la ligne :line avec le code :code.',
diff --git a/resources/lang/hu_HU/config.php b/resources/lang/hu_HU/config.php
index f160be11d2..a22c202c31 100644
--- a/resources/lang/hu_HU/config.php
+++ b/resources/lang/hu_HU/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'YYYY Q',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/hu_HU/errors.php b/resources/lang/hu_HU/errors.php
index c72e009719..a1d9aca144 100644
--- a/resources/lang/hu_HU/errors.php
+++ b/resources/lang/hu_HU/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Rögtön jövök!',
'check_back' => 'FireFly III jelenleg karbantartás alatt. Kérem látogasson vissza később.',
'error_occurred' => 'Hoppá! Hiba történt.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Sajnos a hiba után nem sikerült visszaállni :(. A futás megszakadt. A hiba:',
'error' => 'Hiba',
'error_location' => 'Hiba a :file fájl :line sorában a :code kódnál.',
diff --git a/resources/lang/id_ID/config.php b/resources/lang/id_ID/config.php
index 1c13eb9489..73994bafd9 100644
--- a/resources/lang/id_ID/config.php
+++ b/resources/lang/id_ID/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/id_ID/errors.php b/resources/lang/id_ID/errors.php
index 39e57b9bbd..468d67b0a1 100644
--- a/resources/lang/id_ID/errors.php
+++ b/resources/lang/id_ID/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Segera kembali!',
'check_back' => 'Firefly III tidak dapat diakses untuk pemeliharaan. Silakan cek kembali beberapa saat lagi.',
'error_occurred' => 'Ups! Terjadi kesalahan.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Sayangnya, kesalahan ini tidak dapat diperbaiki :(. Firefly III mengalami kerusakan. Kesalahan yang terjadi adalah:',
'error' => 'Kesalahan',
'error_location' => 'Kesalahan ini terjadi pada file ":file" pada baris :line dengan kode :code.',
diff --git a/resources/lang/it_IT/config.php b/resources/lang/it_IT/config.php
index a585d544ce..a1fe53d8d3 100644
--- a/resources/lang/it_IT/config.php
+++ b/resources/lang/it_IT/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'T'Q yyyy",
'half_year_fns' => "'S{half}' yyyy",
diff --git a/resources/lang/it_IT/errors.php b/resources/lang/it_IT/errors.php
index f76d90e87d..fd4f4688b6 100644
--- a/resources/lang/it_IT/errors.php
+++ b/resources/lang/it_IT/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Torno subito!',
'check_back' => 'Firefly III non è in funzione per una manutenzione necessaria. Ricontrolla tra qualche secondo.',
'error_occurred' => 'Ops! Si è verificato un errore.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Sfortunatamente questo errore non è riparabile :(. Firefly III è rotto. L\'errore è:',
'error' => 'Errore',
'error_location' => 'Questo errore si è verificato nel file :file alla riga :line con codice :code.',
diff --git a/resources/lang/ja_JP/config.php b/resources/lang/ja_JP/config.php
index a2d6119b69..9bd070d2d1 100644
--- a/resources/lang/ja_JP/config.php
+++ b/resources/lang/ja_JP/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY年',
//'half_year' => '%B %Y',
- 'half_year_js' => 'YYYY年第Q四半期',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "yyyy年第Q四半期",
'half_year_fns' => "yyyy年H[半期]",
diff --git a/resources/lang/ja_JP/errors.php b/resources/lang/ja_JP/errors.php
index cdb0424f79..0ade79cc77 100644
--- a/resources/lang/ja_JP/errors.php
+++ b/resources/lang/ja_JP/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'メンテナンスはすぐに終わります。',
'check_back' => '必要なメンテナンスを行っているため、Firefly IIIは一時停止しています。しばらくしてからもう一度確認してください。',
'error_occurred' => '申し訳ありません。エラーが発生しました。',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => '残念ながら、このエラーは回復不可能です。Firefly IIIは故障しました。エラーログは以下の通りです:',
'error' => 'エラー',
'error_location' => 'このエラーは、ファイル「:file」 :line 行目のコード :code で発生しました。',
diff --git a/resources/lang/nb_NO/config.php b/resources/lang/nb_NO/config.php
index e9b70c9e5a..fdc75dafa8 100644
--- a/resources/lang/nb_NO/config.php
+++ b/resources/lang/nb_NO/config.php
@@ -54,7 +54,7 @@ CONTEXTREQUEST',
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/nb_NO/errors.php b/resources/lang/nb_NO/errors.php
index 3916c20266..1f5c35f447 100644
--- a/resources/lang/nb_NO/errors.php
+++ b/resources/lang/nb_NO/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Er straks tilbake!',
'check_back' => 'Firefly III er nede for nødvendig vedlikehold. Vennligst sjekk tilbake om en stund.',
'error_occurred' => 'Beklager, en feil har oppstått.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Dessverre ble ikke denne feilen fikset :(. Firefly III ødelagt. Feilen er:',
'error' => 'Feil',
'error_location' => 'Denne feilen oppstod i filen :file på linje :line med kode :code.',
diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php
index d8541072d3..95c3496176 100644
--- a/resources/lang/nl_NL/config.php
+++ b/resources/lang/nl_NL/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/nl_NL/errors.php b/resources/lang/nl_NL/errors.php
index c845cdcf7e..eef93af388 100644
--- a/resources/lang/nl_NL/errors.php
+++ b/resources/lang/nl_NL/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Zo terug!',
'check_back' => 'Firefly III is offline voor onderhoud. Kom later terug.',
'error_occurred' => 'Oeps! Er is een fout opgetreden.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Helaas was deze fout niet te herstellen :(. Firefly III is stuk. De fout is:',
'error' => 'Fout',
'error_location' => 'De fout is opgetreden in bestand :file op regel :line met code :code.',
diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php
index 7f8aa06d4a..e9ae93a01b 100644
--- a/resources/lang/pl_PL/config.php
+++ b/resources/lang/pl_PL/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "Q 'kwartał' yyyy",
'half_year_fns' => "'{half} połowa' yyyy",
diff --git a/resources/lang/pl_PL/errors.php b/resources/lang/pl_PL/errors.php
index 3d2b127e1b..d340a81fe0 100644
--- a/resources/lang/pl_PL/errors.php
+++ b/resources/lang/pl_PL/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Zaraz wracam!',
'check_back' => 'Firefly III jest wyłączony na potrzeby wymaganej konserwacji. Sprawdź ponownie za sekundę.',
'error_occurred' => 'Ups! Wystąpił błąd.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Niestety, nie mogliśmy się pozbierać po tym błędzie :(. Firefly III się popsuło. Błąd to:',
'error' => 'Błąd',
'error_location' => 'Błąd wystąpił w pliku :file linia :line z kodem :code.',
diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php
index 25c15e351f..ae9c4c7d7f 100644
--- a/resources/lang/pt_BR/config.php
+++ b/resources/lang/pt_BR/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'T'Q, yyyy",
'half_year_fns' => "'S{half}', yyyy",
diff --git a/resources/lang/pt_BR/errors.php b/resources/lang/pt_BR/errors.php
index 5309c1b147..74498ddd50 100644
--- a/resources/lang/pt_BR/errors.php
+++ b/resources/lang/pt_BR/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Volto já!',
'check_back' => 'Firefly III está fora do ar devido a manutenção necessária. Acesse novamente em alguns instantes.',
'error_occurred' => 'Ops! Aconteceu um erro.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Infelizmente este erro não é recuperável :(. Firefly III quebrou. O erro é:',
'error' => 'Erro',
'error_location' => 'Esse erro ocorreu no arquivo ":file", na linha :line com o código :code.',
diff --git a/resources/lang/pt_PT/config.php b/resources/lang/pt_PT/config.php
index fb3c703743..abea86f4af 100644
--- a/resources/lang/pt_PT/config.php
+++ b/resources/lang/pt_PT/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Trimestre' Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/pt_PT/errors.php b/resources/lang/pt_PT/errors.php
index 67ca3a8f8f..5f3c638799 100644
--- a/resources/lang/pt_PT/errors.php
+++ b/resources/lang/pt_PT/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Volto já!',
'check_back' => 'Firefly III está desligado para manutenção. Volte já a seguir.',
'error_occurred' => 'Oops! Ocorreu um erro.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Infelizmente, este erro não era recuperável :(. Firefly III avariou. O erro é:',
'error' => 'Erro',
'error_location' => 'O erro ocorreu no ficheiro ":file" na linha :line com o código :code.',
diff --git a/resources/lang/ro_RO/config.php b/resources/lang/ro_RO/config.php
index f9b525aa81..57fe7d6918 100644
--- a/resources/lang/ro_RO/config.php
+++ b/resources/lang/ro_RO/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyy",
diff --git a/resources/lang/ro_RO/errors.php b/resources/lang/ro_RO/errors.php
index e5b81e5f79..2ef8b98bca 100644
--- a/resources/lang/ro_RO/errors.php
+++ b/resources/lang/ro_RO/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Revin imediat!',
'check_back' => 'Firefly III este oprit pentru o întreținere necesară. Vă rugăm să reveniți într-o secundă.',
'error_occurred' => 'Ups! A apărut o eroare.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Din păcate, această eroare nu a putut fi recuperată :(. Firefly III s-a stricat. Eroarea este:',
'error' => 'Eroare',
'error_location' => 'Această eroare a apărut în fișierul ":file" pe linia :line cu codul :code.',
diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php
index c1d64bf7f6..baeeb99a0f 100644
--- a/resources/lang/ru_RU/config.php
+++ b/resources/lang/ru_RU/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/ru_RU/errors.php b/resources/lang/ru_RU/errors.php
index 777bf9b244..1b87722e01 100644
--- a/resources/lang/ru_RU/errors.php
+++ b/resources/lang/ru_RU/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Временно недоступен!',
'check_back' => 'Firefly III отключён для необходимого обслуживания. Пожалуйста, зайдите через секунду.',
'error_occurred' => 'Упс! Произошла ошибка.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'К сожалению, эта ошибка не была исправлена :(. Firefly III сломался. Ошибка:',
'error' => 'Ошибка',
'error_location' => 'Эта ошибка произошла в файле :file в строке :line с кодом :code.',
diff --git a/resources/lang/sk_SK/config.php b/resources/lang/sk_SK/config.php
index 0f701bde92..2240bd8e99 100644
--- a/resources/lang/sk_SK/config.php
+++ b/resources/lang/sk_SK/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/sk_SK/errors.php b/resources/lang/sk_SK/errors.php
index 64b770e77b..32c61a9ec4 100644
--- a/resources/lang/sk_SK/errors.php
+++ b/resources/lang/sk_SK/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Hneď sme späť!',
'check_back' => 'Firefly III je nedostupný kvôli nevyhnutnej údržbe. Prosím, skúste to neskôr.',
'error_occurred' => 'Ups! Vyskytla sa chyba.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Nanešťastie, túto chybu nie je možné opraviť :(. Firefly III sa pokazil. Chyba:',
'error' => 'Chyba',
'error_location' => 'Chyba nastala v súbore ":file" na riadku :line s kódom :code.',
diff --git a/resources/lang/sv_SE/config.php b/resources/lang/sv_SE/config.php
index a0ad62334e..ff114336dc 100644
--- a/resources/lang/sv_SE/config.php
+++ b/resources/lang/sv_SE/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'kvartal'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/sv_SE/errors.php b/resources/lang/sv_SE/errors.php
index 1db6f4050e..fee2c9ddf0 100644
--- a/resources/lang/sv_SE/errors.php
+++ b/resources/lang/sv_SE/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Strax tillbaka!',
'check_back' => 'Firefly III är nere för nödvändigt underhåll. Vänligen kom tillbaka om en liten stund.',
'error_occurred' => 'Hoppsan! Ett fel uppstod.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Oturligt nog har ett återkalligt fel skett :(. Firefly III har gått sönder. Felet är:',
'error' => 'Fel',
'error_location' => 'Detta fel inträffade i filen :file på rad :line med kod :code.',
diff --git a/resources/lang/tr_TR/config.php b/resources/lang/tr_TR/config.php
index 91947a4cde..233e137362 100644
--- a/resources/lang/tr_TR/config.php
+++ b/resources/lang/tr_TR/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/tr_TR/errors.php b/resources/lang/tr_TR/errors.php
index 710b0a788b..4741a30cb1 100644
--- a/resources/lang/tr_TR/errors.php
+++ b/resources/lang/tr_TR/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Hemen dönecek!',
'check_back' => 'Firefly III gerekli bakım için hazır. Lütfen bir saniye sonra tekrar kontrol edin.',
'error_occurred' => 'Hoppala! Bir hata oluştu.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Ne yazık ki, bu hata kurtarılamadı :(. Ateşböceği III kırıldı. Hata şu şekildedir:',
'error' => 'Hata',
'error_location' => 'Bu hata dosyada oluştu:file on line :line with code :code.',
diff --git a/resources/lang/vi_VN/config.php b/resources/lang/vi_VN/config.php
index c479681255..27e8d47644 100644
--- a/resources/lang/vi_VN/config.php
+++ b/resources/lang/vi_VN/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/vi_VN/errors.php b/resources/lang/vi_VN/errors.php
index e1948fb25f..004ac1cd2c 100644
--- a/resources/lang/vi_VN/errors.php
+++ b/resources/lang/vi_VN/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Sẽ quay lại ngay!',
'check_back' => 'Firefly III ngừng hoạt động để bảo trì. Vui lòng kiểm tra lại sau một giây.',
'error_occurred' => 'Rất tiếc! Lỗi xảy ra.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Thật không may, lỗi này không thể phục hồi :(. Firefly III đã bị hỏng. Lỗi là:',
'error' => 'Lỗi',
'error_location' => 'Lỗi này xảy ra trong tập tin :file dòng :line code :code.',
diff --git a/resources/lang/zh_CN/config.php b/resources/lang/zh_CN/config.php
index f1eb57b1dd..31106b95fe 100644
--- a/resources/lang/zh_CN/config.php
+++ b/resources/lang/zh_CN/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'YYYY年 第Q季度',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/zh_CN/errors.php b/resources/lang/zh_CN/errors.php
index c5f02b4088..0ec6a72966 100644
--- a/resources/lang/zh_CN/errors.php
+++ b/resources/lang/zh_CN/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => '敬请期待！',
'check_back' => 'Firefly III 正在进行必要的维护，请稍后再试',
'error_occurred' => '很抱歉，出现错误',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => '很遗憾，该错误无法恢复 :( Firefly III 已崩溃。错误信息：',
'error' => '错误',
'error_location' => '该错误位于文件 :file 第 :line 行的代码 :code',
diff --git a/resources/lang/zh_TW/config.php b/resources/lang/zh_TW/config.php
index 9bd0f0c14d..8c705c387a 100644
--- a/resources/lang/zh_TW/config.php
+++ b/resources/lang/zh_TW/config.php
@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
- 'half_year_js' => 'Q YYYY',
+ 'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
diff --git a/resources/lang/zh_TW/errors.php b/resources/lang/zh_TW/errors.php
index b63c231504..a62e78ebcf 100644
--- a/resources/lang/zh_TW/errors.php
+++ b/resources/lang/zh_TW/errors.php
@@ -33,6 +33,7 @@ return [
'be_right_back' => 'Be right back!',
'check_back' => 'Firefly III is down for some necessary maintenance. Please check back in a second.',
'error_occurred' => 'Whoops! An error occurred.',
+ 'db_error_occurred' => 'Whoops! A database error occurred.',
'error_not_recoverable' => 'Unfortunately, this error was not recoverable :(. Firefly III broke. The error is:',
'error' => 'Error',
'error_location' => 'This error occured in file :file on line :line with code :code.',
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 555140d32c..aedf826479 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -228,17 +228,6 @@
 }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&rec=1)
{% endif %}
-
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index c72672279f..516e82c9f7 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -61,17 +61,5 @@
{% endif %}
-
-