From 34ee2dd8e63812c93e462cdf388f713195fe7564 Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Mon, 17 May 2021 21:22:49 +0300
Subject: [PATCH 1/3] CAKE-324 | added website and github links to support page

---
 assets/images/2.0x/github.png          | Bin 0 -> 981 bytes
 assets/images/3.0x/github.png          | Bin 0 -> 1539 bytes
 assets/images/github.png               | Bin 0 -> 507 bytes
 lib/view_model/support_view_model.dart |   9 +++++++++
 pubspec.lock                           |   6 +++---
 pubspec.yaml                           |   2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 assets/images/2.0x/github.png
 create mode 100644 assets/images/3.0x/github.png
 create mode 100644 assets/images/github.png

diff --git a/assets/images/2.0x/github.png b/assets/images/2.0x/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..e80b428e5149bbb5fbd33821aad08889020dea45
GIT binary patch
literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq001-q001xu1^@s6Ug=r=00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH18PY`K~#7F?U`L@
zPhlL#zh?3_*{oblILu3wmtihQsaZsMNs1e3DC|OVIkYL|!o1u_ZYCv#E2XUnNv<TZ
zWYhfr)IzP9_jmLAIp<$z&(80h=e#{z>;I`wYyamtzvukU%ky@CA;vHyM<KbCoJCF}
zCzHkGDDo%ymduhF@)`LQgOp104B1WghOmvSBP|RPR+CQ<E(ysN*mre6m`7emGKr|3
zCnv!m+sXGxCz+fXaykrf3`jK*w|`+@ywqrPHP%JmCOd&dlV~UJDoGtc3LI4$u5p!d
zH+=!oli<g<fh=>yyx}VUL#{=F?D9AX%cCCmP#NV!_zt#`k6@2EYPa4@j`xUFt<?Jt
zdu)qMIr&iu-tAN0BKMPv$uUA59%xsRn;{SC7Q7$Fv53hPkHDQs9}C`(=MltUn-KIj
zIS%PkA++5?mLMV-$S-m=(xuj??Nf-rT%Umaf>t73s$h57UhVTcJsKftf}GGnnBj!a
zIjjp2=YP-BB?Nj7a}+_IVqFUn2g@N}nOd0TBILoiP&%kU`F|#4T40u2!tXqml}iVy
z2}!fuS7Zmwa^I&+?3mPqrV914FwZ-mvNEYaO=yBp?+48D)u&9FTJ=k4xKOVc=7}^T
zQ4{(s)Z>>h$sHmc<|6`XLOnvgQgRv0Qsq<jNh(kiYKKe>%(B6!tQDH<fIP7BRk2`(
z-SA)OTDpPC0|Grp`W=J?dzV!@hc<+y4gN{-o?H>qfd}?XK>OzqlDdF^y-uSQNS1xD
zJEfqu7a$}hN&p^Ic^m68`AaElBG)52Jl1e$a|gkR<St|+Zldp^F4tvSuzNzUhR%|k
zG-8h+_mG#!570{_=T1aqhLecb@`3lBr8U!4&G>H+E)h2N<oG!HuR|s}Wvk%50Bg{U
zeGlOi+KQO)CSZpWw9!>=!QM6HK`!IC1$wj~Trww-5WFM$4SnCIIfzd)^pklBpV@U3
zcyHOA6yJ%spF4CD;$)^E1@@9(Tn%yW#5<YX`;Bz!lsf95lhA8&Hd15><nO4t@u^-j
zR!~AO5OLmE5Tfowa*^{_r4Y$+8urD@!XW$z^1Gy7*?P_6y}r>tAU9$F;c3eu*w1?I
zq;zHq%wg9t{O!o}S}Twh<U)jF4HEj0l_yW0JR<)9z2ZKYuWS5600000NkvXXu0mjf
DJR!ss

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/github.png b/assets/images/3.0x/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..86b48e44612c101cb968972c6b76a2db543a5d51
GIT binary patch
literal 1539
zcmV+e2K@PnP)<h;3K|Lk000e1NJLTq002$^002k`1^@s6So6aG00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1(-=hK~#7F?VM?d
zR#h0s|CQNd*<z6k*?^U{NM;#@L}-E0Vq-!J71#oi5foHZP#=O82&M&t3i=qC(!}(o
zg<_^vT4<3pT682^h880$v#Fe(KWAQeednBeo_p?guHGN~VU}~>bMABRIrn*<^V}C`
z2x1S!!~UZEMB_yNinfckiAE41RTyrHXs+li(HzmN(Z7wew58F07OfL~Bzi~mv1kyx
z2{T0xh~9=VMpmsCJtjI8yC{o9{h~jRkHI>%L$pS8rD#v=0$d{c48<7BrH!KHqJ2<9
zW{6%xxd!Xhr=rtQ6UK{f75#^5jn=Ln*dI92Fj@2-;xSme_%uEi5i(o!9pW@vOW%sl
zMnudLZAIKhYiU??4I+Sx@2?m;z~@D)MPI?V3S}CH{cRBSik@}+{{mD9pPWM&JFu5K
z+A(~(0><Mn(qNy%+)a}@`tP;0<-=<}D&Q!XaL0B6OA?OjPB<=9zlfG4^f}vc9B0Zg
zD4Bk^r^$hyV~-TAv>f{n%w5Af_63;f-Y0rh^dam~$AD<6r$4$Pzd6SHrRZRk#JzA|
z{S7HT=TXrL(P9{5?(J#MM8q`FLec%Ar$iH=;}y8a{4`2{w|3HEzXox#3dz&`Tm+&C
zjCsYMKynJoH%+TzyyySC`wNRME`xue{u}-&R|T3h)*UE_^@`4^*g_j-Nm?1?ByE9l
zopR+o=!{17ATG{_e(ZN5CB8N8cIerPxcEZ!yRz-o@UMqzj)&Pa(Oj`-5GQoXwV~f4
z<ivx@4mZK?j8=&)ZY|WW)5e&$AZ|Ew{)GQL7>ezSj7)>hXq)rstOQ<!?tD(vexU2&
zFc&%)S8hlAtWvgHjErd4x06v1Cc-2WeCN}PjJ&Ssgjv;?N+^7+h5wws(SDd~s-6Hp
z8%H~<3u_f^T%{Oea2f7!_*sW~F{EfiqaCVfXEode=&~kTP%pMA+a025WHXS~z1V?z
zp<PxE(loLePMe>KH3#QHn*mYPp4behy_063UL2upH;h0IfX;{Gno%cr<ZI~8YbFAr
zF*MF1H4pWGvtvZ5!!#dgo2oqcC+N5w_26P<yH>CtjJC#&ooKh}s)CC>OER=c3l%PZ
zP2*(~ZtA8^JD1G$qN9~<-$zDxYirj8?zGQAoOHn?TD9kL8!|FAMQ0SJf+kEW6Z&o1
z9lDlILk@h9vQtj)F2n&{ssW@M|BuLNbNZo_9aDp-pc1Hq=`h7QX~(`2Il(fizXArp
zj4%tSs|d+%guUQVqi*EL8;(wB(9K9T>?YB*$Z@~Y0X>7IFlG89f#O=2>-!Pij*i-k
z2w8shNy4C*etHDv-L1Wl53Ex;ZuE195N@!RGCxgi*iz1{G(V@U4X^qN#Q<68_mb!y
zgmIndIk*c3L&S3_WLde&(IJEU&X8+0bc1~oVcd*#M$xEH2mVb*r>qy5)z+>{^gaB8
zy$NB=M|#5~iTfrKQ6Myqs|KULqwOj18*d51n2vl6cM(e9u7m+B=xEElJ>Mt&!O}KM
z$@~=LXSByr5)5Hnj%A<Y7(O(Zv*Xj5m7Uxv&r<C@8TlBE#omQZ(N0)X;(GiqL-FKc
zIOZBFN&7PsV)M>f5p*GnC9C1MOoXnlxo`$dwWDodTnmeO%{!~%mLmcfG4Qsx4UlQ3
zyJ6Ba?an2C<}{gvFhUJSw`nONf;&Qk@DH5j{KIX(FF+U}hU2nwCL*K@>Ax1EEW@#Y
zy6QAnBHU8E5BfsoG7QJCuCy23vcd>s0M#0fU)!+|HH4`nCI<LwqwC~C{U|<MT;DXo
zFpq`Yb*e6K!dUPv>^z10kc}Sf?EWyCp_@_aS7nrSbxsmp3X@iU82UF}Z19f00cO!>
pQS`eoMr>$kXlQ6?XlQ8g@;@rJG-cns(Xs#l002ovPDHLkV1lV?-PQmA

literal 0
HcmV?d00001

diff --git a/assets/images/github.png b/assets/images/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..847a269a242cee04d869e807632877991a87021a
GIT binary patch
literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0gy>VK~#7F<&`@~
z13?gme_tTtvr<v<N)c--i(qA?VxwRaL=?5Kun`nXYi&fVtSq$=L=@AAm4#jGd=+Bw
zl{6_t<19CrxnuY4c1h<CAKA?QGqYspE>%dTR-%tldM2{OBPyg6ks<O#Ny7~>OSHjJ
z9&u_YuH%jvgQYx9{IqD4<IfG-CM90i5bH#NV-LJv<nPBs2j^xuHj|{$0h?b!@m}}?
z5spc1b8emwY19bHKgExxaGZ`r{$Z5y9Kp-AoupMHIA{a$C5)4>R~_*oYRu_ODFmm;
zRXd`_p4_PB&u$TWg1d5J-J@$%D`L%XSG{5V*Qg+3EyN()G$Gb+Izu~xcXR=JErx2W
zn2gzwahK>qGN}nGhVq9@<~254^Xb&6s^@7F{#1t5Nz9}C>XF<cLh1p#XX64fB@(YR
z{$-e7veSrBijD8w*yDnu8gJUrWD5zk#0h6ae}pfsX>v(4!b0kDUpe_3{yoGsQg4MO
xILIURxyXrTf1LN!A%;-_sS!8*Wenio>KDkvo5-G#DXRbg002ovPDHLkV1j&q+57+i

literal 0
HcmV?d00001

diff --git a/lib/view_model/support_view_model.dart b/lib/view_model/support_view_model.dart
index 1f80f476d..08044232e 100644
--- a/lib/view_model/support_view_model.dart
+++ b/lib/view_model/support_view_model.dart
@@ -24,6 +24,15 @@ abstract class SupportViewModelBase with Store {
           title: 'Email',
           linkTitle: 'support@cakewallet.com',
           link: 'mailto:support@cakewallet.com'),
+      LinkListItem(
+          title: 'Website',
+          linkTitle: 'cakewallet.com',
+          link: 'https://cakewallet.com'),
+      LinkListItem(
+          title: 'GitHub',
+          icon: 'assets/images/github.png',
+          linkTitle: 'APK update',
+          link: 'https://github.com/cake-tech/cake_wallet/releases'),
       LinkListItem(
           title: 'Telegram',
           icon: 'assets/images/Telegram.png',
diff --git a/pubspec.lock b/pubspec.lock
index 3ff596074..207f4b18a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -70,7 +70,7 @@ packages:
       path: "."
       ref: cake
       resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
-      url: "git@github.com:cake-tech/bech32.git"
+      url: "https://github.com/cake-tech/bech32.git"
     source: git
     version: "0.2.0"
   bip32:
@@ -92,8 +92,8 @@ packages:
     description:
       path: "."
       ref: cake
-      resolved-ref: b3ab2926c665f0e68b74a4a5f31059f7fcd817b7
-      url: "git@github.com:cake-tech/bitcoin_flutter.git"
+      resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
+      url: "https://github.com/cake-tech/bitcoin_flutter.git"
     source: git
     version: "2.0.2"
   boolean_selector:
diff --git a/pubspec.yaml b/pubspec.yaml
index 27fb93b0d..4d1b63ceb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -67,7 +67,7 @@ dependencies:
   basic_utils: ^2.0.3
   bitcoin_flutter:
     git:
-      url: git@github.com:cake-tech/bitcoin_flutter.git
+      url: https://github.com/cake-tech/bitcoin_flutter.git
       ref: cake
   get_it: ^6.0.0
   connectivity: ^3.0.3

From 66e22c2d07bbcecc2853eee0bb28ab67974faf91 Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Tue, 18 May 2021 19:14:42 +0300
Subject: [PATCH 2/3] CAKE-324 | fixed localization

---
 lib/view_model/support_view_model.dart | 2 +-
 res/values/strings_de.arb              | 6 ++++--
 res/values/strings_en.arb              | 4 +++-
 res/values/strings_es.arb              | 6 ++++--
 res/values/strings_hi.arb              | 6 ++++--
 res/values/strings_hr.arb              | 8 +++++---
 res/values/strings_it.arb              | 8 +++++---
 res/values/strings_ja.arb              | 6 ++++--
 res/values/strings_ko.arb              | 6 ++++--
 res/values/strings_nl.arb              | 6 ++++--
 res/values/strings_pl.arb              | 6 ++++--
 res/values/strings_pt.arb              | 6 ++++--
 res/values/strings_ru.arb              | 6 ++++--
 res/values/strings_uk.arb              | 6 ++++--
 res/values/strings_zh.arb              | 6 ++++--
 15 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/lib/view_model/support_view_model.dart b/lib/view_model/support_view_model.dart
index 08044232e..1937b90ff 100644
--- a/lib/view_model/support_view_model.dart
+++ b/lib/view_model/support_view_model.dart
@@ -31,7 +31,7 @@ abstract class SupportViewModelBase with Store {
       LinkListItem(
           title: 'GitHub',
           icon: 'assets/images/github.png',
-          linkTitle: 'APK update',
+          linkTitle: S.current.apk_update,
           link: 'https://github.com/cake-tech/cake_wallet/releases'),
       LinkListItem(
           title: 'Telegram',
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 27c705d97..ed3520d17 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "Derzeit unterstützen wir nur den Kauf von Bitcoin. Um Bitcoin zu kaufen, erstellen Sie bitte Ihre Bitcoin-Brieftasche oder wechseln Sie zu dieser",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Neue Bitcoin-Geldbörsen, die in Cake erstellt wurden, haben jetzt einen Startwert von 24 Wörtern. Es ist obligatorisch, dass Sie eine neue Bitcoin-Brieftasche erstellen, Ihr gesamtes Geld in die neue 24-Wörter-Brieftasche überweisen und keine Brieftaschen mit einem 12-Wörter-Startwert mehr verwenden. Bitte tun Sie dies sofort, um Ihr Geld zu sichern.",
+  "understand" : "Ich verstehe",
+
+  "apk_update" : "APK Update"
 }
\ No newline at end of file
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 78ab7ec06..65dee6dbe 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -474,5 +474,7 @@
   "buy_alert_content" : "Currently we only support the purchase of Bitcoin. To buy Bitcoin, please create or switch to your Bitcoin wallet",
 
   "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",
+
+  "apk_update" : "APK update"
 }
\ No newline at end of file
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 98ece5ce7..983146557 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "Actualmente solo apoyamos la compra de Bitcoin. Para comprar Bitcoin, cree o cambie a su billetera Bitcoin",
   
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Las nuevas carteras de Bitcoin creadas en Cake ahora tienen una semilla de 24 palabras. Es obligatorio que cree una nueva billetera de Bitcoin y transfiera todos sus fondos a la nueva billetera de 24 palabras, y deje de usar billeteras con una semilla de 12 palabras. Haga esto de inmediato para asegurar sus fondos.",
+  "understand" : "Entiendo",
+
+  "apk_update" : "Actualización de APK"
 }
\ No newline at end of file
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 4f14f2a1a..889f21c3f 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "वर्तमान में हम केवल बिटकॉइन की खरीद का समर्थन करते हैं। बिटकॉइन खरीदने के लिए, कृपया अपना बिटकॉइन वॉलेट बनाएं या स्विच करें",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "केक में बनाए गए नए बिटकॉइन वॉलेट में अब 24-शब्द का बीज है। यह अनिवार्य है कि आप एक नया बिटकॉइन वॉलेट बनाएं और अपने सभी फंड को नए 24-शब्द वाले वॉलेट में स्थानांतरित करें, और 12-शब्द बीज वाले वॉलेट का उपयोग करना बंद करें। कृपया अपने धन को सुरक्षित करने के लिए इसे तुरंत करें।",
+  "understand" : "मुझे समझ",
+
+  "apk_update" : "APK अद्यतन"
 }
\ No newline at end of file
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index d449fca1b..681917b03 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -471,8 +471,10 @@
 
   "submit_request" : "podnesi zahtjev",
 
-  "buy_alert_content" : "Currently we only support the purchase of Bitcoin. To buy Bitcoin, please create or switch to your Bitcoin wallet",
+  "buy_alert_content" : "Trenutno podržavamo samo kupnju Bitcoina. Da biste kupili Bitcoin, izradite ili prijeđite na svoj Bitcoin novčanik",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Novi Bitcoin novčanici stvoreni u Cakeu sada imaju sjeme od 24 riječi. Obavezno je stvoriti novi Bitcoin novčanik i prenijeti sva svoja sredstva u novi novčanik od 24 riječi te prestati koristiti novčanike s sjemenkom od 12 riječi. Učinite to odmah kako biste osigurali svoja sredstva.",
+  "understand" : "Razumijem",
+
+  "apk_update" : "APK ažuriranje"
 }
\ No newline at end of file
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index e8c4da26d..1b10a0137 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -471,8 +471,10 @@
 
   "submit_request" : "invia una richiesta",
 
-  "buy_alert_content" : "Currently we only support the purchase of Bitcoin. To buy Bitcoin, please create or switch to your Bitcoin wallet",
+  "buy_alert_content" : "Attualmente supportiamo solo l'acquisto di Bitcoin. Per acquistare Bitcoin, crea o passa al tuo portafoglio Bitcoin",
   
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "I nuovi portafogli Bitcoin creati in Cake ora hanno un seme di 24 parole. È obbligatorio creare un nuovo portafoglio Bitcoin e trasferire tutti i fondi nel nuovo portafoglio di 24 parole e smettere di usare portafogli con un seme di 12 parole. Ti preghiamo di farlo immediatamente per proteggere i tuoi fondi.",
+  "understand" : "Capisco",
+
+  "apk_update" : "Aggiornamento APK"
 }
\ No newline at end of file
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 797cfe2c2..7d78e9313 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "現在、ビットコインの購入のみをサポートしています。 ビットコインを購入するには、ビットコインウォレットを作成するか切り替えてください",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Cakeで作成された新しいビットコインウォレットには、24ワードのシードがあります。 新しいビットコインウォレットを作成し、すべての資金を新しい24ワードのウォレットに転送し、12ワードのシードを持つウォレットの使用を停止することが必須です。 あなたの資金を確保するためにこれをすぐに行ってください。",
+  "understand" : "わかります",
+
+  "apk_update" : "APKアップデート"
 }
\ No newline at end of file
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index fddff1af5..3a10232a9 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "현재 우리는 비트 코인 구매 만 지원합니다. 비트 코인을 구매하려면 비트 코인 지갑을 생성하거나 전환하십시오",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Cake에서 생성 된 새로운 비트 코인 지갑에는 이제 24 단어 시드가 있습니다. 새로운 비트 코인 지갑을 생성하고 모든 자금을 새로운 24 단어 지갑으로 이체하고 12 단어 시드가있는 지갑 사용을 중지해야합니다. 자금을 확보하려면 즉시이 작업을 수행하십시오.",
+  "understand" : "이해 했어요",
+
+  "apk_update" : "APK 업데이트"
 }
\ No newline at end of file
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 8d4b4bf1c..76b084428 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "Momenteel ondersteunen we alleen de aankoop van Bitcoin. Om Bitcoin te kopen, moet u uw Bitcoin-portemonnee aanmaken of naar uw Bitcoin-portemonnee overschakelen",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Nieuwe Bitcoin-portefeuilles die in Cake zijn gemaakt, hebben nu een zaadje van 24 woorden. Het is verplicht dat u een nieuwe Bitcoin-portemonnee maakt en al uw geld overmaakt naar de nieuwe portemonnee van 24 woorden, en stopt met het gebruik van wallets met een seed van 12 woorden. Doe dit onmiddellijk om uw geld veilig te stellen.",
+  "understand" : "Ik begrijp het",
+
+  "apk_update" : "APK-update"
 }
\ No newline at end of file
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index fca8328fc..5522713d7 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "Obecnie obsługujemy tylko zakup Bitcoinów. Aby kupić Bitcoin, utwórz lub przełącz się na swój portfel Bitcoin",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Nowe portfele Bitcoin utworzone w Cake mają teraz ziarno składające się z 24 słów. Konieczne jest utworzenie nowego portfela Bitcoin i przeniesienie wszystkich środków do nowego portfela na 24 słowa oraz zaprzestanie korzystania z portfeli z zalążkiem na 12 słów. Zrób to natychmiast, aby zabezpieczyć swoje fundusze.",
+  "understand" : "Rozumiem",
+
+  "apk_update" : "Aktualizacja APK"
 }
\ No newline at end of file
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 8aa08e69c..c5c976113 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "Atualmente, apoiamos apenas a compra de Bitcoin. Para comprar Bitcoin, crie ou mude para sua carteira Bitcoin",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "As novas carteiras Bitcoin criadas no Cake agora têm uma semente de 24 palavras. É obrigatório que você crie uma nova carteira Bitcoin e transfira todos os seus fundos para a nova carteira de 24 palavras, e pare de usar carteiras com semente de 12 palavras. Faça isso imediatamente para garantir seus fundos.",
+  "understand" : "Entendo",
+
+  "apk_update" : "Atualização de APK"
 }
\ No newline at end of file
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 4fe26f13c..1377b4fc0 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "В настоящее время мы поддерживаем только покупку Bitcoin. Чтобы купить Bitcoin, создайте или переключитесь на ваш Bitcoin кошелек",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Новые биткойн-кошельки, созданные в Cake, теперь содержат мнемоническую фразу из 24 слов. Вы обязательно должны создать новый биткойн-кошелек и перевести все свои средства в новый кошелек из 24 слов, а также прекратить использование кошельков с мнемонической фразой из 12 слов. Пожалуйста, сделайте это немедленно, чтобы обезопасить свои средства.",
+  "understand" : "Понятно",
+
+  "apk_update" : "Обновление APK"
 }
\ No newline at end of file
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 69d02a27e..e0c1fcc55 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -473,6 +473,8 @@
 
   "buy_alert_content" : "На даний час ми підтримуємо тільки покупку Bitcoin. Щоб купити Bitcoin, будь ласка, створіть або переключіться на ваш Bitcoin гаманець",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "Нові біткойн-гаманці, створені в Cake, тепер містять мнемонічну фразу з 24 слів. Обов’язково стовріть новий біткойн-гаманець, переведіть всі кошти на новий гаманець із 24 слів і припиніть використання гаманців із мнемонічною фразою з 12 слів. Зробіть це негайно, щоб убезпечити свої кошти.",
+  "understand" : "Зрозуміло",
+
+  "apk_update" : "Оновлення APK"
 }
\ No newline at end of file
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index e0a96561c..ddb1efda3 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -470,6 +470,8 @@
   "submit_request" : "提交请求",
   "buy_alert_content" : "目前,我們僅支持購買比特幣。 要購買比特幣,請創建或切換到您的比特幣錢包",
 
-  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "outdated_electrum_wallet_desceription" : "在Cake中創建的新比特幣錢包現在有一個24字的種子。 必須創建一個新的比特幣錢包,然後將所有資金轉移到新的24字錢包,並停止使用帶有12字種子的錢包。 請立即執行此操作以確保您的資金安全。",
+  "understand" : "我明白",
+
+  "apk_update" : "APK更新"
 }
\ No newline at end of file

From 7be3288d5322eaf66022478420f4109723961435 Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Wed, 2 Jun 2021 12:45:29 +0300
Subject: [PATCH 3/3] CAKE-324 | merged main branch into current

---
 res/values/strings_zh.arb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 61e6ed893..5faa8c840 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -468,6 +468,7 @@
   "confirmed" : "已确认",
   "unconfirmed" : "未经证实",
   "displayable" : "可显示",
+
   "submit_request" : "提交请求",
 
   "buy_alert_content" : "目前,我们仅支持购买比特币。要购买比特币,请创建或切换到您的比特币钱包",