From 2abe0c458237624e433f08b68f23c7050985ca62 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sat, 4 Oct 2025 10:54:57 +0100
Subject: [PATCH] v3.2.2 - Fixed translation issues #168 #172, AMSAT priority
 #173

---
 app/build.gradle                                            | 4 ++--
 app/src/main/res/values-zh-rCN/strings.xml                  | 2 +-
 .../java/com/rtbishop/look4sat/domain/ISettingsManager.kt   | 4 ++--
 .../com/rtbishop/look4sat/domain/data/DataRepository.kt     | 2 +-
 fastlane/metadata/android/en-US/changelogs/default.txt      | 6 +++---
 fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US     | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7e5d7b8e..ed93da01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.rtbishop.look4sat"
         minSdk 21
         targetSdk 35
-        versionCode 321
-        versionName '3.2.1'
+        versionCode 322
+        versionName '3.2.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d96cedf3..e17fdac4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -28,7 +28,7 @@
     <string name="btn_manual">手动输入</string>
     <string name="btn_qth">QTH 网格</string>
     <string name="btn_web">在线更新</string>
-    <string name="btn_import">進口</string>
+    <string name="btn_import">导入文件</string>
     <string name="btn_github">GitHub</string>
     <string name="btn_support">支持</string>
     <string name="btn_fdroid">F-Droid</string>
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsManager.kt b/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsManager.kt
index f271624c..08382b09 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsManager.kt
+++ b/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsManager.kt
@@ -24,7 +24,6 @@ interface ISettingsManager {
     val sourcesMap: Map<String, String>
         get() = mapOf(
             "All" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
-            "Amsat" to "https://amsat.org/tle/current/nasabare.txt",
             "Amateur" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",
             "Classified" to "https://www.mmccants.org/~mmccants/tles/classfd.zip",
             "Cubesat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv",
@@ -48,7 +47,8 @@ interface ISettingsManager {
             "Starlink" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=starlink&FORMAT=csv",
             "Swarm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=swarm&FORMAT=csv",
             "Weather" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=csv",
-            "X-Comm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=csv"
+            "X-Comm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=csv",
+            "Amsat" to "https://amsat.org/tle/current/nasabare.txt"
         )
 
     fun loadStationLocator(): String
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/data/DataRepository.kt b/base/src/main/java/com/rtbishop/look4sat/domain/data/DataRepository.kt
index 005f720b..9471f3f7 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/data/DataRepository.kt
+++ b/base/src/main/java/com/rtbishop/look4sat/domain/data/DataRepository.kt
@@ -75,7 +75,7 @@ class DataRepository(
             jobsMap.mapValues { job -> job.value.await() }.forEach { entry ->
                 entry.value?.let { stream ->
                     when (val type = entry.key) {
-                        "AMSAT", "R4UAB" -> {
+                        "Amsat", "R4UAB" -> {
                             // parse tle stream
                             val satellites = importSatellites(stream)
                             val catnums = satellites.map { it.data.catnum }
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index 3a024c39..e7b680ef 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,3 +1,3 @@
-Added Ukrainian translation by KristobalJunta #165
-Added per-app language switching feature by KristobalJunta #166
-Added negative elevation filtering when sent via BT/Network #164
+Added AMSAT data source and naming convention priority #173
+Added fixes for Chinese translation by Mubi-Baihua #169
+Added fixes for Ukrainian translation by KristobalJunta #172
diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
index 3a024c39..e7b680ef 100644
--- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
+++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
@@ -1,3 +1,3 @@
-Added Ukrainian translation by KristobalJunta #165
-Added per-app language switching feature by KristobalJunta #166
-Added negative elevation filtering when sent via BT/Network #164
+Added AMSAT data source and naming convention priority #173
+Added fixes for Chinese translation by Mubi-Baihua #169
+Added fixes for Ukrainian translation by KristobalJunta #172