From cd65e6c077c48b6d0210b12883208c87d6488e83 Mon Sep 17 00:00:00 2001 From: atsunatsu Date: Mon, 21 Sep 2026 11:11:52 +0800 Subject: [PATCH] fix(res): single-line what's new string, unformatted qso count, si typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pass_whatsnew_message rewritten as a single line with escaped \n bullets: real newlines in the value are invalid for aapt2 ('not a valid string'). - Escape the apostrophe in "map's"; mark grid_qso_calls_count formatted=false (two %d + '·' triggered multiple-substitutions). - values-si: remove stray comma after map_altitude . All were latent resource errors surfaced by the forced recompile. --- .../src/main/res/values-si/strings.xml | 2 +- .../src/main/res/values-zh/strings.xml | 17 ++--------- .../src/main/res/values/strings.xml | 29 ++----------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/core/presentation/src/main/res/values-si/strings.xml b/core/presentation/src/main/res/values-si/strings.xml index 2236c969..fd8acb18 100644 --- a/core/presentation/src/main/res/values-si/strings.xml +++ b/core/presentation/src/main/res/values-si/strings.xml @@ -71,7 +71,7 @@ ඊළග දිගංශය: %.1f° උත්තෝලනය: %.1f° - උන්නතාශය: %.0f km, + උන්නතාශය: %.0f km පරතරය: %.0f km අක්‍ෂාංශ: %.1f° දේශාංශ: %.1f° diff --git a/core/presentation/src/main/res/values-zh/strings.xml b/core/presentation/src/main/res/values-zh/strings.xml index 2955d423..2975c45a 100644 --- a/core/presentation/src/main/res/values-zh/strings.xml +++ b/core/presentation/src/main/res/values-zh/strings.xml @@ -41,20 +41,7 @@ 请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性 - 4.4.6 以来的全部更新（4.4.7 系列）： -\n• 网格模式地图：LoTW 已确认网格绿色填充、漫游网格蓝色条纹、当前网格加粗框；右上角网格/卫星模式开关。 -\n• 首通呼号（VUCC 视图）：绿格显示该格最早通联的呼号，非绿格空白。 -\n• worked 网格可按操作网格筛选（含“全部”）；点击网格弹出 QSO 明细；每格 QSO 计数。 -\n• 各操作网格独立 VUCC 计数；极区网格标签；反经线修复；漫游条纹密度一致。 -\n• WAPC/WAJA 地图标签随系统语言。 -\n• 网格模式视口与筛选跨页保持。 -\n• LoTW 同步：账号直连、全量/增量模式、实时进度、可取消、启动自动同步（独立开关）、设置页显示上次同步时间。 -\n• 历史过境：过境筛选可回看过去数小时（先前时间）。 -\n• 指南针校准：8 字动作精度指示 + 手动航向偏置。 -\n• AMSAT 状态页：连续相同状态报告计数。 -\n• 过境/雷达：UTC 切换重算过境；日出日落与仰角颜色修复；卫星模糊搜索；相互过境页滚动保持、跟随 UTC、雷达快捷入口。 -\n• CW 解码器支持 32/64 位设备；Android 17 (API 37) 适配。 - + 4.4.6 以来的全部更新（4.4.7 系列）：\n\n• 网格模式地图：LoTW 已确认网格绿色填充、漫游网格蓝色条纹、当前网格加粗框；右上角网格/卫星模式开关。\n\n• 首通呼号（VUCC 视图）：绿格显示该格最早通联的呼号，非绿格空白。\n\n• worked 网格可按操作网格筛选（含“全部”）；点击网格弹出 QSO 明细；每格 QSO 计数。\n\n• 各操作网格独立 VUCC 计数；极区网格标签；反经线修复；漫游条纹密度一致。\n\n• WAPC/WAJA 地图标签随系统语言。\n\n• 网格模式视口与筛选跨页保持。\n\n• LoTW 同步：账号直连、全量/增量模式、实时进度、可取消、启动自动同步（独立开关）、设置页显示上次同步时间。\n\n• 历史过境：过境筛选可回看过去数小时（先前时间）。\n\n• 指南针校准：8 字动作精度指示 + 手动航向偏置。\n\n• AMSAT 状态页：连续相同状态报告计数。\n\n• 过境/雷达：UTC 切换重算过境；日出日落与仰角颜色修复；卫星模糊搜索；相互过境页滚动保持、跟随 UTC、雷达快捷入口。\n\n• CW 解码器支持 32/64 位设备；Android 17 (API 37) 适配。 AMSAT AMSAT 卫星状态 @@ -138,7 +125,7 @@ 速度：%.2f km/s 能见度：%s - %d 个呼号 · %d 次通联 + %d 个呼号 · %d 次通联 %d QSO %d QSOs 首通 diff --git a/core/presentation/src/main/res/values/strings.xml b/core/presentation/src/main/res/values/strings.xml index e9c9c58b..7fbfe2ac 100644 --- a/core/presentation/src/main/res/values/strings.xml +++ b/core/presentation/src/main/res/values/strings.xml @@ -52,32 +52,7 @@ Make sure to set your position via GPS, Lat/Lon or QTH in Settings. \n\nPlease update the database at least weekly to get accurate predictions. What\'s new in Look4Sat - All changes since 4.4.6 (the 4.4.7 series): - -• Grid-mode map: LoTW confirmed grids in green, roamed grids with blue stripes, current grid highlighted; mode switch pill at the map's top-right. - -• First-call labels (VUCC view): show the first callsign worked in each green grid instead of the grid code; non-worked cells stay empty. - -• Worked grids filtered by operated grid (with an All option); tap a grid to see its QSO detail dialog; per-grid QSO counts. - -• Per-operated-grid VUCC counting; polar grid labels; antimeridian fixes; consistent roamed-stripe density. - -• WAPC/WAJA map labels follow the system language. - -• Grid-mode viewport and award filter survive page switches. - -• LoTW sync: direct login, full/incremental modes, live progress, cancel button, auto-sync on app start with its own toggle, last-sync time shown. - -• Pass history: filter can look back over past passes (Time before). - -• Compass calibration: figure-eight accuracy meter plus manual heading offset. - -• AMSAT status page: consecutive same-status report counts. - -• Passes/radar: UTC toggle recalculates passes; sunrise/sunset and elevation color fixes; satellite fuzzy search; mutual page keeps scroll, follows UTC, radar shortcut. - -• CW decoder for 32/64-bit devices; Android 17 (API 37) support. - + All changes since 4.4.6 (the 4.4.7 series):\n\n• Grid-mode map: LoTW confirmed grids in green, roamed grids with blue stripes, current grid highlighted; mode switch pill at the map\'s top-right.\n\n• First-call labels (VUCC view): show the first callsign worked in each green grid instead of the grid code; non-worked cells stay empty.\n\n• Worked grids filtered by operated grid (with an All option); tap a grid to see its QSO detail dialog; per-grid QSO counts.\n\n• Per-operated-grid VUCC counting; polar grid labels; antimeridian fixes; consistent roamed-stripe density.\n\n• WAPC/WAJA map labels follow the system language.\n\n• Grid-mode viewport and award filter survive page switches.\n\n• LoTW sync: direct login, full/incremental modes, live progress, cancel button, auto-sync on app start with its own toggle, last-sync time shown.\n\n• Pass history: filter can look back over past passes (Time before).\n\n• Compass calibration: figure-eight accuracy meter plus manual heading offset.\n\n• AMSAT status page: consecutive same-status report counts.\n\n• Passes/radar: UTC toggle recalculates passes; sunrise/sunset and elevation color fixes; satellite fuzzy search; mutual page keeps scroll, follows UTC, radar shortcut.\n\n• CW decoder for 32/64-bit devices; Android 17 (API 37) support. AMSAT @@ -170,7 +145,7 @@ Velocity: %.2f km/s Visibility: %s - %d callsigns · %d QSOs + %d callsigns · %d QSOs %d QSO %d QSOs First