Merge upstream main into File Manager Test branch

Resolve File Manager conflicts with the upstream copy cancellation and symlink changes. Preserve the original navigation, confirmation, and localization commits. Pass cancellation into move cleanup and retain the upstream empty-file copy behavior.
This commit is contained in:
K11MCH1 committed 2026-10-22 21:15:46 +09:00
commit 7432a4f1a3
225 files changed
+7391 -1222

No files matched your search

+64 -3
View File
@@ -181,6 +181,8 @@
<string name="app_fex_x86">%1$s through FEX</string>
<string name="app_fex_not_ready">This program is built for %1$s PCs and runs through FEX, which is not set up yet. Open Steam once while signed in: DroidDeck has it download FEX and the Steam Linux Runtime it needs, then this opens.</string>
<string name="session_end_program">This program</string>
<string name="session_end_steam_download">Couldn\'t download the Steam client. Your network or VPN may be blocking Steam\'s servers; check the connection and try again.</string>
<string name="session_end_steam_setup">Couldn\'t set up the Steam client. Check your connection and free storage, then try again.</string>
<string name="session_end_fex_missing">%1$s is built for x86 PCs and runs through FEX, which is not installed yet. Start Steam once while signed in and let it download FEX and the Steam Linux Runtime, then start this again.</string>
<string name="add_app_flatpak_hint">A Flathub app ID or its Flathub page. Flatpak is set up first if it is not yet.</string>
<string name="add_app_file">File</string>
@@ -306,6 +308,12 @@
<string name="mode_decky_current">Up to date · %1$s</string>
<string name="mode_decky_loader">Loader</string>
<string name="mode_decky_install_latest">Install latest</string>
<string name="decky_channel">Update Channel</string>
<string name="decky_channel_hint">Which Decky Loader releases to install. Decky\'s own updater uses the same channel.</string>
<string name="decky_channel_stable">Stable</string>
<string name="decky_channel_prerelease">Prerelease</string>
<string name="decky_channel_testing">Testing</string>
<string name="decky_channel_failed">Could not save the Decky update channel</string>
<string name="mode_decky_on">Starts with Steam. While on, other apps on this device may be able to control Steam.</string>
<string name="mode_decky_off">Off. Steam\'s remote debugging port stays closed.</string>
<string name="mode_decky_remove_title">Uninstall Decky Loader?</string>
@@ -313,6 +321,8 @@
<string name="mode_client">Client</string>
<string name="mode_mangoapp">Performance overlay</string>
<string name="mode_mangoapp_hint">Turn off if games crash or go black in Deck mode. Applies next session.</string>
<string name="mode_return_after_game">Return to DroidDeck after a game</string>
<string name="mode_return_after_game_hint">When a game you started from DroidDeck or another launcher closes, Steam exits cleanly (cloud saves finish first) and you go back there. Off: stay in Steam.</string>
<string name="mode_steam_repair">Repair Steam client</string>
<string name="mode_steam_repair_hint">Downloads the Steam client again the next time Steam starts. Use it if Steam stays on its loading screen. Games, sign-in and settings are kept.</string>
<string name="mode_steam_repair_queued">The Steam client will be downloaded again the next time Steam starts.</string>
@@ -507,7 +517,9 @@
<string name="comp_delete_original_title">Delete this original?</string>
<string name="comp_delete_original_body">This %1$s original is from an earlier build of %2$s. The current build\'s original is always kept.</string>
<string name="comp_nightlies_count">On the Nightlies · %1$d</string>
<string name="comp_refresh_to_list">Refresh to list packages on the Nightlies.</string>
<string name="comp_channel_stable">Stable</string>
<string name="comp_channel_nightly">Nightly</string>
<string name="comp_refresh_to_list">Refresh to list packages on the Nightlies and DroidDeck releases.</string>
<string name="comp_nothing_new">Nothing new since the last check.</string>
<string name="comp_import_wcp">Import .wcp</string>
<string name="comp_restore_original">Restore this Proton\'s original</string>
@@ -585,6 +597,16 @@
<string name="drawer_prev_page">Previous page</string>
<string name="drawer_next_page">Next page</string>
<string name="drawer_hud">Performance HUD</string>
<string name="drawer_hud_fps">Frame rate</string>
<string name="drawer_hud_battery">Battery temperature</string>
<string name="drawer_hud_graph">Performance graph</string>
<string name="drawer_hud_color">Color</string>
<string name="drawer_hud_color_mint">Mint</string>
<string name="drawer_hud_color_white">White</string>
<string name="drawer_hud_color_sky">Sky</string>
<string name="drawer_hud_color_amber">Amber</string>
<string name="drawer_hud_color_violet">Violet</string>
<string name="drawer_hud_opacity">Opacity</string>
<string name="drawer_scaling">Scaling mode</string>
<string name="drawer_scaling_sharpness">Scaling sharpness</string>
<string name="drawer_effects">Screen effects</string>
@@ -1402,6 +1424,13 @@
<string name="mode_decky_plugins_hint">Install a plugin ZIP for the next Steam session.</string>
<string name="mode_decky_plugin_downloading">Downloading…</string>
<string name="mode_decky_plugin_install_zip">Install from ZIP</string>
<string name="decky_zip_warning_title">Third-Party Plugin Installation</string>
<string name="decky_zip_warning_text">The Decky Loader team has not reviewed this plugin. It may contain malware, such as software to steal your Steam account or harm your device. By installing this plugin, you agree you have assumed all risks to your device.</string>
<string name="decky_zip_warning_continue">Continue</string>
<plurals name="decky_zip_warning_wait">
<item quantity="one">Please wait %1$d second</item>
<item quantity="other">Please wait %1$d seconds</item>
</plurals>
<string name="store_cat_games">Games</string>
<string name="store_cat_audio_video">Audio &amp; Video</string>
<string name="store_cat_graphics">Graphics</string>
@@ -1826,7 +1855,8 @@
<string name="cmgr_original_kept">The installed build\'s original is kept: it is the way back.</string>
<string name="cmgr_not_stored">Not stored</string>
<string name="cmgr_deleted_original">Deleted the %1$s original of %2$s.</string>
<string name="cmgr_nightlies_only">Downloads come only from the Nightlies releases</string>
<string name="cmgr_nightlies_only">Downloads come only from the Nightlies and DroidDeck releases</string>
<string name="cmgr_nightly_replaced">Download failed: this nightly may have been replaced by a newer build. Refresh the list and try again.</string>
<string name="cmgr_list_predates_checksums">This package list predates checksums - refresh it and try again</string>
<string name="cmgr_checksum_mismatch">Checksum mismatch</string>
@@ -2084,6 +2114,9 @@
<string name="cloud_last_sync">Last sync %1$s</string>
<string name="cloud_never">Not synced yet</string>
<string name="cloud_done">%1$d files</string>
<string name="cloud_up_to_date">Already up to date</string>
<string name="cloud_signed_out">Sign in to the store to sync saves</string>
<string name="cloud_not_synced">Saves were not synced</string>
<string name="stores_eyebrow_installed">installed</string>
<string name="stores_eyebrow_library">in your library</string>
<string name="stores_eyebrow_store">store</string>
@@ -2172,6 +2205,9 @@
<string name="stores_download_manager">Download manager</string>
<string name="stores_parallel">Downloads at a time</string>
<string name="stores_install_where">Install to</string>
<string name="stores_install_language">Game language</string>
<string name="stores_install_language_hint">GOG and Epic install this language. System follows the app language.</string>
<string name="stores_install_language_system">System</string>
<string name="stores_install_title">Install %1$s:</string>
<string name="stores_target_internal">Internal</string>
<string name="stores_target_free">%1$s free</string>
@@ -2400,7 +2436,7 @@
<string name="touch_done">Done</string>
<string name="touch_save_failed">Could not save the touch layout</string>
<string name="touch_saved">Touch layout saved to Steam</string>
<string name="touch_app_id">App %1$d</string>
<string name="touch_app_id">App %1$s</string>
<string name="touch_label_hint">Label (optional)</string>
<string name="touch_icons_missing">Steam\'s icons were not found</string>
<plurals name="touch_icons_found">
@@ -2497,6 +2533,22 @@
<string name="glasses_tracking_flat_hint">Automatic keeps this 2D game fixed in view. Choose Virtual screen in Display to use head tracking.</string>
<string name="glasses_tracking_sbs_hint">Head tracking applies to a virtual screen or a running SteamVR game.</string>
<string name="glasses_hardware">Device</string>
<string name="vr_controllers_tab">Controllers</string>
<string name="vr_controllers_group">SteamVR controllers</string>
<string name="vr_controllers_emulate">Game pad in VR</string>
<string name="vr_controllers_emulate_hint">The two VR hands your controller plays as. Changes apply right away, also while SteamVR runs. Joy-Cons and tracked hands still take over their side.</string>
<string name="vr_controllers_off">Regular game pad</string>
<string name="vr_controllers_index">Valve Index controllers</string>
<string name="vr_controllers_touch">Meta Quest 3 controllers</string>
<string name="vr_controllers_vive">HTC Vive wands</string>
<string name="vr_controllers_sticks">Sticks start by</string>
<string name="vr_controllers_sticks_hint">Press both sticks in together during VR to switch.</string>
<string name="vr_controllers_sticks_game">Moving you in the game</string>
<string name="vr_controllers_sticks_hands">Moving the hands</string>
<string name="vr_controllers_buttons">Buttons</string>
<string name="vr_controllers_buttons_stick">Triggers are triggers, bumpers grip, A/B and X/Y are each hand\'s face buttons, stick clicks click the thumbsticks, Guide opens the SteamVR menu. D-pad up and down move the hands closer or farther.</string>
<string name="vr_controllers_buttons_vive">The sticks are trackpads; A/X or a stick click presses them. Triggers are triggers, bumpers grip, Start and Select are menu, Guide opens the SteamVR menu.</string>
<string name="vr_controllers_buttons_off">No VR hands. Games that support a game pad, and the SteamVR menu, get your controller as usual.</string>
<string name="glasses_brightness">Brightness</string>
<string name="glasses_volume">Volume</string>
<string name="glasses_sunblock">Sunblock</string>
@@ -2514,6 +2566,15 @@
<string name="glasses_vr_fov">SteamVR field of view</string>
<string name="glasses_vr_fov_hint">Lower brings SteamVR closer and fills the glasses; higher shows more around you.</string>
<string name="glasses_playing">Playing on %1$s</string>
<string name="glasses_phone_recenter">Recenter</string>
<string name="glasses_phone_steamvr_menu">SteamVR menu</string>
<string name="glasses_phone_switch_sticks">Sticks: hands ⇄ game</string>
<string name="glasses_phone_controllers">Controllers: %1$s</string>
<string name="glasses_phone_keyboard">Keyboard</string>
<string name="glasses_phone_session_menu">Session menu</string>
<string name="glasses_phone_stop_steamvr">Stop SteamVR</string>
<string name="glasses_phone_brightness">Brightness %1$d / %2$d</string>
<string name="glasses_phone_battery">Battery %1$d%% · %2$d °C</string>
<string name="glasses_calibration">Tracking calibration</string>
<string name="glasses_calibration_hint">Reduce drift and align the level reference.</string>
<string name="glasses_calibration_saved_hint">Saved calibration is applied to these glasses.</string>