chore: fige Cargo.lock

Epoch 1.8.0

# Conflicts:
#	Cargo.lock

Cargo.lock

@@ -1855,7 +1855,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2012,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2385,7 +2385,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.5",
 ]
 
 [[package]]
@@ -3742,7 +3742,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4257,9 +4257,9 @@ dependencies = [
 
 [[package]]
 name = "nmrs"
-version = "3.4.0"
+version = "3.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62c427203beda58ac05815b356d64a34eeb2fba180b3077d543ebb1472fc1269"
+checksum = "aa84a0ad51eda83c8817099a0b613847599c712d049e89d892cca53ed6c4a337"
 dependencies = [
  "async-trait",
  "base64",
@@ -4317,7 +4317,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5443,7 +5443,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5838,7 +5838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5971,9 +5971,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.3"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6025,10 +6025,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6389,7 +6389,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -7021,7 +7021,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -7911,7 +7911,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.5",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -8165,7 +8165,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.5",
  "zvariant_utils",
 ]
 
@@ -8178,14 +8178,14 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 3.0.3",
+ "syn 3.0.5",
  "winnow",
 ]
 
-[[patch.unused]]
-name = "cosmic-settings-airplane-mode-subscription"
-version = "1.7.0"
-
 [[patch.unused]]
 name = "winit-x11"
 version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "cosmic-settings-airplane-mode-subscription"
+version = "1.7.0"

cosmic-app-list/i18n/ru/cosmic_app_list.ftl

@@ -3,6 +3,6 @@ pin = Закрепить на панели приложений
 quit = Завершить
 quit-all = Завершить все
 new-window = Новое окно
-run = Выполнить
+run = Запустить
 run-on = Запустить на { $gpu }
 run-on-default = (По умолчанию)

cosmic-applet-audio/src/lib.rs

@@ -439,7 +439,7 @@ impl cosmic::Application for Audio {
                         tokio::time::sleep(Duration::from_millis(128)).await;
                         _ = client
                             .conn
-                            .set_sink_volume(volume.load(atomic::Ordering::Relaxed))
+                            .set_source_volume(volume.load(atomic::Ordering::Relaxed))
                             .await;
                         Message::ReattachClient(Arc::new(client)).into()
                     });

cosmic-applet-battery/i18n/nl/cosmic_applet_battery.ftl

@@ -1,9 +1,9 @@
 battery = Batterij
-battery-desc = Energiebesparing en lagere prestaties.
+battery-desc = Verminderde prestaties en lager energieverbruik.
 balanced = Gebalanceerd
-balanced-desc = Normale prestaties en batterijverbruik.
+balanced-desc = Normale prestaties en matig energieverbruik.
 performance = Hoge prestaties
-performance-desc = Hoge prestaties en energieverbruik.
+performance-desc = Maximale prestaties en hoger energieverbruik.
 max-charge = Verleng de levensduur van uw batterij door een maximale laadwaarde van 80% in te stellen
 seconds = s
 minutes = m

cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl

@@ -1,4 +1,4 @@
-battery = Economia de energia
+battery = Bateria
 battery-desc = Uso reduzido de energia e desempenho limitado.
 balanced = Balanceado
 balanced-desc = Desempenho padrão e uso de bateria moderado.

cosmic-applet-bluetooth/src/bluetooth.rs

@@ -275,10 +275,9 @@ const DEFAULT_DEVICE_ICON: &str = "bluetooth-symbolic";
 impl BluerDevice {
     #[inline(never)]
     pub async fn from_device(device: &bluer::Device) -> Self {
-        let (mut name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
-            device
-                .name()
-                .map(|res| res.ok().flatten().unwrap_or(device.address().to_string())),
+        let (alias, name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
+            device.alias().map(|res| res.ok()),
+            device.name().map(|res| res.ok().flatten()),
             device.is_paired().map(Result::unwrap_or_default),
             device.is_trusted().map(Result::unwrap_or_default),
             device.is_connected().map(Result::unwrap_or_default),
@@ -287,10 +286,11 @@ impl BluerDevice {
                 .icon()
                 .map(|res| device_type_to_icon(&res.ok().flatten().unwrap_or_default()))
         );
-
-        if name.is_empty() {
-            name = device.address().to_string();
-        }
+        let address_string = device.address().to_string();
+        let name = alias
+            .filter(|name| !name.is_empty() && *name != address_string.replace(':', "-"))
+            .or(name.filter(|name| !name.is_empty()))
+            .unwrap_or(address_string);
 
         let status = if is_connected {
             BluerDeviceStatus::Connected

cosmic-applet-network/Cargo.toml

@@ -26,4 +26,4 @@ tracing.workspace = true
 indexmap = "2.13.0"
 secure-string = "0.3.0"
 uuid = { version = "1.21.0", features = ["v4"] }
-nmrs = "3.4.0"
+nmrs = "3.5.2"

cosmic-applet-network/src/app.rs

@@ -1,7 +1,7 @@
 use indexmap::IndexMap;
 use nmrs::{
-    ActiveConnection, ActiveConnectionState, ConnectType, ConnectivityState, EapOptions,
-    NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
+    ActiveConnection, ActiveConnectionState, ConnectByUuidConfig, ConnectType, ConnectivityState,
+    EapOptions, NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
     agent::{SecretAgent, SecretAgentCapabilities, SecretRequest, SecretResponder, SecretSetting},
 };
 use rustc_hash::FxHashSet;
@@ -916,7 +916,7 @@ impl CosmicNetworkApplet {
         cosmic::task::future(async move {
             let error = match NmrsManager::new().await {
                 Ok(nm) => nm
-                    .connect_vpn_by_uuid(&uuid)
+                    .connect_by_uuid(&uuid, ConnectByUuidConfig::default())
                     .await
                     .err()
                     .map(|e| format!("activate VPN {uuid}: {e}")),
@@ -1318,7 +1318,7 @@ impl cosmic::Application for CosmicNetworkApplet {
                 let disconnect_task = cosmic::task::future(async move {
                     let error = match NmrsManager::new().await {
                         Ok(nm) => nm
-                            .disconnect_vpn_by_uuid(&uuid)
+                            .disconnect_by_uuid(&uuid)
                             .await
                             .err()
                             .map(|e| format!("disconnect VPN {uuid}: {e}")),

i18n/el/desktop_entries.ftl

@@ -45,7 +45,7 @@ cosmic-applet-tiling-comment = Διαχείριση της ένδειξης εν
 cosmic-applet-tiling-keywords = Μικροεφαρμογή;Παράθεση;Ένδειξη;Χώρος;Εργασίας;COSMIC;Applet;Tiling;Hint;Workspace;
 cosmic-applet-time-comment = Προβολή της τρέχουσας ώρας στη γραμμή συστήματος με αναδυόμενο ημερολόγιο
 cosmic-applet-workspaces-comment = Εναλλαγή μεταξύ των αριθμημένων χώρων εργασίας στη γραμμή συστήματος
-cosmic-panel-launcher-button = Κουμπί μενού εκκίνησης
-cosmic-panel-launcher-button-comment = Άνοιγμα του μενού εκκίνησης για αναζήτηση εφαρμογών και εκτέλεση εντολών
+cosmic-panel-launcher-button = Κουμπί γραμμής εκκίνησης
+cosmic-panel-launcher-button-comment = Άνοιγμα της γραμμής εκκίνησης για αναζήτηση εφαρμογών και εκτέλεση εντολών
 cosmic-panel-launcher-button-keywords = Μικροεφαρμογή;Μενού;Εκκίνηση;Εκτέλεση;COSMIC;Applet;Launcher;Runner;
 cosmic-panel-workspaces-button-comment = Άνοιγμα των χώρων εργασίας για διαχείριση και εναλλαγή χώρων εργασίας