Merge lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19 into lp:ubuntu/quantal/psensor
- Quantal (12.10)
- new-upstream-0-6-2-19
- Merge into quantal
Status: | Merged |
---|---|
Merged at revision: | 15 |
Proposed branch: | lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19 |
Merge into: | lp:ubuntu/quantal/psensor |
Diff against target: |
3456 lines (+664/-1032) 36 files modified
.pc/LP1021900.patch/src/lib/psensor.c (+0/-461) .pc/applied-patches (+0/-1) Makefile.in (+64/-42) NEWS (+16/-1) aclocal.m4 (+44/-24) configure (+19/-16) configure.ac (+1/-1) debian/changelog (+12/-0) debian/patches/LP1021900.patch (+0/-26) debian/patches/series (+0/-1) icons/hicolor/14x14/Makefile.in (+19/-10) icons/hicolor/16x16/Makefile.in (+19/-10) icons/hicolor/22x22/Makefile.in (+19/-10) icons/hicolor/24x24/Makefile.in (+19/-10) icons/hicolor/32x32/Makefile.in (+19/-10) icons/hicolor/48x48/Makefile.in (+19/-10) icons/hicolor/64x64/Makefile.in (+19/-10) icons/hicolor/scalable/Makefile.in (+19/-10) icons/ubuntu-mono-dark/apps/22/Makefile.in (+19/-10) icons/ubuntu-mono-dark/status/22/Makefile.in (+19/-10) icons/ubuntu-mono-light/status/22/Makefile.in (+19/-10) po/LINGUAS (+9/-1) po/fr.po (+78/-143) po/psensor.pot (+1/-5) po/tr.po (+5/-24) po/zh_CN.po (+91/-107) src/Makefile.in (+20/-11) src/glade/Makefile.in (+19/-10) src/lib/Makefile.in (+13/-8) src/lib/psensor.c (+2/-2) src/main.c (+8/-8) src/psensor.1 (+1/-1) src/server/Makefile.in (+20/-11) src/server/psensor-server.1 (+1/-1) tests/Makefile.in (+12/-7) www/Makefile.in (+19/-10) |
To merge this branch: | bzr merge lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+122221@code.launchpad.net |
Commit message
* New upstream release
+ fixed hide window on startup for gnome-shell. (Closes: #676361)
+ fixed size of the icon hicolor/
* Removed LP1021900.patch: fixed upstream since 0.6.2.18.
* Remaining changes:
+ Modifed build-dep to add NVidia and Application Indicator support
+ Only add an nvidia-settings build-dep on i386 and amd6
Description of the change
I am submitting this merge following discussion from a previous request: https:/
This branch is upgrading to Psensor version 0.6.2.19.
The mainstream diff between 0.6.2.17 and 0.6.2.19:
- fix https:/
- fix https:/
- fix http://
- added and merged (from LP) several translations files (only .po, no code modification)
LP1021900.patch is removed because it has been fixed upstream since 0.6.2.18.
- 16. By Jean-Philippe Orsini
-
fixed bullet indentation
Preview Diff
1 | === removed directory '.pc/LP1021900.patch' |
2 | === removed directory '.pc/LP1021900.patch/src' |
3 | === removed directory '.pc/LP1021900.patch/src/lib' |
4 | === removed file '.pc/LP1021900.patch/src/lib/psensor.c' |
5 | --- .pc/LP1021900.patch/src/lib/psensor.c 2012-07-07 00:47:44 +0000 |
6 | +++ .pc/LP1021900.patch/src/lib/psensor.c 1970-01-01 00:00:00 +0000 |
7 | @@ -1,461 +0,0 @@ |
8 | -/* |
9 | - * Copyright (C) 2010-2012 jeanfi@gmail.com |
10 | - * |
11 | - * This program is free software; you can redistribute it and/or |
12 | - * modify it under the terms of the GNU General Public License as |
13 | - * published by the Free Software Foundation; either version 2 of the |
14 | - * License, or (at your option) any later version. |
15 | - * |
16 | - * This program is distributed in the hope that it will be useful, but |
17 | - * WITHOUT ANY WARRANTY; without even the implied warranty of |
18 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
19 | - * General Public License for more details. |
20 | - * |
21 | - * You should have received a copy of the GNU General Public License |
22 | - * along with this program; if not, write to the Free Software |
23 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA |
24 | - * 02110-1301 USA |
25 | - */ |
26 | -#include <stdlib.h> |
27 | -#include <string.h> |
28 | - |
29 | -#include <locale.h> |
30 | -#include <libintl.h> |
31 | -#define _(str) gettext(str) |
32 | - |
33 | -#include "hdd.h" |
34 | -#include "psensor.h" |
35 | -#include "lmsensor.h" |
36 | - |
37 | -#ifdef HAVE_GTOP |
38 | -#include "cpu.h" |
39 | -#endif |
40 | - |
41 | - |
42 | -struct psensor *psensor_create(char *id, char *name, |
43 | - unsigned int type, int values_max_length) |
44 | -{ |
45 | - struct psensor *psensor |
46 | - = (struct psensor *)malloc(sizeof(struct psensor)); |
47 | - |
48 | - psensor->id = id; |
49 | - psensor->name = name; |
50 | - psensor->enabled = 1; |
51 | - psensor->min = UNKNOWN_DBL_VALUE; |
52 | - psensor->max = UNKNOWN_DBL_VALUE; |
53 | - |
54 | - psensor->type = type; |
55 | - |
56 | - psensor->values_max_length = values_max_length; |
57 | - psensor->measures = measures_dbl_create(values_max_length); |
58 | - |
59 | - psensor->alarm_limit = 0; |
60 | - |
61 | - psensor->cb_alarm_raised = NULL; |
62 | - psensor->cb_alarm_raised_data = NULL; |
63 | - psensor->alarm_raised = 0; |
64 | - |
65 | - psensor->alarm_enabled = 0; |
66 | - |
67 | - psensor->url = NULL; |
68 | - |
69 | - psensor->color = NULL; |
70 | - |
71 | - return psensor; |
72 | -} |
73 | - |
74 | -void psensor_values_resize(struct psensor *s, int new_size) |
75 | -{ |
76 | - struct measure *new_ms, *cur_ms; |
77 | - int cur_size; |
78 | - |
79 | - cur_size = s->values_max_length; |
80 | - cur_ms = s->measures; |
81 | - new_ms = measures_dbl_create(new_size); |
82 | - |
83 | - if (cur_ms) { |
84 | - int i; |
85 | - for (i = 0; i < new_size - 1 && i < cur_size - 1; i++) |
86 | - measure_copy(&cur_ms[cur_size - i - 1], |
87 | - &new_ms[new_size - i - 1]); |
88 | - |
89 | - measures_free(s->measures); |
90 | - } |
91 | - |
92 | - s->values_max_length = new_size; |
93 | - s->measures = new_ms; |
94 | -} |
95 | - |
96 | -void psensor_free(struct psensor *sensor) |
97 | -{ |
98 | - if (sensor) { |
99 | - free(sensor->name); |
100 | - free(sensor->id); |
101 | - |
102 | - if (sensor->color) |
103 | - free(sensor->color); |
104 | - |
105 | - measures_free(sensor->measures); |
106 | - |
107 | - free(sensor->url); |
108 | - |
109 | - free(sensor); |
110 | - } |
111 | -} |
112 | - |
113 | -void psensor_list_free(struct psensor **sensors) |
114 | -{ |
115 | - struct psensor **sensor_cur; |
116 | - |
117 | - if (sensors) { |
118 | - sensor_cur = sensors; |
119 | - |
120 | - while (*sensor_cur) { |
121 | - psensor_free(*sensor_cur); |
122 | - |
123 | - sensor_cur++; |
124 | - } |
125 | - |
126 | - free(sensors); |
127 | - |
128 | - sensors = NULL; |
129 | - } |
130 | -} |
131 | - |
132 | -int psensor_list_size(struct psensor **sensors) |
133 | -{ |
134 | - int size; |
135 | - struct psensor **sensor_cur; |
136 | - |
137 | - if (!sensors) |
138 | - return 0; |
139 | - |
140 | - size = 0; |
141 | - sensor_cur = sensors; |
142 | - |
143 | - while (*sensor_cur) { |
144 | - size++; |
145 | - sensor_cur++; |
146 | - } |
147 | - return size; |
148 | -} |
149 | - |
150 | -int psensor_list_contains_type(struct psensor **sensors, unsigned int type) |
151 | -{ |
152 | - struct psensor **s; |
153 | - |
154 | - if (!sensors) |
155 | - return 0; |
156 | - |
157 | - s = sensors; |
158 | - while (*s) { |
159 | - if ((*s)->type == type) |
160 | - return 1; |
161 | - s++; |
162 | - } |
163 | - |
164 | - return 0; |
165 | -} |
166 | - |
167 | -struct psensor **psensor_list_add(struct psensor **sensors, |
168 | - struct psensor *sensor) |
169 | -{ |
170 | - int size = psensor_list_size(sensors); |
171 | - |
172 | - struct psensor **result |
173 | - = malloc((size + 1 + 1) * sizeof(struct psensor *)); |
174 | - |
175 | - if (sensors) |
176 | - memcpy(result, sensors, size * sizeof(struct psensor *)); |
177 | - |
178 | - result[size] = sensor; |
179 | - result[size + 1] = NULL; |
180 | - |
181 | - return result; |
182 | -} |
183 | - |
184 | -struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id) |
185 | -{ |
186 | - struct psensor **sensors_cur = sensors; |
187 | - |
188 | - while (*sensors_cur) { |
189 | - if (!strcmp((*sensors_cur)->id, id)) |
190 | - return *sensors_cur; |
191 | - |
192 | - sensors_cur++; |
193 | - } |
194 | - |
195 | - return NULL; |
196 | -} |
197 | - |
198 | -int is_temp_type(unsigned int type) |
199 | -{ |
200 | - return type & SENSOR_TYPE_TEMP; |
201 | -} |
202 | - |
203 | -int is_fan_type(unsigned int type) |
204 | -{ |
205 | - return type & SENSOR_TYPE_FAN; |
206 | -} |
207 | - |
208 | -char *psensor_value_to_string(unsigned int type, double value) |
209 | -{ |
210 | - /* should not be possible to exceed 20 characters with temp or |
211 | - rpm values the .x part is never displayed */ |
212 | - char *str = malloc(20); |
213 | - |
214 | - char *unit; |
215 | - |
216 | - if (is_temp_type(type)) |
217 | - unit = "C"; |
218 | - else if (type & SENSOR_TYPE_CPU_USAGE) |
219 | - unit = "%"; |
220 | - else |
221 | - unit = ""; |
222 | - |
223 | - sprintf(str, "%.0f%s", value, unit); |
224 | - |
225 | - return str; |
226 | -} |
227 | - |
228 | -void psensor_set_current_value(struct psensor *sensor, double value) |
229 | -{ |
230 | - struct timeval tv; |
231 | - |
232 | - if (gettimeofday(&tv, NULL) != 0) |
233 | - timerclear(&tv); |
234 | - |
235 | - psensor_set_current_measure(sensor, value, tv); |
236 | -} |
237 | - |
238 | -void |
239 | -psensor_set_current_measure(struct psensor *s, |
240 | - double v, struct timeval tv) |
241 | -{ |
242 | - memmove(s->measures, |
243 | - &s->measures[1], |
244 | - (s->values_max_length - 1) * sizeof(struct measure)); |
245 | - |
246 | - s->measures[s->values_max_length - 1].value.d_num = v; |
247 | - s->measures[s->values_max_length - 1].time = tv; |
248 | - |
249 | - if (s->min == UNKNOWN_DBL_VALUE || v < s->min) |
250 | - s->min = v; |
251 | - |
252 | - if (s->max == UNKNOWN_DBL_VALUE || v > s->max) |
253 | - s->max = v; |
254 | - |
255 | - if (s->alarm_limit && s->alarm_enabled) { |
256 | - if (v > s->alarm_limit) { |
257 | - if (!s->alarm_raised && s->cb_alarm_raised) |
258 | - s->cb_alarm_raised(s, |
259 | - s->cb_alarm_raised_data); |
260 | - |
261 | - s->alarm_raised = 1; |
262 | - } else { |
263 | - s->alarm_raised = 0; |
264 | - } |
265 | - } |
266 | -} |
267 | - |
268 | -double psensor_get_current_value(struct psensor *sensor) |
269 | -{ |
270 | - return sensor->measures[sensor->values_max_length - 1].value.d_num; |
271 | -} |
272 | - |
273 | -struct measure *psensor_get_current_measure(struct psensor *sensor) |
274 | -{ |
275 | - return &sensor->measures[sensor->values_max_length - 1]; |
276 | -} |
277 | - |
278 | -/* |
279 | - Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or |
280 | - SENSOR_TYPE_FAN) |
281 | - */ |
282 | -double get_min_value(struct psensor **sensors, int type) |
283 | -{ |
284 | - double m = UNKNOWN_DBL_VALUE; |
285 | - struct psensor **s = sensors; |
286 | - |
287 | - while (*s) { |
288 | - struct psensor *sensor = *s; |
289 | - |
290 | - if (sensor->enabled && (sensor->type & type)) { |
291 | - int i; |
292 | - double t; |
293 | - |
294 | - for (i = 0; i < sensor->values_max_length; i++) { |
295 | - t = sensor->measures[i].value.d_num; |
296 | - |
297 | - if (t == UNKNOWN_DBL_VALUE) |
298 | - continue; |
299 | - |
300 | - if (m == UNKNOWN_DBL_VALUE || t < m) |
301 | - m = t; |
302 | - } |
303 | - } |
304 | - s++; |
305 | - } |
306 | - |
307 | - return m; |
308 | -} |
309 | - |
310 | -/* |
311 | - Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or |
312 | - SENSOR_TYPE_FAN) |
313 | - */ |
314 | -double get_max_value(struct psensor **sensors, int type) |
315 | -{ |
316 | - double m = UNKNOWN_DBL_VALUE; |
317 | - struct psensor **s = sensors; |
318 | - |
319 | - while (*s) { |
320 | - struct psensor *sensor = *s; |
321 | - |
322 | - if (sensor->enabled && (sensor->type & type)) { |
323 | - int i; |
324 | - double t; |
325 | - for (i = 0; i < sensor->values_max_length; i++) { |
326 | - t = sensor->measures[i].value.d_num; |
327 | - |
328 | - if (t == UNKNOWN_DBL_VALUE) |
329 | - continue; |
330 | - |
331 | - if (m == UNKNOWN_DBL_VALUE || t > m) |
332 | - m = t; |
333 | - } |
334 | - } |
335 | - s++; |
336 | - } |
337 | - |
338 | - return m; |
339 | -} |
340 | - |
341 | -double |
342 | -psensor_get_max_current_value(struct psensor **sensors, unsigned int type) |
343 | -{ |
344 | - double m = UNKNOWN_DBL_VALUE; |
345 | - struct psensor **s_cur = sensors; |
346 | - |
347 | - while (*s_cur) { |
348 | - struct psensor *s = *s_cur; |
349 | - |
350 | - if (s->enabled && (s->type & type)) { |
351 | - double v = psensor_get_current_value(s); |
352 | - |
353 | - if (m == UNKNOWN_DBL_VALUE || v > m) |
354 | - m = v; |
355 | - } |
356 | - |
357 | - s_cur++; |
358 | - } |
359 | - |
360 | - return m; |
361 | -} |
362 | - |
363 | -double get_min_temp(struct psensor **sensors) |
364 | -{ |
365 | - return get_min_value(sensors, SENSOR_TYPE_TEMP); |
366 | -} |
367 | - |
368 | -double get_min_rpm(struct psensor **sensors) |
369 | -{ |
370 | - return get_min_value(sensors, SENSOR_TYPE_FAN); |
371 | -} |
372 | - |
373 | -double get_max_rpm(struct psensor **sensors) |
374 | -{ |
375 | - return get_max_value(sensors, SENSOR_TYPE_FAN); |
376 | -} |
377 | - |
378 | -double get_max_temp(struct psensor **sensors) |
379 | -{ |
380 | - return get_max_value(sensors, SENSOR_TYPE_TEMP); |
381 | -} |
382 | - |
383 | -struct psensor **get_all_sensors(int values_max_length) |
384 | -{ |
385 | - struct psensor **psensors = NULL; |
386 | - struct psensor **tmp_psensors; |
387 | - |
388 | - psensors = lmsensor_psensor_list_add(NULL, values_max_length); |
389 | - |
390 | - tmp_psensors = hdd_psensor_list_add(psensors, values_max_length); |
391 | - if (tmp_psensors != psensors) { |
392 | - free(psensors); |
393 | - psensors = tmp_psensors; |
394 | - } |
395 | - |
396 | - if (!psensors) { /* there is no detected sensors */ |
397 | - psensors = malloc(sizeof(struct psensor *)); |
398 | - *psensors = NULL; |
399 | - } |
400 | - |
401 | - return psensors; |
402 | -} |
403 | - |
404 | -const char *psensor_type_to_str(unsigned int type) |
405 | -{ |
406 | - if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP) |
407 | - return "NVidia GPU Temperature"; |
408 | - |
409 | - if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP) |
410 | - return "AMD GPU Temperature"; |
411 | - |
412 | - if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN) |
413 | - return "AMD GPU Fan Speed"; |
414 | - |
415 | - if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP) |
416 | - return "HDD Temperature"; |
417 | - |
418 | - if (type & SENSOR_TYPE_CPU_USAGE) |
419 | - return "CPU Usage"; |
420 | - |
421 | - if (type & SENSOR_TYPE_TEMP) |
422 | - return "Temperature"; |
423 | - |
424 | - if (type & SENSOR_TYPE_FAN) |
425 | - return "Fan"; |
426 | - |
427 | - if (type & SENSOR_TYPE_REMOTE) |
428 | - return "Remote"; |
429 | - |
430 | - return "N/A"; /* should not be possible */ |
431 | -} |
432 | - |
433 | - |
434 | -const char *psensor_type_to_unit_str(unsigned int type) |
435 | -{ |
436 | - if (type & SENSOR_TYPE_TEMP) |
437 | - return _("C"); |
438 | - |
439 | - if (type & SENSOR_TYPE_FAN) |
440 | - return _("RPM"); |
441 | - |
442 | - if (type & SENSOR_TYPE_CPU_USAGE) |
443 | - return _("%"); |
444 | - |
445 | - return "N/A"; |
446 | -} |
447 | - |
448 | -void psensor_list_update_measures(struct psensor **sensors) |
449 | -{ |
450 | - lmsensor_psensor_list_update(sensors); |
451 | - |
452 | -#ifdef HAVE_GTOP |
453 | - cpu_psensor_list_update(sensors); |
454 | -#endif |
455 | - |
456 | - if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP)) |
457 | - hdd_psensor_list_update(sensors); |
458 | -} |
459 | - |
460 | -void psensor_init() |
461 | -{ |
462 | - lmsensor_init(); |
463 | -} |
464 | - |
465 | -void psensor_cleanup() |
466 | -{ |
467 | - lmsensor_cleanup(); |
468 | -} |
469 | |
470 | === removed file '.pc/applied-patches' |
471 | --- .pc/applied-patches 2012-07-13 02:22:18 +0000 |
472 | +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 |
473 | @@ -1,1 +0,0 @@ |
474 | -LP1021900.patch |
475 | |
476 | === modified file 'Makefile.in' |
477 | --- Makefile.in 2011-11-25 02:56:22 +0000 |
478 | +++ Makefile.in 2012-08-31 10:30:30 +0000 |
479 | @@ -1,9 +1,9 @@ |
480 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
481 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
482 | # @configure_input@ |
483 | |
484 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
485 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
486 | -# Inc. |
487 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
488 | +# Foundation, Inc. |
489 | # This Makefile.in is free software; the Free Software Foundation |
490 | # gives unlimited permission to copy and/or distribute it, |
491 | # with or without modifications, as long as this notice is preserved. |
492 | @@ -80,6 +80,12 @@ |
493 | am__base_list = \ |
494 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
495 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
496 | +am__uninstall_files_from_dir = { \ |
497 | + test -z "$$files" \ |
498 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
499 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
500 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
501 | + } |
502 | am__installdirs = "$(DESTDIR)$(autostartdir)" \ |
503 | "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)" |
504 | DATA = $(autostart_DATA) $(desktop_DATA) $(dist_doc_DATA) |
505 | @@ -95,9 +101,11 @@ |
506 | distdir = $(PACKAGE)-$(VERSION) |
507 | top_distdir = $(distdir) |
508 | am__remove_distdir = \ |
509 | - { test ! -d "$(distdir)" \ |
510 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
511 | - && rm -fr "$(distdir)"; }; } |
512 | + if test -d "$(distdir)"; then \ |
513 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
514 | + && rm -rf "$(distdir)" \ |
515 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
516 | + else :; fi |
517 | am__relativize = \ |
518 | dir0=`pwd`; \ |
519 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
520 | @@ -126,6 +134,8 @@ |
521 | DIST_ARCHIVES = $(distdir).tar.gz |
522 | GZIP_ENV = --best |
523 | distuninstallcheck_listfiles = find . -type f -print |
524 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
525 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
526 | distcleancheck_listfiles = find . -type f -print |
527 | ACLOCAL = @ACLOCAL@ |
528 | AMTAR = @AMTAR@ |
529 | @@ -297,7 +307,7 @@ |
530 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
531 | |
532 | .SUFFIXES: |
533 | -am--refresh: |
534 | +am--refresh: Makefile |
535 | @: |
536 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
537 | @for dep in $?; do \ |
538 | @@ -333,10 +343,8 @@ |
539 | $(am__aclocal_m4_deps): |
540 | |
541 | config.h: stamp-h1 |
542 | - @if test ! -f $@; then \ |
543 | - rm -f stamp-h1; \ |
544 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
545 | - else :; fi |
546 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
547 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
548 | |
549 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
550 | @rm -f stamp-h1 |
551 | @@ -365,9 +373,7 @@ |
552 | @$(NORMAL_UNINSTALL) |
553 | @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \ |
554 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
555 | - test -n "$$files" || exit 0; \ |
556 | - echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \ |
557 | - cd "$(DESTDIR)$(autostartdir)" && rm -f $$files |
558 | + dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir) |
559 | install-desktopDATA: $(desktop_DATA) |
560 | @$(NORMAL_INSTALL) |
561 | test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" |
562 | @@ -385,9 +391,7 @@ |
563 | @$(NORMAL_UNINSTALL) |
564 | @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ |
565 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
566 | - test -n "$$files" || exit 0; \ |
567 | - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ |
568 | - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files |
569 | + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) |
570 | install-dist_docDATA: $(dist_doc_DATA) |
571 | @$(NORMAL_INSTALL) |
572 | test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" |
573 | @@ -405,9 +409,7 @@ |
574 | @$(NORMAL_UNINSTALL) |
575 | @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ |
576 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
577 | - test -n "$$files" || exit 0; \ |
578 | - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ |
579 | - cd "$(DESTDIR)$(docdir)" && rm -f $$files |
580 | + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) |
581 | |
582 | # This directory's subdirectories are mostly independent; you can cd |
583 | # into them and run `make' without going through this Makefile. |
584 | @@ -616,7 +618,11 @@ |
585 | $(am__remove_distdir) |
586 | |
587 | dist-bzip2: distdir |
588 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
589 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
590 | + $(am__remove_distdir) |
591 | + |
592 | +dist-lzip: distdir |
593 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
594 | $(am__remove_distdir) |
595 | |
596 | dist-lzma: distdir |
597 | @@ -624,7 +630,7 @@ |
598 | $(am__remove_distdir) |
599 | |
600 | dist-xz: distdir |
601 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
602 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
603 | $(am__remove_distdir) |
604 | |
605 | dist-tarZ: distdir |
606 | @@ -655,6 +661,8 @@ |
607 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
608 | *.tar.lzma*) \ |
609 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
610 | + *.tar.lz*) \ |
611 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
612 | *.tar.xz*) \ |
613 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
614 | *.tar.Z*) \ |
615 | @@ -674,6 +682,7 @@ |
616 | && am__cwd=`pwd` \ |
617 | && $(am__cd) $(distdir)/_build \ |
618 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
619 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
620 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
621 | && $(MAKE) $(AM_MAKEFLAGS) \ |
622 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
623 | @@ -702,8 +711,16 @@ |
624 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
625 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
626 | distuninstallcheck: |
627 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
628 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
629 | + @test -n '$(distuninstallcheck_dir)' || { \ |
630 | + echo 'ERROR: trying to run $@ with an empty' \ |
631 | + '$$(distuninstallcheck_dir)' >&2; \ |
632 | + exit 1; \ |
633 | + }; \ |
634 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
635 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
636 | + exit 1; \ |
637 | + }; \ |
638 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
639 | || { echo "ERROR: files left after uninstall:" ; \ |
640 | if test -n "$(DESTDIR)"; then \ |
641 | echo " (check DESTDIR support)"; \ |
642 | @@ -737,10 +754,15 @@ |
643 | |
644 | installcheck: installcheck-recursive |
645 | install-strip: |
646 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
647 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
648 | - `test -z '$(STRIP)' || \ |
649 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
650 | + if test -z '$(STRIP)'; then \ |
651 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
652 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
653 | + install; \ |
654 | + else \ |
655 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
656 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
657 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
658 | + fi |
659 | mostlyclean-generic: |
660 | |
661 | clean-generic: |
662 | @@ -829,20 +851,20 @@ |
663 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
664 | all all-am am--refresh check check-am clean clean-generic \ |
665 | ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
666 | - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ |
667 | - distclean distclean-generic distclean-hdr distclean-tags \ |
668 | - distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
669 | - html-am info info-am install install-am install-autostartDATA \ |
670 | - install-data install-data-am install-desktopDATA \ |
671 | - install-dist_docDATA install-dvi install-dvi-am install-exec \ |
672 | - install-exec-am install-html install-html-am install-info \ |
673 | - install-info-am install-man install-pdf install-pdf-am \ |
674 | - install-ps install-ps-am install-strip installcheck \ |
675 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
676 | - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ |
677 | - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ |
678 | - uninstall-autostartDATA uninstall-desktopDATA \ |
679 | - uninstall-dist_docDATA |
680 | + dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
681 | + distcheck distclean distclean-generic distclean-hdr \ |
682 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
683 | + dvi-am html html-am info info-am install install-am \ |
684 | + install-autostartDATA install-data install-data-am \ |
685 | + install-desktopDATA install-dist_docDATA install-dvi \ |
686 | + install-dvi-am install-exec install-exec-am install-html \ |
687 | + install-html-am install-info install-info-am install-man \ |
688 | + install-pdf install-pdf-am install-ps install-ps-am \ |
689 | + install-strip installcheck installcheck-am installdirs \ |
690 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
691 | + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ |
692 | + tags-recursive uninstall uninstall-am uninstall-autostartDATA \ |
693 | + uninstall-desktopDATA uninstall-dist_docDATA |
694 | |
695 | |
696 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
697 | |
698 | === modified file 'NEWS' |
699 | --- NEWS 2012-04-09 12:15:54 +0000 |
700 | +++ NEWS 2012-08-31 10:30:30 +0000 |
701 | @@ -1,6 +1,21 @@ |
702 | +* v0.6.2.19 |
703 | + |
704 | +** psensor: fixed size of the icon hicolor/48x48/psensor_hot.png. |
705 | + (LP: #1029065) |
706 | + |
707 | +* v0.6.2.18 |
708 | + |
709 | +** added degree sign for celcius (Closes LP: #1021900). |
710 | +** added russian, brazilian, hungarian, serbian, slovenian, |
711 | + italian, ukrainian and german translation files. |
712 | +** merged translations from LP. |
713 | +** psensor: fixed hide window on startup for gnome-shell (Closes: |
714 | + #676361). |
715 | + |
716 | * v0.6.2.17 |
717 | |
718 | -** psensor: fixed sensor type displayed in sensor preferences dialog. |
719 | +** psensor: fixed sensor type displayed in sensor preferences |
720 | + dialog. (Closes LP: #968912) |
721 | ** psensor: fixed compilation error on 64bits with ATI/AMD GPU support. |
722 | ** psensor: not calling g_thread_init when compiled with glib >= 2.31. |
723 | ** changed copyright dates to 2012. |
724 | |
725 | === modified file 'aclocal.m4' |
726 | --- aclocal.m4 2011-11-25 02:56:22 +0000 |
727 | +++ aclocal.m4 2012-08-31 10:30:30 +0000 |
728 | @@ -1,7 +1,8 @@ |
729 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
730 | +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
731 | |
732 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
733 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
734 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
735 | +# Inc. |
736 | # This file is free software; the Free Software Foundation |
737 | # gives unlimited permission to copy and/or distribute it, |
738 | # with or without modifications, as long as this notice is preserved. |
739 | @@ -2517,12 +2518,15 @@ |
740 | AC_SUBST([$1])dnl |
741 | ]) |
742 | |
743 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
744 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
745 | +# Foundation, Inc. |
746 | # |
747 | # This file is free software; the Free Software Foundation |
748 | # gives unlimited permission to copy and/or distribute it, |
749 | # with or without modifications, as long as this notice is preserved. |
750 | |
751 | +# serial 1 |
752 | + |
753 | # AM_AUTOMAKE_VERSION(VERSION) |
754 | # ---------------------------- |
755 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
756 | @@ -2532,7 +2536,7 @@ |
757 | [am__api_version='1.11' |
758 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
759 | dnl require some minimum version. Point them to the right macro. |
760 | -m4_if([$1], [1.11.1], [], |
761 | +m4_if([$1], [1.11.3], [], |
762 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
763 | ]) |
764 | |
765 | @@ -2548,19 +2552,21 @@ |
766 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
767 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
768 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
769 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
770 | +[AM_AUTOMAKE_VERSION([1.11.3])dnl |
771 | m4_ifndef([AC_AUTOCONF_VERSION], |
772 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
773 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
774 | |
775 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
776 | |
777 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
778 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
779 | # |
780 | # This file is free software; the Free Software Foundation |
781 | # gives unlimited permission to copy and/or distribute it, |
782 | # with or without modifications, as long as this notice is preserved. |
783 | |
784 | +# serial 1 |
785 | + |
786 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
787 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
788 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
789 | @@ -2642,14 +2648,14 @@ |
790 | Usually this means the macro was only invoked conditionally.]]) |
791 | fi])]) |
792 | |
793 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
794 | -# Free Software Foundation, Inc. |
795 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
796 | +# 2010, 2011 Free Software Foundation, Inc. |
797 | # |
798 | # This file is free software; the Free Software Foundation |
799 | # gives unlimited permission to copy and/or distribute it, |
800 | # with or without modifications, as long as this notice is preserved. |
801 | |
802 | -# serial 10 |
803 | +# serial 12 |
804 | |
805 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
806 | # written in clear, in which case automake, when reading aclocal.m4, |
807 | @@ -2689,6 +2695,7 @@ |
808 | # instance it was reported that on HP-UX the gcc test will end up |
809 | # making a dummy file named `D' -- because `-MD' means `put the output |
810 | # in D'. |
811 | + rm -rf conftest.dir |
812 | mkdir conftest.dir |
813 | # Copy depcomp to subdir because otherwise we won't find it if we're |
814 | # using a relative directory. |
815 | @@ -2753,7 +2760,7 @@ |
816 | break |
817 | fi |
818 | ;; |
819 | - msvisualcpp | msvcmsys) |
820 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
821 | # This compiler won't grok `-c -o', but also, the minuso test has |
822 | # not run yet. These depmodes are late enough in the game, and |
823 | # so weak that their functioning should not be impacted. |
824 | @@ -2818,10 +2825,13 @@ |
825 | if test "x$enable_dependency_tracking" != xno; then |
826 | am_depcomp="$ac_aux_dir/depcomp" |
827 | AMDEPBACKSLASH='\' |
828 | + am__nodep='_no' |
829 | fi |
830 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
831 | AC_SUBST([AMDEPBACKSLASH])dnl |
832 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
833 | +AC_SUBST([am__nodep])dnl |
834 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
835 | ]) |
836 | |
837 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
838 | @@ -3043,12 +3053,15 @@ |
839 | done |
840 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
841 | |
842 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
843 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
844 | +# Inc. |
845 | # |
846 | # This file is free software; the Free Software Foundation |
847 | # gives unlimited permission to copy and/or distribute it, |
848 | # with or without modifications, as long as this notice is preserved. |
849 | |
850 | +# serial 1 |
851 | + |
852 | # AM_PROG_INSTALL_SH |
853 | # ------------------ |
854 | # Define $install_sh. |
855 | @@ -3215,12 +3228,15 @@ |
856 | fi |
857 | ]) |
858 | |
859 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
860 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
861 | +# Inc. |
862 | # |
863 | # This file is free software; the Free Software Foundation |
864 | # gives unlimited permission to copy and/or distribute it, |
865 | # with or without modifications, as long as this notice is preserved. |
866 | |
867 | +# serial 1 |
868 | + |
869 | # AM_PROG_MKDIR_P |
870 | # --------------- |
871 | # Check for `mkdir -p'. |
872 | @@ -3243,13 +3259,14 @@ |
873 | |
874 | # Helper functions for option handling. -*- Autoconf -*- |
875 | |
876 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
877 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
878 | +# Foundation, Inc. |
879 | # |
880 | # This file is free software; the Free Software Foundation |
881 | # gives unlimited permission to copy and/or distribute it, |
882 | # with or without modifications, as long as this notice is preserved. |
883 | |
884 | -# serial 4 |
885 | +# serial 5 |
886 | |
887 | # _AM_MANGLE_OPTION(NAME) |
888 | # ----------------------- |
889 | @@ -3257,13 +3274,13 @@ |
890 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
891 | |
892 | # _AM_SET_OPTION(NAME) |
893 | -# ------------------------------ |
894 | +# -------------------- |
895 | # Set option NAME. Presently that only means defining a flag for this option. |
896 | AC_DEFUN([_AM_SET_OPTION], |
897 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
898 | |
899 | # _AM_SET_OPTIONS(OPTIONS) |
900 | -# ---------------------------------- |
901 | +# ------------------------ |
902 | # OPTIONS is a space-separated list of Automake options. |
903 | AC_DEFUN([_AM_SET_OPTIONS], |
904 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
905 | @@ -3339,12 +3356,14 @@ |
906 | fi |
907 | AC_MSG_RESULT(yes)]) |
908 | |
909 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
910 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
911 | # |
912 | # This file is free software; the Free Software Foundation |
913 | # gives unlimited permission to copy and/or distribute it, |
914 | # with or without modifications, as long as this notice is preserved. |
915 | |
916 | +# serial 1 |
917 | + |
918 | # AM_PROG_INSTALL_STRIP |
919 | # --------------------- |
920 | # One issue with vendor `install' (even GNU) is that you can't |
921 | @@ -3367,13 +3386,13 @@ |
922 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
923 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
924 | |
925 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
926 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
927 | # |
928 | # This file is free software; the Free Software Foundation |
929 | # gives unlimited permission to copy and/or distribute it, |
930 | # with or without modifications, as long as this notice is preserved. |
931 | |
932 | -# serial 2 |
933 | +# serial 3 |
934 | |
935 | # _AM_SUBST_NOTMAKE(VARIABLE) |
936 | # --------------------------- |
937 | @@ -3382,13 +3401,13 @@ |
938 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
939 | |
940 | # AM_SUBST_NOTMAKE(VARIABLE) |
941 | -# --------------------------- |
942 | +# -------------------------- |
943 | # Public sister of _AM_SUBST_NOTMAKE. |
944 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
945 | |
946 | # Check how to create a tarball. -*- Autoconf -*- |
947 | |
948 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
949 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
950 | # |
951 | # This file is free software; the Free Software Foundation |
952 | # gives unlimited permission to copy and/or distribute it, |
953 | @@ -3410,10 +3429,11 @@ |
954 | # a tarball read from stdin. |
955 | # $(am__untar) < result.tar |
956 | AC_DEFUN([_AM_PROG_TAR], |
957 | -[# Always define AMTAR for backward compatibility. |
958 | -AM_MISSING_PROG([AMTAR], [tar]) |
959 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
960 | +# in the wild :-( We should find a proper way to deprecate it ... |
961 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
962 | m4_if([$1], [v7], |
963 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
964 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
965 | [m4_case([$1], [ustar],, [pax],, |
966 | [m4_fatal([Unknown tar format])]) |
967 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
968 | |
969 | === modified file 'configure' |
970 | --- configure 2012-04-09 12:15:54 +0000 |
971 | +++ configure 2012-08-31 10:30:30 +0000 |
972 | @@ -1,6 +1,6 @@ |
973 | #! /bin/sh |
974 | # Guess values for system-dependent variables and create Makefiles. |
975 | -# Generated by GNU Autoconf 2.68 for psensor 0.6.2.17. |
976 | +# Generated by GNU Autoconf 2.68 for psensor 0.6.2.19. |
977 | # |
978 | # Report bugs to <jeanfi@gmail.com>. |
979 | # |
980 | @@ -560,8 +560,8 @@ |
981 | # Identity of this package. |
982 | PACKAGE_NAME='psensor' |
983 | PACKAGE_TARNAME='psensor' |
984 | -PACKAGE_VERSION='0.6.2.17' |
985 | -PACKAGE_STRING='psensor 0.6.2.17' |
986 | +PACKAGE_VERSION='0.6.2.19' |
987 | +PACKAGE_STRING='psensor 0.6.2.19' |
988 | PACKAGE_BUGREPORT='jeanfi@gmail.com' |
989 | PACKAGE_URL='http://wpitchoune.net/psensor' |
990 | |
991 | @@ -691,6 +691,7 @@ |
992 | am__fastdepCC_FALSE |
993 | am__fastdepCC_TRUE |
994 | CCDEPMODE |
995 | +am__nodep |
996 | AMDEPBACKSLASH |
997 | AMDEP_FALSE |
998 | AMDEP_TRUE |
999 | @@ -1355,7 +1356,7 @@ |
1000 | # Omit some internal or obsolete options to make the list less imposing. |
1001 | # This message is too long to be a string in the A/UX 3.1 sh. |
1002 | cat <<_ACEOF |
1003 | -\`configure' configures psensor 0.6.2.17 to adapt to many kinds of systems. |
1004 | +\`configure' configures psensor 0.6.2.19 to adapt to many kinds of systems. |
1005 | |
1006 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1007 | |
1008 | @@ -1429,7 +1430,7 @@ |
1009 | |
1010 | if test -n "$ac_init_help"; then |
1011 | case $ac_init_help in |
1012 | - short | recursive ) echo "Configuration of psensor 0.6.2.17:";; |
1013 | + short | recursive ) echo "Configuration of psensor 0.6.2.19:";; |
1014 | esac |
1015 | cat <<\_ACEOF |
1016 | |
1017 | @@ -1567,7 +1568,7 @@ |
1018 | test -n "$ac_init_help" && exit $ac_status |
1019 | if $ac_init_version; then |
1020 | cat <<\_ACEOF |
1021 | -psensor configure 0.6.2.17 |
1022 | +psensor configure 0.6.2.19 |
1023 | generated by GNU Autoconf 2.68 |
1024 | |
1025 | Copyright (C) 2010 Free Software Foundation, Inc. |
1026 | @@ -1990,7 +1991,7 @@ |
1027 | This file contains any messages produced by compilers while |
1028 | running configure, to aid debugging if configure makes a mistake. |
1029 | |
1030 | -It was created by psensor $as_me 0.6.2.17, which was |
1031 | +It was created by psensor $as_me 0.6.2.19, which was |
1032 | generated by GNU Autoconf 2.68. Invocation command line was |
1033 | |
1034 | $ $0 $@ |
1035 | @@ -2807,7 +2808,7 @@ |
1036 | |
1037 | # Define the identity of the package. |
1038 | PACKAGE='psensor' |
1039 | - VERSION='0.6.2.17' |
1040 | + VERSION='0.6.2.19' |
1041 | |
1042 | |
1043 | cat >>confdefs.h <<_ACEOF |
1044 | @@ -2837,11 +2838,11 @@ |
1045 | |
1046 | # We need awk for the "check" target. The system "awk" is bad on |
1047 | # some platforms. |
1048 | -# Always define AMTAR for backward compatibility. |
1049 | - |
1050 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
1051 | - |
1052 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
1053 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
1054 | +# in the wild :-( We should find a proper way to deprecate it ... |
1055 | +AMTAR='$${TAR-tar}' |
1056 | + |
1057 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
1058 | |
1059 | |
1060 | |
1061 | @@ -3694,6 +3695,7 @@ |
1062 | if test "x$enable_dependency_tracking" != xno; then |
1063 | am_depcomp="$ac_aux_dir/depcomp" |
1064 | AMDEPBACKSLASH='\' |
1065 | + am__nodep='_no' |
1066 | fi |
1067 | if test "x$enable_dependency_tracking" != xno; then |
1068 | AMDEP_TRUE= |
1069 | @@ -3718,6 +3720,7 @@ |
1070 | # instance it was reported that on HP-UX the gcc test will end up |
1071 | # making a dummy file named `D' -- because `-MD' means `put the output |
1072 | # in D'. |
1073 | + rm -rf conftest.dir |
1074 | mkdir conftest.dir |
1075 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1076 | # using a relative directory. |
1077 | @@ -3777,7 +3780,7 @@ |
1078 | break |
1079 | fi |
1080 | ;; |
1081 | - msvisualcpp | msvcmsys) |
1082 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1083 | # This compiler won't grok `-c -o', but also, the minuso test has |
1084 | # not run yet. These depmodes are late enough in the game, and |
1085 | # so weak that their functioning should not be impacted. |
1086 | @@ -9176,7 +9179,7 @@ |
1087 | # report actual input values of CONFIG_FILES etc. instead of their |
1088 | # values after options handling. |
1089 | ac_log=" |
1090 | -This file was extended by psensor $as_me 0.6.2.17, which was |
1091 | +This file was extended by psensor $as_me 0.6.2.19, which was |
1092 | generated by GNU Autoconf 2.68. Invocation command line was |
1093 | |
1094 | CONFIG_FILES = $CONFIG_FILES |
1095 | @@ -9243,7 +9246,7 @@ |
1096 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1097 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1098 | ac_cs_version="\\ |
1099 | -psensor config.status 0.6.2.17 |
1100 | +psensor config.status 0.6.2.19 |
1101 | configured by $0, generated by GNU Autoconf 2.68, |
1102 | with options \\"\$ac_cs_config\\" |
1103 | |
1104 | |
1105 | === modified file 'configure.ac' |
1106 | --- configure.ac 2012-04-09 12:15:54 +0000 |
1107 | +++ configure.ac 2012-08-31 10:30:30 +0000 |
1108 | @@ -2,7 +2,7 @@ |
1109 | # Process this file with autoconf to produce a configure script. |
1110 | |
1111 | AC_PREREQ([2.64]) |
1112 | -AC_INIT([psensor], [0.6.2.17],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) |
1113 | +AC_INIT([psensor], [0.6.2.19],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) |
1114 | |
1115 | AM_INIT_AUTOMAKE([-Wall -Werror gnu]) |
1116 | |
1117 | |
1118 | === modified file 'debian/changelog' |
1119 | --- debian/changelog 2012-07-13 02:22:18 +0000 |
1120 | +++ debian/changelog 2012-08-31 10:30:30 +0000 |
1121 | @@ -1,3 +1,15 @@ |
1122 | +psensor (0.6.2.19-1ubuntu1) quantal; urgency=low |
1123 | + |
1124 | + * New upstream release |
1125 | + + fixed hide window on startup for gnome-shell. (Closes: #676361) |
1126 | + + fixed size of the icon hicolor/48x48/psensor_hot.png. (LP: #1029065) |
1127 | + * Removed LP1021900.patch: fixed upstream since 0.6.2.18. |
1128 | + * Remaining changes: |
1129 | + + Modifed build-dep to add NVidia and Application Indicator support |
1130 | + + Only add an nvidia-settings build-dep on i386 and amd6 |
1131 | + |
1132 | + -- Jean-Philippe Orsini <jeanfi@gmail.com> Tue, 21 Aug 2012 11:19:33 +0200 |
1133 | + |
1134 | psensor (0.6.2.17-2ubuntu1) quantal; urgency=low |
1135 | |
1136 | * Merge from Debian testing. Remaining changes: |
1137 | |
1138 | === removed file 'debian/patches/LP1021900.patch' |
1139 | --- debian/patches/LP1021900.patch 2012-07-07 00:47:44 +0000 |
1140 | +++ debian/patches/LP1021900.patch 1970-01-01 00:00:00 +0000 |
1141 | @@ -1,26 +0,0 @@ |
1142 | -Description: added degree Celcius symbol |
1143 | -Author: Jean-Philippe Orsini <jeanfi@gmail.com> |
1144 | -Origin: Upstream |
1145 | -Ubuntu-bug: https://bugs.launchpad.net/ubuntu/+source/psensor/+bug/1021900 |
1146 | -Index: psensor-0.6.2.16/src/lib/psensor.c |
1147 | -=================================================================== |
1148 | ---- psensor-0.6.2.16.orig/src/lib/psensor.c 2012-07-07 00:40:33.000000000 +0200 |
1149 | -+++ psensor-0.6.2.16/src/lib/psensor.c 2012-07-07 00:47:36.258308297 +0200 |
1150 | -@@ -207,7 +207,7 @@ |
1151 | - char *unit; |
1152 | - |
1153 | - if (is_temp_type(type)) |
1154 | -- unit = "C"; |
1155 | -+ unit = "°C"; |
1156 | - else if (type & SENSOR_TYPE_CPU_USAGE) |
1157 | - unit = "%"; |
1158 | - else |
1159 | -@@ -427,7 +427,7 @@ |
1160 | - const char *psensor_type_to_unit_str(unsigned int type) |
1161 | - { |
1162 | - if (type & SENSOR_TYPE_TEMP) |
1163 | -- return _("C"); |
1164 | -+ return "\302\260C"; |
1165 | - |
1166 | - if (type & SENSOR_TYPE_FAN) |
1167 | - return _("RPM"); |
1168 | |
1169 | === modified file 'debian/patches/series' |
1170 | --- debian/patches/series 2012-07-13 02:22:18 +0000 |
1171 | +++ debian/patches/series 2012-08-31 10:30:30 +0000 |
1172 | @@ -1,1 +0,0 @@ |
1173 | -LP1021900.patch |
1174 | |
1175 | === modified file 'icons/hicolor/14x14/Makefile.in' |
1176 | --- icons/hicolor/14x14/Makefile.in 2011-11-25 02:56:22 +0000 |
1177 | +++ icons/hicolor/14x14/Makefile.in 2012-08-31 10:30:30 +0000 |
1178 | @@ -1,9 +1,9 @@ |
1179 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1180 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1181 | # @configure_input@ |
1182 | |
1183 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1184 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1185 | -# Inc. |
1186 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1187 | +# Foundation, Inc. |
1188 | # This Makefile.in is free software; the Free Software Foundation |
1189 | # gives unlimited permission to copy and/or distribute it, |
1190 | # with or without modifications, as long as this notice is preserved. |
1191 | @@ -67,6 +67,12 @@ |
1192 | am__base_list = \ |
1193 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1194 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1195 | +am__uninstall_files_from_dir = { \ |
1196 | + test -z "$$files" \ |
1197 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1198 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1199 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1200 | + } |
1201 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1202 | DATA = $(psensordistpix_DATA) |
1203 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1204 | @@ -270,9 +276,7 @@ |
1205 | @$(NORMAL_UNINSTALL) |
1206 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1207 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1208 | - test -n "$$files" || exit 0; \ |
1209 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1210 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1211 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1212 | tags: TAGS |
1213 | TAGS: |
1214 | |
1215 | @@ -327,10 +331,15 @@ |
1216 | |
1217 | installcheck: installcheck-am |
1218 | install-strip: |
1219 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1220 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1221 | - `test -z '$(STRIP)' || \ |
1222 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1223 | + if test -z '$(STRIP)'; then \ |
1224 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1225 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1226 | + install; \ |
1227 | + else \ |
1228 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1229 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1230 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1231 | + fi |
1232 | mostlyclean-generic: |
1233 | |
1234 | clean-generic: |
1235 | |
1236 | === modified file 'icons/hicolor/16x16/Makefile.in' |
1237 | --- icons/hicolor/16x16/Makefile.in 2011-11-25 02:56:22 +0000 |
1238 | +++ icons/hicolor/16x16/Makefile.in 2012-08-31 10:30:30 +0000 |
1239 | @@ -1,9 +1,9 @@ |
1240 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1241 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1242 | # @configure_input@ |
1243 | |
1244 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1245 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1246 | -# Inc. |
1247 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1248 | +# Foundation, Inc. |
1249 | # This Makefile.in is free software; the Free Software Foundation |
1250 | # gives unlimited permission to copy and/or distribute it, |
1251 | # with or without modifications, as long as this notice is preserved. |
1252 | @@ -67,6 +67,12 @@ |
1253 | am__base_list = \ |
1254 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1255 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1256 | +am__uninstall_files_from_dir = { \ |
1257 | + test -z "$$files" \ |
1258 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1259 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1260 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1261 | + } |
1262 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1263 | DATA = $(psensordistpix_DATA) |
1264 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1265 | @@ -270,9 +276,7 @@ |
1266 | @$(NORMAL_UNINSTALL) |
1267 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1268 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1269 | - test -n "$$files" || exit 0; \ |
1270 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1271 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1272 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1273 | tags: TAGS |
1274 | TAGS: |
1275 | |
1276 | @@ -327,10 +331,15 @@ |
1277 | |
1278 | installcheck: installcheck-am |
1279 | install-strip: |
1280 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1281 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1282 | - `test -z '$(STRIP)' || \ |
1283 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1284 | + if test -z '$(STRIP)'; then \ |
1285 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1286 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1287 | + install; \ |
1288 | + else \ |
1289 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1290 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1291 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1292 | + fi |
1293 | mostlyclean-generic: |
1294 | |
1295 | clean-generic: |
1296 | |
1297 | === modified file 'icons/hicolor/22x22/Makefile.in' |
1298 | --- icons/hicolor/22x22/Makefile.in 2011-11-25 02:56:22 +0000 |
1299 | +++ icons/hicolor/22x22/Makefile.in 2012-08-31 10:30:30 +0000 |
1300 | @@ -1,9 +1,9 @@ |
1301 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1302 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1303 | # @configure_input@ |
1304 | |
1305 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1306 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1307 | -# Inc. |
1308 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1309 | +# Foundation, Inc. |
1310 | # This Makefile.in is free software; the Free Software Foundation |
1311 | # gives unlimited permission to copy and/or distribute it, |
1312 | # with or without modifications, as long as this notice is preserved. |
1313 | @@ -67,6 +67,12 @@ |
1314 | am__base_list = \ |
1315 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1316 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1317 | +am__uninstall_files_from_dir = { \ |
1318 | + test -z "$$files" \ |
1319 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1320 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1321 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1322 | + } |
1323 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1324 | DATA = $(psensordistpix_DATA) |
1325 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1326 | @@ -270,9 +276,7 @@ |
1327 | @$(NORMAL_UNINSTALL) |
1328 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1329 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1330 | - test -n "$$files" || exit 0; \ |
1331 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1332 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1333 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1334 | tags: TAGS |
1335 | TAGS: |
1336 | |
1337 | @@ -327,10 +331,15 @@ |
1338 | |
1339 | installcheck: installcheck-am |
1340 | install-strip: |
1341 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1342 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1343 | - `test -z '$(STRIP)' || \ |
1344 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1345 | + if test -z '$(STRIP)'; then \ |
1346 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1347 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1348 | + install; \ |
1349 | + else \ |
1350 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1351 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1352 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1353 | + fi |
1354 | mostlyclean-generic: |
1355 | |
1356 | clean-generic: |
1357 | |
1358 | === modified file 'icons/hicolor/24x24/Makefile.in' |
1359 | --- icons/hicolor/24x24/Makefile.in 2011-11-25 02:56:22 +0000 |
1360 | +++ icons/hicolor/24x24/Makefile.in 2012-08-31 10:30:30 +0000 |
1361 | @@ -1,9 +1,9 @@ |
1362 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1363 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1364 | # @configure_input@ |
1365 | |
1366 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1367 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1368 | -# Inc. |
1369 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1370 | +# Foundation, Inc. |
1371 | # This Makefile.in is free software; the Free Software Foundation |
1372 | # gives unlimited permission to copy and/or distribute it, |
1373 | # with or without modifications, as long as this notice is preserved. |
1374 | @@ -67,6 +67,12 @@ |
1375 | am__base_list = \ |
1376 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1377 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1378 | +am__uninstall_files_from_dir = { \ |
1379 | + test -z "$$files" \ |
1380 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1381 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1382 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1383 | + } |
1384 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1385 | DATA = $(psensordistpix_DATA) |
1386 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1387 | @@ -270,9 +276,7 @@ |
1388 | @$(NORMAL_UNINSTALL) |
1389 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1390 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1391 | - test -n "$$files" || exit 0; \ |
1392 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1393 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1394 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1395 | tags: TAGS |
1396 | TAGS: |
1397 | |
1398 | @@ -327,10 +331,15 @@ |
1399 | |
1400 | installcheck: installcheck-am |
1401 | install-strip: |
1402 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1403 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1404 | - `test -z '$(STRIP)' || \ |
1405 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1406 | + if test -z '$(STRIP)'; then \ |
1407 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1408 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1409 | + install; \ |
1410 | + else \ |
1411 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1412 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1413 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1414 | + fi |
1415 | mostlyclean-generic: |
1416 | |
1417 | clean-generic: |
1418 | |
1419 | === modified file 'icons/hicolor/32x32/Makefile.in' |
1420 | --- icons/hicolor/32x32/Makefile.in 2011-11-25 02:56:22 +0000 |
1421 | +++ icons/hicolor/32x32/Makefile.in 2012-08-31 10:30:30 +0000 |
1422 | @@ -1,9 +1,9 @@ |
1423 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1424 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1425 | # @configure_input@ |
1426 | |
1427 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1428 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1429 | -# Inc. |
1430 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1431 | +# Foundation, Inc. |
1432 | # This Makefile.in is free software; the Free Software Foundation |
1433 | # gives unlimited permission to copy and/or distribute it, |
1434 | # with or without modifications, as long as this notice is preserved. |
1435 | @@ -67,6 +67,12 @@ |
1436 | am__base_list = \ |
1437 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1438 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1439 | +am__uninstall_files_from_dir = { \ |
1440 | + test -z "$$files" \ |
1441 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1442 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1443 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1444 | + } |
1445 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1446 | DATA = $(psensordistpix_DATA) |
1447 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1448 | @@ -270,9 +276,7 @@ |
1449 | @$(NORMAL_UNINSTALL) |
1450 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1451 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1452 | - test -n "$$files" || exit 0; \ |
1453 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1454 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1455 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1456 | tags: TAGS |
1457 | TAGS: |
1458 | |
1459 | @@ -327,10 +331,15 @@ |
1460 | |
1461 | installcheck: installcheck-am |
1462 | install-strip: |
1463 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1464 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1465 | - `test -z '$(STRIP)' || \ |
1466 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1467 | + if test -z '$(STRIP)'; then \ |
1468 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1469 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1470 | + install; \ |
1471 | + else \ |
1472 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1473 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1474 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1475 | + fi |
1476 | mostlyclean-generic: |
1477 | |
1478 | clean-generic: |
1479 | |
1480 | === modified file 'icons/hicolor/48x48/Makefile.in' |
1481 | --- icons/hicolor/48x48/Makefile.in 2011-11-25 02:56:22 +0000 |
1482 | +++ icons/hicolor/48x48/Makefile.in 2012-08-31 10:30:30 +0000 |
1483 | @@ -1,9 +1,9 @@ |
1484 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1485 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1486 | # @configure_input@ |
1487 | |
1488 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1489 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1490 | -# Inc. |
1491 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1492 | +# Foundation, Inc. |
1493 | # This Makefile.in is free software; the Free Software Foundation |
1494 | # gives unlimited permission to copy and/or distribute it, |
1495 | # with or without modifications, as long as this notice is preserved. |
1496 | @@ -67,6 +67,12 @@ |
1497 | am__base_list = \ |
1498 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1499 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1500 | +am__uninstall_files_from_dir = { \ |
1501 | + test -z "$$files" \ |
1502 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1503 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1504 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1505 | + } |
1506 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1507 | DATA = $(psensordistpix_DATA) |
1508 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1509 | @@ -270,9 +276,7 @@ |
1510 | @$(NORMAL_UNINSTALL) |
1511 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1512 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1513 | - test -n "$$files" || exit 0; \ |
1514 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1515 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1516 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1517 | tags: TAGS |
1518 | TAGS: |
1519 | |
1520 | @@ -327,10 +331,15 @@ |
1521 | |
1522 | installcheck: installcheck-am |
1523 | install-strip: |
1524 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1525 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1526 | - `test -z '$(STRIP)' || \ |
1527 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1528 | + if test -z '$(STRIP)'; then \ |
1529 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1530 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1531 | + install; \ |
1532 | + else \ |
1533 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1534 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1535 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1536 | + fi |
1537 | mostlyclean-generic: |
1538 | |
1539 | clean-generic: |
1540 | |
1541 | === modified file 'icons/hicolor/48x48/psensor_hot.png' |
1542 | Binary files icons/hicolor/48x48/psensor_hot.png 2011-11-25 02:56:22 +0000 and icons/hicolor/48x48/psensor_hot.png 2012-08-31 10:30:30 +0000 differ |
1543 | === modified file 'icons/hicolor/64x64/Makefile.in' |
1544 | --- icons/hicolor/64x64/Makefile.in 2011-11-25 02:56:22 +0000 |
1545 | +++ icons/hicolor/64x64/Makefile.in 2012-08-31 10:30:30 +0000 |
1546 | @@ -1,9 +1,9 @@ |
1547 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1548 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1549 | # @configure_input@ |
1550 | |
1551 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1552 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1553 | -# Inc. |
1554 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1555 | +# Foundation, Inc. |
1556 | # This Makefile.in is free software; the Free Software Foundation |
1557 | # gives unlimited permission to copy and/or distribute it, |
1558 | # with or without modifications, as long as this notice is preserved. |
1559 | @@ -67,6 +67,12 @@ |
1560 | am__base_list = \ |
1561 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1562 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1563 | +am__uninstall_files_from_dir = { \ |
1564 | + test -z "$$files" \ |
1565 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1566 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1567 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1568 | + } |
1569 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1570 | DATA = $(psensordistpix_DATA) |
1571 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1572 | @@ -270,9 +276,7 @@ |
1573 | @$(NORMAL_UNINSTALL) |
1574 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1575 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1576 | - test -n "$$files" || exit 0; \ |
1577 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1578 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1579 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1580 | tags: TAGS |
1581 | TAGS: |
1582 | |
1583 | @@ -327,10 +331,15 @@ |
1584 | |
1585 | installcheck: installcheck-am |
1586 | install-strip: |
1587 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1588 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1589 | - `test -z '$(STRIP)' || \ |
1590 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1591 | + if test -z '$(STRIP)'; then \ |
1592 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1593 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1594 | + install; \ |
1595 | + else \ |
1596 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1597 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1598 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1599 | + fi |
1600 | mostlyclean-generic: |
1601 | |
1602 | clean-generic: |
1603 | |
1604 | === modified file 'icons/hicolor/scalable/Makefile.in' |
1605 | --- icons/hicolor/scalable/Makefile.in 2011-11-25 02:56:22 +0000 |
1606 | +++ icons/hicolor/scalable/Makefile.in 2012-08-31 10:30:30 +0000 |
1607 | @@ -1,9 +1,9 @@ |
1608 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1609 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1610 | # @configure_input@ |
1611 | |
1612 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1613 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1614 | -# Inc. |
1615 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1616 | +# Foundation, Inc. |
1617 | # This Makefile.in is free software; the Free Software Foundation |
1618 | # gives unlimited permission to copy and/or distribute it, |
1619 | # with or without modifications, as long as this notice is preserved. |
1620 | @@ -67,6 +67,12 @@ |
1621 | am__base_list = \ |
1622 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1623 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1624 | +am__uninstall_files_from_dir = { \ |
1625 | + test -z "$$files" \ |
1626 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1627 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1628 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1629 | + } |
1630 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1631 | DATA = $(psensordistpix_DATA) |
1632 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1633 | @@ -270,9 +276,7 @@ |
1634 | @$(NORMAL_UNINSTALL) |
1635 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1636 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1637 | - test -n "$$files" || exit 0; \ |
1638 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1639 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1640 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1641 | tags: TAGS |
1642 | TAGS: |
1643 | |
1644 | @@ -327,10 +331,15 @@ |
1645 | |
1646 | installcheck: installcheck-am |
1647 | install-strip: |
1648 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1649 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1650 | - `test -z '$(STRIP)' || \ |
1651 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1652 | + if test -z '$(STRIP)'; then \ |
1653 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1654 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1655 | + install; \ |
1656 | + else \ |
1657 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1658 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1659 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1660 | + fi |
1661 | mostlyclean-generic: |
1662 | |
1663 | clean-generic: |
1664 | |
1665 | === modified file 'icons/ubuntu-mono-dark/apps/22/Makefile.in' |
1666 | --- icons/ubuntu-mono-dark/apps/22/Makefile.in 2011-11-25 02:56:22 +0000 |
1667 | +++ icons/ubuntu-mono-dark/apps/22/Makefile.in 2012-08-31 10:30:30 +0000 |
1668 | @@ -1,9 +1,9 @@ |
1669 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1670 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1671 | # @configure_input@ |
1672 | |
1673 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1674 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1675 | -# Inc. |
1676 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1677 | +# Foundation, Inc. |
1678 | # This Makefile.in is free software; the Free Software Foundation |
1679 | # gives unlimited permission to copy and/or distribute it, |
1680 | # with or without modifications, as long as this notice is preserved. |
1681 | @@ -67,6 +67,12 @@ |
1682 | am__base_list = \ |
1683 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1684 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1685 | +am__uninstall_files_from_dir = { \ |
1686 | + test -z "$$files" \ |
1687 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1688 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1689 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1690 | + } |
1691 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1692 | DATA = $(psensordistpix_DATA) |
1693 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1694 | @@ -270,9 +276,7 @@ |
1695 | @$(NORMAL_UNINSTALL) |
1696 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1697 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1698 | - test -n "$$files" || exit 0; \ |
1699 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1700 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1701 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1702 | tags: TAGS |
1703 | TAGS: |
1704 | |
1705 | @@ -327,10 +331,15 @@ |
1706 | |
1707 | installcheck: installcheck-am |
1708 | install-strip: |
1709 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1710 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1711 | - `test -z '$(STRIP)' || \ |
1712 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1713 | + if test -z '$(STRIP)'; then \ |
1714 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1715 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1716 | + install; \ |
1717 | + else \ |
1718 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1719 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1720 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1721 | + fi |
1722 | mostlyclean-generic: |
1723 | |
1724 | clean-generic: |
1725 | |
1726 | === modified file 'icons/ubuntu-mono-dark/status/22/Makefile.in' |
1727 | --- icons/ubuntu-mono-dark/status/22/Makefile.in 2011-11-25 02:56:22 +0000 |
1728 | +++ icons/ubuntu-mono-dark/status/22/Makefile.in 2012-08-31 10:30:30 +0000 |
1729 | @@ -1,9 +1,9 @@ |
1730 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1731 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1732 | # @configure_input@ |
1733 | |
1734 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1735 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1736 | -# Inc. |
1737 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1738 | +# Foundation, Inc. |
1739 | # This Makefile.in is free software; the Free Software Foundation |
1740 | # gives unlimited permission to copy and/or distribute it, |
1741 | # with or without modifications, as long as this notice is preserved. |
1742 | @@ -67,6 +67,12 @@ |
1743 | am__base_list = \ |
1744 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1745 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1746 | +am__uninstall_files_from_dir = { \ |
1747 | + test -z "$$files" \ |
1748 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1749 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1750 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1751 | + } |
1752 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1753 | DATA = $(psensordistpix_DATA) |
1754 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1755 | @@ -270,9 +276,7 @@ |
1756 | @$(NORMAL_UNINSTALL) |
1757 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1758 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1759 | - test -n "$$files" || exit 0; \ |
1760 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1761 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1762 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1763 | tags: TAGS |
1764 | TAGS: |
1765 | |
1766 | @@ -327,10 +331,15 @@ |
1767 | |
1768 | installcheck: installcheck-am |
1769 | install-strip: |
1770 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1771 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1772 | - `test -z '$(STRIP)' || \ |
1773 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1774 | + if test -z '$(STRIP)'; then \ |
1775 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1776 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1777 | + install; \ |
1778 | + else \ |
1779 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1780 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1781 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1782 | + fi |
1783 | mostlyclean-generic: |
1784 | |
1785 | clean-generic: |
1786 | |
1787 | === modified file 'icons/ubuntu-mono-light/status/22/Makefile.in' |
1788 | --- icons/ubuntu-mono-light/status/22/Makefile.in 2011-11-25 02:56:22 +0000 |
1789 | +++ icons/ubuntu-mono-light/status/22/Makefile.in 2012-08-31 10:30:30 +0000 |
1790 | @@ -1,9 +1,9 @@ |
1791 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1792 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
1793 | # @configure_input@ |
1794 | |
1795 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1796 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1797 | -# Inc. |
1798 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1799 | +# Foundation, Inc. |
1800 | # This Makefile.in is free software; the Free Software Foundation |
1801 | # gives unlimited permission to copy and/or distribute it, |
1802 | # with or without modifications, as long as this notice is preserved. |
1803 | @@ -67,6 +67,12 @@ |
1804 | am__base_list = \ |
1805 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1806 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1807 | +am__uninstall_files_from_dir = { \ |
1808 | + test -z "$$files" \ |
1809 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1810 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1811 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1812 | + } |
1813 | am__installdirs = "$(DESTDIR)$(psensordistpixdir)" |
1814 | DATA = $(psensordistpix_DATA) |
1815 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1816 | @@ -270,9 +276,7 @@ |
1817 | @$(NORMAL_UNINSTALL) |
1818 | @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ |
1819 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1820 | - test -n "$$files" || exit 0; \ |
1821 | - echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \ |
1822 | - cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files |
1823 | + dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) |
1824 | tags: TAGS |
1825 | TAGS: |
1826 | |
1827 | @@ -327,10 +331,15 @@ |
1828 | |
1829 | installcheck: installcheck-am |
1830 | install-strip: |
1831 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1832 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1833 | - `test -z '$(STRIP)' || \ |
1834 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1835 | + if test -z '$(STRIP)'; then \ |
1836 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1837 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1838 | + install; \ |
1839 | + else \ |
1840 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1841 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1842 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1843 | + fi |
1844 | mostlyclean-generic: |
1845 | |
1846 | clean-generic: |
1847 | |
1848 | === modified file 'po/LINGUAS' |
1849 | --- po/LINGUAS 2011-04-21 15:19:35 +0000 |
1850 | +++ po/LINGUAS 2012-08-31 10:30:30 +0000 |
1851 | @@ -6,6 +6,14 @@ |
1852 | # Copying and distribution of this file, with or without modification, |
1853 | # are permitted in any medium without royalty provided the copyright |
1854 | # notice and this notice are preserved. |
1855 | +de |
1856 | fr |
1857 | +hu |
1858 | +it |
1859 | +pt_BR |
1860 | +ru |
1861 | +sl |
1862 | +sr |
1863 | +tr |
1864 | +uk |
1865 | zh_CN |
1866 | -tr |
1867 | |
1868 | === modified file 'po/fr.gmo' |
1869 | Binary files po/fr.gmo 2012-04-09 12:15:54 +0000 and po/fr.gmo 2012-08-31 10:30:30 +0000 differ |
1870 | === modified file 'po/fr.po' |
1871 | --- po/fr.po 2012-04-09 12:15:54 +0000 |
1872 | +++ po/fr.po 2012-08-31 10:30:30 +0000 |
1873 | @@ -5,19 +5,21 @@ |
1874 | # |
1875 | msgid "" |
1876 | msgstr "" |
1877 | -"Project-Id-Version: psensor 0.6.0.9\n" |
1878 | +"Project-Id-Version: psensor 0.6.2.x\n" |
1879 | "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" |
1880 | -"POT-Creation-Date: 2012-03-26 10:30+0200\n" |
1881 | -"PO-Revision-Date: 2011-02-07 21:18+0100\n" |
1882 | -"Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n" |
1883 | +"POT-Creation-Date: 2012-07-07 00:37+0200\n" |
1884 | +"PO-Revision-Date: 2012-06-13 15:38+0000\n" |
1885 | +"Last-Translator: Vincent Lhote <Unknown>\n" |
1886 | "Language-Team: Oriya\n" |
1887 | -"Language: or\n" |
1888 | +"Language: fr\n" |
1889 | "MIME-Version: 1.0\n" |
1890 | "Content-Type: text/plain; charset=UTF-8\n" |
1891 | -"Content-Transfer-Encoding: 8-bit\n" |
1892 | +"Content-Transfer-Encoding: 8bit\n" |
1893 | +"X-Launchpad-Export-Date: 2012-07-09 21:00+0000\n" |
1894 | +"X-Generator: Launchpad (build 15558)\n" |
1895 | |
1896 | #: src/main.c:77 |
1897 | -#, fuzzy, c-format |
1898 | +#, c-format |
1899 | msgid "" |
1900 | "Copyright (C) %s jeanfi@gmail.com\n" |
1901 | "License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-" |
1902 | @@ -26,12 +28,12 @@ |
1903 | "There is NO WARRANTY, to the extent permitted by law.\n" |
1904 | msgstr "" |
1905 | "Copyright (C) %s wpitchoune@gmail.com\n" |
1906 | -"License GPLv2: GNU GPL version 3 ou ultérieure<http://www.gnu.org/licenses/" |
1907 | +"Licence GPLv2: GNU GPL version 3 ou ultérieure<http://www.gnu.org/licenses/" |
1908 | "old-licenses/gpl-2.0.html>\n" |
1909 | "Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n" |
1910 | "redistribuer.\n" |
1911 | -"Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" |
1912 | -"autorisees par la loi applicable.\n" |
1913 | +"Ce logiciel n'est accompagné d’ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" |
1914 | +"autorisées par la loi applicable.\n" |
1915 | |
1916 | #: src/main.c:88 src/server/server.c:86 |
1917 | #, c-format |
1918 | @@ -68,6 +70,8 @@ |
1919 | #: src/main.c:105 |
1920 | msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" |
1921 | msgstr "" |
1922 | +" -d, --debug=LEVEL assigner le niveau de débogage, nombre entier entre 0 " |
1923 | +"et 3" |
1924 | |
1925 | #: src/main.c:110 src/server/server.c:104 |
1926 | #, c-format |
1927 | @@ -77,12 +81,11 @@ |
1928 | #: src/main.c:112 src/server/server.c:106 |
1929 | #, c-format |
1930 | msgid "%s home page: <%s>\n" |
1931 | -msgstr "%s page d'acceuil: <%s>\n" |
1932 | +msgstr "%s page d’accueil: <%s>\n" |
1933 | |
1934 | #: src/main.c:425 |
1935 | -#, fuzzy |
1936 | msgid "Enables debug mode." |
1937 | -msgstr "Activée" |
1938 | +msgstr "Active le mode de débogage." |
1939 | |
1940 | #: src/main.c:434 src/server/server.c:352 |
1941 | #, c-format |
1942 | @@ -97,10 +100,9 @@ |
1943 | "distance.\n" |
1944 | |
1945 | #: src/ui.c:80 |
1946 | -#, fuzzy |
1947 | msgid "Psensor is a GTK+ application for monitoring hardware sensors" |
1948 | msgstr "" |
1949 | -"psensor est une application GTK pour surveiller les sondes matérielles " |
1950 | +"Psensor est une application GTK+ pour surveiller les sondes matérielles " |
1951 | "thermiques et les ventilateurs." |
1952 | |
1953 | #: src/ui.c:83 |
1954 | @@ -108,36 +110,34 @@ |
1955 | "Copyright(c) 2010-2012\n" |
1956 | "jeanfi@gmail.com" |
1957 | msgstr "" |
1958 | +"Copyright(c) 2010-2012\n" |
1959 | +"jeanfi@gmail.com" |
1960 | |
1961 | #: src/ui.c:86 |
1962 | msgid "About Psensor" |
1963 | -msgstr "" |
1964 | +msgstr "A propos de Psensor" |
1965 | |
1966 | #: src/ui.c:89 |
1967 | msgid "Psensor Homepage" |
1968 | -msgstr "" |
1969 | +msgstr "Site internet de Psensor" |
1970 | |
1971 | #: src/ui.c:144 |
1972 | -#, fuzzy |
1973 | msgid "_Preferences" |
1974 | -msgstr "Configuration" |
1975 | +msgstr "_Configuration" |
1976 | |
1977 | #: src/ui.c:145 src/ui_sensorlist.c:200 |
1978 | msgid "Preferences" |
1979 | msgstr "Configuration" |
1980 | |
1981 | #: src/ui.c:149 |
1982 | -#, fuzzy |
1983 | msgid "_Sensor Preferences" |
1984 | -msgstr "Editer La Configuration Des Sondes" |
1985 | +msgstr "Configuration Des Sondes" |
1986 | |
1987 | #: src/ui.c:150 |
1988 | -#, fuzzy |
1989 | msgid "Sensor Preferences" |
1990 | -msgstr "Editer La Configuration Des Sondes" |
1991 | +msgstr "Configuration Des Sondes" |
1992 | |
1993 | #: src/ui.c:154 |
1994 | -#, fuzzy |
1995 | msgid "_Quit" |
1996 | msgstr "Quitter" |
1997 | |
1998 | @@ -147,29 +147,29 @@ |
1999 | |
2000 | #: src/ui.c:160 |
2001 | msgid "_About" |
2002 | -msgstr "" |
2003 | +msgstr "À propos" |
2004 | |
2005 | #: src/ui.c:161 |
2006 | msgid "About" |
2007 | -msgstr "" |
2008 | +msgstr "A propos" |
2009 | |
2010 | #: src/ui.c:183 src/ui_appindicator.c:176 |
2011 | #, c-format |
2012 | msgid "building menus failed: %s" |
2013 | -msgstr "" |
2014 | +msgstr "La construction des menus a échouée: %s" |
2015 | |
2016 | #: src/ui.c:231 |
2017 | msgid "Psensor - Temperature Monitor" |
2018 | -msgstr "Psensor - Surveillance Des Temperatures" |
2019 | +msgstr "Psensor - Surveillance Des Températures" |
2020 | |
2021 | #: src/ui.c:248 |
2022 | -#, fuzzy, c-format |
2023 | +#, c-format |
2024 | msgid "ERROR: Failed to load psensor icon.\n" |
2025 | -msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n" |
2026 | +msgstr "ERREUR: Échec du chargement de l’icône de Psensor\n" |
2027 | |
2028 | #: src/ui_sensorlist.c:231 |
2029 | msgid "Select foreground color" |
2030 | -msgstr "Selectionner la couleur d'avant-plan" |
2031 | +msgstr "Sélectionner la couleur d'avant-plan" |
2032 | |
2033 | #: src/ui_sensorlist.c:308 src/glade/psensor-pref.glade:241 |
2034 | msgid "Sensor" |
2035 | @@ -209,32 +209,33 @@ |
2036 | msgstr "Alerte thermique" |
2037 | |
2038 | #: src/ui_sensorpref.c:397 |
2039 | -#, fuzzy |
2040 | msgid "Sensor Name" |
2041 | -msgstr "Sonde" |
2042 | +msgstr "Nom De La Sonde" |
2043 | |
2044 | #: src/rsensor.c:107 |
2045 | -#, fuzzy, c-format |
2046 | +#, c-format |
2047 | msgid "Fail to connect to: %s" |
2048 | -msgstr "ERREUR: Echer de la connectio à: %s\n" |
2049 | +msgstr "Échec de la connexion à: %s" |
2050 | |
2051 | #: src/rsensor.c:144 |
2052 | -#, fuzzy, c-format |
2053 | +#, c-format |
2054 | msgid "Invalid content: %s" |
2055 | -msgstr "ERREUR: Contenu invalide: %s\n" |
2056 | +msgstr "Contenu invalide: %s" |
2057 | |
2058 | #: src/rsensor.c:184 |
2059 | -#, fuzzy, c-format |
2060 | +#, c-format |
2061 | msgid "Invalid JSON: %s" |
2062 | -msgstr "ERREUR: Invalide JSON: %s\n" |
2063 | +msgstr "JSON incorrect: %s" |
2064 | |
2065 | #: src/server/server.c:53 |
2066 | msgid "" |
2067 | "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>" |
2068 | msgstr "" |
2069 | +"<html><body><p>Page non trouvée - Allez à <a href='/'>Main page</a></p></" |
2070 | +"body>" |
2071 | |
2072 | #: src/server/server.c:76 |
2073 | -#, fuzzy, c-format |
2074 | +#, c-format |
2075 | msgid "" |
2076 | "Copyright (C) %s jeanfi@gmail.com\n" |
2077 | "License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-" |
2078 | @@ -248,7 +249,7 @@ |
2079 | "Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n" |
2080 | "redistribuer.\n" |
2081 | "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" |
2082 | -"autorisees par la loi applicable.\n" |
2083 | +"autorisées par la loi applicable.\n" |
2084 | |
2085 | #: src/server/server.c:88 |
2086 | msgid "" |
2087 | @@ -258,27 +259,26 @@ |
2088 | "matérielles." |
2089 | |
2090 | #: src/server/server.c:93 |
2091 | -#, fuzzy |
2092 | msgid "" |
2093 | " -h, --help\t\tdisplay this help and exit\n" |
2094 | " -v, --version\t\tdisplay version information and exit" |
2095 | msgstr "" |
2096 | -" -h, --help afficher cette aide et quitter\n" |
2097 | -" -v, --version afficher les informations de version et quitter" |
2098 | +" -h, --help\t\tafficher cette aide et quitter\n" |
2099 | +" -v, --version\t\tafficher les informations de version et quitter" |
2100 | |
2101 | #: src/server/server.c:98 |
2102 | -#, fuzzy |
2103 | msgid "" |
2104 | " -d,--debug\t\trun in debug mode\n" |
2105 | " -p,--port=PORT\twebserver port\n" |
2106 | " -w,--wdir=DIR\t\tdirectory containing webserver pages" |
2107 | msgstr "" |
2108 | -" -p,--port=PORT port du serveur Web\n" |
2109 | -" -w,--wdir=DIR répertoire contenant les pages du serveur Web" |
2110 | +" -d,--debug\t\trun in debug mode\n" |
2111 | +" -p,--port=PORT\tport du serveur Web\n" |
2112 | +" -w,--wdir=DIR\t\trépertoire contenant les pages du serveur Web" |
2113 | |
2114 | #: src/server/server.c:175 |
2115 | msgid "<html><body><p>Server stop requested</p></body></html>" |
2116 | -msgstr "" |
2117 | +msgstr "<html><body><p>L’arrêt du serveur a été demandé</p></body></html>" |
2118 | |
2119 | #: src/server/server.c:290 |
2120 | #, c-format |
2121 | @@ -296,19 +296,19 @@ |
2122 | msgstr "ERREUR: Echec de la creation du serveur Web\n" |
2123 | |
2124 | #: src/server/server.c:377 |
2125 | -#, fuzzy, c-format |
2126 | +#, c-format |
2127 | msgid "Web server started on port: %d" |
2128 | -msgstr "Server Web demarre sur le port: %d\n" |
2129 | +msgstr "Le serveur Web a été démarre sur le port: %d" |
2130 | |
2131 | #: src/server/server.c:378 |
2132 | -#, fuzzy, c-format |
2133 | +#, c-format |
2134 | msgid "WWW directory: %s" |
2135 | -msgstr "WWW repertoire: %s\n" |
2136 | +msgstr "WWW répertoire: %s" |
2137 | |
2138 | #: src/server/server.c:379 |
2139 | -#, fuzzy, c-format |
2140 | +#, c-format |
2141 | msgid "URL: http://localhost:%d" |
2142 | -msgstr "URL: http://localhost:%d\n" |
2143 | +msgstr "URL: http://localhost:%d" |
2144 | |
2145 | #: src/lib/amd.c:151 |
2146 | #, c-format |
2147 | @@ -321,25 +321,24 @@ |
2148 | msgstr "" |
2149 | |
2150 | #: src/lib/amd.c:185 |
2151 | -#, fuzzy, c-format |
2152 | +#, c-format |
2153 | msgid "ERROR: ADL Initialization Error!\n" |
2154 | -msgstr "ERREUR: échec de l'initialisation nvidia\n" |
2155 | +msgstr "ERREUR: échec de l'initialisation ADL\n" |
2156 | |
2157 | #: src/lib/amd.c:193 |
2158 | -#, fuzzy, c-format |
2159 | +#, c-format |
2160 | msgid "ERROR: Cannot get the number of adapters!\n" |
2161 | msgstr "" |
2162 | -"ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n" |
2163 | |
2164 | #: src/lib/hdd.c:58 |
2165 | -#, fuzzy, c-format |
2166 | +#, c-format |
2167 | msgid "ERROR: hdd fetch, failed to open socket\n" |
2168 | -msgstr "ERREUR: hdd_fetch, écher d'ouverture de la socket\n" |
2169 | +msgstr "ERREUR: hdd_fetch, échec d'ouverture de la socket\n" |
2170 | |
2171 | #: src/lib/hdd.c:72 |
2172 | -#, fuzzy, c-format |
2173 | +#, c-format |
2174 | msgid "ERROR: hdd fetch, failed to open connection\n" |
2175 | -msgstr "ERREUR: hdd_fetch, écher de l'ouverture de la connection\n" |
2176 | +msgstr "ERREUR: hdd_fetch, échec de l'ouverture de la connection\n" |
2177 | |
2178 | #: src/lib/hdd.c:182 |
2179 | #, c-format |
2180 | @@ -354,7 +353,7 @@ |
2181 | #: src/lib/log.c:37 |
2182 | #, c-format |
2183 | msgid "Cannot open log file: %s" |
2184 | -msgstr "" |
2185 | +msgstr "Impossible d'ouvrir le journal: %s" |
2186 | |
2187 | #: src/lib/nvidia.c:54 |
2188 | #, c-format |
2189 | @@ -362,14 +361,14 @@ |
2190 | msgstr "ERREUR: échec de la récupération des températures nvidia\n" |
2191 | |
2192 | #: src/lib/nvidia.c:91 |
2193 | -#, fuzzy, c-format |
2194 | +#, c-format |
2195 | msgid "ERROR: Cannot open connection to X Server\n" |
2196 | -msgstr "ERREUR: Echer de la connectio à: %s\n" |
2197 | +msgstr "ERREUR: Echec de la connection au serveur X11\n" |
2198 | |
2199 | #: src/lib/nvidia.c:99 |
2200 | -#, fuzzy, c-format |
2201 | +#, c-format |
2202 | msgid "ERROR: Cannot retrieve NVidia information\n" |
2203 | -msgstr "ERREUR: échec de la récupération des températures nvidia\n" |
2204 | +msgstr "ERREUR: échec de la récupération des informations NVidia\n" |
2205 | |
2206 | #: src/lib/lmsensor.c:43 |
2207 | #, c-format |
2208 | @@ -387,21 +386,17 @@ |
2209 | msgid "ERROR: lm-sensors initialization failure: %s\n" |
2210 | msgstr "ERREUR: échec de l'initialisation de lm-sensors: %s\n" |
2211 | |
2212 | -#: src/lib/psensor.c:430 |
2213 | -msgid "C" |
2214 | -msgstr "" |
2215 | - |
2216 | #: src/lib/psensor.c:433 |
2217 | msgid "RPM" |
2218 | -msgstr "" |
2219 | +msgstr "RPM" |
2220 | |
2221 | #: src/lib/psensor.c:436 |
2222 | msgid "%" |
2223 | -msgstr "" |
2224 | +msgstr "%" |
2225 | |
2226 | #: src/glade/psensor-pref.glade:7 |
2227 | msgid "Edit Preferences" |
2228 | -msgstr "Editer la configuration" |
2229 | +msgstr "Éditer la configuration" |
2230 | |
2231 | #: src/glade/psensor-pref.glade:70 |
2232 | msgid "Graph Colors" |
2233 | @@ -413,7 +408,7 @@ |
2234 | |
2235 | #: src/glade/psensor-pref.glade:100 |
2236 | msgid "Background:" |
2237 | -msgstr "Arrière-plan :" |
2238 | +msgstr "Arrière-plan:" |
2239 | |
2240 | #: src/glade/psensor-pref.glade:114 |
2241 | msgid "Background opacity:" |
2242 | @@ -424,14 +419,12 @@ |
2243 | msgstr "Graphe" |
2244 | |
2245 | #: src/glade/psensor-pref.glade:183 |
2246 | -#, fuzzy |
2247 | msgid "Update interval:" |
2248 | -msgstr "Interval de mise à jour du graphe:" |
2249 | +msgstr "Intervalle de mise à jour:" |
2250 | |
2251 | #: src/glade/psensor-pref.glade:197 |
2252 | -#, fuzzy |
2253 | msgid "Monitoring duration:" |
2254 | -msgstr "Durée de surveillance du graphe:" |
2255 | +msgstr "Durée de surveillance:" |
2256 | |
2257 | #: src/glade/psensor-pref.glade:210 src/glade/psensor-pref.glade:272 |
2258 | msgid "second(s)" |
2259 | @@ -443,7 +436,7 @@ |
2260 | |
2261 | #: src/glade/psensor-pref.glade:259 |
2262 | msgid "Measure update interval:" |
2263 | -msgstr "Interval de mise à jour des mesures:" |
2264 | +msgstr "Intervalle de mise à jour des mesures:" |
2265 | |
2266 | #: src/glade/psensor-pref.glade:288 |
2267 | msgid "Interface" |
2268 | @@ -470,26 +463,24 @@ |
2269 | msgstr "<i>Max</i>" |
2270 | |
2271 | #: src/glade/psensor-pref.glade:483 |
2272 | -#, fuzzy |
2273 | msgid "Enable menu" |
2274 | -msgstr "Activée" |
2275 | +msgstr "Activer le menu" |
2276 | |
2277 | #: src/glade/psensor-pref.glade:500 |
2278 | msgid "Enable Unity Launcher counter" |
2279 | msgstr "Activer le compteur du lanceur de Unity" |
2280 | |
2281 | #: src/glade/psensor-pref.glade:518 |
2282 | -#, fuzzy |
2283 | msgid "Hide window on startup" |
2284 | -msgstr "Cacher les décorations de la fenêtre" |
2285 | +msgstr "Cacher la fenêtre au lancement" |
2286 | |
2287 | #: src/glade/psensor-pref.glade:535 |
2288 | msgid "Restore window position and size" |
2289 | -msgstr "" |
2290 | +msgstr "Restaurer la position et la taille de la fenêtre" |
2291 | |
2292 | #: src/glade/sensor-edit.glade:8 |
2293 | msgid "Edit Sensor Preferences" |
2294 | -msgstr "Editer La Configuration Des Sondes" |
2295 | +msgstr "Éditer La Configuration Des Sondes" |
2296 | |
2297 | #: src/glade/sensor-edit.glade:104 |
2298 | msgid "Name:" |
2299 | @@ -504,7 +495,6 @@ |
2300 | msgstr "Id:" |
2301 | |
2302 | #: src/glade/sensor-edit.glade:202 |
2303 | -#, fuzzy |
2304 | msgid "Color:" |
2305 | msgstr "Couleur:" |
2306 | |
2307 | @@ -522,7 +512,7 @@ |
2308 | |
2309 | #: src/glade/sensor-edit.glade:266 |
2310 | msgid "Sensor Information" |
2311 | -msgstr "Information sonde" |
2312 | +msgstr "Information de la sonde" |
2313 | |
2314 | #: src/glade/sensor-edit.glade:279 |
2315 | msgid "Draw sensor curve" |
2316 | @@ -531,58 +521,3 @@ |
2317 | #: src/glade/sensor-edit.glade:327 |
2318 | msgid "°C" |
2319 | msgstr "°C" |
2320 | - |
2321 | -#~ msgid "ERROR: failed gettimeofday\n" |
2322 | -#~ msgstr "ERREUR: échec gettimeofday\n" |
2323 | - |
2324 | -#~ msgid "Current" |
2325 | -#~ msgstr "Actuelle" |
2326 | - |
2327 | -#~ msgid "ERROR: failed to init lm-sensors\n" |
2328 | -#~ msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n" |
2329 | - |
2330 | -#, fuzzy |
2331 | -#~ msgid "ERROR: lmsensor init failure: %s\n" |
2332 | -#~ msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n" |
2333 | - |
2334 | -#~ msgid "LUATPL Error: failed to load Lua script: %s.\n" |
2335 | -#~ msgstr "LUATPL Erreur: échec du chargement du script LUA: %s.\n" |
2336 | - |
2337 | -#~ msgid "LUATPL Error: failed to call init function: %s.\n" |
2338 | -#~ msgstr "LUATPL Erreur: échec du lancement de la fonction init: %s.\n" |
2339 | - |
2340 | -#~ msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n" |
2341 | -#~ msgstr "LUATP Erreur: échec de l'exécution du script Lua (%s): %s.\n" |
2342 | - |
2343 | -#~ msgid "LUATPL Error:lua script (%s) returned a wrong type.\n" |
2344 | -#~ msgstr "LUATPL Errur: le script Lua (%s) a retourné le mauvais type.\n" |
2345 | - |
2346 | -#~ msgid "LUATPL Error:failed to open lua state.\n" |
2347 | -#~ msgstr "LUATPL Errur: écher de creation du Lua state.\n" |
2348 | - |
2349 | -#~ msgid "LUATPL Error: code: %d.\n" |
2350 | -#~ msgstr "LUATPL Erreur: code: %d.\n" |
2351 | - |
2352 | -#~ msgid "ERROR: nvidia initialization failure: %d\n" |
2353 | -#~ msgstr "ERREUR: échec de l'initialisation nvidia: %d\n" |
2354 | - |
2355 | -#~ msgid "ERROR: no nvidia chips or initialization failure\n" |
2356 | -#~ msgstr "ERREUR: aucunes puces nvidia ou échec de l'initialisation\n" |
2357 | - |
2358 | -#~ msgid "Show" |
2359 | -#~ msgstr "Montrer" |
2360 | - |
2361 | -#~ msgid "Right" |
2362 | -#~ msgstr "Droite" |
2363 | - |
2364 | -#~ msgid "Left" |
2365 | -#~ msgstr "Gauche" |
2366 | - |
2367 | -#~ msgid "Top" |
2368 | -#~ msgstr "Haut" |
2369 | - |
2370 | -#~ msgid "Bottom" |
2371 | -#~ msgstr "Bas" |
2372 | - |
2373 | -#~ msgid "ERROR: Lua support not enabled\n" |
2374 | -#~ msgstr "ERREUR: Le support de Lua n'est pas activé\n" |
2375 | |
2376 | === modified file 'po/psensor.pot' |
2377 | --- po/psensor.pot 2012-04-09 12:15:54 +0000 |
2378 | +++ po/psensor.pot 2012-08-31 10:30:30 +0000 |
2379 | @@ -8,7 +8,7 @@ |
2380 | msgstr "" |
2381 | "Project-Id-Version: PACKAGE VERSION\n" |
2382 | "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" |
2383 | -"POT-Creation-Date: 2012-03-26 10:30+0200\n" |
2384 | +"POT-Creation-Date: 2012-07-07 00:37+0200\n" |
2385 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
2386 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
2387 | "Language-Team: LANGUAGE <LL@li.org>\n" |
2388 | @@ -348,10 +348,6 @@ |
2389 | msgid "ERROR: lm-sensors initialization failure: %s\n" |
2390 | msgstr "" |
2391 | |
2392 | -#: src/lib/psensor.c:430 |
2393 | -msgid "C" |
2394 | -msgstr "" |
2395 | - |
2396 | #: src/lib/psensor.c:433 |
2397 | msgid "RPM" |
2398 | msgstr "" |
2399 | |
2400 | === modified file 'po/tr.gmo' |
2401 | Binary files po/tr.gmo 2012-04-09 12:15:54 +0000 and po/tr.gmo 2012-08-31 10:30:30 +0000 differ |
2402 | === modified file 'po/tr.po' |
2403 | --- po/tr.po 2012-04-09 12:15:54 +0000 |
2404 | +++ po/tr.po 2012-08-31 10:30:30 +0000 |
2405 | @@ -7,16 +7,16 @@ |
2406 | msgstr "" |
2407 | "Project-Id-Version: psensor\n" |
2408 | "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" |
2409 | -"POT-Creation-Date: 2012-03-26 10:30+0200\n" |
2410 | -"PO-Revision-Date: 2011-04-10 13:11+0000\n" |
2411 | +"POT-Creation-Date: 2012-07-07 00:37+0200\n" |
2412 | +"PO-Revision-Date: 2012-03-28 11:40+0000\n" |
2413 | "Last-Translator: zeugma <Unknown>\n" |
2414 | "Language-Team: Turkish <tr@li.org>\n" |
2415 | "Language: tr\n" |
2416 | "MIME-Version: 1.0\n" |
2417 | "Content-Type: text/plain; charset=UTF-8\n" |
2418 | "Content-Transfer-Encoding: 8bit\n" |
2419 | -"X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n" |
2420 | -"X-Generator: Launchpad (build 12735)\n" |
2421 | +"X-Launchpad-Export-Date: 2012-07-09 21:00+0000\n" |
2422 | +"X-Generator: Launchpad (build 15558)\n" |
2423 | |
2424 | #: src/main.c:77 |
2425 | #, c-format |
2426 | @@ -102,7 +102,6 @@ |
2427 | msgstr "" |
2428 | |
2429 | #: src/ui.c:144 |
2430 | -#, fuzzy |
2431 | msgid "_Preferences" |
2432 | msgstr "Tercihler" |
2433 | |
2434 | @@ -111,12 +110,10 @@ |
2435 | msgstr "Tercihler" |
2436 | |
2437 | #: src/ui.c:149 |
2438 | -#, fuzzy |
2439 | msgid "_Sensor Preferences" |
2440 | msgstr "Tercihleri düzenle" |
2441 | |
2442 | #: src/ui.c:150 |
2443 | -#, fuzzy |
2444 | msgid "Sensor Preferences" |
2445 | msgstr "Tercihleri düzenle" |
2446 | |
2447 | @@ -192,7 +189,6 @@ |
2448 | msgstr "" |
2449 | |
2450 | #: src/ui_sensorpref.c:397 |
2451 | -#, fuzzy |
2452 | msgid "Sensor Name" |
2453 | msgstr "Algılayıcı" |
2454 | |
2455 | @@ -353,10 +349,6 @@ |
2456 | msgid "ERROR: lm-sensors initialization failure: %s\n" |
2457 | msgstr "" |
2458 | |
2459 | -#: src/lib/psensor.c:430 |
2460 | -msgid "C" |
2461 | -msgstr "" |
2462 | - |
2463 | #: src/lib/psensor.c:433 |
2464 | msgid "RPM" |
2465 | msgstr "" |
2466 | @@ -374,9 +366,8 @@ |
2467 | msgstr "Grafik Renkleri" |
2468 | |
2469 | #: src/glade/psensor-pref.glade:86 |
2470 | -#, fuzzy |
2471 | msgid "Foreground:" |
2472 | -msgstr "Arkaplan:" |
2473 | +msgstr "" |
2474 | |
2475 | #: src/glade/psensor-pref.glade:100 |
2476 | msgid "Background:" |
2477 | @@ -451,7 +442,6 @@ |
2478 | msgstr "" |
2479 | |
2480 | #: src/glade/sensor-edit.glade:8 |
2481 | -#, fuzzy |
2482 | msgid "Edit Sensor Preferences" |
2483 | msgstr "Tercihleri düzenle" |
2484 | |
2485 | @@ -494,12 +484,3 @@ |
2486 | #: src/glade/sensor-edit.glade:327 |
2487 | msgid "°C" |
2488 | msgstr "" |
2489 | - |
2490 | -#~ msgid "Right" |
2491 | -#~ msgstr "Sağ" |
2492 | - |
2493 | -#~ msgid "Left" |
2494 | -#~ msgstr "Sol" |
2495 | - |
2496 | -#~ msgid "Top" |
2497 | -#~ msgstr "Üstte" |
2498 | |
2499 | === modified file 'po/zh_CN.gmo' |
2500 | Binary files po/zh_CN.gmo 2012-04-09 12:15:54 +0000 and po/zh_CN.gmo 2012-08-31 10:30:30 +0000 differ |
2501 | === modified file 'po/zh_CN.po' |
2502 | --- po/zh_CN.po 2012-04-09 12:15:54 +0000 |
2503 | +++ po/zh_CN.po 2012-08-31 10:30:30 +0000 |
2504 | @@ -7,16 +7,16 @@ |
2505 | msgstr "" |
2506 | "Project-Id-Version: psensor 0.6.0.10\n" |
2507 | "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" |
2508 | -"POT-Creation-Date: 2012-03-26 10:30+0200\n" |
2509 | -"PO-Revision-Date: 2011-06-06 08:57+0000\n" |
2510 | -"Last-Translator: royclark <Unknown>\n" |
2511 | +"POT-Creation-Date: 2012-07-07 00:37+0200\n" |
2512 | +"PO-Revision-Date: 2012-05-09 02:21+0000\n" |
2513 | +"Last-Translator: Wang Dianjin <Unknown>\n" |
2514 | "Language-Team: Chinese (simplified)\n" |
2515 | "Language: zh_CN\n" |
2516 | "MIME-Version: 1.0\n" |
2517 | "Content-Type: text/plain; charset=UTF-8\n" |
2518 | "Content-Transfer-Encoding: 8bit\n" |
2519 | -"X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n" |
2520 | -"X-Generator: Launchpad (build 13144)\n" |
2521 | +"X-Launchpad-Export-Date: 2012-07-09 21:00+0000\n" |
2522 | +"X-Generator: Launchpad (build 15558)\n" |
2523 | |
2524 | #: src/main.c:77 |
2525 | #, c-format |
2526 | @@ -27,6 +27,11 @@ |
2527 | "This is free software: you are free to change and redistribute it.\n" |
2528 | "There is NO WARRANTY, to the extent permitted by law.\n" |
2529 | msgstr "" |
2530 | +"版权所有(C) %s jeanfi@gmail.com\n" |
2531 | +"协议 GPLv2:GNU GPL 第 2 版或以后的 <http://www.gnu.org/licenses/old-" |
2532 | +"licenses/gpl-2.0.html>\n" |
2533 | +"该软件为自由软件:您可以自由修改并分发。\n" |
2534 | +"There is NO WARRANTY, to the extent permitted by law。\n" |
2535 | |
2536 | #: src/main.c:88 src/server/server.c:86 |
2537 | #, c-format |
2538 | @@ -41,7 +46,7 @@ |
2539 | |
2540 | #: src/main.c:94 |
2541 | msgid "Options:" |
2542 | -msgstr "" |
2543 | +msgstr "选项:" |
2544 | |
2545 | #: src/main.c:95 |
2546 | msgid "" |
2547 | @@ -59,70 +64,71 @@ |
2548 | |
2549 | #: src/main.c:105 |
2550 | msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" |
2551 | -msgstr "" |
2552 | +msgstr " -d,--debug=LEVEL 设置调试等级,等级为 0 到 3 之间的整数" |
2553 | |
2554 | #: src/main.c:110 src/server/server.c:104 |
2555 | #, c-format |
2556 | msgid "Report bugs to: %s\n" |
2557 | -msgstr "" |
2558 | +msgstr "报告问题至:%s\n" |
2559 | |
2560 | #: src/main.c:112 src/server/server.c:106 |
2561 | #, c-format |
2562 | msgid "%s home page: <%s>\n" |
2563 | -msgstr "" |
2564 | +msgstr "%s 主页:<%s>\n" |
2565 | |
2566 | #: src/main.c:425 |
2567 | msgid "Enables debug mode." |
2568 | -msgstr "" |
2569 | +msgstr "启用调试模式。" |
2570 | |
2571 | #: src/main.c:434 src/server/server.c:352 |
2572 | #, c-format |
2573 | msgid "Try `%s --help' for more information.\n" |
2574 | -msgstr "" |
2575 | +msgstr "试用‘%s --help’来获得更多信息。\n" |
2576 | |
2577 | #: src/main.c:469 |
2578 | #, c-format |
2579 | msgid "ERROR: Not compiled with remote sensor support.\n" |
2580 | -msgstr "" |
2581 | +msgstr "错误:无法支持编译远程监测器。\n" |
2582 | |
2583 | #: src/ui.c:80 |
2584 | -#, fuzzy |
2585 | msgid "Psensor is a GTK+ application for monitoring hardware sensors" |
2586 | -msgstr "psensor 是一个 GTK 程序,用来监视硬件传感器,包括温度和风扇转速。" |
2587 | +msgstr "Psensor 是一款 GTK+ 硬件监测传感应用程序" |
2588 | |
2589 | #: src/ui.c:83 |
2590 | msgid "" |
2591 | "Copyright(c) 2010-2012\n" |
2592 | "jeanfi@gmail.com" |
2593 | msgstr "" |
2594 | +"版权所有(c) 2010-2012\n" |
2595 | +"jeanfi@gmail.com" |
2596 | |
2597 | #: src/ui.c:86 |
2598 | msgid "About Psensor" |
2599 | -msgstr "" |
2600 | +msgstr "关于 Psensor" |
2601 | |
2602 | #: src/ui.c:89 |
2603 | msgid "Psensor Homepage" |
2604 | -msgstr "" |
2605 | +msgstr "Psensor 主页" |
2606 | |
2607 | #: src/ui.c:144 |
2608 | msgid "_Preferences" |
2609 | -msgstr "" |
2610 | +msgstr "首选项(_P)" |
2611 | |
2612 | #: src/ui.c:145 src/ui_sensorlist.c:200 |
2613 | msgid "Preferences" |
2614 | -msgstr "选项" |
2615 | +msgstr "首选项" |
2616 | |
2617 | #: src/ui.c:149 |
2618 | msgid "_Sensor Preferences" |
2619 | -msgstr "" |
2620 | +msgstr "传感器首选项(_S)" |
2621 | |
2622 | #: src/ui.c:150 |
2623 | msgid "Sensor Preferences" |
2624 | -msgstr "" |
2625 | +msgstr "传感器首选项" |
2626 | |
2627 | #: src/ui.c:154 |
2628 | msgid "_Quit" |
2629 | -msgstr "" |
2630 | +msgstr "退出(_Q)" |
2631 | |
2632 | #: src/ui.c:154 |
2633 | msgid "Quit" |
2634 | @@ -130,25 +136,25 @@ |
2635 | |
2636 | #: src/ui.c:160 |
2637 | msgid "_About" |
2638 | -msgstr "" |
2639 | +msgstr "关于(_A)" |
2640 | |
2641 | #: src/ui.c:161 |
2642 | msgid "About" |
2643 | -msgstr "" |
2644 | +msgstr "关于" |
2645 | |
2646 | #: src/ui.c:183 src/ui_appindicator.c:176 |
2647 | #, c-format |
2648 | msgid "building menus failed: %s" |
2649 | -msgstr "" |
2650 | +msgstr "创建菜单失败:%s" |
2651 | |
2652 | #: src/ui.c:231 |
2653 | msgid "Psensor - Temperature Monitor" |
2654 | -msgstr "" |
2655 | +msgstr "Psensor - 温度监视器" |
2656 | |
2657 | #: src/ui.c:248 |
2658 | #, c-format |
2659 | msgid "ERROR: Failed to load psensor icon.\n" |
2660 | -msgstr "" |
2661 | +msgstr "错误:无法加载 psensor 图标。\n" |
2662 | |
2663 | #: src/ui_sensorlist.c:231 |
2664 | msgid "Select foreground color" |
2665 | @@ -160,7 +166,7 @@ |
2666 | |
2667 | #: src/ui_sensorlist.c:314 |
2668 | msgid "Value" |
2669 | -msgstr "" |
2670 | +msgstr "值" |
2671 | |
2672 | #: src/ui_sensorlist.c:320 |
2673 | msgid "Min" |
2674 | @@ -181,11 +187,11 @@ |
2675 | #: src/ui_sensorlist.c:374 src/ui_sensorlist.c:375 src/ui_sensorlist.c:376 |
2676 | #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153 |
2677 | msgid "N/A" |
2678 | -msgstr "" |
2679 | +msgstr "不可用" |
2680 | |
2681 | #: src/ui_notify.c:45 |
2682 | msgid "gettimeofday failed" |
2683 | -msgstr "" |
2684 | +msgstr "获取时间失败" |
2685 | |
2686 | #: src/ui_notify.c:67 src/ui_notify.c:69 |
2687 | msgid "Temperature alert" |
2688 | @@ -193,27 +199,27 @@ |
2689 | |
2690 | #: src/ui_sensorpref.c:397 |
2691 | msgid "Sensor Name" |
2692 | -msgstr "" |
2693 | +msgstr "传感器名称" |
2694 | |
2695 | #: src/rsensor.c:107 |
2696 | #, c-format |
2697 | msgid "Fail to connect to: %s" |
2698 | -msgstr "" |
2699 | +msgstr "无法连接到:%s" |
2700 | |
2701 | #: src/rsensor.c:144 |
2702 | #, c-format |
2703 | msgid "Invalid content: %s" |
2704 | -msgstr "" |
2705 | +msgstr "无效内容:%s" |
2706 | |
2707 | #: src/rsensor.c:184 |
2708 | #, c-format |
2709 | msgid "Invalid JSON: %s" |
2710 | -msgstr "" |
2711 | +msgstr "无效 JSON:%s" |
2712 | |
2713 | #: src/server/server.c:53 |
2714 | msgid "" |
2715 | "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>" |
2716 | -msgstr "" |
2717 | +msgstr "<html><body><p>未找到页面 - 请访问<a href='/'>主页</a></p></body>" |
2718 | |
2719 | #: src/server/server.c:76 |
2720 | #, c-format |
2721 | @@ -224,6 +230,11 @@ |
2722 | "This is free software: you are free to change and redistribute it.\n" |
2723 | "There is NO WARRANTY, to the extent permitted by law.\n" |
2724 | msgstr "" |
2725 | +"版权所有(C) %s jeanfi@gmail.com\n" |
2726 | +"协议 GPLv2:GNU GPL 第 2 版或更新的<http://www.gnu.org/licenses/old-licenses/" |
2727 | +"gpl-2.0.html>\n" |
2728 | +"本软件为自由软件:您可以自由修改并分发。\n" |
2729 | +"There is NO WARRANTY, to the extent permitted by law。\n" |
2730 | |
2731 | #: src/server/server.c:88 |
2732 | msgid "" |
2733 | @@ -231,13 +242,12 @@ |
2734 | msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。" |
2735 | |
2736 | #: src/server/server.c:93 |
2737 | -#, fuzzy |
2738 | msgid "" |
2739 | " -h, --help\t\tdisplay this help and exit\n" |
2740 | " -v, --version\t\tdisplay version information and exit" |
2741 | msgstr "" |
2742 | -" -h, --help 显示这个帮助并退出\n" |
2743 | -" -v, --version 显示版本信息并退出" |
2744 | +" -h, --help\t\t 显示本帮助并退出\n" |
2745 | +" -v, --version\t\t 显示版本信息并退出" |
2746 | |
2747 | #: src/server/server.c:98 |
2748 | msgid "" |
2749 | @@ -245,131 +255,130 @@ |
2750 | " -p,--port=PORT\twebserver port\n" |
2751 | " -w,--wdir=DIR\t\tdirectory containing webserver pages" |
2752 | msgstr "" |
2753 | +" -d,--debug\t\t 以调试模式运行\n" |
2754 | +" -p,--port=PORT\t 网络服务器端口\n" |
2755 | +" -w,--wdir=DIR\t\t 包括网络服务器页面的目录" |
2756 | |
2757 | #: src/server/server.c:175 |
2758 | msgid "<html><body><p>Server stop requested</p></body></html>" |
2759 | -msgstr "" |
2760 | +msgstr "<html><body><p>服务器停止请求</p></body></html>" |
2761 | |
2762 | #: src/server/server.c:290 |
2763 | #, c-format |
2764 | msgid "HTTP Request: %s\n" |
2765 | -msgstr "" |
2766 | +msgstr "HTTP 请求:%s\n" |
2767 | |
2768 | #: src/server/server.c:366 |
2769 | #, c-format |
2770 | msgid "ERROR: no sensors detected\n" |
2771 | -msgstr "" |
2772 | +msgstr "错误:未检测到传感器\n" |
2773 | |
2774 | #: src/server/server.c:373 |
2775 | #, c-format |
2776 | msgid "ERROR: Fail to create web server\n" |
2777 | -msgstr "" |
2778 | +msgstr "错误:无法创建网络服务器\n" |
2779 | |
2780 | #: src/server/server.c:377 |
2781 | #, c-format |
2782 | msgid "Web server started on port: %d" |
2783 | -msgstr "" |
2784 | +msgstr "网络服务器启动端口:%d" |
2785 | |
2786 | #: src/server/server.c:378 |
2787 | #, c-format |
2788 | msgid "WWW directory: %s" |
2789 | -msgstr "" |
2790 | +msgstr "WWW 目录:%s" |
2791 | |
2792 | #: src/server/server.c:379 |
2793 | #, c-format |
2794 | msgid "URL: http://localhost:%d" |
2795 | -msgstr "" |
2796 | +msgstr "URL: http://localhost:%d" |
2797 | |
2798 | #: src/lib/amd.c:151 |
2799 | #, c-format |
2800 | msgid "ERROR: ADL library not found!\n" |
2801 | -msgstr "" |
2802 | +msgstr "错误:未找到 ADL 库\n" |
2803 | |
2804 | #: src/lib/amd.c:176 |
2805 | #, c-format |
2806 | msgid "ERROR: ADL's API is missing!\n" |
2807 | -msgstr "" |
2808 | +msgstr "错误:ADL 的 API 丢失!\n" |
2809 | |
2810 | #: src/lib/amd.c:185 |
2811 | #, c-format |
2812 | msgid "ERROR: ADL Initialization Error!\n" |
2813 | -msgstr "" |
2814 | +msgstr "错误:ADL 初始化出错!\n" |
2815 | |
2816 | #: src/lib/amd.c:193 |
2817 | #, c-format |
2818 | msgid "ERROR: Cannot get the number of adapters!\n" |
2819 | -msgstr "" |
2820 | +msgstr "错误:无法获取适配器数目!\n" |
2821 | |
2822 | #: src/lib/hdd.c:58 |
2823 | #, c-format |
2824 | msgid "ERROR: hdd fetch, failed to open socket\n" |
2825 | -msgstr "" |
2826 | +msgstr "错误:硬盘读取时,无法打开 socket\n" |
2827 | |
2828 | #: src/lib/hdd.c:72 |
2829 | #, c-format |
2830 | msgid "ERROR: hdd fetch, failed to open connection\n" |
2831 | -msgstr "" |
2832 | +msgstr "错误:硬盘读取时,无法打开连接\n" |
2833 | |
2834 | #: src/lib/hdd.c:182 |
2835 | #, c-format |
2836 | msgid "ERROR: wrong hdd string: %s" |
2837 | -msgstr "" |
2838 | +msgstr "错误:不正确的硬盘字符串:%s" |
2839 | |
2840 | #: src/lib/hdd.c:252 |
2841 | #, c-format |
2842 | msgid "ERROR: wrong hdd string: %s\n" |
2843 | -msgstr "" |
2844 | +msgstr "错误:不正确的硬盘字符串:%s\n" |
2845 | |
2846 | #: src/lib/log.c:37 |
2847 | #, c-format |
2848 | msgid "Cannot open log file: %s" |
2849 | -msgstr "" |
2850 | +msgstr "无法打开日志文件:%s" |
2851 | |
2852 | #: src/lib/nvidia.c:54 |
2853 | #, c-format |
2854 | msgid "ERROR: failed to retrieve nvidia temperature\n" |
2855 | -msgstr "" |
2856 | +msgstr "错误:无法获取 nvidia 温度\n" |
2857 | |
2858 | #: src/lib/nvidia.c:91 |
2859 | #, c-format |
2860 | msgid "ERROR: Cannot open connection to X Server\n" |
2861 | -msgstr "" |
2862 | +msgstr "错误:无法打开到 X Server 的连接\n" |
2863 | |
2864 | #: src/lib/nvidia.c:99 |
2865 | #, c-format |
2866 | msgid "ERROR: Cannot retrieve NVidia information\n" |
2867 | -msgstr "" |
2868 | +msgstr "错误:无法获取 NVidia 信息\n" |
2869 | |
2870 | #: src/lib/lmsensor.c:43 |
2871 | #, c-format |
2872 | msgid "ERROR: Can't get value of subfeature %s: %s\n" |
2873 | -msgstr "" |
2874 | +msgstr "错误:无法获取子功能的值:%s: %s\n" |
2875 | |
2876 | #: src/lib/lmsensor.c:125 |
2877 | #, c-format |
2878 | msgid "ERROR: create_sensor, wrong feature type\n" |
2879 | -msgstr "" |
2880 | +msgstr "错误:创建传感器时,不正确的特征类型\n" |
2881 | |
2882 | #: src/lib/lmsensor.c:208 |
2883 | #, c-format |
2884 | msgid "ERROR: lm-sensors initialization failure: %s\n" |
2885 | -msgstr "" |
2886 | - |
2887 | -#: src/lib/psensor.c:430 |
2888 | -msgid "C" |
2889 | -msgstr "" |
2890 | +msgstr "错误:lm-sensors 初始化失败:%s\n" |
2891 | |
2892 | #: src/lib/psensor.c:433 |
2893 | msgid "RPM" |
2894 | -msgstr "" |
2895 | +msgstr "转速" |
2896 | |
2897 | #: src/lib/psensor.c:436 |
2898 | msgid "%" |
2899 | -msgstr "" |
2900 | +msgstr "%" |
2901 | |
2902 | #: src/glade/psensor-pref.glade:7 |
2903 | msgid "Edit Preferences" |
2904 | -msgstr "" |
2905 | +msgstr "编辑首选项" |
2906 | |
2907 | #: src/glade/psensor-pref.glade:70 |
2908 | msgid "Graph Colors" |
2909 | @@ -377,7 +386,7 @@ |
2910 | |
2911 | #: src/glade/psensor-pref.glade:86 |
2912 | msgid "Foreground:" |
2913 | -msgstr "坐标栏:" |
2914 | +msgstr "前景:" |
2915 | |
2916 | #: src/glade/psensor-pref.glade:100 |
2917 | msgid "Background:" |
2918 | @@ -385,7 +394,7 @@ |
2919 | |
2920 | #: src/glade/psensor-pref.glade:114 |
2921 | msgid "Background opacity:" |
2922 | -msgstr "背景亮度:" |
2923 | +msgstr "背景透明:" |
2924 | |
2925 | #: src/glade/psensor-pref.glade:165 src/glade/sensor-edit.glade:184 |
2926 | msgid "Graph" |
2927 | @@ -393,23 +402,23 @@ |
2928 | |
2929 | #: src/glade/psensor-pref.glade:183 |
2930 | msgid "Update interval:" |
2931 | -msgstr "" |
2932 | +msgstr "更新间隔:" |
2933 | |
2934 | #: src/glade/psensor-pref.glade:197 |
2935 | msgid "Monitoring duration:" |
2936 | -msgstr "" |
2937 | +msgstr "监视持续时长:" |
2938 | |
2939 | #: src/glade/psensor-pref.glade:210 src/glade/psensor-pref.glade:272 |
2940 | msgid "second(s)" |
2941 | -msgstr "" |
2942 | +msgstr "秒" |
2943 | |
2944 | #: src/glade/psensor-pref.glade:225 |
2945 | msgid "minute(s)" |
2946 | -msgstr "" |
2947 | +msgstr "分钟" |
2948 | |
2949 | #: src/glade/psensor-pref.glade:259 |
2950 | msgid "Measure update interval:" |
2951 | -msgstr "" |
2952 | +msgstr "测量更新间隔:" |
2953 | |
2954 | #: src/glade/psensor-pref.glade:288 |
2955 | msgid "Interface" |
2956 | @@ -437,24 +446,23 @@ |
2957 | |
2958 | #: src/glade/psensor-pref.glade:483 |
2959 | msgid "Enable menu" |
2960 | -msgstr "" |
2961 | +msgstr "启用菜单" |
2962 | |
2963 | #: src/glade/psensor-pref.glade:500 |
2964 | msgid "Enable Unity Launcher counter" |
2965 | -msgstr "" |
2966 | +msgstr "启用 Unity 启动器计数器" |
2967 | |
2968 | #: src/glade/psensor-pref.glade:518 |
2969 | -#, fuzzy |
2970 | msgid "Hide window on startup" |
2971 | -msgstr "隐藏窗口标题栏" |
2972 | +msgstr "启动时隐藏窗口" |
2973 | |
2974 | #: src/glade/psensor-pref.glade:535 |
2975 | msgid "Restore window position and size" |
2976 | -msgstr "" |
2977 | +msgstr "恢复窗口位置和大小" |
2978 | |
2979 | #: src/glade/sensor-edit.glade:8 |
2980 | msgid "Edit Sensor Preferences" |
2981 | -msgstr "监视设备选项" |
2982 | +msgstr "编辑传感器首选项" |
2983 | |
2984 | #: src/glade/sensor-edit.glade:104 |
2985 | msgid "Name:" |
2986 | @@ -470,11 +478,11 @@ |
2987 | |
2988 | #: src/glade/sensor-edit.glade:202 |
2989 | msgid "Color:" |
2990 | -msgstr "" |
2991 | +msgstr "颜色:" |
2992 | |
2993 | #: src/glade/sensor-edit.glade:216 |
2994 | msgid "Alarm" |
2995 | -msgstr "警告信息" |
2996 | +msgstr "警告" |
2997 | |
2998 | #: src/glade/sensor-edit.glade:231 |
2999 | msgid "Activate desktop notifications" |
3000 | @@ -486,7 +494,7 @@ |
3001 | |
3002 | #: src/glade/sensor-edit.glade:266 |
3003 | msgid "Sensor Information" |
3004 | -msgstr "设备信息" |
3005 | +msgstr "传感器信息" |
3006 | |
3007 | #: src/glade/sensor-edit.glade:279 |
3008 | msgid "Draw sensor curve" |
3009 | @@ -494,28 +502,4 @@ |
3010 | |
3011 | #: src/glade/sensor-edit.glade:327 |
3012 | msgid "°C" |
3013 | -msgstr "" |
3014 | - |
3015 | -#~ msgid "Current" |
3016 | -#~ msgstr "当前" |
3017 | - |
3018 | -#~ msgid "Right" |
3019 | -#~ msgstr "右侧" |
3020 | - |
3021 | -#~ msgid "Left" |
3022 | -#~ msgstr "左侧" |
3023 | - |
3024 | -#~ msgid "Top" |
3025 | -#~ msgstr "顶部" |
3026 | - |
3027 | -#~ msgid "Bottom" |
3028 | -#~ msgstr "底部" |
3029 | - |
3030 | -#~ msgid "Show" |
3031 | -#~ msgstr "显示主窗口" |
3032 | - |
3033 | -#~ msgid "Graph update interval:" |
3034 | -#~ msgstr "图表更新间隔:" |
3035 | - |
3036 | -#~ msgid "Graph monitoring duration:" |
3037 | -#~ msgstr "图表监视持续时间:" |
3038 | +msgstr "°C" |
3039 | |
3040 | === modified file 'src/Makefile.in' |
3041 | --- src/Makefile.in 2011-12-22 21:11:44 +0000 |
3042 | +++ src/Makefile.in 2012-08-31 10:30:30 +0000 |
3043 | @@ -1,9 +1,9 @@ |
3044 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3045 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3046 | # @configure_input@ |
3047 | |
3048 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3049 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3050 | -# Inc. |
3051 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3052 | +# Foundation, Inc. |
3053 | # This Makefile.in is free software; the Free Software Foundation |
3054 | # gives unlimited permission to copy and/or distribute it, |
3055 | # with or without modifications, as long as this notice is preserved. |
3056 | @@ -122,6 +122,12 @@ |
3057 | am__base_list = \ |
3058 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
3059 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
3060 | +am__uninstall_files_from_dir = { \ |
3061 | + test -z "$$files" \ |
3062 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
3063 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
3064 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
3065 | + } |
3066 | man1dir = $(mandir)/man1 |
3067 | NROFF = nroff |
3068 | MANS = $(dist_man_MANS) |
3069 | @@ -394,7 +400,7 @@ |
3070 | |
3071 | clean-binPROGRAMS: |
3072 | -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) |
3073 | -psensor$(EXEEXT): $(psensor_OBJECTS) $(psensor_DEPENDENCIES) |
3074 | +psensor$(EXEEXT): $(psensor_OBJECTS) $(psensor_DEPENDENCIES) $(EXTRA_psensor_DEPENDENCIES) |
3075 | @rm -f psensor$(EXEEXT) |
3076 | $(LINK) $(psensor_OBJECTS) $(psensor_LDADD) $(LIBS) |
3077 | |
3078 | @@ -467,9 +473,7 @@ |
3079 | sed -n '/\.1[a-z]*$$/p'; \ |
3080 | } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ |
3081 | -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ |
3082 | - test -z "$$files" || { \ |
3083 | - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ |
3084 | - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } |
3085 | + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) |
3086 | |
3087 | # This directory's subdirectories are mostly independent; you can cd |
3088 | # into them and run `make' without going through this Makefile. |
3089 | @@ -695,10 +699,15 @@ |
3090 | |
3091 | installcheck: installcheck-recursive |
3092 | install-strip: |
3093 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3094 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3095 | - `test -z '$(STRIP)' || \ |
3096 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3097 | + if test -z '$(STRIP)'; then \ |
3098 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3099 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3100 | + install; \ |
3101 | + else \ |
3102 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3103 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3104 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3105 | + fi |
3106 | mostlyclean-generic: |
3107 | |
3108 | clean-generic: |
3109 | |
3110 | === modified file 'src/glade/Makefile.in' |
3111 | --- src/glade/Makefile.in 2011-11-25 02:56:22 +0000 |
3112 | +++ src/glade/Makefile.in 2012-08-31 10:30:30 +0000 |
3113 | @@ -1,9 +1,9 @@ |
3114 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3115 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3116 | # @configure_input@ |
3117 | |
3118 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3119 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3120 | -# Inc. |
3121 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3122 | +# Foundation, Inc. |
3123 | # This Makefile.in is free software; the Free Software Foundation |
3124 | # gives unlimited permission to copy and/or distribute it, |
3125 | # with or without modifications, as long as this notice is preserved. |
3126 | @@ -67,6 +67,12 @@ |
3127 | am__base_list = \ |
3128 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
3129 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
3130 | +am__uninstall_files_from_dir = { \ |
3131 | + test -z "$$files" \ |
3132 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
3133 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
3134 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
3135 | + } |
3136 | am__installdirs = "$(DESTDIR)$(gladedir)" |
3137 | DATA = $(glade_DATA) |
3138 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3139 | @@ -270,9 +276,7 @@ |
3140 | @$(NORMAL_UNINSTALL) |
3141 | @list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \ |
3142 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3143 | - test -n "$$files" || exit 0; \ |
3144 | - echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \ |
3145 | - cd "$(DESTDIR)$(gladedir)" && rm -f $$files |
3146 | + dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir) |
3147 | tags: TAGS |
3148 | TAGS: |
3149 | |
3150 | @@ -327,10 +331,15 @@ |
3151 | |
3152 | installcheck: installcheck-am |
3153 | install-strip: |
3154 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3155 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3156 | - `test -z '$(STRIP)' || \ |
3157 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3158 | + if test -z '$(STRIP)'; then \ |
3159 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3160 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3161 | + install; \ |
3162 | + else \ |
3163 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3164 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3165 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3166 | + fi |
3167 | mostlyclean-generic: |
3168 | |
3169 | clean-generic: |
3170 | |
3171 | === modified file 'src/lib/Makefile.in' |
3172 | --- src/lib/Makefile.in 2011-12-22 21:11:44 +0000 |
3173 | +++ src/lib/Makefile.in 2012-08-31 10:30:30 +0000 |
3174 | @@ -1,9 +1,9 @@ |
3175 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3176 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3177 | # @configure_input@ |
3178 | |
3179 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3180 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3181 | -# Inc. |
3182 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3183 | +# Foundation, Inc. |
3184 | # This Makefile.in is free software; the Free Software Foundation |
3185 | # gives unlimited permission to copy and/or distribute it, |
3186 | # with or without modifications, as long as this notice is preserved. |
3187 | @@ -280,7 +280,7 @@ |
3188 | |
3189 | clean-noinstLIBRARIES: |
3190 | -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) |
3191 | -libpsensor.a: $(libpsensor_a_OBJECTS) $(libpsensor_a_DEPENDENCIES) |
3192 | +libpsensor.a: $(libpsensor_a_OBJECTS) $(libpsensor_a_DEPENDENCIES) $(EXTRA_libpsensor_a_DEPENDENCIES) |
3193 | -rm -f libpsensor.a |
3194 | $(libpsensor_a_AR) libpsensor.a $(libpsensor_a_OBJECTS) $(libpsensor_a_LIBADD) |
3195 | $(RANLIB) libpsensor.a |
3196 | @@ -414,10 +414,15 @@ |
3197 | |
3198 | installcheck: installcheck-am |
3199 | install-strip: |
3200 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3201 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3202 | - `test -z '$(STRIP)' || \ |
3203 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3204 | + if test -z '$(STRIP)'; then \ |
3205 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3206 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3207 | + install; \ |
3208 | + else \ |
3209 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3210 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3211 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3212 | + fi |
3213 | mostlyclean-generic: |
3214 | |
3215 | clean-generic: |
3216 | |
3217 | === modified file 'src/lib/psensor.c' |
3218 | --- src/lib/psensor.c 2012-07-13 02:22:18 +0000 |
3219 | +++ src/lib/psensor.c 2012-08-31 10:30:30 +0000 |
3220 | @@ -207,7 +207,7 @@ |
3221 | char *unit; |
3222 | |
3223 | if (is_temp_type(type)) |
3224 | - unit = "°C"; |
3225 | + unit = "C"; |
3226 | else if (type & SENSOR_TYPE_CPU_USAGE) |
3227 | unit = "%"; |
3228 | else |
3229 | @@ -427,7 +427,7 @@ |
3230 | const char *psensor_type_to_unit_str(unsigned int type) |
3231 | { |
3232 | if (type & SENSOR_TYPE_TEMP) |
3233 | - return "\302\260C"; |
3234 | + return _("C"); |
3235 | |
3236 | if (type & SENSOR_TYPE_FAN) |
3237 | return _("RPM"); |
3238 | |
3239 | === modified file 'src/main.c' |
3240 | --- src/main.c 2012-07-13 02:22:18 +0000 |
3241 | +++ src/main.c 2012-08-31 10:30:30 +0000 |
3242 | @@ -514,16 +514,16 @@ |
3243 | ui_appindicator_init(&ui); |
3244 | #endif |
3245 | |
3246 | - /* |
3247 | - * show the window as soon as all gtk events have been processed |
3248 | - * in order to ensure that the status icon is attempted to be |
3249 | - * drawn before. If not, there is no way to detect that it is |
3250 | - * visible. |
3251 | - */ |
3252 | - g_idle_add((GSourceFunc)initial_window_show, &ui); |
3253 | - |
3254 | gdk_notify_startup_complete(); |
3255 | |
3256 | + /* |
3257 | + * hack, did not find a cleaner solution. |
3258 | + * wait 2s to ensure that the status icon is attempted to be |
3259 | + * drawn before determining whether the main window must be |
3260 | + * show. |
3261 | + */ |
3262 | + g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui); |
3263 | + |
3264 | /* main loop */ |
3265 | gtk_main(); |
3266 | |
3267 | |
3268 | === modified file 'src/psensor.1' |
3269 | --- src/psensor.1 2012-04-09 12:15:54 +0000 |
3270 | +++ src/psensor.1 2012-08-31 10:30:30 +0000 |
3271 | @@ -1,5 +1,5 @@ |
3272 | .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. |
3273 | -.TH PSENSOR "1" "March 2012" "psensor 0.6.2.17" "User Commands" |
3274 | +.TH PSENSOR "1" "August 2012" "psensor 0.6.2.19" "User Commands" |
3275 | .SH NAME |
3276 | psensor \- Temperature monitoring application |
3277 | .SH SYNOPSIS |
3278 | |
3279 | === modified file 'src/server/Makefile.in' |
3280 | --- src/server/Makefile.in 2011-12-22 21:11:44 +0000 |
3281 | +++ src/server/Makefile.in 2012-08-31 10:30:30 +0000 |
3282 | @@ -1,9 +1,9 @@ |
3283 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3284 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3285 | # @configure_input@ |
3286 | |
3287 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3288 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3289 | -# Inc. |
3290 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3291 | +# Foundation, Inc. |
3292 | # This Makefile.in is free software; the Free Software Foundation |
3293 | # gives unlimited permission to copy and/or distribute it, |
3294 | # with or without modifications, as long as this notice is preserved. |
3295 | @@ -88,6 +88,12 @@ |
3296 | am__base_list = \ |
3297 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
3298 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
3299 | +am__uninstall_files_from_dir = { \ |
3300 | + test -z "$$files" \ |
3301 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
3302 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
3303 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
3304 | + } |
3305 | man1dir = $(mandir)/man1 |
3306 | NROFF = nroff |
3307 | MANS = $(dist_man_MANS) |
3308 | @@ -317,7 +323,7 @@ |
3309 | |
3310 | clean-binPROGRAMS: |
3311 | -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) |
3312 | -psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) |
3313 | +psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) $(EXTRA_psensor_server_DEPENDENCIES) |
3314 | @rm -f psensor-server$(EXEEXT) |
3315 | $(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS) |
3316 | |
3317 | @@ -378,9 +384,7 @@ |
3318 | sed -n '/\.1[a-z]*$$/p'; \ |
3319 | } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ |
3320 | -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ |
3321 | - test -z "$$files" || { \ |
3322 | - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ |
3323 | - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } |
3324 | + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) |
3325 | |
3326 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
3327 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3328 | @@ -494,10 +498,15 @@ |
3329 | |
3330 | installcheck: installcheck-am |
3331 | install-strip: |
3332 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3333 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3334 | - `test -z '$(STRIP)' || \ |
3335 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3336 | + if test -z '$(STRIP)'; then \ |
3337 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3338 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3339 | + install; \ |
3340 | + else \ |
3341 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3342 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3343 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3344 | + fi |
3345 | mostlyclean-generic: |
3346 | |
3347 | clean-generic: |
3348 | |
3349 | === modified file 'src/server/psensor-server.1' |
3350 | --- src/server/psensor-server.1 2012-04-09 12:15:54 +0000 |
3351 | +++ src/server/psensor-server.1 2012-08-31 10:30:30 +0000 |
3352 | @@ -1,5 +1,5 @@ |
3353 | .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. |
3354 | -.TH PSENSOR-SERVER "1" "March 2012" "psensor-server 0.6.2.17" "User Commands" |
3355 | +.TH PSENSOR-SERVER "1" "August 2012" "psensor-server 0.6.2.19" "User Commands" |
3356 | .SH NAME |
3357 | psensor-server \- Temperature and system monitoring Web server |
3358 | .SH SYNOPSIS |
3359 | |
3360 | === modified file 'tests/Makefile.in' |
3361 | --- tests/Makefile.in 2011-11-25 02:56:22 +0000 |
3362 | +++ tests/Makefile.in 2012-08-31 10:30:30 +0000 |
3363 | @@ -1,9 +1,9 @@ |
3364 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3365 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3366 | # @configure_input@ |
3367 | |
3368 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3369 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3370 | -# Inc. |
3371 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3372 | +# Foundation, Inc. |
3373 | # This Makefile.in is free software; the Free Software Foundation |
3374 | # gives unlimited permission to copy and/or distribute it, |
3375 | # with or without modifications, as long as this notice is preserved. |
3376 | @@ -276,10 +276,15 @@ |
3377 | |
3378 | installcheck: installcheck-am |
3379 | install-strip: |
3380 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3381 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3382 | - `test -z '$(STRIP)' || \ |
3383 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3384 | + if test -z '$(STRIP)'; then \ |
3385 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3386 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3387 | + install; \ |
3388 | + else \ |
3389 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3390 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3391 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3392 | + fi |
3393 | mostlyclean-generic: |
3394 | |
3395 | clean-generic: |
3396 | |
3397 | === modified file 'www/Makefile.in' |
3398 | --- www/Makefile.in 2011-11-25 02:56:22 +0000 |
3399 | +++ www/Makefile.in 2012-08-31 10:30:30 +0000 |
3400 | @@ -1,9 +1,9 @@ |
3401 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3402 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3403 | # @configure_input@ |
3404 | |
3405 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3406 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3407 | -# Inc. |
3408 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3409 | +# Foundation, Inc. |
3410 | # This Makefile.in is free software; the Free Software Foundation |
3411 | # gives unlimited permission to copy and/or distribute it, |
3412 | # with or without modifications, as long as this notice is preserved. |
3413 | @@ -67,6 +67,12 @@ |
3414 | am__base_list = \ |
3415 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
3416 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
3417 | +am__uninstall_files_from_dir = { \ |
3418 | + test -z "$$files" \ |
3419 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
3420 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
3421 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
3422 | + } |
3423 | am__installdirs = "$(DESTDIR)$(defaultwwwdir)" |
3424 | DATA = $(defaultwww_DATA) |
3425 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3426 | @@ -279,9 +285,7 @@ |
3427 | @$(NORMAL_UNINSTALL) |
3428 | @list='$(defaultwww_DATA)'; test -n "$(defaultwwwdir)" || list=; \ |
3429 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3430 | - test -n "$$files" || exit 0; \ |
3431 | - echo " ( cd '$(DESTDIR)$(defaultwwwdir)' && rm -f" $$files ")"; \ |
3432 | - cd "$(DESTDIR)$(defaultwwwdir)" && rm -f $$files |
3433 | + dir='$(DESTDIR)$(defaultwwwdir)'; $(am__uninstall_files_from_dir) |
3434 | tags: TAGS |
3435 | TAGS: |
3436 | |
3437 | @@ -336,10 +340,15 @@ |
3438 | |
3439 | installcheck: installcheck-am |
3440 | install-strip: |
3441 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3442 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3443 | - `test -z '$(STRIP)' || \ |
3444 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3445 | + if test -z '$(STRIP)'; then \ |
3446 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3447 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3448 | + install; \ |
3449 | + else \ |
3450 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3451 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3452 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3453 | + fi |
3454 | mostlyclean-generic: |
3455 | |
3456 | clean-generic: |
Looks good to me, thanks — uploading! I just changed the version number to ...-0ubuntu1 as this isn't a merge.