IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-22 08:56:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-03-28

Browse Source
This commit is contained in:
github-actions 2024-03-28 04:10:19 +01:00
parent 322f70bcca
commit c44e48a793
13 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
composer.lock generated
View File

@ -3366,16 +3366,16 @@
},
{
"name": "nesbot/carbon",
"version": "3.1.1",
"version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2"
"reference": "b4272c2e78d30f9085b079aedb692b2da879b313"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2",
"reference": "34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/b4272c2e78d30f9085b079aedb692b2da879b313",
"reference": "b4272c2e78d30f9085b079aedb692b2da879b313",
"shasum": ""
},
"require": {
@ -3393,14 +3393,14 @@
"require-dev": {
"doctrine/dbal": "^3.6.3 || ^4.0",
"doctrine/orm": "^2.15.2 || ^3.0",
"friendsofphp/php-cs-fixer": "^3.18.0",
"kylekatarnls/multi-tester": "^2.2.0",
"ondrejmirtes/better-reflection": "^6.11.0.0",
"phpmd/phpmd": "^2.13.0",
"phpstan/extension-installer": "^1.3.0",
"phpstan/phpstan": "^1.10.20",
"phpunit/phpunit": "^10.2.2",
"squizlabs/php_codesniffer": "^3.7.2"
"friendsofphp/php-cs-fixer": "^3.52.1",
"kylekatarnls/multi-tester": "^2.5.3",
"ondrejmirtes/better-reflection": "^6.25.0.4",
"phpmd/phpmd": "^2.15.0",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan": "^1.10.65",
"phpunit/phpunit": "^10.5.15",
"squizlabs/php_codesniffer": "^3.9.0"
},
"bin": [
"bin/carbon"
@ -3468,7 +3468,7 @@
"type": "tidelift"
}
],
"time": "2024-03-13T12:42:37+00:00"
"time": "2024-03-27T21:37:24+00:00"
},
{
"name": "nette/schema",

2
config/firefly.php
View File

@ -117,7 +117,7 @@ return [
'expression_engine' => false,
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2024-03-27',
'version' => 'develop/2024-03-28',
'api_version' => '2.0.12',
'db_version' => 23,

4
public/v2/i18n/fr.json
View File

@ -8,7 +8,7 @@
"spent": "D\u00e9pens\u00e9",
"left": "Reste",
"paid": "Pay\u00e9",
"errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
"errors_submission_v2": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : {{errorMessage}}",
"unpaid": "Impay\u00e9",
"default_group_title_name_plain": "non group\u00e9",
"subscriptions_in_group": "Abonnements dans le groupe \"%{title}\"",
@ -23,7 +23,7 @@
"unknown_dest_plain": "Compte de destination inconnu",
"unknown_any_plain": "Compte inconnu",
"unknown_budget_plain": "Pas de budget",
"stored_journal_js": "Successfully created new transaction \"{{description}}\"",
"stored_journal_js": "Op\u00e9ration \"{{description}}\" cr\u00e9\u00e9e avec succ\u00e8s",
"wait_loading_transaction": "Veuillez patienter pendant le chargement du formulaire",
"nothing_found": "(aucun r\u00e9sultat)",
"wait_loading_data": "Veuillez attendre que vos informations soient charg\u00e9es...",

4
public/v2/i18n/fr_FR.json
View File

@ -8,7 +8,7 @@
"spent": "D\u00e9pens\u00e9",
"left": "Reste",
"paid": "Pay\u00e9",
"errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
"errors_submission_v2": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : {{errorMessage}}",
"unpaid": "Impay\u00e9",
"default_group_title_name_plain": "non group\u00e9",
"subscriptions_in_group": "Abonnements dans le groupe \"%{title}\"",
@ -23,7 +23,7 @@
"unknown_dest_plain": "Compte de destination inconnu",
"unknown_any_plain": "Compte inconnu",
"unknown_budget_plain": "Pas de budget",
"stored_journal_js": "Successfully created new transaction \"{{description}}\"",
"stored_journal_js": "Op\u00e9ration \"{{description}}\" cr\u00e9\u00e9e avec succ\u00e8s",
"wait_loading_transaction": "Veuillez patienter pendant le chargement du formulaire",
"nothing_found": "(aucun r\u00e9sultat)",
"wait_loading_data": "Veuillez attendre que vos informations soient charg\u00e9es...",

6
public/v2/i18n/zh-cn.json
View File

@ -2,13 +2,13 @@
"config": {
"html_language": "zh-cn",
"date_time_fns": "YYYY\u5e74M\u6708D\u65e5 HH:mm:ss",
"date_time_fns_short": "MMMM do, yyyy @ HH:mm"
"date_time_fns_short": "MMMM \u6267\u884c, yyyy @ HH:mm"
},
"firefly": {
"spent": "\u652f\u51fa",
"left": "\u5269\u4f59",
"paid": "\u5df2\u4ed8\u6b3e",
"errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
"errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",
"unpaid": "\u672a\u4ed8\u6b3e",
"default_group_title_name_plain": "\u672a\u5206\u7ec4",
"subscriptions_in_group": "\u5206\u7ec4\u201c%{title}\u201d\u8ba2\u9605",
@ -23,7 +23,7 @@
"unknown_dest_plain": "\u672a\u77e5\u76ee\u6807\u8d26\u6237",
"unknown_any_plain": "\u672a\u77e5\u8d26\u6237",
"unknown_budget_plain": "\u65e0\u9884\u7b97",
"stored_journal_js": "Successfully created new transaction \"{{description}}\"",
"stored_journal_js": "\u6210\u529f\u521b\u5efa\u65b0\u4ea4\u6613 \"{{description}}\"",
"wait_loading_transaction": "\u8bf7\u7b49\u5f85\u8868\u5355\u52a0\u8f7d",
"nothing_found": "(\u6ca1\u6709\u627e\u5230)",
"wait_loading_data": "\u8bf7\u7b49\u5f85\u60a8\u7684\u4fe1\u606f\u52a0\u8f7d...",

6
public/v2/i18n/zh_CN.json
View File

@ -2,13 +2,13 @@
"config": {
"html_language": "zh-cn",
"date_time_fns": "YYYY\u5e74M\u6708D\u65e5 HH:mm:ss",
"date_time_fns_short": "MMMM do, yyyy @ HH:mm"
"date_time_fns_short": "MMMM \u6267\u884c, yyyy @ HH:mm"
},
"firefly": {
"spent": "\u652f\u51fa",
"left": "\u5269\u4f59",
"paid": "\u5df2\u4ed8\u6b3e",
"errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
"errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",
"unpaid": "\u672a\u4ed8\u6b3e",
"default_group_title_name_plain": "\u672a\u5206\u7ec4",
"subscriptions_in_group": "\u5206\u7ec4\u201c%{title}\u201d\u8ba2\u9605",
@ -23,7 +23,7 @@
"unknown_dest_plain": "\u672a\u77e5\u76ee\u6807\u8d26\u6237",
"unknown_any_plain": "\u672a\u77e5\u8d26\u6237",
"unknown_budget_plain": "\u65e0\u9884\u7b97",
"stored_journal_js": "Successfully created new transaction \"{{description}}\"",
"stored_journal_js": "\u6210\u529f\u521b\u5efa\u65b0\u4ea4\u6613 \"{{description}}\"",
"wait_loading_transaction": "\u8bf7\u7b49\u5f85\u8868\u5355\u52a0\u8f7d",
"nothing_found": "(\u6ca1\u6709\u627e\u5230)",
"wait_loading_data": "\u8bf7\u7b49\u5f85\u60a8\u7684\u4fe1\u606f\u52a0\u8f7d...",

4
resources/assets/js/locales/zh-cn.json
View File

@ -5,8 +5,8 @@
"flash_warning": "\u8b66\u544a\uff01",
"flash_success": "\u6210\u529f\uff01",
"close": "\u5173\u95ed",
"select_dest_account": "Please select or type a valid destination account name",
"select_source_account": "Please select or type a valid source account name",
"select_dest_account": "\u8bf7\u9009\u62e9\u6216\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u76ee\u6807\u5e10\u6237\u540d\u79f0",
"select_source_account": "\u8bf7\u9009\u62e9\u6216\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u6e90\u5e10\u6237\u540d\u79f0",
"split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
"errors_submission": "\u60a8\u7684\u63d0\u4ea4\u6709\u8bef\uff0c\u8bf7\u67e5\u770b\u4e0b\u9762\u8f93\u51fa\u7684\u9519\u8bef\u4fe1\u606f\u3002",
"split": "\u62c6\u5206",

8
resources/lang/fr_FR/firefly.php
View File

@ -1989,7 +1989,7 @@ return [
'deleted_transfer' => 'Opération ":description" correctement supprimée',
'deleted_reconciliation' => 'Opération ":description" supprimée avec succès',
'stored_journal' => 'Opération ":description" créée avec succès',
'stored_journal_js' => 'Successfully created new transaction "{{description}}"',
'stored_journal_js' => 'Opération "{{description}}" créée avec succès',
'stored_journal_no_descr' => 'Nouvelle opération créée avec succès',
'updated_journal_no_descr' => 'Votre opération a été mise à jour avec succès',
'select_transactions' => 'Sélectionner des opérations',
@ -2297,7 +2297,7 @@ return [
'description' => 'Description',
'sum_of_period' => 'Somme pour la période',
'average_in_period' => 'Moyenne pour la période',
'no_account_role' => '(no role)',
'no_account_role' => '(aucun rôle)',
'account_role_defaultAsset' => 'Compte d\'actif par défaut',
'account_role_sharedAsset' => 'Compte d\'actif partagé',
'account_role_savingAsset' => 'Compte d’épargne',
@ -2570,9 +2570,9 @@ return [
'store_as_new' => 'Enregistrer comme une nouvelle opération au lieu de mettre à jour.',
'reset_after' => 'Réinitialiser le formulaire après soumission',
'errors_submission' => 'Certaines informations ne sont pas correctes dans votre formulaire. Veuillez vérifier les erreurs ci-dessous.',
'errors_submission_v2' => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
'errors_submission_v2' => 'Certaines informations ne sont pas correctes dans votre formulaire. Veuillez vérifier les erreurs ci-dessous : {{errorMessage}}',
'transaction_expand_split' => 'Développer la séparation',
'transaction_remove_split' => 'Remove split',
'transaction_remove_split' => 'Supprimer la division',
'transaction_collapse_split' => 'Réduire la séparation',
// object groups

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

@ -64,7 +64,7 @@ return [
// 'date_time' => '%B %e, %Y, @ %T',
'date_time_js' => 'YYYY年M月D日 HH:mm:ss',
'date_time_fns' => 'YYYY年M月D日 HH:mm:ss',
'date_time_fns_short' => 'MMMM do, yyyy @ HH:mm',
'date_time_fns_short' => 'MMMM 执行, yyyy @ HH:mm',
// 'specific_day' => '%e %B %Y',
'specific_day_js' => 'YYYY年M月D日',

2
resources/lang/zh_CN/errors.php
View File

@ -42,7 +42,7 @@ return [
'fatal_error' => '发生致命错误：请检查位于“storage/logs”目录的日志文件，或使用“docker logs -f [container]”命令查看相关信息。',
'maintenance_mode' => 'Firefly III 已启用维护模式',
'be_right_back' => '敬请期待！',
'check_back' => 'Firefly III is down for some necessary maintenance. Please check back in a second. If you happen to see this message on the demo site, just wait a few minutes. The database is reset every few hours.',
'check_back' => 'Firefly III 是为了一些必要的维护。请稍后再试。 如果您正好在演示站点看到此消息，请等待几分钟。数据库将每隔几小时重置。',
'error_occurred' => '很抱歉，出现错误',
'db_error_occurred' => '哎呀！发生数据库错误。',
'error_not_recoverable' => '很遗憾，该错误无法恢复 :( Firefly III 已崩溃。错误信息：',

40
resources/lang/zh_CN/firefly.php
View File

@ -113,7 +113,7 @@ return [
'two_factor_forgot' => '我忘记了两步验证码',
'two_factor_lost_header' => '遗失了您的两步验证吗？',
'two_factor_lost_intro' => '如果您同时遗失了备份代码，很抱歉，您无法通过网页进行恢复。您可以通过下述方式进行操作。',
'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, read <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working">this entry in the FAQ</a> for instructions.',
'two_factor_lost_fix_self' => '若您自行运行 Firefly III 服务，查看 <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working">常见问题解答</a> 来参考',
'two_factor_lost_fix_owner' => '如果这不是您自己的 Firefly III 站点，请邮件联系站点管理员（<a href="mailto::site_owner">:site_owner</a>）协助您重置两步验证。',
'mfa_backup_code' => '您已使用备用代码登录到 Firefly III 。 您不能再使用它，因此请将其划掉。',
'pref_two_factor_new_backup_codes' => '获取新的备份代码',
@ -317,8 +317,8 @@ return [
'update_new_version_alert' => '发现可用的 Firefly III 新版本，您正在运行的版本是 :your_version，最新版本是 :new_version（发布于 :date）。',
'update_version_beta' => '此版本是 BETA 版本。您可能会遇到问题。',
'update_version_alpha' => '此版本是 ALPHA 版本。您可能会遇到问题。',
'update_current_dev_older' => 'You are running development release ":version", which is older than the latest release :new_version. Please update!',
'update_current_dev_newer' => 'You are running development release ":version", which is newer than the latest release :new_version.',
'update_current_dev_older' => '您正在运行开发版本 ":version", 该版本比最新版本的 :new_version旧。请更新！',
'update_current_dev_newer' => '您正在运行开发版本 ":version", 它比最新版本 :new_version 更新。',
'update_current_version_alert' => '您正在运行 :version，这是最新的可用版本。',
'update_newer_version_alert' => '您正在运行 :your_version，它比最新发布的 :new_version 更新。',
'update_check_error' => '检查更新时发生错误：:error',
@ -896,12 +896,12 @@ return [
'rule_trigger_budget_is' => '预算为 ":trigger_value"',
'rule_trigger_tag_is_choice' => '其中一个标签为...',
'rule_trigger_tag_is' => '其中一个标签为":trigger_value"',
'rule_trigger_tag_contains_choice' => 'Any tag contains..',
'rule_trigger_tag_contains' => 'Any tag contains ":trigger_value"',
'rule_trigger_tag_ends_choice' => 'Any tag ends with..',
'rule_trigger_tag_ends' => 'Any tag ends with ":trigger_value"',
'rule_trigger_tag_starts_choice' => 'Any tag starts with..',
'rule_trigger_tag_starts' => 'Any tag starts with ":trigger_value"',
'rule_trigger_tag_contains_choice' => '任何标签包含...',
'rule_trigger_tag_contains' => '任何标签包含 ":trigger_value"',
'rule_trigger_tag_ends_choice' => '任何标签结尾...',
'rule_trigger_tag_ends' => '任何标签以 ":trigger_value " 结尾',
'rule_trigger_tag_starts_choice' => '任何标签开头...',
'rule_trigger_tag_starts' => '任何标签以 ":trigger_value " 开头',
'rule_trigger_currency_is_choice' => '交易货币为…',
'rule_trigger_currency_is' => '交易货币为“:trigger_value”',
'rule_trigger_foreign_currency_is_choice' => '交易外币为...',
@ -1203,7 +1203,7 @@ return [
'rule_trigger_not_exists' => '交易不存在',
'rule_trigger_not_has_attachments' => '交易不含附件',
'rule_trigger_not_has_any_category' => '交易不含分类',
'rule_trigger_not_has_any_budget' => 'Transaction has no budget',
'rule_trigger_not_has_any_budget' => '交易没有预算',
'rule_trigger_not_has_any_bill' => '交易不含账单',
'rule_trigger_not_has_any_tag' => '交易不含标签',
'rule_trigger_not_any_notes' => '交易不含备注',
@ -1286,8 +1286,8 @@ return [
'rule_action_append_notes_to_descr' => '在描述后追加备注',
'rule_action_move_descr_to_notes' => '用描述替换备注',
'rule_action_move_notes_to_descr' => '用备注替换描述',
'rule_action_set_amount_choice' => 'Set amount to ..',
'rule_action_set_amount' => 'Set amount to ":action_value"',
'rule_action_set_amount_choice' => '设置金额为 ...',
'rule_action_set_amount' => '设置金额为 ":action_value"',
'rule_action_set_destination_to_cash_choice' => '将目标帐户设置为 (现金)',
'rule_action_set_source_to_cash_choice' => '将源账户设置为 (现金)',
'rulegroup_for_bills_title' => '账单规则组',
@ -1589,8 +1589,8 @@ return [
'submission_options' => '提交选项',
'apply_rules_checkbox' => '应用规则',
'fire_webhooks_checkbox' => '触发 webhook',
'select_source_account' => 'Please select or type a valid source account name',
'select_dest_account' => 'Please select or type a valid destination account name',
'select_source_account' => '请选择或输入一个有效的源帐户名称',
'select_dest_account' => '请选择或输入一个有效的目标帐户名称',
// convert stuff:
'convert_is_already_type_Withdrawal' => '此交易已经为支出',
@ -1990,7 +1990,7 @@ return [
'deleted_transfer' => '已成功删除转账“:description”',
'deleted_reconciliation' => '成功删除对账交易“:description”',
'stored_journal' => '成功创建新交易“:description”',
'stored_journal_js' => 'Successfully created new transaction "{{description}}"',
'stored_journal_js' => '成功创建新交易 "{{description}}"',
'stored_journal_no_descr' => '成功创建您的新交易',
'updated_journal_no_descr' => '成功更新您的交易',
'select_transactions' => '选择交易',
@ -2298,7 +2298,7 @@ return [
'description' => '描述',
'sum_of_period' => '区间内的总和',
'average_in_period' => '区间平均',
'no_account_role' => '(no role)',
'no_account_role' => '(无角色)',
'account_role_defaultAsset' => '默认资产账户',
'account_role_sharedAsset' => '共用资产账户',
'account_role_savingAsset' => '储蓄账户',
@ -2463,7 +2463,7 @@ return [
'block_code_bounced' => '电子邮件被退回',
'block_code_expired' => '演示账户已过期',
'no_block_code' => '无封禁理由或用户未被封禁',
'demo_user_export' => 'The demo user cannot export data',
'demo_user_export' => '演示用户不能导出数据',
'block_code_email_changed' => '用户尚未确认新的电子邮件地址',
'admin_update_email' => '与个人档案页面相反，用户不会被通知他们的电子邮件地址已变更！',
'update_user' => '更新用户',
@ -2571,9 +2571,9 @@ return [
'store_as_new' => '保存为新交易而不是更新此交易。',
'reset_after' => '提交后重置表单',
'errors_submission' => '您的提交有误，请查看下面输出的错误信息。',
'errors_submission_v2' => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
'errors_submission_v2' => '您提交的内容有误，请检查错误信息: {{errorMessage}}',
'transaction_expand_split' => '展开拆分',
'transaction_remove_split' => 'Remove split',
'transaction_remove_split' => '移除拆分',
'transaction_collapse_split' => '折叠拆分',
// object groups
@ -2773,7 +2773,7 @@ return [
'ale_action_add_to_piggy' => '存钱罐',
'ale_action_remove_from_piggy' => '存钱罐',
'ale_action_add_tag' => '添加标签',
'ale_action_update_amount' => 'Updated amount',
'ale_action_update_amount' => '更新金额',
// dashboard
'enable_auto_convert' => '启用货币转换',

2
resources/lang/zh_CN/rules.php
View File

@ -70,5 +70,5 @@ return [
'cannot_find_budget' => 'Firefly III 找不到预算“:name”',
'cannot_find_category' => 'Firefly III 找不到分类“:name”',
'cannot_set_budget' => 'Firefly III 无法设置预算“:name”为类型“:type”的交易',
'journal_invalid_amount' => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
'journal_invalid_amount' => 'Firefly III 无法设置金额 ":amount" 因为它不是一个有效的数字。',
];

6
resources/lang/zh_CN/validation.php
View File

@ -55,11 +55,11 @@ return [
'reconciled_forbidden_field' => '这笔交易已经对账，您无法更改“:field”',
'deleted_user' => '由于安全限制，您无法使用此电子邮件地址注册',
'rule_trigger_value' => '此值不能用于所选触发条件',
'rule_action_expression' => 'Invalid expression. :error',
'rule_action_expression' => '无效表达式. :error',
'rule_action_value' => '此值不能用于所选动作',
'file_already_attached' => '上传的文件“:name”已添加到此对象',
'file_attached' => '成功上传文件“:name”',
'file_zero' => 'The file is zero bytes in size.',
'file_zero' => '文件大小为零字节。',
'must_exist' => '数据库中不存在字段 :attribute 的 ID',
'all_accounts_equal' => '此字段中的所有账户必须相同',
'group_title_mandatory' => '在有超过一笔交易时，组标题为必填项',
@ -197,7 +197,7 @@ return [
*
*/
'secure_password' => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
'secure_password' => '这不是一个安全的密码。请再试一次。欲了解更多信息，请访问 https://bit.ly/FF3-password',
'valid_recurrence_rep_type' => '此重复类型不能用于定期交易',
'valid_recurrence_rep_moment' => '此重复时刻不能用于此重复类型',
'invalid_account_info' => '无效的账户信息',