diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff')
-rw-r--r-- | meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff | 2256 |
1 files changed, 2256 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff new file mode 100644 index 000000000..f61c1649a --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff | |||
@@ -0,0 +1,2256 @@ | |||
1 | Megapatch from debian | ||
2 | |||
3 | Original URL: http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-52.diff.gz | ||
4 | |||
5 | Filtered with: | ||
6 | filterdiff -p1 -x README -x 'debian/*' | ||
7 | |||
8 | |||
9 | Upstream-Status: unmaintained | ||
10 | |||
11 | --- hddtemp-0.3-beta15.orig/doc/hddtemp.8 | ||
12 | +++ hddtemp-0.3-beta15/doc/hddtemp.8 | ||
13 | @@ -58,6 +58,10 @@ | ||
14 | .B \-f, \-\-file=\fIfile\fI | ||
15 | Specify the database file to use. | ||
16 | .TP | ||
17 | +.B \-F, \-\-foreground | ||
18 | +Don't fork into the background even in daemon mode. This is useful | ||
19 | +when running under a process supervisor. | ||
20 | +.TP | ||
21 | .B \-l, \-\-listen=\fIaddr\fR | ||
22 | Listen on a specific address. \fIaddr\fR is a string containing a | ||
23 | host name or a numeric host address string. The numeric host address | ||
24 | @@ -80,6 +84,9 @@ | ||
25 | .B \-q, \-\-quiet | ||
26 | Don't check if the drive is supported. | ||
27 | .TP | ||
28 | +.B \-u, \-\-unit=\fIC|F\fR | ||
29 | +Force output temperature either in Celsius or Fahrenheit. | ||
30 | +.TP | ||
31 | .B \-v, \-\-version | ||
32 | Display hddtemp version number. | ||
33 | .TP | ||
34 | @@ -96,7 +103,7 @@ | ||
35 | .SH "DRIVE DATABASE" | ||
36 | If you know your drive has a temperature sensor but it is being | ||
37 | reported unsupported, tell me which model and which manufacturer it | ||
38 | -is, and/or just add a new entry in /usr/share/misc/hddtemp.db. Each | ||
39 | +is, and/or just add a new entry in /etc/hddtemp.db. Each | ||
40 | line of hddtemp.db is either a comment, a blank line or a line | ||
41 | containing: | ||
42 | .TP | ||
43 | @@ -112,7 +119,7 @@ | ||
44 | Feedback is welcome (see the REPORT section below). | ||
45 | |||
46 | .SH "TCP/IP DAEMON MODE" | ||
47 | -Exemple of type forcing: | ||
48 | +Example of type forcing: | ||
49 | .PP | ||
50 | # hddtemp SATA:/dev/sda PATA:/dev/hda | ||
51 | .PP | ||
52 | @@ -120,7 +127,7 @@ | ||
53 | .B hddtemp | ||
54 | in daemon mode, start it like this: | ||
55 | .PP | ||
56 | -# hddtemp -d /dev/hd[abcd] | ||
57 | +# hddtemp \-d /dev/hd[abcd] | ||
58 | .PP | ||
59 | .PP | ||
60 | and use | ||
61 | @@ -165,8 +172,8 @@ | ||
62 | investigation they do not. But fields 194 (which is the standard | ||
63 | field for temperature) and 231 are good candidates. | ||
64 | .PP | ||
65 | -Then, you can send me a report with outputs from `hddtemp --debug ...', | ||
66 | -`smartctl' or `hdparm -i ...', and/or add an entry in hddtemp.db | ||
67 | +Then, you can send me a report with outputs from `hddtemp \-\-debug ...', | ||
68 | +`smartctl' or `hdparm \-i ...', and/or add an entry in hddtemp.db | ||
69 | yourself. | ||
70 | |||
71 | .SH "BUGS" | ||
72 | @@ -183,5 +190,5 @@ | ||
73 | .PP | ||
74 | Emmanuel Varagnat (hddtemp@guzu.net). | ||
75 | .PP | ||
76 | -This manual page was originaly written by Aurelien Jarno <aurel32@debian.org>, | ||
77 | +This manual page was originally written by Aurelien Jarno <aurel32@debian.org>, | ||
78 | for the Debian GNU/Linux system (but may be used by others). | ||
79 | --- hddtemp-0.3-beta15.orig/po/fr.po | ||
80 | +++ hddtemp-0.3-beta15/po/fr.po | ||
81 | @@ -7,9 +7,9 @@ | ||
82 | msgid "" | ||
83 | msgstr "" | ||
84 | "Project-Id-Version: fr\n" | ||
85 | -"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" | ||
86 | -"POT-Creation-Date: 2005-02-25 22:43+0100\n" | ||
87 | -"PO-Revision-Date: 2003-06-03 00:58GMT+1\n" | ||
88 | +"Report-Msgid-Bugs-To: \n" | ||
89 | +"POT-Creation-Date: 2006-06-29 16:24+0200\n" | ||
90 | +"PO-Revision-Date: 2011-08-30 16:38+0200\n" | ||
91 | "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" | ||
92 | "Language-Team: FRANCAIS <fr@li.org>\n" | ||
93 | "MIME-Version: 1.0\n" | ||
94 | @@ -17,23 +17,7 @@ | ||
95 | "Content-Transfer-Encoding: 8bit\n" | ||
96 | "X-Generator: KBabel 1.0.1\n" | ||
97 | |||
98 | -#: src/hddtemp.c:112 | ||
99 | -#, c-format | ||
100 | -msgid "" | ||
101 | -"\n" | ||
102 | -"Regexp%s| Value | Description\n" | ||
103 | -"------%s---------------------\n" | ||
104 | -msgstr "" | ||
105 | -"\n" | ||
106 | -"Regexp%s| Valeur | Description\n" | ||
107 | -"------%s----------------------\n" | ||
108 | - | ||
109 | -#: src/hddtemp.c:118 | ||
110 | -#, c-format | ||
111 | -msgid "%s%s| %5d | %s\n" | ||
112 | -msgstr "%s%s| %5d | %s\n" | ||
113 | - | ||
114 | -#: src/hddtemp.c:161 | ||
115 | +#: src/hddtemp.c:156 | ||
116 | #, c-format | ||
117 | msgid "" | ||
118 | "\n" | ||
119 | @@ -46,7 +30,7 @@ | ||
120 | "Modèle: %s\n" | ||
121 | "\n" | ||
122 | |||
123 | -#: src/hddtemp.c:188 | ||
124 | +#: src/hddtemp.c:189 | ||
125 | #, c-format | ||
126 | msgid "" | ||
127 | "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" | ||
128 | @@ -60,75 +44,60 @@ | ||
129 | "net).\n" | ||
130 | "ATTENTION : Voir les options --help, --debug et --drivebase.\n" | ||
131 | |||
132 | -#: src/hddtemp.c:192 | ||
133 | +#: src/hddtemp.c:197 | ||
134 | #, c-format | ||
135 | msgid "%s: %s: no sensor\n" | ||
136 | msgstr "%s: %s : pas de capteur\n" | ||
137 | |||
138 | -#: src/hddtemp.c:197 | ||
139 | -#, c-format | ||
140 | -msgid "" | ||
141 | -"WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
142 | -"WARNING: But using a common value, it reports something.\n" | ||
143 | -"WARNING: Note that the temperature shown could be wrong.\n" | ||
144 | -"WARNING: See --help, --debug and --drivebase options.\n" | ||
145 | -"WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
146 | -msgstr "" | ||
147 | -"ATTENTION : Le lecteur %s n'apparait pas dans la base de données des " | ||
148 | -"lecteurs supportés\n" | ||
149 | -"ATTENTION : Mais en utilisant une valeur courante, il renvoie quelque " | ||
150 | -"chose.\n" | ||
151 | -"ATTENTION : Notez que la température renvoyée peut être erronée.\n" | ||
152 | -"ATTENTION : Voir les options --help, --debug et --drivebase.\n" | ||
153 | -"ATTENTION : Et n'oubliez pas d'ajouter votre lecteur au fichier hddtemp.db\n" | ||
154 | - | ||
155 | -#: src/hddtemp.c:202 | ||
156 | +#: src/hddtemp.c:211 | ||
157 | #, c-format | ||
158 | msgid "%s: %s: %d%sC or %sF\n" | ||
159 | msgstr "%s: %s : %d%sC ou %sF\n" | ||
160 | |||
161 | -#: src/hddtemp.c:214 | ||
162 | +#: src/hddtemp.c:235 | ||
163 | #, c-format | ||
164 | msgid "%s: %s: drive is sleeping\n" | ||
165 | msgstr "%s: %s : le lecteur est en veille\n" | ||
166 | |||
167 | -#: src/hddtemp.c:217 | ||
168 | +#: src/hddtemp.c:242 | ||
169 | #, c-format | ||
170 | -msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" | ||
171 | +msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" | ||
172 | msgstr "" | ||
173 | "%s: %s: lecteur connu, mais il ne possède pas de capteur de température.\n" | ||
174 | |||
175 | -#: src/hddtemp.c:220 | ||
176 | +#: src/hddtemp.c:246 | ||
177 | #, c-format | ||
178 | msgid "ERROR: %s: %s: unknown returned status\n" | ||
179 | msgstr "ERREUR : %s : %s : status inconnu\n" | ||
180 | |||
181 | -#: src/hddtemp.c:235 | ||
182 | +#: src/hddtemp.c:261 | ||
183 | #, c-format | ||
184 | msgid "" | ||
185 | "\n" | ||
186 | "If one of the field value seems to match the temperature, be sure to read\n" | ||
187 | -"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" | ||
188 | +"the hddtemp man page before sending a report (section REPORT). Thanks.\n" | ||
189 | msgstr "" | ||
190 | |||
191 | -#: src/hddtemp.c:308 | ||
192 | +#: src/hddtemp.c:338 | ||
193 | #, c-format | ||
194 | msgid "ERROR: invalid separator.\n" | ||
195 | msgstr "ERREUR : séparateur invalide.\n" | ||
196 | |||
197 | -#: src/hddtemp.c:319 | ||
198 | +#: src/hddtemp.c:349 | ||
199 | #, c-format | ||
200 | msgid "ERROR: invalid port number.\n" | ||
201 | msgstr "ERREUR : numéro de port invalide.\n" | ||
202 | |||
203 | -#: src/hddtemp.c:329 | ||
204 | -#, fuzzy, c-format | ||
205 | +#: src/hddtemp.c:371 | ||
206 | +#, c-format | ||
207 | msgid "" | ||
208 | -" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" | ||
209 | +" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" | ||
210 | "\n" | ||
211 | " hddtemp displays the temperature of drives supplied in argument.\n" | ||
212 | " Drives must support S.M.A.R.T.\n" | ||
213 | "\n" | ||
214 | +" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" | ||
215 | +"\n" | ||
216 | " -b --drivebase : display database file content that allow hddtemp to\n" | ||
217 | " recognize supported drives.\n" | ||
218 | " -D --debug : display various S.M.A.R.T. fields and their values.\n" | ||
219 | @@ -138,6 +107,7 @@ | ||
220 | " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " | ||
221 | "default.)\n" | ||
222 | " -f --file=FILE : specify database file to use.\n" | ||
223 | +" -F --foreground : don't daemonize, stay in foreground.\n" | ||
224 | " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " | ||
225 | "mode).\n" | ||
226 | " -n --numeric : print only the temperature.\n" | ||
227 | @@ -145,6 +115,8 @@ | ||
228 | " -s --separator=C : separator to use between fields (in TCP/IP daemon " | ||
229 | "mode).\n" | ||
230 | " -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
231 | +" -u --unit=[C|F] : force output temperature either in Celsius or " | ||
232 | +"Fahrenheit.\n" | ||
233 | " -q --quiet : do not check if the drive is supported.\n" | ||
234 | " -v --version : display hddtemp version number.\n" | ||
235 | " -w --wake-up : wake-up the drive if need.\n" | ||
236 | @@ -153,11 +125,14 @@ | ||
237 | "\n" | ||
238 | "Report bugs or new drives to <hddtemp@guzu.net>.\n" | ||
239 | msgstr "" | ||
240 | -" Utilisation: hddtemp [OPTIONS] DISQUE1 [DISQUE2]...\n" | ||
241 | +" Utilisation: hddtemp [OPTIONS] [TYPE:]DISQUE1 [[TYPE:]DISQUE2]...\n" | ||
242 | "\n" | ||
243 | " hddtemp affiche la température des lecteurs passés en argument.\n" | ||
244 | " Les lecteurs doivent avoir le support S.M.A.R.T.\n" | ||
245 | "\n" | ||
246 | +" TYPE peut être SATA, PATA ou SCSI. Si le type est omis, hddtemp essaiera\n" | ||
247 | +" de le deviner.\n" | ||
248 | +"\n" | ||
249 | " -b --drivebase : affiche le contenu du fichier de base de donnée " | ||
250 | "qui \n" | ||
251 | " permet à hddtemp de reconnaître les lecteurs " | ||
252 | @@ -172,6 +147,7 @@ | ||
253 | "défaut).\n" | ||
254 | " -f --file=FILE : specifie le fichier à utiliser comme base de " | ||
255 | "données.\n" | ||
256 | +" -F --foreground : ne pas démoniser, rester au premier plan.\n" | ||
257 | " -l --listen=addr : écoute sur une interface spécifique (en mode démon " | ||
258 | "TCP/IP).\n" | ||
259 | " -n --numeric : affiche seulement la température.\n" | ||
260 | @@ -180,6 +156,8 @@ | ||
261 | "démon TCP/IP).\n" | ||
262 | " -S --syslog=s : enregistre la température dans syslog tous les s " | ||
263 | "secondes.\n" | ||
264 | +" -u --unit=[C|F] : affiche la température en degrés Celsius ou " | ||
265 | +"Fahrenheit.\n" | ||
266 | " -q --quiet : ne vérifie pas si le lecteur est supporté.\n" | ||
267 | " -v --version : affiche la version de hddtemp.\n" | ||
268 | " -w --wake-up : réveiller le lecteur si nécessaire.\n" | ||
269 | @@ -188,62 +166,95 @@ | ||
270 | "\n" | ||
271 | "Report bugs or new drives to <hddtemp@guzu.net>.\n" | ||
272 | |||
273 | -#: src/hddtemp.c:522 | ||
274 | +#: src/hddtemp.c:402 | ||
275 | #, c-format | ||
276 | msgid "hddtemp version %s\n" | ||
277 | msgstr "hddtemp version %s\n" | ||
278 | |||
279 | -#: src/hddtemp.c:547 | ||
280 | +#: src/hddtemp.c:418 | ||
281 | #, c-format | ||
282 | msgid "ERROR: invalid interval.\n" | ||
283 | msgstr "ERREUR : intervalle invalide.\n" | ||
284 | |||
285 | -#: src/hddtemp.c:547 | ||
286 | +#: src/hddtemp.c:438 | ||
287 | +#, c-format | ||
288 | msgid "Too few arguments: you must specify one drive, at least.\n" | ||
289 | msgstr "Trop peu d'arguments : vous devez spécifier au moins un lecteur.\n" | ||
290 | |||
291 | -#: src/hddtemp.c:557 | ||
292 | +#: src/hddtemp.c:448 | ||
293 | +#, c-format | ||
294 | msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" | ||
295 | msgstr "" | ||
296 | "ERREUR: impossible d'utiliser les options --debug et --daemon ou --syslog en " | ||
297 | "même temps.\n" | ||
298 | |||
299 | -#: src/hddtemp.c:583 | ||
300 | +#: src/hddtemp.c:505 | ||
301 | #, c-format | ||
302 | msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" | ||
303 | msgstr "" | ||
304 | "ERREUR: %s: impossible de déterminer le type de bus (ou ce type de bus est " | ||
305 | "inconnu)\n" | ||
306 | |||
307 | -#: src/ata.c:66 src/scsi.c:68 | ||
308 | +#: src/ata.c:66 src/scsi.c:64 | ||
309 | msgid "unknown" | ||
310 | msgstr "inconnu" | ||
311 | |||
312 | -#: src/ata.c:98 | ||
313 | +#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 | ||
314 | #, c-format | ||
315 | -msgid "field(%d)\t = %d\n" | ||
316 | -msgstr "champ(%d)\t = %d\n" | ||
317 | - | ||
318 | -#: src/ata.c:167 | ||
319 | msgid "S.M.A.R.T. not available" | ||
320 | msgstr "S.M.A.R.T. non disponible" | ||
321 | |||
322 | -#: src/db.c:180 | ||
323 | +#: src/db.c:115 | ||
324 | +#, c-format | ||
325 | +msgid "" | ||
326 | +"\n" | ||
327 | +"Regexp%s| Value | Description\n" | ||
328 | +"------%s---------------------\n" | ||
329 | +msgstr "" | ||
330 | +"\n" | ||
331 | +"Regexp%s| Valeur | Description\n" | ||
332 | +"------%s----------------------\n" | ||
333 | + | ||
334 | +#: src/db.c:121 | ||
335 | +#, c-format | ||
336 | +msgid "%s%s| %5d | %s\n" | ||
337 | +msgstr "%s%s| %5d | %s\n" | ||
338 | + | ||
339 | +#: src/db.c:236 | ||
340 | #, c-format | ||
341 | msgid "hddtemp: can't open %1$s: %2$s\n" | ||
342 | msgstr "hddtemp: ne peut ouvrir %1$s: %2$s\n" | ||
343 | |||
344 | -#: src/db.c:194 | ||
345 | +#: src/db.c:250 | ||
346 | #, c-format | ||
347 | msgid "ERROR: syntax error at line %1$d in %2$s\n" | ||
348 | msgstr "ERREUR: erreur de syntaxe à la ligne %1$d: %2$s\n" | ||
349 | |||
350 | -#: src/db.c:201 | ||
351 | +#: src/db.c:257 | ||
352 | #, c-format | ||
353 | msgid " ERROR: line exceed %1$d characters in %2$s.\n" | ||
354 | msgstr " ERREUR: ligne exécdant %1$d caractères dans %2$s.\n" | ||
355 | |||
356 | -#: src/scsi.c:112 src/scsi.c:130 | ||
357 | +#: src/scsi.c:111 src/scsi.c:129 | ||
358 | #, c-format | ||
359 | msgid "log sense failed : %s" | ||
360 | msgstr "echec de 'log sense' : %s " | ||
361 | + | ||
362 | +#~ msgid "" | ||
363 | +#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
364 | +#~ "WARNING: But using a common value, it reports something.\n" | ||
365 | +#~ "WARNING: Note that the temperature shown could be wrong.\n" | ||
366 | +#~ "WARNING: See --help, --debug and --drivebase options.\n" | ||
367 | +#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
368 | +#~ msgstr "" | ||
369 | +#~ "ATTENTION : Le lecteur %s n'apparait pas dans la base de données des " | ||
370 | +#~ "lecteurs supportés\n" | ||
371 | +#~ "ATTENTION : Mais en utilisant une valeur courante, il renvoie quelque " | ||
372 | +#~ "chose.\n" | ||
373 | +#~ "ATTENTION : Notez que la température renvoyée peut être erronée.\n" | ||
374 | +#~ "ATTENTION : Voir les options --help, --debug et --drivebase.\n" | ||
375 | +#~ "ATTENTION : Et n'oubliez pas d'ajouter votre lecteur au fichier hddtemp." | ||
376 | +#~ "db\n" | ||
377 | + | ||
378 | +#~ msgid "field(%d)\t = %d\n" | ||
379 | +#~ msgstr "champ(%d)\t = %d\n" | ||
380 | --- hddtemp-0.3-beta15.orig/po/ru.po | ||
381 | +++ hddtemp-0.3-beta15/po/ru.po | ||
382 | @@ -6,8 +6,8 @@ | ||
383 | msgid "" | ||
384 | msgstr "" | ||
385 | "Project-Id-Version: hddtemp 0.3-beta3\n" | ||
386 | -"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" | ||
387 | -"POT-Creation-Date: 2005-02-25 22:43+0100\n" | ||
388 | +"Report-Msgid-Bugs-To: \n" | ||
389 | +"POT-Creation-Date: 2006-06-29 16:24+0200\n" | ||
390 | "PO-Revision-Date: 2003-03-08 16:42+0300\n" | ||
391 | "Last-Translator: Michael Shigorin <mike@altlinux.ru>\n" | ||
392 | "Language-Team: Russian <ru@li.org>\n" | ||
393 | @@ -15,23 +15,7 @@ | ||
394 | "Content-Type: text/plain; charset=koi8-r\n" | ||
395 | "Content-Transfer-Encoding: 8bit\n" | ||
396 | |||
397 | -#: src/hddtemp.c:112 | ||
398 | -#, c-format | ||
399 | -msgid "" | ||
400 | -"\n" | ||
401 | -"Regexp%s| Value | Description\n" | ||
402 | -"------%s---------------------\n" | ||
403 | -msgstr "" | ||
404 | -"\n" | ||
405 | -"òÅÇÜËÓ%s| úÎÁÞ. | ïÐÉÓÁÎÉÅ \n" | ||
406 | -"------%s---------------------\n" | ||
407 | - | ||
408 | -#: src/hddtemp.c:118 | ||
409 | -#, c-format | ||
410 | -msgid "%s%s| %5d | %s\n" | ||
411 | -msgstr "" | ||
412 | - | ||
413 | -#: src/hddtemp.c:161 | ||
414 | +#: src/hddtemp.c:156 | ||
415 | #, c-format | ||
416 | msgid "" | ||
417 | "\n" | ||
418 | @@ -40,7 +24,7 @@ | ||
419 | "\n" | ||
420 | msgstr "" | ||
421 | |||
422 | -#: src/hddtemp.c:188 | ||
423 | +#: src/hddtemp.c:189 | ||
424 | #, c-format | ||
425 | msgid "" | ||
426 | "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" | ||
427 | @@ -53,72 +37,59 @@ | ||
428 | "÷îéíáîéå: åÓÌÉ ×Ù ÔÏÞÎÏ ÚÎÁÅÔÅ, ÞÔÏ ÄÁÔÞÉË ÅÓÔØ, ÎÁÐÉÛÉÔÅ hddtemp@guzu.net\n" | ||
429 | "÷îéíáîéå: (ÓÍ. ÏÐÃÉÉ --help, --debug É --drivebase).\n" | ||
430 | |||
431 | -#: src/hddtemp.c:192 | ||
432 | +#: src/hddtemp.c:197 | ||
433 | #, c-format | ||
434 | msgid "%s: %s: no sensor\n" | ||
435 | msgstr "%s: %s: ÎÅÔ ÄÁÔÞÉËÁ\n" | ||
436 | |||
437 | -#: src/hddtemp.c:197 | ||
438 | -#, c-format | ||
439 | -msgid "" | ||
440 | -"WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
441 | -"WARNING: But using a common value, it reports something.\n" | ||
442 | -"WARNING: Note that the temperature shown could be wrong.\n" | ||
443 | -"WARNING: See --help, --debug and --drivebase options.\n" | ||
444 | -"WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
445 | -msgstr "" | ||
446 | -"÷îéíáîéå: äÉÓË %s ÎÅ ×ËÌÀÞÅÎ × ÂÁÚÕ ÄÁÎÎÙÈ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÐÒÉ×ÏÄÏ×.\n" | ||
447 | -"÷îéíáîéå: îÏ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÒÁÓÐÒÏÓÔÒÁÎÅÎÎÙÈ ÐÁÒÁÍÅÔÒÏ× ÏÎ ÞÔÏ-ÔÏ ×ÙÄÁÅÔ.\n" | ||
448 | -"÷îéíáîéå: úÁÍÅÔØÔÅ, ÞÔÏ ÐÏËÁÚÁÎÎÁÑ ÔÅÍÐÅÒÁÔÕÒÁ ÍÏÖÅÔ ÔÁËÏ×ÏÊ ÎÅ Ñ×ÌÑÔØÓÑ.\n" | ||
449 | -"÷îéíáîéå: óÍ. ÏÐÃÉÉ --help, --debug É --drivebase.\n" | ||
450 | -"÷îéíáîéå: é ÎÅ ÚÁÂÕÄØÔÅ, ÞÔÏ ÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÐÒÉ×ÏÄ × hddtemp.db\n" | ||
451 | - | ||
452 | -#: src/hddtemp.c:202 | ||
453 | +#: src/hddtemp.c:211 | ||
454 | #, c-format | ||
455 | msgid "%s: %s: %d%sC or %sF\n" | ||
456 | msgstr "%s: %s: %d%sC ÉÌÉ %sF\n" | ||
457 | |||
458 | -#: src/hddtemp.c:214 | ||
459 | +#: src/hddtemp.c:235 | ||
460 | #, c-format | ||
461 | msgid "%s: %s: drive is sleeping\n" | ||
462 | msgstr "%s: %s: ÎÅÔ ÄÁÔÞÉËÁ\n" | ||
463 | |||
464 | -#: src/hddtemp.c:217 | ||
465 | -#, c-format | ||
466 | -msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" | ||
467 | +#: src/hddtemp.c:242 | ||
468 | +#, fuzzy, c-format | ||
469 | +msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" | ||
470 | msgstr "%s: %s: ÉÚ×ÅÓÔÎÙÊ ÄÉÓË, ÎÅ ÓÏÄÅÒÖÁÝÉÊ ÄÁÔÞÉËÁ ÔÅÍÐÅÒÁÔÕÒÙ.\n" | ||
471 | |||
472 | -#: src/hddtemp.c:220 | ||
473 | +#: src/hddtemp.c:246 | ||
474 | #, c-format | ||
475 | msgid "ERROR: %s: %s: unknown returned status\n" | ||
476 | msgstr "ïûéâëá: %s: %s: ÎÅÉÚ×ÅÓÔÎÙÊ ÓÔÁÔÕÓ ×ÏÚ×ÒÁÔÁ\n" | ||
477 | |||
478 | -#: src/hddtemp.c:235 | ||
479 | +#: src/hddtemp.c:261 | ||
480 | #, c-format | ||
481 | msgid "" | ||
482 | "\n" | ||
483 | "If one of the field value seems to match the temperature, be sure to read\n" | ||
484 | -"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" | ||
485 | +"the hddtemp man page before sending a report (section REPORT). Thanks.\n" | ||
486 | msgstr "" | ||
487 | |||
488 | -#: src/hddtemp.c:308 | ||
489 | +#: src/hddtemp.c:338 | ||
490 | #, c-format | ||
491 | msgid "ERROR: invalid separator.\n" | ||
492 | msgstr "ïûéâëá: ÎÅ×ÅÒÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ.\n" | ||
493 | |||
494 | -#: src/hddtemp.c:319 | ||
495 | +#: src/hddtemp.c:349 | ||
496 | #, c-format | ||
497 | msgid "ERROR: invalid port number.\n" | ||
498 | msgstr "ïýéâëá: ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÏÒÔÁ.\n" | ||
499 | |||
500 | -#: src/hddtemp.c:329 | ||
501 | +#: src/hddtemp.c:371 | ||
502 | #, fuzzy, c-format | ||
503 | msgid "" | ||
504 | -" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" | ||
505 | +" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" | ||
506 | "\n" | ||
507 | " hddtemp displays the temperature of drives supplied in argument.\n" | ||
508 | " Drives must support S.M.A.R.T.\n" | ||
509 | "\n" | ||
510 | +" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" | ||
511 | +"\n" | ||
512 | " -b --drivebase : display database file content that allow hddtemp to\n" | ||
513 | " recognize supported drives.\n" | ||
514 | " -D --debug : display various S.M.A.R.T. fields and their values.\n" | ||
515 | @@ -128,6 +99,7 @@ | ||
516 | " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " | ||
517 | "default.)\n" | ||
518 | " -f --file=FILE : specify database file to use.\n" | ||
519 | +" -F --foreground : don't daemonize, stay in foreground.\n" | ||
520 | " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " | ||
521 | "mode).\n" | ||
522 | " -n --numeric : print only the temperature.\n" | ||
523 | @@ -135,6 +107,8 @@ | ||
524 | " -s --separator=C : separator to use between fields (in TCP/IP daemon " | ||
525 | "mode).\n" | ||
526 | " -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
527 | +" -u --unit=[C|F] : force output temperature either in Celsius or " | ||
528 | +"Fahrenheit.\n" | ||
529 | " -q --quiet : do not check if the drive is supported.\n" | ||
530 | " -v --version : display hddtemp version number.\n" | ||
531 | " -w --wake-up : wake-up the drive if need.\n" | ||
532 | @@ -168,59 +142,90 @@ | ||
533 | "\n" | ||
534 | "óÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ É ÄÁÎÎÙÅ ÄÌÑ ÄÉÓËÏ× ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ <hddtemp@guzu.net>.\n" | ||
535 | |||
536 | -#: src/hddtemp.c:522 | ||
537 | +#: src/hddtemp.c:402 | ||
538 | #, c-format | ||
539 | msgid "hddtemp version %s\n" | ||
540 | msgstr "÷ÅÒÓÉÑ hddtemp: %s\n" | ||
541 | |||
542 | -#: src/hddtemp.c:547 | ||
543 | +#: src/hddtemp.c:418 | ||
544 | #, fuzzy, c-format | ||
545 | msgid "ERROR: invalid interval.\n" | ||
546 | msgstr "ïûéâëá: ÎÅ×ÅÒÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ.\n" | ||
547 | |||
548 | -#: src/hddtemp.c:547 | ||
549 | +#: src/hddtemp.c:438 | ||
550 | +#, c-format | ||
551 | msgid "Too few arguments: you must specify one drive, at least.\n" | ||
552 | msgstr "" | ||
553 | |||
554 | -#: src/hddtemp.c:557 | ||
555 | -#, fuzzy | ||
556 | +#: src/hddtemp.c:448 | ||
557 | +#, fuzzy, c-format | ||
558 | msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" | ||
559 | msgstr "ïûéâëá: ÏÄÎÏ×ÒÅÍÅÎÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ --debug É --daemon ÎÅÄÏÐÕÓÔÉÍÏ.\n" | ||
560 | |||
561 | -#: src/hddtemp.c:583 | ||
562 | +#: src/hddtemp.c:505 | ||
563 | #, c-format | ||
564 | msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" | ||
565 | msgstr "ïûéâëá: %s: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÔÉÐ ÛÉÎÙ\n" | ||
566 | |||
567 | -#: src/ata.c:66 src/scsi.c:68 | ||
568 | +#: src/ata.c:66 src/scsi.c:64 | ||
569 | msgid "unknown" | ||
570 | msgstr "ÎÅÉÚ×." | ||
571 | |||
572 | -#: src/ata.c:98 | ||
573 | +#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 | ||
574 | #, c-format | ||
575 | -msgid "field(%d)\t = %d\n" | ||
576 | -msgstr "ÐÏÌÅ(%d)\t = %d\n" | ||
577 | - | ||
578 | -#: src/ata.c:167 | ||
579 | msgid "S.M.A.R.T. not available" | ||
580 | msgstr "S.M.A.R.T. ÎÅÄÏÓÔÕÐÅÎ" | ||
581 | |||
582 | -#: src/db.c:180 | ||
583 | +#: src/db.c:115 | ||
584 | +#, c-format | ||
585 | +msgid "" | ||
586 | +"\n" | ||
587 | +"Regexp%s| Value | Description\n" | ||
588 | +"------%s---------------------\n" | ||
589 | +msgstr "" | ||
590 | +"\n" | ||
591 | +"òÅÇÜËÓ%s| úÎÁÞ. | ïÐÉÓÁÎÉÅ \n" | ||
592 | +"------%s---------------------\n" | ||
593 | + | ||
594 | +#: src/db.c:121 | ||
595 | +#, c-format | ||
596 | +msgid "%s%s| %5d | %s\n" | ||
597 | +msgstr "" | ||
598 | + | ||
599 | +#: src/db.c:236 | ||
600 | #, c-format | ||
601 | msgid "hddtemp: can't open %1$s: %2$s\n" | ||
602 | msgstr "hddtemp: ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %1$s: %2$s\n" | ||
603 | |||
604 | -#: src/db.c:194 | ||
605 | +#: src/db.c:250 | ||
606 | #, c-format | ||
607 | msgid "ERROR: syntax error at line %1$d in %2$s\n" | ||
608 | msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ïûéâëá × ÓÔÒÏËÅ %1$d ÆÁÊÌÁ %2$s\n" | ||
609 | |||
610 | -#: src/db.c:201 | ||
611 | +#: src/db.c:257 | ||
612 | #, c-format | ||
613 | msgid " ERROR: line exceed %1$d characters in %2$s.\n" | ||
614 | msgstr "ïûéâëá: ÓÔÒÏËÁ ÄÌÉÎÎÅÅ %1$d ÓÉÍ×ÏÌÏ× × %2$s.\n" | ||
615 | |||
616 | -#: src/scsi.c:112 src/scsi.c:130 | ||
617 | +#: src/scsi.c:111 src/scsi.c:129 | ||
618 | #, c-format | ||
619 | msgid "log sense failed : %s" | ||
620 | msgstr "" | ||
621 | + | ||
622 | +#~ msgid "" | ||
623 | +#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
624 | +#~ "WARNING: But using a common value, it reports something.\n" | ||
625 | +#~ "WARNING: Note that the temperature shown could be wrong.\n" | ||
626 | +#~ "WARNING: See --help, --debug and --drivebase options.\n" | ||
627 | +#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
628 | +#~ msgstr "" | ||
629 | +#~ "÷îéíáîéå: äÉÓË %s ÎÅ ×ËÌÀÞÅÎ × ÂÁÚÕ ÄÁÎÎÙÈ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÐÒÉ×ÏÄÏ×.\n" | ||
630 | +#~ "÷îéíáîéå: îÏ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÒÁÓÐÒÏÓÔÒÁÎÅÎÎÙÈ ÐÁÒÁÍÅÔÒÏ× ÏÎ ÞÔÏ-ÔÏ " | ||
631 | +#~ "×ÙÄÁÅÔ.\n" | ||
632 | +#~ "÷îéíáîéå: úÁÍÅÔØÔÅ, ÞÔÏ ÐÏËÁÚÁÎÎÁÑ ÔÅÍÐÅÒÁÔÕÒÁ ÍÏÖÅÔ ÔÁËÏ×ÏÊ ÎÅ " | ||
633 | +#~ "Ñ×ÌÑÔØÓÑ.\n" | ||
634 | +#~ "÷îéíáîéå: óÍ. ÏÐÃÉÉ --help, --debug É --drivebase.\n" | ||
635 | +#~ "÷îéíáîéå: é ÎÅ ÚÁÂÕÄØÔÅ, ÞÔÏ ÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÐÒÉ×ÏÄ × hddtemp.db\n" | ||
636 | + | ||
637 | +#~ msgid "field(%d)\t = %d\n" | ||
638 | +#~ msgstr "ÐÏÌÅ(%d)\t = %d\n" | ||
639 | --- hddtemp-0.3-beta15.orig/po/sv.po | ||
640 | +++ hddtemp-0.3-beta15/po/sv.po | ||
641 | @@ -6,8 +6,8 @@ | ||
642 | msgid "" | ||
643 | msgstr "" | ||
644 | "Project-Id-Version: hddtemp 0.3-beta14-4\n" | ||
645 | -"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" | ||
646 | -"POT-Creation-Date: 2005-02-25 22:43+0100\n" | ||
647 | +"Report-Msgid-Bugs-To: \n" | ||
648 | +"POT-Creation-Date: 2006-06-29 16:24+0200\n" | ||
649 | "PO-Revision-Date: 2005-11-02 19:03+0100\n" | ||
650 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" | ||
651 | "Language-Team: Swedish <sv@li.org>\n" | ||
652 | @@ -17,23 +17,7 @@ | ||
653 | "X-Poedit-Language: swe\n" | ||
654 | "X-Poedit-Country: swe\n" | ||
655 | |||
656 | -#: src/hddtemp.c:112 | ||
657 | -#, c-format | ||
658 | -msgid "" | ||
659 | -"\n" | ||
660 | -"Regexp%s| Value | Description\n" | ||
661 | -"------%s---------------------\n" | ||
662 | -msgstr "" | ||
663 | -"\n" | ||
664 | -"Regexp%s| Värde | Beskrivning\n" | ||
665 | -"------%s---------------------\n" | ||
666 | - | ||
667 | -#: src/hddtemp.c:118 | ||
668 | -#, c-format | ||
669 | -msgid "%s%s| %5d | %s\n" | ||
670 | -msgstr "%s%s| %5d | %s\n" | ||
671 | - | ||
672 | -#: src/hddtemp.c:161 | ||
673 | +#: src/hddtemp.c:156 | ||
674 | #, c-format | ||
675 | msgid "" | ||
676 | "\n" | ||
677 | @@ -46,7 +30,7 @@ | ||
678 | "Modell: %s\n" | ||
679 | "\n" | ||
680 | |||
681 | -#: src/hddtemp.c:188 | ||
682 | +#: src/hddtemp.c:189 | ||
683 | #, c-format | ||
684 | msgid "" | ||
685 | "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" | ||
686 | @@ -60,76 +44,63 @@ | ||
687 | "net).\n" | ||
688 | "VARNING: Se --help, --debug och --drivebase flaggorna.\n" | ||
689 | |||
690 | -#: src/hddtemp.c:192 | ||
691 | +#: src/hddtemp.c:197 | ||
692 | #, c-format | ||
693 | msgid "%s: %s: no sensor\n" | ||
694 | msgstr "%s: %s: ingen sensor\n" | ||
695 | |||
696 | -#: src/hddtemp.c:197 | ||
697 | -#, c-format | ||
698 | -msgid "" | ||
699 | -"WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
700 | -"WARNING: But using a common value, it reports something.\n" | ||
701 | -"WARNING: Note that the temperature shown could be wrong.\n" | ||
702 | -"WARNING: See --help, --debug and --drivebase options.\n" | ||
703 | -"WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
704 | -msgstr "" | ||
705 | -"VARNING: Disken %s verkar inte finnas i databasen över diskar som stöds\n" | ||
706 | -"VARNING: Men använder man ett vanligt värde rapporterar den något.\n" | ||
707 | -"VARNING: Notera att temperaturen som visas kan vara felaktig.\n" | ||
708 | -"VARNING: Se --help, --debug och --drivebase flaggorna.\n" | ||
709 | -"VARNING: Och glöm inte att du kan lägga till din disk till hddtemp.db\n" | ||
710 | - | ||
711 | -#: src/hddtemp.c:202 | ||
712 | +#: src/hddtemp.c:211 | ||
713 | #, c-format | ||
714 | msgid "%s: %s: %d%sC or %sF\n" | ||
715 | msgstr "%s: %s: %d%sC eller %sF\n" | ||
716 | |||
717 | -#: src/hddtemp.c:214 | ||
718 | +#: src/hddtemp.c:235 | ||
719 | #, c-format | ||
720 | msgid "%s: %s: drive is sleeping\n" | ||
721 | msgstr "%s: %s: disken sover\n" | ||
722 | |||
723 | -#: src/hddtemp.c:217 | ||
724 | -#, c-format | ||
725 | -msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" | ||
726 | +#: src/hddtemp.c:242 | ||
727 | +#, fuzzy, c-format | ||
728 | +msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" | ||
729 | msgstr "%s: %s: känd disk men den har ingen temperatursensor.\n" | ||
730 | |||
731 | -#: src/hddtemp.c:220 | ||
732 | +#: src/hddtemp.c:246 | ||
733 | #, c-format | ||
734 | msgid "ERROR: %s: %s: unknown returned status\n" | ||
735 | msgstr "FEL: %s: %s: okänd returnerad status\n" | ||
736 | |||
737 | -#: src/hddtemp.c:235 | ||
738 | -#, c-format | ||
739 | +#: src/hddtemp.c:261 | ||
740 | +#, fuzzy, c-format | ||
741 | msgid "" | ||
742 | "\n" | ||
743 | "If one of the field value seems to match the temperature, be sure to read\n" | ||
744 | -"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" | ||
745 | +"the hddtemp man page before sending a report (section REPORT). Thanks.\n" | ||
746 | msgstr "" | ||
747 | "\n" | ||
748 | "Om ett av fältvärdena verkar matcha temperaturen, var säker på att du\n" | ||
749 | "läst manualsidan för hddtemp före du skickar en rapport till mig (sektionen\n" | ||
750 | "REPORT). Tack.\n" | ||
751 | |||
752 | -#: src/hddtemp.c:308 | ||
753 | +#: src/hddtemp.c:338 | ||
754 | #, c-format | ||
755 | msgid "ERROR: invalid separator.\n" | ||
756 | msgstr "FEL: ogiltig separator.\n" | ||
757 | |||
758 | -#: src/hddtemp.c:319 | ||
759 | +#: src/hddtemp.c:349 | ||
760 | #, c-format | ||
761 | msgid "ERROR: invalid port number.\n" | ||
762 | msgstr "FEL: ogiltigt portnummer.\n" | ||
763 | |||
764 | -#: src/hddtemp.c:329 | ||
765 | -#, c-format | ||
766 | +#: src/hddtemp.c:371 | ||
767 | +#, fuzzy, c-format | ||
768 | msgid "" | ||
769 | -" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" | ||
770 | +" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" | ||
771 | "\n" | ||
772 | " hddtemp displays the temperature of drives supplied in argument.\n" | ||
773 | " Drives must support S.M.A.R.T.\n" | ||
774 | "\n" | ||
775 | +" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" | ||
776 | +"\n" | ||
777 | " -b --drivebase : display database file content that allow hddtemp to\n" | ||
778 | " recognize supported drives.\n" | ||
779 | " -D --debug : display various S.M.A.R.T. fields and their values.\n" | ||
780 | @@ -139,6 +110,7 @@ | ||
781 | " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " | ||
782 | "default.)\n" | ||
783 | " -f --file=FILE : specify database file to use.\n" | ||
784 | +" -F --foreground : don't daemonize, stay in foreground.\n" | ||
785 | " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " | ||
786 | "mode).\n" | ||
787 | " -n --numeric : print only the temperature.\n" | ||
788 | @@ -146,6 +118,8 @@ | ||
789 | " -s --separator=C : separator to use between fields (in TCP/IP daemon " | ||
790 | "mode).\n" | ||
791 | " -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
792 | +" -u --unit=[C|F] : force output temperature either in Celsius or " | ||
793 | +"Fahrenheit.\n" | ||
794 | " -q --quiet : do not check if the drive is supported.\n" | ||
795 | " -v --version : display hddtemp version number.\n" | ||
796 | " -w --wake-up : wake-up the drive if need.\n" | ||
797 | @@ -184,61 +158,91 @@ | ||
798 | "\n" | ||
799 | "Rapportera buggar eller nya hårddiskar till <hddtemp@guzu.net>.\n" | ||
800 | |||
801 | -#: src/hddtemp.c:522 | ||
802 | +#: src/hddtemp.c:402 | ||
803 | #, c-format | ||
804 | msgid "hddtemp version %s\n" | ||
805 | msgstr "hddtemp version %s\n" | ||
806 | |||
807 | -#: src/hddtemp.c:547 | ||
808 | +#: src/hddtemp.c:418 | ||
809 | #, c-format | ||
810 | msgid "ERROR: invalid interval.\n" | ||
811 | msgstr "FEL: ogiltigt intervall.\n" | ||
812 | |||
813 | -#: src/hddtemp.c:547 | ||
814 | +#: src/hddtemp.c:438 | ||
815 | +#, c-format | ||
816 | msgid "Too few arguments: you must specify one drive, at least.\n" | ||
817 | msgstr "För få argument: du måste specificera åtminstone en disk.\n" | ||
818 | |||
819 | -#: src/hddtemp.c:557 | ||
820 | +#: src/hddtemp.c:448 | ||
821 | +#, c-format | ||
822 | msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" | ||
823 | msgstr "" | ||
824 | "FEL: kan inte använda --debug och --daemon eller --syslog flaggorna " | ||
825 | "tillsammans.\n" | ||
826 | |||
827 | -#: src/hddtemp.c:583 | ||
828 | +#: src/hddtemp.c:505 | ||
829 | #, c-format | ||
830 | msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" | ||
831 | msgstr "" | ||
832 | "FEL: %s: kan inte fastställa busstyp (eller så är denna busstyp okänd)\n" | ||
833 | |||
834 | -#: src/ata.c:66 src/scsi.c:68 | ||
835 | +#: src/ata.c:66 src/scsi.c:64 | ||
836 | msgid "unknown" | ||
837 | msgstr "okänd" | ||
838 | |||
839 | -#: src/ata.c:98 | ||
840 | +#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 | ||
841 | #, c-format | ||
842 | -msgid "field(%d)\t = %d\n" | ||
843 | -msgstr "fält(%d)\t = %d\n" | ||
844 | - | ||
845 | -#: src/ata.c:167 | ||
846 | msgid "S.M.A.R.T. not available" | ||
847 | msgstr "S.M.A.R.T. är inte tillgänglig" | ||
848 | |||
849 | -#: src/db.c:180 | ||
850 | +#: src/db.c:115 | ||
851 | +#, c-format | ||
852 | +msgid "" | ||
853 | +"\n" | ||
854 | +"Regexp%s| Value | Description\n" | ||
855 | +"------%s---------------------\n" | ||
856 | +msgstr "" | ||
857 | +"\n" | ||
858 | +"Regexp%s| Värde | Beskrivning\n" | ||
859 | +"------%s---------------------\n" | ||
860 | + | ||
861 | +#: src/db.c:121 | ||
862 | +#, c-format | ||
863 | +msgid "%s%s| %5d | %s\n" | ||
864 | +msgstr "%s%s| %5d | %s\n" | ||
865 | + | ||
866 | +#: src/db.c:236 | ||
867 | #, c-format | ||
868 | msgid "hddtemp: can't open %1$s: %2$s\n" | ||
869 | msgstr "hddtemp: kan inte öppna %1$s: %2$s\n" | ||
870 | |||
871 | -#: src/db.c:194 | ||
872 | +#: src/db.c:250 | ||
873 | #, c-format | ||
874 | msgid "ERROR: syntax error at line %1$d in %2$s\n" | ||
875 | msgstr "FEL: syntaxfel på rad %1$d i %2$s\n" | ||
876 | |||
877 | -#: src/db.c:201 | ||
878 | +#: src/db.c:257 | ||
879 | #, c-format | ||
880 | msgid " ERROR: line exceed %1$d characters in %2$s.\n" | ||
881 | msgstr " FEL: raden överstiger %1$d tecken i %2$s.\n" | ||
882 | |||
883 | -#: src/scsi.c:112 src/scsi.c:130 | ||
884 | +#: src/scsi.c:111 src/scsi.c:129 | ||
885 | #, c-format | ||
886 | msgid "log sense failed : %s" | ||
887 | msgstr "igenkänning av logg misslyckades : %s" | ||
888 | + | ||
889 | +#~ msgid "" | ||
890 | +#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
891 | +#~ "WARNING: But using a common value, it reports something.\n" | ||
892 | +#~ "WARNING: Note that the temperature shown could be wrong.\n" | ||
893 | +#~ "WARNING: See --help, --debug and --drivebase options.\n" | ||
894 | +#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
895 | +#~ msgstr "" | ||
896 | +#~ "VARNING: Disken %s verkar inte finnas i databasen över diskar som stöds\n" | ||
897 | +#~ "VARNING: Men använder man ett vanligt värde rapporterar den något.\n" | ||
898 | +#~ "VARNING: Notera att temperaturen som visas kan vara felaktig.\n" | ||
899 | +#~ "VARNING: Se --help, --debug och --drivebase flaggorna.\n" | ||
900 | +#~ "VARNING: Och glöm inte att du kan lägga till din disk till hddtemp.db\n" | ||
901 | + | ||
902 | +#~ msgid "field(%d)\t = %d\n" | ||
903 | +#~ msgstr "fält(%d)\t = %d\n" | ||
904 | --- hddtemp-0.3-beta15.orig/po/pt.po | ||
905 | +++ hddtemp-0.3-beta15/po/pt.po | ||
906 | @@ -7,7 +7,7 @@ | ||
907 | msgstr "" | ||
908 | "Project-Id-Version: hddtemp 0.3-beta14\n" | ||
909 | "Report-Msgid-Bugs-To: \n" | ||
910 | -"POT-Creation-Date: 2005-02-25 22:43+0100\n" | ||
911 | +"POT-Creation-Date: 2006-06-29 16:24+0200\n" | ||
912 | "PO-Revision-Date: 2006-03-29 23:22+0000\n" | ||
913 | "Last-Translator: Miguel Figueiredo <elmig@debianp.org>\n" | ||
914 | "Language-Team: Portuguese <traduz@debianpt.org>\n" | ||
915 | @@ -15,23 +15,7 @@ | ||
916 | "Content-Type: text/plain; charset=UTF-8\n" | ||
917 | "Content-Transfer-Encoding: 8bit\n" | ||
918 | |||
919 | -#: src/hddtemp.c:112 | ||
920 | -#, c-format | ||
921 | -msgid "" | ||
922 | -"\n" | ||
923 | -"Regexp%s| Value | Description\n" | ||
924 | -"------%s---------------------\n" | ||
925 | -msgstr "" | ||
926 | -"\n" | ||
927 | -"Regexp%s| Valor | Descrição\n" | ||
928 | -"------%s-------------------\n" | ||
929 | - | ||
930 | -#: src/hddtemp.c:118 | ||
931 | -#, c-format | ||
932 | -msgid "%s%s| %5d | %s\n" | ||
933 | -msgstr "%s%s| %5d | %s\n" | ||
934 | - | ||
935 | -#: src/hddtemp.c:161 | ||
936 | +#: src/hddtemp.c:156 | ||
937 | #, c-format | ||
938 | msgid "" | ||
939 | "\n" | ||
940 | @@ -44,7 +28,7 @@ | ||
941 | "Modelo: %s\n" | ||
942 | "\n" | ||
943 | |||
944 | -#: src/hddtemp.c:188 | ||
945 | +#: src/hddtemp.c:189 | ||
946 | #, c-format | ||
947 | msgid "" | ||
948 | "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" | ||
949 | @@ -54,79 +38,68 @@ | ||
950 | msgstr "" | ||
951 | "AVISO: O disco %s não parece ter um sensor de temperatura.\n" | ||
952 | "AVISO: Isto não significa que não tem nenhum.\n" | ||
953 | -"AVISO: Se tem a certeza que tem um, por favor contacte-me (hddtemp@guzu.net).\n" | ||
954 | +"AVISO: Se tem a certeza que tem um, por favor contacte-me (hddtemp@guzu." | ||
955 | +"net).\n" | ||
956 | "AVISO: Veja as opções --help, --debug e --drivebase.\n" | ||
957 | |||
958 | -#: src/hddtemp.c:192 | ||
959 | +#: src/hddtemp.c:197 | ||
960 | #, c-format | ||
961 | msgid "%s: %s: no sensor\n" | ||
962 | msgstr "%s: %s: sem sensor\n" | ||
963 | |||
964 | -#: src/hddtemp.c:197 | ||
965 | -#, c-format | ||
966 | -msgid "" | ||
967 | -"WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
968 | -"WARNING: But using a common value, it reports something.\n" | ||
969 | -"WARNING: Note that the temperature shown could be wrong.\n" | ||
970 | -"WARNING: See --help, --debug and --drivebase options.\n" | ||
971 | -"WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
972 | -msgstr "" | ||
973 | -"AVISO: O disco %s não parece estar na base de dados de discos suportados\n" | ||
974 | -"AVISO: Mas ao utilizar um valor usual, relata alguma coisa.\n" | ||
975 | -"AVISO: Note que a temperatura mostrada pode estar errada.\n" | ||
976 | -"AVISO: Veja as opções --help, --debug e --frivebase.\n" | ||
977 | -"AVISO: E não se esqueça de adicionar o seu disco a hddtemp.db\n" | ||
978 | - | ||
979 | -#: src/hddtemp.c:202 | ||
980 | +#: src/hddtemp.c:211 | ||
981 | #, c-format | ||
982 | msgid "%s: %s: %d%sC or %sF\n" | ||
983 | msgstr "%s: %s: %d%sC ou %sF\n" | ||
984 | |||
985 | -#: src/hddtemp.c:214 | ||
986 | +#: src/hddtemp.c:235 | ||
987 | #, c-format | ||
988 | msgid "%s: %s: drive is sleeping\n" | ||
989 | msgstr "%s: %s: o disco está adormecido\n" | ||
990 | |||
991 | -#: src/hddtemp.c:217 | ||
992 | -#, c-format | ||
993 | -msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" | ||
994 | +#: src/hddtemp.c:242 | ||
995 | +#, fuzzy, c-format | ||
996 | +msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" | ||
997 | msgstr "%s: %s: disco conhecido, mas não tem um sensor de temperatura.\n" | ||
998 | |||
999 | -#: src/hddtemp.c:220 | ||
1000 | +#: src/hddtemp.c:246 | ||
1001 | #, c-format | ||
1002 | msgid "ERROR: %s: %s: unknown returned status\n" | ||
1003 | msgstr "ERRO: %s: %s: estado devolvido desconhecido\n" | ||
1004 | |||
1005 | -#: src/hddtemp.c:235 | ||
1006 | -#, c-format | ||
1007 | +#: src/hddtemp.c:261 | ||
1008 | +#, fuzzy, c-format | ||
1009 | msgid "" | ||
1010 | "\n" | ||
1011 | "If one of the field value seems to match the temperature, be sure to read\n" | ||
1012 | -"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" | ||
1013 | +"the hddtemp man page before sending a report (section REPORT). Thanks.\n" | ||
1014 | msgstr "" | ||
1015 | "\n" | ||
1016 | -"Se um dos campos de valores parecer coincidir com a temperatura, assegure-se\n" | ||
1017 | +"Se um dos campos de valores parecer coincidir com a temperatura, assegure-" | ||
1018 | +"se\n" | ||
1019 | "que lê a página do manual hddtemp antes de me enviar um relatório (secção\n" | ||
1020 | "REPORT). Obrigado.\n" | ||
1021 | |||
1022 | -#: src/hddtemp.c:308 | ||
1023 | +#: src/hddtemp.c:338 | ||
1024 | #, c-format | ||
1025 | msgid "ERROR: invalid separator.\n" | ||
1026 | msgstr "ERRO: separador inválido.\n" | ||
1027 | |||
1028 | -#: src/hddtemp.c:319 | ||
1029 | +#: src/hddtemp.c:349 | ||
1030 | #, c-format | ||
1031 | msgid "ERROR: invalid port number.\n" | ||
1032 | msgstr "ERRO: número de port inválido\n" | ||
1033 | |||
1034 | -#: src/hddtemp.c:329 | ||
1035 | -#, c-format | ||
1036 | +#: src/hddtemp.c:371 | ||
1037 | +#, fuzzy, c-format | ||
1038 | msgid "" | ||
1039 | -" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" | ||
1040 | +" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" | ||
1041 | "\n" | ||
1042 | " hddtemp displays the temperature of drives supplied in argument.\n" | ||
1043 | " Drives must support S.M.A.R.T.\n" | ||
1044 | "\n" | ||
1045 | +" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" | ||
1046 | +"\n" | ||
1047 | " -b --drivebase : display database file content that allow hddtemp to\n" | ||
1048 | " recognize supported drives.\n" | ||
1049 | " -D --debug : display various S.M.A.R.T. fields and their values.\n" | ||
1050 | @@ -136,6 +109,7 @@ | ||
1051 | " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " | ||
1052 | "default.)\n" | ||
1053 | " -f --file=FILE : specify database file to use.\n" | ||
1054 | +" -F --foreground : don't daemonize, stay in foreground.\n" | ||
1055 | " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " | ||
1056 | "mode).\n" | ||
1057 | " -n --numeric : print only the temperature.\n" | ||
1058 | @@ -143,6 +117,8 @@ | ||
1059 | " -s --separator=C : separator to use between fields (in TCP/IP daemon " | ||
1060 | "mode).\n" | ||
1061 | " -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
1062 | +" -u --unit=[C|F] : force output temperature either in Celsius or " | ||
1063 | +"Fahrenheit.\n" | ||
1064 | " -q --quiet : do not check if the drive is supported.\n" | ||
1065 | " -v --version : display hddtemp version number.\n" | ||
1066 | " -w --wake-up : wake-up the drive if need.\n" | ||
1067 | @@ -156,19 +132,23 @@ | ||
1068 | " hddtemp mostra a temperatura dos discos indicados no argumento.\n" | ||
1069 | " Os discos têm de suportar S.M.A.R.T.\n" | ||
1070 | "\n" | ||
1071 | -" -b --drivebase : mostrar o conteúdo do ficheiro de base de dados que\n" | ||
1072 | +" -b\t --drivebase : mostrar o conteúdo do ficheiro de base de dados que\n" | ||
1073 | " permite ao hddtemp reconhecer os discos suportados.\n" | ||
1074 | -" -D --debug : mostrar vários campos S.M.A.R.T. e os seus valores.\n" | ||
1075 | -" Útil para encontrar um valor que pareça coincidir com " | ||
1076 | -" a temperatura e/ou para me enviar um relatório.\n" | ||
1077 | +" -D\t --debug : mostrar vários campos S.M.A.R.T. e os seus valores.\n" | ||
1078 | +" Útil para encontrar um valor que pareça coincidir " | ||
1079 | +"com a temperatura e/ou para me enviar um relatório.\n" | ||
1080 | " (feito para cada disco indicado).\n" | ||
1081 | -" -d --daemon : correr o hddtemp no modo daemon TCP/IP\n (porto %d por omissão.)\n" | ||
1082 | +" -d --daemon : correr o hddtemp no modo daemon TCP/IP\n" | ||
1083 | +" (porto %d por omissão.)\n" | ||
1084 | " -f --file=FILE : especificar o ficheiro de base de dados a utilizar.\n" | ||
1085 | -" -l --listen=addr : escutar um interface especÃfico (no modo daemon TCP/IP).\n" | ||
1086 | +" -l --listen=addr : escutar um interface especÃfico (no modo daemon TCP/" | ||
1087 | +"IP).\n" | ||
1088 | " -n --numeric : escrever apenas a temperatura.\n" | ||
1089 | " -p --port=# : port para escutar (no modo daemon TCP/IP).\n" | ||
1090 | -" -s --separator=C : separador a utilizar entre campos (no modo daemon TCP/IP).\n" | ||
1091 | -" -S --syslog=s : registar a temperatura para o syslog a cada s segundos.\n" | ||
1092 | +" -s --separator=C : separador a utilizar entre campos (no modo daemon " | ||
1093 | +"TCP/IP).\n" | ||
1094 | +" -S --syslog=s : registar a temperatura para o syslog a cada s " | ||
1095 | +"segundos.\n" | ||
1096 | " -q --quiet : não verificar se o disco é suportado.\n" | ||
1097 | " -v --version : mostrar o número da versão do hddtemp.\n" | ||
1098 | " -w --wake-up : acordar o disco se necessário.\n" | ||
1099 | @@ -177,58 +157,93 @@ | ||
1100 | "\n" | ||
1101 | "Relatar bugs ou novos discos para <hddtemp@guzu.net>.\n" | ||
1102 | |||
1103 | -#: src/hddtemp.c:522 | ||
1104 | +#: src/hddtemp.c:402 | ||
1105 | #, c-format | ||
1106 | msgid "hddtemp version %s\n" | ||
1107 | msgstr "hddtemp versão %s\n" | ||
1108 | |||
1109 | -#: src/hddtemp.c:547 | ||
1110 | +#: src/hddtemp.c:418 | ||
1111 | #, c-format | ||
1112 | msgid "ERROR: invalid interval.\n" | ||
1113 | msgstr "ERRO: intervalo inválido.\n" | ||
1114 | |||
1115 | -#: src/hddtemp.c:547 | ||
1116 | +#: src/hddtemp.c:438 | ||
1117 | +#, c-format | ||
1118 | msgid "Too few arguments: you must specify one drive, at least.\n" | ||
1119 | -msgstr "Número de argumentos insuficiente: tem de especificar pelo menos um disco.\n" | ||
1120 | +msgstr "" | ||
1121 | +"Número de argumentos insuficiente: tem de especificar pelo menos um disco.\n" | ||
1122 | |||
1123 | -#: src/hddtemp.c:557 | ||
1124 | +#: src/hddtemp.c:448 | ||
1125 | +#, c-format | ||
1126 | msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" | ||
1127 | -msgstr "ERRO: não pode utilizar em conjunto as opções --debug e --daemon ou --syslog.\n" | ||
1128 | +msgstr "" | ||
1129 | +"ERRO: não pode utilizar em conjunto as opções --debug e --daemon ou --" | ||
1130 | +"syslog.\n" | ||
1131 | |||
1132 | -#: src/hddtemp.c:583 | ||
1133 | +#: src/hddtemp.c:505 | ||
1134 | #, c-format | ||
1135 | msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" | ||
1136 | -msgstr "ERRO: %s: não é possÃvel determinar o tipo do bus (ou este tipo de bus é desconhecido)\n" | ||
1137 | +msgstr "" | ||
1138 | +"ERRO: %s: não é possÃvel determinar o tipo do bus (ou este tipo de bus é " | ||
1139 | +"desconhecido)\n" | ||
1140 | |||
1141 | -#: src/ata.c:66 src/scsi.c:68 | ||
1142 | +#: src/ata.c:66 src/scsi.c:64 | ||
1143 | msgid "unknown" | ||
1144 | msgstr "desconhecido" | ||
1145 | |||
1146 | -#: src/ata.c:98 | ||
1147 | +#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 | ||
1148 | #, c-format | ||
1149 | -msgid "field(%d)\t = %d\n" | ||
1150 | -msgstr "campo(%d)\t = %d\n" | ||
1151 | - | ||
1152 | -#: src/ata.c:167 | ||
1153 | msgid "S.M.A.R.T. not available" | ||
1154 | msgstr "S.M.A.R.T. não está disponÃvel" | ||
1155 | |||
1156 | -#: src/db.c:180 | ||
1157 | +#: src/db.c:115 | ||
1158 | +#, c-format | ||
1159 | +msgid "" | ||
1160 | +"\n" | ||
1161 | +"Regexp%s| Value | Description\n" | ||
1162 | +"------%s---------------------\n" | ||
1163 | +msgstr "" | ||
1164 | +"\n" | ||
1165 | +"Regexp%s| Valor | Descrição\n" | ||
1166 | +"------%s-------------------\n" | ||
1167 | + | ||
1168 | +#: src/db.c:121 | ||
1169 | +#, c-format | ||
1170 | +msgid "%s%s| %5d | %s\n" | ||
1171 | +msgstr "%s%s| %5d | %s\n" | ||
1172 | + | ||
1173 | +#: src/db.c:236 | ||
1174 | #, c-format | ||
1175 | msgid "hddtemp: can't open %1$s: %2$s\n" | ||
1176 | msgstr "hddtemp: não pode abrir %1$s: %2$s\n" | ||
1177 | |||
1178 | -#: src/db.c:194 | ||
1179 | +#: src/db.c:250 | ||
1180 | #, c-format | ||
1181 | msgid "ERROR: syntax error at line %1$d in %2$s\n" | ||
1182 | msgstr "ERRO: erro de sintaxe na linha %1$d em %2$s\n" | ||
1183 | |||
1184 | -#: src/db.c:201 | ||
1185 | +#: src/db.c:257 | ||
1186 | #, c-format | ||
1187 | msgid " ERROR: line exceed %1$d characters in %2$s.\n" | ||
1188 | msgstr " ERRO: a linha execedeu %1$d caracteres em %2$s.\n" | ||
1189 | |||
1190 | -#: src/scsi.c:112 src/scsi.c:130 | ||
1191 | +#: src/scsi.c:111 src/scsi.c:129 | ||
1192 | #, c-format | ||
1193 | msgid "log sense failed : %s" | ||
1194 | msgstr "detecção de log falhou: %s" | ||
1195 | + | ||
1196 | +#~ msgid "" | ||
1197 | +#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
1198 | +#~ "WARNING: But using a common value, it reports something.\n" | ||
1199 | +#~ "WARNING: Note that the temperature shown could be wrong.\n" | ||
1200 | +#~ "WARNING: See --help, --debug and --drivebase options.\n" | ||
1201 | +#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
1202 | +#~ msgstr "" | ||
1203 | +#~ "AVISO: O disco %s não parece estar na base de dados de discos suportados\n" | ||
1204 | +#~ "AVISO: Mas ao utilizar um valor usual, relata alguma coisa.\n" | ||
1205 | +#~ "AVISO: Note que a temperatura mostrada pode estar errada.\n" | ||
1206 | +#~ "AVISO: Veja as opções --help, --debug e --frivebase.\n" | ||
1207 | +#~ "AVISO: E não se esqueça de adicionar o seu disco a hddtemp.db\n" | ||
1208 | + | ||
1209 | +#~ msgid "field(%d)\t = %d\n" | ||
1210 | +#~ msgstr "campo(%d)\t = %d\n" | ||
1211 | --- hddtemp-0.3-beta15.orig/po/de.po | ||
1212 | +++ hddtemp-0.3-beta15/po/de.po | ||
1213 | @@ -0,0 +1,250 @@ | ||
1214 | +# German translation of hddtemp. | ||
1215 | +# Copyright (C) 2008 Free Software Foundation, Inc. | ||
1216 | +# This file is distributed under the same license as the hddtemp package. | ||
1217 | +# Vinzenz Vietzke <vinz@v1nz.org>, 2008. | ||
1218 | +# , | ||
1219 | +# | ||
1220 | +# | ||
1221 | +msgid "" | ||
1222 | +msgstr "" | ||
1223 | +"Project-Id-Version: hddtemp 0.3-beta15-44\n" | ||
1224 | +"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" | ||
1225 | +"POT-Creation-Date: 2006-06-29 16:24+0200\n" | ||
1226 | +"PO-Revision-Date: 2011-08-30 16:40+0200\n" | ||
1227 | +"Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n" | ||
1228 | +"Language-Team: <debian-l10n-german@lists.debian.org>\n" | ||
1229 | +"MIME-Version: 1.0\n" | ||
1230 | +"Content-Type: text/plain; charset=UTF-8\n" | ||
1231 | +"Content-Transfer-Encoding: 8bit" | ||
1232 | + | ||
1233 | +#: src/hddtemp.c:156 | ||
1234 | +#, c-format | ||
1235 | +msgid "" | ||
1236 | +"\n" | ||
1237 | +"================= hddtemp %s ==================\n" | ||
1238 | +"Model: %s\n" | ||
1239 | +"\n" | ||
1240 | +msgstr "" | ||
1241 | +"\n" | ||
1242 | +"================= hddtemp %s ==================\n" | ||
1243 | +"Modell: %s\n" | ||
1244 | +"\n" | ||
1245 | + | ||
1246 | +#: src/hddtemp.c:189 | ||
1247 | +#, c-format | ||
1248 | +msgid "" | ||
1249 | +"WARNING: Drive %s doesn't seem to have a temperature sensor.\n" | ||
1250 | +"WARNING: This doesn't mean it hasn't got one.\n" | ||
1251 | +"WARNING: If you are sure it has one, please contact me (hddtemp@guzu." | ||
1252 | +"net).\n" | ||
1253 | +"WARNING: See --help, --debug and --drivebase options.\n" | ||
1254 | +msgstr "" | ||
1255 | +"WARNUNG: Laufwerk %s scheint keinen Temperatur-Sensor zu haben.\n" | ||
1256 | +"WARNUNG: Das bedeutet nicht, dass es keinen besitzt.\n" | ||
1257 | +"WARNUNG: Falls Sie sicher sind, dass es einen besitzt, kontaktieren Sie " | ||
1258 | +"mich bitte (hddtemp@guzu.net).\n" | ||
1259 | +"WARNUNG: Siehe Optionen --help, --debug und --drivebase.\n" | ||
1260 | + | ||
1261 | +#: src/hddtemp.c:197 | ||
1262 | +#, c-format | ||
1263 | +msgid "%s: %s: no sensor\n" | ||
1264 | +msgstr "%s: %s: kein Sensor\n" | ||
1265 | + | ||
1266 | +#: src/hddtemp.c:211 | ||
1267 | +#, c-format | ||
1268 | +msgid "%s: %s: %d%sC or %sF\n" | ||
1269 | +msgstr "%s: %s: %d%s°C oder %s°F\n" | ||
1270 | + | ||
1271 | +#: src/hddtemp.c:235 | ||
1272 | +#, c-format | ||
1273 | +msgid "%s: %s: drive is sleeping\n" | ||
1274 | +msgstr "%s: %s: Laufwerk schläft\n" | ||
1275 | + | ||
1276 | +#: src/hddtemp.c:242 | ||
1277 | +#, c-format | ||
1278 | +msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" | ||
1279 | +msgstr "" | ||
1280 | +"%s: %s: Laufwerk unterstützt, aber es hat keinen Temperatur-Sensor.\n" | ||
1281 | + | ||
1282 | +#: src/hddtemp.c:246 | ||
1283 | +#, c-format | ||
1284 | +msgid "ERROR: %s: %s: unknown returned status\n" | ||
1285 | +msgstr "FEHLER: %s: %s: zurückgegebener Status unbekannt\n" | ||
1286 | + | ||
1287 | +#: src/hddtemp.c:261 | ||
1288 | +#, c-format | ||
1289 | +msgid "" | ||
1290 | +"\n" | ||
1291 | +"If one of the field value seems to match the temperature, be sure to read\n" | ||
1292 | +"the hddtemp man page before sending a report (section REPORT). Thanks.\n" | ||
1293 | +msgstr "" | ||
1294 | +"\n" | ||
1295 | +"Falls einer der Feldwerte der Temperatur zu entsprechen scheint, stellen " | ||
1296 | +"Sie\n" | ||
1297 | +"sicher, die hddtemp-Handbuchseite gelesen zu haben, bevor Sie einen " | ||
1298 | +"Bericht\n" | ||
1299 | +"senden (Abschnitt BERICHT). Danke.\n" | ||
1300 | + | ||
1301 | +#: src/hddtemp.c:338 | ||
1302 | +#, c-format | ||
1303 | +msgid "ERROR: invalid separator.\n" | ||
1304 | +msgstr "FEHLER: ungültiges Trennzeichen.\n" | ||
1305 | + | ||
1306 | +#: src/hddtemp.c:349 | ||
1307 | +#, c-format | ||
1308 | +msgid "ERROR: invalid port number.\n" | ||
1309 | +msgstr "FEHLER: ungültige Portnummer.\n" | ||
1310 | + | ||
1311 | +#: src/hddtemp.c:371 | ||
1312 | +#, c-format | ||
1313 | +msgid "" | ||
1314 | +" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" | ||
1315 | +"\n" | ||
1316 | +" hddtemp displays the temperature of drives supplied in argument.\n" | ||
1317 | +" Drives must support S.M.A.R.T.\n" | ||
1318 | +"\n" | ||
1319 | +" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" | ||
1320 | +"\n" | ||
1321 | +" -b --drivebase : display database file content that allow hddtemp " | ||
1322 | +"to\n" | ||
1323 | +" recognize supported drives.\n" | ||
1324 | +" -D --debug : display various S.M.A.R.T. fields and their " | ||
1325 | +"values.\n" | ||
1326 | +" Useful to find a value that seems to match the\n" | ||
1327 | +" temperature and/or to send me a report.\n" | ||
1328 | +" (done for every drive supplied).\n" | ||
1329 | +" -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " | ||
1330 | +"default.)\n" | ||
1331 | +" -f --file=FILE : specify database file to use.\n" | ||
1332 | +" -F --foreground : don't daemonize, stay in foreground.\n" | ||
1333 | +" -l --listen=addr : listen on a specific interface (in TCP/IP daemon " | ||
1334 | +"mode).\n" | ||
1335 | +" -n --numeric : print only the temperature.\n" | ||
1336 | +" -p --port=# : port to listen to (in TCP/IP daemon mode).\n" | ||
1337 | +" -s --separator=C : separator to use between fields (in TCP/IP daemon " | ||
1338 | +"mode).\n" | ||
1339 | +" -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
1340 | +" -u --unit=[C|F] : force output temperature either in Celsius or " | ||
1341 | +"Fahrenheit.\n" | ||
1342 | +" -q --quiet : do not check if the drive is supported.\n" | ||
1343 | +" -v --version : display hddtemp version number.\n" | ||
1344 | +" -w --wake-up : wake-up the drive if need.\n" | ||
1345 | +" -4 : listen on IPv4 sockets only.\n" | ||
1346 | +" -6 : listen on IPv6 sockets only.\n" | ||
1347 | +"\n" | ||
1348 | +"Report bugs or new drives to <hddtemp@guzu.net>.\n" | ||
1349 | +msgstr "" | ||
1350 | +" Verwendung: hddtemp [OPTIONEN] [TYP:]LAUFWERK1 [[TYP:]LAUFWERK2]...\n" | ||
1351 | +"\n" | ||
1352 | +" hddtemp zeigt die Temperatur der via Argument angegeben Laufwerke.\n" | ||
1353 | +" Laufwerke müssen S.M.A.R.T. unterstützen.\n" | ||
1354 | +"\n" | ||
1355 | +" TYP kann SATA, PATA oder SCSI sein. Falls ausgelassen, wird hddtemp \n" | ||
1356 | +" versuchen, diesen zu erraten.\n" | ||
1357 | +"\n" | ||
1358 | +" -b --drivebase : Datenbank-Datei-Inhalt anzeigen, der hddtemp " | ||
1359 | +"erlaubt\n" | ||
1360 | +" unterstützte Laufwerke zu erkennen.\n" | ||
1361 | +" -D --debug : verschiedene S.M.A.R.T.-Felder und deren Werte " | ||
1362 | +"anzeigen.\n" | ||
1363 | +" Nützlich, um Werte zu finden, die der Temperatur " | ||
1364 | +"entsprechen\n" | ||
1365 | +" und/oder um mir einen Bericht zu senden.\n" | ||
1366 | +" (bereits erledigt für jedes bereitgestellte " | ||
1367 | +"Laufwerk).\n" | ||
1368 | +" -d --daemon : hddtemp im TCP/IP-Daemon-Modus ausführen " | ||
1369 | +"(Standardmäßig Port %d)\n" | ||
1370 | +" -f --file=DATEI : zu verwendende Datenbank-Datei festlegen.\n" | ||
1371 | +" -F --foreground : nicht daemonisieren, im Vordergrund bleiben.\n" | ||
1372 | +" -l --listen=addr : auf einer bestimmten Schnittstelle auf Anfragen " | ||
1373 | +"warten (im TCP/IP-Daemon-Modus).\n" | ||
1374 | +" -n --numeric : nur die Temperatur ausgeben.\n" | ||
1375 | +" -p --port=# : Port, auf dem auf Anfragen gewartet werden soll " | ||
1376 | +"(im TCP/IP-Daemon-Modus).\n" | ||
1377 | +" -s --separator=C : Trennzeichen zur Verwendung zwischen Feldern (im " | ||
1378 | +"TCP/IP-Daemon-Modus).\n" | ||
1379 | +" -S --syslog=s : Temperatur alle s Sekunden in das syslog " | ||
1380 | +"eintragen.\n" | ||
1381 | +" -u --unit=[C|F] : Ausgabe der Temperatur entweder in Celsius oder " | ||
1382 | +"Fahrenheit erzwingen.\n" | ||
1383 | +" -q --quiet : nicht prüfen, ob das Laufwerk unterstützt wird.\n" | ||
1384 | +" -v --version : Versionsnummer von hddtemp anzeigen.\n" | ||
1385 | +" -w --wake-up : Laufwerk bei Bedarf aufwecken.\n" | ||
1386 | +" -4 : nur auf IPv4-Sockets auf Anfragen warten.\n" | ||
1387 | +" -6 : nur auf IPv6-Sockets auf Anfragen warten.\n" | ||
1388 | +"\n" | ||
1389 | +"Fehler oder neue Laufwerke an <hddtemp@guzu.net> melden.\n" | ||
1390 | + | ||
1391 | +#: src/hddtemp.c:402 | ||
1392 | +#, c-format | ||
1393 | +msgid "hddtemp version %s\n" | ||
1394 | +msgstr "hddtemp Version %s\n" | ||
1395 | + | ||
1396 | +#: src/hddtemp.c:418 | ||
1397 | +#, c-format | ||
1398 | +msgid "ERROR: invalid interval.\n" | ||
1399 | +msgstr "FEHLER: ungültiges Intervall.\n" | ||
1400 | + | ||
1401 | +#: src/hddtemp.c:438 | ||
1402 | +#, c-format | ||
1403 | +msgid "Too few arguments: you must specify one drive, at least.\n" | ||
1404 | +msgstr "Zu wenige Argumente: Sie müssen mindestens ein Laufwerk angeben.\n" | ||
1405 | + | ||
1406 | +#: src/hddtemp.c:448 | ||
1407 | +#, c-format | ||
1408 | +msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" | ||
1409 | +msgstr "" | ||
1410 | +"FEHLER: kann Optionen --debug und --daemon oder --syslog nicht zusammen " | ||
1411 | +"verwenden.\n" | ||
1412 | + | ||
1413 | +#: src/hddtemp.c:505 | ||
1414 | +#, c-format | ||
1415 | +msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" | ||
1416 | +msgstr "" | ||
1417 | +"FEHLER: %s: kann Bus-Typ nicht ermitteln (oder dieser Bus-Typ ist " | ||
1418 | +"unbekannt)\n" | ||
1419 | + | ||
1420 | +#: src/ata.c:66 src/scsi.c:64 | ||
1421 | +msgid "unknown" | ||
1422 | +msgstr "unbekannt" | ||
1423 | + | ||
1424 | +#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 | ||
1425 | +#, c-format | ||
1426 | +msgid "S.M.A.R.T. not available" | ||
1427 | +msgstr "S.M.A.R.T. nicht verfügbar" | ||
1428 | + | ||
1429 | +#: src/db.c:115 | ||
1430 | +#, c-format | ||
1431 | +msgid "" | ||
1432 | +"\n" | ||
1433 | +"Regexp%s| Value | Description\n" | ||
1434 | +"------%s---------------------\n" | ||
1435 | +msgstr "" | ||
1436 | +"\n" | ||
1437 | +"Regexp%s| Wert | Beschreibung\n" | ||
1438 | +"------%s---------------------\n" | ||
1439 | + | ||
1440 | +#: src/db.c:121 | ||
1441 | +#, c-format | ||
1442 | +msgid "%s%s| %5d | %s\n" | ||
1443 | +msgstr "%s%s| %5d | %s\n" | ||
1444 | + | ||
1445 | +#: src/db.c:236 | ||
1446 | +#, c-format | ||
1447 | +msgid "hddtemp: can't open %1$s: %2$s\n" | ||
1448 | +msgstr "hddtemp: kann %1$s nicht öffnen: %2$s\n" | ||
1449 | + | ||
1450 | +#: src/db.c:250 | ||
1451 | +#, c-format | ||
1452 | +msgid "ERROR: syntax error at line %1$d in %2$s\n" | ||
1453 | +msgstr "FEHLER: Syntaxfehler in Zeile %1$d in %2$s\n" | ||
1454 | + | ||
1455 | +#: src/db.c:257 | ||
1456 | +#, c-format | ||
1457 | +msgid " ERROR: line exceed %1$d characters in %2$s.\n" | ||
1458 | +msgstr " FEHLER: Zeile überschreitet %1$d Zeichen in %2$s.\n" | ||
1459 | + | ||
1460 | +#: src/scsi.c:111 src/scsi.c:129 | ||
1461 | +#, c-format | ||
1462 | +msgid "log sense failed : %s" | ||
1463 | +msgstr "Protokoll-Erkennung fehlgeschlagen : %s" | ||
1464 | --- hddtemp-0.3-beta15.orig/po/LINGUAS | ||
1465 | +++ hddtemp-0.3-beta15/po/LINGUAS | ||
1466 | @@ -1,2 +1,2 @@ | ||
1467 | # Set of available languages. | ||
1468 | -fr pt ru sv | ||
1469 | +de fr pt ru sv | ||
1470 | --- hddtemp-0.3-beta15.orig/po/hddtemp.pot | ||
1471 | +++ hddtemp-0.3-beta15/po/hddtemp.pot | ||
1472 | @@ -1,35 +1,22 @@ | ||
1473 | - | ||
1474 | -# Copyright (C) 2006 Free Software Foundation, Inc. | ||
1475 | -# This file is distributed under the same license as the 'hddtemp' package. | ||
1476 | -# Emmanuel VARAGNAT <hddtemp@guzu.net>, 2006. | ||
1477 | +# SOME DESCRIPTIVE TITLE. | ||
1478 | +# Copyright (C) YEAR Free Software Foundation, Inc. | ||
1479 | +# This file is distributed under the same license as the PACKAGE package. | ||
1480 | +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
1481 | # | ||
1482 | #, fuzzy | ||
1483 | msgid "" | ||
1484 | msgstr "" | ||
1485 | "Project-Id-Version: PACKAGE VERSION\n" | ||
1486 | -"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" | ||
1487 | -"POT-Creation-Date: 2005-02-25 22:43+0100\n" | ||
1488 | +"Report-Msgid-Bugs-To: \n" | ||
1489 | +"POT-Creation-Date: 2006-06-29 16:24+0200\n" | ||
1490 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
1491 | -"Last-Translator: Emmanuel Varagnat <hddtemp@guzu.net>\n" | ||
1492 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
1493 | "Language-Team: LANGUAGE <LL@li.org>\n" | ||
1494 | "MIME-Version: 1.0\n" | ||
1495 | "Content-Type: text/plain; charset=CHARSET\n" | ||
1496 | "Content-Transfer-Encoding: 8bit\n" | ||
1497 | |||
1498 | -#: src/hddtemp.c:112 | ||
1499 | -#, c-format | ||
1500 | -msgid "" | ||
1501 | -"\n" | ||
1502 | -"Regexp%s| Value | Description\n" | ||
1503 | -"------%s---------------------\n" | ||
1504 | -msgstr "" | ||
1505 | - | ||
1506 | -#: src/hddtemp.c:118 | ||
1507 | -#, c-format | ||
1508 | -msgid "%s%s| %5d | %s\n" | ||
1509 | -msgstr "" | ||
1510 | - | ||
1511 | -#: src/hddtemp.c:161 | ||
1512 | +#: src/hddtemp.c:156 | ||
1513 | #, c-format | ||
1514 | msgid "" | ||
1515 | "\n" | ||
1516 | @@ -38,7 +25,7 @@ | ||
1517 | "\n" | ||
1518 | msgstr "" | ||
1519 | |||
1520 | -#: src/hddtemp.c:188 | ||
1521 | +#: src/hddtemp.c:189 | ||
1522 | #, c-format | ||
1523 | msgid "" | ||
1524 | "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" | ||
1525 | @@ -47,67 +34,59 @@ | ||
1526 | "WARNING: See --help, --debug and --drivebase options.\n" | ||
1527 | msgstr "" | ||
1528 | |||
1529 | -#: src/hddtemp.c:192 | ||
1530 | -#, c-format | ||
1531 | -msgid "%s: %s: no sensor\n" | ||
1532 | -msgstr "" | ||
1533 | - | ||
1534 | #: src/hddtemp.c:197 | ||
1535 | #, c-format | ||
1536 | -msgid "" | ||
1537 | -"WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
1538 | -"WARNING: But using a common value, it reports something.\n" | ||
1539 | -"WARNING: Note that the temperature shown could be wrong.\n" | ||
1540 | -"WARNING: See --help, --debug and --drivebase options.\n" | ||
1541 | -"WARNING: And don't forget you can add your drive to hddtemp.db\n" | ||
1542 | +msgid "%s: %s: no sensor\n" | ||
1543 | msgstr "" | ||
1544 | |||
1545 | -#: src/hddtemp.c:202 | ||
1546 | +#: src/hddtemp.c:211 | ||
1547 | #, c-format | ||
1548 | msgid "%s: %s: %d%sC or %sF\n" | ||
1549 | msgstr "" | ||
1550 | |||
1551 | -#: src/hddtemp.c:214 | ||
1552 | +#: src/hddtemp.c:235 | ||
1553 | #, c-format | ||
1554 | msgid "%s: %s: drive is sleeping\n" | ||
1555 | msgstr "" | ||
1556 | |||
1557 | -#: src/hddtemp.c:217 | ||
1558 | +#: src/hddtemp.c:242 | ||
1559 | #, c-format | ||
1560 | -msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" | ||
1561 | +msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" | ||
1562 | msgstr "" | ||
1563 | |||
1564 | -#: src/hddtemp.c:220 | ||
1565 | +#: src/hddtemp.c:246 | ||
1566 | #, c-format | ||
1567 | msgid "ERROR: %s: %s: unknown returned status\n" | ||
1568 | msgstr "" | ||
1569 | |||
1570 | -#: src/hddtemp.c:235 | ||
1571 | +#: src/hddtemp.c:261 | ||
1572 | #, c-format | ||
1573 | msgid "" | ||
1574 | "\n" | ||
1575 | "If one of the field value seems to match the temperature, be sure to read\n" | ||
1576 | -"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" | ||
1577 | +"the hddtemp man page before sending a report (section REPORT). Thanks.\n" | ||
1578 | msgstr "" | ||
1579 | |||
1580 | -#: src/hddtemp.c:308 | ||
1581 | +#: src/hddtemp.c:338 | ||
1582 | #, c-format | ||
1583 | msgid "ERROR: invalid separator.\n" | ||
1584 | msgstr "" | ||
1585 | |||
1586 | -#: src/hddtemp.c:319 | ||
1587 | +#: src/hddtemp.c:349 | ||
1588 | #, c-format | ||
1589 | msgid "ERROR: invalid port number.\n" | ||
1590 | msgstr "" | ||
1591 | |||
1592 | -#: src/hddtemp.c:329 | ||
1593 | +#: src/hddtemp.c:371 | ||
1594 | #, c-format | ||
1595 | msgid "" | ||
1596 | -" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" | ||
1597 | +" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" | ||
1598 | "\n" | ||
1599 | " hddtemp displays the temperature of drives supplied in argument.\n" | ||
1600 | " Drives must support S.M.A.R.T.\n" | ||
1601 | "\n" | ||
1602 | +" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" | ||
1603 | +"\n" | ||
1604 | " -b --drivebase : display database file content that allow hddtemp to\n" | ||
1605 | " recognize supported drives.\n" | ||
1606 | " -D --debug : display various S.M.A.R.T. fields and their values.\n" | ||
1607 | @@ -117,6 +96,7 @@ | ||
1608 | " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " | ||
1609 | "default.)\n" | ||
1610 | " -f --file=FILE : specify database file to use.\n" | ||
1611 | +" -F --foreground : don't daemonize, stay in foreground.\n" | ||
1612 | " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " | ||
1613 | "mode).\n" | ||
1614 | " -n --numeric : print only the temperature.\n" | ||
1615 | @@ -124,6 +104,8 @@ | ||
1616 | " -s --separator=C : separator to use between fields (in TCP/IP daemon " | ||
1617 | "mode).\n" | ||
1618 | " -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
1619 | +" -u --unit=[C|F] : force output temperature either in Celsius or " | ||
1620 | +"Fahrenheit.\n" | ||
1621 | " -q --quiet : do not check if the drive is supported.\n" | ||
1622 | " -v --version : display hddtemp version number.\n" | ||
1623 | " -w --wake-up : wake-up the drive if need.\n" | ||
1624 | @@ -133,58 +115,69 @@ | ||
1625 | "Report bugs or new drives to <hddtemp@guzu.net>.\n" | ||
1626 | msgstr "" | ||
1627 | |||
1628 | -#: src/hddtemp.c:522 | ||
1629 | +#: src/hddtemp.c:402 | ||
1630 | #, c-format | ||
1631 | msgid "hddtemp version %s\n" | ||
1632 | msgstr "" | ||
1633 | |||
1634 | -#: src/hddtemp.c:547 | ||
1635 | +#: src/hddtemp.c:418 | ||
1636 | #, c-format | ||
1637 | msgid "ERROR: invalid interval.\n" | ||
1638 | msgstr "" | ||
1639 | |||
1640 | -#: src/hddtemp.c:547 | ||
1641 | +#: src/hddtemp.c:438 | ||
1642 | +#, c-format | ||
1643 | msgid "Too few arguments: you must specify one drive, at least.\n" | ||
1644 | msgstr "" | ||
1645 | |||
1646 | -#: src/hddtemp.c:557 | ||
1647 | +#: src/hddtemp.c:448 | ||
1648 | +#, c-format | ||
1649 | msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" | ||
1650 | msgstr "" | ||
1651 | |||
1652 | -#: src/hddtemp.c:583 | ||
1653 | +#: src/hddtemp.c:505 | ||
1654 | #, c-format | ||
1655 | msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" | ||
1656 | msgstr "" | ||
1657 | |||
1658 | -#: src/ata.c:66 src/scsi.c:68 | ||
1659 | +#: src/ata.c:66 src/scsi.c:64 | ||
1660 | msgid "unknown" | ||
1661 | msgstr "" | ||
1662 | |||
1663 | -#: src/ata.c:98 | ||
1664 | +#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 | ||
1665 | #, c-format | ||
1666 | -msgid "field(%d)\t = %d\n" | ||
1667 | +msgid "S.M.A.R.T. not available" | ||
1668 | msgstr "" | ||
1669 | |||
1670 | -#: src/ata.c:167 | ||
1671 | -msgid "S.M.A.R.T. not available" | ||
1672 | +#: src/db.c:115 | ||
1673 | +#, c-format | ||
1674 | +msgid "" | ||
1675 | +"\n" | ||
1676 | +"Regexp%s| Value | Description\n" | ||
1677 | +"------%s---------------------\n" | ||
1678 | +msgstr "" | ||
1679 | + | ||
1680 | +#: src/db.c:121 | ||
1681 | +#, c-format | ||
1682 | +msgid "%s%s| %5d | %s\n" | ||
1683 | msgstr "" | ||
1684 | |||
1685 | -#: src/db.c:180 | ||
1686 | +#: src/db.c:236 | ||
1687 | #, c-format | ||
1688 | msgid "hddtemp: can't open %1$s: %2$s\n" | ||
1689 | msgstr "" | ||
1690 | |||
1691 | -#: src/db.c:194 | ||
1692 | +#: src/db.c:250 | ||
1693 | #, c-format | ||
1694 | msgid "ERROR: syntax error at line %1$d in %2$s\n" | ||
1695 | msgstr "" | ||
1696 | |||
1697 | -#: src/db.c:201 | ||
1698 | +#: src/db.c:257 | ||
1699 | #, c-format | ||
1700 | msgid " ERROR: line exceed %1$d characters in %2$s.\n" | ||
1701 | msgstr "" | ||
1702 | |||
1703 | -#: src/scsi.c:112 src/scsi.c:130 | ||
1704 | +#: src/scsi.c:111 src/scsi.c:129 | ||
1705 | #, c-format | ||
1706 | msgid "log sense failed : %s" | ||
1707 | msgstr "" | ||
1708 | --- hddtemp-0.3-beta15.orig/src/sata.c | ||
1709 | +++ hddtemp-0.3-beta15/src/sata.c | ||
1710 | @@ -118,11 +118,22 @@ | ||
1711 | int i; | ||
1712 | u16 * p; | ||
1713 | |||
1714 | - if(dsk->db_entry && dsk->db_entry->attribute_id == 0) { | ||
1715 | + if(dsk->db_entry->attribute_id == 0) { | ||
1716 | close(dsk->fd); | ||
1717 | dsk->fd = -1; | ||
1718 | return GETTEMP_NOSENSOR; | ||
1719 | } | ||
1720 | + | ||
1721 | + switch(ata_get_powermode(dsk->fd)) { | ||
1722 | + case PWM_STANDBY: | ||
1723 | + case PWM_SLEEPING: | ||
1724 | + if (!wakeup) | ||
1725 | + return GETTEMP_DRIVE_SLEEP; | ||
1726 | + case PWM_UNKNOWN: | ||
1727 | + case PWM_ACTIVE: /* active or idle */ | ||
1728 | + default: | ||
1729 | + break; | ||
1730 | + } | ||
1731 | |||
1732 | /* get SMART values */ | ||
1733 | if(sata_enable_smart(dsk->fd) != 0) { | ||
1734 | @@ -154,24 +165,15 @@ | ||
1735 | } | ||
1736 | |||
1737 | /* temperature */ | ||
1738 | - if(dsk->db_entry && dsk->db_entry->attribute_id > 0) | ||
1739 | - field = sata_search_temperature(values, dsk->db_entry->attribute_id); | ||
1740 | - else | ||
1741 | - field = sata_search_temperature(values, DEFAULT_ATTRIBUTE_ID); | ||
1742 | + field = sata_search_temperature(values, dsk->db_entry->attribute_id); | ||
1743 | |||
1744 | if(field) | ||
1745 | dsk->value = *(field+3); | ||
1746 | |||
1747 | if(dsk->db_entry && dsk->value != -1) | ||
1748 | return GETTEMP_KNOWN; | ||
1749 | - else { | ||
1750 | - if(dsk->value != -1) { | ||
1751 | - return GETTEMP_GUESS; | ||
1752 | - } | ||
1753 | - else { | ||
1754 | - return GETTEMP_UNKNOWN; | ||
1755 | - } | ||
1756 | - } | ||
1757 | + else | ||
1758 | + return GETTEMP_UNKNOWN; | ||
1759 | |||
1760 | /* never reached */ | ||
1761 | } | ||
1762 | --- hddtemp-0.3-beta15.orig/src/satacmds.c | ||
1763 | +++ hddtemp-0.3-beta15/src/satacmds.c | ||
1764 | @@ -39,7 +39,7 @@ | ||
1765 | #include <sys/ioctl.h> | ||
1766 | #include <scsi/sg.h> | ||
1767 | #include <linux/hdreg.h> | ||
1768 | -#include <netinet/in.h> | ||
1769 | +#include <byteswap.h> | ||
1770 | |||
1771 | // Application specific includes | ||
1772 | #include "satacmds.h" | ||
1773 | @@ -80,8 +80,8 @@ | ||
1774 | |||
1775 | ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); | ||
1776 | |||
1777 | - /* Verify SATA magics */ | ||
1778 | - if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00) | ||
1779 | + /* Verify SATA magic */ | ||
1780 | + if (sense[0] != 0x72) | ||
1781 | return 1; | ||
1782 | else | ||
1783 | return ret; | ||
1784 | @@ -95,10 +95,10 @@ | ||
1785 | p = s; | ||
1786 | end = &s[bytecount & ~1]; /* bytecount must be even */ | ||
1787 | |||
1788 | - /* convert from big-endian to host byte order */ | ||
1789 | + /* convert from big-endian to string order */ | ||
1790 | for (p = end ; p != s;) { | ||
1791 | unsigned short *pp = (unsigned short *) (p -= 2); | ||
1792 | - *pp = ntohs(*pp); | ||
1793 | + *pp = bswap_16(*pp); | ||
1794 | } | ||
1795 | |||
1796 | /* strip leading blanks */ | ||
1797 | --- hddtemp-0.3-beta15.orig/src/backtrace.c | ||
1798 | +++ hddtemp-0.3-beta15/src/backtrace.c | ||
1799 | @@ -16,9 +16,10 @@ | ||
1800 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
1801 | */ | ||
1802 | |||
1803 | +#define _GNU_SOURCE | ||
1804 | #include <features.h> | ||
1805 | |||
1806 | -#if defined(__i386__) && defined(__GLIBC__) | ||
1807 | +#if (defined(__i386__) || defined(__x86_64__)) && defined(__GLIBC__) | ||
1808 | |||
1809 | #include <execinfo.h> | ||
1810 | |||
1811 | @@ -31,8 +32,12 @@ | ||
1812 | #include <bits/sigcontext.h> | ||
1813 | #include <sys/param.h> | ||
1814 | |||
1815 | -#define __USE_GNU | ||
1816 | #include <ucontext.h> | ||
1817 | +#if defined(__i386__) | ||
1818 | +# define REG_IP REG_EIP | ||
1819 | +#elif defined(__x86_64__) | ||
1820 | +# define REG_IP REG_RIP | ||
1821 | +#endif | ||
1822 | |||
1823 | #define MAX_BTSIZE 64 | ||
1824 | |||
1825 | @@ -42,7 +47,6 @@ | ||
1826 | static char **messages = NULL; | ||
1827 | static size_t btsize = 0; | ||
1828 | static size_t i; | ||
1829 | - static unsigned int old_eip, old_ebp; | ||
1830 | static char *strerr = "???"; | ||
1831 | static FILE *fstrm; | ||
1832 | |||
1833 | @@ -61,10 +65,10 @@ | ||
1834 | SIC_CASE(SEGV_MAPERR); | ||
1835 | SIC_CASE(SEGV_ACCERR); | ||
1836 | } | ||
1837 | - fprintf(fstrm, "=== SEGFAULT (%s) : invalid access to %p, in 0x%08x\n", | ||
1838 | + fprintf(fstrm, "=== SEGFAULT (%s) : invalid access to %p, in %p\n", | ||
1839 | strerr, | ||
1840 | ist->si_addr, | ||
1841 | - puc->uc_mcontext.gregs[REG_EIP]); | ||
1842 | + (void*)puc->uc_mcontext.gregs[REG_IP]); | ||
1843 | break; | ||
1844 | case SIGILL: | ||
1845 | switch(ist->si_code) { | ||
1846 | @@ -77,10 +81,10 @@ | ||
1847 | SIC_CASE(ILL_COPROC); | ||
1848 | SIC_CASE(ILL_BADSTK); | ||
1849 | } | ||
1850 | - fprintf(fstrm, "=== ILLEGAL INSTR (%s) : invalid access to %p, in 0x%08x\n", | ||
1851 | + fprintf(fstrm, "=== ILLEGAL INSTR (%s) : invalid access to %p, in %p\n", | ||
1852 | strerr, | ||
1853 | ist->si_addr, | ||
1854 | - puc->uc_mcontext.gregs[REG_EIP]); | ||
1855 | + (void*)puc->uc_mcontext.gregs[REG_IP]); | ||
1856 | break; | ||
1857 | case SIGBUS: | ||
1858 | switch(ist->si_code) { | ||
1859 | @@ -88,10 +92,10 @@ | ||
1860 | SIC_CASE(BUS_ADRERR); | ||
1861 | SIC_CASE(BUS_OBJERR); | ||
1862 | } | ||
1863 | - fprintf(fstrm, "=== BUS ERROR (%p) : invalid access to %p, in 0x%08x\n", | ||
1864 | + fprintf(fstrm, "=== BUS ERROR (%p) : invalid access to %p, in %p\n", | ||
1865 | strerr, | ||
1866 | ist->si_addr, | ||
1867 | - puc->uc_mcontext.gregs[REG_EIP]); | ||
1868 | + (void*)puc->uc_mcontext.gregs[REG_IP]); | ||
1869 | break; | ||
1870 | } | ||
1871 | fflush(fstrm); | ||
1872 | @@ -101,7 +105,7 @@ | ||
1873 | /* | ||
1874 | old_eip = *(unsigned int*)((void*)&n-4); | ||
1875 | old_ebp = *(unsigned int*)((void*)&n-8); | ||
1876 | - *(unsigned int*)((void*)&n-4) = puc->uc_mcontext.gregs[REG_EIP]; | ||
1877 | + *(unsigned int*)((void*)&n-4) = puc->uc_mcontext.gregs[REG_IP]; | ||
1878 | *(unsigned int*)((void*)&n-8) = puc->uc_mcontext.gregs[REG_EBP]; | ||
1879 | |||
1880 | btsize = backtrace(btinfo, MAX_BTSIZE); | ||
1881 | @@ -111,14 +115,14 @@ | ||
1882 | */ | ||
1883 | |||
1884 | btsize = backtrace(btinfo, MAX_BTSIZE); | ||
1885 | - btinfo[1] = (void*) puc->uc_mcontext.gregs[REG_EIP]; | ||
1886 | + btinfo[1] = (void*) puc->uc_mcontext.gregs[REG_IP]; | ||
1887 | |||
1888 | messages = backtrace_symbols(btinfo, btsize); | ||
1889 | |||
1890 | for(i = 1; | ||
1891 | i < btsize; | ||
1892 | i++) | ||
1893 | - fprintf(fstrm, "[%d] #%d: %s\n", getpid(), i, messages[i]); | ||
1894 | + fprintf(fstrm, "[%d] #%zu: %s\n", getpid(), i, messages[i]); | ||
1895 | fflush(fstrm); | ||
1896 | fclose(fstrm); | ||
1897 | |||
1898 | --- hddtemp-0.3-beta15.orig/src/daemon.c | ||
1899 | +++ hddtemp-0.3-beta15/src/daemon.c | ||
1900 | @@ -163,19 +163,16 @@ | ||
1901 | |||
1902 | switch(dsk->ret) { | ||
1903 | case GETTEMP_NOT_APPLICABLE: | ||
1904 | - n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", | ||
1905 | + n = snprintf(msg, sizeof(msg), "%s%c%s%cNA%c*", | ||
1906 | dsk->drive, separator, | ||
1907 | dsk->model, separator, | ||
1908 | - "NA", separator, | ||
1909 | - '*'); | ||
1910 | + separator); | ||
1911 | break; | ||
1912 | - case GETTEMP_GUESS: | ||
1913 | case GETTEMP_UNKNOWN: | ||
1914 | - n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", | ||
1915 | + n = snprintf(msg, sizeof(msg), "%s%c%s%cUNK%c*", | ||
1916 | dsk->drive, separator, | ||
1917 | - dsk->model, separator, | ||
1918 | - "UNK", separator, | ||
1919 | - '*'); | ||
1920 | + dsk->model, separator, | ||
1921 | + separator); | ||
1922 | break; | ||
1923 | case GETTEMP_KNOWN: | ||
1924 | n = snprintf(msg, sizeof(msg), "%s%c%s%c%d%c%c", | ||
1925 | @@ -185,26 +182,23 @@ | ||
1926 | get_unit(dsk)); | ||
1927 | break; | ||
1928 | case GETTEMP_NOSENSOR: | ||
1929 | - n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", | ||
1930 | + n = snprintf(msg, sizeof(msg), "%s%c%s%cNOS%c*", | ||
1931 | dsk->drive, separator, | ||
1932 | dsk->model, separator, | ||
1933 | - "NOS", separator, | ||
1934 | - '*'); | ||
1935 | + separator); | ||
1936 | break; | ||
1937 | case GETTEMP_DRIVE_SLEEP: | ||
1938 | - n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", | ||
1939 | + n = snprintf(msg, sizeof(msg), "%s%c%s%cSLP%c*", | ||
1940 | dsk->drive, separator, | ||
1941 | dsk->model, separator, | ||
1942 | - "SLP", separator, | ||
1943 | - '*'); | ||
1944 | + separator); | ||
1945 | break; | ||
1946 | case GETTEMP_ERROR: | ||
1947 | default: | ||
1948 | - n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", | ||
1949 | + n = snprintf(msg, sizeof(msg), "%s%c%s%cERR%c*", | ||
1950 | dsk->drive, separator, | ||
1951 | (dsk->model) ? dsk->model : "???", separator, | ||
1952 | - "ERR", separator, | ||
1953 | - '*'); | ||
1954 | + separator); | ||
1955 | break; | ||
1956 | } | ||
1957 | write(cfd,&separator, 1); | ||
1958 | @@ -222,14 +216,11 @@ | ||
1959 | for(dsk = ldisks; dsk; dsk = dsk->next) { | ||
1960 | switch(dsk->ret) { | ||
1961 | case GETTEMP_KNOWN: | ||
1962 | - case GETTEMP_GUESS: | ||
1963 | - value_to_unit(dsk); | ||
1964 | - | ||
1965 | syslog(LOG_INFO, "%s: %s: %d %c", | ||
1966 | dsk->drive, | ||
1967 | dsk->model, | ||
1968 | - dsk->value, | ||
1969 | - dsk->db_entry->unit); | ||
1970 | + value_to_unit(dsk), | ||
1971 | + get_unit(dsk)); | ||
1972 | break; | ||
1973 | case GETTEMP_DRIVE_SLEEP: | ||
1974 | syslog(LOG_WARNING, _("%s: %s: drive is sleeping"), | ||
1975 | @@ -270,28 +261,30 @@ | ||
1976 | fd_set deffds; | ||
1977 | time_t next_time; | ||
1978 | |||
1979 | - switch(fork()) { | ||
1980 | - case -1: | ||
1981 | - perror("fork"); | ||
1982 | - exit(2); | ||
1983 | - break; | ||
1984 | - case 0: | ||
1985 | - break; | ||
1986 | - default: | ||
1987 | - exit(0); | ||
1988 | - } | ||
1989 | - | ||
1990 | - setsid(); | ||
1991 | - | ||
1992 | - switch(fork()) { | ||
1993 | - case -1: | ||
1994 | - perror("fork"); | ||
1995 | - exit(2); | ||
1996 | - break; | ||
1997 | - case 0: | ||
1998 | - break; | ||
1999 | - default: | ||
2000 | - exit(0); | ||
2001 | +if (!foreground) { | ||
2002 | + switch(fork()) { | ||
2003 | + case -1: | ||
2004 | + perror("fork"); | ||
2005 | + exit(2); | ||
2006 | + break; | ||
2007 | + case 0: | ||
2008 | + break; | ||
2009 | + default: | ||
2010 | + exit(0); | ||
2011 | + } | ||
2012 | + | ||
2013 | + setsid(); | ||
2014 | + | ||
2015 | + switch(fork()) { | ||
2016 | + case -1: | ||
2017 | + perror("fork"); | ||
2018 | + exit(2); | ||
2019 | + break; | ||
2020 | + case 0: | ||
2021 | + break; | ||
2022 | + default: | ||
2023 | + exit(0); | ||
2024 | + } | ||
2025 | } | ||
2026 | chdir("/"); | ||
2027 | umask(0); | ||
2028 | --- hddtemp-0.3-beta15.orig/src/hddtemp.c | ||
2029 | +++ hddtemp-0.3-beta15/src/hddtemp.c | ||
2030 | @@ -75,7 +75,7 @@ | ||
2031 | char separator = SEPARATOR; | ||
2032 | |||
2033 | struct bustype * bus[BUS_TYPE_MAX]; | ||
2034 | -int tcp_daemon, debug, quiet, numeric, wakeup, af_hint; | ||
2035 | +int tcp_daemon, debug, quiet, numeric, wakeup, foreground, af_hint; | ||
2036 | |||
2037 | static enum { DEFAULT, CELSIUS, FAHRENHEIT } unit; | ||
2038 | |||
2039 | @@ -194,23 +194,7 @@ | ||
2040 | if (numeric && quiet) | ||
2041 | printf("0\n"); | ||
2042 | else | ||
2043 | - printf(_("%s: %s: no sensor\n"), dsk->drive, dsk->model); | ||
2044 | - | ||
2045 | - break; | ||
2046 | - case GETTEMP_GUESS: | ||
2047 | - | ||
2048 | - if(!quiet) | ||
2049 | - fprintf(stderr, | ||
2050 | - _("WARNING: Drive %s doesn't appear in the database of supported drives\n" | ||
2051 | - "WARNING: But using a common value, it reports something.\n" | ||
2052 | - "WARNING: Note that the temperature shown could be wrong.\n" | ||
2053 | - "WARNING: See --help, --debug and --drivebase options.\n" | ||
2054 | - "WARNING: And don't forget you can add your drive to hddtemp.db\n"), dsk->drive); | ||
2055 | - | ||
2056 | - if (! numeric) | ||
2057 | - printf(_("%s: %s: %d%sC or %sF\n"), dsk->drive, dsk->model, dsk->value, degree, degree); | ||
2058 | - else | ||
2059 | - printf("%d\n", value_to_unit(dsk)); | ||
2060 | + fprintf(stderr, _("%s: %s: no sensor\n"), dsk->drive, dsk->model); | ||
2061 | |||
2062 | break; | ||
2063 | case GETTEMP_KNOWN: | ||
2064 | @@ -232,14 +216,14 @@ | ||
2065 | if (numeric && quiet) | ||
2066 | printf("0\n"); | ||
2067 | else | ||
2068 | - printf(_("%s: %s: drive is sleeping\n"), dsk->drive, dsk->model); | ||
2069 | + fprintf(stderr, _("%s: %s: drive is sleeping\n"), dsk->drive, dsk->model); | ||
2070 | |||
2071 | break; | ||
2072 | case GETTEMP_NOSENSOR: | ||
2073 | if (numeric && quiet) | ||
2074 | printf("0\n"); | ||
2075 | else | ||
2076 | - printf(_("%s: %s: drive supported, but it doesn't have a temperature sensor.\n"), dsk->drive, dsk->model); | ||
2077 | + fprintf(stderr, _("%s: %s: drive supported, but it doesn't have a temperature sensor.\n"), dsk->drive, dsk->model); | ||
2078 | |||
2079 | break; | ||
2080 | default: | ||
2081 | @@ -268,8 +252,9 @@ | ||
2082 | |||
2083 | int main(int argc, char* argv[]) { | ||
2084 | int i, c, lindex = 0, db_loaded = 0; | ||
2085 | + int ret = 0; | ||
2086 | int show_db; | ||
2087 | - struct disk * ldisks; | ||
2088 | + struct disk * ldisks; | ||
2089 | |||
2090 | backtrace_sigsegv(); | ||
2091 | backtrace_sigill(); | ||
2092 | @@ -279,7 +264,7 @@ | ||
2093 | bindtextdomain (PACKAGE, LOCALEDIR); | ||
2094 | textdomain (PACKAGE); | ||
2095 | |||
2096 | - show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0; | ||
2097 | + show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0; | ||
2098 | unit = DEFAULT; | ||
2099 | portnum = PORT_NUMBER; | ||
2100 | listen_addr = NULL; | ||
2101 | @@ -294,6 +279,7 @@ | ||
2102 | {"drivebase", 0, NULL, 'b'}, | ||
2103 | {"debug", 0, NULL, 'D'}, | ||
2104 | {"file", 1, NULL, 'f'}, | ||
2105 | + {"foreground", 0, NULL, 'F'}, | ||
2106 | {"listen", 1, NULL, 'l'}, | ||
2107 | {"version", 0, NULL, 'v'}, | ||
2108 | {"port", 1, NULL, 'p'}, | ||
2109 | @@ -305,7 +291,7 @@ | ||
2110 | {0, 0, 0, 0} | ||
2111 | }; | ||
2112 | |||
2113 | - c = getopt_long (argc, argv, "bDdf:l:hp:qs:u:vnw46S:", long_options, &lindex); | ||
2114 | + c = getopt_long (argc, argv, "bDdf:l:hp:qs:u:vnw46FS:", long_options, &lindex); | ||
2115 | if (c == -1) | ||
2116 | break; | ||
2117 | |||
2118 | @@ -382,12 +368,13 @@ | ||
2119 | " (done for every drive supplied).\n" | ||
2120 | " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by default.)\n" | ||
2121 | " -f --file=FILE : specify database file to use.\n" | ||
2122 | + " -F --foreground : don't daemonize, stay in foreground.\n" | ||
2123 | " -l --listen=addr : listen on a specific interface (in TCP/IP daemon mode).\n" | ||
2124 | " -n --numeric : print only the temperature.\n" | ||
2125 | " -p --port=# : port to listen to (in TCP/IP daemon mode).\n" | ||
2126 | " -s --separator=C : separator to use between fields (in TCP/IP daemon mode).\n" | ||
2127 | " -S --syslog=s : log temperature to syslog every s seconds.\n" | ||
2128 | - " -u --unit=[C|F] : force output temperature either in Celius or Fahrenheit.\n" | ||
2129 | + " -u --unit=[C|F] : force output temperature either in Celsius or Fahrenheit.\n" | ||
2130 | " -q --quiet : do not check if the drive is supported.\n" | ||
2131 | " -v --version : display hddtemp version number.\n" | ||
2132 | " -w --wake-up : wake-up the drive if need.\n" | ||
2133 | @@ -418,6 +405,9 @@ | ||
2134 | } | ||
2135 | } | ||
2136 | break; | ||
2137 | + case 'F': | ||
2138 | + foreground = 1; | ||
2139 | + break; | ||
2140 | default: | ||
2141 | exit(1); | ||
2142 | } | ||
2143 | @@ -489,6 +479,7 @@ | ||
2144 | if( (dsk->fd = open(dsk->drive, O_RDONLY | O_NONBLOCK)) < 0) { | ||
2145 | snprintf(dsk->errormsg, MAX_ERRORMSG_SIZE, "open: %s\n", strerror(errno)); | ||
2146 | dsk->type = ERROR; | ||
2147 | + ret = 1; | ||
2148 | continue; | ||
2149 | } | ||
2150 | |||
2151 | @@ -501,6 +492,7 @@ | ||
2152 | |||
2153 | ldisks = dsk->next; | ||
2154 | free(dsk); | ||
2155 | + ret = 1; | ||
2156 | continue; | ||
2157 | } | ||
2158 | |||
2159 | @@ -514,11 +506,17 @@ | ||
2160 | db_loaded = 1; | ||
2161 | } | ||
2162 | |||
2163 | + dsk->db_entry = (struct harddrive_entry *)malloc(sizeof(struct harddrive_entry)); | ||
2164 | dbe = is_a_supported_drive(dsk->model); | ||
2165 | - if(dbe) { | ||
2166 | - dsk->db_entry = (struct harddrive_entry *)malloc(sizeof(struct harddrive_entry)); | ||
2167 | + if(dbe) | ||
2168 | memcpy(dsk->db_entry, dbe, sizeof(struct harddrive_entry)); | ||
2169 | - } | ||
2170 | + else { | ||
2171 | + dsk->db_entry->regexp = ""; | ||
2172 | + dsk->db_entry->description = ""; | ||
2173 | + dsk->db_entry->attribute_id = DEFAULT_ATTRIBUTE_ID; | ||
2174 | + dsk->db_entry->unit = 'C'; | ||
2175 | + dsk->db_entry->next = NULL; | ||
2176 | + } | ||
2177 | } | ||
2178 | } | ||
2179 | |||
2180 | @@ -530,5 +528,5 @@ | ||
2181 | do_direct_mode(ldisks); | ||
2182 | } | ||
2183 | |||
2184 | - return 0; | ||
2185 | + return ret; | ||
2186 | } | ||
2187 | --- hddtemp-0.3-beta15.orig/src/ata.c | ||
2188 | +++ hddtemp-0.3-beta15/src/ata.c | ||
2189 | @@ -75,7 +75,7 @@ | ||
2190 | int i; | ||
2191 | u16 * p; | ||
2192 | |||
2193 | - if(dsk->db_entry && dsk->db_entry->attribute_id == 0) { | ||
2194 | + if(dsk->db_entry->attribute_id == 0) { | ||
2195 | close(dsk->fd); | ||
2196 | dsk->fd = -1; | ||
2197 | return GETTEMP_NOSENSOR; | ||
2198 | @@ -140,24 +140,15 @@ | ||
2199 | */ | ||
2200 | |||
2201 | /* temperature */ | ||
2202 | - if(dsk->db_entry && dsk->db_entry->attribute_id > 0) | ||
2203 | - field = ata_search_temperature(values, dsk->db_entry->attribute_id); | ||
2204 | - else | ||
2205 | - field = ata_search_temperature(values, DEFAULT_ATTRIBUTE_ID); | ||
2206 | + field = ata_search_temperature(values, dsk->db_entry->attribute_id); | ||
2207 | |||
2208 | if(field) | ||
2209 | dsk->value = *(field+3); | ||
2210 | |||
2211 | - if(dsk->db_entry && dsk->value != -1) | ||
2212 | + if(dsk->value != -1) | ||
2213 | return GETTEMP_KNOWN; | ||
2214 | - else { | ||
2215 | - if(dsk->value != -1) { | ||
2216 | - return GETTEMP_GUESS; | ||
2217 | - } | ||
2218 | - else { | ||
2219 | - return GETTEMP_UNKNOWN; | ||
2220 | - } | ||
2221 | - } | ||
2222 | + else | ||
2223 | + return GETTEMP_UNKNOWN; | ||
2224 | |||
2225 | /* never reached */ | ||
2226 | } | ||
2227 | --- hddtemp-0.3-beta15.orig/src/hddtemp.h | ||
2228 | +++ hddtemp-0.3-beta15/src/hddtemp.h | ||
2229 | @@ -39,8 +39,6 @@ | ||
2230 | GETTEMP_ERROR, /* Error */ | ||
2231 | GETTEMP_NOT_APPLICABLE, /* */ | ||
2232 | GETTEMP_UNKNOWN, /* Drive is not in database */ | ||
2233 | - GETTEMP_GUESS, /* Not in database, but something was guessed, user must | ||
2234 | - check that the temperature returned is correct */ | ||
2235 | GETTEMP_KNOWN, /* Drive appear in database */ | ||
2236 | GETTEMP_NOSENSOR, /* Drive appear in database but is known to have no sensor */ | ||
2237 | GETTEMP_DRIVE_SLEEP /* Drive is sleeping */ | ||
2238 | @@ -78,7 +76,7 @@ | ||
2239 | |||
2240 | extern struct bustype * bus[BUS_TYPE_MAX]; | ||
2241 | extern char errormsg[MAX_ERRORMSG_SIZE]; | ||
2242 | -extern int tcp_daemon, debug, quiet, wakeup, af_hint; | ||
2243 | +extern int tcp_daemon, debug, quiet, wakeup, af_hint, foreground; | ||
2244 | extern char separator; | ||
2245 | extern long portnum, syslog_interval; | ||
2246 | extern char * listen_addr; | ||
2247 | --- hddtemp-0.3-beta15.orig/src/scsicmds.c | ||
2248 | +++ hddtemp-0.3-beta15/src/scsicmds.c | ||
2249 | @@ -147,6 +147,7 @@ | ||
2250 | return 1; | ||
2251 | else { | ||
2252 | scsi_fixstring(buffer + 8, 24); | ||
2253 | + buffer[32] = 0; | ||
2254 | return 0; | ||
2255 | } | ||
2256 | } | ||