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

Proposed by Marco Trevisan (Treviño) on 2019-01-25
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: c29c02c8013adce360628d7847c8c78285620309
Proposed branch: ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Diff against target: 284 lines (+262/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch (+254/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Sebastien Bacher 2019-01-25 Approve on 2019-01-25
Iain Lane 2019-01-25 Pending
Review via email: mp+362225@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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) wrote :

we took the same commit in debian

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index d452e13..60439e4 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+gnome-control-center (1:3.30.2-3ubuntu2) UNRELEASED; urgency=medium
7+
8+ * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
9+ - Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032)
10+
11+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 25 Jan 2019 00:53:03 +0000
12+
13 gnome-control-center (1:3.30.2-3ubuntu1) disco; urgency=medium
14
15 * Merge with debian unstable. Remaining changes:
16diff --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
17new file mode 100644
18index 0000000..c7a2bab
19--- /dev/null
20+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
21@@ -0,0 +1,254 @@
22+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= <jprvita@endlessm.com>
23+Date: Sat, 20 Oct 2018 00:34:56 +0200
24+Subject: power: Label the PENDING_CHARGING state as "Not Charging"
25+
26+The pending-charge state means AC power is on but the battery is not
27+being charged. This can happen because its charge is above a certain
28+threshold, to avoid short charging cycles and prolong the battery's
29+life, or because the PSU is not powerful enough to charge the batteries.
30+
31+Instead of lying to the user about something being estimated, we should
32+simply tell the truth and set the label to "Not Charging".
33+
34+Closes: #249.
35+
36+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
37+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249
38+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e
39+Applied-Upstream: yes, 3.31.2
40+---
41+ panels/power/cc-power-panel.c | 10 ++++++++--
42+ po/de.po | 7 ++++++-
43+ po/el.po | 8 +++++++-
44+ po/eo.po | 7 ++++++-
45+ po/es.po | 7 ++++++-
46+ po/fur.po | 7 ++++++-
47+ po/it.po | 5 +++++
48+ po/ja.po | 7 ++++++-
49+ po/sl.po | 7 ++++++-
50+ po/sv.po | 7 ++++++-
51+ po/tr.po | 8 +++++++-
52+ 11 files changed, 69 insertions(+), 11 deletions(-)
53+
54+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
55+index 298c2bf..882d469 100644
56+--- a/panels/power/cc-power-panel.c
57++++ b/panels/power/cc-power-panel.c
58+@@ -302,7 +302,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
59+ switch (state)
60+ {
61+ case UP_DEVICE_STATE_CHARGING:
62+- case UP_DEVICE_STATE_PENDING_CHARGE:
63+ /* TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" */
64+ details = g_strdup_printf (_("%s until fully charged"), time_string);
65+ break;
66+@@ -323,6 +322,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
67+ /* TRANSLATORS: primary battery */
68+ details = g_strdup (_("Fully charged"));
69+ break;
70++ case UP_DEVICE_STATE_PENDING_CHARGE:
71++ /* TRANSLATORS: primary battery */
72++ details = g_strdup (_("Not charging"));
73++ break;
74+ case UP_DEVICE_STATE_EMPTY:
75+ /* TRANSLATORS: primary battery */
76+ details = g_strdup (_("Empty"));
77+@@ -337,7 +340,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
78+ switch (state)
79+ {
80+ case UP_DEVICE_STATE_CHARGING:
81+- case UP_DEVICE_STATE_PENDING_CHARGE:
82+ /* TRANSLATORS: primary battery */
83+ details = g_strdup (_("Charging"));
84+ break;
85+@@ -350,6 +352,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
86+ /* TRANSLATORS: primary battery */
87+ details = g_strdup (_("Fully charged"));
88+ break;
89++ case UP_DEVICE_STATE_PENDING_CHARGE:
90++ /* TRANSLATORS: primary battery */
91++ details = g_strdup (_("Not charging"));
92++ break;
93+ case UP_DEVICE_STATE_EMPTY:
94+ /* TRANSLATORS: primary battery */
95+ details = g_strdup (_("Empty"));
96+diff --git a/po/de.po b/po/de.po
97+index 852bd20..139320c 100644
98+--- a/po/de.po
99++++ b/po/de.po
100+@@ -3961,7 +3961,12 @@ msgid "Fully charged"
101+ msgstr "Vollständig geladen"
102+
103+ #. TRANSLATORS: primary battery
104+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
105++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
106++msgid "Not charging"
107++msgstr "Lädt nicht"
108++
109++#. TRANSLATORS: primary battery
110++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
111+ msgid "Empty"
112+ msgstr "Leer"
113+
114+diff --git a/po/el.po b/po/el.po
115+index bd118c9..d68d648 100644
116+--- a/po/el.po
117++++ b/po/el.po
118+@@ -4008,7 +4008,13 @@ msgid "Fully charged"
119+ msgstr "Πλήρης φόρτιση"
120+
121+ #. TRANSLATORS: primary battery
122+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
123++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
124++#| msgid "Charging"
125++msgid "Not charging"
126++msgstr "Δεν φορτίζεται"
127++
128++#. TRANSLATORS: primary battery
129++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
130+ msgid "Empty"
131+ msgstr "Κενό"
132+
133+diff --git a/po/eo.po b/po/eo.po
134+index 325639b..d5840ce 100644
135+--- a/po/eo.po
136++++ b/po/eo.po
137+@@ -3908,7 +3908,12 @@ msgid "Fully charged"
138+ msgstr "Tute ŝargita"
139+
140+ #. TRANSLATORS: primary battery
141+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
142++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
143++msgid "Not charging"
144++msgstr "Ne ŝargante"
145++
146++#. TRANSLATORS: primary battery
147++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
148+ msgid "Empty"
149+ msgstr "Malplena"
150+
151+diff --git a/po/es.po b/po/es.po
152+index 72f997a..06e1649 100644
153+--- a/po/es.po
154++++ b/po/es.po
155+@@ -3942,7 +3942,12 @@ msgid "Fully charged"
156+ msgstr "Cargada completamente"
157+
158+ #. TRANSLATORS: primary battery
159+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
160++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
161++msgid "Not charging"
162++msgstr "No está cargando"
163++
164++#. TRANSLATORS: primary battery
165++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
166+ msgid "Empty"
167+ msgstr "Vacía"
168+
169+diff --git a/po/fur.po b/po/fur.po
170+index df0d5be..c43acde 100644
171+--- a/po/fur.po
172++++ b/po/fur.po
173+@@ -3929,7 +3929,12 @@ msgid "Fully charged"
174+ msgstr "Cjarie"
175+
176+ #. TRANSLATORS: primary battery
177+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
178++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
179++msgid "Not charging"
180++msgstr "Nol sta cjariant"
181++
182++#. TRANSLATORS: primary battery
183++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
184+ msgid "Empty"
185+ msgstr "Scjarie"
186+
187+diff --git a/po/it.po b/po/it.po
188+index e5e65cd..6829451 100644
189+--- a/po/it.po
190++++ b/po/it.po
191+@@ -3964,6 +3964,11 @@ msgstr "In carica"
192+ msgid "Discharging"
193+ msgstr "In scarica"
194+
195++#. TRANSLATORS: primary battery
196++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
197++msgid "Not charging"
198++msgstr "Non in carica"
199++
200+ #: panels/power/cc-power-panel.c:465
201+ msgctxt "Battery name"
202+ msgid "Main"
203+diff --git a/po/ja.po b/po/ja.po
204+index 5f4767f..8858273 100644
205+--- a/po/ja.po
206++++ b/po/ja.po
207+@@ -3904,7 +3904,12 @@ msgid "Fully charged"
208+ msgstr "フル充電"
209+
210+ #. TRANSLATORS: primary battery
211+-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
212++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
213++msgid "Not charging"
214++msgstr "放電中"
215++
216++#. TRANSLATORS: primary battery
217++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
218+ msgid "Empty"
219+ msgstr "空"
220+
221+diff --git a/po/sl.po b/po/sl.po
222+index 30c82b6..c42fac3 100644
223+--- a/po/sl.po
224++++ b/po/sl.po
225+@@ -3935,7 +3935,12 @@ msgid "Fully charged"
226+ msgstr "Polna napolnjenost"
227+
228+ #. TRANSLATORS: primary battery
229+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
230++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
231++msgid "Not charging"
232++msgstr "Naprava se ne polni"
233++
234++#. TRANSLATORS: primary battery
235++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
236+ msgid "Empty"
237+ msgstr "Prazno"
238+
239+diff --git a/po/sv.po b/po/sv.po
240+index 7ae4f78..b11ef43 100644
241+--- a/po/sv.po
242++++ b/po/sv.po
243+@@ -3919,7 +3919,12 @@ msgid "Fully charged"
244+ msgstr "Fullt uppladdad"
245+
246+ #. TRANSLATORS: primary battery
247+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
248++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
249++msgid "Not charging"
250++msgstr "Laddar inte"
251++
252++#. TRANSLATORS: primary battery
253++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
254+ msgid "Empty"
255+ msgstr "Tom"
256+
257+diff --git a/po/tr.po b/po/tr.po
258+index 593195b..7aac665 100644
259+--- a/po/tr.po
260++++ b/po/tr.po
261+@@ -3909,7 +3909,13 @@ msgid "Fully charged"
262+ msgstr "Tümüyle dolu"
263+
264+ #. TRANSLATORS: primary battery
265+-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
266++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
267++#| msgid "Charging"
268++msgid "Not charging"
269++msgstr "Şarj olmuyor"
270++
271++#. TRANSLATORS: primary battery
272++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
273+ msgid "Empty"
274+ msgstr "Boş"
275+
276diff --git a/debian/patches/series b/debian/patches/series
277index 60c843b..28912f0 100644
278--- a/debian/patches/series
279+++ b/debian/patches/series
280@@ -26,3 +26,4 @@ ubuntu-legacy-notifications.patch
281 connectivity-switch.patch
282 privacy-panel-whoopsie.patch
283 auto_quit_after_goa_add.patch
284+power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch

Subscribers

People subscribed via source and target branches