better wording

8 files changed, 15 insertions, 13 deletions

diff --git a/packages/demobank-ui/package.json b/packages/demobank-ui/package.json
index fa6f5bc7b..22c4dc874 100644
--- a/packages/demobank-ui/package.json
+++ b/packages/demobank-ui/package.json
@@ -12,10 +12,8 @@
     "test": "./test.mjs && mocha --require source-map-support/register 'dist/test/**/*.test.js' 'dist/test/**/test.js'",
     "lint": "eslint 'src/**/*.{js,jsx,ts,tsx}'",
     "typedoc": "typedoc --out dist/typedoc ./src/",
-    "i18n:extract": "pogen extract",
-    "i18n:merge": "pogen merge",
-    "i18n:emit": "pogen emit",
-    "i18n": "pnpm i18n:extract && pnpm i18n:merge && pnpm i18n:emit",
+    "i18n:strings": "pogen extract && pogen merge",
+    "i18n:translations": "pogen emit",
     "pretty": "prettier --write src"
   },
   "dependencies": {
diff --git a/packages/demobank-ui/src/pages/OperationState/views.tsx b/packages/demobank-ui/src/pages/OperationState/views.tsx
index 0ebdeea47..d0016a2f3 100644
--- a/packages/demobank-ui/src/pages/OperationState/views.tsx
+++ b/packages/demobank-ui/src/pages/OperationState/views.tsx
@@ -93,6 +93,7 @@ export function NeedConfirmationView({ error, onAbort: doAbort, onConfirm: doCon
           description: resp.detail.hint as TranslatedString,
           debug: resp.detail,
         })
+        // FIXME: remove exchange word
         case TalerErrorCode.BANK_CONFIRM_INCOMPLETE: return notify({
           type: "error",
           title: i18n.str`The withdraw operation cannot be confirmed because no exchange and reserve public key selection happened before`,
@@ -329,7 +330,7 @@ export function ReadyView({ uri, onClose: doClose }: State.Ready): VNode<{}> {
         <div class="mt-2 sm:flex sm:items-start sm:justify-between">
           <div class="max-w-xl text-sm text-gray-500">
             <p>
-              <i18n.Translate>If you are using a desktop browser you can open the popup now or click the link if you have the "Inject Taler support" option enabled.</i18n.Translate>
+              <i18n.Translate>If you are using a web browser on desktop you should access your wallet with the GNU Taler WebExtension now or click the link if your WebExtension have the "Inject Taler support" option enabled.</i18n.Translate>
             </p>
           </div>
           <div class="mt-5 sm:ml-6 sm:mt-0 sm:flex sm:flex-shrink-0 sm:items-center">
diff --git a/packages/demobank-ui/src/pages/SolveChallengePage.tsx b/packages/demobank-ui/src/pages/SolveChallengePage.tsx
index e55038df5..426866e40 100644
--- a/packages/demobank-ui/src/pages/SolveChallengePage.tsx
+++ b/packages/demobank-ui/src/pages/SolveChallengePage.tsx
@@ -398,7 +398,7 @@ function ChallengeDetails({ challenge, onStart }: { challenge: ChallengeInProges
                   }
                   {challenge.request.is_public !== undefined &&
                     <div class="px-4 py-2 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
-                      <dt class="text-sm font-medium leading-6 text-gray-900">Is public</dt>
+                      <dt class="text-sm font-medium leading-6 text-gray-900">Is this account public?</dt>
                       <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
                         {challenge.request.is_public ? "enable" : "disable"}
                       </dd>
diff --git a/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx b/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx
index 890478f82..a2ddc725e 100644
--- a/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx
+++ b/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx
@@ -93,6 +93,7 @@ export function WithdrawalConfirmationQuestion({
             description: resp.detail.hint as TranslatedString,
             debug: resp.detail,
           });
+          // FIXME: remove exchange word
           case TalerErrorCode.BANK_CONFIRM_INCOMPLETE: return notify({
             type: "error",
             title: i18n.str`The withdraw operation cannot be confirmed because no exchange and reserve public key selection happened before`,
diff --git a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx
index 97bc9f61f..c81c4ab8a 100644
--- a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx
+++ b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx
@@ -68,10 +68,12 @@ export function WithdrawalQRCode({
   const { body: data } = result;
 
   if (data.status === "aborted") {
+    // FIXME: remove exchange word
     return <section id="main" class="content">
       <h1 class="nav">{i18n.str`Operation aborted`}</h1>
       <section>
         <p>
+
           <i18n.Translate>
             The wire transfer to the GNU Taler Exchange bank's account was aborted, your balance
             was not affected.
diff --git a/packages/demobank-ui/src/pages/admin/AccountForm.tsx b/packages/demobank-ui/src/pages/admin/AccountForm.tsx
index 7296e7744..827b2a0f0 100644
--- a/packages/demobank-ui/src/pages/admin/AccountForm.tsx
+++ b/packages/demobank-ui/src/pages/admin/AccountForm.tsx
@@ -408,7 +408,7 @@ export function AccountForm<PurposeType extends keyof ChangeByPurposeType>({
               <div class="flex items-center justify-between">
                 <span class="flex flex-grow flex-col">
                   <span class="text-sm text-black font-medium leading-6 " id="availability-label">
-                    <i18n.Translate>Is an exchange</i18n.Translate>
+                    <i18n.Translate>Is this a Taler Exchange?</i18n.Translate>
                   </span>
                 </span>
                 <button type="button" data-enabled={form.isExchange ?? defaultValue.isExchange ? "true" : "false"} class="bg-indigo-600 data-[enabled=false]:bg-gray-200 relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2" role="switch" aria-checked="false" aria-labelledby="availability-label" aria-describedby="availability-description"
@@ -437,7 +437,7 @@ export function AccountForm<PurposeType extends keyof ChangeByPurposeType>({
                 class="block text-sm font-medium leading-6 text-gray-900"
                 for="channel"
               >
-                {i18n.str`Confirmation the operation using`}
+                {i18n.str`Confirm the operation using`}
               </label>
               <div class="mt-2 max-w-xl text-sm text-gray-500">
                 <div class="px-4 mt-4 grid grid-cols-1 gap-y-6">
@@ -506,7 +506,7 @@ export function AccountForm<PurposeType extends keyof ChangeByPurposeType>({
             <div class="flex items-center justify-between">
               <span class="flex flex-grow flex-col">
                 <span class="text-sm text-black font-medium leading-6 " id="availability-label">
-                  <i18n.Translate>Is public</i18n.Translate>
+                  <i18n.Translate>Is this account public?</i18n.Translate>
                 </span>
               </span>
               <button type="button" data-enabled={form.isPublic ?? defaultValue.isPublic ? "true" : "false"} class="bg-indigo-600 data-[enabled=false]:bg-gray-200 relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2" role="switch" aria-checked="false" aria-labelledby="availability-label" aria-describedby="availability-description"
diff --git a/packages/demobank-ui/src/pages/business/CreateCashout.tsx b/packages/demobank-ui/src/pages/business/CreateCashout.tsx
index e4fda8fb6..e3602bff1 100644
--- a/packages/demobank-ui/src/pages/business/CreateCashout.tsx
+++ b/packages/demobank-ui/src/pages/business/CreateCashout.tsx
@@ -175,7 +175,7 @@ export function CreateCashout({
     amount: !form.amount
       ? i18n.str`required`
       : !inputAmount
-        ? i18n.str`could not be parsed`
+        ? i18n.str`invalid`
         : Amounts.cmp(limit, calc.debit) === -1
           ? i18n.str`balance is not enough`
           : Amounts.cmp(calc.credit, sellFee) === -1
@@ -229,7 +229,7 @@ export function CreateCashout({
           });
           case TalerErrorCode.BANK_BAD_CONVERSION: return notify({
             type: "error",
-            title: i18n.str`The exchange rate was incorrectly applied`,
+            title: i18n.str`The conversion rate was incorrectly applied`,
             description: resp.detail.hint as TranslatedString,
             debug: resp.detail,
           });
@@ -467,7 +467,7 @@ export function CreateCashout({
                     class="block text-sm font-medium leading-6 text-gray-900"
                     for="channel"
                   >
-                    {i18n.str`Confirmation the operation using`}
+                    {i18n.str`Confirm the operation using`}
                   </label>
                   <div class="mt-2 max-w-xl text-sm text-gray-500">
                     <div class="px-4 mt-4 grid grid-cols-1 gap-y-6">
diff --git a/packages/demobank-ui/src/pages/business/ShowCashoutDetails.tsx b/packages/demobank-ui/src/pages/business/ShowCashoutDetails.tsx
index b517a7d42..76876df5d 100644
--- a/packages/demobank-ui/src/pages/business/ShowCashoutDetails.tsx
+++ b/packages/demobank-ui/src/pages/business/ShowCashoutDetails.tsx
@@ -156,7 +156,7 @@ export function ShowCashoutDetails({
           });
           case TalerErrorCode.BANK_BAD_CONVERSION: return notify({
             type: "error",
-            title: i18n.str`The exchange rate was incorrectly applied`,
+            title: i18n.str`The conversion rate was incorrectly applied`,
             description: resp.detail.hint as TranslatedString,
             debug: resp.detail,
           });