Skip to content

Commit 39deaab

Browse files
jayfuncjayfunc
committed
fix: resolve encoding issues in localization files
1 parent 26a8895 commit 39deaab

10 files changed

Lines changed: 163 additions & 160 deletions

File tree

‎Android/app/src/main/java/com/jayfunc/carpecast/MediaSyncService.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ class MediaSyncService : NotificationListenerService() {
107107
isRunning = true
108108

109109
val prefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
110-
deviceName = prefs.getString("device_name", android.os.Build.MODEL) ?: android.os.Build.MODEL
111110
discoveryPort = prefs.getInt("discovery_port", 5001)
112111
senderDiscoveryPort = prefs.getInt("sender_discovery_port", 5003)
113112
// commandPort is dynamically allocated now, no need to read it from prefs

‎Android/app/src/main/res/values-ja/strings.xml‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,72 @@
1-
<resources>
1+
<resources>
22
<string name="app_name">CarpeCast</string>
33

44
<!-- Player Strings -->
55
<string name="no_media_playing">メディアが再生されていません</string>
6-
<string name="unknown_artist">不明なアーティス�/string>
7-
<string name="unknown_album">不明なアルバ�/string>
8-
<string name="status_playing">再生�/string>
9-
<string name="status_paused">一時停�/string>
6+
<string name="unknown_artist">不明なアーティスト</string>
7+
<string name="unknown_album">不明なアルバム</string>
8+
<string name="status_playing">再生中</string>
9+
<string name="status_paused">一時停止</string>
1010
<string name="status_stopped">停止</string>
1111
<string name="app_name_placeholder">音楽</string>
1212

1313
<!-- Device Status Strings -->
1414
<string name="syncing_to_pc">PCに同期中: %1$s</string>
15-
<string name="waiting_for_pc">PCの接続を待機していま�..</string>
16-
<string name="connection_status">接続ステータ�/string>
17-
<string name="grant_service_permission">通知へのアクセスを許�/string>
15+
<string name="waiting_for_pc">PCの接続を待機しています...</string>
16+
<string name="connection_status">接続ステータス</string>
17+
<string name="grant_service_permission">通知へのアクセスを許可</string>
1818
<string name="disconnect">切断</string>
1919

2020
<!-- Bottom Navigation -->
21-
<string name="nav_player">プレーヤ�/string>
21+
<string name="nav_player">プレーヤー</string>
2222
<string name="nav_devices">デバイス</string>
2323
<string name="nav_settings">設定</string>
2424

2525
<!-- Settings -->
2626
<string name="settings_title">設定</string>
2727
<string name="settings_network">ネットワーク</string>
28-
<string name="settings_theme">テー�/string>
28+
<string name="settings_theme">テーマ</string>
2929
<string name="settings_theme_desc">アプリの外観を選択します</string>
30-
<string name="settings_language">言�/string>
31-
<string name="settings_language_desc">希望の言語を選択しま�/string>
32-
<string name="theme_system">システムに従�/string>
33-
<string name="theme_light">ライ�/string>
30+
<string name="settings_language">言語</string>
31+
<string name="settings_language_desc">希望の言語を選択します</string>
32+
<string name="theme_system">システムに従う</string>
33+
<string name="theme_light">ライト</string>
3434
<string name="theme_dark">ダーク</string>
35-
<string name="language_system">システムに従�/string>
35+
<string name="language_system">システムに従う</string>
3636
<string name="language_english">English</string>
3737
<string name="language_chinese">簡体字中国語</string>
3838
<string name="language_chinese_traditional">繁体字中国語</string>
39-
<string name="language_japanese">日本�/string>
40-
<string name="settings_device_name">デバイス�/string>
39+
<string name="language_japanese">日本語</string>
40+
<string name="settings_device_name">デバイス名</string>
4141
<string name="restore_default">デフォルトに戻す</string>
42-
<string name="settings_discovery_port">探索ポー�/string>
42+
<string name="settings_discovery_port">探索ポート</string>
4343
<string name="settings_discovery_port_desc">ローカルネットワークでのデバイス検索に使用します。デフォルト: 5001</string>
44-
<string name="settings_sender_discovery_port">ËÍÐłȗʳö¥Ý©`¥È</string>
45-
<string name="settings_sender_discovery_port_desc">ÊÜÐłȤË×ÔÉí¤ò¥Ö¥í©`¥É¥­¥ã¥¹¥È¤¹¤ë¤¿¤á¤Î¥Ý©`¥È¤Ç¤¹¡£</string>
46-
<string name="settings_command_port">コマンドポー�/string>
47-
<string name="settings_command_port_desc">PCからの再�一時停止コマンドを受信するために使用します。デフォルト: 5002</string>
44+
45+
<string name="settings_sender_discovery_port">送信側検出ポート</string>
46+
<string name="settings_sender_discovery_port_desc">受信側に自身をブロードキャストするためのポートです。</string>
47+
<string name="settings_command_port">コマンドポート</string>
48+
<string name="settings_command_port_desc">PCからの再生/一時停止コマンドを受信するために使用します。デフォルト: 5002</string>
4849
<string name="settings_allowed_sources">許可されたソース</string>
49-
<string name="settings_allowed_sources_desc">同期するアプリを選択しま�/string>
50-
<string name="dialog_allowed_sources_title">許可されたソースを選�/string>
50+
<string name="settings_allowed_sources_desc">同期するアプリを選択します</string>
51+
<string name="dialog_allowed_sources_title">許可されたソースを選択</string>
5152
<string name="allow_all_sources">すべてのアプリを許可</string>
52-
<string name="no_media_apps_found">音楽プレーヤーが見つかりませ�/string>
53-
<string name="settings_save_restart">保存して再起�/string>
53+
<string name="no_media_apps_found">音楽プレーヤーが見つかりません</string>
54+
<string name="settings_save_restart">保存して再起動</string>
5455

5556
<string name="settings_recommended">おすすめ</string>
56-
<string name="settings_betterlyrics_desc">最高のデスクトップ歌詞体験を得るには、BetterLyricsをおすすめします�/string>
57-
<string name="settings_download_windows_title">PC版CarpeCastをダウンロー�/string>
58-
<string name="settings_download_windows_desc">音楽を同期するには、PCにCarpeCastをインストールしてください�/string>
57+
<string name="settings_betterlyrics_desc">最高のデスクトップ歌詞体験を得るには、BetterLyricsをおすすめします。</string>
58+
<string name="settings_download_windows_title">PC版CarpeCastをダウンロード</string>
59+
<string name="settings_download_windows_desc">音楽を同期するには、PCにCarpeCastをインストールしてください。</string>
5960

6061
<string name="settings_system_permissions">システム権限</string>
6162
<string name="settings_battery_optimization">バッテリー最適化</string>
62-
<string name="settings_battery_optimization_desc">バックグラウンド同期の終了を防ぐ（制限なしを推奨�/string>
63+
<string name="settings_battery_optimization_desc">バックグラウンド同期の終了を防ぐ（制限なしを推奨）</string>
6364
<string name="settings_auto_start">自動起動</string>
6465
<string name="settings_auto_start_desc">アプリのバックグラウンド実行と自動起動を許可</string>
6566

6667
<!-- Foreground Service Notification -->
6768
<string name="notification_channel_name">バックグラウンド同期</string>
68-
<string name="notification_channel_desc">メディア同期をバックグラウンドで維持しま�/string>
69-
<string name="notification_title_idle">接続を待機中�/string>
70-
<string name="notification_title_connected">接続済み�1$s</string>
69+
<string name="notification_channel_desc">メディア同期をバックグラウンドで維持します</string>
70+
<string name="notification_title_idle">接続を待機中…</string>
71+
<string name="notification_title_connected">接続済み：%1$s</string>
7172
</resources>

‎Android/app/src/main/res/values-zh-rTW/strings.xml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
<resources>
1+
<resources>
22
<string name="app_name">拾音</string>
33

44
<!-- Player Strings -->
55
<string name="no_media_playing">暫無媒體播放</string>
66
<string name="unknown_artist">未知歌手</string>
77
<string name="unknown_album">未知專輯</string>
88
<string name="status_playing">正在播放</string>
9-
<string name="status_paused">已暫�/string>
10-
<string name="status_stopped">已停�/string>
9+
<string name="status_paused">已暫停</string>
10+
<string name="status_stopped">已停止</string>
1111
<string name="app_name_placeholder">音樂</string>
1212

1313
<!-- Device Status Strings -->
14-
<string name="syncing_to_pc">正在同步至電� %1$s</string>
14+
<string name="syncing_to_pc">正在同步至電腦: %1$s</string>
1515
<string name="waiting_for_pc">正在等待電腦端連線...</string>
16-
<string name="connection_status">連線狀�/string>
16+
<string name="connection_status">連線狀態</string>
1717
<string name="grant_service_permission">授予通知監聽權限</string>
1818
<string name="disconnect">斷開連線</string>
1919

2020
<!-- Bottom Navigation -->
2121
<string name="nav_player">播放控制</string>
22-
<string name="nav_devices">設備狀�/string>
22+
<string name="nav_devices">設備狀態</string>
2323
<string name="nav_settings">設定</string>
2424

2525
<!-- Settings -->
@@ -36,36 +36,37 @@
3636
<string name="language_english">English</string>
3737
<string name="language_chinese">簡體中文</string>
3838
<string name="language_chinese_traditional">繁體中文</string>
39-
<string name="language_japanese">日本�/string>
39+
<string name="language_japanese">日本語</string>
4040
<string name="settings_device_name">裝置名稱</string>
4141
<string name="restore_default">恢復預設</string>
42-
<string name="settings_discovery_port">發現連接�/string>
43-
<string name="settings_discovery_port_desc">用於在區域網路中發現裝置。預� 5001</string>
44-
<string name="settings_sender_discovery_port">°lËͶ˰l¬FßB½Ó²º</string>
45-
<string name="settings_sender_discovery_port_desc">ÓÃ춏V²¥×ÔÉíÒÔ±»½ÓÊն˰l¬FµÄßB½Ó²º¡£</string>
46-
<string name="settings_command_port">命令接收連接�/string>
47-
<string name="settings_command_port_desc">用於接收來自電腦的播�暫停等指令。預� 5002</string>
42+
<string name="settings_discovery_port">發現連接埠</string>
43+
<string name="settings_discovery_port_desc">用於在區域網路中發現裝置。預設: 5001</string>
44+
45+
<string name="settings_sender_discovery_port">發送端發現連接埠</string>
46+
<string name="settings_sender_discovery_port_desc">用於廣播自身以被接收端發現的連接埠。</string>
47+
<string name="settings_command_port">命令接收連接埠</string>
48+
<string name="settings_command_port_desc">用於接收來自電腦的播放/暫停等指令。預設: 5002</string>
4849
<string name="settings_allowed_sources">允許的播放源</string>
4950
<string name="settings_allowed_sources_desc">選擇要同步播放狀態的應用程式</string>
5051
<string name="dialog_allowed_sources_title">選擇允許的播放源</string>
51-
<string name="allow_all_sources">允許所有應用程�/string>
52+
<string name="allow_all_sources">允許所有應用程式</string>
5253
<string name="no_media_apps_found">未找到音樂播放器</string>
53-
<string name="settings_save_restart">儲存並重啟服�/string>
54+
<string name="settings_save_restart">儲存並重啟服務</string>
5455

5556
<string name="settings_recommended">推薦</string>
56-
<string name="settings_betterlyrics_desc">推薦搭配 BetterLyrics 獲得最佳的桌面歌詞體驗�/string>
57-
<string name="settings_download_windows_title">下載 PC �CarpeCast</string>
58-
<string name="settings_download_windows_desc">在電腦上安裝 CarpeCast 以實現音樂同步�/string>
57+
<string name="settings_betterlyrics_desc">推薦搭配 BetterLyrics 獲得最佳的桌面歌詞體驗。</string>
58+
<string name="settings_download_windows_title">下載 PC 版 CarpeCast</string>
59+
<string name="settings_download_windows_desc">在電腦上安裝 CarpeCast 以實現音樂同步。</string>
5960

6061
<string name="settings_system_permissions">系統權限</string>
6162
<string name="settings_battery_optimization">電池策略 (背景執行)</string>
62-
<string name="settings_battery_optimization_desc">防止背景同步服務被系統強制關�(建議設為無限�</string>
63+
<string name="settings_battery_optimization_desc">防止背景同步服務被系統強制關閉 (建議設為無限制)</string>
6364
<string name="settings_auto_start">自動啟動</string>
64-
<string name="settings_auto_start_desc">允許應用程式在背景執行並隨系統啟�/string>
65+
<string name="settings_auto_start_desc">允許應用程式在背景執行並隨系統啟動</string>
6566

6667
<!-- Foreground Service Notification -->
6768
<string name="notification_channel_name">背景同步</string>
68-
<string name="notification_channel_desc">保持媒體同步在背景持續執�/string>
69-
<string name="notification_title_idle">等待連線�/string>
70-
<string name="notification_title_connected">已連線�1$s</string>
69+
<string name="notification_channel_desc">保持媒體同步在背景持續執行</string>
70+
<string name="notification_title_idle">等待連線…</string>
71+
<string name="notification_title_connected">已連線：%1$s</string>
7172
</resources>

‎Android/app/src/main/res/values-zh/strings.xml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
<resources>
1+
<resources>
22
<string name="app_name">拾音</string>
33

44
<!-- Player Strings -->
55
<string name="no_media_playing">暂无媒体播放</string>
66
<string name="unknown_artist">未知歌手</string>
77
<string name="unknown_album">未知专辑</string>
88
<string name="status_playing">正在播放</string>
9-
<string name="status_paused">已暂�/string>
10-
<string name="status_stopped">已停�/string>
9+
<string name="status_paused">已暂停</string>
10+
<string name="status_stopped">已停止</string>
1111
<string name="app_name_placeholder">音乐</string>
1212

1313
<!-- Device Status Strings -->
14-
<string name="syncing_to_pc">正在同步至电� %1$s</string>
15-
<string name="waiting_for_pc">正在等待电脑端连�..</string>
16-
<string name="connection_status">连接状�/string>
14+
<string name="syncing_to_pc">正在同步至电脑: %1$s</string>
15+
<string name="waiting_for_pc">正在等待电脑端连接...</string>
16+
<string name="connection_status">连接状态</string>
1717
<string name="grant_service_permission">授予通知监听权限</string>
1818
<string name="disconnect">断开连接</string>
1919

2020
<!-- Bottom Navigation -->
2121
<string name="nav_player">播放控制</string>
22-
<string name="nav_devices">设备状�/string>
22+
<string name="nav_devices">设备状态</string>
2323
<string name="nav_settings">设置</string>
2424

2525
<!-- Settings -->
@@ -34,38 +34,39 @@
3434
<string name="theme_dark">深色模式</string>
3535
<string name="language_system">跟随系统</string>
3636
<string name="language_english">English</string>
37-
<string name="language_chinese">简体中�/string>
37+
<string name="language_chinese">简体中文</string>
3838
<string name="language_chinese_traditional">繁體中文</string>
39-
<string name="language_japanese">日本�/string>
39+
<string name="language_japanese">日本語</string>
4040
<string name="settings_device_name">设备名称</string>
4141
<string name="restore_default">恢复默认</string>
4242
<string name="settings_discovery_port">发现端口</string>
43-
<string name="settings_discovery_port_desc">用于在局域网中发现设备。默� 5001</string>
44-
<string name="settings_sender_discovery_port">·¢ËͶ˷¢Ïֶ˿Ú</string>
45-
<string name="settings_sender_discovery_port_desc">ÓÃÓڹ㲥×ÔÉíÒÔ±»½ÓÊն˷¢ÏֵĶ˿ڡ£</string>
43+
<string name="settings_discovery_port_desc">用于在局域网中发现设备。默认: 5001</string>
44+
45+
<string name="settings_sender_discovery_port">发送端发现端口</string>
46+
<string name="settings_sender_discovery_port_desc">用于广播自身以被接收端发现的端口。</string>
4647
<string name="settings_command_port">命令接收端口</string>
47-
<string name="settings_command_port_desc">用于接收来自电脑的播�暂停等指令。默� 5002</string>
48+
<string name="settings_command_port_desc">用于接收来自电脑的播放/暂停等指令。默认: 5002</string>
4849
<string name="settings_allowed_sources">允许的播放源</string>
4950
<string name="settings_allowed_sources_desc">选择要同步播放状态的应用</string>
5051
<string name="dialog_allowed_sources_title">选择允许的播放源</string>
51-
<string name="allow_all_sources">允许所有应�/string>
52+
<string name="allow_all_sources">允许所有应用</string>
5253
<string name="no_media_apps_found">未找到音乐播放器</string>
53-
<string name="settings_save_restart">保存并重启服�/string>
54+
<string name="settings_save_restart">保存并重启服务</string>
5455

5556
<string name="settings_recommended">推荐</string>
56-
<string name="settings_betterlyrics_desc">推荐搭配 BetterLyrics 获得最佳的桌面歌词体验�/string>
57-
<string name="settings_download_windows_title">下载 PC �CarpeCast</string>
58-
<string name="settings_download_windows_desc">在电脑上安装 CarpeCast 以实现音乐同步�/string>
57+
<string name="settings_betterlyrics_desc">推荐搭配 BetterLyrics 获得最佳的桌面歌词体验。</string>
58+
<string name="settings_download_windows_title">下载 PC 版 CarpeCast</string>
59+
<string name="settings_download_windows_desc">在电脑上安装 CarpeCast 以实现音乐同步。</string>
5960

6061
<string name="settings_system_permissions">系统权限</string>
6162
<string name="settings_battery_optimization">电池策略 (后台运行)</string>
62-
<string name="settings_battery_optimization_desc">防止后台同步服务被系统查杀（建议设为无限制�/string>
63-
<string name="settings_auto_start">自启�/string>
64-
<string name="settings_auto_start_desc">允许应用在后台运行并随系统启�/string>
63+
<string name="settings_battery_optimization_desc">防止后台同步服务被系统查杀（建议设为无限制）</string>
64+
<string name="settings_auto_start">自启动</string>
65+
<string name="settings_auto_start_desc">允许应用在后台运行并随系统启动</string>
6566

6667
<!-- Foreground Service Notification -->
6768
<string name="notification_channel_name">后台同步</string>
68-
<string name="notification_channel_desc">保持媒体同步在后台持续运�/string>
69-
<string name="notification_title_idle">等待连接�/string>
69+
<string name="notification_channel_desc">保持媒体同步在后台持续运行</string>
70+
<string name="notification_title_idle">等待连接…</string>
7071
<string name="notification_title_connected">已连接：%1$s</string>
7172
</resources>

0 commit comments

Comments
 (0)