Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1745032 in linux (Ubuntu): "AC adapter status not detected on Asus ZenBook UX410UAK" https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032 Bug #1779051 in gnome-control-center (Ubuntu): "/usr/bin/gnome-control-center:11:gtk_container_remove:update_output_settings:on_amplify_changed:g_closure_invoke:signal_emit_unlocked_R" https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1779051 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362226 Synced also vcs with ubuntu -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog index 3c0e09e..3a24f3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) UNRELEASED; urgency=medium + + * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch: + - Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032) + + -- Marco Trevisan (Treviño) <[email protected]> Fri, 25 Jan 2019 01:17:15 +0000 + +gnome-control-center (1:3.28.2-0ubuntu0.18.04.2) bionic; urgency=medium + + * debian/patches/70_allow_sound_above_100.patch: + - Fix crash when settings changed after panel closed (LP: #1779051) + + -- Robert Ancell <[email protected]> Wed, 08 Aug 2018 11:48:27 +1200 + gnome-control-center (1:3.28.2-0ubuntu0.18.04.1) bionic; urgency=medium * New bugfix version (lp: #1780280) diff --git a/debian/patches/70_allow_sound_above_100.patch b/debian/patches/70_allow_sound_above_100.patch index 041cdc2..39a0cef 100644 --- a/debian/patches/70_allow_sound_above_100.patch +++ b/debian/patches/70_allow_sound_above_100.patch @@ -215,3 +215,11 @@ Index: gnome-control-center-3.27.90/panels/sound/gvc-mixer-dialog.c dialog->settings = g_settings_new (KEY_SOUNDS_SCHEMA); g_signal_connect (dialog->settings, "changed::allow-volume-above-100-percent", G_CALLBACK (allow_volume_above_100_percent_cb), dialog); +@@ -1939,6 +2064,7 @@ gvc_mixer_dialog_finalize (GObject *object) + mixer_dialog = GVC_MIXER_DIALOG (object); + + g_return_if_fail (mixer_dialog != NULL); ++ g_clear_object (&mixer_dialog->ubuntu_sound_settings); + g_clear_object (&mixer_dialog->settings); + G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->finalize (object); + } diff --git a/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch new file mode 100644 index 0000000..5df4f40 --- /dev/null +++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch @@ -0,0 +1,256 @@ +From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= <[email protected]> +Date: Sat, 20 Oct 2018 00:34:56 +0200 +Subject: power: Label the PENDING_CHARGING state as "Not Charging" + +The pending-charge state means AC power is on but the battery is not +being charged. This can happen because its charge is above a certain +threshold, to avoid short charging cycles and prolong the battery's +life, or because the PSU is not powerful enough to charge the batteries. + +Instead of lying to the user about something being estimated, we should +simply tell the truth and set the label to "Not Charging". + +Closes: #249. + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032 +Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249 +Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e +Applied-Upstream: yes, 3.31.2 +--- + panels/power/cc-power-panel.c | 10 ++++++++-- + po/de.po | 7 ++++++- + po/el.po | 8 +++++++- + po/eo.po | 7 ++++++- + po/es.po | 7 ++++++- + po/fur.po | 7 ++++++- + po/it.po | 7 ++++++- + po/ja.po | 7 ++++++- + po/sl.po | 7 ++++++- + po/sv.po | 7 ++++++- + po/tr.po | 8 +++++++- + 11 files changed, 70 insertions(+), 12 deletions(-) + +diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c +index f9b67a4..d8c87c7 100644 +--- a/panels/power/cc-power-panel.c ++++ b/panels/power/cc-power-panel.c +@@ -295,7 +295,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time) + switch (state) + { + case UP_DEVICE_STATE_CHARGING: +- case UP_DEVICE_STATE_PENDING_CHARGE: + /* TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" */ + details = g_strdup_printf (_("%s until fully charged"), time_string); + break; +@@ -316,6 +315,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time) + /* TRANSLATORS: primary battery */ + details = g_strdup (_("Fully charged")); + break; ++ case UP_DEVICE_STATE_PENDING_CHARGE: ++ /* TRANSLATORS: primary battery */ ++ details = g_strdup (_("Not charging")); ++ break; + case UP_DEVICE_STATE_EMPTY: + /* TRANSLATORS: primary battery */ + details = g_strdup (_("Empty")); +@@ -331,7 +334,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time) + switch (state) + { + case UP_DEVICE_STATE_CHARGING: +- case UP_DEVICE_STATE_PENDING_CHARGE: + /* TRANSLATORS: primary battery */ + details = g_strdup (_("Charging")); + break; +@@ -344,6 +346,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time) + /* TRANSLATORS: primary battery */ + details = g_strdup (_("Fully charged")); + break; ++ case UP_DEVICE_STATE_PENDING_CHARGE: ++ /* TRANSLATORS: primary battery */ ++ details = g_strdup (_("Not charging")); ++ break; + case UP_DEVICE_STATE_EMPTY: + /* TRANSLATORS: primary battery */ + details = g_strdup (_("Empty")); +diff --git a/po/de.po b/po/de.po +index 78325a2..3954b1e 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -3930,7 +3930,12 @@ msgid "Fully charged" + msgstr "Vollständig geladen" + + #. TRANSLATORS: primary battery +-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "Lädt nicht" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Leer" + +diff --git a/po/el.po b/po/el.po +index a4a1374..c168970 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -3959,7 +3959,13 @@ msgid "Fully charged" + msgstr "Πλήρης φόρτιση" + + #. TRANSLATORS: primary battery +-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++#| msgid "Charging" ++msgid "Not charging" ++msgstr "Δεν φορτίζεται" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Κενό" + +diff --git a/po/eo.po b/po/eo.po +index a13393b..23e6d14 100644 +--- a/po/eo.po ++++ b/po/eo.po +@@ -4052,7 +4052,12 @@ msgstr "%s restanta" + #. TRANSLATORS: primary battery + #: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345 + msgid "Fully charged" +-msgstr "Plene ŝargita" ++msgstr "Tute ŝargita" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "Ne ŝargante" + + #. TRANSLATORS: primary battery + #: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349 +diff --git a/po/es.po b/po/es.po +index b59dcd8..72dc0c3 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -3902,7 +3902,12 @@ msgid "Fully charged" + msgstr "Cargada completamente" + + #. TRANSLATORS: primary battery +-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "No está cargando" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Vacía" + +diff --git a/po/fur.po b/po/fur.po +index e483976..72d0e6c 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -3901,7 +3901,12 @@ msgid "Fully charged" + msgstr "Cjarie" + + #. TRANSLATORS: primary battery +-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "Nol sta cjariant" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Scjarie" + +diff --git a/po/it.po b/po/it.po +index cdbc7b0..abefd0b 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -3936,7 +3936,12 @@ msgstr "In carica" + msgid "Discharging" + msgstr "In scarica" + +-#: panels/power/cc-power-panel.c:464 ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "Non in carica" ++ ++#: panels/power/cc-power-panel.c:465 + msgctxt "Battery name" + msgid "Main" + msgstr "Principale" +diff --git a/po/ja.po b/po/ja.po +index 5f4767f..8858273 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -3904,7 +3904,12 @@ msgid "Fully charged" + msgstr "フル充電" + + #. TRANSLATORS: primary battery +-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "放電中" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "空" + +diff --git a/po/sl.po b/po/sl.po +index ba5f934..3b37d9c 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -3922,7 +3922,12 @@ msgid "Fully charged" + msgstr "Polna napolnjenost" + + #. TRANSLATORS: primary battery +-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "Naprava se ne polni" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Prazno" + +diff --git a/po/sv.po b/po/sv.po +index d8f4138..5951a70 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -3891,7 +3891,12 @@ msgid "Fully charged" + msgstr "Fullt uppladdad" + + #. TRANSLATORS: primary battery +-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++msgid "Not charging" ++msgstr "Laddar inte" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Tom" + +diff --git a/po/tr.po b/po/tr.po +index 7ac1573..58d02dd 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -3896,7 +3896,13 @@ msgid "Fully charged" + msgstr "Tamamen dolu" + + #. TRANSLATORS: primary battery +-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349 ++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357 ++#| msgid "Charging" ++msgid "Not charging" ++msgstr "Şarj olmuyor" ++ ++#. TRANSLATORS: primary battery ++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361 + msgid "Empty" + msgstr "Boş" + diff --git a/debian/patches/series b/debian/patches/series index 0bc5fb9..6357c3a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,3 +24,4 @@ auto_quit_after_goa_add.patch 0002-shell-Icon-name-helper-returns-symbolic-name.patch 0003-thunderbolt-new-panel-for-device-management.patch 0004-thunderbolt-move-to-the-Devices-page.patch +power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
-- ubuntu-desktop mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
