Merge latest origin/main and resolve conflicts

This commit is contained in:
DroidDeck Merge committed 2026-11-02 10:44:24 +08:00
commit 8171bf20fd
581 files changed
+14773 -4227

No files matched your search

+156 -2
View File
@@ -323,6 +323,8 @@
<string name="mode_controller_x360">Xbox 360 controller</string>
<string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string>
<string name="mode_back">Back</string>
<string name="back_hold">Hold Back for Steam shortcuts</string>
<string name="back_hold_hint">Holding Back opens Quick Access or makes Steam chords with other buttons. Turn off to ignore held Back; tap and double-tap still work.</string>
<string name="back_native_qam_hint">Hold Back for 700 ms, or hold Back and press another button for Steam shortcuts.</string>
<string name="back_double_tap_window">Double-tap window</string>
<string name="back_tap_ms">%1$d ms</string>
@@ -452,6 +454,16 @@
<string name="mode_storage_internal">Internal only</string>
<string name="mode_storage_folder">Folder: %1$s</string>
<string name="mode_second_library">Second library</string>
<string name="libraries_title">More Steam libraries</string>
<string name="libraries_hint">Folders Steam can install to and play from, each under its own name. Removing one keeps its games on disk.</string>
<string name="libraries_add">Add library</string>
<string name="libraries_rename">Rename</string>
<string name="libraries_rename_title">Library name</string>
<string name="libraries_pick">Choose a folder for the library</string>
<string name="libraries_full">At most %1$d added libraries</string>
<string name="libraries_overlap">That folder is already a library or inside one</string>
<string name="libraries_missing">%1$s · not available</string>
<string name="libraries_applies_next">Applies from the next Steam session</string>
<string name="mode_storage_note">Games that stream assets from SD or shared storage may stutter.</string>
<string name="mode_storage_diagnostics">Storage diagnostics</string>
<string name="mode_storage_diagnostics_hint">Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session.</string>
@@ -678,6 +690,8 @@
<string name="hud_size_strip">Strip</string>
<string name="hud_locked">Lock in place</string>
<string name="hud_locked_hint">Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work.</string>
<string name="hud_snap">Snap to sides</string>
<string name="hud_snap_hint">Let go of the HUD and it moves to the nearer side of the screen. A flick throws it that way.</string>
<string name="hud_group_look">Look</string>
<string name="hud_scale">Size on screen</string>
<string name="hud_color_soft">Soft</string>
@@ -1878,6 +1892,17 @@
<string name="second_mode_terminal">Terminal</string>
<string name="second_mode_deck_controls">Deck grips + trackpads</string>
<string name="second_mode_dashboard">Dashboard</string>
<string name="second_mode_desktop">Desktop</string>
<string name="bottom_desktop_start">Start the desktop</string>
<string name="bottom_desktop_title">Desktop · %1$s</string>
<string name="bottom_desktop_mode_trackpad">Trackpad</string>
<string name="bottom_desktop_mode_touch">Direct touch</string>
<string name="bottom_desktop_trackpad">Trackpad. Tap for direct touch</string>
<string name="bottom_desktop_direct_touch">Direct touch. Tap for trackpad</string>
<string name="bottom_desktop_starting">Starting the KDE desktop…</string>
<string name="bottom_desktop_ended">The desktop closed.</string>
<string name="bottom_desktop_failed">The desktop couldn\'t start. Its logs are in this session\'s bottom-desktop folder.</string>
<string name="bottom_desktop_off">The desktop is closed.</string>
<string name="bottom_dashboard_empty">Nothing to show here yet.</string>
<string name="bottom_page_downloads">Downloads</string>
<string name="bottom_downloads_none">No downloads running.</string>
@@ -1922,7 +1947,21 @@
<string name="stats_fuel_t">Fuel, t</string>
<string name="stats_fuel_main">Main %1$s t</string>
<string name="stats_fuel_reserve">Reserve %1$s t</string>
<string name="stats_tap_hint">Tap the top strip or the dash to change its style.</string>
<string name="stats_tap_hint">Tap the HUD, the top strip or the dash to change its style.</string>
<string name="stats_hud_frametime">Frame time</string>
<string name="stats_hud_last_seconds">last %1$d s</string>
<string name="stats_hud_avg_frame">avg frame</string>
<string name="stats_hud_low">1 percent low</string>
<string name="stats_hud_slow_frames">frames over 33 ms</string>
<string name="stats_hud_per_minute">%1$d / min</string>
<string name="stats_hud_playing_for">Playing for %1$s</string>
<string name="stats_hud_core_group">%1$d cores, up to %2$s GHz</string>
<string name="stats_hud_core_group_unknown">%1$d cores</string>
<string name="stats_hud_game_cores">game</string>
<string name="stats_hud_fps_of">FPS of %1$d Hz</string>
<string name="stats_hud_red_mark">The red mark is where the HUD shows the temperature in red.</string>
<string name="stats_hud_whole_device">whole device</string>
<string name="stats_hud_battery_temp">battery</string>
<string name="bottom_telemetry_send_title">Send dashboard data</string>
<string name="bottom_telemetry_send_auto">Automatic</string>
<string name="bottom_telemetry_send_auto_hint">Turns it on for every game listed here, including games found later. Games you switch off stay off.</string>
@@ -1946,6 +1985,13 @@
<string name="bottom_chat_mic_unavailable">Mic is off for this game. To talk, turn on Microphone in DroidDeck\'s Steam settings (Audio) and start the game again.</string>
<string name="bottom_chat_volume">Volume %1$d%%</string>
<string name="bottom_page_telemetry">In-game stats</string>
<string name="bottom_hud_group">Bottom screen HUD</string>
<string name="bottom_hud_group_detail">Works with the top HUD off and does not change it. The number switches below are for the Line strip: under the tabs, and the Line style above a game\'s dashboard.</string>
<string name="bottom_hud_hint">The big HUD, the Line strip and the strip under the tabs. A game\'s dashboard stays.</string>
<string name="bottom_strip_tabs">Strip on every tab</string>
<string name="bottom_strip_tabs_hint">Shows the line under the tabs while you use the bottom screen.</string>
<string name="bottom_strip_lows" formatted="false">1% and 0.1% lows</string>
<string name="bottom_strip_cpu_temp">CPU temperature</string>
<string name="bottom_telemetry_fps">FPS</string>
<string name="bottom_telemetry_cpu">CPU</string>
<string name="bottom_telemetry_gpu">GPU</string>
@@ -1961,7 +2007,7 @@
<string name="bottom_telemetry_balance">Balance</string>
<string name="bottom_telemetry_war_thunder">War Thunder</string>
<string name="bottom_telemetry_elite">Elite Dangerous</string>
<string name="bottom_telemetry_help">Turn on a racing game\'s data output (often called telemetry or UDP) to see a live dash here. It stays on this device.</string>
<string name="bottom_telemetry_help">Turn on a game\'s data output (often called telemetry or UDP) to see a live dash here. It stays on this device.</string>
<string name="bottom_telemetry_unknown_format">Port %1$d receives data (%2$d packets of %3$d bytes), but in a format this page cannot read yet.</string>
<string name="bottom_telemetry_port_busy">Another program already uses port %1$s, so that game cannot show here.</string>
@@ -2297,6 +2343,7 @@
<string name="display_look_filter">%1$s Sets scaling to %2$s.</string>
<string name="display_match_screen">Match screen (%1$d×%2$d)</string>
<string name="display_follow_screen">Follow screen (resizes when folded or unfolded)</string>
<string name="display_follow_screen_scaled">Scaled %1$s</string>
<string name="mode_tab_steam">Steam</string>
<string name="device_info_show">Show device details</string>
<string name="device_info_hide">Hide device details</string>
@@ -3421,6 +3468,113 @@
<string name="spatial_saved_views_hint">Saved views can be recalculated. Start a new calibration to capture in the current tracking frame.</string>
<string name="spatial_model_checksum_error">Hand model checksum mismatch</string>
<string name="spatial_opencv_load_error">OpenCV could not load</string>
<string name="setup_tab_sync">Syncthing</string>
<string name="sync_group">Syncthing</string>
<string name="sync_enable">Sync with Syncthing</string>
<string name="sync_enable_hint">Based on Syncthing-Fork, this is a Syncthing implementation that lets you sync files in DroidDeck\'s internal file system with other Syncthing instances. This is only for files you are storing within DroidDeck\'s internal file system.</string>
<string name="sync_missing">This build doesn\'t include Syncthing.</string>
<string name="sync_starting">Starting Syncthing</string>
<string name="sync_status_starting">Starting</string>
<string name="sync_status_up_to_date">Up to date</string>
<string name="sync_status_syncing">Syncing</string>
<string name="sync_status_paused">Paused</string>
<string name="sync_status_pausing">Pausing</string>
<string name="sync_status_resuming">Resuming</string>
<string name="sync_status_attention">Needs attention</string>
<string name="sync_status_failed">Syncthing stopped</string>
<string name="sync_failed_retry">Try again</string>
<string name="sync_paused_wifi">Paused until Wi-Fi</string>
<string name="sync_paused_game">Paused during the game</string>
<string name="sync_summary">%1$d folders · %2$d of %3$d devices connected</string>
<string name="sync_left">%1$s left</string>
<string name="sync_open_web_ui">Open web UI</string>
<string name="sync_pause">Pause</string>
<string name="sync_resume">Resume</string>
<string name="sync_running">Running</string>
<string name="sync_running_hint">Turn off to stop Syncthing completely.</string>
<string name="sync_this_device">This device</string>
<string name="sync_device_id">Device ID</string>
<string name="sync_show_qr">Show QR</string>
<string name="sync_advanced">Advanced</string>
<string name="sync_advanced_hint">Ports, when to run, reset</string>
<string name="sync_open">Open</string>
<string name="sync_waiting">Waiting for you</string>
<string name="sync_pending_device">%1$s wants to connect</string>
<string name="sync_pending_folder">%1$s wants to share “%2$s”</string>
<string name="sync_pending_folder_hint">Accept to choose where it\'s saved in DroidDeck.</string>
<string name="sync_review">Review in web UI</string>
<string name="sync_folders">Folders</string>
<string name="sync_no_folders">No folders yet.</string>
<string name="sync_folder_detail">%1$s · %2$s</string>
<string name="sync_folder_up_to_date">Up to date</string>
<string name="sync_folder_syncing">Syncing %1$d%%</string>
<string name="sync_folder_scanning">Scanning</string>
<string name="sync_folder_paused">Paused</string>
<string name="sync_folder_out_of_sync">Out of sync</string>
<string name="sync_folder_errors">%1$d files couldn\'t sync</string>
<string name="sync_folder_blocked">Blocked</string>
<string name="sync_folder_blocked_hint">This folder is outside DroidDeck\'s storage, so DroidDeck paused it. To sync folders outside DroidDeck, use the Syncthing-Fork app.</string>
<string name="sync_remove_folder">Remove from Syncthing</string>
<string name="sync_remove_folder_hint">Removing it doesn\'t delete any files.</string>
<string name="sync_devices">Devices</string>
<string name="sync_no_devices">No devices yet.</string>
<string name="sync_connected">Connected</string>
<string name="sync_offline">Offline</string>
<string name="sync_last_seen">Last seen %1$s</string>
<string name="sync_device_id_title">This device\'s ID</string>
<string name="sync_device_id_hint">On your other device, add a device in Syncthing and scan this code or paste the ID. Then accept it here in the web UI.</string>
<string name="sync_copy">Copy</string>
<string name="sync_share">Share</string>
<string name="sync_done">Done</string>
<string name="sync_off_title">Turn off Syncthing?</string>
<string name="sync_off_body">Syncthing stops now and stays stopped until it\'s turned back on. Synced files stay where they are.</string>
<string name="sync_off_forget">Also delete Syncthing\'s config</string>
<string name="sync_off_forget_hint">Removes this device\'s ID, folders and devices. Turning it on again starts fresh.</string>
<string name="sync_turn_off">Turn off</string>
<string name="sync_ports">Ports</string>
<string name="sync_port_sync">Sync</string>
<string name="sync_port_discovery">Local discovery</string>
<string name="sync_repick">Pick new ports</string>
<string name="sync_repick_hint">Checked again on every start.</string>
<string name="sync_repick_button">Re-pick</string>
<string name="sync_reset_group">Reset</string>
<string name="sync_api_key">API key</string>
<string name="sync_regenerate">Regenerate</string>
<string name="sync_reset">Reset Syncthing</string>
<string name="sync_reset_hint">New device ID, folders and devices removed. Files in DroidDeck\'s storage are kept.</string>
<string name="sync_reset_button">Reset</string>
<string name="sync_reset_confirm_title">Reset Syncthing?</string>
<string name="sync_running_group">Running</string>
<string name="sync_run">Run</string>
<string name="sync_run_open">While DroidDeck is open</string>
<string name="sync_run_background">In the background</string>
<string name="sync_wifi_only">Wi-Fi only</string>
<string name="sync_pause_games">Pause during games</string>
<string name="sync_logs">Logs</string>
<string name="sync_logs_hint">Syncthing output for this session</string>
<string name="sync_logs_share">Share</string>
<string name="sync_notification_channel">Syncthing</string>
<string name="sync_needs_runtime">Set up the Linux runtime first.</string>
<string name="sync_accept">Accept</string>
<string name="sync_accept_title">Save “%1$s” to</string>
<string name="sync_add_folder">Add folder</string>
<string name="sync_add_folder_hint">Sync a folder in DroidDeck\'s storage</string>
<string name="sync_choose">Choose</string>
<string name="sync_add">Add</string>
<string name="sync_add_failed">The folder couldn\'t be added.</string>
<string name="sync_share_with">Share with</string>
<string name="sync_share_none">No devices yet. You can share this folder from the web UI later.</string>
<string name="sync_use_folder">Use this folder</string>
<string name="sync_new_folder">New folder</string>
<string name="sync_location_home">Container home</string>
<string name="sync_location_sync">Sync folder</string>
<string name="sync_location_shared">DroidDeck shared storage</string>
<string name="sync_location_card">DroidDeck on %1$s</string>
<string name="sync_location_app">DroidDeck app data</string>
<string name="sync_web_path_locked">New folders are saved in DroidDeck\'s Sync folder. To sync a different DroidDeck folder, use Add folder on the Syncthing tab.</string>
<string name="sync_web_title">Syncthing</string>
<string name="sync_web_reload">Reload</string>
<string name="sync_not_running">Syncthing isn\'t running.</string>
<string name="session_end_steam_sigill">Steam stopped with an illegal instruction (SIGILL). This can be a CPU instruction compatibility problem or a client crash. Share the logs with your device details.</string>
<string name="session_end_steam_try_x64">You can try Steam settings → Steam client → x86-64 (experimental). It needs an additional download and may run more slowly.</string>
<string name="session_end_vulkan_device">The Linux graphics driver could not find a usable Vulkan device. Check that the selected Linux GPU driver supports this GPU.</string>