Merge ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master

[Marco Trevisan (Treviño)]

[Sebastien Bacher (seb128)]

Looks like that was merged through Debian, right?
https://launchpad.net/ubuntu/+source/gnome-control-center/1:3.30.2-4ubuntu1

review: Approve

[Iain Lane (laney)]

we took the same commit in debian

diff --git a/debian/changelog b/debian/changelog
index d452e13..60439e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.30.2-3ubuntu2) 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) <[e-mail]>  Fri, 25 Jan 2019 00:53:03 +0000
+
 gnome-control-center (1:3.30.2-3ubuntu1) disco; urgency=medium
 
   * Merge with debian unstable. Remaining changes:
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..c7a2bab
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
@@ -0,0 +1,254 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= <[e-mail]>
+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                      |  5 +++++
+ po/ja.po                      |  7 ++++++-
+ po/sl.po                      |  7 ++++++-
+ po/sv.po                      |  7 ++++++-
+ po/tr.po                      |  8 +++++++-
+ 11 files changed, 69 insertions(+), 11 deletions(-)
+
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index 298c2bf..882d469 100644
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -302,7 +302,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;
+@@ -323,6 +322,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"));
+@@ -337,7 +340,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;
+@@ -350,6 +352,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 852bd20..139320c 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -3961,7 +3961,12 @@ msgid "Fully charged"
+ msgstr "Vollständig geladen"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 bd118c9..d68d648 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -4008,7 +4008,13 @@ msgid "Fully charged"
+ msgstr "Πλήρης φόρτιση"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 325639b..d5840ce 100644
+--- a/po/eo.po
++++ b/po/eo.po
+@@ -3908,7 +3908,12 @@ msgid "Fully charged"
+ msgstr "Tute ŝargita"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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:331 panels/power/cc-power-panel.c:361
+ msgid "Empty"
+ msgstr "Malplena"
+ 
+diff --git a/po/es.po b/po/es.po
+index 72f997a..06e1649 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -3942,7 +3942,12 @@ msgid "Fully charged"
+ msgstr "Cargada completamente"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 df0d5be..c43acde 100644
+--- a/po/fur.po
++++ b/po/fur.po
+@@ -3929,7 +3929,12 @@ msgid "Fully charged"
+ msgstr "Cjarie"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 e5e65cd..6829451 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -3964,6 +3964,11 @@ msgstr "In carica"
+ msgid "Discharging"
+ msgstr "In scarica"
+ 
++#. 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"
+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 30c82b6..c42fac3 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -3935,7 +3935,12 @@ msgid "Fully charged"
+ msgstr "Polna napolnjenost"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 7ae4f78..b11ef43 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -3919,7 +3919,12 @@ msgid "Fully charged"
+ msgstr "Fullt uppladdad"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 593195b..7aac665 100644
+--- a/po/tr.po
++++ b/po/tr.po
+@@ -3909,7 +3909,13 @@ msgid "Fully charged"
+ msgstr "Tümüyle dolu"
+ 
+ #. TRANSLATORS: primary battery
+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
++#: 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 60c843b..28912f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ ubuntu-legacy-notifications.patch
 connectivity-switch.patch
 privacy-panel-whoopsie.patch
 auto_quit_after_goa_add.patch
+power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch