Merge branch 'master' into simon/bisq-dashboard

# Conflicts:
#	frontend/src/locale/messages.xlf

frontend/README.md

@@ -22,6 +22,7 @@ https://www.transifex.com/mempool/mempool/dashboard/
 * Dutch @m__btc
 * Japanese @wiz @japananon
 * Norwegian @T82771355
+* Polish @maciejsoltysiak
 * Portugese @jgcastro1985
 * Slovenian @thepkbadger
 * Finnish @bio_bitcoin

frontend/angular.json

@@ -71,6 +71,10 @@
             "translation": "src/locale/messages.nb.xlf",
             "baseHref": "/nb/"
           },
+          "pl": {
+            "translation": "src/locale/messages.pl.xlf",
+            "baseHref": "/pl/"
+          },
           "pt": {
             "translation": "src/locale/messages.pt.xlf",
             "baseHref": "/pt/"

frontend/src/app/app.constants.ts

@@ -71,7 +71,7 @@ export const languages: Language[] = [
    { code: 'ja', name: '日本語' },          // Japanese
    { code: 'nb', name: 'Norsk' },           // Norwegian Bokmål
 // { code: 'nn', name: 'Norsk Nynorsk' },   // Norwegian Nynorsk
-// { code: 'pl', name: 'Polski' },          // Polish
+   { code: 'pl', name: 'Polski' },          // Polish
    { code: 'pt', name: 'Português' },       // Portuguese
 // { code: 'pt-BR', name: 'Português (Brazil)' }, // Portuguese (Brazil)
 // { code: 'ro', name: 'Română' },          // Romanian

frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts

@@ -27,19 +27,19 @@ export class BisqTransactionsComponent implements OnInit {
   types: string[] = [];
 
   txTypeOptions: IMultiSelectOption[] = [
-      { id: 1, name: 'Asset listing fee' },
-      { id: 2, name: 'Blind vote' },
-      { id: 3, name: 'Compensation request' },
-      { id: 4, name: 'Genesis' },
-      { id: 13, name: 'Irregular' },
-      { id: 5, name: 'Lockup' },
-      { id: 6, name: 'Pay trade fee' },
-      { id: 7, name: 'Proof of burn' },
-      { id: 8, name: 'Proposal' },
-      { id: 9, name: 'Reimbursement request' },
-      { id: 10, name: 'Transfer BSQ' },
-      { id: 11, name: 'Unlock' },
-      { id: 12, name: 'Vote reveal' },
+      { id: 1, name: $localize`Asset listing fee` },
+      { id: 2, name: $localize`Blind vote` },
+      { id: 3, name: $localize`Compensation request` },
+      { id: 4, name: $localize`Genesis` },
+      { id: 13, name: $localize`Irregular` },
+      { id: 5, name: $localize`Lockup` },
+      { id: 6, name: $localize`Pay trade fee` },
+      { id: 7, name: $localize`Proof of burn` },
+      { id: 8, name: $localize`Proposal` },
+      { id: 9, name: $localize`Reimbursement request` },
+      { id: 10, name: $localize`Transfer BSQ` },
+      { id: 11, name: $localize`Unlock` },
+      { id: 12, name: $localize`Vote reveal` },
   ];
   txTypesDefaultChecked = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
 

frontend/src/app/components/about/about.component.html

@@ -44,7 +44,7 @@
     <br><br>
     <br><br>
 
-    <h3 i18n="about.sponsors.enterprise">Enterprise Sponsors 🚀</h3>
+    <h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3>
 
     <a href="https://squarecrypto.org/" target="_blank">
       <div class="profile_photo enterprise_sponsor d-inline-block" title="Square Crypto">

frontend/src/app/components/asset/asset.component.html

@@ -1,5 +1,5 @@
 <div class="container-xl">
-  <h1 style="float: left;">Asset</h1>
+  <h1 style="float: left;" i18n="asset|Liquid Asset page title">Asset</h1>
   <a [routerLink]="['/asset/' | relativeUrl, assetString]" style="line-height: 56px; margin-left: 10px;">
     <span class="d-inline d-lg-none">{{ assetString | shortenString : 24 }}</span>
     <span class="d-none d-lg-inline">{{ assetString }}</span>
@@ -72,7 +72,7 @@
 
     <br>
 
-    <h2><ng-template [ngIf]="transactions?.length">{{ (transactions?.length | number) || '?' }} of </ng-template>{{ txCount | number }} <ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template><ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template></h2>
+    <h2><ng-template [ngIf]="transactions?.length" i18n="asset.M_of_N">{{ (transactions?.length | number) || '?' }} of </ng-template>{{ txCount | number }} <ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template><ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template></h2>
 
     <app-transactions-list [transactions]="transactions" [showConfirmations]="true" (loadMore)="loadMore()"></app-transactions-list>
 

frontend/src/app/shared/pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts

@@ -8,7 +8,7 @@ export class ScriptpubkeyTypePipe implements PipeTransform {
   transform(value: string): string {
     switch (value) {
       case 'fee':
-        return 'Transaction fee';
+        return $localize`Transaction fee`;
       case 'p2pk':
         return 'P2PK';
       case 'op_return':

nginx.conf

@@ -91,6 +91,7 @@ http {
 	        ~*^nl nl;
 	        ~*^ja ja;
 	        ~*^nb nb;
+	        ~*^pl pl;
 	        ~*^pt pt;
 	        ~*^sl sl;
 	        ~*^fi fi;
@@ -119,6 +120,7 @@ http {
 	        ~*^nl nl;
 	        ~*^ja ja;
 	        ~*^nb nb;
+	        ~*^pl pl;
 	        ~*^pt pt;
 	        ~*^sl sl;
 	        ~*^fi fi;

production/nginx.conf

@@ -102,6 +102,7 @@ http {
 	        ~*^nl nl;
 	        ~*^ja ja;
 	        ~*^nb nb;
+	        ~*^pl pl;
 	        ~*^pt pt;
 	        ~*^sl sl;
 	        ~*^fi fi;
@@ -130,6 +131,7 @@ http {
 	        ~*^nl nl;
 	        ~*^ja ja;
 	        ~*^nb nb;
+	        ~*^pl pl;
 	        ~*^pt pt;
 	        ~*^sl sl;
 	        ~*^fi fi;