Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/localization of FIRE page (#7401)
Thomas Kaulad92c763cb43
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 49da55d4f2..cdf6e47181 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -16,10 +16,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Recomputed the portfolio snapshot calculation in the background on a portfolio change- Improved the deduplication of the portfolio snapshot calculation jobs by considering the filters- Refactored the deprecated animation providers (`provideAnimations()` and `provideNoopAnimations()`)+- Improved the language localization for German (`de`)- Improved the language localization for Polish (`pl`)### Fixed+- Fixed an issue with the localization in the _FIRE_ page- Improved the spacing in the testimonial section on the landing page## 3.32.0 - 2026-07-22diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.tsindex e7b6948196..b7ef8b302b 100644--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts@@ -1,6 +1,7 @@import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';import { UserService } from '@ghostfolio/client/services/user/user.service';import { SubscriptionType } from '@ghostfolio/common/enums';+import { formatMonthAndYear } from '@ghostfolio/common/helper';import {FireCalculationCompleteEvent,FireWealth,@@ -77,6 +78,20 @@ export class GfFirePageComponent implements OnInit {);private readonly userService = inject(UserService);+ protected get retirementDateLabel(): string {+ const retirementDate =+ this.user?.settings?.retirementDate ?? this.retirementDate;++ if (!retirementDate) {+ return '';+ }++ return formatMonthAndYear({+ date: new Date(retirementDate),+ locale: this.user?.settings?.locale+ });+ }+public ngOnInit() {this.isLoading = true;diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.html b/apps/client/src/app/pages/portfolio/fire/fire-page.htmlindex 2730b35cd5..3bc62dd95f 100644--- a/apps/client/src/app/pages/portfolio/fire/fire-page.html+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.html@@ -66,47 +66,38 @@<div [class.text-muted]="user?.subscription?.type === 'Basic'"><div class="mb-2"><ng-container i18n- >If you retire today, you would be able to withdraw</ng-container- >- <ng-container> </ng-container>- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [isCurrency]="true"- [locale]="user?.settings?.locale"- [unit]="user?.settings?.baseCurrency"- [value]="withdrawalRatePerYear?.toNumber()"- />- <ng-container> </ng-container>- <ng-container i18n>per year</ng-container></span- >- <ng-container> </ng-container>- <ng-container i18n>or</ng-container>- <ng-container> </ng-container>- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [isCurrency]="true"- [locale]="user?.settings?.locale"- [unit]="user?.settings?.baseCurrency"- [value]="withdrawalRatePerMonth?.toNumber()"- />- <ng-container> </ng-container>- <ng-container i18n>per month</ng-container></span+ >If you retire today, you would be able to withdraw+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [isCurrency]="true"+ [locale]="user?.settings?.locale"+ [unit]="user?.settings?.baseCurrency"+ [value]="withdrawalRatePerYear?.toNumber()"+ />+ per year</span+ >+ or+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [isCurrency]="true"+ [locale]="user?.settings?.locale"+ [unit]="user?.settings?.baseCurrency"+ [value]="withdrawalRatePerMonth?.toNumber()"+ />+ per month</span+ >, based on your total assets of+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [isCurrency]="true"+ [locale]="user?.settings?.locale"+ [unit]="user?.settings?.baseCurrency"+ [value]="fireWealth?.today.valueInBaseCurrency"+ /></span>+ and a safe withdrawal rate (SWR) of</ng-container>- <ng-container i18n>, based on your total assets of</ng-container>- <ng-container> </ng-container>- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [isCurrency]="true"- [locale]="user?.settings?.locale"- [unit]="user?.settings?.baseCurrency"- [value]="fireWealth?.today.valueInBaseCurrency"- />- </span>- <ng-container> </ng-container>- <ng-container i18n>and a safe withdrawal rate (SWR) of</ng-container>@if (!hasImpersonationId &&hasPermissionToUpdateUserSettings &&@@ -137,53 +128,40 @@@if (user?.settings?.isExperimentalFeatures) {<div>- <ng-container i18n>By</ng-container>- <ng-container> </ng-container>- <span class="font-weight-bold">{{- user?.settings?.retirementDate ?? retirementDate- | date: 'MMMM yyyy'- }}</span>- <ng-container i18n="@@page.fire.projected.1">,</ng-container>- <ng-container> </ng-container>- <ng-container i18n>this is projected to increase to</ng-container>- <ng-container> </ng-container>- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [isCurrency]="true"- [locale]="user?.settings?.locale"- [unit]="user?.settings?.baseCurrency"- [value]="withdrawalRatePerYearProjected?.toNumber()"- />- <ng-container> </ng-container>- <ng-container i18n>per year</ng-container></span+ <ng-container i18n+ >By <span class="font-weight-bold">{{ retirementDateLabel }}</span+ >, this is projected to increase to+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [isCurrency]="true"+ [locale]="user?.settings?.locale"+ [unit]="user?.settings?.baseCurrency"+ [value]="withdrawalRatePerYearProjected?.toNumber()"+ />+ per year</span+ >+ or+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [isCurrency]="true"+ [locale]="user?.settings?.locale"+ [unit]="user?.settings?.baseCurrency"+ [value]="withdrawalRatePerMonthProjected?.toNumber()"+ />+ per month</span+ >, assuming a+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [isPercent]="true"+ [locale]="user?.settings?.locale"+ [precision]="2"+ [value]="user?.settings?.annualInterestRate / 100"+ /></span>+ annual interest rate.</ng-container>- <ng-container> </ng-container>- <ng-container i18n>or</ng-container>- <ng-container> </ng-container>- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [isCurrency]="true"- [locale]="user?.settings?.locale"- [unit]="user?.settings?.baseCurrency"- [value]="withdrawalRatePerMonthProjected?.toNumber()"- />- <ng-container> </ng-container>- <ng-container i18n>per month</ng-container></span- >- <ng-container i18n>, assuming a</ng-container>- <ng-container> </ng-container>- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [isPercent]="true"- [locale]="user?.settings?.locale"- [precision]="2"- [value]="user?.settings?.annualInterestRate / 100"- /></span>- <ng-container> </ng-container>- <ng-container i18n>annual interest rate</ng-container>.</div>}</div>diff --git a/apps/client/src/locales/messages.ca.xlf b/apps/client/src/locales/messages.ca.xlfindex aa1734e324..b6ae28a2a7 100644--- a/apps/client/src/locales/messages.ca.xlf+++ b/apps/client/src/locales/messages.ca.xlf@@ -4223,14 +4223,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="new">and a safe withdrawal rate (SWR) of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><target state="translated">Usuaris nous</target>@@ -6636,9 +6628,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="new">If you retire today, you would be able to withdraw</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="new">If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per any<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> o <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -6968,14 +6960,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="new">, based on your total assets of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="new">Inactive</target>diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlfindex 1aa95c70f7..1d65a313ab 100644--- a/apps/client/src/locales/messages.de.xlf+++ b/apps/client/src/locales/messages.de.xlf@@ -3281,9 +3281,9 @@<context context-type="linenumber">77</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">Wenn du heute in den Ruhestand gehen würdest, könntest du</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">Wenn du heute in den Ruhestand gehen würdest, könntest du <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> pro Jahr<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> oder <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> pro Monat<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> entnehmen, bezogen auf dein Gesamtanlagevermögen von <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> und einer sicheren Entnahmerate (SWR) von</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5763,14 +5763,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">und einer sicheren Entnahmerate (SWR) von</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="translated">Verfügbar für</target>@@ -6992,14 +6984,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">entnehmen, bezogen auf dein Gesamtanlagevermögen von</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Inaktiv</target>diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlfindex 81f5ce42e6..e030136af3 100644--- a/apps/client/src/locales/messages.es.xlf+++ b/apps/client/src/locales/messages.es.xlf@@ -3266,9 +3266,9 @@<context context-type="linenumber">77</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">Si te jubilas hoy, podrías retirar</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">Si te jubilas hoy, podrías retirar <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> por año<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> o <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> por mes<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, basado en tus activos totales de <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> y una tasa de retiro segura (SWR) de</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5740,14 +5740,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">y una tasa de retiro segura (SWR) de</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="new">Available on</target>@@ -6969,14 +6961,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">, basado en tus activos totales de</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Inactiva</target>diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlfindex 3637a997f4..3763466f76 100644--- a/apps/client/src/locales/messages.fr.xlf+++ b/apps/client/src/locales/messages.fr.xlf@@ -3441,9 +3441,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">Si vous partez à la retraite aujourd’hui, vous pourriez retirer</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">Si vous partez à la retraite aujourd’hui, vous pourriez retirer <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> par an<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> ou <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> par mois<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, basé sur le total de vos actifs de <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> et un taux de retrait sûr (SWR) de</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5739,14 +5739,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">et un taux de retrait sûr (SWR) de</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="translated">Disponible sur</target>@@ -6968,14 +6960,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">, basé sur le total de vos actifs de</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Inactif</target>diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlfindex 26f5752c84..86675aac45 100644--- a/apps/client/src/locales/messages.it.xlf+++ b/apps/client/src/locales/messages.it.xlf@@ -3266,9 +3266,9 @@<context context-type="linenumber">77</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="new">If you retire today, you would be able to withdraw</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="new">If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per anno<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> oppure <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5740,14 +5740,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="new">and a safe withdrawal rate (SWR) of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="new">Available on</target>@@ -6969,14 +6961,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="new">, based on your total assets of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Inattivo</target>diff --git a/apps/client/src/locales/messages.ja.xlf b/apps/client/src/locales/messages.ja.xlfindex f584352a48..219f41f817 100644--- a/apps/client/src/locales/messages.ja.xlf+++ b/apps/client/src/locales/messages.ja.xlf@@ -3879,14 +3879,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">および安全な引き出し率(SWR)の</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><target state="translated">新規ユーザー</target>@@ -6068,9 +6060,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">もしあなたが今日退職するなら、あなたは引き出すことができるでしょう</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="new">もしあなたが今日退職するなら、あなたは引き出すことができるでしょう <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> 年あたり<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> または <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> 月あたり<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> および安全な引き出し率(SWR)の</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -7041,14 +7033,6 @@<context context-type="linenumber">39</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="new">, based on your total assets of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="new">Inactive</target>diff --git a/apps/client/src/locales/messages.ko.xlf b/apps/client/src/locales/messages.ko.xlfindex 6793e720ea..b570f552ca 100644--- a/apps/client/src/locales/messages.ko.xlf+++ b/apps/client/src/locales/messages.ko.xlf@@ -3871,14 +3871,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">안전 인출률(SWR)은 다음과 같습니다.</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><target state="translated">신규 사용자</target>@@ -6068,9 +6060,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">오늘 퇴사하면 탈퇴 가능</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">오늘 퇴사하면 탈퇴 가능 <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> 연간<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> 또는 <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> 매월<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, 귀하의 총 자산을 기준으로 <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> 안전 인출률(SWR)은 다음과 같습니다.</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -7041,14 +7033,6 @@<context context-type="linenumber">39</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">, 귀하의 총 자산을 기준으로</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">비활성</target>diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlfindex 1f70d55182..cd37770500 100644--- a/apps/client/src/locales/messages.nl.xlf+++ b/apps/client/src/locales/messages.nl.xlf@@ -3265,9 +3265,9 @@<context context-type="linenumber">77</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">Als u vandaag met pensioen gaat, kunt u</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">Als u vandaag met pensioen gaat, kunt u <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per jaar<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per maand<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> opnemen, dit is gebaseerd op uw totale vermogen van <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> en een veilige opnameratio (SWR) van</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5739,14 +5739,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">en een veilige opnameratio (SWR) van</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="translated">Beschikbaar op</target>@@ -6968,14 +6960,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">opnemen, dit is gebaseerd op uw totale vermogen van</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Inactief</target>diff --git a/apps/client/src/locales/messages.pl.xlf b/apps/client/src/locales/messages.pl.xlfindex 0bc20eec6b..1068a7d573 100644--- a/apps/client/src/locales/messages.pl.xlf+++ b/apps/client/src/locales/messages.pl.xlf@@ -3838,14 +3838,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">oraz bezpiecznej stopy wypłaty (SWR) na poziomie</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><target state="translated">Nowi Użytkownicy</target>@@ -5991,9 +5983,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">Gdybyś przeszedł na emeryturę dziś, mógłbyś wypłacać</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">Gdybyś przeszedł na emeryturę dziś, mógłbyś wypłacać <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> rocznie<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> lub <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> miesięcznie<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, na podstawie całkowitej wartości aktywów wynoszącej <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> oraz bezpiecznej stopy wypłaty (SWR) na poziomie</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -6968,14 +6960,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">, na podstawie całkowitej wartości aktywów wynoszącej</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Nieaktywny</target>diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlfindex 80f351a930..751e813baf 100644--- a/apps/client/src/locales/messages.pt.xlf+++ b/apps/client/src/locales/messages.pt.xlf@@ -3269,9 +3269,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="new">If you retire today, you would be able to withdraw</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="new">If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> por ano<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> ou <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5739,14 +5739,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="new">and a safe withdrawal rate (SWR) of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="new">Available on</target>@@ -6968,14 +6960,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="new">, based on your total assets of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Inativo</target>diff --git a/apps/client/src/locales/messages.tr.xlf b/apps/client/src/locales/messages.tr.xlfindex 85a1ce506d..3f7086da71 100644--- a/apps/client/src/locales/messages.tr.xlf+++ b/apps/client/src/locales/messages.tr.xlf@@ -5643,9 +5643,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="new">If you retire today, you would be able to withdraw</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="new">If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> yıllık<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> veya <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -5747,14 +5747,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="new">and a safe withdrawal rate (SWR) of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6075566839446502414" datatype="html"><source>Available on</source><target state="new">Available on</target>@@ -6968,14 +6960,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="new">, based on your total assets of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Pasif</target>diff --git a/apps/client/src/locales/messages.uk.xlf b/apps/client/src/locales/messages.uk.xlfindex 953b05b35c..a3857d31dc 100644--- a/apps/client/src/locales/messages.uk.xlf+++ b/apps/client/src/locales/messages.uk.xlf@@ -4519,14 +4519,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">та безпечним рівнем зняття коштів (SWR) у розмірі</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><target state="translated">Нові користувачі</target>@@ -5343,14 +5335,6 @@<context context-type="linenumber">58</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="new">, based on your total assets of</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">Неактивний</target>@@ -7598,9 +7582,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="new">If you retire today, you would be able to withdraw</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="new">If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> на рік<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> або <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> та безпечним рівнем зняття коштів (SWR) у розмірі</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlfindex 5e26a30cb0..208eff81b4 100644--- a/apps/client/src/locales/messages.xlf+++ b/apps/client/src/locales/messages.xlf@@ -3544,13 +3544,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><context-group purpose="location">@@ -5519,8 +5512,8 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -6396,13 +6389,6 @@<context context-type="linenumber">39</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><context-group purpose="location">diff --git a/apps/client/src/locales/messages.zh.xlf b/apps/client/src/locales/messages.zh.xlfindex be338019d9..6a3439d47f 100644--- a/apps/client/src/locales/messages.zh.xlf+++ b/apps/client/src/locales/messages.zh.xlf@@ -3855,14 +3855,6 @@<context context-type="linenumber">60</context></context-group></trans-unit>- <trans-unit id="70768492340592330" datatype="html">- <source>and a safe withdrawal rate (SWR) of</source>- <target state="translated">和安全取款率 (SWR) 为</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">109</context>- </context-group>- </trans-unit><trans-unit id="6099700884541852399" datatype="html"><source>New Users</source><target state="translated">新用户</target>@@ -6044,9 +6036,9 @@<context context-type="linenumber">78</context></context-group></trans-unit>- <trans-unit id="3227075298129844075" datatype="html">- <source>If you retire today, you would be able to withdraw</source>- <target state="translated">如果您今天退休,您将能够提取</target>+ <trans-unit id="5552246967241337741" datatype="html">+ <source>If you retire today, you would be able to withdraw <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per year<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> or <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> per month<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>, based on your total assets of <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> and a safe withdrawal rate (SWR) of</source>+ <target state="translated">如果您今天退休,您将能够提取 <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerYear?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> 每年<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> 或 <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_1" ctype="x-gf_value_1" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="withdrawalRatePerMonth?.toNumber()" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/> 每月<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>基于您总资产的 <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="font-weight-bold" >"/><x id="START_TAG_GF_VALUE_2" ctype="x-gf_value_2" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_GF_VALUE" ctype="x-gf_value" equiv-text="<gf-value class="d-inline-block" [isCurrency]="true" [locale]="user?.settings?.locale" [unit]="user?.settings?.baseCurrency" [value]="fireWealth?.today.valueInBaseCurrency" />"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> 和安全取款率 (SWR) 为</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context><context context-type="linenumber">69</context>@@ -6969,14 +6961,6 @@<context context-type="linenumber">263</context></context-group></trans-unit>- <trans-unit id="1355312194390410495" datatype="html">- <source>, based on your total assets of</source>- <target state="translated">基于您总资产的</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/fire/fire-page.html</context>- <context context-type="linenumber">97</context>- </context-group>- </trans-unit><trans-unit id="1859131936150262113" datatype="html"><source>Inactive</source><target state="translated">非活跃</target>diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.tsindex 7787b2a97b..5d1ff538e5 100644--- a/libs/common/src/lib/helper.ts+++ b/libs/common/src/lib/helper.ts@@ -233,6 +233,19 @@ export function extractNumberFromString({}}+export function formatMonthAndYear({+ date,+ locale+}: {+ date: Date;+ locale?: string;+}) {+ return new Intl.DateTimeFormat(locale, {+ month: 'long',+ year: 'numeric'+ }).format(date);+}+export function getAllActivityTypes(): ActivityType[] {return Object.values(ActivityType);}diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.html b/libs/ui/src/lib/fire-calculator/fire-calculator.component.htmlindex df78cadca7..b2162a764a 100644--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.html+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.html@@ -30,11 +30,7 @@<mat-form-field appearance="outline" class="w-100"><mat-label i18n>Retirement Date</mat-label>- <div>- {{- calculatorForm.get('retirementDate')?.value | date: 'MMMM yyyy'- }}- </div>+ <div>{{ retirementDateLabel }}</div><inputclass="d-none"formControlName="retirementDate"diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.component.tsindex fa998778d6..cfa2ee5cd2 100644--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts@@ -3,7 +3,7 @@ import {transformTickToAbbreviation} from '@ghostfolio/common/chart-helper';import { primaryColorRgb } from '@ghostfolio/common/config';-import { getLocale } from '@ghostfolio/common/helper';+import { formatMonthAndYear, getLocale } from '@ghostfolio/common/helper';import { FireCalculationCompleteEvent } from '@ghostfolio/common/interfaces';import { ColorScheme } from '@ghostfolio/common/types';@@ -208,6 +208,19 @@ export class GfFireCalculatorComponent implements OnChanges, OnDestroy {});}+ protected get retirementDateLabel(): string {+ const retirementDate = this.calculatorForm.get('retirementDate')?.value;++ if (!retirementDate) {+ return '';+ }++ return formatMonthAndYear({+ date: retirementDate,+ locale: this.locale+ });+ }+public ngOnChanges() {if (isNumber(this.fireWealth) && this.fireWealth >= 0) {this.calculatorForm.setValue(