🍒 Cherry pick PR #75675 to staging 🍒#75714
Merged
Merged
Conversation
(cherry picked from commit 7e65b39) (cherry-picked to staging by marcaaron)
os-botify
Bot
added
Engineering
Hourly
os-botify
Bot
added
Engineering
Hourly
melvin-bot
Bot
requested review from
youssef-lr
and removed request for
a team
November 21, 2025 00:22
|
@youssef-lr Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
melvin-bot
Bot
requested review from
trjExpensify
and removed request for
a team
November 21, 2025 00:32
Contributor
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index e903f997..0ecdf1df 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7439,12 +7439,12 @@ ${
},
migratedUserWelcomeModal: {
title: 'Willkommen bei New Expensify!',
- subtitle: 'New Expensify hat die gleiche großartige Automatisierung, aber jetzt mit erstaunlicher Zusammenarbeit:',
+ subtitle: 'Das neue Expensify bietet dieselbe großartige Automatisierung, jetzt jedoch mit beeindruckender Zusammenarbeit:',
confirmText: "Los geht's!",
features: {
- chat: '<strong>Chatten Sie direkt über jede Ausgabe</strong>, jeden Bericht oder Arbeitsbereich',
- scanReceipt: '<strong>Belege scannen</strong> und Rückerstattung erhalten',
- crossPlatform: 'Erledigen Sie <strong>alles</strong> von Ihrem Telefon oder Browser aus',
+ chat: '<strong>Direkt bei jeder Ausgabe chatten</strong>, in jedem Bericht oder Arbeitsbereich',
+ scanReceipt: '<strong>Belege scannen</strong> und Geld zurückerhalten',
+ crossPlatform: 'Erledigen Sie <strong>alles</strong> auf Ihrem Smartphone oder im Browser',
},
},
productTrainingTooltip: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index dd1db695..ed110587 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7444,12 +7444,12 @@ ${
},
migratedUserWelcomeModal: {
title: 'Bienvenue sur New Expensify !',
- subtitle: 'New Expensify a la même excellente automatisation, mais maintenant avec une collaboration incroyable :',
+ subtitle: 'Le nouvel Expensify offre la même excellente automatisation, mais désormais avec une collaboration incroyable :',
confirmText: 'Allons-y !',
features: {
- chat: "<strong>Discutez directement sur n'importe quelle dépense</strong>, rapport ou espace de travail",
- scanReceipt: '<strong>Scannez les reçus</strong> et soyez remboursé',
- crossPlatform: 'Faites <strong>tout</strong> depuis votre téléphone ou navigateur',
+ chat: '<strong>Discutez directement sur n’importe quelle dépense</strong>, rapport ou espace de travail',
+ scanReceipt: '<strong>Numérisez des reçus</strong> et faites-vous rembourser',
+ crossPlatform: 'Faites <strong>tout</strong> depuis votre téléphone ou votre navigateur',
},
},
productTrainingTooltip: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 8fd9b7bb..64b73ac6 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7422,12 +7422,12 @@ ${
},
migratedUserWelcomeModal: {
title: 'Benvenuto in New Expensify!',
- subtitle: 'Il nuovo Expensify ha la stessa fantastica automazione, ma ora con una collaborazione straordinaria:',
+ subtitle: 'Il nuovo Expensify offre la stessa fantastica automazione, ma ora con una collaborazione straordinaria:',
confirmText: 'Andiamo!',
features: {
chat: '<strong>Chatta direttamente su qualsiasi spesa</strong>, report o spazio di lavoro',
scanReceipt: '<strong>Scansiona le ricevute</strong> e ricevi il rimborso',
- crossPlatform: 'Fai <strong>tutto</strong> dal tuo telefono o browser',
+ crossPlatform: 'Fai <strong>tutto</strong> dal tuo telefono o dal tuo browser',
},
},
productTrainingTooltip: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index cb094ba0..44cd4654 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7354,12 +7354,12 @@ ${
},
migratedUserWelcomeModal: {
title: 'New Expensifyへようこそ！',
- subtitle: '新しいExpensifyは、素晴らしい自動化機能に加えて、驚くべきコラボレーション機能を備えています。',
+ subtitle: 'New Expensify は、同じ優れた自動化はそのままに、今では驚くべきコラボレーションも実現します:',
confirmText: '行きましょう！',
features: {
- chat: '<strong>任意の経費</strong>、レポート、またはワークスペースで直接チャット',
- scanReceipt: '<strong>領収書をスキャン</strong>して払い戻しを受ける',
- crossPlatform: '<strong>すべて</strong>を携帯電話やブラウザから行う',
+ chat: '<strong>あらゆる経費で直接チャット</strong>、レポートやワークスペースでも',
+ scanReceipt: '<strong>領収書をスキャン</strong>して払い戻しを受け取りましょう',
+ crossPlatform: 'スマートフォンまたはブラウザから<strong>すべて</strong>を行えます',
},
},
productTrainingTooltip: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 05017f75..99bc79c8 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7402,11 +7402,11 @@ ${
},
migratedUserWelcomeModal: {
title: 'Welkom bij New Expensify!',
- subtitle: 'Nieuwe Expensify heeft dezelfde geweldige automatisering, maar nu met geweldige samenwerking:',
+ subtitle: 'New Expensify heeft dezelfde geweldige automatisering, maar nu ook met fantastische samenwerking:',
confirmText: 'Laten we gaan!',
features: {
- chat: '<strong>Chat direct op elke uitgave</strong>, rapport of werkruimte',
- scanReceipt: '<strong>Scan bonnetjes</strong> en krijg je geld terugbetaald',
+ chat: '<strong>Chat rechtstreeks op elke uitgave</strong>, rapport of werkruimte',
+ scanReceipt: '<strong>Scan bonnen</strong> en krijg je geld terug',
crossPlatform: 'Doe <strong>alles</strong> vanaf je telefoon of browser',
},
},
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 35d32f05..f2e6f701 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7393,7 +7393,7 @@ ${
subtitle: 'Nowy Expensify ma tę samą świetną automatyzację, ale teraz z niesamowitą współpracą:',
confirmText: 'Zaczynajmy!',
features: {
- chat: '<strong>Czatuj bezpośrednio na dowolnym wydatku</strong>, raporcie lub przestrzeni roboczej',
+ chat: '<strong>Czatuj bezpośrednio przy dowolnym wydatku</strong>, raporcie lub przestrzeni roboczej',
scanReceipt: '<strong>Skanuj paragony</strong> i otrzymuj zwrot pieniędzy',
crossPlatform: 'Rób <strong>wszystko</strong> z telefonu lub przeglądarki',
},
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index a5249828..e3e23086 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7400,12 +7400,12 @@ ${
},
migratedUserWelcomeModal: {
title: 'Bem-vindo ao New Expensify!',
- subtitle: 'O novo Expensify tem a mesma ótima automação, mas agora com uma colaboração incrível:',
+ subtitle: 'O Novo Expensify tem a mesma excelente automação, mas agora com uma colaboração incrível:',
confirmText: 'Vamos lá!',
features: {
chat: '<strong>Converse diretamente em qualquer despesa</strong>, relatório ou espaço de trabalho',
- scanReceipt: '<strong>Escaneie recibos</strong> e receba o reembolso',
- crossPlatform: 'Faça <strong>tudo</strong> do seu telefone ou navegador',
+ scanReceipt: '<strong>Digitalize recibos</strong> e receba o reembolso',
+ crossPlatform: 'Faça <strong>tudo</strong> pelo seu celular ou navegador',
},
},
productTrainingTooltip: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c9acd844..a51eb57a 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7241,13 +7241,9 @@ ${
},
migratedUserWelcomeModal: {
title: '欢迎使用 New Expensify！',
- subtitle: '新Expensify拥有同样出色的自动化功能，但现在增加了令人惊叹的协作功能：',
+ subtitle: '全新 Expensify 拥有同样出色的自动化，同时新增令人惊叹的协作功能：',
confirmText: '我们走吧！',
- features: {
- chat: '<strong>直接在任何费用</strong>、报告或工作区上聊天',
- scanReceipt: '<strong>扫描收据</strong>并获得报销',
- crossPlatform: '通过手机或浏览器完成<strong>所有操作</strong>',
- },
+ features: {chat: '<strong>在任何费用上直接聊天</strong>、报告或工作区', scanReceipt: '<strong>扫描收据</strong>并获得报销', crossPlatform: '用手机或浏览器完成<strong>一切</strong>'},
},
productTrainingTooltip: {
// TODO: CONCIERGE_LHN_GBR tooltip will be replaced by a tooltip in the #admins room
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
grgia
approved these changes
Nov 21, 2025
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / SafariMacOS: Desktop |
Contributor
|
🚀 Cherry-picked to staging by https://github.com/grgia in version: 9.2.61-5 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/grgia in version: 9.2.61-5 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🍒 Cherry pick #75675 to staging 🍒
This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:
Then manually resolve conflicts, and commit the change with
git cherry-pick --continue. Lastly, please run:This last part is important. It will help us keep track of who triggered this CP, and will ensure that version bumps are tracked correctly. Once all that's done, push your changes with
git push origin cherry-pick-staging-75675-19555581075-1, and then open this PR for review.Note that you must test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.
Pro-tip: If this PR appears to have conflicts against the staging base, it means that the version on staging has been updated. The easiest thing to do if you see this is to close the PR and re-run the CP.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop