Skip to content

PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.

fix(ui): simplify settings and clarify relay allowance

baiyuzea7ec28d88b69
diff --git a/ui/lib/l10n/app_en.arb b/ui/lib/l10n/app_en.arb
index 0601936..e4dae00 100644
--- a/ui/lib/l10n/app_en.arb
+++ b/ui/lib/l10n/app_en.arb
@@ -389,55 +389,47 @@
"rejectMismatch": "Mismatch, decline",
"confirmMatch": "They match, pair",
"server": "Server (optional)",
- "serverFootnote": "Only needed to sync between different networks, such as home and office. Devices on the same network connect without it. The server only helps devices find each other and can't see what they send.",
"signalingUrl": "Signaling server",
- "signalingUrlDesc": "Click Save and connect or press Enter. Leave it empty to sync on this network only.",
+ "signalingUrlDesc": "Leave blank for local sync only",
"signalingUrlPlaceholder": "ws://server-address:8787/signal",
- "publicStun": "Probe with public servers",
- "publicStunDesc": "On networks with several uplinks, such as offices with two ISPs, this finds more direct paths. Public servers only see your public IP.",
+ "publicStun": "Improve direct connections",
+ "publicStunDesc": "Public servers can see your public IP",
"connectionStatus": "Connection",
- "connectedDesc": "Connected to the signaling server",
- "disconnectedDesc": "Can't reach the server. Check the address and that the server is running.",
+ "disconnectedDesc": "Check the server address and availability",
"connected": "Connected",
"notConnected": "Not connected",
"notSet": "Not set",
- "notSetDesc": "Syncing with devices on this network only",
"serverCleared": "Server removed. Syncing on this network only.",
"localNetwork": "Local network",
- "lanFootnote": "Uses UDP port 8788. If the devices are on different subnets, enter the other device's address when pairing.",
"lanDiscovery": "Find devices on this network",
- "lanDiscoveryDesc": "Pair and sync without a server. Others on the network only see an anonymous entry that changes daily, and the device name only while Search nearby is open.",
+ "lanDiscoveryDesc": "Anonymous discovery; names are visible only during Search nearby",
"macLocalNetwork": "Local Network access",
- "macLocalNetworkDesc": "macOS asks once whether PasteFerry may connect to devices on your network. If you declined, turn on PasteFerry Daemon there.",
+ "macLocalNetworkDesc": "Allow PasteFerry Daemon in System Settings",
"allowLan": "Windows Firewall",
- "allowLanDesc": "Allow this when other devices can't reach this one, for example when pairing from another subnet. Asks for administrator approval once.",
+ "allowLanDesc": "Allow blocked connections; requires administrator approval",
"allow": "Allow",
"allowLanDone": "Allowed. Other devices can now reach this one.",
"deviceName": "Device name",
- "deviceNameDesc": "Shown in the list on your other devices",
"language": "Language",
"languageSystem": "System",
"sync": "Sync",
- "syncFootnote": "Items under the limit are pushed to your other devices as you copy. Larger ones sync as a record; pull them from History when you need them, so big files don't waste bandwidth or disk space.",
"autoSyncLimit": "Auto-sync limit",
- "autoSyncLimitDesc": "Larger files are pulled by hand",
+ "autoSyncLimitDesc": "Pull larger items manually from History",
"autoApply": "Put received items on the clipboard",
- "autoApplyDesc": "When off, put them on the clipboard from History yourself",
"whatToSync": "What to sync",
"syncFiles": "Files and folders",
"syncText": "Plain text",
"syncRich": "Rich text",
"syncImages": "Images and screenshots",
"storage": "Storage",
- "storageFootnote": "Expired items and cached files are cleaned up automatically.",
+ "storageFootnote": "Expired history and cached files are deleted automatically.",
"keepHistory": "Keep history for",
"keepCache": "Keep cached files for",
- "keepCacheDesc": "Never longer than the history",
+ "keepCacheDesc": "No longer than history retention",
"cacheUsage": "Cache size",
"backgroundSync": "Background sync",
- "backgroundFootnote": "When off, nothing syncs and PasteFerry doesn't start at login. History and pairings are kept; open the app to turn it back on.",
"backgroundService": "Background service",
- "backgroundServiceDesc": "Starts at login and keeps syncing with the window closed",
+ "backgroundServiceDesc": "Starts at login; syncs with the window closed",
"restart": "Restart",
"restarted": "Background service restarted",
"disableEllipsis": "Turn off…",
@@ -521,6 +513,7 @@
"svcCanDisable": "You can turn background sync off anytime in Settings.",
"officialService": "Official service",
"useOfficialService": "Use official service",
+ "officialServiceDesc": "Sync across networks, direct connections first",
"officialPrivacy": "Connects to the official service only when enabled and records essential access statistics. Direct connections are tried first; relay access is requested only if they fail. Content, real device names and raw system identifiers are not uploaded.",
"officialEnableTitle": "Enable official Internet service?",
"officialSwitchConfirm": "This switches away from your custom server. Its saved address will be retained.",
diff --git a/ui/lib/l10n/app_ja.arb b/ui/lib/l10n/app_ja.arb
index 6aef0bf..de33a1b 100644
--- a/ui/lib/l10n/app_ja.arb
+++ b/ui/lib/l10n/app_ja.arb
@@ -157,55 +157,47 @@
"rejectMismatch": "不一致、拒否",
"confirmMatch": "一致、ペアリング",
"server": "サーバー(任意)",
- "serverFootnote": "家と会社のように、別々のネットワーク間で同期するときだけ必要です。同じネットワーク内のデバイスはサーバーなしで直接つながります。サーバーはデバイス同士を引き合わせるだけで、やり取りする内容は見えません。",
"signalingUrl": "シグナリングサーバー",
- "signalingUrlDesc": "「保存して接続」をクリックするか Enter を押します。空欄にするとこのネットワーク内だけで同期します",
+ "signalingUrlDesc": "空欄ならローカル同期のみ",
"signalingUrlPlaceholder": "ws://サーバーアドレス:8787/signal",
- "publicStun": "公開サーバーで出口を調べる",
- "publicStunDesc": "複数の回線を持つ会社などのネットワークで、直接つながる経路を多く見つけます。公開サーバーに見えるのはグローバル IP だけです。",
+ "publicStun": "直接接続を補助",
+ "publicStunDesc": "公開サーバーにグローバル IP が伝わります",
"connectionStatus": "接続状態",
- "connectedDesc": "シグナリングサーバーに接続しています",
- "disconnectedDesc": "サーバーに接続できません。アドレスとサーバーの稼働を確認してください。",
+ "disconnectedDesc": "アドレスとサーバーの稼働を確認",
"connected": "接続済み",
"notConnected": "未接続",
"notSet": "未設定",
- "notSetDesc": "同じネットワークのデバイスとだけ同期します",
"serverCleared": "サーバーを削除しました。このネットワーク内だけで同期します",
"localNetwork": "ローカルネットワーク",
- "lanFootnote": "UDP ポート 8788 を使います。2 台が別のサブネットにある場合は、ペアリング時に相手のアドレスを入力します。",
"lanDiscovery": "このネットワークでデバイスを探す",
- "lanDiscoveryDesc": "サーバーなしでペアリングと同期ができます。ネットワーク上の他の人には、毎日変わる匿名の識別子しか見えません。デバイス名が見えるのは「近くを検索」を開いている間だけです",
+ "lanDiscoveryDesc": "匿名で検出。「近くを検索」中のみ名前を公開",
"macLocalNetwork": "ローカルネットワークへのアクセス",
- "macLocalNetworkDesc": "PasteFerry がネットワーク上のデバイスに接続してよいか、macOS が一度だけ確認します。拒否した場合は、そこで PasteFerry Daemon をオンにしてください",
+ "macLocalNetworkDesc": "システム設定で PasteFerry Daemon を許可",
"allowLan": "Windows ファイアウォール",
- "allowLanDesc": "他のデバイスからこのデバイスに接続できないとき(別のサブネットからのペアリングなど)に許可します。管理者の承認を 1 回求めます",
+ "allowLanDesc": "接続がブロックされた場合に許可。管理者権限が必要",
"allow": "許可",
"allowLanDone": "許可しました。他のデバイスからこのデバイスに接続できます。",
"deviceName": "デバイス名",
- "deviceNameDesc": "他のデバイスの一覧に表示されます",
"language": "言語",
"languageSystem": "システムに合わせる",
"sync": "同期",
- "syncFootnote": "上限より小さい内容はコピーした時点で他のデバイスに送られます。大きいものは記録だけを同期し、必要なときに「履歴」から取り込むので、帯域やディスクを無駄に使いません。",
"autoSyncLimit": "自動同期の上限",
- "autoSyncLimitDesc": "これより大きいファイルは手動で取り込みます",
+ "autoSyncLimitDesc": "上限を超える内容は履歴から手動で取得",
"autoApply": "受け取った内容をクリップボードに入れる",
- "autoApplyDesc": "オフの場合は「履歴」から手動でクリップボードに入れます",
"whatToSync": "同期する内容",
"syncFiles": "ファイルとフォルダ",
"syncText": "プレーンテキスト",
"syncRich": "書式付きテキスト",
"syncImages": "画像とスクリーンショット",
"storage": "ストレージ",
- "storageFootnote": "期限切れの履歴とキャッシュは自動で削除されます。",
+ "storageFootnote": "期限が切れると履歴とキャッシュを自動削除します。",
"keepHistory": "履歴の保存期間",
"keepCache": "キャッシュの保存期間",
- "keepCacheDesc": "履歴の保存期間を超えません",
+ "keepCacheDesc": "履歴の保存期間以内",
"cacheUsage": "キャッシュ容量",
"backgroundSync": "バックグラウンド同期",
- "backgroundFootnote": "オフにすると同期せず、ログイン時にも起動しません。履歴とペアリングは残り、アプリを開けば再び有効にできます。",
"backgroundService": "バックグラウンドサービス",
- "backgroundServiceDesc": "ログイン時に起動し、ウィンドウを閉じても同期を続けます",
+ "backgroundServiceDesc": "ログイン時に起動。ウィンドウを閉じても同期",
"restart": "再起動",
"restarted": "バックグラウンドサービスを再起動しました",
"disableEllipsis": "オフにする…",
@@ -254,6 +246,7 @@
"svcCanDisable": "バックグラウンド同期は「設定」でいつでもオフにできます。",
"officialService": "公式サービス",
"useOfficialService": "公式サービスを使う",
+ "officialServiceDesc": "別のネットワーク間で同期。直接接続を優先",
"officialPrivacy": "有効にした場合のみ公式サービスに接続し、必要最小限の接続情報を記録します。まず直接接続を試み、失敗した場合のみ中継を申請します。内容、実際の端末名、元のシステム識別子は送信しません。",
"officialEnableTitle": "公式インターネットサービスを有効にしますか?",
"officialSwitchConfirm": "現在のカスタムサーバーから切り替えます。保存済みのアドレスは保持されます。",
diff --git a/ui/lib/l10n/app_localizations.dart b/ui/lib/l10n/app_localizations.dart
index 856b850..d0d8ef6 100644
--- a/ui/lib/l10n/app_localizations.dart
+++ b/ui/lib/l10n/app_localizations.dart
@@ -1052,12 +1052,6 @@ abstract class AppLocalizations {
/// **'Server (optional)'**
String get server;
- /// No description provided for @serverFootnote.
- ///
- /// In en, this message translates to:
- /// **'Only needed to sync between different networks, such as home and office. Devices on the same network connect without it. The server only helps devices find each other and can\'t see what they send.'**
- String get serverFootnote;
-
/// No description provided for @signalingUrl.
///
/// In en, this message translates to:
@@ -1067,7 +1061,7 @@ abstract class AppLocalizations {
/// No description provided for @signalingUrlDesc.
///
/// In en, this message translates to:
- /// **'Click Save and connect or press Enter. Leave it empty to sync on this network only.'**
+ /// **'Leave blank for local sync only'**
String get signalingUrlDesc;
/// No description provided for @signalingUrlPlaceholder.
@@ -1079,13 +1073,13 @@ abstract class AppLocalizations {
/// No description provided for @publicStun.
///
/// In en, this message translates to:
- /// **'Probe with public servers'**
+ /// **'Improve direct connections'**
String get publicStun;
/// No description provided for @publicStunDesc.
///
/// In en, this message translates to:
- /// **'On networks with several uplinks, such as offices with two ISPs, this finds more direct paths. Public servers only see your public IP.'**
+ /// **'Public servers can see your public IP'**
String get publicStunDesc;
/// No description provided for @connectionStatus.
@@ -1094,16 +1088,10 @@ abstract class AppLocalizations {
/// **'Connection'**
String get connectionStatus;
- /// No description provided for @connectedDesc.
- ///
- /// In en, this message translates to:
- /// **'Connected to the signaling server'**
- String get connectedDesc;
-
/// No description provided for @disconnectedDesc.
///
/// In en, this message translates to:
- /// **'Can\'t reach the server. Check the address and that the server is running.'**
+ /// **'Check the server address and availability'**
String get disconnectedDesc;
/// No description provided for @connected.
@@ -1124,12 +1112,6 @@ abstract class AppLocalizations {
/// **'Not set'**
String get notSet;
- /// No description provided for @notSetDesc.
- ///
- /// In en, this message translates to:
- /// **'Syncing with devices on this network only'**
- String get notSetDesc;
-
/// No description provided for @serverCleared.
///
/// In en, this message translates to:
@@ -1142,12 +1124,6 @@ abstract class AppLocalizations {
/// **'Local network'**
String get localNetwork;
- /// No description provided for @lanFootnote.
- ///
- /// In en, this message translates to:
- /// **'Uses UDP port 8788. If the devices are on different subnets, enter the other device\'s address when pairing.'**
- String get lanFootnote;
-
/// No description provided for @lanDiscovery.
///
/// In en, this message translates to:
@@ -1157,7 +1133,7 @@ abstract class AppLocalizations {
/// No description provided for @lanDiscoveryDesc.
///
/// In en, this message translates to:
- /// **'Pair and sync without a server. Others on the network only see an anonymous entry that changes daily, and the device name only while Search nearby is open.'**
+ /// **'Anonymous discovery; names are visible only during Search nearby'**
String get lanDiscoveryDesc;
/// No description provided for @macLocalNetwork.
@@ -1169,7 +1145,7 @@ abstract class AppLocalizations {
/// No description provided for @macLocalNetworkDesc.
///
/// In en, this message translates to:
- /// **'macOS asks once whether PasteFerry may connect to devices on your network. If you declined, turn on PasteFerry Daemon there.'**
+ /// **'Allow PasteFerry Daemon in System Settings'**
String get macLocalNetworkDesc;
/// No description provided for @allowLan.
@@ -1181,7 +1157,7 @@ abstract class AppLocalizations {
/// No description provided for @allowLanDesc.
///
/// In en, this message translates to:
- /// **'Allow this when other devices can\'t reach this one, for example when pairing from another subnet. Asks for administrator approval once.'**
+ /// **'Allow blocked connections; requires administrator approval'**
String get allowLanDesc;
/// No description provided for @allow.
@@ -1202,12 +1178,6 @@ abstract class AppLocalizations {
/// **'Device name'**
String get deviceName;
- /// No description provided for @deviceNameDesc.
- ///
- /// In en, this message translates to:
- /// **'Shown in the list on your other devices'**
- String get deviceNameDesc;
-
/// No description provided for @language.
///
/// In en, this message translates to:
@@ -1226,12 +1196,6 @@ abstract class AppLocalizations {
/// **'Sync'**
String get sync;
- /// No description provided for @syncFootnote.
- ///
- /// In en, this message translates to:
- /// **'Items under the limit are pushed to your other devices as you copy. Larger ones sync as a record; pull them from History when you need them, so big files don\'t waste bandwidth or disk space.'**
- String get syncFootnote;
-
/// No description provided for @autoSyncLimit.
///
/// In en, this message translates to:
@@ -1241,7 +1205,7 @@ abstract class AppLocalizations {
/// No description provided for @autoSyncLimitDesc.
///
/// In en, this message translates to:
- /// **'Larger files are pulled by hand'**
+ /// **'Pull larger items manually from History'**
String get autoSyncLimitDesc;
/// No description provided for @autoApply.
@@ -1250,12 +1214,6 @@ abstract class AppLocalizations {
/// **'Put received items on the clipboard'**
String get autoApply;
- /// No description provided for @autoApplyDesc.
- ///
- /// In en, this message translates to:
- /// **'When off, put them on the clipboard from History yourself'**
- String get autoApplyDesc;
-
/// No description provided for @whatToSync.
///
/// In en, this message translates to:
@@ -1295,7 +1253,7 @@ abstract class AppLocalizations {
/// No description provided for @storageFootnote.
///
/// In en, this message translates to:
- /// **'Expired items and cached files are cleaned up automatically.'**
+ /// **'Expired history and cached files are deleted automatically.'**
String get storageFootnote;
/// No description provided for @keepHistory.
@@ -1313,7 +1271,7 @@ abstract class AppLocalizations {
/// No description provided for @keepCacheDesc.
///
/// In en, this message translates to:
- /// **'Never longer than the history'**
+ /// **'No longer than history retention'**
String get keepCacheDesc;
/// No description provided for @cacheUsage.
@@ -1328,12 +1286,6 @@ abstract class AppLocalizations {
/// **'Background sync'**
String get backgroundSync;
- /// No description provided for @backgroundFootnote.
- ///
- /// In en, this message translates to:
- /// **'When off, nothing syncs and PasteFerry doesn\'t start at login. History and pairings are kept; open the app to turn it back on.'**
- String get backgroundFootnote;
-
/// No description provided for @backgroundService.
///
/// In en, this message translates to:
@@ -1343,7 +1295,7 @@ abstract class AppLocalizations {
/// No description provided for @backgroundServiceDesc.
///
/// In en, this message translates to:
- /// **'Starts at login and keeps syncing with the window closed'**
+ /// **'Starts at login; syncs with the window closed'**
String get backgroundServiceDesc;
/// No description provided for @restart.
@@ -1634,6 +1586,12 @@ abstract class AppLocalizations {
/// **'Use official service'**
String get useOfficialService;
+ /// No description provided for @officialServiceDesc.
+ ///
+ /// In en, this message translates to:
+ /// **'Sync across networks, direct connections first'**
+ String get officialServiceDesc;
+
/// No description provided for @officialPrivacy.
///
/// In en, this message translates to:
diff --git a/ui/lib/l10n/app_localizations_en.dart b/ui/lib/l10n/app_localizations_en.dart
index b3e4a7b..95ab3e6 100644
--- a/ui/lib/l10n/app_localizations_en.dart
+++ b/ui/lib/l10n/app_localizations_en.dart
@@ -622,36 +622,26 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get server => 'Server (optional)';
- @override
- String get serverFootnote =>
- 'Only needed to sync between different networks, such as home and office. Devices on the same network connect without it. The server only helps devices find each other and can\'t see what they send.';
-
@override
String get signalingUrl => 'Signaling server';
@override
- String get signalingUrlDesc =>
- 'Click Save and connect or press Enter. Leave it empty to sync on this network only.';
+ String get signalingUrlDesc => 'Leave blank for local sync only';
@override
String get signalingUrlPlaceholder => 'ws://server-address:8787/signal';
@override
- String get publicStun => 'Probe with public servers';
+ String get publicStun => 'Improve direct connections';
@override
- String get publicStunDesc =>
- 'On networks with several uplinks, such as offices with two ISPs, this finds more direct paths. Public servers only see your public IP.';
+ String get publicStunDesc => 'Public servers can see your public IP';
@override
String get connectionStatus => 'Connection';
@override
- String get connectedDesc => 'Connected to the signaling server';
-
- @override
- String get disconnectedDesc =>
- 'Can\'t reach the server. Check the address and that the server is running.';
+ String get disconnectedDesc => 'Check the server address and availability';
@override
String get connected => 'Connected';
@@ -662,39 +652,32 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get notSet => 'Not set';
- @override
- String get notSetDesc => 'Syncing with devices on this network only';
-
@override
String get serverCleared => 'Server removed. Syncing on this network only.';
@override
String get localNetwork => 'Local network';
- @override
- String get lanFootnote =>
- 'Uses UDP port 8788. If the devices are on different subnets, enter the other device\'s address when pairing.';
-
@override
String get lanDiscovery => 'Find devices on this network';
@override
String get lanDiscoveryDesc =>
- 'Pair and sync without a server. Others on the network only see an anonymous entry that changes daily, and the device name only while Search nearby is open.';
+ 'Anonymous discovery; names are visible only during Search nearby';
@override
String get macLocalNetwork => 'Local Network access';
@override
String get macLocalNetworkDesc =>
- 'macOS asks once whether PasteFerry may connect to devices on your network. If you declined, turn on PasteFerry Daemon there.';
+ 'Allow PasteFerry Daemon in System Settings';
@override
String get allowLan => 'Windows Firewall';
@override
String get allowLanDesc =>
- 'Allow this when other devices can\'t reach this one, for example when pairing from another subnet. Asks for administrator approval once.';
+ 'Allow blocked connections; requires administrator approval';
@override
String get allow => 'Allow';
@@ -705,9 +688,6 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get deviceName => 'Device name';
- @override
- String get deviceNameDesc => 'Shown in the list on your other devices';
-
@override
String get language => 'Language';
@@ -717,23 +697,15 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get sync => 'Sync';
- @override
- String get syncFootnote =>
- 'Items under the limit are pushed to your other devices as you copy. Larger ones sync as a record; pull them from History when you need them, so big files don\'t waste bandwidth or disk space.';
-
@override
String get autoSyncLimit => 'Auto-sync limit';
@override
- String get autoSyncLimitDesc => 'Larger files are pulled by hand';
+ String get autoSyncLimitDesc => 'Pull larger items manually from History';
@override
String get autoApply => 'Put received items on the clipboard';
- @override
- String get autoApplyDesc =>
- 'When off, put them on the clipboard from History yourself';
-
@override
String get whatToSync => 'What to sync';
@@ -754,7 +726,7 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get storageFootnote =>
- 'Expired items and cached files are cleaned up automatically.';
+ 'Expired history and cached files are deleted automatically.';
@override
String get keepHistory => 'Keep history for';
@@ -763,7 +735,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get keepCache => 'Keep cached files for';
@override
- String get keepCacheDesc => 'Never longer than the history';
+ String get keepCacheDesc => 'No longer than history retention';
@override
String get cacheUsage => 'Cache size';
@@ -771,16 +743,12 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get backgroundSync => 'Background sync';
- @override
- String get backgroundFootnote =>
- 'When off, nothing syncs and PasteFerry doesn\'t start at login. History and pairings are kept; open the app to turn it back on.';
-
@override
String get backgroundService => 'Background service';
@override
String get backgroundServiceDesc =>
- 'Starts at login and keeps syncing with the window closed';
+ 'Starts at login; syncs with the window closed';
@override
String get restart => 'Restart';
@@ -949,6 +917,10 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get useOfficialService => 'Use official service';
+ @override
+ String get officialServiceDesc =>
+ 'Sync across networks, direct connections first';
+
@override
String get officialPrivacy =>
'Connects to the official service only when enabled and records essential access statistics. Direct connections are tried first; relay access is requested only if they fail. Content, real device names and raw system identifiers are not uploaded.';
diff --git a/ui/lib/l10n/app_localizations_ja.dart b/ui/lib/l10n/app_localizations_ja.dart
index 80acdbf..2053ba0 100644
--- a/ui/lib/l10n/app_localizations_ja.dart
+++ b/ui/lib/l10n/app_localizations_ja.dart
@@ -549,35 +549,26 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get server => 'サーバー(任意)';
- @override
- String get serverFootnote =>
- '家と会社のように、別々のネットワーク間で同期するときだけ必要です。同じネットワーク内のデバイスはサーバーなしで直接つながります。サーバーはデバイス同士を引き合わせるだけで、やり取りする内容は見えません。';
-
@override
String get signalingUrl => 'シグナリングサーバー';
@override
- String get signalingUrlDesc =>
- '「保存して接続」をクリックするか Enter を押します。空欄にするとこのネットワーク内だけで同期します';
+ String get signalingUrlDesc => '空欄ならローカル同期のみ';
@override
String get signalingUrlPlaceholder => 'ws://サーバーアドレス:8787/signal';
@override
- String get publicStun => '公開サーバーで出口を調べる';
+ String get publicStun => '直接接続を補助';
@override
- String get publicStunDesc =>
- '複数の回線を持つ会社などのネットワークで、直接つながる経路を多く見つけます。公開サーバーに見えるのはグローバル IP だけです。';
+ String get publicStunDesc => '公開サーバーにグローバル IP が伝わります';
@override
String get connectionStatus => '接続状態';
@override
- String get connectedDesc => 'シグナリングサーバーに接続しています';
-
- @override
- String get disconnectedDesc => 'サーバーに接続できません。アドレスとサーバーの稼働を確認してください。';
+ String get disconnectedDesc => 'アドレスとサーバーの稼働を確認';
@override
String get connected => '接続済み';
@@ -588,39 +579,29 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get notSet => '未設定';
- @override
- String get notSetDesc => '同じネットワークのデバイスとだけ同期します';
-
@override
String get serverCleared => 'サーバーを削除しました。このネットワーク内だけで同期します';
@override
String get localNetwork => 'ローカルネットワーク';
- @override
- String get lanFootnote =>
- 'UDP ポート 8788 を使います。2 台が別のサブネットにある場合は、ペアリング時に相手のアドレスを入力します。';
-
@override
String get lanDiscovery => 'このネットワークでデバイスを探す';
@override
- String get lanDiscoveryDesc =>
- 'サーバーなしでペアリングと同期ができます。ネットワーク上の他の人には、毎日変わる匿名の識別子しか見えません。デバイス名が見えるのは「近くを検索」を開いている間だけです';
+ String get lanDiscoveryDesc => '匿名で検出。「近くを検索」中のみ名前を公開';
@override
String get macLocalNetwork => 'ローカルネットワークへのアクセス';
@override
- String get macLocalNetworkDesc =>
- 'PasteFerry がネットワーク上のデバイスに接続してよいか、macOS が一度だけ確認します。拒否した場合は、そこで PasteFerry Daemon をオンにしてください';
+ String get macLocalNetworkDesc => 'システム設定で PasteFerry Daemon を許可';
@override
String get allowLan => 'Windows ファイアウォール';
@override
- String get allowLanDesc =>
- '他のデバイスからこのデバイスに接続できないとき(別のサブネットからのペアリングなど)に許可します。管理者の承認を 1 回求めます';
+ String get allowLanDesc => '接続がブロックされた場合に許可。管理者権限が必要';
@override
String get allow => '許可';
@@ -631,9 +612,6 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get deviceName => 'デバイス名';
- @override
- String get deviceNameDesc => '他のデバイスの一覧に表示されます';
-
@override
String get language => '言語';
@@ -643,22 +621,15 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get sync => '同期';
- @override
- String get syncFootnote =>
- '上限より小さい内容はコピーした時点で他のデバイスに送られます。大きいものは記録だけを同期し、必要なときに「履歴」から取り込むので、帯域やディスクを無駄に使いません。';
-
@override
String get autoSyncLimit => '自動同期の上限';
@override
- String get autoSyncLimitDesc => 'これより大きいファイルは手動で取り込みます';
+ String get autoSyncLimitDesc => '上限を超える内容は履歴から手動で取得';
@override
String get autoApply => '受け取った内容をクリップボードに入れる';
- @override
- String get autoApplyDesc => 'オフの場合は「履歴」から手動でクリップボードに入れます';
-
@override
String get whatToSync => '同期する内容';
@@ -678,7 +649,7 @@ class AppLocalizationsJa extends AppLocalizations {
String get storage => 'ストレージ';
@override
- String get storageFootnote => '期限切れの履歴とキャッシュは自動で削除されます。';
+ String get storageFootnote => '期限が切れると履歴とキャッシュを自動削除します。';
@override
String get keepHistory => '履歴の保存期間';
@@ -687,7 +658,7 @@ class AppLocalizationsJa extends AppLocalizations {
String get keepCache => 'キャッシュの保存期間';
@override
- String get keepCacheDesc => '履歴の保存期間を超えません';
+ String get keepCacheDesc => '履歴の保存期間以内';
@override
String get cacheUsage => 'キャッシュ容量';
@@ -695,15 +666,11 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get backgroundSync => 'バックグラウンド同期';
- @override
- String get backgroundFootnote =>
- 'オフにすると同期せず、ログイン時にも起動しません。履歴とペアリングは残り、アプリを開けば再び有効にできます。';
-
@override
String get backgroundService => 'バックグラウンドサービス';
@override
- String get backgroundServiceDesc => 'ログイン時に起動し、ウィンドウを閉じても同期を続けます';
+ String get backgroundServiceDesc => 'ログイン時に起動。ウィンドウを閉じても同期';
@override
String get restart => '再起動';
@@ -871,6 +838,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get useOfficialService => '公式サービスを使う';
+ @override
+ String get officialServiceDesc => '別のネットワーク間で同期。直接接続を優先';
+
@override
String get officialPrivacy =>
'有効にした場合のみ公式サービスに接続し、必要最小限の接続情報を記録します。まず直接接続を試み、失敗した場合のみ中継を申請します。内容、実際の端末名、元のシステム識別子は送信しません。';
diff --git a/ui/lib/l10n/app_localizations_zh.dart b/ui/lib/l10n/app_localizations_zh.dart
index 39a0637..645f03a 100644
--- a/ui/lib/l10n/app_localizations_zh.dart
+++ b/ui/lib/l10n/app_localizations_zh.dart
@@ -546,33 +546,26 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get server => '服务器(可选)';
- @override
- String get serverFootnote =>
- '只在不同网络之间同步时需要,比如家里和公司;同一网络里的设备不用服务器也能直接连上。服务器只负责让设备找到彼此,看不到传输的内容。';
-
@override
String get signalingUrl => '信令服务器地址';
@override
- String get signalingUrlDesc => '点击“保存并连接”或按回车。留空表示只在局域网里同步';
+ String get signalingUrlDesc => '留空仅在局域网同步';
@override
String get signalingUrlPlaceholder => 'ws://服务器地址:8787/signal';
@override
- String get publicStun => '用公共服务器探测网络出口';
+ String get publicStun => '增强公网直连';
@override
- String get publicStunDesc => '公司双线这类多出口网络里,能找到更多可以直连的路径。公共服务器只会看到你的公网 IP';
+ String get publicStunDesc => '公共服务器可见本机公网 IP';
@override
String get connectionStatus => '连接状态';
@override
- String get connectedDesc => '已连接到信令服务器';
-
- @override
- String get disconnectedDesc => '连不上服务器。检查地址是否正确、服务器是否在运行。';
+ String get disconnectedDesc => '请检查地址与服务器状态';
@override
String get connected => '已连接';
@@ -583,37 +576,29 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get notSet => '未设置';
- @override
- String get notSetDesc => '只与同一网络里的设备同步';
-
@override
String get serverCleared => '已清除服务器地址,只在局域网里同步';
@override
String get localNetwork => '局域网';
- @override
- String get lanFootnote => '使用 UDP 端口 8788。两台不在同一网段时,配对时输入对方的地址。';
-
@override
String get lanDiscovery => '在局域网中查找设备';
@override
- String get lanDiscoveryDesc =>
- '不用服务器就能配对和同步。网络里的其他人只能看到一个每天都变的匿名标识;打开「搜索附近设备」期间才看得到设备名';
+ String get lanDiscoveryDesc => '匿名发现,仅搜索附近设备时显示名称';
@override
String get macLocalNetwork => '本地网络权限';
@override
- String get macLocalNetworkDesc =>
- 'macOS 会问一次是否允许隔空贴连接网络里的设备。拒绝过的话,到那里打开 PasteFerry Daemon';
+ String get macLocalNetworkDesc => '在系统设置中允许 PasteFerry Daemon';
@override
String get allowLan => 'Windows 防火墙';
@override
- String get allowLanDesc => '其他设备连不上这台时放行,比如从别的网段配对。会请求一次管理员权限';
+ String get allowLanDesc => '连接受阻时放行,需管理员权限';
@override
String get allow => '放行';
@@ -624,9 +609,6 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get deviceName => '设备名称';
- @override
- String get deviceNameDesc => '显示在其他设备的列表里';
-
@override
String get language => '语言';
@@ -636,22 +618,15 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get sync => '同步';
- @override
- String get syncFootnote =>
- '小于阈值的内容在复制时直接推送到其他设备;超过阈值的只同步一条记录,需要时在「复制记录」里点「拉取到本机」,避免大文件无谓地占用带宽和磁盘。';
-
@override
String get autoSyncLimit => '自动同步上限';
@override
- String get autoSyncLimitDesc => '超过这个大小的文件改为手动拉取';
+ String get autoSyncLimitDesc => '超出上限后,在复制记录中手动拉取';
@override
String get autoApply => '收到后直接写入剪贴板';
- @override
- String get autoApplyDesc => '关闭后,需要在「复制记录」里手动放入剪贴板';
-
@override
String get whatToSync => '同步哪些内容';
@@ -671,7 +646,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get storage => '存储';
@override
- String get storageFootnote => '到期的记录与缓存文件会被自动清理。';
+ String get storageFootnote => '到期自动清理记录与缓存。';
@override
String get keepHistory => '记录保留';
@@ -680,7 +655,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get keepCache => '缓存文件保留';
@override
- String get keepCacheDesc => '不会超过记录的保留时长';
+ String get keepCacheDesc => '不超过记录保留时长';
@override
String get cacheUsage => '缓存占用';
@@ -688,15 +663,11 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get backgroundSync => '后台同步';
- @override
- String get backgroundFootnote =>
- '停用后不再同步,也不会开机启动。历史记录与配对关系会保留,重新打开 App 即可再次启用。';
-
@override
String get backgroundService => '后台服务';
@override
- String get backgroundServiceDesc => '随系统登录自动启动,关掉窗口也照常同步';
+ String get backgroundServiceDesc => '登录自启,关闭窗口后继续同步';
@override
String get restart => '重新启动';
@@ -861,6 +832,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get useOfficialService => '使用官方服务';
+ @override
+ String get officialServiceDesc => '跨网络同步,优先直连';
+
@override
String get officialPrivacy =>
'仅开启后连接官方服务并统计必要接入信息。先尝试直连,失败才申请中转;不上传内容、真实设备名或原始系统标识。';
@@ -1477,33 +1451,26 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get server => '伺服器(可選)';
- @override
- String get serverFootnote =>
- '只在不同網絡之間同步時需要,例如家裏和公司;同一網絡裏的裝置不用伺服器也能直接連上。伺服器只負責讓裝置找到彼此,看不到傳輸的內容。';
-
@override
String get signalingUrl => '信令伺服器地址';
@override
- String get signalingUrlDesc => '點擊「儲存並連線」或按 Enter。留空表示只在區域網絡裏同步';
+ String get signalingUrlDesc => '留空只在區域網絡同步';
@override
String get signalingUrlPlaceholder => 'ws://伺服器地址:8787/signal';
@override
- String get publicStun => '用公共伺服器探測網絡出口';
+ String get publicStun => '提升公網直連成功率';
@override
- String get publicStunDesc => '在公司雙線這類多出口網絡裏,能找到更多可以直連的路徑。公共伺服器只會看到你的公網 IP';
+ String get publicStunDesc => '公共伺服器可見本機公網 IP';
@override
String get connectionStatus => '連線狀態';
@override
- String get connectedDesc => '已連線到信令伺服器';
-
- @override
- String get disconnectedDesc => '連不上伺服器。請檢查地址是否正確、伺服器是否正在執行。';
+ String get disconnectedDesc => '請檢查地址與伺服器狀態';
@override
String get connected => '已連線';
@@ -1514,37 +1481,29 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get notSet => '未設定';
- @override
- String get notSetDesc => '只與同一網絡裏的裝置同步';
-
@override
String get serverCleared => '已清除伺服器地址,只在區域網絡裏同步';
@override
String get localNetwork => '區域網絡';
- @override
- String get lanFootnote => '使用 UDP 端口 8788。兩部不在同一網段時,配對時要輸入對方的地址。';
-
@override
String get lanDiscovery => '在區域網絡中尋找裝置';
@override
- String get lanDiscoveryDesc =>
- '不用伺服器就能配對和同步。網絡裏的其他人只能看到一個每天都會改變的匿名標識;開啟「搜尋附近裝置」期間才看得到裝置名稱';
+ String get lanDiscoveryDesc => '匿名發現,只在搜尋附近裝置時顯示名稱';
@override
String get macLocalNetwork => '本地網絡權限';
@override
- String get macLocalNetworkDesc =>
- 'macOS 會詢問一次是否允許隔空貼連接網絡裏的裝置。如果拒絕過,請到那裏開啟 PasteFerry Daemon';
+ String get macLocalNetworkDesc => '在系統設定中允許 PasteFerry Daemon';
@override
String get allowLan => 'Windows 防火牆';
@override
- String get allowLanDesc => '其他裝置連不上這部電腦時允許連線,例如從別的網段配對。會要求一次管理員權限';
+ String get allowLanDesc => '連線受阻時允許連線,需管理員權限';
@override
String get allow => '允許';
@@ -1555,9 +1514,6 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get deviceName => '裝置名稱';
- @override
- String get deviceNameDesc => '顯示在其他裝置的列表裏';
-
@override
String get language => '語言';
@@ -1567,22 +1523,15 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get sync => '同步';
- @override
- String get syncFootnote =>
- '小於上限的內容在複製時直接推送到其他裝置;超過上限的只同步一條記錄,需要時在「複製記錄」裏按「拉取到本機」,避免大檔案無謂地佔用頻寬和磁碟空間。';
-
@override
String get autoSyncLimit => '自動同步上限';
@override
- String get autoSyncLimitDesc => '超過這個大小的檔案改為手動拉取';
+ String get autoSyncLimitDesc => '超出上限後,在複製記錄中手動拉取';
@override
String get autoApply => '收到後直接寫入剪貼簿';
- @override
- String get autoApplyDesc => '關閉後,需要在「複製記錄」裏手動放入剪貼簿';
-
@override
String get whatToSync => '同步哪些內容';
@@ -1602,7 +1551,7 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
String get storage => '儲存空間';
@override
- String get storageFootnote => '到期的記錄與快取檔案會自動清理。';
+ String get storageFootnote => '到期自動清理記錄與快取。';
@override
String get keepHistory => '記錄保留';
@@ -1611,7 +1560,7 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
String get keepCache => '快取檔案保留';
@override
- String get keepCacheDesc => '不會超過記錄的保留時間';
+ String get keepCacheDesc => '不超過記錄保留時間';
@override
String get cacheUsage => '快取佔用空間';
@@ -1619,15 +1568,11 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get backgroundSync => '背景同步';
- @override
- String get backgroundFootnote =>
- '停用後不再同步,也不會開機啟動。歷史記錄與配對關係會保留,重新開啟 App 即可再次啟用。';
-
@override
String get backgroundService => '背景服務';
@override
- String get backgroundServiceDesc => '隨系統登入自動啟動,關閉視窗也照常同步';
+ String get backgroundServiceDesc => '登入自動啟動,關閉視窗後繼續同步';
@override
String get restart => '重新啟動';
@@ -1792,6 +1737,9 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get useOfficialService => '使用官方服務';
+ @override
+ String get officialServiceDesc => '跨網絡同步,優先直連';
+
@override
String get officialPrivacy =>
'只在啟用後連接官方服務並統計必要連線資料。先嘗試直連,失敗才申請中轉;不傳送內容、真實裝置名稱或原始系統識別碼。';
@@ -2408,33 +2356,26 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get server => '伺服器(選用)';
- @override
- String get serverFootnote =>
- '只在不同網路之間同步時需要,例如家裡和公司;同一個網路裡的裝置不用伺服器也能直接連上。伺服器只負責讓裝置找到彼此,看不到傳輸的內容。';
-
@override
String get signalingUrl => '信令伺服器位址';
@override
- String get signalingUrlDesc => '點擊「儲存並連線」或按 Enter。留空表示只在區域網路裡同步';
+ String get signalingUrlDesc => '留空僅在區域網路同步';
@override
String get signalingUrlPlaceholder => 'ws://伺服器位址:8787/signal';
@override
- String get publicStun => '用公共伺服器偵測網路出口';
+ String get publicStun => '改善公網直接連線';
@override
- String get publicStunDesc => '在公司雙線路這類多出口網路裡,能找到更多可以直連的路徑。公共伺服器只會看到你的公用 IP';
+ String get publicStunDesc => '公共伺服器可見本機的公用 IP';
@override
String get connectionStatus => '連線狀態';
@override
- String get connectedDesc => '已連線到信令伺服器';
-
- @override
- String get disconnectedDesc => '連不上伺服器。請檢查位址是否正確、伺服器是否在執行。';
+ String get disconnectedDesc => '請檢查位址與伺服器狀態';
@override
String get connected => '已連線';
@@ -2445,37 +2386,29 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get notSet => '未設定';
- @override
- String get notSetDesc => '只與同一個網路裡的裝置同步';
-
@override
String get serverCleared => '已清除伺服器位址,只在區域網路裡同步';
@override
String get localNetwork => '區域網路';
- @override
- String get lanFootnote => '使用 UDP 連接埠 8788。兩台不在同一網段時,配對時輸入對方的位址。';
-
@override
String get lanDiscovery => '在區域網路中尋找裝置';
@override
- String get lanDiscoveryDesc =>
- '不用伺服器就能配對和同步。網路裡的其他人只能看到一個每天都會變的匿名識別碼;打開「搜尋附近裝置」期間才看得到裝置名稱';
+ String get lanDiscoveryDesc => '匿名探索,僅搜尋附近裝置時顯示名稱';
@override
String get macLocalNetwork => '本機網路權限';
@override
- String get macLocalNetworkDesc =>
- 'macOS 會詢問一次是否允許隔空貼連線到網路裡的裝置。拒絕過的話,到那裡開啟 PasteFerry Daemon';
+ String get macLocalNetworkDesc => '在系統設定中允許 PasteFerry Daemon';
@override
String get allowLan => 'Windows 防火牆';
@override
- String get allowLanDesc => '其他裝置連不上這台時允許連入,例如從別的網段配對。會要求一次系統管理員權限';
+ String get allowLanDesc => '連線受阻時允許連入,需系統管理員權限';
@override
String get allow => '允許';
@@ -2486,9 +2419,6 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get deviceName => '裝置名稱';
- @override
- String get deviceNameDesc => '顯示在其他裝置的清單裡';
-
@override
String get language => '語言';
@@ -2498,22 +2428,15 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get sync => '同步';
- @override
- String get syncFootnote =>
- '小於上限的內容在複製時直接推送到其他裝置;超過上限的只同步一筆記錄,需要時在「複製記錄」裡點「拉取到本機」,避免大檔案白白佔用頻寬和磁碟空間。';
-
@override
String get autoSyncLimit => '自動同步上限';
@override
- String get autoSyncLimitDesc => '超過這個大小的檔案改為手動拉取';
+ String get autoSyncLimitDesc => '超過上限後,在複製記錄中手動拉取';
@override
String get autoApply => '收到後直接寫入剪貼簿';
- @override
- String get autoApplyDesc => '關閉後,需要在「複製記錄」裡手動放入剪貼簿';
-
@override
String get whatToSync => '同步哪些內容';
@@ -2533,7 +2456,7 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
String get storage => '儲存空間';
@override
- String get storageFootnote => '到期的記錄與快取檔案會自動清除。';
+ String get storageFootnote => '到期自動清除記錄與快取。';
@override
String get keepHistory => '記錄保留';
@@ -2542,7 +2465,7 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
String get keepCache => '快取檔案保留';
@override
- String get keepCacheDesc => '不會超過記錄的保留時間';
+ String get keepCacheDesc => '不超過記錄保留時間';
@override
String get cacheUsage => '快取佔用';
@@ -2550,15 +2473,11 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get backgroundSync => '背景同步';
- @override
- String get backgroundFootnote =>
- '停用後不再同步,也不會開機自動啟動。歷史記錄與配對關係會保留,重新打開 App 即可再次啟用。';
-
@override
String get backgroundService => '背景服務';
@override
- String get backgroundServiceDesc => '隨系統登入自動啟動,關掉視窗也照常同步';
+ String get backgroundServiceDesc => '登入自動啟動,關閉視窗後繼續同步';
@override
String get restart => '重新啟動';
@@ -2723,6 +2642,9 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get useOfficialService => '使用官方服務';
+ @override
+ String get officialServiceDesc => '跨網路同步,優先直連';
+
@override
String get officialPrivacy =>
'僅開啟後連線官方服務並統計必要連線資訊。先嘗試直連,失敗才申請中繼;不傳送內容、真實裝置名稱或原始系統識別碼。';
diff --git a/ui/lib/l10n/app_zh.arb b/ui/lib/l10n/app_zh.arb
index 3e628ed..8c2dae1 100644
--- a/ui/lib/l10n/app_zh.arb
+++ b/ui/lib/l10n/app_zh.arb
@@ -157,55 +157,47 @@
"rejectMismatch": "不一致,拒绝",
"confirmMatch": "一致,确认配对",
"server": "服务器(可选)",
- "serverFootnote": "只在不同网络之间同步时需要,比如家里和公司;同一网络里的设备不用服务器也能直接连上。服务器只负责让设备找到彼此,看不到传输的内容。",
"signalingUrl": "信令服务器地址",
- "signalingUrlDesc": "点击“保存并连接”或按回车。留空表示只在局域网里同步",
+ "signalingUrlDesc": "留空仅在局域网同步",
"signalingUrlPlaceholder": "ws://服务器地址:8787/signal",
- "publicStun": "用公共服务器探测网络出口",
- "publicStunDesc": "公司双线这类多出口网络里,能找到更多可以直连的路径。公共服务器只会看到你的公网 IP",
+ "publicStun": "增强公网直连",
+ "publicStunDesc": "公共服务器可见本机公网 IP",
"connectionStatus": "连接状态",
- "connectedDesc": "已连接到信令服务器",
- "disconnectedDesc": "连不上服务器。检查地址是否正确、服务器是否在运行。",
+ "disconnectedDesc": "请检查地址与服务器状态",
"connected": "已连接",
"notConnected": "未连接",
"notSet": "未设置",
- "notSetDesc": "只与同一网络里的设备同步",
"serverCleared": "已清除服务器地址,只在局域网里同步",
"localNetwork": "局域网",
- "lanFootnote": "使用 UDP 端口 8788。两台不在同一网段时,配对时输入对方的地址。",
"lanDiscovery": "在局域网中查找设备",
- "lanDiscoveryDesc": "不用服务器就能配对和同步。网络里的其他人只能看到一个每天都变的匿名标识;打开「搜索附近设备」期间才看得到设备名",
+ "lanDiscoveryDesc": "匿名发现,仅搜索附近设备时显示名称",
"macLocalNetwork": "本地网络权限",
- "macLocalNetworkDesc": "macOS 会问一次是否允许隔空贴连接网络里的设备。拒绝过的话,到那里打开 PasteFerry Daemon",
+ "macLocalNetworkDesc": "在系统设置中允许 PasteFerry Daemon",
"allowLan": "Windows 防火墙",
- "allowLanDesc": "其他设备连不上这台时放行,比如从别的网段配对。会请求一次管理员权限",
+ "allowLanDesc": "连接受阻时放行,需管理员权限",
"allow": "放行",
"allowLanDone": "已放行,其他设备现在可以连到这台了",
"deviceName": "设备名称",
- "deviceNameDesc": "显示在其他设备的列表里",
"language": "语言",
"languageSystem": "跟随系统",
"sync": "同步",
- "syncFootnote": "小于阈值的内容在复制时直接推送到其他设备;超过阈值的只同步一条记录,需要时在「复制记录」里点「拉取到本机」,避免大文件无谓地占用带宽和磁盘。",
"autoSyncLimit": "自动同步上限",
- "autoSyncLimitDesc": "超过这个大小的文件改为手动拉取",
+ "autoSyncLimitDesc": "超出上限后,在复制记录中手动拉取",
"autoApply": "收到后直接写入剪贴板",
- "autoApplyDesc": "关闭后,需要在「复制记录」里手动放入剪贴板",
"whatToSync": "同步哪些内容",
"syncFiles": "文件与文件夹",
"syncText": "纯文本",
"syncRich": "带格式的文本",
"syncImages": "图片与截图",
"storage": "存储",
- "storageFootnote": "到期的记录与缓存文件会被自动清理。",
+ "storageFootnote": "到期自动清理记录与缓存。",
"keepHistory": "记录保留",
"keepCache": "缓存文件保留",
- "keepCacheDesc": "不会超过记录的保留时长",
+ "keepCacheDesc": "不超过记录保留时长",
"cacheUsage": "缓存占用",
"backgroundSync": "后台同步",
- "backgroundFootnote": "停用后不再同步,也不会开机启动。历史记录与配对关系会保留,重新打开 App 即可再次启用。",
"backgroundService": "后台服务",
- "backgroundServiceDesc": "随系统登录自动启动,关掉窗口也照常同步",
+ "backgroundServiceDesc": "登录自启,关闭窗口后继续同步",
"restart": "重新启动",
"restarted": "后台服务已重新启动",
"disableEllipsis": "停用…",
@@ -254,6 +246,7 @@
"svcCanDisable": "随时可以在「设置」中停用后台同步。",
"officialService": "官方服务",
"useOfficialService": "使用官方服务",
+ "officialServiceDesc": "跨网络同步,优先直连",
"officialPrivacy": "仅开启后连接官方服务并统计必要接入信息。先尝试直连,失败才申请中转;不上传内容、真实设备名或原始系统标识。",
"officialEnableTitle": "启用官方公网服务?",
"officialSwitchConfirm": "这会切换当前自定义服务器,已保存的地址仍会保留。",
diff --git a/ui/lib/l10n/app_zh_Hant_HK.arb b/ui/lib/l10n/app_zh_Hant_HK.arb
index 4f55c96..ddf2a55 100644
--- a/ui/lib/l10n/app_zh_Hant_HK.arb
+++ b/ui/lib/l10n/app_zh_Hant_HK.arb
@@ -157,55 +157,47 @@
"rejectMismatch": "不一致,拒絕",
"confirmMatch": "一致,確認配對",
"server": "伺服器(可選)",
- "serverFootnote": "只在不同網絡之間同步時需要,例如家裏和公司;同一網絡裏的裝置不用伺服器也能直接連上。伺服器只負責讓裝置找到彼此,看不到傳輸的內容。",
"signalingUrl": "信令伺服器地址",
- "signalingUrlDesc": "點擊「儲存並連線」或按 Enter。留空表示只在區域網絡裏同步",
+ "signalingUrlDesc": "留空只在區域網絡同步",
"signalingUrlPlaceholder": "ws://伺服器地址:8787/signal",
- "publicStun": "用公共伺服器探測網絡出口",
- "publicStunDesc": "在公司雙線這類多出口網絡裏,能找到更多可以直連的路徑。公共伺服器只會看到你的公網 IP",
+ "publicStun": "提升公網直連成功率",
+ "publicStunDesc": "公共伺服器可見本機公網 IP",
"connectionStatus": "連線狀態",
- "connectedDesc": "已連線到信令伺服器",
- "disconnectedDesc": "連不上伺服器。請檢查地址是否正確、伺服器是否正在執行。",
+ "disconnectedDesc": "請檢查地址與伺服器狀態",
"connected": "已連線",
"notConnected": "未連線",
"notSet": "未設定",
- "notSetDesc": "只與同一網絡裏的裝置同步",
"serverCleared": "已清除伺服器地址,只在區域網絡裏同步",
"localNetwork": "區域網絡",
- "lanFootnote": "使用 UDP 端口 8788。兩部不在同一網段時,配對時要輸入對方的地址。",
"lanDiscovery": "在區域網絡中尋找裝置",
- "lanDiscoveryDesc": "不用伺服器就能配對和同步。網絡裏的其他人只能看到一個每天都會改變的匿名標識;開啟「搜尋附近裝置」期間才看得到裝置名稱",
+ "lanDiscoveryDesc": "匿名發現,只在搜尋附近裝置時顯示名稱",
"macLocalNetwork": "本地網絡權限",
- "macLocalNetworkDesc": "macOS 會詢問一次是否允許隔空貼連接網絡裏的裝置。如果拒絕過,請到那裏開啟 PasteFerry Daemon",
+ "macLocalNetworkDesc": "在系統設定中允許 PasteFerry Daemon",
"allowLan": "Windows 防火牆",
- "allowLanDesc": "其他裝置連不上這部電腦時允許連線,例如從別的網段配對。會要求一次管理員權限",
+ "allowLanDesc": "連線受阻時允許連線,需管理員權限",
"allow": "允許",
"allowLanDone": "已允許,其他裝置現在可以連到這部電腦了",
"deviceName": "裝置名稱",
- "deviceNameDesc": "顯示在其他裝置的列表裏",
"language": "語言",
"languageSystem": "跟隨系統",
"sync": "同步",
- "syncFootnote": "小於上限的內容在複製時直接推送到其他裝置;超過上限的只同步一條記錄,需要時在「複製記錄」裏按「拉取到本機」,避免大檔案無謂地佔用頻寬和磁碟空間。",
"autoSyncLimit": "自動同步上限",
- "autoSyncLimitDesc": "超過這個大小的檔案改為手動拉取",
+ "autoSyncLimitDesc": "超出上限後,在複製記錄中手動拉取",
"autoApply": "收到後直接寫入剪貼簿",
- "autoApplyDesc": "關閉後,需要在「複製記錄」裏手動放入剪貼簿",
"whatToSync": "同步哪些內容",
"syncFiles": "檔案與資料夾",
"syncText": "純文字",
"syncRich": "帶格式的文字",
"syncImages": "圖片與截圖",
"storage": "儲存空間",
- "storageFootnote": "到期的記錄與快取檔案會自動清理。",
+ "storageFootnote": "到期自動清理記錄與快取。",
"keepHistory": "記錄保留",
"keepCache": "快取檔案保留",
- "keepCacheDesc": "不會超過記錄的保留時間",
+ "keepCacheDesc": "不超過記錄保留時間",
"cacheUsage": "快取佔用空間",
"backgroundSync": "背景同步",
- "backgroundFootnote": "停用後不再同步,也不會開機啟動。歷史記錄與配對關係會保留,重新開啟 App 即可再次啟用。",
"backgroundService": "背景服務",
- "backgroundServiceDesc": "隨系統登入自動啟動,關閉視窗也照常同步",
+ "backgroundServiceDesc": "登入自動啟動,關閉視窗後繼續同步",
"restart": "重新啟動",
"restarted": "背景服務已重新啟動",
"disableEllipsis": "停用…",
@@ -254,6 +246,7 @@
"svcCanDisable": "隨時可以在「設定」中停用背景同步。",
"officialService": "官方服務",
"useOfficialService": "使用官方服務",
+ "officialServiceDesc": "跨網絡同步,優先直連",
"officialPrivacy": "只在啟用後連接官方服務並統計必要連線資料。先嘗試直連,失敗才申請中轉;不傳送內容、真實裝置名稱或原始系統識別碼。",
"officialEnableTitle": "啟用官方公網服務?",
"officialSwitchConfirm": "這會切換目前的自訂伺服器,已儲存的地址仍會保留。",
diff --git a/ui/lib/l10n/app_zh_Hant_TW.arb b/ui/lib/l10n/app_zh_Hant_TW.arb
index 029105b..82173f2 100644
--- a/ui/lib/l10n/app_zh_Hant_TW.arb
+++ b/ui/lib/l10n/app_zh_Hant_TW.arb
@@ -157,55 +157,47 @@
"rejectMismatch": "不一致,拒絕",
"confirmMatch": "一致,確認配對",
"server": "伺服器(選用)",
- "serverFootnote": "只在不同網路之間同步時需要,例如家裡和公司;同一個網路裡的裝置不用伺服器也能直接連上。伺服器只負責讓裝置找到彼此,看不到傳輸的內容。",
"signalingUrl": "信令伺服器位址",
- "signalingUrlDesc": "點擊「儲存並連線」或按 Enter。留空表示只在區域網路裡同步",
+ "signalingUrlDesc": "留空僅在區域網路同步",
"signalingUrlPlaceholder": "ws://伺服器位址:8787/signal",
- "publicStun": "用公共伺服器偵測網路出口",
- "publicStunDesc": "在公司雙線路這類多出口網路裡,能找到更多可以直連的路徑。公共伺服器只會看到你的公用 IP",
+ "publicStun": "改善公網直接連線",
+ "publicStunDesc": "公共伺服器可見本機的公用 IP",
"connectionStatus": "連線狀態",
- "connectedDesc": "已連線到信令伺服器",
- "disconnectedDesc": "連不上伺服器。請檢查位址是否正確、伺服器是否在執行。",
+ "disconnectedDesc": "請檢查位址與伺服器狀態",
"connected": "已連線",
"notConnected": "未連線",
"notSet": "未設定",
- "notSetDesc": "只與同一個網路裡的裝置同步",
"serverCleared": "已清除伺服器位址,只在區域網路裡同步",
"localNetwork": "區域網路",
- "lanFootnote": "使用 UDP 連接埠 8788。兩台不在同一網段時,配對時輸入對方的位址。",
"lanDiscovery": "在區域網路中尋找裝置",
- "lanDiscoveryDesc": "不用伺服器就能配對和同步。網路裡的其他人只能看到一個每天都會變的匿名識別碼;打開「搜尋附近裝置」期間才看得到裝置名稱",
+ "lanDiscoveryDesc": "匿名探索,僅搜尋附近裝置時顯示名稱",
"macLocalNetwork": "本機網路權限",
- "macLocalNetworkDesc": "macOS 會詢問一次是否允許隔空貼連線到網路裡的裝置。拒絕過的話,到那裡開啟 PasteFerry Daemon",
+ "macLocalNetworkDesc": "在系統設定中允許 PasteFerry Daemon",
"allowLan": "Windows 防火牆",
- "allowLanDesc": "其他裝置連不上這台時允許連入,例如從別的網段配對。會要求一次系統管理員權限",
+ "allowLanDesc": "連線受阻時允許連入,需系統管理員權限",
"allow": "允許",
"allowLanDone": "已允許,其他裝置現在可以連到這台了",
"deviceName": "裝置名稱",
- "deviceNameDesc": "顯示在其他裝置的清單裡",
"language": "語言",
"languageSystem": "跟隨系統",
"sync": "同步",
- "syncFootnote": "小於上限的內容在複製時直接推送到其他裝置;超過上限的只同步一筆記錄,需要時在「複製記錄」裡點「拉取到本機」,避免大檔案白白佔用頻寬和磁碟空間。",
"autoSyncLimit": "自動同步上限",
- "autoSyncLimitDesc": "超過這個大小的檔案改為手動拉取",
+ "autoSyncLimitDesc": "超過上限後,在複製記錄中手動拉取",
"autoApply": "收到後直接寫入剪貼簿",
- "autoApplyDesc": "關閉後,需要在「複製記錄」裡手動放入剪貼簿",
"whatToSync": "同步哪些內容",
"syncFiles": "檔案與資料夾",
"syncText": "純文字",
"syncRich": "帶格式的文字",
"syncImages": "圖片與螢幕截圖",
"storage": "儲存空間",
- "storageFootnote": "到期的記錄與快取檔案會自動清除。",
+ "storageFootnote": "到期自動清除記錄與快取。",
"keepHistory": "記錄保留",
"keepCache": "快取檔案保留",
- "keepCacheDesc": "不會超過記錄的保留時間",
+ "keepCacheDesc": "不超過記錄保留時間",
"cacheUsage": "快取佔用",
"backgroundSync": "背景同步",
- "backgroundFootnote": "停用後不再同步,也不會開機自動啟動。歷史記錄與配對關係會保留,重新打開 App 即可再次啟用。",
"backgroundService": "背景服務",
- "backgroundServiceDesc": "隨系統登入自動啟動,關掉視窗也照常同步",
+ "backgroundServiceDesc": "登入自動啟動,關閉視窗後繼續同步",
"restart": "重新啟動",
"restarted": "背景服務已重新啟動",
"disableEllipsis": "停用…",
@@ -254,6 +246,7 @@
"svcCanDisable": "隨時可以在「設定」中停用背景同步。",
"officialService": "官方服務",
"useOfficialService": "使用官方服務",
+ "officialServiceDesc": "跨網路同步,優先直連",
"officialPrivacy": "僅開啟後連線官方服務並統計必要連線資訊。先嘗試直連,失敗才申請中繼;不傳送內容、真實裝置名稱或原始系統識別碼。",
"officialEnableTitle": "啟用官方公網服務?",
"officialSwitchConfirm": "這會切換目前的自訂伺服器,已儲存的位址仍會保留。",
diff --git a/ui/lib/pages/official_service_page.dart b/ui/lib/pages/official_service_page.dart
index 5efe209..6418d6a 100644
--- a/ui/lib/pages/official_service_page.dart
+++ b/ui/lib/pages/official_service_page.dart
@@ -8,8 +8,7 @@ import '../widgets/common.dart';
class OfficialServicePage extends StatelessWidget {
const OfficialServicePage({super.key});
- String _mb(int bytes) =>
- bytes > 0 && bytes < 1000000 ? '<1 MB' : '${bytes ~/ 1000000} MB';
+ String _mb(int bytes) => '${(bytes / 1000000).toStringAsFixed(2)} MB';
String _time(int seconds, {bool beijing = false}) {
var d = DateTime.fromMillisecondsSinceEpoch(seconds * 1000, isUtc: true);
d = beijing ? d.add(const Duration(hours: 8)) : d.toLocal();
diff --git a/ui/lib/pages/settings_page.dart b/ui/lib/pages/settings_page.dart
index 55f40cd..5d731e2 100644
--- a/ui/lib/pages/settings_page.dart
+++ b/ui/lib/pages/settings_page.dart
@@ -66,12 +66,13 @@ class _SettingsPageState extends State<SettingsPage> {
final l = context.l10n;
final connected = state.status?.signalingConnected == true;
// 服务器是可选的:没填地址不是故障,用中性色
- final (Color statusColor, String statusLabel, String statusDesc) = switch ((
- state.serverConfigured,
- connected,
- )) {
- (false, _) => (p.textFaint, l.notSet, l.notSetDesc),
- (true, true) => (p.online, l.connected, l.connectedDesc),
+ final (
+ Color statusColor,
+ String statusLabel,
+ String? statusDesc,
+ ) = switch ((state.serverConfigured, connected)) {
+ (false, _) => (p.textFaint, l.notSet, null),
+ (true, true) => (p.online, l.connected, null),
(true, false) => (p.danger, l.notConnected, l.disconnectedDesc),
};
@@ -90,12 +91,11 @@ class _SettingsPageState extends State<SettingsPage> {
children: [
GroupSection(
title: l.server,
- footnote: l.serverFootnote,
child: GroupBox(
children: [
SettingRow(
title: l.useOfficialService,
- description: l.officialPrivacy,
+ description: l.officialServiceDesc,
child: SmallSwitch(
value: state.officialEnabled,
onChanged: _serverSaving
@@ -107,24 +107,25 @@ class _SettingsPageState extends State<SettingsPage> {
title: l.customServer,
description: l.signalingUrlDesc,
child: SizedBox(
- width: 290,
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.stretch,
+ width: 360,
+ child: Row(
children: [
- TextField(
- controller: _serverController,
- style: context.text.bodyMedium?.copyWith(
- fontFamily: monoFamily,
- fontSize: 12,
- ),
- decoration: InputDecoration(
- hintText: l.signalingUrlPlaceholder,
+ Expanded(
+ child: TextField(
+ controller: _serverController,
+ style: context.text.bodyMedium?.copyWith(
+ fontFamily: monoFamily,
+ fontSize: 12,
+ ),
+ decoration: InputDecoration(
+ hintText: l.signalingUrlPlaceholder,
+ ),
+ onChanged: (_) =>
+ setState(() => _serverDirty = true),
+ onSubmitted: (_) => _saveServer(state, cfg),
),
- onChanged: (_) =>
- setState(() => _serverDirty = true),
- onSubmitted: (_) => _saveServer(state, cfg),
),
- const SizedBox(height: 8),
+ const SizedBox(width: 8),
FilledButton(
onPressed: _serverSaving
? null
@@ -153,7 +154,6 @@ class _SettingsPageState extends State<SettingsPage> {
),
GroupSection(
title: l.localNetwork,
- footnote: l.lanFootnote,
child: GroupBox(
children: [
SettingRow(
@@ -192,7 +192,6 @@ class _SettingsPageState extends State<SettingsPage> {
children: [
SettingRow(
title: l.deviceName,
- description: l.deviceNameDesc,
child: SizedBox(
width: 220,
child: TextField(
@@ -236,7 +235,6 @@ class _SettingsPageState extends State<SettingsPage> {
),
GroupSection(
title: l.sync,
- footnote: l.syncFootnote,
child: GroupBox(
children: [
SettingRow(
@@ -252,7 +250,6 @@ class _SettingsPageState extends State<SettingsPage> {
),
SettingRow(
title: l.autoApply,
- description: l.autoApplyDesc,
child: SmallSwitch(
value: cfg.autoApplyToClipboard,
onChanged: (v) =>
@@ -326,7 +323,6 @@ class _SettingsPageState extends State<SettingsPage> {
if (state.service.available)
GroupSection(
title: l.backgroundSync,
- footnote: l.backgroundFootnote,
child: GroupBox(
children: [
SettingRow(
diff --git a/ui/test/official_service_test.dart b/ui/test/official_service_test.dart
index daf3112..d302c7b 100644
--- a/ui/test/official_service_test.dart
+++ b/ui/test/official_service_test.dart
@@ -60,7 +60,7 @@ void main() {
await tester.pumpAndSettle();
expect(find.byType(OfficialServicePage), findsOneWidget);
expect(find.text('尚未申请中转,余额待核验'), findsWidgets);
- expect(find.text('0 MB'), findsNothing);
+ expect(find.text('0.00 MB'), findsNothing);
state.debugSeed(
status: state.status!,
config: state.config!.deepCopy()
@@ -150,10 +150,10 @@ void main() {
available: true,
day: '2026-10-16',
quotaGroup: 'bucket',
- uploadBytes: Int64(50000000),
- downloadBytes: Int64(40000000),
+ uploadBytes: Int64(90001234),
+ downloadBytes: Int64(456789),
limitBytes: Int64(100000000),
- remainingBytes: Int64(10000000),
+ remainingBytes: Int64(9541977),
resetAtUnix: Int64(now + 3600),
updatedAtUnix: Int64(now),
),
@@ -163,8 +163,11 @@ void main() {
await tester.tap(find.byIcon(Icons.cloud_outlined).first);
await tester.pumpAndSettle();
expect(find.byType(OfficialServicePage), findsOneWidget);
- expect(find.text('90 MB'), findsOneWidget);
- expect(find.text('100 MB'), findsOneWidget);
+ expect(find.text('90.46 MB'), findsOneWidget);
+ expect(find.text('100.00 MB'), findsOneWidget);
+ expect(find.text('9.54 MB'), findsOneWidget);
+ expect(find.text('90.00 MB'), findsOneWidget);
+ expect(find.text('0.46 MB'), findsOneWidget);
expect(tester.takeException(), isNull);
});
}
diff --git a/ui/tool/l10n/strings.py b/ui/tool/l10n/strings.py
index 58a210d..8592465 100644
--- a/ui/tool/l10n/strings.py
+++ b/ui/tool/l10n/strings.py
@@ -194,55 +194,47 @@ S = [
# ── 设置 ──
("server", "Server (optional)", "服务器(可选)", "サーバー(任意)", "伺服器(選用)", "伺服器(可選)"),
- ("serverFootnote", "Only needed to sync between different networks, such as home and office. Devices on the same network connect without it. The server only helps devices find each other and can't see what they send.", "只在不同网络之间同步时需要,比如家里和公司;同一网络里的设备不用服务器也能直接连上。服务器只负责让设备找到彼此,看不到传输的内容。", "家と会社のように、別々のネットワーク間で同期するときだけ必要です。同じネットワーク内のデバイスはサーバーなしで直接つながります。サーバーはデバイス同士を引き合わせるだけで、やり取りする内容は見えません。", "只在不同網路之間同步時需要,例如家裡和公司;同一個網路裡的裝置不用伺服器也能直接連上。伺服器只負責讓裝置找到彼此,看不到傳輸的內容。", "只在不同網絡之間同步時需要,例如家裏和公司;同一網絡裏的裝置不用伺服器也能直接連上。伺服器只負責讓裝置找到彼此,看不到傳輸的內容。"),
("signalingUrl", "Signaling server", "信令服务器地址", "シグナリングサーバー", "信令伺服器位址", "信令伺服器地址"),
- ("signalingUrlDesc", "Click Save and connect or press Enter. Leave it empty to sync on this network only.", "点击“保存并连接”或按回车。留空表示只在局域网里同步", "「保存して接続」をクリックするか Enter を押します。空欄にするとこのネットワーク内だけで同期します", "點擊「儲存並連線」或按 Enter。留空表示只在區域網路裡同步", "點擊「儲存並連線」或按 Enter。留空表示只在區域網絡裏同步"),
+ ("signalingUrlDesc", "Leave blank for local sync only", "留空仅在局域网同步", "空欄ならローカル同期のみ", "留空僅在區域網路同步", "留空只在區域網絡同步"),
("signalingUrlPlaceholder", "ws://server-address:8787/signal", "ws://服务器地址:8787/signal", "ws://サーバーアドレス:8787/signal", "ws://伺服器位址:8787/signal", "ws://伺服器地址:8787/signal"),
- ("publicStun", "Probe with public servers", "用公共服务器探测网络出口", "公開サーバーで出口を調べる", "用公共伺服器偵測網路出口", "用公共伺服器探測網絡出口"),
- ("publicStunDesc", "On networks with several uplinks, such as offices with two ISPs, this finds more direct paths. Public servers only see your public IP.", "公司双线这类多出口网络里,能找到更多可以直连的路径。公共服务器只会看到你的公网 IP", "複数の回線を持つ会社などのネットワークで、直接つながる経路を多く見つけます。公開サーバーに見えるのはグローバル IP だけです。", "在公司雙線路這類多出口網路裡,能找到更多可以直連的路徑。公共伺服器只會看到你的公用 IP", "在公司雙線這類多出口網絡裏,能找到更多可以直連的路徑。公共伺服器只會看到你的公網 IP"),
+ ("publicStun", "Improve direct connections", "增强公网直连", "直接接続を補助", "改善公網直接連線", "提升公網直連成功率"),
+ ("publicStunDesc", "Public servers can see your public IP", "公共服务器可见本机公网 IP", "公開サーバーにグローバル IP が伝わります", "公共伺服器可見本機的公用 IP", "公共伺服器可見本機公網 IP"),
("connectionStatus", "Connection", "连接状态", "接続状態", "連線狀態", "連線狀態"),
- ("connectedDesc", "Connected to the signaling server", "已连接到信令服务器", "シグナリングサーバーに接続しています", "已連線到信令伺服器", "已連線到信令伺服器"),
- ("disconnectedDesc", "Can't reach the server. Check the address and that the server is running.", "连不上服务器。检查地址是否正确、服务器是否在运行。", "サーバーに接続できません。アドレスとサーバーの稼働を確認してください。", "連不上伺服器。請檢查位址是否正確、伺服器是否在執行。", "連不上伺服器。請檢查地址是否正確、伺服器是否正在執行。"),
+ ("disconnectedDesc", "Check the server address and availability", "请检查地址与服务器状态", "アドレスとサーバーの稼働を確認", "請檢查位址與伺服器狀態", "請檢查地址與伺服器狀態"),
("connected", "Connected", "已连接", "接続済み", "已連線", "已連線"),
("notConnected", "Not connected", "未连接", "未接続", "未連線", "未連線"),
("notSet", "Not set", "未设置", "未設定", "未設定", "未設定"),
- ("notSetDesc", "Syncing with devices on this network only", "只与同一网络里的设备同步", "同じネットワークのデバイスとだけ同期します", "只與同一個網路裡的裝置同步", "只與同一網絡裏的裝置同步"),
("serverCleared", "Server removed. Syncing on this network only.", "已清除服务器地址,只在局域网里同步", "サーバーを削除しました。このネットワーク内だけで同期します", "已清除伺服器位址,只在區域網路裡同步", "已清除伺服器地址,只在區域網絡裏同步"),
("localNetwork", "Local network", "局域网", "ローカルネットワーク", "區域網路", "區域網絡"),
- ("lanFootnote", "Uses UDP port 8788. If the devices are on different subnets, enter the other device's address when pairing.", "使用 UDP 端口 8788。两台不在同一网段时,配对时输入对方的地址。", "UDP ポート 8788 を使います。2 台が別のサブネットにある場合は、ペアリング時に相手のアドレスを入力します。", "使用 UDP 連接埠 8788。兩台不在同一網段時,配對時輸入對方的位址。", "使用 UDP 端口 8788。兩部不在同一網段時,配對時要輸入對方的地址。"),
("lanDiscovery", "Find devices on this network", "在局域网中查找设备", "このネットワークでデバイスを探す", "在區域網路中尋找裝置", "在區域網絡中尋找裝置"),
- ("lanDiscoveryDesc", "Pair and sync without a server. Others on the network only see an anonymous entry that changes daily, and the device name only while Search nearby is open.", "不用服务器就能配对和同步。网络里的其他人只能看到一个每天都变的匿名标识;打开「搜索附近设备」期间才看得到设备名", "サーバーなしでペアリングと同期ができます。ネットワーク上の他の人には、毎日変わる匿名の識別子しか見えません。デバイス名が見えるのは「近くを検索」を開いている間だけです", "不用伺服器就能配對和同步。網路裡的其他人只能看到一個每天都會變的匿名識別碼;打開「搜尋附近裝置」期間才看得到裝置名稱", "不用伺服器就能配對和同步。網絡裏的其他人只能看到一個每天都會改變的匿名標識;開啟「搜尋附近裝置」期間才看得到裝置名稱"),
+ ("lanDiscoveryDesc", "Anonymous discovery; names are visible only during Search nearby", "匿名发现,仅搜索附近设备时显示名称", "匿名で検出。「近くを検索」中のみ名前を公開", "匿名探索,僅搜尋附近裝置時顯示名稱", "匿名發現,只在搜尋附近裝置時顯示名稱"),
("macLocalNetwork", "Local Network access", "本地网络权限", "ローカルネットワークへのアクセス", "本機網路權限", "本地網絡權限"),
- ("macLocalNetworkDesc", "macOS asks once whether PasteFerry may connect to devices on your network. If you declined, turn on PasteFerry Daemon there.", "macOS 会问一次是否允许隔空贴连接网络里的设备。拒绝过的话,到那里打开 PasteFerry Daemon", "PasteFerry がネットワーク上のデバイスに接続してよいか、macOS が一度だけ確認します。拒否した場合は、そこで PasteFerry Daemon をオンにしてください", "macOS 會詢問一次是否允許隔空貼連線到網路裡的裝置。拒絕過的話,到那裡開啟 PasteFerry Daemon", "macOS 會詢問一次是否允許隔空貼連接網絡裏的裝置。如果拒絕過,請到那裏開啟 PasteFerry Daemon"),
+ ("macLocalNetworkDesc", "Allow PasteFerry Daemon in System Settings", "在系统设置中允许 PasteFerry Daemon", "システム設定で PasteFerry Daemon を許可", "在系統設定中允許 PasteFerry Daemon", "在系統設定中允許 PasteFerry Daemon"),
("allowLan", "Windows Firewall", "Windows 防火墙", "Windows ファイアウォール", "Windows 防火牆", "Windows 防火牆"),
- ("allowLanDesc", "Allow this when other devices can't reach this one, for example when pairing from another subnet. Asks for administrator approval once.", "其他设备连不上这台时放行,比如从别的网段配对。会请求一次管理员权限", "他のデバイスからこのデバイスに接続できないとき(別のサブネットからのペアリングなど)に許可します。管理者の承認を 1 回求めます", "其他裝置連不上這台時允許連入,例如從別的網段配對。會要求一次系統管理員權限", "其他裝置連不上這部電腦時允許連線,例如從別的網段配對。會要求一次管理員權限"),
+ ("allowLanDesc", "Allow blocked connections; requires administrator approval", "连接受阻时放行,需管理员权限", "接続がブロックされた場合に許可。管理者権限が必要", "連線受阻時允許連入,需系統管理員權限", "連線受阻時允許連線,需管理員權限"),
("allow", "Allow", "放行", "許可", "允許", "允許"),
("allowLanDone", "Allowed. Other devices can now reach this one.", "已放行,其他设备现在可以连到这台了", "許可しました。他のデバイスからこのデバイスに接続できます。", "已允許,其他裝置現在可以連到這台了", "已允許,其他裝置現在可以連到這部電腦了"),
("deviceName", "Device name", "设备名称", "デバイス名", "裝置名稱", "裝置名稱"),
- ("deviceNameDesc", "Shown in the list on your other devices", "显示在其他设备的列表里", "他のデバイスの一覧に表示されます", "顯示在其他裝置的清單裡", "顯示在其他裝置的列表裏"),
("language", "Language", "语言", "言語", "語言", "語言"),
("languageSystem", "System", "跟随系统", "システムに合わせる", "跟隨系統", "跟隨系統"),
("sync", "Sync", "同步", "同期", "同步", "同步"),
- ("syncFootnote", "Items under the limit are pushed to your other devices as you copy. Larger ones sync as a record; pull them from History when you need them, so big files don't waste bandwidth or disk space.", "小于阈值的内容在复制时直接推送到其他设备;超过阈值的只同步一条记录,需要时在「复制记录」里点「拉取到本机」,避免大文件无谓地占用带宽和磁盘。", "上限より小さい内容はコピーした時点で他のデバイスに送られます。大きいものは記録だけを同期し、必要なときに「履歴」から取り込むので、帯域やディスクを無駄に使いません。", "小於上限的內容在複製時直接推送到其他裝置;超過上限的只同步一筆記錄,需要時在「複製記錄」裡點「拉取到本機」,避免大檔案白白佔用頻寬和磁碟空間。", "小於上限的內容在複製時直接推送到其他裝置;超過上限的只同步一條記錄,需要時在「複製記錄」裏按「拉取到本機」,避免大檔案無謂地佔用頻寬和磁碟空間。"),
("autoSyncLimit", "Auto-sync limit", "自动同步上限", "自動同期の上限", "自動同步上限", "自動同步上限"),
- ("autoSyncLimitDesc", "Larger files are pulled by hand", "超过这个大小的文件改为手动拉取", "これより大きいファイルは手動で取り込みます", "超過這個大小的檔案改為手動拉取", "超過這個大小的檔案改為手動拉取"),
+ ("autoSyncLimitDesc", "Pull larger items manually from History", "超出上限后,在复制记录中手动拉取", "上限を超える内容は履歴から手動で取得", "超過上限後,在複製記錄中手動拉取", "超出上限後,在複製記錄中手動拉取"),
("autoApply", "Put received items on the clipboard", "收到后直接写入剪贴板", "受け取った内容をクリップボードに入れる", "收到後直接寫入剪貼簿", "收到後直接寫入剪貼簿"),
- ("autoApplyDesc", "When off, put them on the clipboard from History yourself", "关闭后,需要在「复制记录」里手动放入剪贴板", "オフの場合は「履歴」から手動でクリップボードに入れます", "關閉後,需要在「複製記錄」裡手動放入剪貼簿", "關閉後,需要在「複製記錄」裏手動放入剪貼簿"),
("whatToSync", "What to sync", "同步哪些内容", "同期する内容", "同步哪些內容", "同步哪些內容"),
("syncFiles", "Files and folders", "文件与文件夹", "ファイルとフォルダ", "檔案與資料夾", "檔案與資料夾"),
("syncText", "Plain text", "纯文本", "プレーンテキスト", "純文字", "純文字"),
("syncRich", "Rich text", "带格式的文本", "書式付きテキスト", "帶格式的文字", "帶格式的文字"),
("syncImages", "Images and screenshots", "图片与截图", "画像とスクリーンショット", "圖片與螢幕截圖", "圖片與截圖"),
("storage", "Storage", "存储", "ストレージ", "儲存空間", "儲存空間"),
- ("storageFootnote", "Expired items and cached files are cleaned up automatically.", "到期的记录与缓存文件会被自动清理。", "期限切れの履歴とキャッシュは自動で削除されます。", "到期的記錄與快取檔案會自動清除。", "到期的記錄與快取檔案會自動清理。"),
+ ("storageFootnote", "Expired history and cached files are deleted automatically.", "到期自动清理记录与缓存。", "期限が切れると履歴とキャッシュを自動削除します。", "到期自動清除記錄與快取。", "到期自動清理記錄與快取。"),
("keepHistory", "Keep history for", "记录保留", "履歴の保存期間", "記錄保留", "記錄保留"),
("keepCache", "Keep cached files for", "缓存文件保留", "キャッシュの保存期間", "快取檔案保留", "快取檔案保留"),
- ("keepCacheDesc", "Never longer than the history", "不会超过记录的保留时长", "履歴の保存期間を超えません", "不會超過記錄的保留時間", "不會超過記錄的保留時間"),
+ ("keepCacheDesc", "No longer than history retention", "不超过记录保留时长", "履歴の保存期間以内", "不超過記錄保留時間", "不超過記錄保留時間"),
("cacheUsage", "Cache size", "缓存占用", "キャッシュ容量", "快取佔用", "快取佔用空間"),
("backgroundSync", "Background sync", "后台同步", "バックグラウンド同期", "背景同步", "背景同步"),
- ("backgroundFootnote", "When off, nothing syncs and PasteFerry doesn't start at login. History and pairings are kept; open the app to turn it back on.", "停用后不再同步,也不会开机启动。历史记录与配对关系会保留,重新打开 App 即可再次启用。", "オフにすると同期せず、ログイン時にも起動しません。履歴とペアリングは残り、アプリを開けば再び有効にできます。", "停用後不再同步,也不會開機自動啟動。歷史記錄與配對關係會保留,重新打開 App 即可再次啟用。", "停用後不再同步,也不會開機啟動。歷史記錄與配對關係會保留,重新開啟 App 即可再次啟用。"),
("backgroundService", "Background service", "后台服务", "バックグラウンドサービス", "背景服務", "背景服務"),
- ("backgroundServiceDesc", "Starts at login and keeps syncing with the window closed", "随系统登录自动启动,关掉窗口也照常同步", "ログイン時に起動し、ウィンドウを閉じても同期を続けます", "隨系統登入自動啟動,關掉視窗也照常同步", "隨系統登入自動啟動,關閉視窗也照常同步"),
+ ("backgroundServiceDesc", "Starts at login; syncs with the window closed", "登录自启,关闭窗口后继续同步", "ログイン時に起動。ウィンドウを閉じても同期", "登入自動啟動,關閉視窗後繼續同步", "登入自動啟動,關閉視窗後繼續同步"),
("restart", "Restart", "重新启动", "再起動", "重新啟動", "重新啟動"),
("restarted", "Background service restarted", "后台服务已重新启动", "バックグラウンドサービスを再起動しました", "背景服務已重新啟動", "背景服務已重新啟動"),
("disableEllipsis", "Turn off…", "停用…", "オフにする…", "停用…", "停用…"),
@@ -296,6 +288,7 @@ S = [
# Official gateway: opt-in access, relay-only quota and privacy.
('officialService', 'Official service', '官方服务', '公式サービス', '官方服務', '官方服務'),
('useOfficialService', 'Use official service', '使用官方服务', '公式サービスを使う', '使用官方服務', '使用官方服務'),
+ ("officialServiceDesc", "Sync across networks, direct connections first", "跨网络同步,优先直连", "別のネットワーク間で同期。直接接続を優先", "跨網路同步,優先直連", "跨網絡同步,優先直連"),
('officialPrivacy', 'Connects to the official service only when enabled and records essential access statistics. Direct connections are tried first; relay access is requested only if they fail. Content, real device names and raw system identifiers are not uploaded.', '仅开启后连接官方服务并统计必要接入信息。先尝试直连,失败才申请中转;不上传内容、真实设备名或原始系统标识。', '有効にした場合のみ公式サービスに接続し、必要最小限の接続情報を記録します。まず直接接続を試み、失敗した場合のみ中継を申請します。内容、実際の端末名、元のシステム識別子は送信しません。', '僅開啟後連線官方服務並統計必要連線資訊。先嘗試直連,失敗才申請中繼;不傳送內容、真實裝置名稱或原始系統識別碼。', '只在啟用後連接官方服務並統計必要連線資料。先嘗試直連,失敗才申請中轉;不傳送內容、真實裝置名稱或原始系統識別碼。'),
('officialEnableTitle', 'Enable official Internet service?', '启用官方公网服务?', '公式インターネットサービスを有効にしますか?', '啟用官方公網服務?', '啟用官方公網服務?'),
('officialSwitchConfirm', 'This switches away from your custom server. Its saved address will be retained.', '这会切换当前自定义服务器,已保存的地址仍会保留。', '現在のカスタムサーバーから切り替えます。保存済みのアドレスは保持されます。', '這會切換目前的自訂伺服器,已儲存的位址仍會保留。', '這會切換目前的自訂伺服器,已儲存的地址仍會保留。'),