diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 888f850e86..4a978381ed 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -43,8 +43,8 @@ shared.buyMonero=Buy Monero shared.sellMonero=Sell Monero shared.buyCurrency=Buy {0} shared.sellCurrency=Sell {0} -shared.buyCurrencyLocked=Buy {0} 🔒 -shared.sellCurrencyLocked=Sell {0} 🔒 +shared.buyCurrency.locked=Buy {0} 🔒 +shared.sellCurrency.locked=Sell {0} 🔒 shared.buyingXMRWith=buying XMR with {0} shared.sellingXMRFor=selling XMR for {0} shared.buyingCurrency=buying {0} (selling XMR) @@ -2463,12 +2463,14 @@ navigation.support=\"Support\" formatter.formatVolumeLabel={0} amount{1} formatter.makerTaker=Maker as {0} {1} / Taker as {2} {3} -formatter.makerTakerLocked=Maker as {0} {1} / Taker as {2} {3} 🔒 +formatter.makerTaker.locked=Maker as {0} {1} / Taker as {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=You are {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=You are creating an offer to {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=You are creating an offer to {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=You are creating an offer to {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=You are creating an offer to {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} as maker formatter.asTaker={0} {1} as taker diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index a3b1974d8b..16b6a05bba 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -43,8 +43,8 @@ shared.buyMonero=Koupit monero shared.sellMonero=Prodat monero shared.buyCurrency=Koupit {0} shared.sellCurrency=Prodat {0} -shared.buyCurrencyLocked=Koupit {0} 🔒 -shared.sellCurrencyLocked=Prodat {0} 🔒 +shared.buyCurrency.locked=Koupit {0} 🔒 +shared.sellCurrency.locked=Prodat {0} 🔒 shared.buyingXMRWith=nakoupit XMR za {0} shared.sellingXMRFor=prodat XMR za {0} shared.buyingCurrency=nakoupit {0} (prodat XMR) @@ -2425,12 +2425,14 @@ navigation.support=\"Podpora\" formatter.formatVolumeLabel={0} částka{1} formatter.makerTaker=Tvůrce jako {0} {1} / Příjemce jako {2} {3} -formatter.makerTakerLocked=Tvůrce jako {0} {1} / Příjemce jako {2} {3} 🔒 +formatter.makerTaker.locked=Tvůrce jako {0} {1} / Příjemce jako {2} {3} 🔒 formatter.youAreAsMaker=Jste {1} {0} (jako tvůrce) / Příjemce je {3} {2} formatter.youAreAsTaker=Jste {1} {0} (jako příjemce) / Tvůrce je {3} {2} formatter.youAre={0}te {1} ({2}te {3}) formatter.youAreCreatingAnOffer.traditional=Vytváříte nabídku: {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Vytváříte nabídku: {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Vytváříte nabídku: {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Vytváříte nabídku: {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} jako tvůrce formatter.asTaker={0} {1} jako příjemce diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index ce1d2c2a2a..4663384a66 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -40,8 +40,8 @@ shared.buyMonero=Monero kaufen shared.sellMonero=Monero verkaufen shared.buyCurrency={0} kaufen shared.sellCurrency={0} verkaufen -shared.buyCurrencyLocked={0} kaufen 🔒 -shared.sellCurrencyLocked={0} verkaufen 🔒 +shared.buyCurrency.locked={0} kaufen 🔒 +shared.sellCurrency.locked={0} verkaufen 🔒 shared.buyingXMRWith=kaufe XMR mit {0} shared.sellingXMRFor=verkaufe XMR für {0} shared.buyingCurrency=kaufe {0} (verkaufe XMR) @@ -1831,12 +1831,14 @@ navigation.support=\"Support\" formatter.formatVolumeLabel={0} Betrag{1} formatter.makerTaker=Ersteller als {0} {1} / Abnehmer als {2} {3} -formatter.makerTakerLocked=Ersteller als {0} {1} / Abnehmer als {2} {3} 🔒 +formatter.makerTaker.locked=Ersteller als {0} {1} / Abnehmer als {2} {3} 🔒 formatter.youAreAsMaker=Sie sind: {1} {0} (Ersteller) / Abnehmer ist: {3} {2} formatter.youAreAsTaker=Sie sind: {1} {0} (Abnehmer) / Ersteller ist: {3} {2} formatter.youAre=Sie {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Sie erstellen ein Angebot um {1} zu {0} +formatter.youAreCreatingAnOffer.traditional.locked=Sie erstellen ein Angebot um {1} zu {0} 🔒 formatter.youAreCreatingAnOffer.crypto=Sie erstellen ein Angebot {1} zu {0} ({3} zu {2}) +formatter.youAreCreatingAnOffer.crypto.locked=Sie erstellen ein Angebot {1} zu {0} ({3} zu {2}) 🔒 formatter.asMaker={0} {1} als Ersteller formatter.asTaker={0} {1} als Abnehmer diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index a8fe7a8fa0..a8f105d6c0 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -40,8 +40,8 @@ shared.buyMonero=Comprar monero shared.sellMonero=Vender monero shared.buyCurrency=Comprar {0} shared.sellCurrency=Vender {0} -shared.buyCurrencyLocked=Comprar {0} 🔒 -shared.sellCurrencyLocked=Vender {0} 🔒 +shared.buyCurrency.locked=Comprar {0} 🔒 +shared.sellCurrency.locked=Vender {0} 🔒 shared.buyingXMRWith=Comprando XMR con {0} shared.sellingXMRFor=Vendiendo XMR por {0} shared.buyingCurrency=comprando {0} (Vendiendo XMR) @@ -1832,12 +1832,14 @@ navigation.support=\"Soporte\" formatter.formatVolumeLabel={0} cantidad{1} formatter.makerTaker=Creador como {0} {1} / Tomador como {2} {3} -formatter.makerTakerLocked=Creador como {0} {1} / Tomador como {2} {3} 🔒 +formatter.makerTaker.locked=Creador como {0} {1} / Tomador como {2} {3} 🔒 formatter.youAreAsMaker=Usted es: {1} {0} (creador) / El tomador es: {3} {2} formatter.youAreAsTaker=Usted es: {1} {0} (tomador) / Creador es: {3} {2} formatter.youAre=Usted es {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Está creando una oferta a {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Está creando una oferta a {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Está creando una oferta a {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Está creando una oferta a {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} como creador formatter.asTaker={0} {1} como tomador diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 53bd2363ce..dd0cbee6d3 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -40,8 +40,8 @@ shared.buyMonero=خرید بیتکوین shared.sellMonero=بیتکوین بفروشید shared.buyCurrency=خرید {0} shared.sellCurrency=فروش {0} -shared.buyCurrencyLocked=بخر {0} 🔒 -shared.sellCurrencyLocked=فروش {0} 🔒 +shared.buyCurrency.locked=بخر {0} 🔒 +shared.sellCurrency.locked=فروش {0} 🔒 shared.buyingXMRWith=خرید بیتکوین با {0} shared.sellingXMRFor=فروش بیتکوین با {0} shared.buyingCurrency=خرید {0} ( فروش بیتکوین) @@ -1825,12 +1825,14 @@ navigation.support=\"پشتیبانی\" formatter.formatVolumeLabel={0} مبلغ {1} formatter.makerTaker=سفارش گذار به عنوان {0} {1} / پذیرنده به عنوان {2} {3} -formatter.makerTakerLocked=سفارش گذار به عنوان {0} {1} / پذیرنده به عنوان {2} {3} 🔒 +formatter.makerTaker.locked=سفارش گذار به عنوان {0} {1} / پذیرنده به عنوان {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=شما {0} {1} ({2} {3}) هستید formatter.youAreCreatingAnOffer.traditional=شما در حال ایجاد یک پیشنهاد به {0} {1} هستید +formatter.youAreCreatingAnOffer.traditional.locked=🔒 شما در حال ایجاد یک پیشنهاد به {0} {1} هستید formatter.youAreCreatingAnOffer.crypto=شما در حال ایجاد یک پیشنهاد به {0} {1} ({2} {3}) هستید +formatter.youAreCreatingAnOffer.crypto.locked=🔒 شما در حال ایجاد یک پیشنهاد به {0} {1} ({2} {3}) هستید formatter.asMaker={0} {1} به عنوان سفارش گذار formatter.asTaker={0} {1} به عنوان پذیرنده diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 900e829baa..f4395ca9c4 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -40,8 +40,8 @@ shared.buyMonero=Achat Monero shared.sellMonero=Vendre des Moneros shared.buyCurrency=Achat {0} shared.sellCurrency=Vendre {0} -shared.buyCurrencyLocked=Achat {0} 🔒 -shared.sellCurrencyLocked=Vendre {0} 🔒 +shared.buyCurrency.locked=Achat {0} 🔒 +shared.sellCurrency.locked=Vendre {0} 🔒 shared.buyingXMRWith=achat XMR avec {0} shared.sellingXMRFor=vendre XMR pour {0} shared.buyingCurrency=achat {0} (vente XMR) @@ -1833,12 +1833,14 @@ navigation.support=\"Assistance\" formatter.formatVolumeLabel={0} montant{1} formatter.makerTaker=Maker comme {0} {1} / Taker comme {2} {3} -formatter.makerTakerLocked=Maker comme {0} {1} / Taker comme {2} {3} 🔒 +formatter.makerTaker.locked=Maker comme {0} {1} / Taker comme {2} {3} 🔒 formatter.youAreAsMaker=Vous êtes {1} {0} (maker) / Le preneur est: {3} {2} formatter.youAreAsTaker=Vous êtes: {1} {0} (preneur) / Le maker est: {3} {2} formatter.youAre=Vous êtes {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Vous êtes en train de créer un ordre pour {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Vous êtes en train de créer un ordre pour {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Vous êtes en train de créer un ordre pour {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Vous êtes en train de créer un ordre pour {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} en tant que maker formatter.asTaker={0} {1} en tant que taker diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index cbc56c5f5d..4a5d177c0a 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -40,8 +40,8 @@ shared.buyMonero=Acquista monero shared.sellMonero=Vendi monero shared.buyCurrency=Acquista {0} shared.sellCurrency=Vendi {0} -shared.buyCurrencyLocked=Acquista {0} 🔒 -shared.sellCurrencyLocked=Vendi {0} 🔒 +shared.buyCurrency.locked=Acquista {0} 🔒 +shared.sellCurrency.locked=Vendi {0} 🔒 shared.buyingXMRWith=acquistando XMR con {0} shared.sellingXMRFor=vendendo XMR per {0} shared.buyingCurrency=comprando {0} (vendendo XMR) @@ -1828,12 +1828,14 @@ navigation.support=\"Supporto\" formatter.formatVolumeLabel={0} importo{1} formatter.makerTaker=Maker come {0} {1} / Taker come {2} {3} -formatter.makerTakerLocked=Maker come {0} {1} / Taker come {2} {3} 🔒 +formatter.makerTaker.locked=Maker come {0} {1} / Taker come {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=Sei {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Stai creando un'offerta per {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Stai creando un'offerta per {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Stai creando un'offerta per {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Stai creando un'offerta per {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} come maker formatter.asTaker={0} {1} come taker diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index c1d2281373..3514d37343 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -40,8 +40,8 @@ shared.buyMonero=ビットコインを買う shared.sellMonero=ビットコインを売る shared.buyCurrency={0}を買う shared.sellCurrency={0}を売る -shared.buyCurrencyLocked={0}を買う 🔒 -shared.sellCurrencyLocked={0}を売る 🔒 +shared.buyCurrency.locked={0}を買う 🔒 +shared.sellCurrency.locked={0}を売る 🔒 shared.buyingXMRWith=XMRを{0}で買う shared.sellingXMRFor=XMRを{0}で売る shared.buyingCurrency={0}を購入中 (XMRを売却中) @@ -1831,12 +1831,14 @@ navigation.support=「サポート」 formatter.formatVolumeLabel={0} 額{1} formatter.makerTaker=メイカーは{0} {1} / テイカーは{2} {3} -formatter.makerTakerLocked=メイカーは{0} {1} / テイカーは{2} {3} 🔒 +formatter.makerTaker.locked=メイカーは{0} {1} / テイカーは{2} {3} 🔒 formatter.youAreAsMaker=あなたは:{1} {0}(メイカー) / テイカーは:{3} {2} formatter.youAreAsTaker=あなたは:{1} {0}(テイカー) / メイカーは{3} {2} formatter.youAre=あなたは{0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=あなたはオファーを{0} {1}に作成中です +formatter.youAreCreatingAnOffer.traditional.locked=あなたはオファーを{0} {1}に作成中です 🔒 formatter.youAreCreatingAnOffer.crypto=あなたはオファーを{0} {1} ({2} {3})に作成中です +formatter.youAreCreatingAnOffer.crypto.locked=あなたはオファーを{0} {1} ({2} {3})に作成中です 🔒 formatter.asMaker={0} {1}のメイカー formatter.asTaker={0} {1}のテイカー diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index d7463aacb4..03d90cc9fd 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -40,8 +40,8 @@ shared.buyMonero=Comprar monero shared.sellMonero=Vender monero shared.buyCurrency=Comprar {0} shared.sellCurrency=Vender {0} -shared.buyCurrencyLocked=Comprar {0} 🔒 -shared.sellCurrencyLocked=Vender {0} 🔒 +shared.buyCurrency.locked=Comprar {0} 🔒 +shared.sellCurrency.locked=Vender {0} 🔒 shared.buyingXMRWith=comprando XMR com {0} shared.sellingXMRFor=vendendo XMR por {0} shared.buyingCurrency=comprando {0} (vendendo XMR) @@ -1835,12 +1835,14 @@ navigation.support=\"Suporte\" formatter.formatVolumeLabel={0} quantia{1} formatter.makerTaker=Ofertante: {1} de {0} / Aceitador: {3} de {2} -formatter.makerTakerLocked=Ofertante: {1} de {0} / Aceitador: {3} de {2} 🔒 +formatter.makerTaker.locked=Ofertante: {1} de {0} / Aceitador: {3} de {2} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=Você está {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Você está criando uma oferta para {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Você está criando uma oferta para {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Você está criando uma oferta para {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Você está criando uma oferta para {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} como ofertante formatter.asTaker={0} {1} como aceitador diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index b6456daf42..0ec7c93184 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -40,8 +40,8 @@ shared.buyMonero=Comprar monero shared.sellMonero=Vender monero shared.buyCurrency=Comprar {0} shared.sellCurrency=Vender {0} -shared.buyCurrencyLocked=Comprar {0} 🔒 -shared.sellCurrencyLocked=Vender {0} 🔒 +shared.buyCurrency.locked=Comprar {0} 🔒 +shared.sellCurrency.locked=Vender {0} 🔒 shared.buyingXMRWith=comprando XMR com {0} shared.sellingXMRFor=vendendo XMR por {0} shared.buyingCurrency=comprando {0} (vendendo XMR) @@ -1825,12 +1825,14 @@ navigation.support=\"Apoio\" formatter.formatVolumeLabel={0} quantia{1} formatter.makerTaker=Ofertante como {0} {1} / Aceitador como {2} {3} -formatter.makerTakerLocked=Ofertante como {0} {1} / Aceitador como {2} {3} 🔒 +formatter.makerTaker.locked=Ofertante como {0} {1} / Aceitador como {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=Você é {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Você está criando uma oferta para {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Você está criando uma oferta para {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Você está criando uma oferta para {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Você está criando uma oferta para {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} como ofertante formatter.asTaker={0} {1} como aceitador diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 3c66af61fe..46828f97b1 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -40,8 +40,8 @@ shared.buyMonero=Купить биткойн shared.sellMonero=Продать биткойн shared.buyCurrency=Купить {0} shared.sellCurrency=Продать {0} -shared.buyCurrencyLocked=Купить {0} 🔒 -shared.sellCurrencyLocked=Продать {0} 🔒 +shared.buyCurrency.locked=Купить {0} 🔒 +shared.sellCurrency.locked=Продать {0} 🔒 shared.buyingXMRWith=покупка ВТС за {0} shared.sellingXMRFor=продажа ВТС за {0} shared.buyingCurrency=покупка {0} (продажа ВТС) @@ -1826,12 +1826,14 @@ navigation.support=\«Поддержка\» formatter.formatVolumeLabel={0} сумма {1} formatter.makerTaker=Мейкер как {0} {1} / Тейкер как {2} {3} -formatter.makerTakerLocked=Мейкер как {0} {1} / Тейкер как {2} {3} 🔒 +formatter.makerTaker.locked=Мейкер как {0} {1} / Тейкер как {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=Вы {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Вы создаете предложение {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Вы создаете предложение {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Вы создаете предложение {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Вы создаете предложение {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} как мейкер formatter.asTaker={0} {1} как тейкер diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 8b675222fb..56fe9e67c9 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -40,8 +40,8 @@ shared.buyMonero=ซื้อ monero (บิตคอยน์) shared.sellMonero=ขาย monero (บิตคอยน์) shared.buyCurrency=ซื้อ {0} shared.sellCurrency=ขาย {0} -shared.buyCurrencyLocked=ซื้อ {0} 🔒 -shared.sellCurrencyLocked=ขาย {0} 🔒 +shared.buyCurrency.locked=ซื้อ {0} 🔒 +shared.sellCurrency.locked=ขาย {0} 🔒 shared.buyingXMRWith=การซื้อ XMR กับ {0} shared.sellingXMRFor=การขาย XMR แก่ {0} shared.buyingCurrency=การซื้อ {0} (การขาย XMR) @@ -1826,12 +1826,14 @@ navigation.support=\"ช่วยเหลือและสนับสนุ formatter.formatVolumeLabel={0} จำนวนยอด{1} formatter.makerTaker=ผู้สร้าง เป็น {0} {1} / ผู้รับเป็น {2} {3} -formatter.makerTakerLocked=ผู้สร้าง เป็น {0} {1} / ผู้รับเป็น {2} {3} 🔒 +formatter.makerTaker.locked=ผู้สร้าง เป็น {0} {1} / ผู้รับเป็น {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=คุณคือ {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=คุณกำลังสร้างข้อเสนอให้ {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=คุณกำลังสร้างข้อเสนอให้ {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=คุณกำลังสร้างข้อเสนอให้กับ {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=คุณกำลังสร้างข้อเสนอให้กับ {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} ในฐานะผู้สร้าง formatter.asTaker={0} {1} ในฐานะคนรับ diff --git a/core/src/main/resources/i18n/displayStrings_tr.properties b/core/src/main/resources/i18n/displayStrings_tr.properties index 9ffb43d66a..28034c72a3 100644 --- a/core/src/main/resources/i18n/displayStrings_tr.properties +++ b/core/src/main/resources/i18n/displayStrings_tr.properties @@ -43,8 +43,8 @@ shared.buyMonero=Monero Satın Al shared.sellMonero=Monero Sat shared.buyCurrency={0} satın al shared.sellCurrency={0} sat -shared.buyCurrencyLocked={0} satın al 🔒 -shared.sellCurrencyLocked={0} sat 🔒 +shared.buyCurrency.locked={0} satın al 🔒 +shared.sellCurrency.locked={0} sat 🔒 shared.buyingXMRWith={0} ile XMR satın alınıyor shared.sellingXMRFor={0} karşılığında XMR satılıyor shared.buyingCurrency={0} satın alınıyor (XMR satılıyor) @@ -2413,12 +2413,14 @@ navigation.support="Destek" formatter.formatVolumeLabel={0} miktar{1} formatter.makerTaker=Yapan olarak {0} {1} / Alan olarak {2} {3} -formatter.makerTakerLocked=Yapıcı olarak {0} {1} / Alan olarak {2} {3} 🔒 +formatter.makerTaker.locked=Yapıcı olarak {0} {1} / Alan olarak {2} {3} 🔒 formatter.youAreAsMaker=Yapan sizsiniz: {1} {0} (maker) / Alan: {3} {2} formatter.youAreAsTaker=Alan sizsiniz: {1} {0} (taker) / Yapan: {3} {2} formatter.youAre=Şu anda sizsiniz {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Şu anda bir teklif oluşturuyorsunuz: {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Şu anda bir teklif oluşturuyorsunuz: {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Şu anda bir teklif oluşturuyorsunuz: {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Şu anda bir teklif oluşturuyorsunuz: {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} olarak formatter.asTaker={0} {1} olarak diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index aeab1530a7..e6dd802dee 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -40,8 +40,8 @@ shared.buyMonero=Mua monero shared.sellMonero=Bán monero shared.buyCurrency=Mua {0} shared.sellCurrency=Bán {0} -shared.buyCurrencyLocked=Mua {0} 🔒 -shared.sellCurrencyLocked=Bán {0} 🔒 +shared.buyCurrency.locked=Mua {0} 🔒 +shared.sellCurrency.locked=Bán {0} 🔒 shared.buyingXMRWith=đang mua XMR với {0} shared.sellingXMRFor=đang bán XMR với {0} shared.buyingCurrency=đang mua {0} (đang bán XMR) @@ -1828,12 +1828,14 @@ navigation.support=\"Hỗ trợ\" formatter.formatVolumeLabel={0} giá trị {1} formatter.makerTaker=Người tạo là {0} {1} / Người nhận là {2} {3} -formatter.makerTakerLocked=Người tạo là {0} {1} / Người nhận là {2} {3} 🔒 +formatter.makerTaker.locked=Người tạo là {0} {1} / Người nhận là {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=Bạn là {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=Bạn đang tạo một chào giá đến {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=Bạn đang tạo một chào giá đến {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=Bạn đang tạo một chào giá đến {0} {1} ({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=Bạn đang tạo một chào giá đến {0} {1} ({2} {3}) 🔒 formatter.asMaker={0} {1} như người tạo formatter.asTaker={0} {1} như người nhận diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index a783f387e6..f1b086eec3 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -40,8 +40,8 @@ shared.buyMonero=买入比特币 shared.sellMonero=卖出比特币 shared.buyCurrency=买入 {0} shared.sellCurrency=卖出 {0} -shared.buyCurrencyLocked=买入 {0} 🔒 -shared.sellCurrencyLocked=卖出 {0} 🔒 +shared.buyCurrency.locked=买入 {0} 🔒 +shared.sellCurrency.locked=卖出 {0} 🔒 shared.buyingXMRWith=用 {0} 买入 XMR shared.sellingXMRFor=卖出 XMR 为 {0} shared.buyingCurrency=买入 {0}(卖出 XMR) @@ -1835,12 +1835,14 @@ navigation.support=“帮助” formatter.formatVolumeLabel={0} 数量 {1} formatter.makerTaker=卖家 {0} {1} / 买家 {2} {3} -formatter.makerTakerLocked=卖家 {0} {1} / 买家 {2} {3} 🔒 +formatter.makerTaker.locked=卖家 {0} {1} / 买家 {2} {3} 🔒 formatter.youAreAsMaker=您是 {1} {0} 卖家 / 买家是 {3} {2} formatter.youAreAsTaker=您是 {1} {0} 买家 / 卖家是 {3} {2} formatter.youAre=您是 {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=您创建新的报价 {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=您创建新的报价 {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=您正创建报价 {0} {1}({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=您正创建报价 {0} {1}({2} {3}) 🔒 formatter.asMaker={0} {1} 是卖家 formatter.asTaker={0} {1} 是买家 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index e3344d1fea..94554bc12f 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -40,8 +40,8 @@ shared.buyMonero=買入比特幣 shared.sellMonero=賣出比特幣 shared.buyCurrency=買入 {0} shared.sellCurrency=賣出 {0} -shared.buyCurrencyLocked=買入 {0} 🔒 -shared.sellCurrencyLocked=賣出 {0} 🔒 +shared.buyCurrency.locked=買入 {0} 🔒 +shared.sellCurrency.locked=賣出 {0} 🔒 shared.buyingXMRWith=用 {0} 買入 XMR shared.sellingXMRFor=賣出 XMR 為 {0} shared.buyingCurrency=買入 {0}(賣出 XMR) @@ -1829,12 +1829,14 @@ navigation.support=“幫助” formatter.formatVolumeLabel={0} 數量 {1} formatter.makerTaker=賣家 {0} {1} / 買家 {2} {3} -formatter.makerTakerLocked=賣家 {0} {1} / 買家 {2} {3} 🔒 +formatter.makerTaker.locked=賣家 {0} {1} / 買家 {2} {3} 🔒 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2} formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2} formatter.youAre=您是 {0} {1} ({2} {3}) formatter.youAreCreatingAnOffer.traditional=您創建新的報價 {0} {1} +formatter.youAreCreatingAnOffer.traditional.locked=您創建新的報價 {0} {1} 🔒 formatter.youAreCreatingAnOffer.crypto=您正創建報價 {0} {1}({2} {3}) +formatter.youAreCreatingAnOffer.crypto.locked=您正創建報價 {0} {1}({2} {3}) 🔒 formatter.asMaker={0} {1} 是賣家 formatter.asTaker={0} {1} 是買家 diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java index 2139bf2813..dd645246f7 100644 --- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java @@ -211,7 +211,7 @@ public class OfferDetailsWindow extends Overlay { xmrDirectionInfo = direction == OfferDirection.SELL ? toReceive : toSpend; } else if (placeOfferHandlerOptional.isPresent()) { addConfirmationLabelLabel(gridPane, rowIndex, offerTypeLabel, - DisplayUtils.getOfferDirectionForCreateOffer(direction, currencyCode), firstRowDistance); + DisplayUtils.getOfferDirectionForCreateOffer(direction, currencyCode, offer.isPrivateOffer()), firstRowDistance); counterCurrencyDirectionInfo = direction == OfferDirection.SELL ? toReceive : toSpend; xmrDirectionInfo = direction == OfferDirection.BUY ? toReceive : toSpend; } else { diff --git a/desktop/src/main/java/haveno/desktop/util/DisplayUtils.java b/desktop/src/main/java/haveno/desktop/util/DisplayUtils.java index 9c59eeeeb5..8c725188c1 100644 --- a/desktop/src/main/java/haveno/desktop/util/DisplayUtils.java +++ b/desktop/src/main/java/haveno/desktop/util/DisplayUtils.java @@ -34,6 +34,7 @@ import java.util.Optional; @Slf4j public class DisplayUtils { private static final int SCALE = 3; + private static final String LOCKED = ".locked"; public static String formatDateTime(Date date) { return FormattingUtils.formatDateTime(date, true); @@ -118,16 +119,16 @@ public class DisplayUtils { public static String getDirectionWithCode(OfferDirection direction, String currencyCode, boolean isPrivate) { if (CurrencyUtil.isTraditionalCurrency(currencyCode)) - return (direction == OfferDirection.BUY) ? Res.get(isPrivate ? "shared.buyCurrencyLocked" : "shared.buyCurrency", Res.getBaseCurrencyCode()) : Res.get(isPrivate ? "shared.sellCurrencyLocked" : "shared.sellCurrency", Res.getBaseCurrencyCode()); + return (direction == OfferDirection.BUY) ? Res.get("shared.buyCurrency" + (isPrivate ? LOCKED : ""), Res.getBaseCurrencyCode()) : Res.get("shared.sellCurrency" + (isPrivate ? LOCKED : ""), Res.getBaseCurrencyCode()); else - return (direction == OfferDirection.SELL) ? Res.get(isPrivate ? "shared.buyCurrencyLocked" : "shared.buyCurrency", currencyCode) : Res.get(isPrivate ? "shared.sellCurrencyLocked" : "shared.sellCurrency", currencyCode); + return (direction == OfferDirection.SELL) ? Res.get("shared.buyCurrency" + (isPrivate ? LOCKED : ""), currencyCode) : Res.get("shared.sellCurrency" + (isPrivate ? LOCKED : ""), currencyCode); } - public static String getDirectionBothSides(OfferDirection direction, boolean isLocked) { + public static String getDirectionBothSides(OfferDirection direction, boolean isPrivate) { String currencyCode = Res.getBaseCurrencyCode(); return direction == OfferDirection.BUY ? - Res.get(isLocked ? "formatter.makerTakerLocked" : "formatter.makerTaker", currencyCode, Res.get("shared.buyer"), currencyCode, Res.get("shared.seller")) : - Res.get(isLocked ? "formatter.makerTakerLocked" : "formatter.makerTaker", currencyCode, Res.get("shared.seller"), currencyCode, Res.get("shared.buyer")); + Res.get("formatter.makerTaker" + (isPrivate ? LOCKED : ""), currencyCode, Res.get("shared.buyer"), currencyCode, Res.get("shared.seller")) : + Res.get("formatter.makerTaker" + (isPrivate ? LOCKED : ""), currencyCode, Res.get("shared.seller"), currencyCode, Res.get("shared.buyer")); } public static String getDirectionForBuyer(boolean isMyOffer, String currencyCode) { @@ -170,16 +171,16 @@ public class DisplayUtils { } } - public static String getOfferDirectionForCreateOffer(OfferDirection direction, String currencyCode) { + public static String getOfferDirectionForCreateOffer(OfferDirection direction, String currencyCode, boolean isPrivate) { String baseCurrencyCode = Res.getBaseCurrencyCode(); if (CurrencyUtil.isTraditionalCurrency(currencyCode)) { return direction == OfferDirection.BUY ? - Res.get("formatter.youAreCreatingAnOffer.traditional", Res.get("shared.buy"), baseCurrencyCode) : - Res.get("formatter.youAreCreatingAnOffer.traditional", Res.get("shared.sell"), baseCurrencyCode); + Res.get("formatter.youAreCreatingAnOffer.traditional" + (isPrivate ? LOCKED : ""), Res.get("shared.buy"), baseCurrencyCode) : + Res.get("formatter.youAreCreatingAnOffer.traditional" + (isPrivate ? LOCKED : ""), Res.get("shared.sell"), baseCurrencyCode); } else { return direction == OfferDirection.SELL ? - Res.get("formatter.youAreCreatingAnOffer.crypto", Res.get("shared.buy"), currencyCode, Res.get("shared.selling"), baseCurrencyCode) : - Res.get("formatter.youAreCreatingAnOffer.crypto", Res.get("shared.sell"), currencyCode, Res.get("shared.buying"), baseCurrencyCode); + Res.get("formatter.youAreCreatingAnOffer.crypto" + (isPrivate ? LOCKED : ""), Res.get("shared.buy"), currencyCode, Res.get("shared.selling"), baseCurrencyCode) : + Res.get("formatter.youAreCreatingAnOffer.crypto" + (isPrivate ? LOCKED : ""), Res.get("shared.sell"), currencyCode, Res.get("shared.buying"), baseCurrencyCode); } }