Merge remote-tracking branch 'upstream/master' into yoda-dock-magnification

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	cosmic-app-list/src/app.rs
#	cosmic-applet-audio/src/lib.rs
#	cosmic-applet-input-sources/Cargo.toml
#	cosmic-applet-input-sources/src/lib.rs
#	cosmic-applet-status-area/src/components/app.rs
#	cosmic-panel-button/src/lib.rs

cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl

@@ -0,0 +1,12 @@
+cancel = Annuller
+confirm-pin = Bekræft venligst, at følgende pinkode matcher den, der vises på { $deviceName }
+bluetooth = Bluetooth
+unsuccessful = Parring Mislykkedes
+pairable = Parbare
+try-again = Prøv Igen
+check-device = Sørg for, at { $deviceName } er slået til, inden for rækkevidde og klar til parring.
+other-devices = Andre Bluetooth-enheder
+connected = Forbundet
+confirm = Bekræft
+settings = Bluetooth-indstillinger...
+discoverable = Synlig

cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl

@@ -1,6 +1,6 @@
 bluetooth = Bluetooth
 other-devices = Andere Bluetooth-Geräte
-settings = Bluetooth-Einstellungen...
+settings = Bluetooth-Einstellungen ...
 connected = Verbunden
 confirm-pin = Bitte bestätige, dass die folgende PIN mit der auf { $deviceName } angezeigten PIN übereinstimmt
 confirm = Bestätigen

cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl

@@ -0,0 +1,12 @@
+cancel = Cancel
+confirm-pin = Please confirm that the following PIN matches the one displayed on { $deviceName }
+bluetooth = Bluetooth
+unsuccessful = Pairing Unsuccessful
+pairable = Pairable
+try-again = Try Again
+check-device = Make sure { $deviceName } is turned on, in range, and is ready to pair.
+other-devices = Other Bluetooth devices
+connected = Connected
+confirm = Confirm
+settings = Bluetooth settings...
+discoverable = Discoverable

cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl

@@ -2,11 +2,11 @@ bluetooth = بلوتوث
 other-devices = سایر دستگاه‌های بلوتوث
 settings = تنظیمات بلوتوث...
 connected = متصل
-confirm-pin = لطفاً تأیید کنید که پین زیر با پین نمایش داده شده در {$deviceName} یکسان است.
+confirm-pin = لطفاً تأیید کنید که پین زیر با پین نمایش داده شده در { $deviceName } یکسان است.
 confirm = تأیید
 cancel = لغو
 unsuccessful = جفت‌سازی ناموفق بود
-check-device = مطمئن شوید که {$deviceName} روشن، در محدوده و آماده جفت‌سازی است.
+check-device = مطمئن شوید که { $deviceName } روشن، در محدوده و آماده جفت‌سازی است.
 try-again = تلاش دوباره
 discoverable = قابل شناسایی
 pairable = قابل جفت‌سازی

cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl

@@ -0,0 +1,12 @@
+cancel = Cancelar
+bluetooth = Bluetooth
+other-devices = Outros dispositivos Bluetooth
+settings = Axustes Bluetooth…
+connected = Conectado
+confirm-pin = Por favor, confirme que o seguinte PIN coincide co que se mostra en{ $deviceName }
+confirm = Confirmar
+unsuccessful = Enparellamento non exitoso
+check-device = Asegurate de que { $deviceName } está acendido, dentro do alcance e listo para emparellar.
+try-again = Reintentar
+discoverable = Atopable
+pairable = Emparellable

cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl

@@ -2,11 +2,11 @@ bluetooth = ब्लूटूथ
 other-devices = अन्य ब्लूटूथ उपकरण
 settings = ब्लूटूथ सेटिंग्स...
 connected = जुड़े हुए
-confirm-pin = कृपया सुनिश्चित करें कि निम्नलिखित PIN {$deviceName} पर प्रदर्शित PIN से मेल खाता है
+confirm-pin = कृपया सुनिश्चित करें कि निम्नलिखित PIN { $deviceName } पर प्रदर्शित PIN से मेल खाता है
 confirm = पुष्टि करें
 cancel = रद्द करें
 unsuccessful = पेयरिंग असफल
-check-device = सुनिश्चित करें कि {$deviceName} चालू है, रेंज में है, और पेयर करने के लिए तैयार है।
+check-device = सुनिश्चित करें कि { $deviceName } चालू है, रेंज में है, और पेयर करने के लिए तैयार है।
 try-again = फिर से प्रयास करें
 discoverable = खोजने योग्य
 pairable = पेयर करने योग्य

cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl

@@ -2,11 +2,11 @@ bluetooth = Bluetooth
 other-devices = Altri dispositivi Bluetooth
 settings = Impostazioni Bluetooth...
 connected = Connesso
-confirm-pin = Per favore conferma che il seguente PIN corrisponda a quello visualizzato nel dispositivo {$deviceName}
+confirm-pin = Per favore conferma che il seguente PIN corrisponda a quello visualizzato nel dispositivo { $deviceName }
 confirm = Conferma
 cancel = Annulla
 unsuccessful = Accoppiamento fallito
-check-device = Assicurati che il dispositivo {$deviceName} sia acceso, a portata e pronto per l'accoppiamento.
+check-device = Assicurati che il dispositivo { $deviceName } sia acceso, a portata e pronto per l'accoppiamento.
 try-again = Riprova
 discoverable = Visibile
-pairable = Accoppiabile
+pairable = Accoppiabile

cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl

@@ -0,0 +1 @@
+cancel = ᱵᱟᱹᱛᱤᱞ

cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl

@@ -1,7 +1,7 @@
 bluetooth = 藍牙
 other-devices = 其他藍牙裝置
 settings = 藍牙設定…
-connected = 已經連線
+connected = 已連線
 confirm-pin = 請確認此 PIN 碼與 { $deviceName } 上顯示的是否相符
 confirm = 確認
 cancel = 取消

cosmic-applet-bluetooth/src/app.rs

@@ -121,20 +121,25 @@ impl cosmic::Application for CosmicBluetoothApplet {
                 } else {
                     set_discovery(true);
 
-                    // TODO request update of state maybe
-                    let new_id = window::Id::unique();
-                    self.popup.replace(new_id);
-
-                    let popup_settings = self.core.applet.get_popup_settings(
-                        self.core.main_window_id().unwrap(),
-                        new_id,
-                        None,
-                        None,
-                        None,
-                    );
+                    let get_popup_task =
+                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
+                            |_| Default::default(),
+                            move |app: &mut Self| {
+                                let new_id = window::Id::unique();
+                                app.popup.replace(new_id);
+                                app.core.applet.get_popup_settings(
+                                    app.core.main_window_id().unwrap(),
+                                    new_id,
+                                    None,
+                                    None,
+                                    None,
+                                )
+                            },
+                            None,
+                        ));
 
                     return Task::batch([
-                        get_popup(popup_settings),
+                        get_popup_task,
                         cosmic::task::future(set_tick(Duration::from_secs(3)))
                             .map(|()| cosmic::Action::App(Message::Ignore)),
                     ]);