resolve conflicts

crypto-power · Oct 2, 2023 · 5f3c5a0 · 5f3c5a0
1 parent 498b5cf
commit 5f3c5a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/ui/page/root/trade_page.go b/ui/page/root/trade_page.go
@@ -185,10 +185,10 @@ func (pg *TradePage) pageContentLayout(gtx C) D {
 										return pg.Theme.Icons.TradeExchange.LayoutSize(gtx, 160)
 									}),
 									layout.Rigid(func(gtx C) D {
-										return layout.Inset{Top: values.MarginPadding0}.Layout(gtx, pg.Theme.Label(values.TextSize20, values.String(values.TradePStrDex1)).Layout)
+										return layout.Inset{Top: values.MarginPadding0}.Layout(gtx, pg.Theme.Label(values.TextSize20, values.String(values.StrTradeDex1)).Layout)
 									}),
 									layout.Rigid(func(gtx C) D {
-										return layout.Inset{Bottom: values.MarginPadding0}.Layout(gtx, pg.Theme.Label(values.TextSize20, values.String(values.TradePStrDex2)).Layout)
+										return layout.Inset{Bottom: values.MarginPadding0}.Layout(gtx, pg.Theme.Label(values.TextSize20, values.String(values.StrTradeDex2)).Layout)
 									}),
 								)
 
@@ -210,7 +210,7 @@ func (pg *TradePage) pageContentLayout(gtx C) D {
 											return pg.Theme.Icons.DcrDex.Layout48dp(gtx)
 										}),
 										layout.Rigid(func(gtx C) D {
-											return layout.Inset{Top: values.MarginPadding16}.Layout(gtx, pg.Theme.Label(values.TextSize20, values.String(values.StrExchange)).Layout)
+											return layout.Inset{Top: values.MarginPadding16}.Layout(gtx, pg.Theme.Label(values.TextSize20, values.String(values.StrDcrDex)).Layout)
 										}),
 									)
 								})

diff --git a/ui/values/localizable/en.go b/ui/values/localizable/en.go
@@ -159,7 +159,7 @@ const EN = `
 "daysToVote" = "Days to vote"
 "dcrBtcPair" = "dcr-btc"
 "dcrCaps" = "DCR"
-"dcrDex" = "DCRDEX"
+"dcrDex" = "DCR DEX"
 "dcrReceived" = "You have received %s DCR"
 "debug" = "Debug"
 "default" = "default"
@@ -206,7 +206,7 @@ const EN = `
 "errPassEmpty" = "Password can not be empty"
 "estimatedSize" = "Estimated size"
 "estimatedTime" = "Estimated time"
-"exchange" = "DCR DEX"
+"exchange" = "Centralized Exchange"
 "exchangeAPI" = "Exchange API"
 "exchangeIntro" = "Exchange currency using our predefined/custom servers or through a centralized exchange,"
 "exchangeIntroPt2" = "it is simple, quick, and secure."

diff --git a/ui/values/strings.go b/ui/values/strings.go
@@ -858,6 +858,6 @@ const (
 	StrSetPassword                     = "setPassword"
 	StrPostBond                        = "postBond"
 	StrDCRDEXWelcomeMessage            = "dcrdexWelcomeMessage"
-	TradePStrDex1                      = "tDcrDex1"
-	TradePStrDex2                      = "tDcrDex2"
+	StrTradeDex1                      = "tDcrDex1"
+	StrTradeDex2                      = "tDcrDex2"
 )