Merge branch 'pop-os:master' into master

pop-os · Jan 20, 2025 · a2e03b7 · a2e03b7
2 parents 060953a + 647d238
commit a2e03b7
Show file tree

Hide file tree

Showing 21 changed files with 887 additions and 727 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,14 +32,14 @@ i18n-embed = { version = "0.14.1", features = [
 i18n-embed-fl = "0.8.0"
 rust-embed = "8.4.0"
 glob = "0.3.0"
-freedesktop-desktop-entry = "0.5.2"
+freedesktop-desktop-entry = "0.7.5"
 shlex = "1.1.0"
 serde = { version = "1.0.134", features = ["derive"] }
 ron = "0.8.0"
 notify = "*"
 anyhow = "1.0"
 itertools = "0.13"
-freedesktop-icons = "0.2.4"
+freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
 current_locale = "0.1.1"
 url = "2.4"
 nix = "0.28"
@@ -50,6 +50,9 @@ cosmic-app-list-config = { git = "https://github.com/pop-os/cosmic-applets" }
 [profile.release]
 lto = "thin"
 
+[patch."https://github.com/smithay/client-toolkit.git"]
+sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }
+
 # [patch."https://github.com/pop-os/libcosmic"]
 # libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "notifications-card" }
 # cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "notifications-card" }

diff --git a/i18n/ar/cosmic_app_library.ftl b/i18n/ar/cosmic_app_library.ftl
@@ -0,0 +1,28 @@
+cosmic-app-library = مكتبة تطبيقات كُوزمِك
+cosmic-library-home = الصفحة الرئيسية لمكتبة كُوزمِك
+cosmic-office = كُوزمِك أوفيس
+cosmic-system = نظام كُوزمِك
+cosmic-utilities = أدوات كُوزمِك
+new-group = إنشاء مجموعة
+name = الاسم
+ok = موافق
+save = حفظ
+cancel = إلغاء
+search-placeholder = ...اكتب للبحث عن التطبيقات
+new-group-placeholder = اسم المجموعة
+pin-to-app-tray = تثبيت في شريط التطبيقات
+run = تشغيل
+run-on = {$gpu} تشغيل على
+run-on-default = (المبدئي)
+remove = نقل إلى الصفحة الرئيسية للمكتبة
+create-new = إنشاء جديد
+add-group = إضافة مجموعة
+delete = حذف
+rename = إعادة تسمية
+delete-folder = حذف المجلد؟
+    .msg = .سيؤدي حذف هذا المجلد إلى نقل رموز التطبيقات إلى الصفحة الرئيسية للمكتبة
+flatpak = فلاتباك
+snap = سناب
+system = النظام
+local = محلي
+nix = نيكس
diff --git a/i18n/de/cosmic_app_library.ftl b/i18n/de/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Cosmic App Library
+cosmic-app-library = COSMIC App Library
 cosmic-library-home = Bibliothek-Startseite
 cosmic-office = Büro
 cosmic-system = System

diff --git a/i18n/en/cosmic_app_library.ftl b/i18n/en/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Cosmic App Library
+cosmic-app-library = COSMIC App Library
 cosmic-library-home = Library Home
 cosmic-office = Office
 cosmic-system = System

diff --git a/i18n/es-419/cosmic_app_library.ftl b/i18n/es-419/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Biblioteca de aplicaciones de Cosmic
+cosmic-app-library = Biblioteca de aplicaciones de COSMIC
 cosmic-library-home = Inicio de la biblioteca
 cosmic-office = Oficina
 cosmic-system = Sistema

diff --git a/i18n/es/cosmic_app_library.ftl b/i18n/es/cosmic_app_library.ftl
@@ -1,7 +1,28 @@
-cosmic-app-library = Bibliotea de Aplicaciones Cosmic
+cosmic-app-library = Biblioteca de Aplicaciones COSMIC
+cosmic-library-home = Carpeta principal
+cosmic-office = Oficio
 cosmic-system = Sistema
 cosmic-utilities = Utilidades
-new-group = Nuevo Grupo
+new-group = Nuevo grupo
 name = Nombre
-ok = Ok
+ok = Vale
+save = Guardar
 cancel = Cancelar
+search-placeholder = Tecle para buscar aplicaciones...
+new-group-placeholder = Nombre de la carpeta
+pin-to-app-tray = Fijar a la bandeja
+run = Ejecutar
+run-on = Ejecutar en {$gpu}
+run-on-default = (por defecto)
+remove = Mover a la carpeta principal
+create-new = Crear nueva carpeta
+add-group = Añadir grupo
+delete = Borrar
+rename = Renombrar
+delete-folder = ¿Borrar carpeta?
+    .msg = Borrar esta carpeta moverá los íconos de aplicación a la carpeta principal.
+flatpak = Flatpak
+snap = Snap
+system = Sistema
+local = Local
+nix = Nix
diff --git a/i18n/fa/cosmic_app_library.ftl b/i18n/fa/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = کتابخانه برنامه Cosmic
+cosmic-app-library = کتابخانه برنامه COSMIC
 cosmic-library-home = خانه کتابخانه
 cosmic-office = آفیس
 cosmic-system = سیستم

diff --git a/i18n/fr/cosmic_app_library.ftl b/i18n/fr/cosmic_app_library.ftl
@@ -1,22 +1,22 @@
-cosmic-app-library = Logithèque COSMIC
-cosmic-library-home = Accueil de la logithèque
-cosmic-office = Bureau
+cosmic-app-library = Librairie d'application COSMIC
+cosmic-library-home = Accueil
+cosmic-office = Office
 cosmic-system = Système
 cosmic-utilities = Utilitaires
 new-group = Nouveau groupe
 name = Nom
 ok = Ok
 save = Enregistrer
 cancel = Annuler
-search-placeholder = Tapez pour rechercher des applications...
+search-placeholder = Taper pour rechercher des applications...
 new-group-placeholder = Nom du dossier
-pin-to-app-tray = Épingler à la barre des tâches
-run = Exécuter
-run-on = Exécuter sur {$gpu}
+pin-to-app-tray = Épingler à la barre des applis
+run = Lancer
+run-on = Lancer avec {$gpu}
 run-on-default = (Par défaut)
-remove = Déplacer vers l'accueil de la logithèque
+remove = Déplacer dans le dossier d'accueil
 create-new = Créer un nouveau dossier
-add-group = Ajouter un groupe
+add-group = Nouveau groupe
 delete = Supprimer
 rename = Renommer
 delete-folder = Supprimer le dossier ?

diff --git a/i18n/hu/cosmic_app_library.ftl b/i18n/hu/cosmic_app_library.ftl
@@ -1,8 +1,8 @@
-cosmic-app-library = Cosmic Applikácíó könyvtár
+cosmic-app-library = COSMIC Applikácíó könyvtár
 cosmic-library-home = Könyvtár Kezdőlap
 cosmic-office = Office
 cosmic-system = Rendszer
-cosmic-utilities =  Segédprogramok 
+cosmic-utilities =  Segédprogramok
 new-group = Mappa készítése
 name = Név
 ok = Ok
@@ -24,4 +24,4 @@ flatpak = Flatpak
 snap = Snap
 system = Rendszer
 local = Helyi
-nix = Nix
+nix = Nix
diff --git a/i18n/ja/cosmic_app_library.ftl b/i18n/ja/cosmic_app_library.ftl
@@ -0,0 +1,28 @@
+cosmic-app-library = COSMICアプリライブラリ
+cosmic-library-home = ライブラリホーム
+cosmic-office = オフィス
+cosmic-system = システム
+cosmic-utilities = ユティリティ
+new-group = フォルダ
+name = 名前
+ok = OK
+save = 保存
+cancel = キャンセル
+search-placeholder = アプリを検索するために入力して下さい...
+new-group-placeholder = フォルダ名
+pin-to-app-tray = アプリトレーにピン留めする
+run = 実行
+run-on = {$gpu}で実行
+run-on-default =（デフォルト）
+remove = ライブラリホームに移動
+create-new = 新しいフォルダを作成
+add-group = グループを追加
+delete = 削除
+rename = 名前を変更
+delete-folder = フォルダを削除しますか？
+    .msg = このフォルダを削除すると、アプリケーションのアイコンはライブラリホームに移動されます。
+flatpak = Flatpak
+snap = Snap
+system = システム
+local = ローカル
+nix = Nix
diff --git a/i18n/pl/cosmic_app_library.ftl b/i18n/pl/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Biblioteka Aplikacji Cosmic
+cosmic-app-library = Biblioteka Aplikacji COSMIC
 cosmic-library-home = Strona Domowa Biblioteki
 cosmic-office = Biuro
 cosmic-system = System

diff --git a/i18n/pt-BR/cosmic_app_library.ftl b/i18n/pt-BR/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Biblioteca de Aplicativos Cosmic
+cosmic-app-library = Biblioteca de Aplicativos COSMIC
 cosmic-library-home = Aplicativos
 cosmic-office = Escritório
 cosmic-system = Sistema

diff --git a/i18n/pt/cosmic_app_library.ftl b/i18n/pt/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Biblioteca de Aplicações Cosmic
+cosmic-app-library = Biblioteca de Aplicações COSMIC
 cosmic-library-home = Biblioteca Principal
 cosmic-office = Escritório
 cosmic-system = Sistema

diff --git a/i18n/ru/cosmic_app_library.ftl b/i18n/ru/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Библиотека приложений Cosmic
+cosmic-app-library = Библиотека приложений COSMIC
 cosmic-library-home = Главная
 cosmic-office = Офис
 cosmic-system = Система
@@ -23,4 +23,4 @@ flatpak = Flatpak
 snap = Snap
 system = Системное
 local = Локальное
-nix = Nix
+nix = Nix
diff --git a/i18n/sv/cosmic_app_library.ftl b/i18n/sv/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-osmic-app-library = Cosmic App Bibliotek
+osmic-app-library = COSMIC App Bibliotek
 cosmic-library-home = Bibliotek Hem
 cosmic-office = Kontor
 cosmic-system = System

diff --git a/i18n/tr/cosmic_app_library.ftl b/i18n/tr/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Cosmic Uygulama Kitaplığı
+cosmic-app-library = COSMIC Uygulama Kitaplığı
 cosmic-library-home = Ana Sayfa
 cosmic-office = Ofis
 cosmic-system = Sistem

diff --git a/i18n/uk/cosmic_app_library.ftl b/i18n/uk/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Бібліотека застосунків Cosmic
+cosmic-app-library = Бібліотека застосунків COSMIC
 cosmic-library-home = Домівка бібліотеки
 cosmic-office = Офіс
 cosmic-system = Система

diff --git a/i18n/zh-CN/cosmic_app_library.ftl b/i18n/zh-CN/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Cosmic 应用库
+cosmic-app-library = COSMIC 应用库
 cosmic-library-home = 应用库首页
 cosmic-system = 系统
 cosmic-utilities = 社区

diff --git a/i18n/zh-TW/cosmic_app_library.ftl b/i18n/zh-TW/cosmic_app_library.ftl
@@ -1,4 +1,4 @@
-cosmic-app-library = Cosmic 應用程式庫
+cosmic-app-library = COSMIC 應用程式庫
 cosmic-library-home = 主頁
 cosmic-office = 辦公
 cosmic-system = 系統
@@ -25,4 +25,4 @@ flatpak = Flatpak
 snap = Snap
 system = 系統
 local = 本地
-nix = Nix
+nix = Nix