diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html
index 902f6a370..671e35ce9 100644
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -12,7 +12,7 @@
   <div class="about-text">
     <h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &reg;</ng-template></h5>
     <p i18n>Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties.</p>
-    <h5>Be your own explorer&trade;</h5>
+    <h5><ng-container i18n="shared.be-your-own-explorer">Be your own explorer</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'">&trade;</ng-template></h5>
   </div>
 
   <video #promoVideo (click)="unmutePromoVideo()" (touchstart)="unmutePromoVideo()" src="/resources/promo-video/mempool-promo.mp4" poster="/resources/promo-video/mempool-promo.jpg" controls loop playsinline [autoplay]="true" [muted]="true">
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
index c9a0f54cf..4e40fd639 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -591,7 +591,7 @@
         </div>
         @if (accelerationResponse?.receiptUrl) {
           <div class="d-flex flex-row justify-content-center align-items-center">
-            <span i18n="accelerator.receipt-label"><a [href]="accelerationResponse.receiptUrl" target="_blank">Get a receipt.</a></span>
+            <span><a [href]="accelerationResponse.receiptUrl" target="_blank" i18n="accelerator.receipt-label">Get a receipt.</a></span>
           </div>
         }
       </div>
diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html
index 40a45f3e3..eabfc7c63 100644
--- a/frontend/src/app/components/pool/pool.component.html
+++ b/frontend/src/app/components/pool/pool.component.html
@@ -175,7 +175,7 @@
 
   <!-- Stratum Job -->
   <ng-container *ngIf="(job$ | async) as job;">
-    <h2 i18n="pool.next_block">Next block</h2>
+    <h2 i18n="@@bdf0e930eb22431140a2eaeacd809cc5f8ebd38c">Next Block</h2>
     <div class="box mb-3">
       <div class="row" >
         <div class="col">
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index f4fcd07af..b324062e9 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -143,7 +143,7 @@
             </div>
             <span class="explainer" i18n="tracker.explain.accelerated">Your transaction has been accelerated</span>
             @if (paymentReceiptUrl) {
-              <span class="explainer" i18n="accelerator.receipt-label"><a [href]="paymentReceiptUrl" target="_blank">Get a receipt.</a></span>
+              <span class="explainer"><a [href]="paymentReceiptUrl" target="_blank" i18n="accelerator.receipt-label">Get a receipt.</a></span>
             }
           } @else {
             @switch (trackerStage) {
@@ -177,7 +177,7 @@
                 </div>
                 <span class="explainer" i18n="tracker.explain.confirmed">Your transaction is confirmed!</span>
                 @if (paymentReceiptUrl) {
-                  <span class="explainer" i18n="accelerator.receipt-label"><a [href]="paymentReceiptUrl" target="_blank">Get a receipt.</a></span>
+                  <span class="explainer"><a [href]="paymentReceiptUrl" target="_blank" i18n="accelerator.receipt-label">Get a receipt.</a></span>
                 }
               }
               @case ('replaced') {
diff --git a/frontend/src/app/docs/api-docs/api-docs.component.html b/frontend/src/app/docs/api-docs/api-docs.component.html
index cace339b7..396c8b3ac 100644
--- a/frontend/src/app/docs/api-docs/api-docs.component.html
+++ b/frontend/src/app/docs/api-docs/api-docs.component.html
@@ -124,7 +124,7 @@
           </div>
         </div>
 
-        <p class="doc-welcome-note">Below is a reference for the {{ network.val === '' ? 'Bitcoin' : network.val.charAt(0).toUpperCase() + network.val.slice(1) }} <ng-container i18n="api-docs.title-websocket">Websocket service</ng-container> running at {{ websocketUrl(network.val) }}.</p>
+        <p class="doc-welcome-note">Below is a reference for the {{ network.val === '' ? 'Bitcoin' : network.val.charAt(0).toUpperCase() + network.val.slice(1) }} Websocket service running at {{ websocketUrl(network.val) }}.</p>
         <p class="doc-welcome-note api-note" *ngIf="officialMempoolInstance">Note that usage limits apply to our WebSocket API. Consider an <a href="https://mempool.space/enterprise">enterprise sponsorship</a> if you need higher API limits, such as higher tracking limits.</p>
 
         <div class="doc-item-container" *ngFor="let item of wsDocs">
@@ -138,7 +138,7 @@
                   <div [innerHTML]="item.description.default" i18n></div>
                 </div>
                 <div class="description">
-                  <div class="subtitle" i18n>Payload</div>
+                  <div class="subtitle">Payload</div>
                   <pre><code [innerText]="item.payload"></code></pre>
                 </div>
                 <app-code-template [hostname]="hostname" [baseNetworkUrl]="baseNetworkUrl" [method]="item.httpRequestMethod" [code]="item.codeExample.default" [network]="network.val" [showCodeExample]="item.showJsExamples"></app-code-template>
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index 0dcea9245..2df2727ec 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -86,7 +86,7 @@
           <p><a [routerLink]="['/docs/faq']" fragment="what-is-a-block-explorer" i18n="faq.what-is-a-block-exlorer">What is a block explorer?</a></p>
           <p><a [routerLink]="['/docs/faq']" fragment="what-is-a-mempool-explorer" i18n="faq.what-is-a-mempool-exlorer">What is a mempool explorer?</a></p>
           <p><a [routerLink]="['/docs/faq']" fragment="why-is-transaction-stuck-in-mempool" i18n="faq.why-isnt-my-transaction-confirming">Why isn't my transaction confirming?</a></p>
-          <p><a [routerLink]="['/docs/faq']" fragment="host-my-own-instance-raspberry-pi" i18n="faq.be-your-own-explorer">Be your own explorer&trade;</a></p>
+          <p><a [routerLink]="['/docs/faq']" fragment="host-my-own-instance-raspberry-pi"><ng-container i18n="shared.be-your-own-explorer">Be your own explorer</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'">&trade;</ng-template></a></p>
           <p><a [routerLink]="['/docs/faq' | relativeUrl]" i18n="faq.more-faq">More FAQs &raquo;</a></p>
           <p *ngIf="mempoolSpaceBuild"><a [routerLink]="['/research' | relativeUrl]" i18n="mempool-research">Research</a></p>
         </div>
diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf
index abab60e3d..6e7d06633 100644
--- a/frontend/src/locale/messages.xlf
+++ b/frontend/src/locale/messages.xlf
@@ -267,6 +267,26 @@
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="355c7916ce5b451444ac730e335fb7a8f45ad8ee" datatype="html">
+        <source>Be your own explorer</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/about/about.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/components/global-footer/global-footer.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/components/global-footer/global-footer.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/components/global-footer/global-footer.component.html</context>
+          <context context-type="linenumber">89</context>
+        </context-group>
+        <note priority="1" from="description">shared.be-your-own-explorer</note>
+      </trans-unit>
       <trans-unit id="a24b1c6a9c4334ba204e4cec2dd9f32ea33d043f" datatype="html">
         <source>Enterprise Sponsors 🚀</source>
         <context-group purpose="location">
@@ -996,19 +1016,19 @@
         </context-group>
         <note priority="1" from="description">accelerator.confirmed-acceleration-with-miners-third-party</note>
       </trans-unit>
-      <trans-unit id="fc467176b90af7bbb5150b7c79c1048753745990" datatype="html">
-        <source><x id="START_LINK" ctype="x-a" equiv-text="Get a receipt.&lt;/a&gt;&lt;/span&gt;"/>Get a receipt.<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
+      <trans-unit id="54e27b9841ce10e2650f61dbaa3a07a08a3e9fac" datatype="html">
+        <source>Get a receipt.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/accelerate-checkout/accelerate-checkout.component.html</context>
-          <context context-type="linenumber">594,595</context>
+          <context context-type="linenumber">594</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/tracker/tracker.component.html</context>
-          <context context-type="linenumber">146,147</context>
+          <context context-type="linenumber">146</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/tracker/tracker.component.html</context>
-          <context context-type="linenumber">180,181</context>
+          <context context-type="linenumber">180</context>
         </context-group>
         <note priority="1" from="description">accelerator.receipt-label</note>
       </trans-unit>
@@ -1075,6 +1095,10 @@
           <context context-type="sourcefile">src/app/components/mempool-block/mempool-block.component.ts</context>
           <context context-type="linenumber">87</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
+          <context context-type="linenumber">178</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/tracker/tracker-bar.component.html</context>
           <context context-type="linenumber">8</context>
@@ -5958,14 +5982,6 @@
         </context-group>
         <note priority="1" from="description">1m</note>
       </trans-unit>
-      <trans-unit id="2796adb5348671bc16fda1227f538f5d6ad70af5" datatype="html">
-        <source>Next block</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
-          <context context-type="linenumber">178</context>
-        </context-group>
-        <note priority="1" from="description">pool.next_block</note>
-      </trans-unit>
       <trans-unit id="d7bb114523b22ee8330164224b11d75e62966539" datatype="html">
         <source>Coinbase tag</source>
         <context-group purpose="location">
@@ -7752,21 +7768,6 @@
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4a644e4f9d05a952008365bd18185c6251aa89b7" datatype="html">
-        <source>Websocket service</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/docs/api-docs/api-docs.component.html</context>
-          <context context-type="linenumber">127</context>
-        </context-group>
-        <note priority="1" from="description">api-docs.title-websocket</note>
-      </trans-unit>
-      <trans-unit id="a9641728698315cfe217d6cbee60471dc0c0af26" datatype="html">
-        <source>Payload</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/docs/api-docs/api-docs.component.html</context>
-          <context context-type="linenumber">141</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="0a668c1c2a17e557a18fc06619998e002f50df1e" datatype="html">
         <source>Code Example</source>
         <context-group purpose="location">
@@ -9853,18 +9854,6 @@
         <note priority="1" from="description">sat/WU</note>
         <note priority="1" from="meaning">shared.sat-weight-units</note>
       </trans-unit>
-      <trans-unit id="355c7916ce5b451444ac730e335fb7a8f45ad8ee" datatype="html">
-        <source>Be your own explorer</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/components/global-footer/global-footer.component.html</context>
-          <context context-type="linenumber">20</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/components/global-footer/global-footer.component.html</context>
-          <context context-type="linenumber">64</context>
-        </context-group>
-        <note priority="1" from="description">shared.be-your-own-explorer</note>
-      </trans-unit>
       <trans-unit id="5ce2bda884ea801c34a1a6c23627d9a5e08f0a82" datatype="html">
         <source>My Account</source>
         <context-group purpose="location">
@@ -9950,14 +9939,6 @@
         </context-group>
         <note priority="1" from="description">faq.why-isnt-my-transaction-confirming</note>
       </trans-unit>
-      <trans-unit id="51e29f32829c8a9997eb4fbf73d5a9ad17bd5bfa" datatype="html">
-        <source>Be your own explorer™</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/components/global-footer/global-footer.component.html</context>
-          <context context-type="linenumber">89</context>
-        </context-group>
-        <note priority="1" from="description">faq.be-your-own-explorer</note>
-      </trans-unit>
       <trans-unit id="03f766a5a2abdbfbdcc2b6135691b9fb1f2ed530" datatype="html">
         <source>More FAQs »</source>
         <context-group purpose="location">