Merge branch 'main' into release/v3.12.1-2400214

litecoin-foundation · Feb 16, 2024 · f8a50c3 · f8a50c3
2 parents 8e8481b + f28c55f
commit f8a50c3
Show file tree

Hide file tree

Showing 184 changed files with 25,523 additions and 128 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 ## Litewallet related
-
 litewallet/partner-keys.plist
 litewallet/GoogleService-Info.plist
 

diff --git a/litewallet/Assets.xcassets/TabBar/Contents.json b/litewallet/Assets.xcassets/TabBar/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
 }
diff --git a/litewallet/Assets.xcassets/TabBar/receiveIcon.imageset/Contents.json b/litewallet/Assets.xcassets/TabBar/receiveIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LW_RecieveV2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/litewallet/Assets.xcassets/TabBar/receiveIcon.imageset/LW_RecieveV2.png b/litewallet/Assets.xcassets/TabBar/receiveIcon.imageset/LW_RecieveV2.png
diff --git a/litewallet/es.lproj/Localizable.strings b/litewallet/es.lproj/Localizable.strings
@@ -879,9 +879,6 @@
 /* Fee: $0.01 */
 "Send.bareFee" = "Tarifa: %1$@";
 
-/* Fee: $0.01 */
-"Send.bareFee" = "Tarifa: %1$@";
-
 /* Send Bar Item Title */
 "Send.barItemTitle" = "ENVIAR";
 
@@ -909,18 +906,6 @@
 /* Fees: $0.01*/
 "Send.fee" = "Honorarios: %1$@";
 
-/* Fees: $0.01*/
-"Send.fee" = "Honorarios: %1$@";
-
-/* Fees: $0.01*/
-"Send.fee" = "Honorarios: %1$@";
-
-/* Fees Blank: */
-"Send.feeBlank" = "Honorarios:";
-
-/* Fees Blank: */
-"Send.feeBlank" = "Honorarios:";
-
 /* Fees Blank: */
 "Send.feeBlank" = "Honorarios:";
 

diff --git a/litewallet/fr.lproj/Localizable.strings b/litewallet/fr.lproj/Localizable.strings
@@ -904,18 +904,6 @@
 /* Fees: $0.01*/
 "Send.fee" = "Frais: %1$@";
 
-/* Fees: $0.01*/
-"Send.fee" = "Frais: %1$@";
-
-/* Fees: $0.01*/
-"Send.fee" = "Frais: %1$@";
-
-/* Fees Blank: */
-"Send.feeBlank" = "Frais:";
-
-/* Fees Blank: */
-"Send.feeBlank" = "Frais:";
-
 /* Fees Blank: */
 "Send.feeBlank" = "Frais:";
 

diff --git a/litewallet/id.lproj/Localizable.strings b/litewallet/id.lproj/Localizable.strings
@@ -904,18 +904,6 @@
 /* Fees: $0.01*/
 "Send.fee" = "Biaya: %1$@";
 
-/* Fees: $0.01*/
-"Send.fee" = "Biaya: %1$@";
-
-/* Fees: $0.01*/
-"Send.fee" = "Biaya: %1$@";
-
-/* Fees Blank: */
-"Send.feeBlank" = "Biaya:";
-
-/* Fees Blank: */
-"Send.feeBlank" = "Biaya:";
-
 /* Fees Blank: */
 "Send.feeBlank" = "Biaya:";