Fix rebase JSONs

KoalaSat · KoalaSat · commit 48e9b7cc4942 · 2025-03-23T18:33:33.000+01:00
diff --git a/frontend/src/components/TradeBox/index.tsx b/frontend/src/components/TradeBox/index.tsx
@@ -308,14 +308,11 @@ const TradeBox = ({ currentOrder, onStartAgain }: TradeBoxProps): JSX.Element =>
       submitAction({ action: 'submit_statement', statement });
     }
   };
-<<<<<<< HEAD
 
-  const ratePlatform = function (rating: number): void {
-=======
   const rateUserPlatform = function (rating: number): void {
->>>>>>> 7a113d9a (Coordinators ratings WIP)
     submitAction({ action: 'rate_platform', rating });
   };
+
   const rateHostPlatform = function (rating: number): void {};
 
   const handleWebln = async (order: Order): Promise<void> => {
diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "La teva factura ha caducat o s'han fet més de 3 intents de pagament. Envia una nova factura.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats està intentant pagar la teva factura de Lightning. Recorda que els nodes Lightning han d'estar en línia per rebre pagaments.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renovar",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats millora amb més usuaris i liquiditat. Ensenya-li RoboSats a un amic bitcoiner!",
   "Sending coins to": "Enviant monedes a",
diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Tvůj invoice vypršel nebo selhali pokusy o 3 platby. Nahraj nový invoice.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats se snaží zaplatit tvůj lightning invoice. Nezapomeň, že lightning nody musí být online, aby mohl přijímat platby.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats bude lepší s větší likviditou a uživateli. Pověz svým přátelům o Robosats!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats versucht deine Lightning-Invoice zu bezahlen. Denk daran, dass deine Lightning-Node erreichbar sein muss, um die Zahlung zu erhalten.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats wird noch besser mit mehr Nutzern und Liquidität. Erzähl einem Bitcoin-Freund von uns!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Tu factura ha expirado o se han hecho más de 3 intentos de pago. Aporta una nueva factura.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats está intentando pagar tu factura de Lightning. Recuerda que los nodos Lightning deben estar en línea para recibir pagos.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renovar",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats mejora con más liquidez y usuarios. ¡Háblale a un amigo bitcoiner sobre RoboSats!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Zure faktura iraungi da edo 3 ordainketa saiakera baino gehiago egin dira. Aurkeztu faktura berri bat.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats zure Lightning faktura ordaintzen saiatzen ari da. Gogoratu lightning nodoak online egon behar direla ordainketak jaso ahal izateko.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats hobetu egiten da likidezia eta erabiltzaile gehiagorekin. Aipatu Robosats lagun bitcoiner bati!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Votre facture a expiré ou plus de 3 tentatives de paiement ont été effectuées. Soumettez une nouvelle facture.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats tente de payer votre facture lightning. Rappelez-vous que les nœuds lightning doivent être en ligne pour recevoir des paiements.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renouveler",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats s'améliore avec plus de liquidité et d'utilisateurs. Parlez de Robosats à un ami bitcoiner!",
   "Sending coins to": "Envoi coins à",
diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "La tua fattura è scaduta o sono stati fatti più di 3 tentativi di pagamento. Invia una nuova fattura.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats sta provando a pagare la tua fattura lightning. Ricorda che i nodi lightning devono essere online per ricevere pagamenti.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Rinnova",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats migliora se ha più liquidità ed utenti. Parla di Robosats ai tuoi amici bitcoiner!",
   "Sending coins to": "Invio monete a",
diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "インボイスの有効期限が切れているか、３回以上の支払い試行が行われました。新しいインボイスを提出してください。",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSatsはあなたのライトニングインボイスを支払おうとしています。支払いを受け取るには、ライトニングノードがオンラインである必要があることを忘れないでください。",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "更新する",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSatsはより多くの流動性とユーザーでより良くなります。ビットコイナーのお友達にRoboSatsについて話してください！",
   "Sending coins to": "コインを送信する先",
diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats próbuje zapłacić fakturę za błyskawicę. Pamiętaj, że węzły pioruna muszą być online, aby otrzymywać płatności.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats staje się lepszy dzięki większej płynności i użytkownikom. Powiedz znajomemu bitcoinerowi o Robosats!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Sua invoice expirou ou foram feitas mais de 3 tentativas de pagamento. Envie uma nova invoice.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats está tentando pagar sua lightning invoice. Lembre-se de que os nós lightning devem estar online para receber pagamentos.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats fica melhor com mais liquidez e usuários. Conte a um amigo bitcoiner sobre Robosats!",
   "Sending coins to": "Enviando moedas para",
diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Срок действия Вашего инвойса истёк или было сделано более трёх попыток оплаты. Отправьте новый инвойс.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats пытается оплатить Ваш Lightning инвойс. Помните, что ноды Lightning должны быть подключены к сети, чтобы получать платежи.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats становится лучше с большей ликвидностью и пользователями. Расскажите другу-биткойнеру о Robosat!",
   "Sending coins to": "Отправка монет на",
diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Din faktura har förfallit eller så har fler än tre betalningsförsök gjorts. Dela en ny faktura.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats försöker betala din lightning-faktura. Kom ihåg att lightning-noder måste vara online för att kunna mottaga betalningar.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats blir bättre med mer likviditet och fler användare. Berätta om RoboSats för en Bitcoiner-vän!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Ankara yako imeisha muda au majaribio zaidi ya 3 ya malipo yamefanywa. Wasilisha ankara mpya.",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats inajaribu kulipa ankara yako ya umeme. Kumbuka kuwa nodi za umeme lazima ziwe mtandaoni ili kupokea malipo.",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats inaboreshwa na utoshelevu zaidi na watumiaji. Mwambie rafiki yako wa Bitcoin kuhusu RoboSats!",
   "Sending coins to": "Inatuma sarafu kwa",
diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json
@@ -674,13 +674,9 @@
   "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Invoice หมดอายุ หรือเราได้ลองจ่ายเหรียญครบ 3 ครั้งแล้ว กรุณาส่ง invoice ใหม่ให้เรา",
   "#81": "Phrases in components/TradeBox/Prompts/SendingSats.tsx",
   "RoboSats is trying to pay your lightning invoice. Remember that lightning nodes must be online in order to receive payments.": "RoboSats กำลังจ่ายเหรียญให้ lightning invoice ของท่าน lightning nodes จะต้องออนไลน์เพื่อรับเหรียญ",
-<<<<<<< HEAD
   "#82": "Phrases in components/TradeBox/Prompts/Successful.tsx",
-=======
-  "#81": "Phrases in components/TradeBox/Prompts/Successful.tsx",
   "How was your experience with {{peer_nick}}?": "How was your experience with {{peer_nick}}?",
   "How your host {{coordinator}} did it?": "How your host {{coordinator}} did it?",
->>>>>>> 7a113d9a (Coordinators ratings WIP)
   "Renew": "Renew",
   "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats จะดีขึ้นเมื่อมีสภาพคล่องและผู้ใช้งานมากขึ้น ช่วยกันชวนเพื่อนของคุณมาใช้ Robosats!",
   "Sending coins to": "Sending coins to",
diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json
diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json
