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