fix conflict

planetdecred · May 28, 2021 · 781e903 · 781e903
2 parents 952e0f1 + a5c0545
commit 781e903
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/Decred Wallet/en.lproj/Localizable.strings b/Decred Wallet/en.lproj/Localizable.strings
@@ -449,7 +449,11 @@
 /* Transaction Notification */
 "walletNewTransaction" = "[%@] New Transaction";
 "newTransaction" = "New Transaction";
+<<<<<<< HEAD
 "youReceived" = "You received %@ DCR";
+=======
+"youReceived" = "You received";
+>>>>>>> a5c0545b222879aa37d17ec9905139d676762230
 "walletTicketVoted" = "[%@] A ticket just voted";
 "ticketVoted" = "A ticket just voted";
 "walletTicketRevoked" = "[%@] A ticket was revoked";

diff --git a/Decred Wallet/es.lproj/Localizable.strings b/Decred Wallet/es.lproj/Localizable.strings
@@ -449,7 +449,11 @@
 /* Transaction Notification */
 "walletNewTransaction" = "[%@] New Transaction";
 "newTransaction" = "Nueva Transacción";
+<<<<<<< HEAD
 "youReceived" = "Usted recibió %@ DCR";
+=======
+"youReceived" = "Usted recibió";
+>>>>>>> a5c0545b222879aa37d17ec9905139d676762230
 "walletTicketVoted" = "[%@] A ticket just voted";
 "ticketVoted" = "A ticket just voted";
 "walletTicketRevoked" = "[%@] A ticket was revoked";

diff --git a/Decred Wallet/ru-RU.lproj/Localizable.strings b/Decred Wallet/ru-RU.lproj/Localizable.strings
@@ -449,7 +449,11 @@
 /* Transaction Notification */
 "walletNewTransaction" = "[%@] New Transaction";
 "newTransaction" = "Новая транзакция";
+<<<<<<< HEAD
 "youReceived" = "Вы получили %@ DCR";
+=======
+"youReceived" = "Вы получили";
+>>>>>>> a5c0545b222879aa37d17ec9905139d676762230
 "walletTicketVoted" = "[%@] A ticket just voted";
 "ticketVoted" = "A ticket just voted";
 "walletTicketRevoked" = "[%@] A ticket was revoked";

diff --git a/Decred Wallet/zh-Hans.lproj/Localizable.strings b/Decred Wallet/zh-Hans.lproj/Localizable.strings
@@ -449,7 +449,11 @@
 /* Transaction Notification */
 "walletNewTransaction" = "[%@] New Transaction";
 "newTransaction" = "新的交易";
+<<<<<<< HEAD
 "youReceived" = "您收到 %@ DCR";
+=======
+"youReceived" = "您收到";
+>>>>>>> a5c0545b222879aa37d17ec9905139d676762230
 "walletTicketVoted" = "[%@] A ticket just voted";
 "ticketVoted" = "A ticket just voted";
 "walletTicketRevoked" = "[%@] A ticket was revoked";