Merge branch 'release/5.7.14'

This commit is contained in:
James Cole 2022-10-18 21:13:43 +02:00
commit f7b66a048a
79 changed files with 274 additions and 177 deletions

View File

@ -12,6 +12,9 @@ SITE_OWNER=mail@example.com
# The encryption key for your sessions. Keep this very secure.
# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
#
# Avoid the "#" character in your APP_KEY, it may break things.
#
APP_KEY=SomeRandomStringOf32CharsExactly
# Firefly III will launch using this language (for new users and unauthenticated visitors)

View File

@ -61,6 +61,7 @@ class CorrectDatabase extends Command
'firefly-iii:create-link-types',
'firefly-iii:create-access-tokens',
'firefly-iii:remove-bills',
'firefly-iii:fix-negative-limits',
'firefly-iii:enable-currencies',
'firefly-iii:fix-transfer-budgets',
'firefly-iii:fix-uneven-amount',

View File

@ -0,0 +1,67 @@
<?php
/*
* FixBudgetLimits.php
* Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands\Correction;
use DB;
use FireflyIII\Models\BudgetLimit;
use Illuminate\Console\Command;
/**
* Class CorrectionSkeleton
*/
class FixBudgetLimits extends Command
{
/**
* The console command description.
*
* @var string
*/
protected $description = 'Fixes negative budget limits';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly-iii:fix-negative-limits';
/**
* Execute the console command.
*
* @return int
*/
public function handle(): int
{
$set = BudgetLimit::where('amount', '<', '0')->get();
if (0 === $set->count()) {
$this->info('All budget limits are OK.');
return 0;
}
$count = BudgetLimit::where('amount', '<', '0')->update(['amount' => DB::raw('amount * -1')]);
$this->info(sprintf('Fixed %d budget limit(s)', $count));
return 0;
}
}

View File

@ -82,6 +82,7 @@ class UpgradeDatabase extends Command
'firefly-iii:create-link-types',
'firefly-iii:create-access-tokens',
'firefly-iii:remove-bills',
'firefly-iii:fix-negative-limits',
'firefly-iii:enable-currencies',
'firefly-iii:fix-transfer-budgets',
'firefly-iii:fix-uneven-amount',

View File

@ -160,6 +160,9 @@ class BudgetLimitController extends Controller
if ((int) $amount > 268435456) {
$amount = '268435456';
}
if((float) $amount < 0.0) {
$amount = bcmul($amount, '-1');
}
if (null !== $limit) {
$limit->amount = $amount;
@ -226,6 +229,9 @@ class BudgetLimitController extends Controller
if ((int) $amount > 268435456) { // 268 million
$amount = '268435456';
}
if((float) $amount < 0.0) {
$amount = bcmul($amount, '-1');
}
$limit = $this->blRepository->update($budgetLimit, ['amount' => $amount]);
$array = $limit->toArray();

View File

@ -93,6 +93,7 @@ class InstallController extends Controller
'firefly-iii:create-link-types' => [],
'firefly-iii:create-access-tokens' => [],
'firefly-iii:remove-bills' => [],
'firefly-iii:fix-negative-limits' => [],
'firefly-iii:enable-currencies' => [],
'firefly-iii:fix-transfer-budgets' => [],
'firefly-iii:fix-uneven-amount' => [],

View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BulkEditJournalRequest;
use FireflyIII\Models\TransactionJournal;
@ -32,6 +33,7 @@ use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use Log;
@ -102,8 +104,8 @@ class BulkController extends Controller
$ignoreCategory = 1 === (int) $request->get('ignore_category');
$ignoreBudget = 1 === (int) $request->get('ignore_budget');
$tagsAction = $request->get('tags_action');
$count = 0;
$collection = new Collection;
$count = 0;
foreach ($journalIds as $journalId) {
$journalId = (int) $journalId;
@ -114,9 +116,17 @@ class BulkController extends Controller
$resultC = $this->updateJournalCategory($journal, $ignoreCategory, $request->convertString('category'));
if ($resultA || $resultB || $resultC) {
$count++;
$collection->push($journal);
}
}
}
// run rules on changed journals:
/** @var TransactionJournal $journal */
foreach ($collection as $journal) {
event(new UpdatedTransactionGroup($journal->transactionGroup));
}
app('preferences')->mark();
$request->session()->flash('success', (string) trans_choice('firefly.mass_edited_transactions_success', $count));

View File

@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## 5.7.14 - 2022-10-19
### Fixed
- Bulk editing transactions works.
- Negative budgets no longer work.
## 5.7.13 - 2022-10-17
### Added

View File

@ -172,6 +172,7 @@
"@php artisan firefly-iii:create-link-types",
"@php artisan firefly-iii:create-access-tokens",
"@php artisan firefly-iii:remove-bills",
"@php artisan firefly-iii:fix-negative-limits",
"@php artisan firefly-iii:enable-currencies",
"@php artisan firefly-iii:fix-transfer-budgets",
"@php artisan firefly-iii:fix-uneven-amount",

34
composer.lock generated
View File

@ -1856,16 +1856,16 @@
},
{
"name": "laravel/framework",
"version": "v9.35.1",
"version": "v9.36.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a"
"reference": "0bcd350eec1974c9f912f129368587ef7e43722b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/79aed20f54b6ab75f926bf7d0dd7a5043ceb774a",
"reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a",
"url": "https://api.github.com/repos/laravel/framework/zipball/0bcd350eec1974c9f912f129368587ef7e43722b",
"reference": "0bcd350eec1974c9f912f129368587ef7e43722b",
"shasum": ""
},
"require": {
@ -2038,7 +2038,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2022-10-11T17:30:47+00:00"
"time": "2022-10-18T18:46:20+00:00"
},
{
"name": "laravel/passport",
@ -2838,16 +2838,16 @@
},
{
"name": "league/flysystem",
"version": "3.6.0",
"version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "8eded334b9894dc90ebdcb7be81e3a1c9413f709"
"reference": "3d2ed6215e096e900662bd8f993fc5ad81cc4135"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8eded334b9894dc90ebdcb7be81e3a1c9413f709",
"reference": "8eded334b9894dc90ebdcb7be81e3a1c9413f709",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3d2ed6215e096e900662bd8f993fc5ad81cc4135",
"reference": "3d2ed6215e096e900662bd8f993fc5ad81cc4135",
"shasum": ""
},
"require": {
@ -2909,7 +2909,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.6.0"
"source": "https://github.com/thephpleague/flysystem/tree/3.8.0"
},
"funding": [
{
@ -2925,7 +2925,7 @@
"type": "tidelift"
}
],
"time": "2022-10-13T20:05:14+00:00"
"time": "2022-10-18T06:54:34+00:00"
},
{
"name": "league/fractal",
@ -3752,16 +3752,16 @@
},
{
"name": "nunomaduro/termwind",
"version": "v1.14.0",
"version": "v1.14.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/termwind.git",
"reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d"
"reference": "86fc30eace93b9b6d4c844ba6de76db84184e01b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/termwind/zipball/10065367baccf13b6e30f5e9246fa4f63a79eb1d",
"reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d",
"url": "https://api.github.com/repos/nunomaduro/termwind/zipball/86fc30eace93b9b6d4c844ba6de76db84184e01b",
"reference": "86fc30eace93b9b6d4c844ba6de76db84184e01b",
"shasum": ""
},
"require": {
@ -3818,7 +3818,7 @@
],
"support": {
"issues": "https://github.com/nunomaduro/termwind/issues",
"source": "https://github.com/nunomaduro/termwind/tree/v1.14.0"
"source": "https://github.com/nunomaduro/termwind/tree/v1.14.1"
},
"funding": [
{
@ -3834,7 +3834,7 @@
"type": "github"
}
],
"time": "2022-08-01T11:03:24+00:00"
"time": "2022-10-17T15:20:29+00:00"
},
{
"name": "nyholm/psr7",

View File

@ -101,7 +101,7 @@ return [
'webhooks' => false,
'handle_debts' => true,
],
'version' => '5.7.13',
'version' => '5.7.14',
'api_version' => '1.5.6',
'db_version' => 18,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooky",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Opret ny webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Hvilket format webhook skal levere data i.",
"webhook_active_form_help": "Webhooken skal v\u00e6re aktiv, ellers vil den ikke blive kaldt.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhookit",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspecter",
"create_new_webhook": "Cr\u00e9er un nouveau webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indiquer sur quel \u00e9v\u00e9nement le webhook va se d\u00e9clencher",
"webhook_trigger_form_help": "Indique sur quel \u00e9v\u00e9nement le webhook va se d\u00e9clencher",
"webhook_response_form_help": "Indiquer ce que le webhook doit envoyer \u00e0 l'URL.",
"webhook_delivery_form_help": "Le format dans lequel le webhook doit fournir des donn\u00e9es.",
"webhook_active_form_help": "Le webhook doit \u00eatre actif, sinon il ne sera pas appel\u00e9.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Ispeziona",
"create_new_webhook": "Crea nuovo webhook",
"webhooks": "Webhook",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspecteren",
"create_new_webhook": "Maak nieuwe webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Geef aan bij welke gebeurtenis de webhook afgaat",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Geef aan wat de webhook mee moet sturen.",
"webhook_delivery_form_help": "Geef aan welk dataformaat gebruikt moet worden.",
"webhook_active_form_help": "De webhook moet actief zijn anders doet-ie het niet.",

View File

@ -101,7 +101,7 @@
"inspect": "Zbadaj",
"create_new_webhook": "Utw\u00f3rz nowy webhook",
"webhooks": "Webhooki",
"webhook_trigger_form_help": "Wska\u017c zdarzenie do wyzwolenia webhook'a",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Wska\u017c, co webhook musi przes\u0142a\u0107 do adresu URL.",
"webhook_delivery_form_help": "W jakim formacie webhook musi dostarcza\u0107 dane.",
"webhook_active_form_help": "Webhook musi by\u0107 aktywny lub nie zostanie wywo\u0142any.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhook-uri",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -99,15 +99,15 @@
"inactive": "\u041d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0439",
"no_webhook_messages": "There are no webhook messages",
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"create_new_webhook": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0432\u0435\u0431\u0445\u0443\u043a",
"webhooks": "\u0412\u0435\u0431-\u0445\u0443\u043a\u0438",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",
"edit_webhook_js": "Edit webhook \"{title}\"",
"webhook_was_triggered": "The webhook was triggered on the indicated transaction. You can refresh this page to see the results.",
"view_message": "View message",
"view_message": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f",
"view_attempts": "View failed attempts",
"message_content_title": "Webhook message content",
"message_content_help": "This is the content of the message that was sent (or tried) using this webhook.",
@ -115,9 +115,9 @@
"attempt_content_help": "These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.",
"no_attempts": "There are no unsuccessful attempts. That's a good thing!",
"webhook_attempt_at": "Attempt at {moment}",
"logs": "Logs",
"response": "Response",
"visit_webhook_url": "Visit webhook URL",
"logs": "\u041b\u043e\u0433\u0438",
"response": "\u041e\u0442\u0432\u0435\u0442",
"visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
"reset_webhook_secret": "Reset webhook secret"
},
"form": {
@ -132,20 +132,20 @@
"payment_date": "\u0414\u0430\u0442\u0430 \u043f\u043b\u0430\u0442\u0435\u0436\u0430",
"invoice_date": "\u0414\u0430\u0442\u0430 \u0432\u044b\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u0447\u0451\u0442\u0430",
"internal_reference": "\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u044f\u044f \u0441\u0441\u044b\u043b\u043a\u0430",
"webhook_response": "Response",
"webhook_trigger": "Trigger",
"webhook_response": "\u041e\u0442\u0432\u0435\u0442",
"webhook_trigger": "\u0421\u043e\u0431\u044b\u0442\u0438\u044f",
"webhook_delivery": "Delivery"
},
"list": {
"active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
"trigger": "Trigger",
"response": "Response",
"delivery": "Delivery",
"url": "URL",
"response": "\u041e\u0442\u0432\u0435\u0442",
"delivery": "\u0414\u043e\u0441\u0442\u0430\u0432\u043a\u0430",
"url": "\u0421\u0441\u044b\u043b\u043a\u0430",
"secret": "Secret"
},
"config": {
"html_language": "ru",
"date_time_fns": "MMMM do, yyyy @ HH:mm:ss"
"date_time_fns": "\u041a\u043b\u044e\u0447: \u043c\u0430\u0441\u0441\u0438\u0432 [' \u0434\u0430\u0442\u0430 _ \u0432\u0440\u0435\u043c\u044f _ fns ']\n\u043c\u0430\u0441\u0441\u0438\u0432['\u0434\u0430\u0442\u0430_\u0432\u0440\u0435\u043c\u044f_fns']"
}
}

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooky",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhookar",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Web kancalar\u0131",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "\u0414\u043e\u0441\u043b\u0456\u0434\u0438\u0442\u0438",
"create_new_webhook": "\u0421\u0442\u0432\u043e\u0440\u0438\u0442\u0438 \u043d\u043e\u0432\u0438\u0439 \u0432\u0435\u0431-\u0445\u0443\u043a",
"webhooks": "\u0412\u0435\u0431-\u0433\u0430\u043a\u0438",
"webhook_trigger_form_help": "\u0423\u043a\u0430\u0436\u0456\u0442\u044c, \u0437\u0430 \u044f\u043a\u043e\u0457 \u043f\u043e\u0434\u0456\u0457 \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0442\u0438\u043c\u0435\u0442\u044c\u0441\u044f \u0432\u0435\u0431-\u0445\u0443\u043a",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "\u0423\u043a\u0430\u0436\u0456\u0442\u044c, \u0449\u043e \u0432\u0435\u0431-\u0445\u0443\u043a \u043c\u0430\u0454 \u043f\u0435\u0440\u0435\u0434\u0430\u0442\u0438 \u0432 URL-\u0430\u0434\u0440\u0435\u0441\u0443.",
"webhook_delivery_form_help": "\u0423 \u044f\u043a\u043e\u043c\u0443 \u0444\u043e\u0440\u043c\u0430\u0442\u0456 \u0432\u0435\u0431-\u0445\u0443\u043a \u043c\u0430\u0454 \u043d\u0430\u0434\u0430\u0432\u0430\u0442\u0438 \u0434\u0430\u043d\u0456.",
"webhook_active_form_help": "\u0412\u0435\u0431-\u0445\u0443\u043a \u043c\u0430\u0454 \u0431\u0443\u0442\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u0438\u043c, \u0456\u043d\u0430\u043a\u0448\u0435 \u0439\u043e\u0433\u043e \u043d\u0435 \u0431\u0443\u0434\u0435 \u0432\u0438\u043a\u043b\u0438\u043a\u0430\u043d\u043e.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -101,7 +101,7 @@
"inspect": "Inspect",
"create_new_webhook": "Create new webhook",
"webhooks": "Webhooks",
"webhook_trigger_form_help": "Indicate on what event the webhook wil trigger",
"webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
"webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
"webhook_delivery_form_help": "Which format the webhook must deliver data in.",
"webhook_active_form_help": "The webhook must be active or it won't be called.",

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Opret ny webhook',
'webhooks_create_breadcrumb' => 'Opret ny webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Hvilket format webhook skal levere data i.',
'webhook_active_form_help' => 'Webhooken skal være aktiv, ellers vil den ikke blive kaldt.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '„Endgültiges Löschen” bedeutet „Löschen, was bereits gelöscht wurde”. Unter normalen Umständen löscht Firefly III nichts dauerhaft. Es verbirgt es nur. Die Schaltfläche unten löscht alle diese zuvor "gelöschten" Datensätze DAUERHAFT.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspecter',
'create_new_webhook' => 'Créer un nouveau webhook',
'webhooks_create_breadcrumb' => 'Créer un nouveau webhook',
'webhook_trigger_form_help' => 'Indiquer sur quel événement le webhook va se déclencher',
'webhook_trigger_form_help' => 'Indique sur quel événement le webhook va se déclencher',
'webhook_response_form_help' => 'Indiquer ce que le webhook doit envoyer à l\'URL.',
'webhook_delivery_form_help' => 'Le format dans lequel le webhook doit fournir des données.',
'webhook_active_form_help' => 'Le webhook doit être actif, sinon il ne sera pas appelé.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purger des données de Firefly III',
'purge_data_expl' => '« Purge» signifie « supprimer ce qui est déjà supprimé». Dans des circonstances normales, Firefly III ne supprime rien définitivement. Il ne fait que le cacher. Cela peut être ennuyeux lorsque vous importez des données d\'autres sources, car les transactions supprimées seront toujours reconnues comme doublons possibles. Le bouton ci-dessous supprime tous ces enregistrements précédemment "supprimés".',
'purge_data_expl' => '« Purger » signifie « supprimer ce qui est déjà supprimé ». En temps normal, Firefly III ne supprime rien définitivement. Il ne fait que le cacher. Le bouton ci-dessous supprime tous ces enregistrements précédemment "supprimés".',
'delete_stuff_header' => 'Supprimer et purger les données',
'purge_all_data' => 'Purger tous les enregistrements supprimés',
'purge_data' => 'Purger les données',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Ispeziona',
'create_new_webhook' => 'Crea nuovo webhook',
'webhooks_create_breadcrumb' => 'Crea nuovo webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspecteren',
'create_new_webhook' => 'Maak nieuwe webhook',
'webhooks_create_breadcrumb' => 'Maak nieuwe webhook',
'webhook_trigger_form_help' => 'Geef aan bij welke gebeurtenis de webhook afgaat',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Geef aan wat de webhook mee moet sturen.',
'webhook_delivery_form_help' => 'Geef aan welk dataformaat gebruikt moet worden.',
'webhook_active_form_help' => 'De webhook moet actief zijn anders doet-ie het niet.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Zbadaj',
'create_new_webhook' => 'Utwórz nowy webhook',
'webhooks_create_breadcrumb' => 'Utwórz nowy webhook',
'webhook_trigger_form_help' => 'Wskaż zdarzenie do wyzwolenia webhook\'a',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Wskaż, co webhook musi przesłać do adresu URL.',
'webhook_delivery_form_help' => 'W jakim formacie webhook musi dostarczać dane.',
'webhook_active_form_help' => 'Webhook musi być aktywny lub nie zostanie wywołany.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -37,11 +37,12 @@ return [
'month_and_date_day_js' => 'Do MMMM YYYY',
//'month_and_day_no_year' => '%B %e',
'month_and_day_no_year_js' => 'MMMM Do',
'month_and_day_no_year_js' => 'Ключ: массив [\'месяц _ и _ день _ нет _ год _ js\']',
//'date_time' => '%B %e, %Y, @ %T',
'date_time_js' => 'Do MMMM YYYY, @ HH:mm:ss',
'date_time_fns' => 'MMMM do, yyyy @ HH:mm:ss',
'date_time_fns' => 'Ключ: массив [\' дата _ время _ fns \']
массив[\атаремя_fns\']',
//'specific_day' => '%e %B %Y',
'specific_day_js' => 'D MMMM YYYY',
@ -56,8 +57,8 @@ return [
//'half_year' => '%B %Y',
'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
'quarter_fns' => "Ключ: массив['четверть_fns']",
'half_year_fns' => "Ключ: массив ['половина _ года _ fns']",
'dow_1' => 'Понедельник',
'dow_2' => 'Вторник',
'dow_3' => 'Среда',

View File

@ -34,7 +34,7 @@ return [
'admin_test_body' => 'Это тестовое сообщение с вашего сервера Firefly III. Оно было отправлено на :email.',
// invite
'invitation_created_subject' => 'An invitation has been created',
'invitation_created_subject' => 'Приглашение было создано',
'invitation_created_body' => 'Admin user ":email" created a user invitation which can be used by whoever is behind email address ":invitee". The invite will be valid for 48hrs.',
'invite_user_subject' => 'You\'ve been invited to create a Firefly III account.',
'invitation_introduction' => 'You\'ve been invited to create a Firefly III account on **:host**. Firefly III is a personal, self-hosted, private personal finance manager. All the cool kids are using it.',

View File

@ -230,7 +230,7 @@ return [
// Webhooks
'webhooks' => 'Веб-хуки',
'webhooks_breadcrumb' => 'Webhooks',
'webhooks_breadcrumb' => 'Вебхуки',
'no_webhook_messages' => 'There are no webhook messages',
'webhook_trigger_STORE_TRANSACTION' => 'After transaction creation',
'webhook_trigger_UPDATE_TRANSACTION' => 'After transaction update',
@ -240,22 +240,22 @@ return [
'webhook_response_none_NONE' => 'No details',
'webhook_delivery_JSON' => 'JSON',
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'create_new_webhook' => 'Создать новый вебхук',
'webhooks_create_breadcrumb' => 'Создать новый вебхук',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
'stored_new_webhook' => 'Stored new webhook ":title"',
'delete_webhook' => 'Delete webhook',
'stored_new_webhook' => 'Добавлен новый вебхук ":title"',
'delete_webhook' => 'Удалить вебхук',
'deleted_webhook' => 'Deleted webhook ":title"',
'edit_webhook' => 'Edit webhook ":title"',
'updated_webhook' => 'Updated webhook ":title"',
'edit_webhook_js' => 'Edit webhook "{title}"',
'show_webhook' => 'Webhook ":title"',
'show_webhook' => 'Вебхук ":title"',
'webhook_was_triggered' => 'The webhook was triggered on the indicated transaction. You can refresh this page to see the results.',
'webhook_messages' => 'Webhook message',
'view_message' => 'View message',
'view_message' => 'Просмотр сообщения',
'view_attempts' => 'View failed attempts',
'message_content_title' => 'Webhook message content',
'message_content_help' => 'This is the content of the message that was sent (or tried) using this webhook.',
@ -263,9 +263,9 @@ return [
'attempt_content_help' => 'These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.',
'no_attempts' => 'There are no unsuccessful attempts. That\'s a good thing!',
'webhook_attempt_at' => 'Attempt at {moment}',
'logs' => 'Logs',
'response' => 'Response',
'visit_webhook_url' => 'Visit webhook URL',
'logs' => 'Логи',
'response' => 'Ответ',
'visit_webhook_url' => 'Посетить URL вебхука',
'reset_webhook_secret' => 'Reset webhook secret',
// API access
@ -326,26 +326,26 @@ return [
'search_modifier_date_on' => 'Дата транзакции: ":value"',
'search_modifier_not_date_on' => 'Transaction date is not ":value"',
'search_modifier_reconciled' => 'Transaction is reconciled',
'search_modifier_not_reconciled' => 'Transaction is not reconciled',
'search_modifier_reconciled' => 'Транзакция сверена',
'search_modifier_not_reconciled' => 'Транзакция не сверена',
'search_modifier_id' => 'ID транзакции - ":value"',
'search_modifier_not_id' => 'Transaction ID is not ":value"',
'search_modifier_not_id' => 'ID транзакции не является ":value"',
'search_modifier_date_before' => 'Дата транзакции до или равна ":value"',
'search_modifier_date_after' => 'Дата транзакции после или равна ":value"',
'search_modifier_external_id_is' => 'Внешний ID: ":value"',
'search_modifier_not_external_id_is' => 'External ID is not ":value"',
'search_modifier_not_external_id_is' => 'Внешний ID не ":value"',
'search_modifier_no_external_url' => 'У транзакции нет внешнего URL',
'search_modifier_not_any_external_url' => 'The transaction has no external URL',
'search_modifier_not_any_external_url' => 'У транзакции нет внешнего URL',
'search_modifier_any_external_url' => 'Транзакция должна иметь (любой) внешний URL',
'search_modifier_not_no_external_url' => 'The transaction must have a (any) external URL',
'search_modifier_not_no_external_url' => 'Транзакция должна иметь (любой) внешний URL',
'search_modifier_internal_reference_is' => 'Внутренняя ссылка: ":value"',
'search_modifier_not_internal_reference_is' => 'Internal reference is not ":value"',
'search_modifier_description_starts' => 'Description starts with ":value"',
'search_modifier_not_description_starts' => 'Description does not start with ":value"',
'search_modifier_description_ends' => 'Description ends on ":value"',
'search_modifier_not_description_ends' => 'Description does not end on ":value"',
'search_modifier_not_internal_reference_is' => 'Внутренняя ссылка не ":value"',
'search_modifier_description_starts' => 'Описание начинается с ":value"',
'search_modifier_not_description_starts' => 'Описание не начинается с ":value"',
'search_modifier_description_ends' => 'Описание заканчивается на ":value"',
'search_modifier_not_description_ends' => 'Описание не заканчивается на ":value"',
'search_modifier_description_contains' => 'Описание содержит ":value"',
'search_modifier_not_description_contains' => 'Description does not contain ":value"',
'search_modifier_not_description_contains' => 'Описание не содержит ":value"',
'search_modifier_description_is' => 'Описание точно соответствует ":value"',
'search_modifier_not_description_is' => 'Description is exactly not ":value"',
'search_modifier_currency_is' => '(Иностранная) валюта транзакции - ":value"',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',
@ -2242,7 +2242,7 @@ return [
'invite_user' => 'Invite user',
'user_is_invited' => 'Email address ":address" was invited to Firefly III',
'administration' => 'Администрирование',
'code_already_used' => 'Invite code has been used',
'code_already_used' => 'Код приглашения уже был использован',
'user_administration' => 'Управление пользователями',
'list_all_users' => 'Список пользователей',
'all_users' => 'Все пользователи',
@ -2281,15 +2281,15 @@ return [
'admin_maintanance_title' => 'Обслуживание',
'admin_maintanance_expl' => 'Некоторые хитрые кнопочки для обслуживания Firefly III',
'admin_maintenance_clear_cache' => 'Очистить кэш',
'admin_notifications' => 'Admin notifications',
'admin_notifications_expl' => 'The following notifications can be enabled or disabled by the administrator. If you want to get these messages over Slack as well, set the "incoming webhook" URL.',
'admin_notifications' => 'Уведомления администратора',
'admin_notifications_expl' => 'Следующие уведомления могут быть включены или отключены администратором. Если вы хотите получить эти сообщения через Slack также установите URL "входящий вебхук".',
'admin_notification_check_user_new_reg' => 'User gets post-registration welcome message',
'admin_notification_check_admin_new_reg' => 'Administrator(s) get new user registration notification',
'admin_notification_check_new_version' => 'A new version is available',
'admin_notification_check_invite_created' => 'A user is invited to Firefly III',
'admin_notification_check_invite_redeemed' => 'A user invitation is redeemed',
'all_invited_users' => 'All invited users',
'save_notification_settings' => 'Save settings',
'all_invited_users' => 'Все приглашенные пользователи',
'save_notification_settings' => 'Сохранить настройки',
'notification_settings_saved' => 'The notification settings have been saved',

View File

@ -84,7 +84,7 @@ return [
'liability_type' => 'Вид обязательств',
'interest' => 'Процентная ставка',
'interest_period' => 'Период начисления процентов',
'extension_date' => 'Extension date',
'extension_date' => 'Дата расширения',
'type' => 'Тип',
'convert_Withdrawal' => 'Конвертировать расход',
'convert_Deposit' => 'Конвертировать доход',
@ -125,7 +125,7 @@ return [
'start' => 'Начало диапазона',
'end' => 'Конец диапазона',
'delete_account' => 'Удалить счёт ":name"',
'delete_webhook' => 'Delete webhook ":title"',
'delete_webhook' => 'Удалить вебхук ":title"',
'delete_bill' => 'Удаление счёта к оплате ":name"',
'delete_budget' => 'Удалить бюджет ":name"',
'delete_category' => 'Удалить категорию ":name"',
@ -146,7 +146,7 @@ return [
'object_group_areYouSure' => 'Вы действительно хотите удалить группу с названием ":title"?',
'ruleGroup_areYouSure' => 'Вы действительно хотите удалить группу правил с названием ":title"?',
'budget_areYouSure' => 'Вы действительно хотите удалить бюджет с именем ":name"?',
'webhook_areYouSure' => 'Are you sure you want to delete the webhook named ":title"?',
'webhook_areYouSure' => 'Вы уверены, что хотите удалить вебхук с именем ":title?',
'category_areYouSure' => 'Вы действительно хотите удалить категорию с именем ":name"?',
'recurring_areYouSure' => 'Вы действительно хотите удалить повторяющуюся транзакцию с названием ":title"?',
'currency_areYouSure' => 'Вы уверены, что хотите удалить валюту ":name"?',
@ -249,6 +249,6 @@ return [
'key' => 'Ключ',
'value' => 'Содержание записи',
'webhook_delivery' => 'Delivery',
'webhook_response' => 'Response',
'webhook_trigger' => 'Trigger',
'webhook_response' => 'Ответ',
'webhook_trigger' => 'События',
];

View File

@ -45,8 +45,8 @@ return [
'other_meta_data' => 'Другие метаданные',
'invited_at' => 'Invited at',
'expires' => 'Invitation expires',
'invited_by' => 'Invited by',
'invite_link' => 'Invite link',
'invited_by' => 'Пригласил',
'invite_link' => 'Ссылка на приглашение',
'account_type' => 'Тип профиля',
'created_at' => 'Создан',
'account' => 'Счёт',
@ -143,9 +143,9 @@ return [
'expected_info' => 'Следующая ожидаемая операция',
'start_date' => 'Начальная дата',
'trigger' => 'Trigger',
'response' => 'Response',
'delivery' => 'Delivery',
'url' => 'URL',
'response' => 'Ответ',
'delivery' => 'Доставка',
'url' => 'Ссылка',
'secret' => 'Secret',
];

View File

@ -142,9 +142,9 @@ return [
'unique_object_group' => 'Название группы должно быть уникальным',
'starts_with' => 'Значение должно начинаться с :values.',
'unique_webhook' => 'You already have a webhook with this combination of URL, trigger, response and delivery.',
'unique_existing_webhook' => 'You already have another webhook with this combination of URL, trigger, response and delivery.',
'same_account_type' => 'Both accounts must be of the same account type',
'same_account_currency' => 'Both accounts must have the same currency setting',
'unique_existing_webhook' => 'У вас уже есть другой вебхук с этим сочетанием URL, триггер, ответа и доставки.',
'same_account_type' => 'Оба счета должны иметь один тип счета',
'same_account_currency' => 'Оба счета должны иметь одну и ту же валюту',
'secure_password' => 'Это не безопасный пароль. Попробуйте еще раз. Подробнее можно узнать по ссылке https://bit.ly/FF3-password-security',
'valid_recurrence_rep_type' => 'Недопустимый тип для повторяющихся транзакций.',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -243,7 +243,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1337,7 +1337,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Дослідити',
'create_new_webhook' => 'Створити новий веб-хук',
'webhooks_create_breadcrumb' => 'Створити новий веб-хук',
'webhook_trigger_form_help' => 'Укажіть, за якої події запускатиметься веб-хук',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Укажіть, що веб-хук має передати в URL-адресу.',
'webhook_delivery_form_help' => 'У якому форматі веб-хук має надавати дані.',
'webhook_active_form_help' => 'Веб-хук має бути активним, інакше його не буде викликано.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Видалити та очистити дані',
'purge_all_data' => 'Знищити всі видалені записи',
'purge_data' => 'Очистити дані',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -242,7 +242,7 @@ return [
'inspect' => 'Inspect',
'create_new_webhook' => 'Create new webhook',
'webhooks_create_breadcrumb' => 'Create new webhook',
'webhook_trigger_form_help' => 'Indicate on what event the webhook wil trigger',
'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
@ -1336,7 +1336,7 @@ return [
// profile:
'purge_data_title' => 'Purge data from Firefly III',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. This can be annoying when you import data from other sources, as removed transactions will still be recognized as possible duplicates. The button below deletes all of these previously "deleted" records FOREVER.',
'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
'delete_stuff_header' => 'Delete and purge data',
'purge_all_data' => 'Purge all deleted records',
'purge_data' => 'Purge data',

View File

@ -12,6 +12,6 @@ sonar.organization=firefly-iii
#sonar.sourceEncoding=UTF-8
sonar.projectVersion=5.7.13
sonar.projectVersion=5.7.14
sonar.sources=app,bootstrap,database,resources/assets,resources/views,routes,tests
sonar.sourceEncoding=UTF-8

View File

@ -1907,9 +1907,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001407:
version "1.0.30001420"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001420.tgz#f62f35f051e0b6d25532cf376776d41e45b47ef6"
integrity sha512-OnyeJ9ascFA9roEj72ok2Ikp7PHJTKubtEJIQ/VK3fdsS50q4KWy+Z5X0A1/GswEItKX0ctAp8n4SYDE7wTu6A==
version "1.0.30001421"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001421.tgz#979993aaacff5ab72a8d0d58c28ddbcb7b4deba6"
integrity sha512-Sw4eLbgUJAEhjLs1Fa+mk45sidp1wRn5y6GtDpHGBaNJ9OCDJaVh2tIaWWUnGfuXfKf1JCBaIarak3FkVAvEeA==
chalk@^2.0.0:
version "2.4.2"
@ -2523,9 +2523,9 @@ ee-first@1.1.1:
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
electron-to-chromium@^1.4.251:
version "1.4.283"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.283.tgz#d4f263f5df402fd799c0a06255d580dcf8aa9a8e"
integrity sha512-g6RQ9zCOV+U5QVHW9OpFR7rdk/V7xfopNXnyAamdpFgCHgZ1sjI8VuR1+zG2YG/TZk+tQ8mpNkug4P8FU0fuOA==
version "1.4.284"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
elliptic@^6.5.3:
version "6.5.4"
@ -3233,9 +3233,9 @@ is-buffer@~1.1.6:
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
is-core-module@^2.9.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
version "2.11.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
dependencies:
has "^1.0.3"