Merge tag 'epoch-1.8.0' into yoda-dock-magnification

Epoch 1.8.0

# Conflicts:
#	Cargo.lock

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!(
+        let (alias, name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
-            device
+            device.alias().map(|res| res.ok()),
-                .name()
+            device.name().map(|res| res.ok().flatten()),
-                .map(|res| res.ok().flatten().unwrap_or(device.address().to_string())),
             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()))
         );
-
+        let address_string = device.address().to_string();
-        if name.is_empty() {
+        let name = alias
-            name = device.address().to_string();
+            .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,
+    ActiveConnection, ActiveConnectionState, ConnectByUuidConfig, ConnectType, ConnectivityState,
-    NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
+    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 = Κουμπί γραμμής εκκίνησης
-cosmic-panel-launcher-button-comment = Άνοιγμα του μενού εκκίνησης για αναζήτηση εφαρμογών και εκτέλεση εντολών
+cosmic-panel-launcher-button-comment = Άνοιγμα της γραμμής εκκίνησης για αναζήτηση εφαρμογών και εκτέλεση εντολών
 cosmic-panel-launcher-button-keywords = Μικροεφαρμογή;Μενού;Εκκίνηση;Εκτέλεση;COSMIC;Applet;Launcher;Runner;
 cosmic-panel-workspaces-button-comment = Άνοιγμα των χώρων εργασίας για διαχείριση και εναλλαγή χώρων εργασίας