From f7cce686099df3034fc41e427ab14358277234fe Mon Sep 17 00:00:00 2001 From: Dominic Radermacher Date: Sat, 18 Jul 2026 08:07:42 +0200 Subject: [PATCH] fix compile warnings about missing field initializer --- po/de.po | 124 ++++++++++++++++++++++++------------------------ po/en.po | 124 ++++++++++++++++++++++++------------------------ po/ptouch.pot | 124 ++++++++++++++++++++++++------------------------ src/libptouch.c | 60 +++++++++++------------ 4 files changed, 216 insertions(+), 216 deletions(-) diff --git a/po/de.po b/po/de.po index be284f3..7522f6a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ptouch-print 1.7\n" "Report-Msgid-Bugs-To: dominic@familie-radermacher.ch\n" -"POT-Creation-Date: 2026-03-08 13:10+0100\n" +"POT-Creation-Date: 2026-07-18 08:01+0200\n" "PO-Revision-Date: 2024-05-23 22:27-0400\n" "Last-Translator: dominic@familie-radermacher.ch\n" "Language-Team: German \n" @@ -19,168 +19,168 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.2\n" -#: src/libptouch.c:108 src/libptouch.c:112 src/libptouch.c:116 +#: src/libptouch.c:123 src/libptouch.c:127 src/libptouch.c:131 #, c-format msgid "out of memory\n" msgstr "Nicht genug Speicher\n" -#: src/libptouch.c:120 +#: src/libptouch.c:135 #, c-format msgid "libusb_init() failed\n" msgstr "ptouch_init() fehlgeschlagen\n" -#: src/libptouch.c:129 +#: src/libptouch.c:144 #, c-format msgid "failed to get device descriptor" msgstr "" -#: src/libptouch.c:135 +#: src/libptouch.c:150 #, c-format msgid "%s found on USB bus %d, device %d\n" msgstr "Drucker %s am USB Bus %d, Gerät %d gefunden\n" -#: src/libptouch.c:150 +#: src/libptouch.c:165 #, c-format msgid "libusb_open error :%s\n" msgstr "" -#: src/libptouch.c:156 +#: src/libptouch.c:171 #, c-format msgid "error while detaching kernel driver: %s\n" msgstr "" -#: src/libptouch.c:160 +#: src/libptouch.c:175 #, c-format msgid "interface claim error: %s\n" msgstr "" -#: src/libptouch.c:171 +#: src/libptouch.c:187 #, c-format msgid "" "No P-Touch printer found on USB (remember to put switch to position E)\n" msgstr "Kein P-Ptouch Drucker am USB gefunden (Schalter muss auf E stehen)\n" -#: src/libptouch.c:191 +#: src/libptouch.c:207 #, c-format msgid "debug: called ptouch_send() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:198 +#: src/libptouch.c:214 #, c-format msgid "write error: %s\n" msgstr "" -#: src/libptouch.c:202 +#: src/libptouch.c:218 #, fuzzy, c-format msgid "write error: could send only %i of %ld bytes\n" msgstr "Lesefehler: %i anstatt 32 bytes empfangen\n" -#: src/libptouch.c:252 +#: src/libptouch.c:268 #, c-format msgid "debug: called ptouch_info_cmd() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:294 +#: src/libptouch.c:310 #, fuzzy, c-format msgid "debug: called ptouch_rasterstart() with NULL ptdev\n" msgstr "ptouch_rasterstart() fehlgeschlagen\n" -#: src/libptouch.c:325 +#: src/libptouch.c:341 #, c-format msgid "debug: called ptouch_finalize() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:340 +#: src/libptouch.c:356 #, c-format msgid "debug: dumping raw status bytes\n" msgstr "" -#: src/libptouch.c:359 +#: src/libptouch.c:375 #, c-format msgid "debug: called ptouch_getstatus() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:369 src/libptouch.c:400 +#: src/libptouch.c:385 src/libptouch.c:416 #, c-format msgid "read error: %s\n" msgstr "" -#: src/libptouch.c:374 +#: src/libptouch.c:390 #, c-format msgid "timeout (%i sec) while waiting for status response\n" msgstr "" -#: src/libptouch.c:383 +#: src/libptouch.c:399 #, c-format msgid "unknown tape width of %imm, please report this.\n" msgstr "Unbekannte Schriftband breite (%i mm), bitte melden\n" -#: src/libptouch.c:389 +#: src/libptouch.c:405 #, c-format msgid "got only 16 bytes... wondering what they are:\n" msgstr "nur 16 bytes empfangen... mal gucken was die sind:\n" -#: src/libptouch.c:393 +#: src/libptouch.c:409 #, c-format msgid "read error: got %i instead of 32 bytes\n" msgstr "Lesefehler: %i anstatt 32 bytes empfangen\n" -#: src/libptouch.c:396 +#: src/libptouch.c:412 #, c-format msgid "strange status:\n" msgstr "Seltsamer Status:\n" -#: src/libptouch.c:398 +#: src/libptouch.c:414 #, c-format msgid "trying to flush junk\n" msgstr "" -#: src/libptouch.c:403 +#: src/libptouch.c:419 #, c-format msgid "got another %i bytes. now try again\n" msgstr "weitere %i bytes empfangen. probiere es nochmal.\n" -#: src/libptouch.c:410 +#: src/libptouch.c:426 #, fuzzy, c-format msgid "debug: called ptouch_get_dpi() with NULL ptdev\n" msgstr "ptouch_rasterstart() fehlgeschlagen\n" -#: src/libptouch.c:419 +#: src/libptouch.c:435 #, fuzzy, c-format msgid "debug: called ptouch_cal_tape_width() with NULL ptdev\n" msgstr "ptouch_rasterstart() fehlgeschlagen\n" -#: src/libptouch.c:430 +#: src/libptouch.c:446 #, c-format msgid "printer with %d dpi not supported\n" msgstr "" -#: src/libptouch.c:444 +#: src/libptouch.c:466 #, fuzzy, c-format msgid "debug: called ptouch_get_max_lines() with NULL ptdev\n" msgstr "ptouch_rasterstart() fehlgeschlagen\n" -#: src/libptouch.c:448 +#: src/libptouch.c:470 #, fuzzy, c-format msgid "debug: called ptouch_get_max_lines() with invalid fontsize_px\n" msgstr "ptouch_rasterstart() fehlgeschlagen\n" -#: src/libptouch.c:451 +#: src/libptouch.c:473 #, c-format msgid "debug: calculated max lines %d \n" msgstr "" -#: src/libptouch.c:458 +#: src/libptouch.c:480 #, c-format msgid "debug: called ptouch_get_tape_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:467 +#: src/libptouch.c:489 #, c-format msgid "debug: called ptouch_get_max_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:479 +#: src/libptouch.c:504 #, c-format msgid "debug: called ptouch_sendraster() with NULL ptdev\n" msgstr "" @@ -205,139 +205,139 @@ msgstr "Maximal druckbare Breite für dieses Schriftband sind %ipx\n" msgid "image size (%ipx x %ipx)\n" msgstr "Bild ist zu gross (%ipx x %ipx)\n" -#: src/ptouch-print.c:198 +#: src/ptouch-print.c:204 #, c-format msgid "ptouch_rasterstart() failed\n" msgstr "ptouch_rasterstart() fehlgeschlagen\n" -#: src/ptouch-print.c:204 +#: src/ptouch-print.c:210 #, c-format msgid "send print information command\n" msgstr "" -#: src/ptouch-print.c:210 +#: src/ptouch-print.c:216 #, c-format msgid "send PT-D460BT magic commands\n" msgstr "" -#: src/ptouch-print.c:217 +#: src/ptouch-print.c:223 #, c-format msgid "send precut command\n" msgstr "" -#: src/ptouch-print.c:226 +#: src/ptouch-print.c:232 #, c-format msgid "send PT-D460BT chain commands\n" msgstr "" -#: src/ptouch-print.c:238 +#: src/ptouch-print.c:244 #, fuzzy, c-format msgid "ptouch_sendraster() failed\n" msgstr "ptouch_send() fehlgeschlagen\n" -#: src/ptouch-print.c:287 +#: src/ptouch-print.c:293 #, c-format msgid "writing image '%s' failed\n" msgstr "Schreiben der Bilddatei '%s' fehlgeschlagen\n" -#: src/ptouch-print.c:292 +#: src/ptouch-print.c:298 #, c-format msgid "printing '%s' requires %.1f mm of tape\n" msgstr "" -#: src/ptouch-print.c:314 +#: src/ptouch-print.c:320 #, c-format msgid "debug: z baseline offset - %d\n" msgstr "" -#: src/ptouch-print.c:315 +#: src/ptouch-print.c:321 #, c-format msgid "debug: text baseline offset - %d\n" msgstr "" -#: src/ptouch-print.c:388 +#: src/ptouch-print.c:394 #, c-format msgid "render_text(): %i lines, font = '%s', align = '%c'\n" msgstr "" -#: src/ptouch-print.c:391 +#: src/ptouch-print.c:397 #, c-format msgid "warning: font config not available\n" msgstr "Warnung: fontconfig ist nicht verfügbar\n" -#: src/ptouch-print.c:395 +#: src/ptouch-print.c:401 #, c-format msgid "setting font size=%i\n" msgstr "setze Zeichensatzgrösse=%i\n" -#: src/ptouch-print.c:397 +#: src/ptouch-print.c:403 #, fuzzy, c-format msgid "ignoring setting font margin=%i\n" msgstr "setze Zeichensatzgrösse=%i\n" -#: src/ptouch-print.c:402 +#: src/ptouch-print.c:408 #, c-format msgid "could not estimate needed font size\n" msgstr "Konnte die notwendige Zeichensatzgrösse nicht bestimmen\n" -#: src/ptouch-print.c:409 +#: src/ptouch-print.c:415 #, c-format msgid "choosing font size=%i\n" msgstr "Wähle Zeichensatzgrösse %i\n" -#: src/ptouch-print.c:425 src/ptouch-print.c:459 +#: src/ptouch-print.c:431 src/ptouch-print.c:465 #, fuzzy, c-format msgid "error in gdImageStringFT_180dpi: %s\n" msgstr "Fehler in Funktion gdImageStringFT(): %s\n" -#: src/ptouch-print.c:616 +#: src/ptouch-print.c:622 #, c-format msgid "Only up to %d lines are supported" msgstr "" -#: src/ptouch-print.c:697 +#: src/ptouch-print.c:703 msgid "No arguments supported" msgstr "" -#: src/ptouch-print.c:702 +#: src/ptouch-print.c:708 msgid "Option --writepng missing" msgstr "" -#: src/ptouch-print.c:705 +#: src/ptouch-print.c:711 msgid "Options --force_tape_width and --info can't be used together" msgstr "" -#: src/ptouch-print.c:736 +#: src/ptouch-print.c:742 #, c-format msgid "ptouch_init() failed\n" msgstr "ptouch_init() fehlgeschlagen\n" -#: src/ptouch-print.c:739 +#: src/ptouch-print.c:745 #, c-format msgid "ptouch_getstatus() failed\n" msgstr "ptouch_getstatus() fehlgeschlagen\n" -#: src/ptouch-print.c:753 +#: src/ptouch-print.c:759 #, fuzzy, c-format msgid "printer has %d dpi, maximum printing width is %ld px\n" msgstr "Maximal druckbare Breite für dieses Schriftband sind %ipx\n" -#: src/ptouch-print.c:754 +#: src/ptouch-print.c:760 #, fuzzy, c-format msgid "maximum printing width for this tape is %ldpx\n" msgstr "Maximal druckbare Breite für dieses Schriftband sind %ipx\n" -#: src/ptouch-print.c:779 +#: src/ptouch-print.c:785 #, c-format msgid "failed to load image file\n" msgstr "" -#: src/ptouch-print.c:788 +#: src/ptouch-print.c:794 #, c-format msgid "could not render text\n" msgstr "Konnte Text nicht rendern\n" -#: src/ptouch-print.c:829 +#: src/ptouch-print.c:835 #, c-format msgid "ptouch_finalize(%d) failed\n" msgstr "ptouch_finalize(%d) fehlgeschlagen\n" diff --git a/po/en.po b/po/en.po index 20a1080..25868d7 100644 --- a/po/en.po +++ b/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ptouch-print 1.7\n" "Report-Msgid-Bugs-To: dominic@familie-radermacher.ch\n" -"POT-Creation-Date: 2026-03-08 13:10+0100\n" +"POT-Creation-Date: 2026-07-18 08:01+0200\n" "PO-Revision-Date: 2024-05-23 22:26-0400\n" "Last-Translator: dominic@familie-radermacher.ch\n" "Language-Team: English \n" @@ -18,169 +18,169 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.2\n" -#: src/libptouch.c:108 src/libptouch.c:112 src/libptouch.c:116 +#: src/libptouch.c:123 src/libptouch.c:127 src/libptouch.c:131 #, c-format msgid "out of memory\n" msgstr "out of memory\n" -#: src/libptouch.c:120 +#: src/libptouch.c:135 #, c-format msgid "libusb_init() failed\n" msgstr "libusb_init() failed\n" -#: src/libptouch.c:129 +#: src/libptouch.c:144 #, c-format msgid "failed to get device descriptor" msgstr "failed to get device descriptor" -#: src/libptouch.c:135 +#: src/libptouch.c:150 #, c-format msgid "%s found on USB bus %d, device %d\n" msgstr "%s found on USB bus %d, device %d\n" -#: src/libptouch.c:150 +#: src/libptouch.c:165 #, c-format msgid "libusb_open error :%s\n" msgstr "libusb_open error :%s\n" -#: src/libptouch.c:156 +#: src/libptouch.c:171 #, c-format msgid "error while detaching kernel driver: %s\n" msgstr "error while detaching kernel driver: %s\n" -#: src/libptouch.c:160 +#: src/libptouch.c:175 #, c-format msgid "interface claim error: %s\n" msgstr "interface claim error: %s\n" -#: src/libptouch.c:171 +#: src/libptouch.c:187 #, c-format msgid "" "No P-Touch printer found on USB (remember to put switch to position E)\n" msgstr "" "No P-Touch printer found on USB (remember to put switch to position E)\n" -#: src/libptouch.c:191 +#: src/libptouch.c:207 #, c-format msgid "debug: called ptouch_send() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:198 +#: src/libptouch.c:214 #, c-format msgid "write error: %s\n" msgstr "write error: %s\n" -#: src/libptouch.c:202 +#: src/libptouch.c:218 #, fuzzy, c-format msgid "write error: could send only %i of %ld bytes\n" msgstr "write error: could send only %i of %i bytes\n" -#: src/libptouch.c:252 +#: src/libptouch.c:268 #, c-format msgid "debug: called ptouch_info_cmd() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:294 +#: src/libptouch.c:310 #, fuzzy, c-format msgid "debug: called ptouch_rasterstart() with NULL ptdev\n" msgstr "ptouch_rasterstart() failed\n" -#: src/libptouch.c:325 +#: src/libptouch.c:341 #, c-format msgid "debug: called ptouch_finalize() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:340 +#: src/libptouch.c:356 #, c-format msgid "debug: dumping raw status bytes\n" msgstr "debug: dumping raw status bytes\n" -#: src/libptouch.c:359 +#: src/libptouch.c:375 #, c-format msgid "debug: called ptouch_getstatus() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:369 src/libptouch.c:400 +#: src/libptouch.c:385 src/libptouch.c:416 #, c-format msgid "read error: %s\n" msgstr "read error: %s\n" -#: src/libptouch.c:374 +#: src/libptouch.c:390 #, fuzzy, c-format msgid "timeout (%i sec) while waiting for status response\n" msgstr "timeout while waiting for status response\n" -#: src/libptouch.c:383 +#: src/libptouch.c:399 #, c-format msgid "unknown tape width of %imm, please report this.\n" msgstr "unknown tape width of %imm, please report this.\n" -#: src/libptouch.c:389 +#: src/libptouch.c:405 #, c-format msgid "got only 16 bytes... wondering what they are:\n" msgstr "got only 16 bytes... wondering what they are:\n" -#: src/libptouch.c:393 +#: src/libptouch.c:409 #, c-format msgid "read error: got %i instead of 32 bytes\n" msgstr "read error: got %i instead of 32 bytes\n" -#: src/libptouch.c:396 +#: src/libptouch.c:412 #, c-format msgid "strange status:\n" msgstr "strange status:\n" -#: src/libptouch.c:398 +#: src/libptouch.c:414 #, c-format msgid "trying to flush junk\n" msgstr "trying to flush junk\n" -#: src/libptouch.c:403 +#: src/libptouch.c:419 #, c-format msgid "got another %i bytes. now try again\n" msgstr "got another %i bytes. now try again\n" -#: src/libptouch.c:410 +#: src/libptouch.c:426 #, fuzzy, c-format msgid "debug: called ptouch_get_dpi() with NULL ptdev\n" msgstr "ptouch_rasterstart() failed\n" -#: src/libptouch.c:419 +#: src/libptouch.c:435 #, fuzzy, c-format msgid "debug: called ptouch_cal_tape_width() with NULL ptdev\n" msgstr "ptouch_rasterstart() failed\n" -#: src/libptouch.c:430 +#: src/libptouch.c:446 #, c-format msgid "printer with %d dpi not supported\n" msgstr "" -#: src/libptouch.c:444 +#: src/libptouch.c:466 #, fuzzy, c-format msgid "debug: called ptouch_get_max_lines() with NULL ptdev\n" msgstr "ptouch_rasterstart() failed\n" -#: src/libptouch.c:448 +#: src/libptouch.c:470 #, fuzzy, c-format msgid "debug: called ptouch_get_max_lines() with invalid fontsize_px\n" msgstr "ptouch_rasterstart() failed\n" -#: src/libptouch.c:451 +#: src/libptouch.c:473 #, c-format msgid "debug: calculated max lines %d \n" msgstr "" -#: src/libptouch.c:458 +#: src/libptouch.c:480 #, c-format msgid "debug: called ptouch_get_tape_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:467 +#: src/libptouch.c:489 #, c-format msgid "debug: called ptouch_get_max_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:479 +#: src/libptouch.c:504 #, c-format msgid "debug: called ptouch_sendraster() with NULL ptdev\n" msgstr "" @@ -205,139 +205,139 @@ msgstr "maximum printing width for this tape is %ipx\n" msgid "image size (%ipx x %ipx)\n" msgstr "image is too large (%ipx x %ipx)\n" -#: src/ptouch-print.c:198 +#: src/ptouch-print.c:204 #, c-format msgid "ptouch_rasterstart() failed\n" msgstr "ptouch_rasterstart() failed\n" -#: src/ptouch-print.c:204 +#: src/ptouch-print.c:210 #, c-format msgid "send print information command\n" msgstr "" -#: src/ptouch-print.c:210 +#: src/ptouch-print.c:216 #, c-format msgid "send PT-D460BT magic commands\n" msgstr "" -#: src/ptouch-print.c:217 +#: src/ptouch-print.c:223 #, c-format msgid "send precut command\n" msgstr "" -#: src/ptouch-print.c:226 +#: src/ptouch-print.c:232 #, c-format msgid "send PT-D460BT chain commands\n" msgstr "" -#: src/ptouch-print.c:238 +#: src/ptouch-print.c:244 #, c-format msgid "ptouch_sendraster() failed\n" msgstr "ptouch_sendraster() failed\n" -#: src/ptouch-print.c:287 +#: src/ptouch-print.c:293 #, c-format msgid "writing image '%s' failed\n" msgstr "writing image '%s' failed\n" -#: src/ptouch-print.c:292 +#: src/ptouch-print.c:298 #, c-format msgid "printing '%s' requires %.1f mm of tape\n" msgstr "" -#: src/ptouch-print.c:314 +#: src/ptouch-print.c:320 #, c-format msgid "debug: z baseline offset - %d\n" msgstr "" -#: src/ptouch-print.c:315 +#: src/ptouch-print.c:321 #, c-format msgid "debug: text baseline offset - %d\n" msgstr "" -#: src/ptouch-print.c:388 +#: src/ptouch-print.c:394 #, c-format msgid "render_text(): %i lines, font = '%s', align = '%c'\n" msgstr "" -#: src/ptouch-print.c:391 +#: src/ptouch-print.c:397 #, c-format msgid "warning: font config not available\n" msgstr "warning: font config not available\n" -#: src/ptouch-print.c:395 +#: src/ptouch-print.c:401 #, c-format msgid "setting font size=%i\n" msgstr "setting font size=%i\n" -#: src/ptouch-print.c:397 +#: src/ptouch-print.c:403 #, fuzzy, c-format msgid "ignoring setting font margin=%i\n" msgstr "setting font size=%i\n" -#: src/ptouch-print.c:402 +#: src/ptouch-print.c:408 #, c-format msgid "could not estimate needed font size\n" msgstr "could not estimate needed font size\n" -#: src/ptouch-print.c:409 +#: src/ptouch-print.c:415 #, c-format msgid "choosing font size=%i\n" msgstr "choosing font size=%i\n" -#: src/ptouch-print.c:425 src/ptouch-print.c:459 +#: src/ptouch-print.c:431 src/ptouch-print.c:465 #, fuzzy, c-format msgid "error in gdImageStringFT_180dpi: %s\n" msgstr "error in gdImageStringFT: %s\n" -#: src/ptouch-print.c:616 +#: src/ptouch-print.c:622 #, c-format msgid "Only up to %d lines are supported" msgstr "" -#: src/ptouch-print.c:697 +#: src/ptouch-print.c:703 msgid "No arguments supported" msgstr "" -#: src/ptouch-print.c:702 +#: src/ptouch-print.c:708 msgid "Option --writepng missing" msgstr "" -#: src/ptouch-print.c:705 +#: src/ptouch-print.c:711 msgid "Options --force_tape_width and --info can't be used together" msgstr "" -#: src/ptouch-print.c:736 +#: src/ptouch-print.c:742 #, c-format msgid "ptouch_init() failed\n" msgstr "ptouch_init() failed\n" -#: src/ptouch-print.c:739 +#: src/ptouch-print.c:745 #, c-format msgid "ptouch_getstatus() failed\n" msgstr "ptouch_getstatus() failed\n" -#: src/ptouch-print.c:753 +#: src/ptouch-print.c:759 #, fuzzy, c-format msgid "printer has %d dpi, maximum printing width is %ld px\n" msgstr "maximum printing width for this tape is %ipx\n" -#: src/ptouch-print.c:754 +#: src/ptouch-print.c:760 #, fuzzy, c-format msgid "maximum printing width for this tape is %ldpx\n" msgstr "maximum printing width for this tape is %ipx\n" -#: src/ptouch-print.c:779 +#: src/ptouch-print.c:785 #, c-format msgid "failed to load image file\n" msgstr "" -#: src/ptouch-print.c:788 +#: src/ptouch-print.c:794 #, c-format msgid "could not render text\n" msgstr "could not render text\n" -#: src/ptouch-print.c:829 +#: src/ptouch-print.c:835 #, c-format msgid "ptouch_finalize(%d) failed\n" msgstr "ptouch_finalize(%d) failed\n" diff --git a/po/ptouch.pot b/po/ptouch.pot index 5230cdb..91f0a7d 100644 --- a/po/ptouch.pot +++ b/po/ptouch.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ptouch-print\n" "Report-Msgid-Bugs-To: dominic@familie-radermacher.ch\n" -"POT-Creation-Date: 2026-03-08 13:11+0100\n" +"POT-Creation-Date: 2026-07-18 08:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,168 +17,168 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/libptouch.c:108 src/libptouch.c:112 src/libptouch.c:116 +#: src/libptouch.c:123 src/libptouch.c:127 src/libptouch.c:131 #, c-format msgid "out of memory\n" msgstr "" -#: src/libptouch.c:120 +#: src/libptouch.c:135 #, c-format msgid "libusb_init() failed\n" msgstr "" -#: src/libptouch.c:129 +#: src/libptouch.c:144 #, c-format msgid "failed to get device descriptor" msgstr "" -#: src/libptouch.c:135 +#: src/libptouch.c:150 #, c-format msgid "%s found on USB bus %d, device %d\n" msgstr "" -#: src/libptouch.c:150 +#: src/libptouch.c:165 #, c-format msgid "libusb_open error :%s\n" msgstr "" -#: src/libptouch.c:156 +#: src/libptouch.c:171 #, c-format msgid "error while detaching kernel driver: %s\n" msgstr "" -#: src/libptouch.c:160 +#: src/libptouch.c:175 #, c-format msgid "interface claim error: %s\n" msgstr "" -#: src/libptouch.c:171 +#: src/libptouch.c:187 #, c-format msgid "" "No P-Touch printer found on USB (remember to put switch to position E)\n" msgstr "" -#: src/libptouch.c:191 +#: src/libptouch.c:207 #, c-format msgid "debug: called ptouch_send() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:198 +#: src/libptouch.c:214 #, c-format msgid "write error: %s\n" msgstr "" -#: src/libptouch.c:202 +#: src/libptouch.c:218 #, c-format msgid "write error: could send only %i of %ld bytes\n" msgstr "" -#: src/libptouch.c:252 +#: src/libptouch.c:268 #, c-format msgid "debug: called ptouch_info_cmd() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:294 +#: src/libptouch.c:310 #, c-format msgid "debug: called ptouch_rasterstart() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:325 +#: src/libptouch.c:341 #, c-format msgid "debug: called ptouch_finalize() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:340 +#: src/libptouch.c:356 #, c-format msgid "debug: dumping raw status bytes\n" msgstr "" -#: src/libptouch.c:359 +#: src/libptouch.c:375 #, c-format msgid "debug: called ptouch_getstatus() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:369 src/libptouch.c:400 +#: src/libptouch.c:385 src/libptouch.c:416 #, c-format msgid "read error: %s\n" msgstr "" -#: src/libptouch.c:374 +#: src/libptouch.c:390 #, c-format msgid "timeout (%i sec) while waiting for status response\n" msgstr "" -#: src/libptouch.c:383 +#: src/libptouch.c:399 #, c-format msgid "unknown tape width of %imm, please report this.\n" msgstr "" -#: src/libptouch.c:389 +#: src/libptouch.c:405 #, c-format msgid "got only 16 bytes... wondering what they are:\n" msgstr "" -#: src/libptouch.c:393 +#: src/libptouch.c:409 #, c-format msgid "read error: got %i instead of 32 bytes\n" msgstr "" -#: src/libptouch.c:396 +#: src/libptouch.c:412 #, c-format msgid "strange status:\n" msgstr "" -#: src/libptouch.c:398 +#: src/libptouch.c:414 #, c-format msgid "trying to flush junk\n" msgstr "" -#: src/libptouch.c:403 +#: src/libptouch.c:419 #, c-format msgid "got another %i bytes. now try again\n" msgstr "" -#: src/libptouch.c:410 +#: src/libptouch.c:426 #, c-format msgid "debug: called ptouch_get_dpi() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:419 +#: src/libptouch.c:435 #, c-format msgid "debug: called ptouch_cal_tape_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:430 +#: src/libptouch.c:446 #, c-format msgid "printer with %d dpi not supported\n" msgstr "" -#: src/libptouch.c:444 +#: src/libptouch.c:466 #, c-format msgid "debug: called ptouch_get_max_lines() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:448 +#: src/libptouch.c:470 #, c-format msgid "debug: called ptouch_get_max_lines() with invalid fontsize_px\n" msgstr "" -#: src/libptouch.c:451 +#: src/libptouch.c:473 #, c-format msgid "debug: calculated max lines %d \n" msgstr "" -#: src/libptouch.c:458 +#: src/libptouch.c:480 #, c-format msgid "debug: called ptouch_get_tape_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:467 +#: src/libptouch.c:489 #, c-format msgid "debug: called ptouch_get_max_width() with NULL ptdev\n" msgstr "" -#: src/libptouch.c:479 +#: src/libptouch.c:504 #, c-format msgid "debug: called ptouch_sendraster() with NULL ptdev\n" msgstr "" @@ -203,139 +203,139 @@ msgstr "" msgid "image size (%ipx x %ipx)\n" msgstr "" -#: src/ptouch-print.c:198 +#: src/ptouch-print.c:204 #, c-format msgid "ptouch_rasterstart() failed\n" msgstr "" -#: src/ptouch-print.c:204 +#: src/ptouch-print.c:210 #, c-format msgid "send print information command\n" msgstr "" -#: src/ptouch-print.c:210 +#: src/ptouch-print.c:216 #, c-format msgid "send PT-D460BT magic commands\n" msgstr "" -#: src/ptouch-print.c:217 +#: src/ptouch-print.c:223 #, c-format msgid "send precut command\n" msgstr "" -#: src/ptouch-print.c:226 +#: src/ptouch-print.c:232 #, c-format msgid "send PT-D460BT chain commands\n" msgstr "" -#: src/ptouch-print.c:238 +#: src/ptouch-print.c:244 #, c-format msgid "ptouch_sendraster() failed\n" msgstr "" -#: src/ptouch-print.c:287 +#: src/ptouch-print.c:293 #, c-format msgid "writing image '%s' failed\n" msgstr "" -#: src/ptouch-print.c:292 +#: src/ptouch-print.c:298 #, c-format msgid "printing '%s' requires %.1f mm of tape\n" msgstr "" -#: src/ptouch-print.c:314 +#: src/ptouch-print.c:320 #, c-format msgid "debug: z baseline offset - %d\n" msgstr "" -#: src/ptouch-print.c:315 +#: src/ptouch-print.c:321 #, c-format msgid "debug: text baseline offset - %d\n" msgstr "" -#: src/ptouch-print.c:388 +#: src/ptouch-print.c:394 #, c-format msgid "render_text(): %i lines, font = '%s', align = '%c'\n" msgstr "" -#: src/ptouch-print.c:391 +#: src/ptouch-print.c:397 #, c-format msgid "warning: font config not available\n" msgstr "" -#: src/ptouch-print.c:395 +#: src/ptouch-print.c:401 #, c-format msgid "setting font size=%i\n" msgstr "" -#: src/ptouch-print.c:397 +#: src/ptouch-print.c:403 #, c-format msgid "ignoring setting font margin=%i\n" msgstr "" -#: src/ptouch-print.c:402 +#: src/ptouch-print.c:408 #, c-format msgid "could not estimate needed font size\n" msgstr "" -#: src/ptouch-print.c:409 +#: src/ptouch-print.c:415 #, c-format msgid "choosing font size=%i\n" msgstr "" -#: src/ptouch-print.c:425 src/ptouch-print.c:459 +#: src/ptouch-print.c:431 src/ptouch-print.c:465 #, c-format msgid "error in gdImageStringFT_180dpi: %s\n" msgstr "" -#: src/ptouch-print.c:616 +#: src/ptouch-print.c:622 #, c-format msgid "Only up to %d lines are supported" msgstr "" -#: src/ptouch-print.c:697 +#: src/ptouch-print.c:703 msgid "No arguments supported" msgstr "" -#: src/ptouch-print.c:702 +#: src/ptouch-print.c:708 msgid "Option --writepng missing" msgstr "" -#: src/ptouch-print.c:705 +#: src/ptouch-print.c:711 msgid "Options --force_tape_width and --info can't be used together" msgstr "" -#: src/ptouch-print.c:736 +#: src/ptouch-print.c:742 #, c-format msgid "ptouch_init() failed\n" msgstr "" -#: src/ptouch-print.c:739 +#: src/ptouch-print.c:745 #, c-format msgid "ptouch_getstatus() failed\n" msgstr "" -#: src/ptouch-print.c:753 +#: src/ptouch-print.c:759 #, c-format msgid "printer has %d dpi, maximum printing width is %ld px\n" msgstr "" -#: src/ptouch-print.c:754 +#: src/ptouch-print.c:760 #, c-format msgid "maximum printing width for this tape is %ldpx\n" msgstr "" -#: src/ptouch-print.c:779 +#: src/ptouch-print.c:785 #, c-format msgid "failed to load image file\n" msgstr "" -#: src/ptouch-print.c:788 +#: src/ptouch-print.c:794 #, c-format msgid "could not render text\n" msgstr "" -#: src/ptouch-print.c:829 +#: src/ptouch-print.c:835 #, c-format msgid "ptouch_finalize(%d) failed\n" msgstr "" diff --git a/src/libptouch.c b/src/libptouch.c index b710573..69460f1 100644 --- a/src/libptouch.c +++ b/src/libptouch.c @@ -53,40 +53,40 @@ struct _pt_tape_info tape_info[]= { }; struct _pt_dev_info ptdevs[] = { - {0x04f9, 0x2001, "PT-9200DX", 384, 360, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT}, /* 360dpi, maximum 128px, max tape width 36mm */ - {0x04f9, 0x2002, "PT-9200DX", 384, 360, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT}, /* reported by Christian Pauls - either 0x2001 is wrong, or this printer exists with two different IDs */ - {0x04f9, 0x2004, "PT-2300", 112, 180, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT}, /* 180dpi, 112px printhead */ - {0x04f9, 0x2007, "PT-2420PC", 128, 180, FLAG_RASTER_PACKBITS}, /* 180dpi, 128px, maximum tape width 24mm, must send TIFF compressed pixel data */ - //{0x04f9, 0x200d, "PT-3600", 384, 360, FLAG_RASTER_PACKBITS}, - {0x04f9, 0x2011, "PT-2450PC", 128, 180, FLAG_RASTER_PACKBITS}, - {0x04f9, 0x2019, "PT-1950", 112, 180, FLAG_RASTER_PACKBITS}, /* 180dpi, apparently 112px printhead ?, maximum tape width 18mm - unconfirmed if it works */ - {0x04f9, 0x201f, "PT-2700", 128, 180, FLAG_HAS_PRECUT}, - {0x04f9, 0x202c, "PT-1230PC", 128, 180, FLAG_NONE}, /* 180dpi, supports tapes up to 12mm - I don't know how much pixels it can print! */ + {0x04f9, 0x2001, "PT-9200DX", 384, 360, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT, 0}, /* 360dpi, maximum 128px, max tape width 36mm */ + {0x04f9, 0x2002, "PT-9200DX", 384, 360, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT, 0}, /* reported by Christian Pauls - either 0x2001 is wrong, or this printer exists with two different IDs */ + {0x04f9, 0x2004, "PT-2300", 112, 180, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT, 0}, /* 180dpi, 112px printhead */ + {0x04f9, 0x2007, "PT-2420PC", 128, 180, FLAG_RASTER_PACKBITS, 0}, /* 180dpi, 128px, maximum tape width 24mm, must send TIFF compressed pixel data */ + //{0x04f9, 0x200d, "PT-3600", 384, 360, FLAG_RASTER_PACKBITS, 0}, + {0x04f9, 0x2011, "PT-2450PC", 128, 180, FLAG_RASTER_PACKBITS, 0}, + {0x04f9, 0x2019, "PT-1950", 112, 180, FLAG_RASTER_PACKBITS, 0}, /* 180dpi, apparently 112px printhead ?, maximum tape width 18mm - unconfirmed if it works */ + {0x04f9, 0x201f, "PT-2700", 128, 180, FLAG_HAS_PRECUT, 0}, + {0x04f9, 0x202c, "PT-1230PC", 128, 180, FLAG_NONE, 0}, /* 180dpi, supports tapes up to 12mm - I don't know how much pixels it can print! */ /* Notes about the PT-1230PC: While it is true that this printer supports max 12mm tapes, it apparently expects > 76px data - the first 32px must be blank. */ - {0x04f9, 0x202d, "PT-2430PC", 128, 180, FLAG_NONE}, /* 180dpi, maximum 128px */ - {0x04f9, 0x2030, "PT-1230PC (PLite Mode)", 128, 180, FLAG_PLITE}, - {0x04f9, 0x2031, "PT-2430PC (PLite Mode)", 128, 180, FLAG_PLITE}, - {0x04f9, 0x2041, "PT-2730", 128, 180, FLAG_NONE}, /* 180dpi, maximum 128px, max tape width 24mm - reported to work with some quirks */ + {0x04f9, 0x202d, "PT-2430PC", 128, 180, FLAG_NONE, 0}, /* 180dpi, maximum 128px */ + {0x04f9, 0x2030, "PT-1230PC (PLite Mode)", 128, 180, FLAG_PLITE, 0}, + {0x04f9, 0x2031, "PT-2430PC (PLite Mode)", 128, 180, FLAG_PLITE, 0}, + {0x04f9, 0x2041, "PT-2730", 128, 180, FLAG_NONE, 0}, /* 180dpi, maximum 128px, max tape width 24mm - reported to work with some quirks */ /* Notes about the PT-2730: was reported to need 48px whitespace within png-images before content is actually printed - can not check this */ - {0x04f9, 0x205e, "PT-H500", 128, 180, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT}, + {0x04f9, 0x205e, "PT-H500", 128, 180, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT, 0}, /* Note about the PT-H500: was reported by Eike with the remark that it might need some trailing padding */ - {0x04f9, 0x205f, "PT-E500", 128, 180, FLAG_RASTER_PACKBITS}, + {0x04f9, 0x205f, "PT-E500", 128, 180, FLAG_RASTER_PACKBITS, 0}, /* Note about the PT-E500: was reported by Jesse Becker with the remark that it also needs some padding (white pixels) */ - {0x04f9, 0x2060, "PT-E550W", 128, 180, FLAG_UNSUP_RASTER}, + {0x04f9, 0x2060, "PT-E550W", 128, 180, FLAG_UNSUP_RASTER, 0}, /* Note about the PT-E550W: was reported by Tim Biermann but does not work yet (only prints empty tape with FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT) */ - {0x04f9, 0x2061, "PT-P700", 128, 180, FLAG_RASTER_PACKBITS|FLAG_P700_INIT|FLAG_HAS_PRECUT}, - {0x04f9, 0x2062, "PT-P750W", 128, 180, FLAG_RASTER_PACKBITS|FLAG_P700_INIT}, - {0x04f9, 0x2064, "PT-P700 (PLite Mode)", 128, 180, FLAG_PLITE}, - {0x04f9, 0x2065, "PT-P750W (PLite Mode)", 128, 180, FLAG_PLITE}, - {0x04f9, 0x2073, "PT-D450", 128, 180, FLAG_USE_INFO_CMD}, + {0x04f9, 0x2061, "PT-P700", 128, 180, FLAG_RASTER_PACKBITS|FLAG_P700_INIT|FLAG_HAS_PRECUT, 0}, + {0x04f9, 0x2062, "PT-P750W", 128, 180, FLAG_RASTER_PACKBITS|FLAG_P700_INIT, 0}, + {0x04f9, 0x2064, "PT-P700 (PLite Mode)", 128, 180, FLAG_PLITE, 0}, + {0x04f9, 0x2065, "PT-P750W (PLite Mode)", 128, 180, FLAG_PLITE, 0}, + {0x04f9, 0x2073, "PT-D450", 128, 180, FLAG_USE_INFO_CMD, 0}, /* Notes about the PT-D450: I'm unsure if print width really is 128px */ - {0x04f9, 0x2074, "PT-D600", 128, 180, FLAG_RASTER_PACKBITS}, + {0x04f9, 0x2074, "PT-D600", 128, 180, FLAG_RASTER_PACKBITS, 0}, /* PT-D600 was reported to work, but with some quirks (premature cutting of tape, printing maximum of 73mm length) */ {0x04f9, 0x2085, "PT-P900Wc", 560, 360, FLAG_RASTER_PACKBITS|FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT, -8}, @@ -97,17 +97,17 @@ struct _pt_dev_info ptdevs[] = { centre (pin 280) - a constant offset across all tape widths. See the Brother "Software Developer's Manual - Raster Command Reference, PT-P900/P900W/P950NW", section 2.3.5 "Raster line". */ - {0x04f9, 0x20af, "PT-P710BT", 128, 180, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT}, - {0x04f9, 0x20df, "PT-D410", 128, 180, FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT|FLAG_D460BT_MAGIC}, - {0x04f9, 0x20e0, "PT-D460BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT|FLAG_D460BT_MAGIC}, - {0x04f9, 0x20e1, "PT-D610BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT|FLAG_D460BT_MAGIC}, + {0x04f9, 0x20af, "PT-P710BT", 128, 180, FLAG_RASTER_PACKBITS|FLAG_HAS_PRECUT, 0}, + {0x04f9, 0x20df, "PT-D410", 128, 180, FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT|FLAG_D460BT_MAGIC, 0}, + {0x04f9, 0x20e0, "PT-D460BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT|FLAG_D460BT_MAGIC, 0}, + {0x04f9, 0x20e1, "PT-D610BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_HAS_PRECUT|FLAG_D460BT_MAGIC, 0}, /* added by Christian, PT-E310BT (aka PT-E310BTVP) requires these flags, otherwise not returning from libusb_bulk_transfer-call */ /* printhead 128px, 180 dpi resolution */ /* 3,5/6/9/12/18 mm TZe Tapes, 12mm and 18mm tested */ /* 5,2/9/11,2 mm HSe heat shrink tubes not tested, probably requiring extension of struct _pt_tape_info */ - {0x04f9, 0x2201, "PT-E310BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_D460BT_MAGIC}, - {0x04f9, 0x2203, "PT-E560BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_D460BT_MAGIC}, - {0,0,"",0,0,0} + {0x04f9, 0x2201, "PT-E310BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_D460BT_MAGIC, 0}, + {0x04f9, 0x2203, "PT-E560BT", 128, 180, FLAG_P700_INIT|FLAG_USE_INFO_CMD|FLAG_D460BT_MAGIC, 0}, + {0,0,"",0,0,0,0} }; int ptouch_open(ptouch_dev *ptdev) @@ -368,7 +368,7 @@ int ptouch_getstatus(ptouch_dev ptdev, int timeout) { char cmd[]="\x1biS"; /* 1B 69 53 = ESC i S = Status info request */ uint8_t buf[32] = {}; - int i, r, tx=0, tries=0, maxtries=timeout*10; + int r, tx=0, tries=0, maxtries=timeout*10; struct timespec w; if (!ptdev) {