Skip to content

Commit

Permalink
Merge branch 'main' into jeremypw/fix-secondaryclick-multiplselection
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored Oct 7, 2024
2 parents 907afd1 + 92faf80 commit f9a02f8
Show file tree
Hide file tree
Showing 11 changed files with 297 additions and 417 deletions.
1 change: 0 additions & 1 deletion libcore/Interfaces/SearchableInterface.vala
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ namespace Files.View.Chrome {

public abstract void cancel ();
public abstract void search (string txt, GLib.File search_location);
public abstract bool has_popped_up ();
}
}
14 changes: 13 additions & 1 deletion libcore/Widgets/BasicBreadcrumbsEntry.vala
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,19 @@ namespace Files.View.Chrome {
}
}

public bool hide_breadcrumbs { get; set; default = false; }
private bool _hide_breadcrumbs = false;
public bool hide_breadcrumbs {
get {
return _hide_breadcrumbs;
}

set {
_hide_breadcrumbs = value;
if (!hide_breadcrumbs) {
set_entry_text ("");
}
}
}
public const double MINIMUM_LOCATION_BAR_ENTRY_WIDTH = 16;
public const double MINIMUM_BREADCRUMB_WIDTH = 12;
public const int ICON_WIDTH = 32;
Expand Down
16 changes: 5 additions & 11 deletions po/en_GB.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: marlin\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-08 08:46+0000\n"
"PO-Revision-Date: 2024-05-20 08:13+0000\n"
"PO-Revision-Date: 2024-09-29 02:16+0000\n"
"Last-Translator: David Hewitt <davidmhewitt@gmail.com>\n"
"Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
"files/files/en_GB/>\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.5\n"
"X-Generator: Weblate 5.6.2\n"
"X-Launchpad-Export-Date: 2017-06-11 06:29+0000\n"

#: filechooser-portal/FileChooserDialog.vala:112
Expand Down Expand Up @@ -1904,22 +1904,16 @@ msgid "Could not open files or URIs with this app"
msgstr "Could not open files or URIs with this app"

#: src/Utils/Permissions.vala:29
#, fuzzy
#| msgid "Owner:"
msgid "Owner"
msgstr "Owner:"
msgstr "Owner"

#: src/Utils/Permissions.vala:31
#, fuzzy
#| msgid "Group:"
msgid "Group"
msgstr "Group:"
msgstr "Group"

#: src/Utils/Permissions.vala:34
#, fuzzy
#| msgid "Everyone:"
msgid "Everyone"
msgstr "Everyone:"
msgstr "Everyone"

#: src/View/AbstractDirectoryView.vala:856
#: src/View/AbstractDirectoryView.vala:1183
Expand Down
38 changes: 18 additions & 20 deletions po/extra/zh_TW.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: pantheon-files\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-08 08:46+0000\n"
"PO-Revision-Date: 2019-05-22 16:03+0000\n"
"Last-Translator: P.-H. Lin <cypressyew@gmail.com>\n"
"PO-Revision-Date: 2024-09-19 08:57+0000\n"
"Last-Translator: Kisaragi Hiu <mail@kisaragi-hiu.com>\n"
"Language-Team: Chinese (Traditional) <https://l10n.elementary.io/projects/"
"files/extra/zh_Hant/>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 3.6.1\n"
"X-Generator: Weblate 5.6.2\n"
"X-Launchpad-Export-Date: 2017-06-11 06:29+0000\n"

#: data/io.elementary.files.desktop.in.in:6 data/files.metainfo.xml.in.in:10
Expand Down Expand Up @@ -59,72 +59,70 @@ msgstr ""

#: data/files.metainfo.xml.in.in:18
msgid "Quick access to settings like zoom levels and hidden files"
msgstr ""
msgstr "提供縮放層級與隱藏檔案等設定的快速存取"

#: data/files.metainfo.xml.in.in:22
msgid "See more metadata at a glance in List view"
msgstr ""
msgstr "在列表檢視提供更多中介資料以便概覽"

#: data/files.metainfo.xml.in.in:26
msgid "Browse complex trees faster with Column view"
msgstr ""
msgstr "用分欄檢視來更快速地瀏覽複雜目錄樹"

#: data/files.metainfo.xml.in.in:67 data/files.metainfo.xml.in.in:85
#: data/files.metainfo.xml.in.in:108 data/files.metainfo.xml.in.in:120
#: data/files.metainfo.xml.in.in:140
#, fuzzy
msgid "Minor updates:"
msgstr "小臭蟲修正"
msgstr "小型更新:"

#: data/files.metainfo.xml.in.in:69
msgid "Restoring tabs from last time is now optional"
msgstr ""
msgstr "復原上次使用分頁的功能現在可以選擇停用"

#: data/files.metainfo.xml.in.in:70
msgid "Drag and select can no longer be done with secondary pointer button"
msgstr ""
msgstr "讓拖曳選擇不能用次要指標按鈕進行"

#: data/files.metainfo.xml.in.in:71 data/files.metainfo.xml.in.in:93
#: data/files.metainfo.xml.in.in:110 data/files.metainfo.xml.in.in:122
#: data/files.metainfo.xml.in.in:142
#, fuzzy
msgid "Updated translations"
msgstr "新翻譯"
msgstr "翻譯更新"

#: data/files.metainfo.xml.in.in:87
msgid "Discontinue support for dragging bookmark out of sidebar"
msgstr ""
msgstr "停止支援把書籤拖到側邊欄外的功能"

#: data/files.metainfo.xml.in.in:88
msgid "Fix unexpected scrolling after renaming a folder"
msgstr ""
msgstr "修正重新命名資料夾後突然捲動畫面的問題"

#: data/files.metainfo.xml.in.in:89
msgid ""
"Fixes a crash when switching to viewing as grid under rare circumstances"
msgstr ""
msgstr "修正切換為格狀檢視時偶爾會崩潰的問題"

#: data/files.metainfo.xml.in.in:90
msgid "Ensure the selection persists after refreshing the view"
msgstr ""
msgstr "確保畫面重新整理後選取範圍仍然不變"

#: data/files.metainfo.xml.in.in:91
msgid "Fix Files failing to open if trying to restore a disconnected location"
msgstr ""
msgstr "修正《檔案》嘗試復原已斷線位置而無法啟動的問題"

#: data/files.metainfo.xml.in.in:92
msgid "Fix the view continuing to show when a location is unmounted"
msgstr ""
msgstr "修正位置卸載後頁面仍然繼續顯示它的問題"

#: data/files.metainfo.xml.in.in:136
msgid "Improvements:"
msgstr ""
msgstr "改善項目:"

#: data/files.metainfo.xml.in.in:138
msgid ""
"New Tab Bar with improved animations, smoother drag-and-drop, and "
"reorganized tab context menus"
msgstr ""
msgstr "新分頁列,提供改善的動畫、較滑順的拖放,並且整理分頁的內文選單"

#: data/io.elementary.files.policy.in.in:10
msgid "Run Pantheon Files as Administrator"
Expand Down
Loading

0 comments on commit f9a02f8

Please sign in to comment.