Merge branch 'main' into close-window-when-last-tab-is-closed

Author: jeremypw

libcore/DndHandler.vala

@@ -388,7 +388,7 @@ namespace Files {
             var actions = possible_actions;
             var suggested_action = selected_action;
             var target_location = dest.get_target_location ();
-            suggested_action_return = Gdk.DragAction.PRIVATE;
+            suggested_action_return = Gdk.DragAction.DEFAULT;
 
             if (drop_file_list == null || drop_file_list.data == null) {
                 return Gdk.DragAction.DEFAULT;
@@ -406,8 +406,7 @@ namespace Files {
             } else if (dest.is_executable ()) {
                 actions |= (Gdk.DragAction.COPY |
                            Gdk.DragAction.MOVE |
-                           Gdk.DragAction.LINK |
-                           Gdk.DragAction.PRIVATE);
+                           Gdk.DragAction.LINK);
             } else {
                 actions = Gdk.DragAction.DEFAULT;
             }

po/ja.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pantheon-files\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-05-13 10:24+0000\n"
-"PO-Revision-Date: 2026-01-08 12:55+0000\n"
+"PO-Revision-Date: 2026-05-21 22:56+0000\n"
 "Last-Translator: Ryo Nakano <ryonakaknock3@gmail.com>\n"
 "Language-Team: Japanese <https://l10n.elementaryos.org/projects/files/files/"
 "ja/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.11.4\n"
+"X-Generator: Weblate 2026.5\n"
 "X-Launchpad-Export-Date: 2017-06-11 06:26+0000\n"
 
 #: filechooser-portal/FileChooserDialog.vala:89 src/View/Window.vala:192
@@ -1892,16 +1892,16 @@ msgstr "全員"
 
 #: src/View/AbstractDirectoryView.vala:313
 msgid "This folder only contains hidden files"
-msgstr ""
+msgstr "このフォルダーには隠しファイルのみが存在します"
 
 #: src/View/AbstractDirectoryView.vala:320
 #: src/View/AbstractDirectoryView.vala:326
 msgid "Show"
-msgstr ""
+msgstr "表示"
 
 #: src/View/AbstractDirectoryView.vala:326
 msgid "Hide"
-msgstr ""
+msgstr "隠す"
 
 #: src/View/AbstractDirectoryView.vala:879
 #: src/View/AbstractDirectoryView.vala:1205
@@ -2153,14 +2153,12 @@ msgid "Open the system security and privacy settings app"
 msgstr "システムのセキュリティとプライバシー設定アプリを開きます"
 
 #: src/View/Slot.vala:31
-#, fuzzy
-#| msgid "This Folder Does Not Exist"
 msgid "This Folder does not contain any files"
-msgstr "このフォルダーは存在しません"
+msgstr "このフォルダーにはファイルがありません"
 
 #: src/View/Slot.vala:32
 msgid "Trash does not contain any files"
-msgstr ""
+msgstr "ゴミ箱にはファイルがありません"
 
 #: src/View/Slot.vala:33
 msgid "There Are No Recent Files"

src/View/Window.vala

@@ -68,7 +68,8 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         {"tabhistory-restore", action_tabhistory_restore, "s" },
         {"forward", action_forward, "i"},
         {"back", action_back, "i"},
-        {"focus-sidebar", action_focus_sidebar}
+        {"focus-sidebar", action_focus_sidebar},
+        {"focus-current-container", action_focus_current_container}
     };
 
     private static uint window_id = 0;
@@ -161,7 +162,8 @@ public class Files.View.Window : Hdy.ApplicationWindow {
             marlin_app.set_accels_for_action ("win.back(1)", {"<Alt>Left", "XF86Back"});
             marlin_app.set_accels_for_action ("win.tab::TAB", {"<Shift><Ctrl>K"});
             marlin_app.set_accels_for_action ("win.tab::WINDOW", {"<Ctrl><Alt>N"});
-            marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl>Left"});
+            marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl><Alt>Left"});
+            marlin_app.set_accels_for_action ("win.focus-current-container", {"<Ctrl><Alt>Right"});
         }
 
         build_window ();
@@ -1006,6 +1008,10 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         sidebar.focus ();
     }
 
+    private void action_focus_current_container () {
+        grab_focus ();
+    }
+
     private void before_undo_redo () {
         doing_undo_redo = true;
         update_undo_actions ();