Skip to content

Commit 7baa7a2

Browse files
authored
Merge branch 'master' into fix/type-to-search-space-key
2 parents c680956 + 089ad2b commit 7baa7a2

54 files changed

Lines changed: 3848 additions & 1622 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 1005 additions & 992 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cosmic-files"
3-
version = "1.0.15"
3+
version = "1.8.0"
44
authors = ["Jeremy Soller <jeremy@system76.com>"]
55
edition = "2024"
66
license = "GPL-3.0-only"
@@ -11,7 +11,7 @@ anyhow = "1"
1111
jiff = "0.2"
1212
jiff-icu = "0.2"
1313
icu = { version = "2.2.0", features = ["compiled_data"] }
14-
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c253ec1", optional = true }
14+
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "32283d7", optional = true }
1515
cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
1616
dirs = "6.0.0"
1717
gio = { version = "0.21", optional = true }
@@ -33,7 +33,7 @@ shlex = { version = "1.3" }
3333
tempfile = "3"
3434
tikv-jemallocator = { version = "0.6", optional = true }
3535
tokio = { version = "1", features = ["process", "sync"] }
36-
trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "cosmic" }
36+
trash = "5.2.6"
3737
url = "2.5"
3838
walkdir = "2.5.0"
3939
wayland-client = { version = "0.31.14", optional = true }
@@ -56,6 +56,7 @@ slotmap = "1.1.1"
5656
recently-used-xbel = "1.2.0"
5757
zip = "8"
5858
md-5 = "0.10.6"
59+
sha2 = "0.10"
5960
png = "0.18"
6061
jxl-oxide = { version = "0.12.5", features = ["image"] }
6162
num_cpus = "1.17.0"
@@ -152,9 +153,9 @@ tokio = { version = "1", features = ["rt", "macros"] }
152153
# libcosmic = { path = "../libcosmic" }
153154
# cosmic-config = { path = "../libcosmic/cosmic-config" }
154155
# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
155-
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "iced-rebase" }
156-
# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "iced-rebase" }
157-
# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "iced-rebase" }
156+
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
157+
# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
158+
# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
158159

159160

160161
# [patch.'https://github.com/pop-os/smithay-clipboard']

cosmic-files-applet/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cosmic-files-applet"
3-
version = "1.0.15"
3+
version = "1.8.0"
44
edition = "2024"
55

66
[dependencies]

debian/changelog

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
cosmic-files (1.8.0) noble; urgency=medium
2+
3+
* Epoch 1.8.0 version update
4+
5+
-- Jeremy Soller <jeremy@system76.com> Wed, 02 Sep 2026 08:14:53 -0600
6+
7+
cosmic-files (1.7.0) noble; urgency=medium
8+
9+
* Epoch 1.7.0 version update
10+
11+
-- Jeremy Soller <jeremy@system76.com> Tue, 25 Aug 2026 09:20:22 -0600
12+
13+
cosmic-files (1.6.0) noble; urgency=medium
14+
15+
* Epoch 1.6.0 version update
16+
17+
-- Jeremy Soller <jeremy@system76.com> Tue, 18 Aug 2026 07:13:48 -0600
18+
19+
cosmic-files (1.5.0) noble; urgency=medium
20+
21+
* Epoch 1.5.0 version update
22+
23+
-- Jeremy Soller <jeremy@system76.com> Tue, 28 Jul 2026 09:14:09 -0600
24+
25+
cosmic-files (1.4.0) noble; urgency=medium
26+
27+
* Epoch 1.4.0 version update
28+
29+
-- Jeremy Soller <jeremy@system76.com> Mon, 20 Jul 2026 14:36:06 -0600
30+
31+
cosmic-files (1.3.0) noble; urgency=medium
32+
33+
* Epoch 1.3.0 version update
34+
35+
-- Jeremy Soller <jeremy@system76.com> Sun, 12 Jul 2026 13:21:18 -0600
36+
37+
cosmic-files (1.2.0) noble; urgency=medium
38+
39+
* Epoch 1.2.0 version update
40+
41+
-- Jeremy Soller <jeremy@system76.com> Tue, 30 Jun 2026 12:21:07 -0600
42+
43+
cosmic-files (1.1.0) noble; urgency=medium
44+
45+
* Epoch 1.1.0 version update
46+
47+
-- Jeremy Soller <jeremy@system76.com> Tue, 23 Jun 2026 08:47:18 -0600
48+
49+
cosmic-files (1.0.16) noble; urgency=medium
50+
51+
* Epoch 1.0.16 version update
52+
53+
-- Jeremy Soller <jeremy@system76.com> Tue, 09 Jun 2026 10:26:05 -0600
54+
155
cosmic-files (1.0.15) noble; urgency=medium
256

357
* Epoch 1.0.15 version update

i18n/ar/cosmic_files.ftl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ settings = الإعدادات
8484
### Appearance
8585

8686
appearance = المظهر
87-
theme = النسق
87+
theme = السمة
8888
match-desktop = طابق سطح المكتب
8989
dark = داكن
9090
light = فاتح
@@ -110,7 +110,7 @@ new-tab = لسان جديد
110110
new-window = نافذة جديدة
111111
rename = غيِّر الاسم...
112112
close-tab = أغلق اللسان
113-
quit = أنهِ
113+
quit = إنهِ
114114
115115
## Edit
116116

@@ -147,7 +147,7 @@ icon-size-and-spacing = حجم الأيقونة والتباعد
147147
icon-size = حجم الأيقونة
148148
grid-spacing = تباعد شبكي
149149
trashed-on = مهمل
150-
details = التفاصيل
150+
details = تفاصيل
151151
pause = ألبث
152152
resume = استئناف
153153
create-archive = أنشئ أرشيف
@@ -383,3 +383,7 @@ context-action-confirm-warning =
383383
*[other] عنصر
384384
}.
385385
run = شغِّل
386+
checksum = تدقيق المجموع { $kind }
387+
calculate = احسب
388+
error = خطأ
389+
rename-confirm = أعد التسمية

i18n/ca/cosmic_files.ftl

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cosmic-files = Fitxers del COSMIC
22
empty-folder = Carpeta buida
3-
empty-folder-hidden = Carpeta buida ( elements ocults)
3+
empty-folder-hidden = Carpeta buida (conté elements ocults)
44
no-results = No s'ha trobat cap resultat
55
filesystem = Sistema de fitxers
66
home = Inici
77
networks = Xarxes
8-
notification-in-progress = Hi ha operacions amb fitxers en curs.
8+
notification-in-progress = Operacions de fitxers en curs
99
trash = Paperera
1010
recents = Recents
1111
undo = Desfés
@@ -29,14 +29,14 @@ details = Detalls
2929
dismiss = Descarta el missatge
3030
operations-running =
3131
{ $running } { $running ->
32-
[one] operacion
32+
[one] operació
3333
*[other] operacions
3434
} en curs ({ $percent }%)...
3535
operations-running-finished =
3636
{ $running }{ $running ->
37-
[one] operacion
37+
[one] operació
3838
*[other] operacions
39-
} en curs ({ $percent }%), { $finished } acabat...
39+
} en curs ({ $percent }%), { $finished } acabada/es...
4040
pause = Pausa
4141
resume = Reprèn
4242
@@ -54,7 +54,7 @@ extract-password-required = Cal una contrasenya
5454
## Empty Trash Dialog
5555

5656
empty-trash = Buida la paperera
57-
empty-trash-warning = Voleu suprimir permanentment tots els fitxers de la paperera?
57+
empty-trash-warning = Els elements dins la Paperera s'eliminaran permanentment
5858
5959
## Mount Error Dialog
6060

@@ -64,20 +64,20 @@ mount-error = No es pot accedir a la unitat
6464

6565
create-new-file = Crea un nou fitxer
6666
create-new-folder = Crea una nova carpeta
67-
file-name = Nom del fixer
67+
file-name = Nom del fitxer
6868
folder-name = Nom de la carpeta
69-
file-already-exists = Ja existeix un fitxer amb aquest nom.
70-
folder-already-exists = Ja existeix una carpeta amb aquest nom.
71-
name-hidden = Els noms que comencin amb "." seran ocults.
72-
name-invalid = El nom no pot ser "{ $filename }".
69+
file-already-exists = Ja existeix un fitxer amb aquest nom
70+
folder-already-exists = Ja existeix una carpeta amb aquest nom
71+
name-hidden = Els noms que comencin amb "." s'ocultaran.
72+
name-invalid = El nom no pot ser "{ $filename }"
7373
name-no-slashes = El nom no pot contenir barres.
7474
7575
## Open/Save Dialog
7676

7777
cancel = Cancel·lar
7878
create = Crea
7979
open = Obre
80-
open-file = Obre el fixer
80+
open-file = Obre el fitxer
8181
open-folder = Obre la carpeta
8282
open-in-new-tab = Obre en una pestanya nova
8383
open-in-new-window = Obre en una finestra nova
@@ -353,3 +353,13 @@ sort-oldest-first = Primer més antics
353353
sort-smallest-to-largest = De petit a gran
354354
sort-largest-to-smallest = De gran a petit
355355
run = Executa
356+
extract-to-title = Extreu a una carpeta
357+
empty-trash-title = Voleu buidar la paperera?
358+
extract-to = Extreu a...
359+
delete = Suprimeix
360+
comment = Gestor de fitxers de l'escriptori COSMIC
361+
copy-to-title = Escolliu el destí de la còpia
362+
copy-to-button-label = Copia
363+
move-to-title = Escolliu el destí del trasllat
364+
move-to-button-label = Mou
365+
keywords = Carpeta;Fitxers;Arxius;Gestor;Explorador;

i18n/cs/cosmic_files.ftl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,3 +428,9 @@ context-action-confirm-warning =
428428
}.
429429
run = Spustit
430430
rename-confirm = Přejmenovat
431+
checksum = Kontrolní součet { $kind }
432+
calculate = Vypočítat
433+
error = Chyba
434+
search-application = Hledat podle názvu aplikace
435+
sidebar-label = Popisek v postranním panelu
436+
change-sidebar-label = Změnit popisek v postranním panelu

0 commit comments

Comments
 (0)