Ubuntu
gnome-control-center package

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

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

Subscribers

People subscribed via source and target branches