From 770fcf4b9c514cfd1a43d6008da1007380e8c5bb Mon Sep 17 00:00:00 2001 From: azummo Date: Thu, 4 Jul 2002 21:03:27 +0000 Subject: [PATCH] Applied a patch from Bron Gondawna. --- AUTHORS | 4 +- ChangeLog.2 | 34 ++ doc/coldsync.8 | 25 +- doc/new_PConnection.3 | 17 +- doc/sample.coldsync.rc | 10 +- i18n/cs.po | 766 ++++++++++++++++-------------- i18n/de.po | 773 +++++++++++++++--------------- i18n/fr.po | 769 ++++++++++++++++-------------- i18n/it.po | 766 ++++++++++++++++-------------- i18n/ja.po | 866 ++++++++++++++++++---------------- i18n/ru.po | 761 +++++++++++++++-------------- include/pconn/PConnection.h | 3 +- libpconn/PConnection.c | 20 +- libpconn/PConnection_net.c | 5 +- libpconn/PConnection_serial.c | 47 +- libpconn/PConnection_usb.c | 11 +- src/coldsync.c | 13 +- src/coldsync.h | 3 +- src/lexer.l | 3 +- src/palment.c | 26 +- src/parser.y | 11 +- 21 files changed, 2668 insertions(+), 2265 deletions(-) diff --git a/AUTHORS b/AUTHORS index c0401aa0..5ba3089b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# $Id: AUTHORS,v 2.20 2002-05-03 00:08:00 arensb Exp $ +# $Id: AUTHORS,v 2.21 2002-07-04 21:03:26 azummo Exp $ Authors and Contributors: @@ -45,6 +45,8 @@ Alessandro Zummo : new functions in SPC.pm, Kenneth Lorber : pda_block propagation patch. Michael Lestinsky : PCONNFL_PROMPT patch. Takeshi AIHANA : Japanese translation. +Bron Gondawna : Modem support, command line config file + in daemon mode and wildcards in palms file. A big thank you to Kenneth Albanowski and the rest of the authors of the pilot-link code, for providing a reference diff --git a/ChangeLog.2 b/ChangeLog.2 index 2b54d3cc..636075be 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,3 +1,37 @@ +2002-06-21 Bron Gondwana + + * include/pconn/PConnection.h: Add flag PCONNFL_MODEM. + + * libpconn/PConnection.c: Copy flags into pconn->flags rather than + passing it to the pconn_*_open functions, as it is required in other + functions for modem support. + + * libpconn/Pconnection_net.c: Function definition change for open + and use pconn->flags rather than flags. + + * libpconn/Pconnection_serial.c: Function definition change for open + and use pconn->flags rather than flags, serial_write to STDOUT_FILENO + if pconn->fd == STDIN_FILENO, don't do any setspeed if flags & + PCONNFL_MODEM. Special case device string 'stdin' means read from + stdin (note: linux has a /dev/stdin, but this is more portable) + + * libpconn/Pconnection_usb.c: Function definition change for open + and use pconn->flags rather than flags. + + * src/coldsync.c: Read the user config file in run_mode_Daemon if it's + provided on the command line, re-write flags from LISTENFL_* to + PCONNFL_* during new_PConnection so they don't have to be kept in sync. + + * src/coldsync.h: Added LISTENFL_MODEM for modem support. + + * src/lexer.l: Added MODEM keyword literal string 'modem'. + + * src/palment.c: Wildcards for the columns serial ('' or '*'), + username ('' or '*'), userid (0) such that they match any palm. + + * src/parser.y: token MODEM sets flag LISTENFL_MODEM on the current + listen block if seen. + 2001-12-10 Andrew Arensburger * libpconn/dlp_cmd.c: Removed a to-do comment. Yay! diff --git a/doc/coldsync.8 b/doc/coldsync.8 index a67a72f4..1af1647c 100644 --- a/doc/coldsync.8 +++ b/doc/coldsync.8 @@ -4,7 +4,7 @@ .\" You may distribute this file under the terms of the Artistic .\" License, as specified in the README file. .\" -.\" $Id: coldsync.8,v 1.52 2002-03-14 19:01:32 arensb Exp $ +.\" $Id: coldsync.8,v 1.53 2002-07-04 21:03:26 azummo Exp $ .\" .\" This man page uses the 'mdoc' formatting macros. If your 'man' uses .\" the old 'man' package, you may run into problems. @@ -118,7 +118,11 @@ in which case the given pathname is assumed to be relative to .Pa /dev , or the string .Dq - -(a single dash), meaning stdin. +(a single dash), or meaning stdin and stdout. The special string 'stdin' +also means stdin and stdout (useful with mgetty and modems). ***PLEASE NOTE +THIS FUNCTIONALITY IS DISABLED IN CURRENT DEVELOPMENT BUILDS (use config +files with -f on the command line and specify the device there instead, +using stdin instead of '-' if necessary)*** .Pp .Nm ColdSync waits for a connection on the given port, reads the username and user @@ -381,6 +385,11 @@ listen usb { # BSD only listen net { } + +listen serial { + device: stdin; + modem; +} .Ed .Pp .Li listen serial @@ -405,6 +414,12 @@ directive indicates that the device may not exist when starts, but will be created later on, when the Palm connects to the workstation. Use this if you are using devfs. .Pp +The +.Li modem +directive indicates that the device is a modem, so +.Nm ColdSync +will not attempt to change the line speed and break the connection. +.Pp .Li listen usb is used to sync a Handspring Visor using native USB mode. This only works under *BSD. @@ -935,11 +950,11 @@ single line, with fields separated by vertical bar (pipe) characters: .Ed .Bl -tag -width password -offset indent .It serial -The serial number of the Palm, or the empty string if none or missing. +The serial number of the Palm. The empty string or '*' will match any palm. .It username -The username on the Palm. +The username on the Palm. The empty string or '*' will match any palm. .It userid -The user ID on the Palm. +The user ID on the Palm. The number '0' will match any palm. .It luser The local (Unix) username or UID to setuid() to. .It name diff --git a/doc/new_PConnection.3 b/doc/new_PConnection.3 index ccb76673..4d64f6d5 100644 --- a/doc/new_PConnection.3 +++ b/doc/new_PConnection.3 @@ -4,7 +4,7 @@ .\" You may distribute this file under the terms of the Artistic .\" License, as specified in the README file. .\" -.\" $Id: new_PConnection.3,v 1.3 2001-11-12 00:09:09 arensb Exp $ +.\" $Id: new_PConnection.3,v 1.4 2002-07-04 21:03:26 azummo Exp $ .\" .\" This man page uses the 'mdoc' formatting macros. If your 'man' uses .\" the old 'man' package, you may run into problems. @@ -40,9 +40,9 @@ specifies the pathname of the Palm device, \fIe.g.\fR .Pa /dev/cuaa0 for a serial port. If .Fa device -is NULL, +is NULL or the special string 'stdin', .Nm -uses standard input. +uses standard input and standard output. .Pp .Fa listenType specifies the underlying connection to the Palm cradle. It is one of: @@ -85,8 +85,10 @@ Use the DLP and NetSync protocols. This is the default for .Fa flags is the bitwise-or of .Dv PCONNFL_TRANSIENT -and +, .Dv PCONNFL_PROMPT . +and +.Dv PCONNFL_MODEM . If .Dv PCONN_TRANSIENT has been specified, the device may or may not exist at any given time, @@ -100,6 +102,13 @@ has been specified, .Nm will prompt the user to press the HotSync button on the cradle, after the device has been opened. +.Pp +If +.Dv PCONN_MODEM +has been specified, +.Nm +will not attept to change the change the speed of the connection that +specified by the palm, which breaks modem connections. .Sh RETURN VALUE .Nm returns a pointer to a new diff --git a/doc/sample.coldsync.rc b/doc/sample.coldsync.rc index 06ef7c09..e9a95cc6 100644 --- a/doc/sample.coldsync.rc +++ b/doc/sample.coldsync.rc @@ -1,6 +1,6 @@ # sample.coldsyncrc # -# $Id: sample.coldsync.rc,v 1.5 2001-10-12 02:16:26 arensb Exp $ +# $Id: sample.coldsync.rc,v 1.6 2002-07-04 21:03:26 azummo Exp $ # # This is an example .coldsyncrc file. It is NOT intended as a working # configuration. It is rather a series of examples. Read it through. @@ -33,6 +33,14 @@ listen serial { speed: 38400; } +# OR, if you're using a modem with mgetty, disable the above listen block +# and insert this one. +# +# listen serial { +# device: stdin; +# modem; +# } + # If you're syncing a Visor over USB under FreeBSD, use "usb" instead # of "serial": diff --git a/i18n/cs.po b/i18n/cs.po index e40d792b..cdd95589 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ColdSync 2.1.3\n" -"POT-Creation-Date: 2002-03-10 17:49+0100\n" +"POT-Creation-Date: 2002-06-21 16:10+0200\n" "PO-Revision-Date: 2001-12-07 00:01+0100\n" "Last-Translator: Petr Kubánek \n" "Language-Team: cs \n" @@ -13,51 +13,51 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/config.c:819 +#: ../src/config.c:961 msgid "\t-F:\t\tForce fast sync.\n" msgstr "\t-F:\t\tVynutí rychlou synchronizaci.\n" -#: ../src/config.c:817 +#: ../src/config.c:959 msgid "\t-I:\t\tForce installation of new databases.\n" msgstr "\t-I:\t\tVynutí nainstaci nových databází.\n" -#: ../src/config.c:823 +#: ../src/config.c:965 msgid "\t-P :\tSoftware protocol [default|full|simple|net].\n" msgstr "" -#: ../src/config.c:820 +#: ../src/config.c:962 msgid "\t-R:\t\tCheck ROM databases.\n" msgstr "\t-R:\t\tPrověří ROM databázi.\n" -#: ../src/config.c:818 +#: ../src/config.c:960 msgid "\t-S:\t\tForce slow sync.\n" msgstr "\t-S:\t\tVynutí pomalou synchronizaci.\n" -#: ../src/config.c:814 +#: ../src/config.c:956 msgid "\t-V:\t\tPrint version and exit.\n" msgstr "\t-V:\t\tVytiskne verzi a skončí.\n" -#: ../src/config.c:829 +#: ../src/config.c:972 msgid "\t-d :\tSet debugging level.\n" msgstr "\t-d :Nastaví debugging level.\n" -#: ../src/config.c:815 +#: ../src/config.c:957 msgid "\t-f :\tRead configuration from \n" msgstr "\t-f :\tNačte konfiguraci ze souboru \n" -#: ../src/config.c:813 +#: ../src/config.c:955 msgid "\t-h:\t\tPrint this help message and exit.\n" msgstr "\t-h:\t\tVytiskne tuto nápovědu a skončí.\n" -#: ../src/config.c:826 +#: ../src/config.c:968 msgid "\t-l: :\tWrite error/debugging messages to .\n" msgstr "\t-l: :\tZapíše logovací/debugovací zprávy do u.\n" -#: ../src/config.c:807 +#: ../src/config.c:949 msgid "\t-mI:\tInitialize.\n" msgstr "\t-mI:\tInicializuj Palma.\n" -#: ../src/config.c:808 +#: ../src/config.c:950 msgid "" "\t-mb [database...]\n" "\t\tPerform a backup to .\n" @@ -65,7 +65,7 @@ msgstr "" "\t-mb [databáze...]\n" "\t\tZazálohuj databáze do .\n" -#: ../src/config.c:810 +#: ../src/config.c:952 msgid "" "\t-mr ...\n" "\t\tRestore or install new databases.\n" @@ -73,79 +73,83 @@ msgstr "" "\t-mr ...\n" "\t\tObnov data nebo nainstaluj nové databáze.\n" -#: ../src/config.c:806 +#: ../src/config.c:948 msgid "\t-ms:\tSynchronize (default).\n" msgstr "\t-ms:\tSynchronizuj (defaultní).\n" -#: ../src/config.c:821 +#: ../src/config.c:971 +msgid "\t-n :\tChoice the named listen block.\n" +msgstr "" + +#: ../src/config.c:963 msgid "\t-p :\tListen on device .\n" msgstr "\t-p :\tBude naslouchat zařízení na u.\n" -#: ../src/config.c:825 +#: ../src/config.c:967 msgid "\t-s:\t\tLog error messages to syslog.\n" msgstr "\t-s:\t\tZaloguje chybové zprávy do syslogu.\n" -#: ../src/config.c:822 +#: ../src/config.c:964 msgid "\t-t :\tPort type [serial|usb|net].\n" msgstr "\t-t :\tTyp portu [serial|usb|net].\n" -#: ../src/config.c:828 +#: ../src/config.c:970 msgid "\t-v:\t\tIncrease verbosity.\n" msgstr "\t-v:\t\tZvětší množství informací od programu.\n" -#: ../src/config.c:816 +#: ../src/config.c:958 msgid "\t-z:\t\tInstall databases after sync.\n" msgstr "" "\t-z:\t\tPo dokončení synchronizace nainstaluje na Palm\n" "\t\t\t\tnové databáze.\n" -#: ../src/parser.y:327 ../src/parser.y:585 ../src/parser.y:1136 +#: ../src/parser.y:341 ../src/parser.y:658 ../src/parser.y:1229 #, c-format msgid "\tError near \"%s\"." msgstr "\tChyba v okolí \"%s\"." -#: ../src/parser.y:1165 +#: ../src/parser.y:1258 msgid "\tMissing ':'." msgstr "\tChybí ':'." -#: ../src/parser.y:1182 +#: ../src/parser.y:1274 msgid "\tMissing ';'." msgstr "\tChybí ';'." -#: ../src/parser.y:1174 +#: ../src/parser.y:1266 msgid "\tMissing '{'." msgstr "\tChybí '{'." -#: ../src/parser.y:750 +#: ../src/parser.y:823 #, c-format msgid "\tMissing argument name near \": %s\"." msgstr "\tChybějící jméno argumentu poblíž \": %s\"." -#: ../src/parser.y:248 +#: ../src/parser.y:255 msgid "\tMissing listen block type." msgstr "\tChybí typ listen blocku." -#: ../src/parser.y:829 +#: ../src/parser.y:919 #, fuzzy, c-format msgid "\tMissing option name near \"%s\"." msgstr "Chybí argument optionu po \"%s\"." -#: ../src/parser.y:415 +#: ../src/parser.y:461 #, c-format msgid "\tUnrecognized conduit flavor \"%s\"." msgstr "\tNerozpoznaný druh conduitu \"%s\"." -#: ../src/parser.y:250 +#: ../src/parser.y:257 #, c-format msgid "\tUnrecognized listen type \"%s\"." msgstr "\tNerozponaný druh naslouchání \"%s\"." -#: ../src/parser.y:449 +#: ../src/parser.y:495 #, fuzzy, c-format msgid "\tUnrecognized protocol: \"%s\"." msgstr "Nerozpoznaná optiona: \"%s\"." -#: ../src/config.c:874 +#: ../src/config.c:1017 #, c-format msgid "" "\n" @@ -154,7 +158,7 @@ msgstr "" "\n" " Defaultní globální konfigurační soubor: %s\n" -#: ../src/coldsync.c:386 +#: ../src/coldsync.c:396 #, c-format msgid "" "\n" @@ -163,7 +167,7 @@ msgstr "" "\n" "Log zavřen v %s" -#: ../src/coldsync.c:1825 +#: ../src/coldsync.c:1787 msgid "" "\n" "This Palm already has user information that matches neither what's in your\n" @@ -182,7 +186,7 @@ msgstr "" "Váš .coldsyncrc by měl obsahovat variaci na následující text:\n" "\n" -#: ../src/config.c:869 +#: ../src/config.c:1012 msgid "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: strings are compared without regard\n" " to case, whenever possible.\n" @@ -190,13 +194,13 @@ msgstr "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: řetězce jsou porovnávány bez ohledu\n" " na velikost, kdykoliv je to možné.\n" -#: ../src/config.c:864 +#: ../src/config.c:1007 msgid " WITH_EFENCE: buffer overruns will cause a segmentation violation.\n" msgstr "" " WITH_EFENCE: přetečení zásobníku způsobí chybu stránkování \n" " (segment violation).\n" -#: ../src/config.c:860 +#: ../src/config.c:1003 msgid " WITH_USB: USB support.\n" msgstr " WITH_USB: podporuje USB zařízení.\n" @@ -205,131 +209,136 @@ msgstr " WITH_USB: podporuje USB za msgid "\"%.*s\" record 0x%08lx has length 0.\n" msgstr "%s záznam 0x%08lx má nulovou délku.\n" -#: ../src/coldsync.c:1313 +#: ../src/coldsync.c:1414 #, c-format msgid "\"%s\" exists, but is not a directory." msgstr "\"%s\" existuje, ale není adresářem." #: ../libpconn/dlp_cmd.c:191 ../libpconn/dlp_cmd.c:281 -#: ../libpconn/dlp_cmd.c:380 ../libpconn/dlp_cmd.c:439 -#: ../libpconn/dlp_cmd.c:503 ../libpconn/dlp_cmd.c:626 -#: ../libpconn/dlp_cmd.c:846 ../libpconn/dlp_cmd.c:935 -#: ../libpconn/dlp_cmd.c:1028 ../libpconn/dlp_cmd.c:1098 -#: ../libpconn/dlp_cmd.c:1168 ../libpconn/dlp_cmd.c:1252 -#: ../libpconn/dlp_cmd.c:1326 ../libpconn/dlp_cmd.c:1402 -#: ../libpconn/dlp_cmd.c:1477 ../libpconn/dlp_cmd.c:1564 -#: ../libpconn/dlp_cmd.c:1665 ../libpconn/dlp_cmd.c:1767 -#: ../libpconn/dlp_cmd.c:1875 ../libpconn/dlp_cmd.c:1946 -#: ../libpconn/dlp_cmd.c:2037 ../libpconn/dlp_cmd.c:2136 -#: ../libpconn/dlp_cmd.c:2218 ../libpconn/dlp_cmd.c:2290 -#: ../libpconn/dlp_cmd.c:2345 ../libpconn/dlp_cmd.c:2397 -#: ../libpconn/dlp_cmd.c:2533 ../libpconn/dlp_cmd.c:2578 -#: ../libpconn/dlp_cmd.c:2652 ../libpconn/dlp_cmd.c:2711 -#: ../libpconn/dlp_cmd.c:2774 ../libpconn/dlp_cmd.c:2819 -#: ../libpconn/dlp_cmd.c:2875 ../libpconn/dlp_cmd.c:2928 -#: ../libpconn/dlp_cmd.c:3038 ../libpconn/dlp_cmd.c:3133 -#: ../libpconn/dlp_cmd.c:3229 ../libpconn/dlp_cmd.c:3321 -#: ../libpconn/dlp_cmd.c:3401 ../libpconn/dlp_cmd.c:3499 -#: ../libpconn/dlp_cmd.c:3600 ../libpconn/dlp_cmd.c:3682 +#: ../libpconn/dlp_cmd.c:392 ../libpconn/dlp_cmd.c:451 +#: ../libpconn/dlp_cmd.c:515 ../libpconn/dlp_cmd.c:638 +#: ../libpconn/dlp_cmd.c:858 ../libpconn/dlp_cmd.c:947 +#: ../libpconn/dlp_cmd.c:1040 ../libpconn/dlp_cmd.c:1110 +#: ../libpconn/dlp_cmd.c:1180 ../libpconn/dlp_cmd.c:1264 +#: ../libpconn/dlp_cmd.c:1338 ../libpconn/dlp_cmd.c:1414 +#: ../libpconn/dlp_cmd.c:1489 ../libpconn/dlp_cmd.c:1576 +#: ../libpconn/dlp_cmd.c:1677 ../libpconn/dlp_cmd.c:1779 +#: ../libpconn/dlp_cmd.c:1887 ../libpconn/dlp_cmd.c:1958 +#: ../libpconn/dlp_cmd.c:2049 ../libpconn/dlp_cmd.c:2148 +#: ../libpconn/dlp_cmd.c:2230 ../libpconn/dlp_cmd.c:2302 +#: ../libpconn/dlp_cmd.c:2357 ../libpconn/dlp_cmd.c:2409 +#: ../libpconn/dlp_cmd.c:2545 ../libpconn/dlp_cmd.c:2590 +#: ../libpconn/dlp_cmd.c:2664 ../libpconn/dlp_cmd.c:2723 +#: ../libpconn/dlp_cmd.c:2786 ../libpconn/dlp_cmd.c:2831 +#: ../libpconn/dlp_cmd.c:2887 ../libpconn/dlp_cmd.c:2940 +#: ../libpconn/dlp_cmd.c:3050 ../libpconn/dlp_cmd.c:3145 +#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3333 +#: ../libpconn/dlp_cmd.c:3413 ../libpconn/dlp_cmd.c:3511 +#: ../libpconn/dlp_cmd.c:3612 ../libpconn/dlp_cmd.c:3694 #, c-format msgid "##### %s: Unknown argument type: 0x%02x.\n" msgstr "##### %s: Neznámý typ argumentu: 0x%02x.\n" -#: ../libpconn/padp.c:484 +#: ../libpconn/padp.c:482 #, c-format msgid "##### Bad offset: wanted %d, got %d.\n" msgstr "##### Špatný offset: požadováno %d, obdrženo %d.\n" -#: ../libpconn/dlp.c:291 +#: ../libpconn/dlp.c:292 #, c-format msgid "##### Bad response ID: expected 0x%02x, got 0x%02x.\n" msgstr "##### Špatné ID odpovědi: očekáváno 0x%02x, obdrženo 0x%02x.\n" -#: ../libpconn/padp.c:802 +#: ../libpconn/padp.c:800 #, c-format msgid "##### Expected XID 0x%02x, got 0x%02x.\n" msgstr "##### Očekáváno XID 0x%02x, obdrženo 0x%02x.\n" -#: ../libpconn/dlp.c:282 +#: ../libpconn/dlp.c:283 msgid "##### Expected a DLP response, but this isn't one!\n" msgstr "##### Očekávána DLP odpověď, ale žádnou jsem nedostal!\n" -#: ../libpconn/padp.c:729 +#: ../libpconn/padp.c:727 msgid "##### Got an unexpected data packet. Sending an ACK to shut it up.\n" msgstr "" "##### Obdržen neočekávaný datový paket. Posílám ACK na jeho ukončení.\n" -#: ../libpconn/padp.c:198 ../libpconn/padp.c:446 +#: ../libpconn/padp.c:198 ../libpconn/padp.c:444 msgid "##### I just got an unexpected ACK. I'm confused!\n" msgstr "##### Právě jsem obdržel neočekávané ACK. Jsem z něho zmatený!\n" -#: ../libpconn/padp.c:471 +#: ../libpconn/padp.c:469 msgid "##### I wasn't expecting a new fragment. I'm confused!\n" msgstr "##### Opravdu jsem neočekával nový fragment. Jsem z něho zmatený!\n" -#: ../libpconn/padp.c:217 ../libpconn/padp.c:461 ../libpconn/padp.c:790 +#: ../libpconn/padp.c:217 ../libpconn/padp.c:459 ../libpconn/padp.c:788 #, c-format msgid "##### Unexpected packet type %d.\n" msgstr "##### Neočekávaný typ paketu %d.\n" -#: lexer.l:460 +#: lexer.l:476 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: lexer.l:469 +#: lexer.l:485 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"${%.*s}\".\n" msgstr "" -#: lexer.l:474 +#: lexer.l:490 #, c-format msgid "" "%d: Unterminated variable reference near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: ../src/config.c:845 +#: ../src/config.c:988 #, c-format msgid "%s version %s.\n" msgstr "%s verze %s.\n" -#: ../src/parser.y:614 +#: ../src/parser.y:687 #, c-format msgid "%s: %d: Bogus creator \"%s\"." msgstr "%s: %d: Bogus vytvořitel \"%s\"." -#: ../src/parser.y:638 +#: ../src/parser.y:711 #, c-format msgid "%s: %d: Bogus type \"%s\"." msgstr "%s: %d: Bogus typ \"%s\"." -#: ../src/parser.y:498 +#: ../src/parser.y:549 #, c-format msgid "%s: %d: Can't add creator-type pair to list. This is very bad." msgstr "" "%s: %d: Nemohu přidat pár creator-typ do seznamu. To je opravdu velmi zlé." -#: ../src/parser.y:553 +#: ../src/parser.y:626 #, c-format msgid "%s: %d: Can't add preference to list. This is very bad." msgstr "%s: %d: Nemohu přidat nastavení do seznamu. To je opravdu velmi zlé." -#: ../src/parser.y:287 +#: ../src/parser.y:590 +#, fuzzy, c-format +msgid "%s: %d: Cwd already defined." +msgstr "%s: %d: Rychlost byla již zadána." + +#: ../src/parser.y:301 #, c-format msgid "%s: %d: Device already defined." msgstr "%s: %d: Zařízení bylo již navoleno." -#: ../src/parser.y:1038 +#: ../src/parser.y:1131 #, c-format msgid "%s: %d: Directory already defined." msgstr "%s: %d: Adresář byl již zvolen." -#: ../src/parser.y:1008 +#: ../src/parser.y:1101 #, c-format msgid "" "%s: %d: Incorrect checksum\n" @@ -338,12 +347,12 @@ msgstr "" "%s: %d: Špatný kontrolní součet\n" "pro sériové číslo \"%s-%c\". Měl by být \"%s-%c\"." -#: ../src/parser.y:514 +#: ../src/parser.y:565 #, c-format msgid "%s: %d: Path already defined." msgstr "%s: %d: Cesta byla již nastavena." -#: ../src/parser.y:987 +#: ../src/parser.y:1080 #, c-format msgid "" "%s: %d: Serial number \"%s\" has no checksum.\n" @@ -352,178 +361,178 @@ msgstr "" "%s: %d: Sériové číslo \"%s\" nemá kontrolní součet.\n" "Možná by jste ho měli přepsat na \"%s-%c\"." -#: ../src/parser.y:956 +#: ../src/parser.y:1049 #, c-format msgid "%s: %d: Serial number already defined." msgstr "%s: %d: Sériové číslo bylo již nastaveno." -#: ../src/parser.y:301 +#: ../src/parser.y:315 #, c-format msgid "%s: %d: Speed already defined." msgstr "%s: %d: Rychlost byla již zadána." -#: ../src/parser.y:1074 +#: ../src/parser.y:1167 #, c-format msgid "%s: %d: Userid already defined." msgstr "%s: %d: Userid bylo již zadáno." -#: ../src/parser.y:1059 +#: ../src/parser.y:1152 #, c-format msgid "%s: %d: Username already defined." msgstr "%s: %d: Uživatelské jméno bylo již zadáno." -#: ../libpconn/dlp.c:152 +#: ../libpconn/dlp.c:153 #, c-format msgid "%s: Can't allocate %ld-byte buffer.\n" msgstr "%s: Nemohu naalokovat %ld-bytový buffer.\n" -#: ../src/parser.y:851 +#: ../src/parser.y:941 #, c-format msgid "%s: Can't allocate PDA block." msgstr "%s: Nemohu alokovat PDA blok." -#: ../src/parser.y:708 +#: ../src/parser.y:781 #, c-format msgid "%s: Can't allocate conduit header." msgstr "%s: Nemohu naalokovat hlavičku conduitu." -#: ../src/parser.y:340 +#: ../src/parser.y:354 #, c-format msgid "%s: Can't allocate conduit_block!" msgstr "%s: Nemohu naalokovat conduit_block!" -#: ../src/parser.y:177 +#: ../src/parser.y:180 #, c-format msgid "%s: Can't allocate listen block." msgstr "%s: Nemohu naalokovat listen block." -#: ../src/GenericConduit.cc:1121 +#: ../src/GenericConduit.cc:1042 #, c-format msgid "%s: Can't allocate new record." msgstr "%s: Nemohu naalokovat nový záznam." -#: ../src/GenericConduit.cc:1221 +#: ../src/GenericConduit.cc:1142 #, c-format msgid "%s: Can't append new record to database: %d." msgstr "%s: Nemohu přidat nový záznam do databáze: %d." -#: lexer.l:366 +#: lexer.l:382 #, fuzzy, c-format msgid "%s: Can't append to qstring." msgstr "%s: Nemohu vytvořit kopii řetězce." -#: ../src/backup.c:716 +#: ../src/backup.c:695 #, c-format msgid "%s: Can't back up \"%s\"." msgstr "%s: Nemohu zazálohovat \"%s\"." -#: ../src/GenericConduit.cc:448 ../src/GenericConduit.cc:948 -#: ../src/GenericConduit.cc:1490 +#: ../src/GenericConduit.cc:424 ../src/GenericConduit.cc:886 +#: ../src/GenericConduit.cc:1386 #, c-format msgid "%s: Can't clean up database: %d." msgstr "%s: Nemohu vyčistit databázi: %d." -#: ../src/GenericConduit.cc:1960 ../src/GenericConduit.cc:1998 -#: ../src/GenericConduit.cc:2132 +#: ../src/GenericConduit.cc:1832 ../src/GenericConduit.cc:1869 +#: ../src/GenericConduit.cc:1994 #, c-format msgid "%s: Can't copy record." msgstr "%s: Nemohu nakopírovat záznam." -#: ../src/conduit.c:1541 +#: ../src/conduit.c:1597 #, c-format msgid "%s: Can't create file handle to child's stdin." msgstr "%s: Nemohu vytvořit file handle pro stdin potomka." -#: ../src/conduit.c:1569 +#: ../src/conduit.c:1625 #, c-format msgid "%s: Can't create file handle to child's stdout." msgstr "%s: Nemohu vytvořit file handle pro stdout potomka." -#: ../src/coldsync.c:3681 ../src/coldsync.c:3701 +#: ../src/coldsync.c:3049 ../src/coldsync.c:3069 #, c-format msgid "%s: Can't create staging file \"%s\"." msgstr "%s: Nemohu vytvořit staging file \"%s\"." -#: ../src/coldsync.c:3691 +#: ../src/coldsync.c:3059 #, c-format msgid "%s: Can't create staging file name." msgstr "%s: Nemohu vytvořit jméno staging souboru." -#: ../src/GenericConduit.cc:608 +#: ../src/GenericConduit.cc:560 #, c-format msgid "%s: Can't download \"%s\"." msgstr "%s: Nemohu nahrát \"%s\"." -#: ../src/conduit.c:2057 +#: ../src/conduit.c:2137 #, c-format msgid "%s: Can't get child process status." msgstr "%s: Nemohu získat stav potomka." -#: ../libpconn/PConnection_usb.c:505 +#: ../libpconn/PConnection_usb.c:528 #, c-format msgid "%s: Can't get information about USB device.\n" msgstr "%s: Nemohu získat informace o USB zařízení.\n" -#: ../src/GenericConduit.cc:2094 ../src/GenericConduit.cc:2143 +#: ../src/GenericConduit.cc:1956 ../src/GenericConduit.cc:2004 #, c-format msgid "%s: Can't insert record 0x%08lx." msgstr "%s: Nemohu vložit záznam 0x%08lx." -#: ../src/GenericConduit.cc:2505 +#: ../src/GenericConduit.cc:2354 #, c-format msgid "%s: Can't load \"%s\"." msgstr "%s: Nemohu nahrát \"%s\"." -#: ../src/install.c:270 ../src/install.c:526 +#: ../src/install.c:270 ../src/install.c:512 #, c-format msgid "%s: Can't load database \"%s\"." msgstr "%s: Nemohu nahrát databázi \"%s\"." -#: ../src/conduit.c:1587 +#: ../src/conduit.c:1643 #, c-format msgid "%s: Can't make child's stdout be line-buffered." msgstr "%s: Nemohu změnit buffrování stdout potomka na linkové." -#: lexer.l:135 lexer.l:148 lexer.l:228 lexer.l:303 lexer.l:518 lexer.l:568 +#: lexer.l:135 lexer.l:148 lexer.l:230 lexer.l:319 lexer.l:553 lexer.l:603 #, c-format msgid "%s: Can't make copy of string." msgstr "%s: Nemohu vytvořit kopii řetězce." -#: ../src/GenericConduit.cc:2495 ../src/archive.c:68 ../src/archive.c:127 -#: ../src/install.c:260 ../src/install.c:425 ../src/install.c:516 -#: ../src/parser.y:1223 +#: ../src/GenericConduit.cc:2344 ../src/archive.c:68 ../src/archive.c:127 +#: ../src/install.c:260 ../src/install.c:411 ../src/install.c:502 +#: ../src/parser.y:1315 #, c-format msgid "%s: Can't open \"%s\"." msgstr "%s: Nemohu otevřít \"%s\"." -#: ../libpconn/PConnection_usb.c:717 +#: ../libpconn/PConnection_usb.c:740 #, c-format msgid "%s: Can't open \"%s\".\n" msgstr "%s: Nemohu otevřít \"%s\".\n" -#: ../src/GenericConduit.cc:298 ../src/GenericConduit.cc:318 -#: ../src/GenericConduit.cc:568 ../src/GenericConduit.cc:587 -#: ../src/GenericConduit.cc:1063 ../src/GenericConduit.cc:1082 +#: ../src/GenericConduit.cc:297 ../src/GenericConduit.cc:310 +#: ../src/GenericConduit.cc:534 ../src/GenericConduit.cc:546 +#: ../src/GenericConduit.cc:991 ../src/GenericConduit.cc:1003 #, c-format msgid "%s: Can't open \"%s\": %d." msgstr "" -#: ../libpconn/PConnection_usb.c:491 +#: ../libpconn/PConnection_usb.c:514 #, c-format msgid "%s: Can't open USB device.\n" msgstr "%s: Nemohu otevřít USB zařízení.\n" -#: ../src/coldsync.c:2942 +#: ../src/coldsync.c:2249 #, c-format msgid "%s: Can't open directory \"%s\"." msgstr "%s: Nemohu otevřít adresář \"%s\"." -#: ../src/install.c:403 ../src/install.c:468 +#: ../src/install.c:389 ../src/install.c:454 #, c-format msgid "%s: Can't open install directory." msgstr "%s: Nemohu otevřít adresář s instalací." -#: ../src/GenericConduit.cc:194 +#: ../src/GenericConduit.cc:200 #, c-format msgid "%s: Can't read %s backup file." msgstr "%s: Nemohu přečíst zálohový soubor ze souboru %s." @@ -543,12 +552,12 @@ msgstr "%s: Nemohu p msgid "%s: Can't read sort block for %s: %d.\n" msgstr "%s: Nemohu přečíst třídící blok pro %s: %d.\n" -#: ../src/coldsync.c:3047 ../src/coldsync.c:3085 +#: ../src/coldsync.c:2354 ../src/coldsync.c:2392 #, c-format msgid "%s: Can't rename \"%s\" to \"%s\"." msgstr "%s: Nemohu přejmenovat \"%s\" na \"%s\"." -#: ../src/GenericConduit.cc:2564 +#: ../src/GenericConduit.cc:2413 #, c-format msgid "" "%s: Can't rename staging file.\n" @@ -557,13 +566,13 @@ msgstr "" "%s: Nemohu přejmenovat staging file.\n" "Záloha je snad v \"%s\"." -#: ../src/GenericConduit.cc:468 ../src/GenericConduit.cc:967 -#: ../src/GenericConduit.cc:1510 +#: ../src/GenericConduit.cc:444 ../src/GenericConduit.cc:905 +#: ../src/GenericConduit.cc:1406 #, c-format msgid "%s: Can't reset sync flags: %d." msgstr "%s: Nemohu resetovat sync flagy: %d." -#: ../src/restore.c:120 +#: ../src/restore.c:129 #, c-format msgid "%s: Can't restore %s: it is opened by another application." msgstr "%s: Nemohu obnovit %s: je otevřené jinou aplikací." @@ -573,12 +582,17 @@ msgstr "%s: Nemohu obnovit %s: je otev msgid "%s: Can't seek to end of file." msgstr "%s: Nemohu přejít na konec souboru." -#: ../src/conduit.c:373 +#: ../src/parser.y:909 +#, fuzzy, c-format +msgid "%s: Can't set option.\n" +msgstr "%s: Nemohu otevřít \"%s\".\n" + +#: ../src/conduit.c:390 #, c-format msgid "%s: Can't set signal handler." msgstr "%s: Nemohu nastavit signal handler." -#: ../src/conduit.c:427 +#: ../src/conduit.c:445 #, c-format msgid "%s: Can't spawn conduit." msgstr "%s: Nemohu naspawnovat (vytvořit potomka) conduitu." @@ -593,8 +607,8 @@ msgstr "%s: Nemohu zapsat AppInfo blok.\n" msgid "%s: Can't write archive file header." msgstr "%s: Nemohu napsat hlavičku archivního souboru." -#: ../src/GenericConduit.cc:419 ../src/GenericConduit.cc:925 -#: ../src/GenericConduit.cc:1461 +#: ../src/GenericConduit.cc:402 ../src/GenericConduit.cc:870 +#: ../src/GenericConduit.cc:1364 #, c-format msgid "%s: Can't write backup file." msgstr "%s: Nemohu zapsat záložní soubor." @@ -624,7 +638,7 @@ msgstr "%s: Nemohu zapsat polo msgid "%s: Can't write sort block for \"%.*s\".\n" msgstr "%s: Nemohu zapsat třídící blok.\n" -#: ../src/GenericConduit.cc:2552 +#: ../src/GenericConduit.cc:2401 #, c-format msgid "%s: Can't write staging file \"%s\"." msgstr "%s: Nemohu zapsat staging soubor \"%s\"." @@ -634,12 +648,12 @@ msgstr "%s: Nemohu zapsat staging soubor \"%s\"." msgid "%s: Can't write the two useless NULs to \"%.*s\".\n" msgstr "%s: Nemohu zapsat dva neužitečné NULy.\n" -#: ../src/conduit.c:1880 +#: ../src/conduit.c:1960 #, c-format msgid "%s: Conduit exited unexpectedly." msgstr "%s: Conduit neočekávaně skončil." -#: ../src/conduit.c:677 +#: ../src/conduit.c:698 #, c-format msgid "" "%s: Conduit handler is in an inconsistent state at\n" @@ -648,7 +662,7 @@ msgstr "" "%s: Handler conduitu je v nekonzistentním stavu v\n" "%s, řádce %d. Prosím, upozorněte o tom maintainera." -#: ../src/conduit.c:1871 +#: ../src/conduit.c:1951 #, c-format msgid "" "%s: Conduit is running happily, but hasn't printed anything.\n" @@ -657,32 +671,32 @@ msgstr "" "%s: Conduit spokojeně běží, ale zatím nepředal žádné výsledky.\n" "A teď jsem byl upozorněn. To je chyba. Prosím, upozorněte o tom maintainera." -#: ../libpconn/PConnection_usb.c:625 +#: ../libpconn/PConnection_usb.c:648 #, c-format msgid "%s: Could not find HotSync endpoint on Visor.\n" msgstr "%s: Nemohu najít endpoint HotSyncu na Visoru.\n" -#: ../src/conduit.c:1681 +#: ../src/conduit.c:1538 #, fuzzy, c-format msgid "%s: Couldn't change directory to \"%s\"\n" msgstr "%s: Nemohu otevřít adresář \"%s\"." -#: ../src/restore.c:109 +#: ../src/restore.c:118 #, c-format msgid "%s: Database %s doesn't exist, yet it is open. Huh?" msgstr "%s: Databáze %s neexistuje, ale přesto je otevřena. Uh?" -#: ../src/install.c:335 ../src/install.c:580 +#: ../src/install.c:328 ../src/install.c:566 #, c-format msgid "%s: Error deleting \"%s\"." msgstr "%s: Chyba při mazání \"%s\"." -#: ../src/GenericConduit.cc:1355 ../src/GenericConduit.cc:1394 +#: ../src/GenericConduit.cc:1267 ../src/GenericConduit.cc:1304 #, c-format msgid "%s: Error deleting record 0x%08lx: %d." msgstr "%s: Chyba při mazání záznamu 0x%08lx: %d." -#: ../src/conduit.c:788 +#: ../src/conduit.c:809 #, fuzzy, c-format msgid "%s: Error header wrong length %ld." msgstr "%s: Chyba při mazání \"%s\"." @@ -692,32 +706,32 @@ msgstr "%s: Chyba p msgid "%s: Error in DlpRPC().\n" msgstr "%s: Chyba v DlpRPC().\n" -#: ../src/conduit.c:708 +#: ../src/conduit.c:729 #, c-format msgid "%s: Error in select()." msgstr "%s: Chyba při volání select()." -#: ../src/conduit.c:774 +#: ../src/conduit.c:795 #, c-format msgid "%s: Error reading SPC request from conduit." msgstr "%s: Chyba při čtení SPC požadavku conduitu." -#: ../src/conduit.c:847 +#: ../src/conduit.c:868 #, c-format msgid "%s: Error reading SPC request." msgstr "%s Chyba při čtení SPC požadavku." -#: ../src/conduit.c:975 +#: ../src/conduit.c:996 #, c-format msgid "%s: Error sending SPC response data." msgstr "%s: Chyba při posílání dat SPC odpovědi." -#: ../libpconn/padp.c:757 +#: ../libpconn/padp.c:755 #, c-format msgid "%s: Error sending dummy ACK. This is serious.\n" msgstr "%s: Chyba při posílání prázdného ACK. To je závažné.\n" -#: ../src/install.c:356 ../src/install.c:612 +#: ../src/install.c:342 ../src/install.c:584 #, c-format msgid "%s: Error uploading \"%s\"." msgstr "%s: Chyba při uploadingu \"%s\"." @@ -727,7 +741,7 @@ msgstr "%s: Chyba p msgid "%s: Error: dlp.write returned %d.\n" msgstr "%s: Chyba: dlp.write vrátil %d.\n" -#: ../src/conduit.c:353 +#: ../src/conduit.c:370 #, c-format msgid "" "%s: I just got file descriptor %d. There appears to be a file\n" @@ -736,20 +750,20 @@ msgstr "" "%s: Právě jsem obdržel file descriptor %d. Vypadá to s ním\n" "nějak bledě, asi někam utekl. Prosím upozorněte mainteinera." -#: ../src/GenericConduit.cc:1347 ../src/GenericConduit.cc:1386 -#: ../src/GenericConduit.cc:1630 ../src/GenericConduit.cc:1680 -#: ../src/GenericConduit.cc:1846 ../src/GenericConduit.cc:2198 -#: ../src/GenericConduit.cc:2240 +#: ../src/GenericConduit.cc:1261 ../src/GenericConduit.cc:1298 +#: ../src/GenericConduit.cc:1524 ../src/GenericConduit.cc:1573 +#: ../src/GenericConduit.cc:1728 ../src/GenericConduit.cc:2058 +#: ../src/GenericConduit.cc:2099 #, c-format msgid "%s: Lost connection to Palm." msgstr "%s: Ztratil jsem spojení s Palmem." -#: ../src/config.c:721 +#: ../src/config.c:807 #, c-format msgid "%s: Missing mode string. This should never happen." msgstr "%s: Chybí mi mode string. To by se nikdy nemělo stát." -#: ../src/parser.y:352 +#: ../src/parser.y:398 #, c-format msgid "" "%s: No `type:' line seen\n" @@ -758,20 +772,25 @@ msgstr "" "%s: V definici \"%s\"\n" "\tnení žádný `type:' řádek." -#: ../src/conduit.c:1663 +#: ../src/conduit.c:1719 #, c-format msgid "%s: No executable \"%s\" in $CONDUIT_PATH or $CONDUITDIR.\n" msgstr "" -#: ../src/config.c:1100 ../src/config.c:1136 ../src/config.c:1158 -#: ../src/pref.c:234 ../src/pref.c:299 lexer.l:705 +#: ../src/conduit.c:1757 +#, fuzzy, c-format +msgid "%s: No home directory for %s.\n" +msgstr "%s: Nemohu otevřít adresář \"%s\"." + +#: ../src/config.c:1243 ../src/config.c:1279 ../src/config.c:1301 +#: ../src/pref.c:220 ../src/pref.c:278 lexer.l:506 lexer.l:740 #, c-format msgid "%s: Out of memory." msgstr "%s: Mimo pamět (out of memory)." -#: ../libpconn/dlp_cmd.c:1284 ../libpconn/dlp_cmd.c:1435 -#: ../libpconn/dlp_cmd.c:2183 ../libpconn/dlp_cmd.c:2437 -#: ../libpconn/dlp_cmd.c:3356 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 +#: ../libpconn/dlp_cmd.c:1296 ../libpconn/dlp_cmd.c:1447 +#: ../libpconn/dlp_cmd.c:2195 ../libpconn/dlp_cmd.c:2449 +#: ../libpconn/dlp_cmd.c:3368 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 #: ../libpdb/pdb.c:1090 ../libpdb/pdb.c:1137 ../libpdb/pdb.c:1448 #: ../libpdb/pdb.c:1563 ../libpdb/pdb.c:1676 ../libpdb/pdb.c:1840 #: ../libpdb/pdb.c:1981 ../src/backup.c:138 ../src/backup.c:187 @@ -781,24 +800,24 @@ msgstr "%s: Mimo pam msgid "%s: Out of memory.\n" msgstr "%s: Mimo pamět (out of memory).\n" -#: ../src/conduit.c:361 +#: ../src/conduit.c:378 #, c-format msgid "%s: Too many file descriptors. Aborting." msgstr "%s: Příliš mnoho file deskriptorů. Končím." -#: ../src/GenericConduit.cc:1638 ../src/GenericConduit.cc:1688 -#: ../src/GenericConduit.cc:1854 ../src/GenericConduit.cc:2206 -#: ../src/GenericConduit.cc:2248 +#: ../src/GenericConduit.cc:1533 ../src/GenericConduit.cc:1581 +#: ../src/GenericConduit.cc:1737 ../src/GenericConduit.cc:2067 +#: ../src/GenericConduit.cc:2107 #, c-format msgid "%s: Warning: Can't delete record 0x%08lx: %d." msgstr "%s: Upozornění: Nemohu smazat záznam 0x%08ls: %d." -#: ../libpconn/PConnection_usb.c:543 +#: ../libpconn/PConnection_usb.c:566 #, c-format msgid "%s: Warning: Unexpected USB vendor ID %#x.\n" msgstr "%s: Upozornění: Neočekávané ID USB zařízení %#x.\n" -#: ../libpconn/slp.c:250 +#: ../libpconn/slp.c:248 #, c-format msgid "%s: bad checksum: expected 0x%02x, got 0x%02x.\n" msgstr "" @@ -834,7 +853,7 @@ msgstr "" "%s: nemohu vytvořit nový záložní soubor %s.\n" "Je možné, že již existuje." -#: ../src/backup.c:668 +#: ../src/backup.c:647 #, c-format msgid "%s: can't write database \"%s\" to \"%s\"." msgstr "%s: nemohu zapsat databázi \"%s\" do \"%s\"." @@ -854,27 +873,32 @@ msgstr "%s: nemohu zapsat hlavi msgid "%s: error reading record index entry for \"%.*s\" (%d bytes): %d.\n" msgstr "%s: chyba při čtení index záznamu položky (%d bytů): %d.\n" -#: ../src/conduit.c:942 +#: ../src/conduit.c:963 #, c-format msgid "%s: error sending SPC response header." msgstr "%s: chyba při posílání SPC odpovědní hlavičky." -#: ../src/conduit.c:1694 +#: ../src/conduit.c:1774 #, fuzzy, c-format msgid "%s: execv(%s) failed and returned %d." msgstr "%s: selhalo execv(%s). Jeho návratová hodnota: %d." -#: ../src/config.c:1224 lexer.l:731 +#: ../src/conduit.c:1761 +#, fuzzy, c-format +msgid "%s: getpwuid(%d) failed.\n" +msgstr "%s: realloc(%d) selhal." + +#: ../src/config.c:1367 lexer.l:767 #, c-format msgid "%s: realloc(%d) failed." msgstr "%s: realloc(%d) selhal." -#: ../src/conduit.c:722 +#: ../src/conduit.c:743 #, c-format msgid "%s: select() returned 0. I'm puzzled." msgstr "%s: select() vrátil 0. Nevím, co dál." -#: ../src/conduit.c:1817 +#: ../src/conduit.c:1897 #, c-format msgid "" "%s: select() returned 0. This should never happen. Please notify the " @@ -883,27 +907,27 @@ msgstr "" "%s: select() vrátil 0. To by se nikdy nemělo stát. Prosím upozorněte na to " "maintainera." -#: ../src/conduit.c:1774 +#: ../src/conduit.c:1854 #, c-format msgid "%s: select() returned an unexpected error. This should never happen." msgstr "%s: select() vrátil neočekávanou chybu. To by se nikdy nemělo stát." -#: ../src/config.c:1025 +#: ../src/config.c:1168 #, c-format msgid "%s: socket() returned %d." msgstr "%s: socket() vrátil %d." -#: ../libpconn/PConnection_usb.c:662 +#: ../libpconn/PConnection_usb.c:685 #, c-format msgid "%s: unexpected response %d to GetBytesAvailable.\n" msgstr "%s: neočekávaná odpoveď %d z volání GetBytesAvailable.\n" -#: ../libpconn/PConnection.c:124 +#: ../libpconn/PConnection.c:125 #, c-format msgid "%s: unknown listen type %d.\n" msgstr "%s: neznámý listen type %d.\n" -#: lexer.l:632 +#: lexer.l:667 #, c-format msgid "" "%s: unknown start state %d.\n" @@ -912,19 +936,19 @@ msgstr "" "%s: neznámý počáteční stav %d.\n" "Prosím upozorněte maintainera, aby opravil 'lexer.l'." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:303 -#: ../src/GenericConduit.cc:323 ../src/GenericConduit.cc:343 -#: ../src/GenericConduit.cc:423 ../src/GenericConduit.cc:452 -#: ../src/GenericConduit.cc:480 ../src/GenericConduit.cc:492 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:302 +#: ../src/GenericConduit.cc:315 ../src/GenericConduit.cc:328 +#: ../src/GenericConduit.cc:406 ../src/GenericConduit.cc:428 +#: ../src/GenericConduit.cc:454 ../src/GenericConduit.cc:465 #, fuzzy msgid "(1st)" msgstr " (1.) - " -#: ../src/coldsync.c:1090 ../src/coldsync.c:2679 +#: ../src/coldsync.c:1084 msgid "*Cancelled*\n" msgstr "*Zrušeno*\n" -#: ../libpconn/padp.c:676 +#: ../libpconn/padp.c:674 msgid "ACK Timeout. Attempting to resend.\n" msgstr "ACK Timeout. Zkouším poslat data znovu.\n" @@ -933,9 +957,9 @@ msgstr "ACK Timeout. Zkou msgid "Backing up \"%s\"" msgstr "Zálohuji \"%s\"" -#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:596 -#: ../src/backup.c:628 ../src/backup.c:655 ../src/backup.c:675 -#: ../src/backup.c:686 ../src/coldsync.c:1415 +#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:589 +#: ../src/backup.c:614 ../src/backup.c:634 ../src/backup.c:654 +#: ../src/backup.c:665 ../src/coldsync.c:1478 #, fuzzy msgid "Backup" msgstr "Záloha " @@ -944,7 +968,7 @@ msgstr "Z msgid "Bad file descriptor" msgstr "Špatný descriptor souboru" -#: ../src/coldsync.c:898 ../src/coldsync.c:2502 +#: ../src/coldsync.c:945 #, c-format msgid "CacheFromConduits() returned %d." msgstr "CacheFromConduits() vrátil %d." @@ -953,15 +977,15 @@ msgstr "CacheFromConduits() vr msgid "Can't allocate list of record IDs.\n" msgstr "nemohu naalokovat seznam ID záznamů.\n" -#: ../src/config.c:467 ../src/config.c:508 +#: ../src/config.c:550 ../src/config.c:591 msgid "Can't allocate listen block." msgstr "Nemohu naalokovat listen block." -#: ../src/config.c:320 +#: ../src/config.c:394 msgid "Can't allocate new conduit block." msgstr "Nemohu naalokovat nový conduit block." -#: ../src/config.c:297 +#: ../src/config.c:370 msgid "Can't allocate new configuration." msgstr "Nemohu naalokovat novou konfiguraci." @@ -969,62 +993,60 @@ msgstr "Nemohu naalokovat novou konfiguraci." msgid "Can't allocate new connection.\n" msgstr "Nemohu naalokovat nové spojení.\n" -#: ../src/coldsync.c:566 ../src/coldsync.c:1360 ../src/coldsync.c:1507 -#: ../src/coldsync.c:1650 ../src/coldsync.c:2103 +#: ../src/coldsync.c:562 msgid "Can't allocate struct Palm." msgstr "Nemohu naalokovat struct Palm." -#: ../src/coldsync.c:557 ../src/coldsync.c:1352 ../src/coldsync.c:1499 -#: ../src/coldsync.c:1642 ../src/coldsync.c:2094 +#: ../src/coldsync.c:553 msgid "Can't connect to Palm." msgstr "Nemohu se připojit k Palmu." -#: ../libpconn/PConnection_net.c:411 +#: ../libpconn/PConnection_net.c:449 msgid "Can't connect to server.\n" msgstr "Nemohu se připojit k serveru.\n" -#: ../src/GenericConduit.cc:720 ../src/GenericConduit.cc:2085 +#: ../src/GenericConduit.cc:672 ../src/GenericConduit.cc:1947 msgid "Can't copy a new record." msgstr "Nemohu zkopírovat nový záznam." -#: ../src/coldsync.c:2299 +#: ../src/coldsync.c:2140 msgid "Can't copy config file name" msgstr "Nemohu zkopírovat řetězec s názvem konfiguračního souboru" -#: ../src/config.c:475 ../src/config.c:516 +#: ../src/config.c:558 ../src/config.c:599 msgid "Can't copy string." msgstr "Nemohu zkopírovat řetězec." -#: ../src/GenericConduit.cc:2436 +#: ../src/GenericConduit.cc:2285 #, c-format msgid "Can't create \"%s\"." msgstr "Nemohu vytvořit \"%s\"." -#: ../src/config.c:1627 +#: ../src/config.c:1813 #, c-format msgid "Can't create archive directory %s." msgstr "Nemohu vytvořit archivní adresář %s." -#: ../src/config.c:1609 +#: ../src/config.c:1795 #, c-format msgid "Can't create attic directory %s." msgstr "Nemohu vytvořit attic adresář %s." -#: ../src/config.c:1591 +#: ../src/config.c:1777 #, c-format msgid "Can't create backup directory %s." msgstr "Nemohu vytvořit záložní adresář %s." -#: ../src/config.c:1573 +#: ../src/config.c:1759 #, c-format msgid "Can't create base sync directory %s." msgstr "Nemohu vytvořit základní adresář %s." -#: ../src/coldsync.c:824 ../src/coldsync.c:2422 +#: ../src/coldsync.c:658 msgid "Can't create connection to forwarding host." msgstr "Nemohu vytvořit spojení na forwardující host." -#: ../src/config.c:1645 +#: ../src/config.c:1831 #, c-format msgid "Can't create install directory %s." msgstr "Nemohu vytvořit instalační adresář %s." @@ -1033,19 +1055,19 @@ msgstr "Nemohu vytvo msgid "Can't download record or resource index.\n" msgstr "Nemohu vytvořit záznam nebo resource index.\n" -#: ../src/coldsync.c:461 +#: ../src/coldsync.c:471 msgid "Can't dup(stderr)." msgstr "Nemohu provést dup(stderr)." -#: ../src/coldsync.c:836 ../src/coldsync.c:2434 +#: ../src/coldsync.c:675 msgid "Can't establish connection with forwarding host." msgstr "Nemohu vytvořit spojení s forwardujícím hostem." -#: ../src/coldsync.c:975 ../src/coldsync.c:2568 +#: ../src/coldsync.c:1020 msgid "Can't fetch list of databases." msgstr "Nemohu načíst seznam databází." -#: ../src/coldsync.c:1195 ../src/coldsync.c:2775 +#: ../src/coldsync.c:1164 #, c-format msgid "Can't fetch preference 0x%08lx/%d." msgstr "Nemohu načíst preference 0x%08lx/%d." @@ -1070,60 +1092,59 @@ msgstr "Nemohu naj msgid "Can't find the sort block in \"%.*s\"!\n" msgstr "Nemohu najít třídíci blok!\n" -#: ../src/coldsync.c:232 +#: ../src/coldsync.c:235 msgid "Can't get host ID." msgstr "Neznámé ID hostu." -#: ../src/coldsync.c:784 ../src/coldsync.c:2383 +#: ../src/coldsync.c:623 msgid "Can't get host addresses." msgstr "Neznámá adresa hostu." -#: ../src/config.c:899 +#: ../src/config.c:1042 msgid "Can't get host name." msgstr "Neznámé jméno hostu." -#: ../src/coldsync.c:909 ../src/coldsync.c:2513 +#: ../src/coldsync.c:955 msgid "Can't get last sync PC from Palm" msgstr "Nemohu z Palmu dostat poslední sync" -#: ../src/spalm.c:451 +#: ../src/spalm.c:416 msgid "Can't get location of serial number." msgstr "Nemohu získat umístění seriového čísla." -#: ../src/conduit.c:503 +#: ../src/conduit.c:524 msgid "Can't get preference item." msgstr "Nemohu získat položku preferencí." -#: ../src/spalm.c:224 +#: ../src/spalm.c:211 msgid "Can't get system info." msgstr "Nemohu obdržet systémové informace." -#: ../src/coldsync.c:641 ../src/coldsync.c:1764 +#: ../src/coldsync.c:1288 ../src/coldsync.c:1727 msgid "Can't get user ID from Palm." msgstr "Nemohu obdržet ID z Palmu." -#: ../src/config.c:373 ../src/spalm.c:324 +#: ../src/config.c:447 ../src/spalm.c:304 msgid "Can't get user info." msgstr "Nemohu obdržet uživatelské informace." -#: ../src/coldsync.c:694 +#: ../src/coldsync.c:1340 msgid "Can't get user name from Palm." msgstr "Nemohu obdržet z Palmu jméno uživatele." -#: ../src/config.c:1799 +#: ../src/config.c:1985 msgid "Can't get user's full name." msgstr "Nemohu obdržet plné jméno uživatele." -#: ../src/coldsync.c:1010 ../src/coldsync.c:1229 ../src/coldsync.c:2603 -#: ../src/coldsync.c:2809 +#: ../src/coldsync.c:731 msgid "Can't install new files." msgstr "Nemohu nainstalovat nové soubory." -#: ../src/coldsync.c:225 ../src/coldsync.c:2316 +#: ../src/coldsync.c:228 ../src/coldsync.c:2156 msgid "Can't load configuration." msgstr "Nemohu nahrát konfiguraci." -#: ../src/install.c:434 +#: ../src/install.c:420 msgid "Can't load header." msgstr "Nemohu nahrát hlavičku." @@ -1136,11 +1157,11 @@ msgstr "Nemohu nahr msgid "Can't load record list header for \"%.*s\".\n" msgstr "%s: nemohu zapsat hlavičku listu záznamu.\n" -#: ../src/coldsync.c:589 +#: ../src/coldsync.c:1236 msgid "Can't look up Palm." msgstr "Nemohu najít Palma." -#: ../src/config.c:908 +#: ../src/config.c:1051 msgid "Can't look up my address." msgstr "Nemohu najít moji adresu." @@ -1149,7 +1170,7 @@ msgstr "Nemohu naj msgid "Can't open %s." msgstr "Nemohu otevřít %s." -#: ../src/backup.c:593 +#: ../src/backup.c:586 msgid "Can't open backup conduit." msgstr "Nemohu otevřít záložní conduit." @@ -1158,26 +1179,25 @@ msgstr "Nemohu otev msgid "Can't open conduit for \"%s\": %d.\n" msgstr "Nemohu otevřít modul pro \"%s\": %d.\n" -#: ../src/coldsync.c:548 ../src/coldsync.c:1344 ../src/coldsync.c:1491 -#: ../src/coldsync.c:1634 ../src/coldsync.c:2085 +#: ../src/coldsync.c:544 msgid "Can't open connection." msgstr "Nemohu otevřít spojení." -#: ../src/backup.c:624 +#: ../src/backup.c:610 #, c-format msgid "Can't open database \"%s\"." msgstr "Nemohu otevřít databázi \"%s\"." -#: ../src/coldsync.c:475 +#: ../src/coldsync.c:485 #, c-format msgid "Can't open log file \"%s\"." msgstr "Nemohu otevřít log soubor \"%s\"." -#: ../src/coldsync.c:489 +#: ../src/coldsync.c:499 msgid "Can't open log file on stderr." msgstr "Nemohu otevřít log soubor na stderr." -#: ../src/coldsync.c:178 +#: ../src/coldsync.c:181 msgid "Can't parse command-line arguments." msgstr "Nemohu přečíst argumenty příkazové řádky." @@ -1191,16 +1211,16 @@ msgstr "Nemohu p msgid "Can't read AppInfo block for \"%.*s\".\n" msgstr "%s: Nemohu přečíst AppInfo block pro %s: %d.\n" -#: ../src/spalm.c:300 +#: ../src/spalm.c:280 msgid "Can't read NetSync info." msgstr "Nemohu přečíst NetSync info." -#: ../src/restore.c:227 +#: ../src/restore.c:222 #, c-format msgid "Can't read contents of directory %s." msgstr "Nemohu přečíst obsah adresáře %s." -#: ../src/coldsync.c:1659 +#: ../src/coldsync.c:1623 msgid "Can't read length of serial number." msgstr "Nemohu přečíst délku seriového čísla." @@ -1248,7 +1268,7 @@ msgstr "Nemohu p msgid "Can't read resources for \"%.*s\".\n" msgstr "Nemohu přečíst resource %d.\n" -#: ../src/coldsync.c:1671 ../src/spalm.c:484 +#: ../src/coldsync.c:1635 ../src/spalm.c:442 msgid "Can't read serial number." msgstr "Nemohu přečíst seriové číslo." @@ -1257,86 +1277,90 @@ msgstr "Nemohu p msgid "Can't read sort block for \"%.*s\".\n" msgstr "%s: Nemohu přečíst třídící blok pro %s: %d.\n" -#: ../src/coldsync.c:156 ../src/coldsync.c:161 ../src/coldsync.c:166 +#: ../src/coldsync.c:159 ../src/coldsync.c:164 ../src/coldsync.c:169 #, c-format msgid "Can't reserve file descriptor %d." msgstr "Nemohu si zarezervovat descriptor souboru %d." -#: ../src/spalm.c:1006 +#: ../src/spalm.c:983 msgid "Can't resize palm->dblist." msgstr "Nemohu změnit velikost palm->dblist." -#: ../src/coldsync.c:793 ../src/coldsync.c:2392 +#: ../src/coldsync.c:630 msgid "Can't resolve forwarding address." msgstr "Nemohu resolovat forwarding adresu." -#: ../src/coldsync.c:1534 ../src/coldsync.c:1557 +#: ../src/coldsync.c:1549 ../src/coldsync.c:1572 msgid "Can't restore directory." msgstr "Nemohu obnovit adresář." -#: ../src/coldsync.c:2281 +#: ../src/coldsync.c:2123 msgid "Can't setuid" msgstr "Nemohu provést setuid" -#: ../src/coldsync.c:1161 ../src/coldsync.c:2741 +#: ../src/coldsync.c:1132 msgid "Can't write user info." msgstr "Nemohu zapsat uživatelské info." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:522 -#: ../src/GenericConduit.cc:1019 ../src/backup.c:581 ../src/restore.c:181 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:495 +#: ../src/GenericConduit.cc:954 ../src/backup.c:581 ../src/restore.c:176 #, fuzzy msgid "Cancelled" msgstr "Zrušeno\n" -#: ../src/backup.c:576 ../src/coldsync.c:1380 ../src/coldsync.c:1428 -#: ../src/coldsync.c:1527 ../src/coldsync.c:1550 ../src/conduit.c:1183 -#: ../src/conduit.c:1243 ../src/restore.c:274 +#: ../src/backup.c:576 ../src/coldsync.c:1442 ../src/coldsync.c:1491 +#: ../src/coldsync.c:1541 ../src/coldsync.c:1564 ../src/conduit.c:1226 +#: ../src/conduit.c:1287 ../src/restore.c:269 msgid "Cancelled by Palm." msgstr "Zrušeno Palmem." -#: ../src/config.c:850 +#: ../src/config.c:993 msgid "ColdSync homepage at http://www.ooblick.com/software/coldsync/\n" msgstr "" "Domovská stránka ColdSync na http://www.ooblick.com/software/coldsync/\n" -#: ../src/config.c:856 +#: ../src/config.c:999 msgid "Compile-type options:\n" msgstr "Optiony při kompilaci:\n" -#: ../src/conduit.c:1189 ../src/conduit.c:1249 +#: ../src/conduit.c:1232 ../src/conduit.c:1293 #, c-format msgid "Conduit %s exited abnormally. Continuing." msgstr "Conduit %s skončil nenormálně. Pokračuji." -#: ../src/conduit.c:1169 ../src/conduit.c:1229 +#: ../src/conduit.c:1212 ../src/conduit.c:1273 #, c-format msgid "Conduit %s is not a %s conduit." msgstr "Conduit %s není %s conduitem." -#: ../src/coldsync.c:1103 ../src/coldsync.c:2692 +#: ../src/coldsync.c:846 msgid "Conduit failed for unknown reason." msgstr "Conduit z neznámých důvodů selhal." -#: ../src/config.c:384 +#: ../src/config.c:458 #, c-format msgid "Config file \"%s\" doesn't exist." msgstr "Konfigurační soubor \"%s\" neexistuje." -#: ../src/coldsync.c:1244 ../src/coldsync.c:1454 ../src/coldsync.c:1575 -#: ../src/coldsync.c:1960 ../src/coldsync.c:2824 +#: ../src/coldsync.c:581 msgid "Couldn't disconnect." msgstr "Nemohu se odpojit" -#: ../src/config.c:336 +#: ../src/config.c:1719 +#, fuzzy, c-format +msgid "Couldn't find the requested listen block: \"%s\"" +msgstr "Nemohu najít třídíci blok!\n" + +#: ../src/config.c:410 msgid "Couldn't initialize configuration." msgstr "Nemohu nastavit konfiguraci." -#: ../src/config.c:359 ../src/config.c:418 +#: ../src/config.c:433 ../src/config.c:492 #, c-format msgid "Couldn't read configuration file \"%s\"." msgstr "Nemohu přečíst konfigurační soubor \"%s\"." -#: ../src/conduit.c:619 +#: ../src/conduit.c:640 msgid "Couldn't send header to conduit." msgstr "Nemohu poslat hlavičku conduitu." @@ -1344,20 +1368,30 @@ msgstr "Nemohu poslat hlavi msgid "DlpReadRecordIDList() read 0 records. What happened?\n" msgstr "DlpReadRecordIDList() přečetl 0 záznamů. Co se me stalo?\n" -#: ../libpconn/dlp_cmd.c:1805 +#: ../libpconn/dlp_cmd.c:1817 msgid "DlpWriteRecord: Can't allocate output buffer.\n" msgstr "DlpWriteRecord: nemohu naalokovat výstupní buffer.\n" -#: ../src/coldsync.c:1900 ../src/coldsync.c:3217 +#: ../src/coldsync.c:1828 ../src/coldsync.c:2599 #, c-format msgid "DlpWriteUserInfo failed: %d." msgstr "DlpWriteUserInfo selhal: %d" -#: ../src/coldsync.c:930 ../src/coldsync.c:934 +#: ../src/coldsync.c:975 +#, fuzzy +msgid "Doing a (forced) fast sync." +msgstr "Provádím rychlou synchonizaci." + +#: ../src/coldsync.c:973 +#, fuzzy +msgid "Doing a (forced) slow sync." +msgstr "Provádím pomalou synchronizaci." + +#: ../src/coldsync.c:979 msgid "Doing a fast sync." msgstr "Provádím rychlou synchonizaci." -#: ../src/coldsync.c:928 ../src/coldsync.c:932 +#: ../src/coldsync.c:977 msgid "Doing a slow sync." msgstr "Provádím pomalou synchronizaci." @@ -1365,44 +1399,48 @@ msgstr "Prov msgid "End of file" msgstr "Konec souboru" -#: ../src/GenericConduit.cc:303 ../src/GenericConduit.cc:323 -#: ../src/GenericConduit.cc:343 ../src/GenericConduit.cc:423 -#: ../src/GenericConduit.cc:452 ../src/GenericConduit.cc:481 -#: ../src/GenericConduit.cc:572 ../src/GenericConduit.cc:591 -#: ../src/GenericConduit.cc:612 ../src/GenericConduit.cc:723 -#: ../src/GenericConduit.cc:929 ../src/GenericConduit.cc:952 -#: ../src/GenericConduit.cc:978 ../src/GenericConduit.cc:1067 -#: ../src/GenericConduit.cc:1086 ../src/GenericConduit.cc:1127 -#: ../src/GenericConduit.cc:1229 ../src/GenericConduit.cc:1465 -#: ../src/GenericConduit.cc:1494 ../src/GenericConduit.cc:1521 -#: ../src/backup.c:563 ../src/backup.c:596 ../src/backup.c:628 -#: ../src/backup.c:655 ../src/backup.c:675 ../src/install.c:586 -#: ../src/install.c:618 ../src/install.c:730 ../src/restore.c:192 +#: ../src/GenericConduit.cc:302 ../src/GenericConduit.cc:315 +#: ../src/GenericConduit.cc:328 ../src/GenericConduit.cc:406 +#: ../src/GenericConduit.cc:428 ../src/GenericConduit.cc:455 +#: ../src/GenericConduit.cc:538 ../src/GenericConduit.cc:550 +#: ../src/GenericConduit.cc:564 ../src/GenericConduit.cc:675 +#: ../src/GenericConduit.cc:874 ../src/GenericConduit.cc:890 +#: ../src/GenericConduit.cc:914 ../src/GenericConduit.cc:995 +#: ../src/GenericConduit.cc:1007 ../src/GenericConduit.cc:1048 +#: ../src/GenericConduit.cc:1150 ../src/GenericConduit.cc:1368 +#: ../src/GenericConduit.cc:1390 ../src/GenericConduit.cc:1416 +#: ../src/backup.c:563 ../src/backup.c:589 ../src/backup.c:614 +#: ../src/backup.c:634 ../src/backup.c:654 ../src/install.c:572 +#: ../src/install.c:590 ../src/install.c:702 ../src/restore.c:187 #, fuzzy msgid "Error" msgstr "Chyba\n" -#: ../src/install.c:338 ../src/install.c:359 +#: ../src/install.c:331 ../src/install.c:345 msgid "Error\n" msgstr "Chyba\n" -#: ../src/coldsync.c:998 ../src/coldsync.c:1217 ../src/coldsync.c:2591 -#: ../src/coldsync.c:2797 +#: ../src/coldsync.c:712 ../src/coldsync.c:721 #, c-format msgid "Error %d running install conduits." msgstr "Chyba %d v průběhu spouštění instalačních conduitu." -#: ../src/coldsync.c:1258 ../src/coldsync.c:2837 +#: ../src/coldsync.c:752 ../src/coldsync.c:764 #, c-format msgid "Error %d running post-dump conduits." msgstr "Chyba %d v průběhu spouštění post-dump conduitu." -#: ../src/coldsync.c:1057 ../src/coldsync.c:2648 +#: ../src/coldsync.c:787 ../src/coldsync.c:800 #, c-format msgid "Error %d running pre-fetch conduits." msgstr "Chyba %d při spoučtění pre-feth conduitu." -#: ../src/coldsync.c:1436 +#: ../src/coldsync.c:822 +#, fuzzy, c-format +msgid "Error %d running sync conduits." +msgstr "Chyba %d v průběhu spouštění instalačních conduitu." + +#: ../src/coldsync.c:1500 #, c-format msgid "Error backing up \"%s\"." msgstr "Chyba při zálohování \"%s\"." @@ -1412,17 +1450,17 @@ msgstr "Chyba p msgid "Error creating database \"%s\": %d.\n" msgstr "Chyba při vytváření databáze \"%s\": %d.\n" -#: ../src/install.c:751 +#: ../src/install.c:723 #, c-format msgid "Error deleting \"%s\"." msgstr "Chyba při mazání \"%s\"." -#: ../src/coldsync.c:2904 +#: ../src/coldsync.c:2211 #, c-format msgid "Error during DlpEndOfSync: (%d) %s." msgstr "Chyba při DlpEndOfSync: (%d) %s." -#: ../libpconn/cmp.c:141 +#: ../libpconn/cmp.c:142 #, c-format msgid "Error during cmp_read: (%d) %s.\n" msgstr "Chyba při cmp_read: (%d) %s.\n" @@ -1435,16 +1473,16 @@ msgstr "Chyba p msgid "Error in system call or library function" msgstr "Chyba při systémovém volání nebo v knihovní funkci" -#: ../src/install.c:705 +#: ../src/install.c:677 #, c-format msgid "Error opening \"%s\"." msgstr "Chyba při otvírání \"%s\"." -#: ../libpconn/netsync.c:488 +#: ../libpconn/netsync.c:514 msgid "Error reading NetSync packet header.\n" msgstr "Chyba při čtení hlavičky NetSync paketu.\n" -#: ../libpconn/netsync.c:624 +#: ../libpconn/netsync.c:659 msgid "Error sending NetSync header.\n" msgstr "Chyba při posílání hlavičky NetSync u.\n" @@ -1452,9 +1490,9 @@ msgstr "Chyba p msgid "Error trying to set speed.\n" msgstr "Chyba při pokusu nastavit rychlost.\n" -#: ../src/GenericConduit.cc:888 ../src/GenericConduit.cc:1431 -#: ../src/GenericConduit.cc:1744 ../src/GenericConduit.cc:1889 -#: ../src/GenericConduit.cc:2055 ../src/GenericConduit.cc:2289 +#: ../src/GenericConduit.cc:833 ../src/GenericConduit.cc:1334 +#: ../src/GenericConduit.cc:1627 ../src/GenericConduit.cc:1762 +#: ../src/GenericConduit.cc:1917 ../src/GenericConduit.cc:2138 #, c-format msgid "Error uploading record 0x%08lx: %d." msgstr "Chyba při uploadingu záznamu 0x%08lx: %d." @@ -1463,7 +1501,7 @@ msgstr "Chyba p msgid "Error: " msgstr "Chyba: " -#: ../libpconn/PConnection_serial.c:612 ../libpconn/PConnection_usb.c:460 +#: ../libpconn/PConnection_serial.c:616 ../libpconn/PConnection_usb.c:483 #, c-format msgid "Error: Can't open \"%s\".\n" msgstr "Chyba: Nemohu otevřít \"%s\".\n" @@ -1479,11 +1517,11 @@ msgstr "" msgid "Error: Palm suggested unknown speed %ld\n" msgstr "" -#: ../libpconn/PConnection.c:118 +#: ../libpconn/PConnection.c:119 msgid "Error: USB support not enabled.\n" msgstr "Chyba: není nastavena podpora USB.\n" -#: ../libpconn/netsync.c:496 +#: ../libpconn/netsync.c:521 #, c-format msgid "Error: only read %d bytes of NetSync packet header.\n" msgstr "Chyba: přečetl jsme pouze %d bytů z hlavičky NetSync paketu.\n" @@ -1502,11 +1540,11 @@ msgstr "Hey! Nemohu nal msgid "Hey! I can't find the %dth resource in \"%.*s\"!\n" msgstr "Hey! Nemohu nají %d. resource!\n" -#: ../src/config.c:924 +#: ../src/config.c:1067 msgid "Hey! This isn't an AF_INET address!" msgstr "Hey! To není AF_INET adresa!" -#: ../src/GenericConduit.cc:1200 +#: ../src/GenericConduit.cc:1121 msgid "" "I have a new, deleted record that is neither archived nor expunged\n" "What am I supposed to do?" @@ -1514,12 +1552,12 @@ msgstr "" "Mám nový smazaný záznam, který není ani archivován, ani vyprázdněn\n" "Co mám dělat?" -#: ../src/conduit.c:2191 +#: ../src/conduit.c:2279 msgid "Inside run_DummyConduit.\n" msgstr "V run_DummyConduit.\n" -#: ../src/install.c:584 ../src/install.c:616 ../src/install.c:701 -#: ../src/install.c:709 ../src/install.c:728 ../src/install.c:733 +#: ../src/install.c:570 ../src/install.c:588 ../src/install.c:673 +#: ../src/install.c:681 ../src/install.c:700 ../src/install.c:705 #, fuzzy msgid "Install" msgstr "Instaluji " @@ -1540,43 +1578,41 @@ msgstr " msgid "Invalid result ID" msgstr "Špatné ID výsledku" -#: ../src/coldsync.c:500 +#: ../src/coldsync.c:510 #, c-format msgid "Log started on %s" msgstr "Log zahájen v %s" -#: ../src/coldsync.c:583 ../src/coldsync.c:635 ../src/coldsync.c:688 -#: ../src/coldsync.c:970 ../src/coldsync.c:1069 ../src/coldsync.c:1098 -#: ../src/coldsync.c:1125 ../src/coldsync.c:1191 ../src/coldsync.c:1267 -#: ../src/coldsync.c:1385 ../src/coldsync.c:1433 ../src/coldsync.c:1530 -#: ../src/coldsync.c:1553 ../src/coldsync.c:2564 ../src/coldsync.c:2660 -#: ../src/coldsync.c:2687 ../src/coldsync.c:2708 ../src/coldsync.c:2771 -#: ../src/coldsync.c:2846 ../src/conduit.c:500 ../src/restore.c:278 +#: ../src/coldsync.c:1015 ../src/coldsync.c:1093 ../src/coldsync.c:1160 +#: ../src/coldsync.c:1194 ../src/coldsync.c:1231 ../src/coldsync.c:1283 +#: ../src/coldsync.c:1335 ../src/coldsync.c:1447 ../src/coldsync.c:1496 +#: ../src/coldsync.c:1544 ../src/coldsync.c:1567 ../src/conduit.c:521 +#: ../src/restore.c:273 msgid "Lost connection to Palm." msgstr "Ztratil jsem spojení s Palmem." -#: ../src/conduit.c:1186 ../src/conduit.c:1246 +#: ../src/conduit.c:1229 ../src/conduit.c:1290 msgid "Lost connection to Palm. Aborting." msgstr "Ztratil jsem spojení s Palmem. Končím." -#: ../src/config.c:263 +#: ../src/config.c:336 #, c-format msgid "Missing option argument after \"%s\"." msgstr "Chybí argument optionu po \"%s\"." -#: ../src/config.c:805 +#: ../src/config.c:947 msgid "Modes:\n" msgstr "Módy:\n" -#: ../src/coldsync.c:848 ../src/coldsync.c:2446 +#: ../src/coldsync.c:685 msgid "Network sync forwarding failed." msgstr "Síťový sync forwarding selhal." -#: ../src/spalm.c:288 +#: ../src/spalm.c:275 msgid "No NetSync info.\n" msgstr "Nemám NetSync info.\n" -#: ../src/coldsync.c:1291 +#: ../src/coldsync.c:1392 msgid "No backup directory specified." msgstr "Nebyl zadán backup adresář." @@ -1584,39 +1620,43 @@ msgstr "Nebyl zad msgid "No error" msgstr "Bez chyby" -#: ../src/coldsync.c:2230 +#: ../src/coldsync.c:2088 +#, fuzzy, c-format +msgid "No matching entry in %s, couldn't autoinit." +msgstr "V %s nemám shodnou položku." + +#: ../src/coldsync.c:2099 #, c-format msgid "No matching entry in %s." msgstr "V %s nemám shodnou položku." -#: ../src/coldsync.c:529 ../src/coldsync.c:1326 ../src/coldsync.c:1473 -#: ../src/coldsync.c:1616 ../src/coldsync.c:2064 +#: ../src/coldsync.c:525 msgid "No port specified." msgstr "Nebyl navolen port." -#: ../src/coldsync.c:1417 +#: ../src/coldsync.c:1480 #, fuzzy msgid "No such database" msgstr "Databáze neexistuje\n" -#: ../src/coldsync.c:1412 +#: ../src/coldsync.c:1475 #, c-format msgid "No such database: \"%s\"." msgstr "Databáze \"%s\" neexistuje." -#: ../src/coldsync.c:1316 +#: ../src/coldsync.c:1417 #, c-format msgid "No such directory: \"%s\"." msgstr "Adresář \"%s\" neexistuje." -#: ../src/GenericConduit.cc:492 ../src/GenericConduit.cc:989 -#: ../src/GenericConduit.cc:1531 ../src/backup.c:686 ../src/install.c:703 -#: ../src/install.c:735 ../src/restore.c:197 +#: ../src/GenericConduit.cc:465 ../src/GenericConduit.cc:924 +#: ../src/GenericConduit.cc:1425 ../src/backup.c:665 ../src/install.c:675 +#: ../src/install.c:707 ../src/restore.c:192 #, fuzzy msgid "OK" msgstr "OK\n" -#: ../src/config.c:812 +#: ../src/config.c:954 msgid "Options:\n" msgstr "Optiony:\n" @@ -1624,71 +1664,72 @@ msgstr "Optiony:\n" msgid "Out of memory" msgstr "Out of memory (nedostatek paměti)" -#: ../libpconn/PConnection_serial.c:653 ../libpconn/PConnection_usb.c:435 +#: ../libpconn/PConnection_serial.c:590 ../libpconn/PConnection_serial.c:657 +#: ../libpconn/PConnection_usb.c:458 msgid "Please press the HotSync button.\n" msgstr "Prosím stiskněte tlačítko HotSync.\n" -#: ../src/install.c:711 +#: ../src/install.c:683 #, fuzzy msgid "Problem" msgstr "Problém\n" -#: ../src/restore.c:181 ../src/restore.c:192 ../src/restore.c:197 +#: ../src/restore.c:176 ../src/restore.c:187 ../src/restore.c:192 #, fuzzy msgid "Restore" msgstr "Obnovuji " -#: ../src/restore.c:149 +#: ../src/restore.c:151 #, c-format msgid "Restore: Can't delete database \"%s\": %d." msgstr "Obnovení: nemohu smazat databázi \"%s\": %d." -#: ../src/coldsync.c:1251 +#: ../src/coldsync.c:746 msgid "Running Dump conduits" msgstr "Spouštím dump conduity" -#: ../src/coldsync.c:1050 +#: ../src/coldsync.c:781 msgid "Running Fetch conduits" msgstr "Spouštím stahovací conduity" -#: ../src/coldsync.c:994 ../src/coldsync.c:1213 ../src/coldsync.c:2587 -#: ../src/coldsync.c:2793 +#: ../src/coldsync.c:706 msgid "Running Install conduits" msgstr "Spouštím instalační conduity" -#: ../src/coldsync.c:1075 +#: ../src/coldsync.c:816 msgid "Running Sync conduits" msgstr "Spouštím Sync conduity" -#: ../libpconn/slp.c:391 +#: ../libpconn/slp.c:385 #, c-format msgid "SLP: bad CRC: expected 0x%04x, got 0x%04x.\n" msgstr "SLP: špatný CRC: očekával jsem 0x%04x, doslal jsem 0x%04x.\n" -#: ../src/coldsync.c:1855 +#: ../src/coldsync.c:2443 #, fuzzy msgid "Set user ID" msgstr "Nastaveno uživatelské ID:" -#: ../src/coldsync.c:1890 +#: ../src/coldsync.c:2466 #, fuzzy msgid "Set username" msgstr "Nastaveno uživatelské jméno: " -#: ../src/coldsync.c:1120 +#: ../src/coldsync.c:1083 msgid "Sync cancelled by Palm." msgstr "Sync přerušen Palmem." -#: ../src/coldsync.c:1089 ../src/coldsync.c:2678 -msgid "Sync cancelled." -msgstr "Sync přerušen." - -#: ../src/coldsync.c:621 +#: ../src/coldsync.c:1268 #, c-format msgid "Sync for %s at %s" msgstr "" -#: ../src/coldsync.c:649 +#: ../src/coldsync.c:834 +#, c-format +msgid "Syncing %s" +msgstr "" + +#: ../src/coldsync.c:1296 #, c-format msgid "" "This Palm has user ID %ld (I was expecting %ld).\n" @@ -1706,7 +1747,7 @@ msgstr "" "\tVáš konfigurační soubor by měl obsahovat PDA block vypadající\n" "nějak takto:" -#: ../src/coldsync.c:704 +#: ../src/coldsync.c:1350 #, c-format msgid "" "This Palm has user name \"%.*s\" (I was expecting \"%.*s\").\n" @@ -1724,7 +1765,7 @@ msgstr "" "\tVáš konfigurační soubor by měl obsahovat PDA block vypadající\n" "nějak takto:" -#: ../src/config.c:945 +#: ../src/config.c:1088 msgid "This host doesn't appear to have an IP address." msgstr "Tento host nevypadá na to, že by měl IP adresu." @@ -1736,7 +1777,7 @@ msgstr "Timeout (vypr msgid "Too many errors. Aborting." msgstr "Příliš mnoho chyb. Končím." -#: ../src/coldsync.c:3103 +#: ../src/coldsync.c:2410 #, c-format msgid "Too many files named \"%s\" in the attic." msgstr "V attic u je pojmenováno příliš mnoho souborů \"%s\"" @@ -1749,7 +1790,7 @@ msgstr "Transfer byl p msgid "Unexpected timeout" msgstr "" -#: ../src/config.c:229 +#: ../src/config.c:295 #, c-format msgid "Unknown device type: \"%s\"." msgstr "Neznámý druh zařízení: \"%s\"." @@ -1759,17 +1800,17 @@ msgstr "Nezn msgid "Unknown error" msgstr "Bez chyby" -#: ../src/config.c:706 +#: ../src/config.c:792 #, c-format msgid "Unknown facility \"%s\"." msgstr "Neznámá facilita \"%s\"." -#: ../src/config.c:755 +#: ../src/config.c:843 ../src/config.c:876 #, c-format msgid "Unknown mode: \"%s\"." msgstr "Neznámý mód: \"%s\"." -#: ../src/coldsync.c:345 +#: ../src/coldsync.c:353 #, c-format msgid "" "Unknown mode: %d.\n" @@ -1778,22 +1819,22 @@ msgstr "" "Neznámý mód: %d.\n" "To je chyba. Prosím, upozorněte o tom maintainera." -#: ../src/config.c:242 +#: ../src/config.c:308 #, fuzzy, c-format msgid "Unknown protocol: \"%s\"." msgstr "Neznámý mód: \"%s\"." -#: ../src/coldsync.c:2261 +#: ../src/coldsync.c:2110 #, c-format msgid "Unknown user/uid: \"%s\"." msgstr "Neznámý uživatel/uid(user id): \"%s\"." -#: ../src/config.c:254 +#: ../src/config.c:327 #, c-format msgid "Unrecognized option: \"%s\"." msgstr "Nerozpoznaná optiona: \"%s\"." -#: lexer.l:505 +#: lexer.l:540 #, c-format msgid "Unterminated string at line %d (string started on line %d)\n" msgstr "" @@ -1808,7 +1849,7 @@ msgstr "Nahr msgid "Uploading \"%s\"" msgstr "Nahrávám \"%s\"" -#: ../src/config.c:834 +#: ../src/config.c:977 #, c-format msgid "Usage: %s [options] \n" msgstr "Použití: %s [options] \n" @@ -1826,7 +1867,7 @@ msgstr "" "Varování: AppInfo block je na divném místě.\n" "Očekával jsem ho na 0x%lx, ale jsem na 0x%lx.\n" -#: ../src/spalm.c:461 +#: ../src/spalm.c:426 #, c-format msgid "" "Warning: ROM serial number is %d characters long. Please notify the\n" @@ -1853,7 +1894,7 @@ msgstr "" "Varování: nemohu nastavit rychlost na požadovanou hodnotu (%ld bps).\n" "Použiji defaultní nastavení.\n" -#: ../libpconn/PConnection_serial.c:603 +#: ../libpconn/PConnection_serial.c:607 #, c-format msgid "Warning: no device on %s. Sleeping\n" msgstr "Varování: na %s není připojeno žádné zařízení. Čekám\n" @@ -1885,7 +1926,7 @@ msgstr "" "Varování: třídicí block (sort block) je na neočekávaném místě.\n" "Očekávál jsem ho na 0x%lx, ale jsme na 0x%lx.\n" -#: ../libpconn/padp.c:647 +#: ../libpconn/padp.c:645 msgid "Write timeout. Attempting to resend.\n" msgstr "Timeout při zápisu. Zkouším data poslat znovu.\n" @@ -1893,7 +1934,7 @@ msgstr "Timeout p msgid "XID on ACK doesn't match request" msgstr "" -#: ../src/spalm.c:563 +#: ../src/spalm.c:521 msgid "" "You have an old Palm, one that doesn't say how many\n" "databases it has. I can't cope with this." @@ -1901,7 +1942,7 @@ msgstr "" "Máte starého Palma, nějakého z těch, co mě neřeknout,\n" "kolik má databází. Je mi líto, ale bez toho neumohu pracovat." -#: ../src/config.c:728 +#: ../src/config.c:814 #, c-format msgid "" "You shouldn't specify two -m options.\n" @@ -1910,7 +1951,7 @@ msgstr "" "Neměli by jste zadávat dva -m parametry.\n" "\tPoužiji -m%s." -#: ../src/config.c:269 +#: ../src/config.c:342 #, c-format msgid "" "You specified an apparently legal option (\"-%c\"), but I don't know what\n" @@ -1919,26 +1960,29 @@ msgstr "" "Specifikovali jste podle všeho legální parametr (\"-%c\"), ale nevím,\n" "co s ním dělat. To je chyba. Prosím kontaktujte maintainera." -#: ../src/GenericConduit.cc:177 +#: ../src/GenericConduit.cc:183 msgid "[generic]: Aborting." msgstr "[generic]: Přerušuji." -#: ../libpconn/PConnection_usb.c:648 +#: ../libpconn/PConnection_usb.c:671 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable selhalo" -#: ../libpconn/PConnection_usb.c:586 +#: ../libpconn/PConnection_usb.c:609 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo selhalo" -#: ../src/GenericConduit.cc:340 +#: ../src/GenericConduit.cc:325 msgid "pdb_Download() failed." msgstr "pdb_Download() selhala." -#: ../libpconn/PConnection_usb.c:181 +#: ../libpconn/PConnection_usb.c:204 msgid "usb: trying to fill a non-empty buffer.\n" msgstr "usb: pokouším se naplnit neprázdný buffer.\n" +#~ msgid "Sync cancelled." +#~ msgstr "Sync přerušen." + #~ msgid "##### %s: Unknown argument type: 0x%02x\n" #~ msgstr "##### %s: Neznámý typ argumentu: 0x%02x\n" diff --git a/i18n/de.po b/i18n/de.po index 7e441e15..b0ccafd1 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ColdSync 1.1.4\n" -"POT-Creation-Date: 2002-03-10 17:49+0100\n" +"POT-Creation-Date: 2002-06-21 16:10+0200\n" "PO-Revision-Date: 2000-03-27 16:57+02:00\n" "Last-Translator: Philipp Matthias Hahn \n" "Language-Team: de \n" @@ -13,133 +13,137 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/config.c:819 +#: ../src/config.c:961 msgid "\t-F:\t\tForce fast sync.\n" msgstr "\t-F:\t\t\"Fast sync\" erzwingen.\n" -#: ../src/config.c:817 +#: ../src/config.c:959 msgid "\t-I:\t\tForce installation of new databases.\n" msgstr "\t-I:\t\tInstallation neuer Datenbanken erzwingen.\n" -#: ../src/config.c:823 +#: ../src/config.c:965 msgid "\t-P :\tSoftware protocol [default|full|simple|net].\n" msgstr "" -#: ../src/config.c:820 +#: ../src/config.c:962 msgid "\t-R:\t\tCheck ROM databases.\n" msgstr "\t-R:\t\tDatenbanken im ROM prüfen..\n" -#: ../src/config.c:818 +#: ../src/config.c:960 msgid "\t-S:\t\tForce slow sync.\n" msgstr "\t-S:\t\t\"Slow sync\" erzwingen.\n" -#: ../src/config.c:814 +#: ../src/config.c:956 msgid "\t-V:\t\tPrint version and exit.\n" msgstr "\t-V:\t\tVersionsnummer ausgeben und Programm beenden.\n" -#: ../src/config.c:829 +#: ../src/config.c:972 msgid "\t-d :\tSet debugging level.\n" msgstr "\t-d :\tDebug-Ausgabe einstellen\n" -#: ../src/config.c:815 +#: ../src/config.c:957 msgid "\t-f :\tRead configuration from \n" msgstr "\t-f :\tKonfiguration von lesen.\n" -#: ../src/config.c:813 +#: ../src/config.c:955 msgid "\t-h:\t\tPrint this help message and exit.\n" msgstr "\t-h:\t\tDiese Hilfe ausgeben und Programm beenden.\n" -#: ../src/config.c:826 +#: ../src/config.c:968 msgid "\t-l: :\tWrite error/debugging messages to .\n" msgstr "" -#: ../src/config.c:807 +#: ../src/config.c:949 msgid "\t-mI:\tInitialize.\n" msgstr "" -#: ../src/config.c:808 +#: ../src/config.c:950 msgid "" "\t-mb [database...]\n" "\t\tPerform a backup to .\n" msgstr "" -#: ../src/config.c:810 +#: ../src/config.c:952 msgid "" "\t-mr ...\n" "\t\tRestore or install new databases.\n" msgstr "" -#: ../src/config.c:806 +#: ../src/config.c:948 msgid "\t-ms:\tSynchronize (default).\n" msgstr "" -#: ../src/config.c:821 +#: ../src/config.c:971 +msgid "\t-n :\tChoice the named listen block.\n" +msgstr "" + +#: ../src/config.c:963 msgid "\t-p :\tListen on device .\n" msgstr "\t-p :\tGerät benutzen.\n" -#: ../src/config.c:825 +#: ../src/config.c:967 msgid "\t-s:\t\tLog error messages to syslog.\n" msgstr "" -#: ../src/config.c:822 +#: ../src/config.c:964 msgid "\t-t :\tPort type [serial|usb|net].\n" msgstr "\t-t :\tArt des Geräts [serial|usb|tcp].\n" -#: ../src/config.c:828 +#: ../src/config.c:970 msgid "\t-v:\t\tIncrease verbosity.\n" msgstr "" -#: ../src/config.c:816 +#: ../src/config.c:958 msgid "\t-z:\t\tInstall databases after sync.\n" msgstr "" -#: ../src/parser.y:327 ../src/parser.y:585 ../src/parser.y:1136 +#: ../src/parser.y:341 ../src/parser.y:658 ../src/parser.y:1229 #, c-format msgid "\tError near \"%s\"." msgstr "\tFehler bei \"%s\"." -#: ../src/parser.y:1165 +#: ../src/parser.y:1258 msgid "\tMissing ':'." msgstr "\tFehlender ':'." -#: ../src/parser.y:1182 +#: ../src/parser.y:1274 msgid "\tMissing ';'." msgstr "\tFehlendes ';'." -#: ../src/parser.y:1174 +#: ../src/parser.y:1266 msgid "\tMissing '{'." msgstr "\tFehlende '{'." -#: ../src/parser.y:750 +#: ../src/parser.y:823 #, c-format msgid "\tMissing argument name near \": %s\"." msgstr "\tFehlendes Argument nach \": %s\"." -#: ../src/parser.y:248 +#: ../src/parser.y:255 msgid "\tMissing listen block type." msgstr "\tFehlender Typ im 'listen' Abschnitt." -#: ../src/parser.y:829 +#: ../src/parser.y:919 #, c-format msgid "\tMissing option name near \"%s\"." msgstr "" -#: ../src/parser.y:415 +#: ../src/parser.y:461 #, c-format msgid "\tUnrecognized conduit flavor \"%s\"." msgstr "\tUnbekannter Conduit Typ \"%s\"." -#: ../src/parser.y:250 +#: ../src/parser.y:257 #, c-format msgid "\tUnrecognized listen type \"%s\"." msgstr "\tUnbekannter 'listen' Typ \"%s\"." -#: ../src/parser.y:449 +#: ../src/parser.y:495 #, c-format msgid "\tUnrecognized protocol: \"%s\"." msgstr "\tOption \"%s\" nicht erkannt." -#: ../src/config.c:874 +#: ../src/config.c:1017 #, c-format msgid "" "\n" @@ -148,7 +152,7 @@ msgstr "" "\n" "Voreingestellte globale Konfigurationsdatei: %s\n" -#: ../src/coldsync.c:386 +#: ../src/coldsync.c:396 #, c-format msgid "" "\n" @@ -157,7 +161,7 @@ msgstr "" "\n" "Log geschlossen an %s" -#: ../src/coldsync.c:1825 +#: ../src/coldsync.c:1787 msgid "" "\n" "This Palm already has user information that matches neither what's in your\n" @@ -175,7 +179,7 @@ msgstr "" "Ihre .coldsyncrc sollte etwa folgendes enthalten:\n" "\n" -#: ../src/config.c:869 +#: ../src/config.c:1012 msgid "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: strings are compared without regard\n" " to case, whenever possible.\n" @@ -183,11 +187,11 @@ msgstr "" "HAVE_STRCASECMP, HAVE_STRNCASECMP: Zeichenketten werden wenn möglich\n" "ohne Berücksichtigung von Groß-/Kleinschreibung verglichen.\n" -#: ../src/config.c:864 +#: ../src/config.c:1007 msgid " WITH_EFENCE: buffer overruns will cause a segmentation violation.\n" msgstr " WITH_EFENCE: Puffer-Überläufe lösen Schutzverletzungen aus.\n" -#: ../src/config.c:860 +#: ../src/config.c:1003 msgid " WITH_USB: USB support.\n" msgstr " WITH_USB: Mit USB-Unterstützung\n" @@ -196,130 +200,135 @@ msgstr " WITH_USB: Mit USB-Unterst msgid "\"%.*s\" record 0x%08lx has length 0.\n" msgstr "\"%s\" Datensatz 0x%08lx hat Länge 0.\n" -#: ../src/coldsync.c:1313 +#: ../src/coldsync.c:1414 #, c-format msgid "\"%s\" exists, but is not a directory." msgstr "%s existiert, ist aber kein Verzeichnis." #: ../libpconn/dlp_cmd.c:191 ../libpconn/dlp_cmd.c:281 -#: ../libpconn/dlp_cmd.c:380 ../libpconn/dlp_cmd.c:439 -#: ../libpconn/dlp_cmd.c:503 ../libpconn/dlp_cmd.c:626 -#: ../libpconn/dlp_cmd.c:846 ../libpconn/dlp_cmd.c:935 -#: ../libpconn/dlp_cmd.c:1028 ../libpconn/dlp_cmd.c:1098 -#: ../libpconn/dlp_cmd.c:1168 ../libpconn/dlp_cmd.c:1252 -#: ../libpconn/dlp_cmd.c:1326 ../libpconn/dlp_cmd.c:1402 -#: ../libpconn/dlp_cmd.c:1477 ../libpconn/dlp_cmd.c:1564 -#: ../libpconn/dlp_cmd.c:1665 ../libpconn/dlp_cmd.c:1767 -#: ../libpconn/dlp_cmd.c:1875 ../libpconn/dlp_cmd.c:1946 -#: ../libpconn/dlp_cmd.c:2037 ../libpconn/dlp_cmd.c:2136 -#: ../libpconn/dlp_cmd.c:2218 ../libpconn/dlp_cmd.c:2290 -#: ../libpconn/dlp_cmd.c:2345 ../libpconn/dlp_cmd.c:2397 -#: ../libpconn/dlp_cmd.c:2533 ../libpconn/dlp_cmd.c:2578 -#: ../libpconn/dlp_cmd.c:2652 ../libpconn/dlp_cmd.c:2711 -#: ../libpconn/dlp_cmd.c:2774 ../libpconn/dlp_cmd.c:2819 -#: ../libpconn/dlp_cmd.c:2875 ../libpconn/dlp_cmd.c:2928 -#: ../libpconn/dlp_cmd.c:3038 ../libpconn/dlp_cmd.c:3133 -#: ../libpconn/dlp_cmd.c:3229 ../libpconn/dlp_cmd.c:3321 -#: ../libpconn/dlp_cmd.c:3401 ../libpconn/dlp_cmd.c:3499 -#: ../libpconn/dlp_cmd.c:3600 ../libpconn/dlp_cmd.c:3682 +#: ../libpconn/dlp_cmd.c:392 ../libpconn/dlp_cmd.c:451 +#: ../libpconn/dlp_cmd.c:515 ../libpconn/dlp_cmd.c:638 +#: ../libpconn/dlp_cmd.c:858 ../libpconn/dlp_cmd.c:947 +#: ../libpconn/dlp_cmd.c:1040 ../libpconn/dlp_cmd.c:1110 +#: ../libpconn/dlp_cmd.c:1180 ../libpconn/dlp_cmd.c:1264 +#: ../libpconn/dlp_cmd.c:1338 ../libpconn/dlp_cmd.c:1414 +#: ../libpconn/dlp_cmd.c:1489 ../libpconn/dlp_cmd.c:1576 +#: ../libpconn/dlp_cmd.c:1677 ../libpconn/dlp_cmd.c:1779 +#: ../libpconn/dlp_cmd.c:1887 ../libpconn/dlp_cmd.c:1958 +#: ../libpconn/dlp_cmd.c:2049 ../libpconn/dlp_cmd.c:2148 +#: ../libpconn/dlp_cmd.c:2230 ../libpconn/dlp_cmd.c:2302 +#: ../libpconn/dlp_cmd.c:2357 ../libpconn/dlp_cmd.c:2409 +#: ../libpconn/dlp_cmd.c:2545 ../libpconn/dlp_cmd.c:2590 +#: ../libpconn/dlp_cmd.c:2664 ../libpconn/dlp_cmd.c:2723 +#: ../libpconn/dlp_cmd.c:2786 ../libpconn/dlp_cmd.c:2831 +#: ../libpconn/dlp_cmd.c:2887 ../libpconn/dlp_cmd.c:2940 +#: ../libpconn/dlp_cmd.c:3050 ../libpconn/dlp_cmd.c:3145 +#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3333 +#: ../libpconn/dlp_cmd.c:3413 ../libpconn/dlp_cmd.c:3511 +#: ../libpconn/dlp_cmd.c:3612 ../libpconn/dlp_cmd.c:3694 #, c-format msgid "##### %s: Unknown argument type: 0x%02x.\n" msgstr "##### %s: Unbekannter Argumenttyp: 0x%02x.\n" -#: ../libpconn/padp.c:484 +#: ../libpconn/padp.c:482 #, c-format msgid "##### Bad offset: wanted %d, got %d.\n" msgstr "##### Falscher Offset: erwartet %d, gefunden %d.\n" -#: ../libpconn/dlp.c:291 +#: ../libpconn/dlp.c:292 #, c-format msgid "##### Bad response ID: expected 0x%02x, got 0x%02x.\n" msgstr "##### Falsche Antwort-ID: erwartet 0x%02x, gefunden 0x%02x.\n" -#: ../libpconn/padp.c:802 +#: ../libpconn/padp.c:800 #, c-format msgid "##### Expected XID 0x%02x, got 0x%02x.\n" msgstr "##### Erwartete XID 0x%02x, gefunden 0x%02x.\n" -#: ../libpconn/dlp.c:282 +#: ../libpconn/dlp.c:283 msgid "##### Expected a DLP response, but this isn't one!\n" msgstr "##### DLP-Antwort erwartet, aber das ist keine!\n" -#: ../libpconn/padp.c:729 +#: ../libpconn/padp.c:727 msgid "##### Got an unexpected data packet. Sending an ACK to shut it up.\n" msgstr "" "##### Unerwartetes Datenpaket empfangen. Sende ACK um weiterzumachen.\n" -#: ../libpconn/padp.c:198 ../libpconn/padp.c:446 +#: ../libpconn/padp.c:198 ../libpconn/padp.c:444 msgid "##### I just got an unexpected ACK. I'm confused!\n" msgstr "##### Unerwartete Bestätigung (ťACKŤ) empfangen.\n" -#: ../libpconn/padp.c:471 +#: ../libpconn/padp.c:469 msgid "##### I wasn't expecting a new fragment. I'm confused!\n" msgstr "##### Kein neues Fragment erwartet.\n" -#: ../libpconn/padp.c:217 ../libpconn/padp.c:461 ../libpconn/padp.c:790 +#: ../libpconn/padp.c:217 ../libpconn/padp.c:459 ../libpconn/padp.c:788 #, c-format msgid "##### Unexpected packet type %d.\n" msgstr "##### Unerwarteter Pakettyp %d.\n" -#: lexer.l:460 +#: lexer.l:476 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: lexer.l:469 +#: lexer.l:485 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"${%.*s}\".\n" msgstr "" -#: lexer.l:474 +#: lexer.l:490 #, c-format msgid "" "%d: Unterminated variable reference near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: ../src/config.c:845 +#: ../src/config.c:988 #, c-format msgid "%s version %s.\n" msgstr "%s Version %s.\n" -#: ../src/parser.y:614 +#: ../src/parser.y:687 #, c-format msgid "%s: %d: Bogus creator \"%s\"." msgstr "%s: %d: Falscher Creator \"%s\"." -#: ../src/parser.y:638 +#: ../src/parser.y:711 #, c-format msgid "%s: %d: Bogus type \"%s\"." msgstr "%s: %d: Falscher Typ \"%s\"." -#: ../src/parser.y:498 +#: ../src/parser.y:549 #, c-format msgid "%s: %d: Can't add creator-type pair to list. This is very bad." msgstr "%s: %d: Kann kein Erzeuger-Typ-Paar der Liste hinzufügen." -#: ../src/parser.y:553 +#: ../src/parser.y:626 #, c-format msgid "%s: %d: Can't add preference to list. This is very bad." msgstr "%s: %d: Kann keine Einstellungen der Liste hinzufügen." -#: ../src/parser.y:287 +#: ../src/parser.y:590 +#, fuzzy, c-format +msgid "%s: %d: Cwd already defined." +msgstr "%s: %d: Warnung: Mehrfache Angabe der Geschwindigkeit." + +#: ../src/parser.y:301 #, c-format msgid "%s: %d: Device already defined." msgstr "%s: %d: Warnung: Das Gerät ist schon definiert." -#: ../src/parser.y:1038 +#: ../src/parser.y:1131 #, c-format msgid "%s: %d: Directory already defined." msgstr "%s: %d: Warnung: Das Verzeichnis gibt es schon." -#: ../src/parser.y:1008 +#: ../src/parser.y:1101 #, c-format msgid "" "%s: %d: Incorrect checksum\n" @@ -328,12 +337,12 @@ msgstr "" "%s: %d: Warnung: Ignoriere Prüfsumme\n" "für Seriennummer \"%s-%c\". Sollte \"%s-%c\" sein." -#: ../src/parser.y:514 +#: ../src/parser.y:565 #, c-format msgid "%s: %d: Path already defined." msgstr "%s: %d: Warnung: Das Verzeichnis wird schon benutzt." -#: ../src/parser.y:987 +#: ../src/parser.y:1080 #, c-format msgid "" "%s: %d: Serial number \"%s\" has no checksum.\n" @@ -342,179 +351,179 @@ msgstr "" "%s: %d: Warnung: Seriennummer \"%s\" hat keine Prüfsumme.\n" "Es sollte \"%s-%c\" heißen." -#: ../src/parser.y:956 +#: ../src/parser.y:1049 #, c-format msgid "%s: %d: Serial number already defined." msgstr "%s: %d: Warnung: Die Seriennummer erscheint mehrfach." -#: ../src/parser.y:301 +#: ../src/parser.y:315 #, c-format msgid "%s: %d: Speed already defined." msgstr "%s: %d: Warnung: Mehrfache Angabe der Geschwindigkeit." -#: ../src/parser.y:1074 +#: ../src/parser.y:1167 #, c-format msgid "%s: %d: Userid already defined." msgstr "%s: %d: Warnung: Mehrfache Angabe der Benutzerkennung." -#: ../src/parser.y:1059 +#: ../src/parser.y:1152 #, c-format msgid "%s: %d: Username already defined." msgstr "%s: %d: Warnung: Mehrfache Angabe des Benutzernamens." -#: ../libpconn/dlp.c:152 +#: ../libpconn/dlp.c:153 #, c-format msgid "%s: Can't allocate %ld-byte buffer.\n" msgstr "%s: Kann keinen %ld Byte großen Puffer anlegen.\n" -#: ../src/parser.y:851 +#: ../src/parser.y:941 #, c-format msgid "%s: Can't allocate PDA block." msgstr "%s: Kann keinen PDA block anlegen." -#: ../src/parser.y:708 +#: ../src/parser.y:781 #, c-format msgid "%s: Can't allocate conduit header." msgstr "%s: Kann keinen Conduit-Kopf anlegen." -#: ../src/parser.y:340 +#: ../src/parser.y:354 #, c-format msgid "%s: Can't allocate conduit_block!" msgstr "%s: Kann keinen conduit_block anlegen!" -#: ../src/parser.y:177 +#: ../src/parser.y:180 #, c-format msgid "%s: Can't allocate listen block." msgstr "%s: Kann keinen listen block anlegen." -#: ../src/GenericConduit.cc:1121 +#: ../src/GenericConduit.cc:1042 #, c-format msgid "%s: Can't allocate new record." msgstr "%s Fehler: Kann keinen neuen Datensatz erzeugen." -#: ../src/GenericConduit.cc:1221 +#: ../src/GenericConduit.cc:1142 #, c-format msgid "%s: Can't append new record to database: %d." msgstr "%s: Kann keinen neuen Datensatz an die Datenbank anhängen: %d." -#: lexer.l:366 +#: lexer.l:382 #, fuzzy, c-format msgid "%s: Can't append to qstring." msgstr "%s: Kann q-Zeichenkette nicht kopieren." -#: ../src/backup.c:716 +#: ../src/backup.c:695 #, c-format msgid "%s: Can't back up \"%s\"." msgstr "%s: Kann \"%s\" nicht sichern." -#: ../src/GenericConduit.cc:448 ../src/GenericConduit.cc:948 -#: ../src/GenericConduit.cc:1490 +#: ../src/GenericConduit.cc:424 ../src/GenericConduit.cc:886 +#: ../src/GenericConduit.cc:1386 #, c-format msgid "%s: Can't clean up database: %d." msgstr "%s Fehler: Kann Datenbank nicht aufräumen: %d." -#: ../src/GenericConduit.cc:1960 ../src/GenericConduit.cc:1998 -#: ../src/GenericConduit.cc:2132 +#: ../src/GenericConduit.cc:1832 ../src/GenericConduit.cc:1869 +#: ../src/GenericConduit.cc:1994 #, c-format msgid "%s: Can't copy record." msgstr "%s: Kann Datensatz nicht kopieren." -#: ../src/conduit.c:1541 +#: ../src/conduit.c:1597 #, c-format msgid "%s: Can't create file handle to child's stdin." msgstr "%s: Kann keine Datei mit Standardeingabe des Kindprozesses verbinden." -#: ../src/conduit.c:1569 +#: ../src/conduit.c:1625 #, c-format msgid "%s: Can't create file handle to child's stdout." msgstr "%s: Kann keine Datei mit Standardausgabe des Kindprozesses verbinden." -#: ../src/coldsync.c:3681 ../src/coldsync.c:3701 +#: ../src/coldsync.c:3049 ../src/coldsync.c:3069 #, c-format msgid "%s: Can't create staging file \"%s\"." msgstr "%s: Kann temporäre Datei \"%s\" nicht erzeugen." -#: ../src/coldsync.c:3691 +#: ../src/coldsync.c:3059 #, c-format msgid "%s: Can't create staging file name." msgstr "%s: Kann den Namen der temporären Datei nicht erzeugen." -#: ../src/GenericConduit.cc:608 +#: ../src/GenericConduit.cc:560 #, c-format msgid "%s: Can't download \"%s\"." msgstr "%s: Kann \"%s\" nicht herunterladen." -#: ../src/conduit.c:2057 +#: ../src/conduit.c:2137 #, c-format msgid "%s: Can't get child process status." msgstr "%s: Kann den Status des Kindprozesses nicht feststellen." -#: ../libpconn/PConnection_usb.c:505 +#: ../libpconn/PConnection_usb.c:528 #, c-format msgid "%s: Can't get information about USB device.\n" msgstr "%s: Kann keine Informationen über USB-Gerät bekommen.\n" -#: ../src/GenericConduit.cc:2094 ../src/GenericConduit.cc:2143 +#: ../src/GenericConduit.cc:1956 ../src/GenericConduit.cc:2004 #, c-format msgid "%s: Can't insert record 0x%08lx." msgstr "%s: Kann Datensatz 0x%08lx nicht einfügen." -#: ../src/GenericConduit.cc:2505 +#: ../src/GenericConduit.cc:2354 #, c-format msgid "%s: Can't load \"%s\"." msgstr "%s: Kann \"%s\" nicht laden." -#: ../src/install.c:270 ../src/install.c:526 +#: ../src/install.c:270 ../src/install.c:512 #, c-format msgid "%s: Can't load database \"%s\"." msgstr "%s: Kann Datenbank \"%s\" nicht laden." -#: ../src/conduit.c:1587 +#: ../src/conduit.c:1643 #, c-format msgid "%s: Can't make child's stdout be line-buffered." msgstr "" "%s: Kann Standardausgabe des Kindprozesses nicht auf line-buffered setzen." -#: lexer.l:135 lexer.l:148 lexer.l:228 lexer.l:303 lexer.l:518 lexer.l:568 +#: lexer.l:135 lexer.l:148 lexer.l:230 lexer.l:319 lexer.l:553 lexer.l:603 #, c-format msgid "%s: Can't make copy of string." msgstr "%s: Kann Zeichenkette nicht kopieren." -#: ../src/GenericConduit.cc:2495 ../src/archive.c:68 ../src/archive.c:127 -#: ../src/install.c:260 ../src/install.c:425 ../src/install.c:516 -#: ../src/parser.y:1223 +#: ../src/GenericConduit.cc:2344 ../src/archive.c:68 ../src/archive.c:127 +#: ../src/install.c:260 ../src/install.c:411 ../src/install.c:502 +#: ../src/parser.y:1315 #, c-format msgid "%s: Can't open \"%s\"." msgstr "%s: Kann \"%s\" nicht öffnen." -#: ../libpconn/PConnection_usb.c:717 +#: ../libpconn/PConnection_usb.c:740 #, c-format msgid "%s: Can't open \"%s\".\n" msgstr "%s: Kann \"%s\" nicht öffnen.\n" -#: ../src/GenericConduit.cc:298 ../src/GenericConduit.cc:318 -#: ../src/GenericConduit.cc:568 ../src/GenericConduit.cc:587 -#: ../src/GenericConduit.cc:1063 ../src/GenericConduit.cc:1082 +#: ../src/GenericConduit.cc:297 ../src/GenericConduit.cc:310 +#: ../src/GenericConduit.cc:534 ../src/GenericConduit.cc:546 +#: ../src/GenericConduit.cc:991 ../src/GenericConduit.cc:1003 #, c-format msgid "%s: Can't open \"%s\": %d." msgstr "%s: Kann \"%s\" nicht öffnen: %d: %d." -#: ../libpconn/PConnection_usb.c:491 +#: ../libpconn/PConnection_usb.c:514 #, c-format msgid "%s: Can't open USB device.\n" msgstr "%s: Kann USB-Gerät nicht öffnen.\n" -#: ../src/coldsync.c:2942 +#: ../src/coldsync.c:2249 #, c-format msgid "%s: Can't open directory \"%s\"." msgstr "%s: Kann Verzeichnis \"%s\" nicht öffnen." -#: ../src/install.c:403 ../src/install.c:468 +#: ../src/install.c:389 ../src/install.c:454 #, c-format msgid "%s: Can't open install directory." msgstr "%s: Kann Installationsverzeichnis nicht öffnen." -#: ../src/GenericConduit.cc:194 +#: ../src/GenericConduit.cc:200 #, c-format msgid "%s: Can't read %s backup file." msgstr "%s Fehler: Kann Backup-Datei %s nicht lesen." @@ -534,12 +543,12 @@ msgstr "%s: Kann Datenbank-Info nicht lesen: %d.\n" msgid "%s: Can't read sort block for %s: %d.\n" msgstr "%s: Kann Sort-Block für %s nicht lesen: %d.\n" -#: ../src/coldsync.c:3047 ../src/coldsync.c:3085 +#: ../src/coldsync.c:2354 ../src/coldsync.c:2392 #, c-format msgid "%s: Can't rename \"%s\" to \"%s\"." msgstr "%s: Kann \"%s\" nich zu \"%s\" umbenennen." -#: ../src/GenericConduit.cc:2564 +#: ../src/GenericConduit.cc:2413 #, c-format msgid "" "%s: Can't rename staging file.\n" @@ -548,13 +557,13 @@ msgstr "" "%s: Kann temporäre Datei nicht umbenennen.\n" "Backup liegt hoffentlich in \"%s\"." -#: ../src/GenericConduit.cc:468 ../src/GenericConduit.cc:967 -#: ../src/GenericConduit.cc:1510 +#: ../src/GenericConduit.cc:444 ../src/GenericConduit.cc:905 +#: ../src/GenericConduit.cc:1406 #, c-format msgid "%s: Can't reset sync flags: %d." msgstr "%s: Kann Synchronisierungsmarken nicht zurücksetzen: %d." -#: ../src/restore.c:120 +#: ../src/restore.c:129 #, c-format msgid "%s: Can't restore %s: it is opened by another application." msgstr "" @@ -565,12 +574,17 @@ msgstr "" msgid "%s: Can't seek to end of file." msgstr "%s: Kann nicht auf Ende der Datei positionieren." -#: ../src/conduit.c:373 +#: ../src/parser.y:909 +#, fuzzy, c-format +msgid "%s: Can't set option.\n" +msgstr "%s: Kann %s nicht öffnen\n" + +#: ../src/conduit.c:390 #, c-format msgid "%s: Can't set signal handler." msgstr "%s: Kann Signal-Handler nicht setzen." -#: ../src/conduit.c:427 +#: ../src/conduit.c:445 #, c-format msgid "%s: Can't spawn conduit." msgstr "%s: Kann Conduit nicht starten." @@ -585,8 +599,8 @@ msgstr "%s: Kann AppInfo-Block f msgid "%s: Can't write archive file header." msgstr "%s: Kann Kopf der Archivdatei nicht schreiben." -#: ../src/GenericConduit.cc:419 ../src/GenericConduit.cc:925 -#: ../src/GenericConduit.cc:1461 +#: ../src/GenericConduit.cc:402 ../src/GenericConduit.cc:870 +#: ../src/GenericConduit.cc:1364 #, c-format msgid "%s: Can't write backup file." msgstr "%s: Kann Backup-Datei nicht schreiben." @@ -616,7 +630,7 @@ msgstr "%s: Kann Indexeintrag f msgid "%s: Can't write sort block for \"%.*s\".\n" msgstr "%s: Kann Sort-Block für \"%.*s\" nicht schreiben.\n" -#: ../src/GenericConduit.cc:2552 +#: ../src/GenericConduit.cc:2401 #, c-format msgid "%s: Can't write staging file \"%s\"." msgstr "%s: Kann temporäre Datei \"%s\" nicht schreiben." @@ -626,12 +640,12 @@ msgstr "%s: Kann tempor msgid "%s: Can't write the two useless NULs to \"%.*s\".\n" msgstr "%s: Kann die zwei nutzlosen NULlen nach \"%.*s\" nicht schreiben.\n" -#: ../src/conduit.c:1880 +#: ../src/conduit.c:1960 #, c-format msgid "%s: Conduit exited unexpectedly." msgstr "%s: Conduit unerwartet beendet." -#: ../src/conduit.c:677 +#: ../src/conduit.c:698 #, c-format msgid "" "%s: Conduit handler is in an inconsistent state at\n" @@ -642,7 +656,7 @@ msgstr "" "%s, line %d." # Again, send original message to the maintainer -#: ../src/conduit.c:1871 +#: ../src/conduit.c:1951 #, c-format msgid "" "%s: Conduit is running happily, but hasn't printed anything.\n" @@ -653,32 +667,32 @@ msgstr "" "%s: Conduit is running happily, but hasn't printed anything.\n" "And yet, I was notified. This is a bug. Please notify the maintainer." -#: ../libpconn/PConnection_usb.c:625 +#: ../libpconn/PConnection_usb.c:648 #, c-format msgid "%s: Could not find HotSync endpoint on Visor.\n" msgstr "%s: Konnte keinen Endpunkt für HotSync auf dem Visor finden.\n" -#: ../src/conduit.c:1681 +#: ../src/conduit.c:1538 #, fuzzy, c-format msgid "%s: Couldn't change directory to \"%s\"\n" msgstr "%s: Kann Verzeichnis \"%s\" nicht öffnen." -#: ../src/restore.c:109 +#: ../src/restore.c:118 #, c-format msgid "%s: Database %s doesn't exist, yet it is open. Huh?" msgstr "%s: Die Datenbank %s existiert nicht, ist aber geöffnet." -#: ../src/install.c:335 ../src/install.c:580 +#: ../src/install.c:328 ../src/install.c:566 #, c-format msgid "%s: Error deleting \"%s\"." msgstr "%s: Fehler beim Löschen von \"%s\"." -#: ../src/GenericConduit.cc:1355 ../src/GenericConduit.cc:1394 +#: ../src/GenericConduit.cc:1267 ../src/GenericConduit.cc:1304 #, c-format msgid "%s: Error deleting record 0x%08lx: %d." msgstr "%s: Fehler beim Löschen des Satzes 0x%08lx: %d." -#: ../src/conduit.c:788 +#: ../src/conduit.c:809 #, c-format msgid "%s: Error header wrong length %ld." msgstr "" @@ -688,32 +702,32 @@ msgstr "" msgid "%s: Error in DlpRPC().\n" msgstr "%s: Fehler in DlpRPC().\n" -#: ../src/conduit.c:708 +#: ../src/conduit.c:729 #, c-format msgid "%s: Error in select()." msgstr "%s: Fehler in select()." -#: ../src/conduit.c:774 +#: ../src/conduit.c:795 #, c-format msgid "%s: Error reading SPC request from conduit." msgstr "%s: Fehler beim Lesen der SPC Anfrage vom Conduit." -#: ../src/conduit.c:847 +#: ../src/conduit.c:868 #, c-format msgid "%s: Error reading SPC request." msgstr "%s: Fehler beim Lesen der SPC Anfrage." -#: ../src/conduit.c:975 +#: ../src/conduit.c:996 #, c-format msgid "%s: Error sending SPC response data." msgstr "%s: Fehler beim Senden der SPC Antwortsdaten." -#: ../libpconn/padp.c:757 +#: ../libpconn/padp.c:755 #, c-format msgid "%s: Error sending dummy ACK. This is serious.\n" msgstr "%s: Schwerer Fehler beim Sender eines dummy ACK.\n" -#: ../src/install.c:356 ../src/install.c:612 +#: ../src/install.c:342 ../src/install.c:584 #, c-format msgid "%s: Error uploading \"%s\"." msgstr "%s: Fehler beim Heraufladen von \"%s\"." @@ -723,7 +737,7 @@ msgstr "%s: Fehler beim Heraufladen von \"%s\"." msgid "%s: Error: dlp.write returned %d.\n" msgstr "%s: Fehler: dlp.write lieferte %d.\n" -#: ../src/conduit.c:353 +#: ../src/conduit.c:370 #, c-format msgid "" "%s: I just got file descriptor %d. There appears to be a file\n" @@ -733,20 +747,20 @@ msgstr "" "%s: I just got file descriptor %d. There appears to be a file\n" "descriptor leak." -#: ../src/GenericConduit.cc:1347 ../src/GenericConduit.cc:1386 -#: ../src/GenericConduit.cc:1630 ../src/GenericConduit.cc:1680 -#: ../src/GenericConduit.cc:1846 ../src/GenericConduit.cc:2198 -#: ../src/GenericConduit.cc:2240 +#: ../src/GenericConduit.cc:1261 ../src/GenericConduit.cc:1298 +#: ../src/GenericConduit.cc:1524 ../src/GenericConduit.cc:1573 +#: ../src/GenericConduit.cc:1728 ../src/GenericConduit.cc:2058 +#: ../src/GenericConduit.cc:2099 #, c-format msgid "%s: Lost connection to Palm." msgstr "%s: Verbindung zum Palm verloren." -#: ../src/config.c:721 +#: ../src/config.c:807 #, c-format msgid "%s: Missing mode string. This should never happen." msgstr "%s: Fehlender Modus. Das sollte nicht passieren." -#: ../src/parser.y:352 +#: ../src/parser.y:398 #, c-format msgid "" "%s: No `type:' line seen\n" @@ -755,20 +769,25 @@ msgstr "" "%s: Warnung: Keine 'type:' Zeile\n" "in der Definition von \"%s\"." -#: ../src/conduit.c:1663 +#: ../src/conduit.c:1719 #, c-format msgid "%s: No executable \"%s\" in $CONDUIT_PATH or $CONDUITDIR.\n" msgstr "" -#: ../src/config.c:1100 ../src/config.c:1136 ../src/config.c:1158 -#: ../src/pref.c:234 ../src/pref.c:299 lexer.l:705 +#: ../src/conduit.c:1757 +#, fuzzy, c-format +msgid "%s: No home directory for %s.\n" +msgstr "%s: Kann Verzeichnis \"%s\" nicht öffnen." + +#: ../src/config.c:1243 ../src/config.c:1279 ../src/config.c:1301 +#: ../src/pref.c:220 ../src/pref.c:278 lexer.l:506 lexer.l:740 #, c-format msgid "%s: Out of memory." msgstr "%s: Kein Speicher mehr." -#: ../libpconn/dlp_cmd.c:1284 ../libpconn/dlp_cmd.c:1435 -#: ../libpconn/dlp_cmd.c:2183 ../libpconn/dlp_cmd.c:2437 -#: ../libpconn/dlp_cmd.c:3356 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 +#: ../libpconn/dlp_cmd.c:1296 ../libpconn/dlp_cmd.c:1447 +#: ../libpconn/dlp_cmd.c:2195 ../libpconn/dlp_cmd.c:2449 +#: ../libpconn/dlp_cmd.c:3368 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 #: ../libpdb/pdb.c:1090 ../libpdb/pdb.c:1137 ../libpdb/pdb.c:1448 #: ../libpdb/pdb.c:1563 ../libpdb/pdb.c:1676 ../libpdb/pdb.c:1840 #: ../libpdb/pdb.c:1981 ../src/backup.c:138 ../src/backup.c:187 @@ -778,24 +797,24 @@ msgstr "%s: Kein Speicher mehr." msgid "%s: Out of memory.\n" msgstr "%s: Kein Speicher mehr.\n" -#: ../src/conduit.c:361 +#: ../src/conduit.c:378 #, c-format msgid "%s: Too many file descriptors. Aborting." msgstr "%s: Zu viele offene Dateien. Abbruch." -#: ../src/GenericConduit.cc:1638 ../src/GenericConduit.cc:1688 -#: ../src/GenericConduit.cc:1854 ../src/GenericConduit.cc:2206 -#: ../src/GenericConduit.cc:2248 +#: ../src/GenericConduit.cc:1533 ../src/GenericConduit.cc:1581 +#: ../src/GenericConduit.cc:1737 ../src/GenericConduit.cc:2067 +#: ../src/GenericConduit.cc:2107 #, c-format msgid "%s: Warning: Can't delete record 0x%08lx: %d." msgstr "%s: Warnung: Kann Datensatz 0x%08lx nicht löschen: %d." -#: ../libpconn/PConnection_usb.c:543 +#: ../libpconn/PConnection_usb.c:566 #, c-format msgid "%s: Warning: Unexpected USB vendor ID %#x.\n" msgstr "%s: Warnung: Unbekannter USB-Hersteller ID %#x.\n" -#: ../libpconn/slp.c:250 +#: ../libpconn/slp.c:248 #, c-format msgid "%s: bad checksum: expected 0x%02x, got 0x%02x.\n" msgstr "%s: fehlerhafte Prüfsumme. Erwartet 0x%02x, gefunden 0x%02x.\n" @@ -829,7 +848,7 @@ msgstr "" "%s: Kann neue Backup-Datei %s nicht erzeugen.\n" "Existiert die Datei schon?" -#: ../src/backup.c:668 +#: ../src/backup.c:647 #, c-format msgid "%s: can't write database \"%s\" to \"%s\"." msgstr "%s: Kann Datenbank \"%s\" nicht nach \"%s\" schreiben." @@ -849,27 +868,32 @@ msgstr "%s. Kann Kopf der Datens msgid "%s: error reading record index entry for \"%.*s\" (%d bytes): %d.\n" msgstr "%s: Fehler beim Lesen der Indexeintrags für \"%.*s\" (%d Bytes): %d.\n" -#: ../src/conduit.c:942 +#: ../src/conduit.c:963 #, c-format msgid "%s: error sending SPC response header." msgstr "%s: Fehler beim Sender des SPC Antwortkopfes." -#: ../src/conduit.c:1694 +#: ../src/conduit.c:1774 #, fuzzy, c-format msgid "%s: execv(%s) failed and returned %d." msgstr "%s: excevp(%s) gescheitert, Rückgabewert %d." -#: ../src/config.c:1224 lexer.l:731 +#: ../src/conduit.c:1761 +#, fuzzy, c-format +msgid "%s: getpwuid(%d) failed.\n" +msgstr "%s: realloc gescheitert\n" + +#: ../src/config.c:1367 lexer.l:767 #, c-format msgid "%s: realloc(%d) failed." msgstr "%s: realloc gescheitert." -#: ../src/conduit.c:722 +#: ../src/conduit.c:743 #, c-format msgid "%s: select() returned 0. I'm puzzled." msgstr "%s: select() lieferte 0." -#: ../src/conduit.c:1817 +#: ../src/conduit.c:1897 #, c-format msgid "" "%s: select() returned 0. This should never happen. Please notify the " @@ -879,27 +903,27 @@ msgstr "" "Meldung an den Entwickler des Programms.\n" "%s: select() returned 0. This should never happen." -#: ../src/conduit.c:1774 +#: ../src/conduit.c:1854 #, c-format msgid "%s: select() returned an unexpected error. This should never happen." msgstr "%s: select() gabe einen unerwarteten Fehler zurück." -#: ../src/config.c:1025 +#: ../src/config.c:1168 #, c-format msgid "%s: socket() returned %d." msgstr "%s: socket() lieferte %d." -#: ../libpconn/PConnection_usb.c:662 +#: ../libpconn/PConnection_usb.c:685 #, c-format msgid "%s: unexpected response %d to GetBytesAvailable.\n" msgstr "%s: Unerwartete Antwort %d auf GetBytesAvailable.\n" -#: ../libpconn/PConnection.c:124 +#: ../libpconn/PConnection.c:125 #, c-format msgid "%s: unknown listen type %d.\n" msgstr "%s: Unbekannter Ťlisten typeť %d.\n" -#: lexer.l:632 +#: lexer.l:667 #, c-format msgid "" "%s: unknown start state %d.\n" @@ -909,18 +933,18 @@ msgstr "" "%s: unknown start state %d.\n" "Fix 'lexer.l'." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:303 -#: ../src/GenericConduit.cc:323 ../src/GenericConduit.cc:343 -#: ../src/GenericConduit.cc:423 ../src/GenericConduit.cc:452 -#: ../src/GenericConduit.cc:480 ../src/GenericConduit.cc:492 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:302 +#: ../src/GenericConduit.cc:315 ../src/GenericConduit.cc:328 +#: ../src/GenericConduit.cc:406 ../src/GenericConduit.cc:428 +#: ../src/GenericConduit.cc:454 ../src/GenericConduit.cc:465 msgid "(1st)" msgstr "(1.)" -#: ../src/coldsync.c:1090 ../src/coldsync.c:2679 +#: ../src/coldsync.c:1084 msgid "*Cancelled*\n" msgstr "*Abgebrochen*\n" -#: ../libpconn/padp.c:676 +#: ../libpconn/padp.c:674 msgid "ACK Timeout. Attempting to resend.\n" msgstr "Zeit abgelaufen. Neuer Sendeversuch.\n" @@ -929,9 +953,9 @@ msgstr "Zeit abgelaufen. Neuer Sendeversuch.\n" msgid "Backing up \"%s\"" msgstr "Sichere \"%s\"" -#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:596 -#: ../src/backup.c:628 ../src/backup.c:655 ../src/backup.c:675 -#: ../src/backup.c:686 ../src/coldsync.c:1415 +#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:589 +#: ../src/backup.c:614 ../src/backup.c:634 ../src/backup.c:654 +#: ../src/backup.c:665 ../src/coldsync.c:1478 msgid "Backup" msgstr "Backup" @@ -939,7 +963,7 @@ msgstr "Backup" msgid "Bad file descriptor" msgstr "Fehlerhafter Dateideskriptor" -#: ../src/coldsync.c:898 ../src/coldsync.c:2502 +#: ../src/coldsync.c:945 #, c-format msgid "CacheFromConduits() returned %d." msgstr "CacheFromConduits() lieferte %d zurück." @@ -948,15 +972,15 @@ msgstr "CacheFromConduits() lieferte %d zur msgid "Can't allocate list of record IDs.\n" msgstr "Kann Liste der Datensatz-IDs nicht anlegen.\n" -#: ../src/config.c:467 ../src/config.c:508 +#: ../src/config.c:550 ../src/config.c:591 msgid "Can't allocate listen block." msgstr "Kann Ťlisten blockť nicht anlegen." -#: ../src/config.c:320 +#: ../src/config.c:394 msgid "Can't allocate new conduit block." msgstr "Kann keinen neuen conduit_block anlegen." -#: ../src/config.c:297 +#: ../src/config.c:370 msgid "Can't allocate new configuration." msgstr "Kann keine neue Konfiguration erzeugen." @@ -964,62 +988,60 @@ msgstr "Kann keine neue Konfiguration erzeugen." msgid "Can't allocate new connection.\n" msgstr "Kann keine neue Verbindung anlegen.\n" -#: ../src/coldsync.c:566 ../src/coldsync.c:1360 ../src/coldsync.c:1507 -#: ../src/coldsync.c:1650 ../src/coldsync.c:2103 +#: ../src/coldsync.c:562 msgid "Can't allocate struct Palm." msgstr "Kann Datenstruktur Palm nicht anlegen." -#: ../src/coldsync.c:557 ../src/coldsync.c:1352 ../src/coldsync.c:1499 -#: ../src/coldsync.c:1642 ../src/coldsync.c:2094 +#: ../src/coldsync.c:553 msgid "Can't connect to Palm." msgstr "Keine Verbindung zum Palm." -#: ../libpconn/PConnection_net.c:411 +#: ../libpconn/PConnection_net.c:449 msgid "Can't connect to server.\n" msgstr "Keine Verbindung zum Server.\n" -#: ../src/GenericConduit.cc:720 ../src/GenericConduit.cc:2085 +#: ../src/GenericConduit.cc:672 ../src/GenericConduit.cc:1947 msgid "Can't copy a new record." msgstr "Kann neuen Datensatz nicht kopieren." -#: ../src/coldsync.c:2299 +#: ../src/coldsync.c:2140 msgid "Can't copy config file name" msgstr "Kann Konfigurationsdatei nicht kopieren" -#: ../src/config.c:475 ../src/config.c:516 +#: ../src/config.c:558 ../src/config.c:599 msgid "Can't copy string." msgstr "Kann Zeichenkette nicht kopieren." -#: ../src/GenericConduit.cc:2436 +#: ../src/GenericConduit.cc:2285 #, c-format msgid "Can't create \"%s\"." msgstr "Kann \"%s\" nicht erzeugen." -#: ../src/config.c:1627 +#: ../src/config.c:1813 #, c-format msgid "Can't create archive directory %s." msgstr "Kann Aufbewahrungsverzeichnis %s nicht anlegen." -#: ../src/config.c:1609 +#: ../src/config.c:1795 #, c-format msgid "Can't create attic directory %s." msgstr "Kann Verzeichnis %s für alte Einträge nicht anlegen." -#: ../src/config.c:1591 +#: ../src/config.c:1777 #, c-format msgid "Can't create backup directory %s." msgstr "Kann Sicherungsverzeichnis %s nicht anlegen." -#: ../src/config.c:1573 +#: ../src/config.c:1759 #, c-format msgid "Can't create base sync directory %s." msgstr "Kann Basisverzeichnis %s zum Synchronisieren nicht anelegen." -#: ../src/coldsync.c:824 ../src/coldsync.c:2422 +#: ../src/coldsync.c:658 msgid "Can't create connection to forwarding host." msgstr "Keine Verbindung zum weiterleitenden Rechner." -#: ../src/config.c:1645 +#: ../src/config.c:1831 #, c-format msgid "Can't create install directory %s." msgstr "Kann Installationsverzeichnis %s nicht anlegen." @@ -1028,19 +1050,19 @@ msgstr "Kann Installationsverzeichnis %s nicht anlegen." msgid "Can't download record or resource index.\n" msgstr "Kann Daten- oder Ressource-Index nicht übertragen.\n" -#: ../src/coldsync.c:461 +#: ../src/coldsync.c:471 msgid "Can't dup(stderr)." msgstr "Kann die Standartfehlerausgabe nicht duplizieren." -#: ../src/coldsync.c:836 ../src/coldsync.c:2434 +#: ../src/coldsync.c:675 msgid "Can't establish connection with forwarding host." msgstr "Keine Verbindung zum weiterleitenden Rechner." -#: ../src/coldsync.c:975 ../src/coldsync.c:2568 +#: ../src/coldsync.c:1020 msgid "Can't fetch list of databases." msgstr "Kann Liste der Datenbanken nicht holen." -#: ../src/coldsync.c:1195 ../src/coldsync.c:2775 +#: ../src/coldsync.c:1164 #, c-format msgid "Can't fetch preference 0x%08lx/%d." msgstr "Kann Einstellung 0x%08lx/%d nicht holen." @@ -1065,60 +1087,59 @@ msgstr "Kann AppInfo-Block in \"%.*s\" nicht finden!\n" msgid "Can't find the sort block in \"%.*s\"!\n" msgstr "Kann Sort-Block in \"%.*s\" nicht finden!\n" -#: ../src/coldsync.c:232 +#: ../src/coldsync.c:235 msgid "Can't get host ID." msgstr "Kann Rechner-ID nicht feststellen." -#: ../src/coldsync.c:784 ../src/coldsync.c:2383 +#: ../src/coldsync.c:623 msgid "Can't get host addresses." msgstr "Kann Rechner-Adresse nicht feststellen." -#: ../src/config.c:899 +#: ../src/config.c:1042 msgid "Can't get host name." msgstr "Kann Rechnernamen nicht bestimmen." -#: ../src/coldsync.c:909 ../src/coldsync.c:2513 +#: ../src/coldsync.c:955 msgid "Can't get last sync PC from Palm" msgstr "Kann letzten Synchronisationsrechner nicht feststellen" -#: ../src/spalm.c:451 +#: ../src/spalm.c:416 msgid "Can't get location of serial number." msgstr "Kann die Position der Seriennummer nicht feststellen." -#: ../src/conduit.c:503 +#: ../src/conduit.c:524 msgid "Can't get preference item." msgstr "Kann Benutzerdaten nicht feststellen." -#: ../src/spalm.c:224 +#: ../src/spalm.c:211 msgid "Can't get system info." msgstr "Kann System-Daten nicht feststellen." -#: ../src/coldsync.c:641 ../src/coldsync.c:1764 +#: ../src/coldsync.c:1288 ../src/coldsync.c:1727 msgid "Can't get user ID from Palm." msgstr "Kann Benutzer-ID nicht feststellen." -#: ../src/config.c:373 ../src/spalm.c:324 +#: ../src/config.c:447 ../src/spalm.c:304 msgid "Can't get user info." msgstr "Kann Benutzerdaten nicht feststellen." -#: ../src/coldsync.c:694 +#: ../src/coldsync.c:1340 msgid "Can't get user name from Palm." msgstr "Kann Benutzernamen nicht feststellen." -#: ../src/config.c:1799 +#: ../src/config.c:1985 msgid "Can't get user's full name." msgstr "Kann vollständigen Benutzernamen nicht feststellen." -#: ../src/coldsync.c:1010 ../src/coldsync.c:1229 ../src/coldsync.c:2603 -#: ../src/coldsync.c:2809 +#: ../src/coldsync.c:731 msgid "Can't install new files." msgstr "Fehler beim Installieren neuer Dateien." -#: ../src/coldsync.c:225 ../src/coldsync.c:2316 +#: ../src/coldsync.c:228 ../src/coldsync.c:2156 msgid "Can't load configuration." msgstr "Kann keine neue Konfiguration erzeugen." -#: ../src/install.c:434 +#: ../src/install.c:420 msgid "Can't load header." msgstr "Kann Kopfteil nicht laden." @@ -1131,11 +1152,11 @@ msgstr "Kann Kopfteil nicht laden.\n" msgid "Can't load record list header for \"%.*s\".\n" msgstr "" -#: ../src/coldsync.c:589 +#: ../src/coldsync.c:1236 msgid "Can't look up Palm." msgstr "Kann Palm nicht finden." -#: ../src/config.c:908 +#: ../src/config.c:1051 msgid "Can't look up my address." msgstr "Kann eigene Adresse nicht finden." @@ -1144,7 +1165,7 @@ msgstr "Kann eigene Adresse nicht finden." msgid "Can't open %s." msgstr "Kann %s nicht öffnen." -#: ../src/backup.c:593 +#: ../src/backup.c:586 msgid "Can't open backup conduit." msgstr "Kann Backup-Conduit nicht öffnen." @@ -1153,26 +1174,25 @@ msgstr "Kann Backup-Conduit nicht msgid "Can't open conduit for \"%s\": %d.\n" msgstr "Kann Conduit für \"%s\" nicht öffnen: %d.\n" -#: ../src/coldsync.c:548 ../src/coldsync.c:1344 ../src/coldsync.c:1491 -#: ../src/coldsync.c:1634 ../src/coldsync.c:2085 +#: ../src/coldsync.c:544 msgid "Can't open connection." msgstr "Fehler: Kann Verbindung nicht öffnen." -#: ../src/backup.c:624 +#: ../src/backup.c:610 #, c-format msgid "Can't open database \"%s\"." msgstr "Kann Datenbank \"%s\" nicht öffnen." -#: ../src/coldsync.c:475 +#: ../src/coldsync.c:485 #, c-format msgid "Can't open log file \"%s\"." msgstr "Kann Log \"%s\" nicht öffnen." -#: ../src/coldsync.c:489 +#: ../src/coldsync.c:499 msgid "Can't open log file on stderr." msgstr "Kann Logdatei nicht aus stderr öffnen." -#: ../src/coldsync.c:178 +#: ../src/coldsync.c:181 msgid "Can't parse command-line arguments." msgstr "Kann Kommandozeilenparameter nicht analysieren." @@ -1186,16 +1206,16 @@ msgstr "Kann %s nicht lesen." msgid "Can't read AppInfo block for \"%.*s\".\n" msgstr "Kann AppInfo-Block für \"%.*s\" nicht lesen: %d.\n" -#: ../src/spalm.c:300 +#: ../src/spalm.c:280 msgid "Can't read NetSync info." msgstr "Fehler beim Lesen der NetSync-Informationen." -#: ../src/restore.c:227 +#: ../src/restore.c:222 #, c-format msgid "Can't read contents of directory %s." msgstr "Kann Inhalt von Verzeichnis %s nicht lesen." -#: ../src/coldsync.c:1659 +#: ../src/coldsync.c:1623 msgid "Can't read length of serial number." msgstr "Fehler: Kann Länge der Seriennummer nicht lesen." @@ -1243,7 +1263,7 @@ msgstr "Kann Ressource-Index f msgid "Can't read resources for \"%.*s\".\n" msgstr "" -#: ../src/coldsync.c:1671 ../src/spalm.c:484 +#: ../src/coldsync.c:1635 ../src/spalm.c:442 msgid "Can't read serial number." msgstr "Kann die Seriennummer nicht lesen." @@ -1252,84 +1272,88 @@ msgstr "Kann die Seriennummer nicht lesen." msgid "Can't read sort block for \"%.*s\".\n" msgstr "Kann Sort-Block für \"%.*s\" nicht lesen: %d.\n" -#: ../src/coldsync.c:156 ../src/coldsync.c:161 ../src/coldsync.c:166 +#: ../src/coldsync.c:159 ../src/coldsync.c:164 ../src/coldsync.c:169 #, c-format msgid "Can't reserve file descriptor %d." msgstr "Fehler: Kann Dateidescriptor %d nicht belegen." -#: ../src/spalm.c:1006 +#: ../src/spalm.c:983 msgid "Can't resize palm->dblist." msgstr "Fehler beim Anpassen von palm->dblist." -#: ../src/coldsync.c:793 ../src/coldsync.c:2392 +#: ../src/coldsync.c:630 msgid "Can't resolve forwarding address." msgstr "Kann Weiterleitungsadresse nicht auslösen." -#: ../src/coldsync.c:1534 ../src/coldsync.c:1557 +#: ../src/coldsync.c:1549 ../src/coldsync.c:1572 msgid "Can't restore directory." msgstr "Kann Verzeichnis nicht wiederherstellen." -#: ../src/coldsync.c:2281 +#: ../src/coldsync.c:2123 msgid "Can't setuid" msgstr "Kann Benutzer nicht ändern." -#: ../src/coldsync.c:1161 ../src/coldsync.c:2741 +#: ../src/coldsync.c:1132 msgid "Can't write user info." msgstr "Kann Benutzerdaten nicht schreiben." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:522 -#: ../src/GenericConduit.cc:1019 ../src/backup.c:581 ../src/restore.c:181 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:495 +#: ../src/GenericConduit.cc:954 ../src/backup.c:581 ../src/restore.c:176 msgid "Cancelled" msgstr "Abgebrochen" -#: ../src/backup.c:576 ../src/coldsync.c:1380 ../src/coldsync.c:1428 -#: ../src/coldsync.c:1527 ../src/coldsync.c:1550 ../src/conduit.c:1183 -#: ../src/conduit.c:1243 ../src/restore.c:274 +#: ../src/backup.c:576 ../src/coldsync.c:1442 ../src/coldsync.c:1491 +#: ../src/coldsync.c:1541 ../src/coldsync.c:1564 ../src/conduit.c:1226 +#: ../src/conduit.c:1287 ../src/restore.c:269 msgid "Cancelled by Palm." msgstr "Vom Palm abgebrochen." -#: ../src/config.c:850 +#: ../src/config.c:993 msgid "ColdSync homepage at http://www.ooblick.com/software/coldsync/\n" msgstr "ColdSync Seite bei http://www.ooblick.com/software/coldsync/\n" -#: ../src/config.c:856 +#: ../src/config.c:999 msgid "Compile-type options:\n" msgstr "Übersetzer-Optionen:\n" -#: ../src/conduit.c:1189 ../src/conduit.c:1249 +#: ../src/conduit.c:1232 ../src/conduit.c:1293 #, c-format msgid "Conduit %s exited abnormally. Continuing." msgstr "" -#: ../src/conduit.c:1169 ../src/conduit.c:1229 +#: ../src/conduit.c:1212 ../src/conduit.c:1273 #, c-format msgid "Conduit %s is not a %s conduit." msgstr "Conduit %s ist kein %s Conduit." -#: ../src/coldsync.c:1103 ../src/coldsync.c:2692 +#: ../src/coldsync.c:846 msgid "Conduit failed for unknown reason." msgstr "Das Conduit aus unbekannten Gründen fehl." -#: ../src/config.c:384 +#: ../src/config.c:458 #, c-format msgid "Config file \"%s\" doesn't exist." msgstr "Konfigurationsdatei \"%s\" existiert nicht." -#: ../src/coldsync.c:1244 ../src/coldsync.c:1454 ../src/coldsync.c:1575 -#: ../src/coldsync.c:1960 ../src/coldsync.c:2824 +#: ../src/coldsync.c:581 msgid "Couldn't disconnect." msgstr "Fehler beim Trennen der Verbindung." -#: ../src/config.c:336 +#: ../src/config.c:1719 +#, fuzzy, c-format +msgid "Couldn't find the requested listen block: \"%s\"" +msgstr "Kann Sort-Block in \"%.*s\" nicht finden!\n" + +#: ../src/config.c:410 msgid "Couldn't initialize configuration." msgstr "Fehler beim Laden der Konfiguration." -#: ../src/config.c:359 ../src/config.c:418 +#: ../src/config.c:433 ../src/config.c:492 #, c-format msgid "Couldn't read configuration file \"%s\"." msgstr "Fehler beim Lesen der Konfigurationsdatei \"%s\"." -#: ../src/conduit.c:619 +#: ../src/conduit.c:640 msgid "Couldn't send header to conduit." msgstr "Fehler beim Senden des Kopfes zum Conduit." @@ -1337,20 +1361,30 @@ msgstr "Fehler beim Senden des Kopfes zum Conduit." msgid "DlpReadRecordIDList() read 0 records. What happened?\n" msgstr "DlpReadRecordIDList() hat keine Datensätze gelesen.\n" -#: ../libpconn/dlp_cmd.c:1805 +#: ../libpconn/dlp_cmd.c:1817 msgid "DlpWriteRecord: Can't allocate output buffer.\n" msgstr "DlpWriteRecord: Kann keine Puffer anlegen.\n" -#: ../src/coldsync.c:1900 ../src/coldsync.c:3217 +#: ../src/coldsync.c:1828 ../src/coldsync.c:2599 #, c-format msgid "DlpWriteUserInfo failed: %d." msgstr "DlpWriteUserInfo gescheitert: %d." -#: ../src/coldsync.c:930 ../src/coldsync.c:934 +#: ../src/coldsync.c:975 +#, fuzzy +msgid "Doing a (forced) fast sync." +msgstr "Schnelle Synchronisation." + +#: ../src/coldsync.c:973 +#, fuzzy +msgid "Doing a (forced) slow sync." +msgstr "Langsame Synchronisation." + +#: ../src/coldsync.c:979 msgid "Doing a fast sync." msgstr "Schnelle Synchronisation." -#: ../src/coldsync.c:928 ../src/coldsync.c:932 +#: ../src/coldsync.c:977 msgid "Doing a slow sync." msgstr "Langsame Synchronisation." @@ -1358,43 +1392,47 @@ msgstr "Langsame Synchronisation." msgid "End of file" msgstr "Dateiende" -#: ../src/GenericConduit.cc:303 ../src/GenericConduit.cc:323 -#: ../src/GenericConduit.cc:343 ../src/GenericConduit.cc:423 -#: ../src/GenericConduit.cc:452 ../src/GenericConduit.cc:481 -#: ../src/GenericConduit.cc:572 ../src/GenericConduit.cc:591 -#: ../src/GenericConduit.cc:612 ../src/GenericConduit.cc:723 -#: ../src/GenericConduit.cc:929 ../src/GenericConduit.cc:952 -#: ../src/GenericConduit.cc:978 ../src/GenericConduit.cc:1067 -#: ../src/GenericConduit.cc:1086 ../src/GenericConduit.cc:1127 -#: ../src/GenericConduit.cc:1229 ../src/GenericConduit.cc:1465 -#: ../src/GenericConduit.cc:1494 ../src/GenericConduit.cc:1521 -#: ../src/backup.c:563 ../src/backup.c:596 ../src/backup.c:628 -#: ../src/backup.c:655 ../src/backup.c:675 ../src/install.c:586 -#: ../src/install.c:618 ../src/install.c:730 ../src/restore.c:192 +#: ../src/GenericConduit.cc:302 ../src/GenericConduit.cc:315 +#: ../src/GenericConduit.cc:328 ../src/GenericConduit.cc:406 +#: ../src/GenericConduit.cc:428 ../src/GenericConduit.cc:455 +#: ../src/GenericConduit.cc:538 ../src/GenericConduit.cc:550 +#: ../src/GenericConduit.cc:564 ../src/GenericConduit.cc:675 +#: ../src/GenericConduit.cc:874 ../src/GenericConduit.cc:890 +#: ../src/GenericConduit.cc:914 ../src/GenericConduit.cc:995 +#: ../src/GenericConduit.cc:1007 ../src/GenericConduit.cc:1048 +#: ../src/GenericConduit.cc:1150 ../src/GenericConduit.cc:1368 +#: ../src/GenericConduit.cc:1390 ../src/GenericConduit.cc:1416 +#: ../src/backup.c:563 ../src/backup.c:589 ../src/backup.c:614 +#: ../src/backup.c:634 ../src/backup.c:654 ../src/install.c:572 +#: ../src/install.c:590 ../src/install.c:702 ../src/restore.c:187 msgid "Error" msgstr "Fehler" -#: ../src/install.c:338 ../src/install.c:359 +#: ../src/install.c:331 ../src/install.c:345 msgid "Error\n" msgstr "Fehler\n" -#: ../src/coldsync.c:998 ../src/coldsync.c:1217 ../src/coldsync.c:2591 -#: ../src/coldsync.c:2797 +#: ../src/coldsync.c:712 ../src/coldsync.c:721 #, c-format msgid "Error %d running install conduits." msgstr "Fehler %d beim Ausführen der Install Conduits." -#: ../src/coldsync.c:1258 ../src/coldsync.c:2837 +#: ../src/coldsync.c:752 ../src/coldsync.c:764 #, c-format msgid "Error %d running post-dump conduits." msgstr "Fehler %d beim Ausführen der Post-Dump Conduits." -#: ../src/coldsync.c:1057 ../src/coldsync.c:2648 +#: ../src/coldsync.c:787 ../src/coldsync.c:800 #, c-format msgid "Error %d running pre-fetch conduits." msgstr "Fehler %d beim Ausführen der Pre-Fetch Conduits." -#: ../src/coldsync.c:1436 +#: ../src/coldsync.c:822 +#, fuzzy, c-format +msgid "Error %d running sync conduits." +msgstr "Fehler %d beim Ausführen der Install Conduits." + +#: ../src/coldsync.c:1500 #, c-format msgid "Error backing up \"%s\"." msgstr "Fehler beim Sichern von \"%s\"." @@ -1404,17 +1442,17 @@ msgstr "Fehler beim Sichern von \"%s\"." msgid "Error creating database \"%s\": %d.\n" msgstr "Fehler beim Anlegen der Datenbank \"%s\": %d.\n" -#: ../src/install.c:751 +#: ../src/install.c:723 #, c-format msgid "Error deleting \"%s\"." msgstr "Fehler beim Löschen von \"%s\"." -#: ../src/coldsync.c:2904 +#: ../src/coldsync.c:2211 #, c-format msgid "Error during DlpEndOfSync: (%d) %s." msgstr "Fehler während DlpEndOfSync: (%d) %s." -#: ../libpconn/cmp.c:141 +#: ../libpconn/cmp.c:142 #, c-format msgid "Error during cmp_read: (%d) %s.\n" msgstr "Fehler während cmp_read: (%d) %s.\n" @@ -1427,16 +1465,16 @@ msgstr "Fehler beim msgid "Error in system call or library function" msgstr "Fehler in Systemaufruf oder Bibliotheksfunktion." -#: ../src/install.c:705 +#: ../src/install.c:677 #, c-format msgid "Error opening \"%s\"." msgstr "Fehler beim Öffnen von \"%s\"." -#: ../libpconn/netsync.c:488 +#: ../libpconn/netsync.c:514 msgid "Error reading NetSync packet header.\n" msgstr "Fehler beim Lesen des NetSync-Paketkopfes.\n" -#: ../libpconn/netsync.c:624 +#: ../libpconn/netsync.c:659 msgid "Error sending NetSync header.\n" msgstr "Fehler beim Senden des NetSync-Paketkopfes.\n" @@ -1444,9 +1482,9 @@ msgstr "Fehler beim Senden des NetSync-Paketkopfes.\n" msgid "Error trying to set speed.\n" msgstr "Fehler beim Setzen der Geschwindigkeit.\n" -#: ../src/GenericConduit.cc:888 ../src/GenericConduit.cc:1431 -#: ../src/GenericConduit.cc:1744 ../src/GenericConduit.cc:1889 -#: ../src/GenericConduit.cc:2055 ../src/GenericConduit.cc:2289 +#: ../src/GenericConduit.cc:833 ../src/GenericConduit.cc:1334 +#: ../src/GenericConduit.cc:1627 ../src/GenericConduit.cc:1762 +#: ../src/GenericConduit.cc:1917 ../src/GenericConduit.cc:2138 #, c-format msgid "Error uploading record 0x%08lx: %d." msgstr "Fehler beim Übertragen von Datensatz 0x%08lx: %d." @@ -1455,7 +1493,7 @@ msgstr "Fehler beim msgid "Error: " msgstr "Fehler: " -#: ../libpconn/PConnection_serial.c:612 ../libpconn/PConnection_usb.c:460 +#: ../libpconn/PConnection_serial.c:616 ../libpconn/PConnection_usb.c:483 #, c-format msgid "Error: Can't open \"%s\".\n" msgstr "Fehler: Kann \"%s\" nicht öffnen.\n" @@ -1471,11 +1509,11 @@ msgstr "" msgid "Error: Palm suggested unknown speed %ld\n" msgstr "" -#: ../libpconn/PConnection.c:118 +#: ../libpconn/PConnection.c:119 msgid "Error: USB support not enabled.\n" msgstr "Fehler: USB-Unterstützung nicht aktiviert.\n" -#: ../libpconn/netsync.c:496 +#: ../libpconn/netsync.c:521 #, c-format msgid "Error: only read %d bytes of NetSync packet header.\n" msgstr "Fehler: Nur %d Zeichen der NetSync Paketkopfes gelesen.\n" @@ -1494,22 +1532,22 @@ msgstr "Kann den %d-ten Datensatz in \"%.*s\" nicht finden!\n" msgid "Hey! I can't find the %dth resource in \"%.*s\"!\n" msgstr "Kann die %d-te Ressource in \"%.*s\" nicht finden!\n" -#: ../src/config.c:924 +#: ../src/config.c:1067 msgid "Hey! This isn't an AF_INET address!" msgstr "Das ist keine AF_INET Adresse." -#: ../src/GenericConduit.cc:1200 +#: ../src/GenericConduit.cc:1121 msgid "" "I have a new, deleted record that is neither archived nor expunged\n" "What am I supposed to do?" msgstr "" -#: ../src/conduit.c:2191 +#: ../src/conduit.c:2279 msgid "Inside run_DummyConduit.\n" msgstr "Innerhalb von run_DummyConduit.\n" -#: ../src/install.c:584 ../src/install.c:616 ../src/install.c:701 -#: ../src/install.c:709 ../src/install.c:728 ../src/install.c:733 +#: ../src/install.c:570 ../src/install.c:588 ../src/install.c:673 +#: ../src/install.c:681 ../src/install.c:700 ../src/install.c:705 msgid "Install" msgstr "Installiere" @@ -1529,43 +1567,41 @@ msgstr "Ung msgid "Invalid result ID" msgstr "Ungültige Ergebnis-ID" -#: ../src/coldsync.c:500 +#: ../src/coldsync.c:510 #, c-format msgid "Log started on %s" msgstr "Log gestartet auf %s" -#: ../src/coldsync.c:583 ../src/coldsync.c:635 ../src/coldsync.c:688 -#: ../src/coldsync.c:970 ../src/coldsync.c:1069 ../src/coldsync.c:1098 -#: ../src/coldsync.c:1125 ../src/coldsync.c:1191 ../src/coldsync.c:1267 -#: ../src/coldsync.c:1385 ../src/coldsync.c:1433 ../src/coldsync.c:1530 -#: ../src/coldsync.c:1553 ../src/coldsync.c:2564 ../src/coldsync.c:2660 -#: ../src/coldsync.c:2687 ../src/coldsync.c:2708 ../src/coldsync.c:2771 -#: ../src/coldsync.c:2846 ../src/conduit.c:500 ../src/restore.c:278 +#: ../src/coldsync.c:1015 ../src/coldsync.c:1093 ../src/coldsync.c:1160 +#: ../src/coldsync.c:1194 ../src/coldsync.c:1231 ../src/coldsync.c:1283 +#: ../src/coldsync.c:1335 ../src/coldsync.c:1447 ../src/coldsync.c:1496 +#: ../src/coldsync.c:1544 ../src/coldsync.c:1567 ../src/conduit.c:521 +#: ../src/restore.c:273 msgid "Lost connection to Palm." msgstr "Verbindung zum Palm verloren." -#: ../src/conduit.c:1186 ../src/conduit.c:1246 +#: ../src/conduit.c:1229 ../src/conduit.c:1290 msgid "Lost connection to Palm. Aborting." msgstr "Verbindung zum Palm verloren. Abbruch." -#: ../src/config.c:263 +#: ../src/config.c:336 #, c-format msgid "Missing option argument after \"%s\"." msgstr "Fehlendes Argument nach \"%s\"." -#: ../src/config.c:805 +#: ../src/config.c:947 msgid "Modes:\n" msgstr "Modes:\n" -#: ../src/coldsync.c:848 ../src/coldsync.c:2446 +#: ../src/coldsync.c:685 msgid "Network sync forwarding failed." msgstr "Synchronisation der Netzwerkweiterleitung schlug fehl." -#: ../src/spalm.c:288 +#: ../src/spalm.c:275 msgid "No NetSync info.\n" msgstr "Kein NetSyn-Info.\n" -#: ../src/coldsync.c:1291 +#: ../src/coldsync.c:1392 msgid "No backup directory specified." msgstr "Kein Sicherungsverzeichnis angegeben." @@ -1573,37 +1609,41 @@ msgstr "Kein Sicherungsverzeichnis angegeben." msgid "No error" msgstr "Kein Fehler" -#: ../src/coldsync.c:2230 +#: ../src/coldsync.c:2088 +#, fuzzy, c-format +msgid "No matching entry in %s, couldn't autoinit." +msgstr "Kein passender Eintrag in %s." + +#: ../src/coldsync.c:2099 #, c-format msgid "No matching entry in %s." msgstr "Kein passender Eintrag in %s." -#: ../src/coldsync.c:529 ../src/coldsync.c:1326 ../src/coldsync.c:1473 -#: ../src/coldsync.c:1616 ../src/coldsync.c:2064 +#: ../src/coldsync.c:525 msgid "No port specified." msgstr "Kein Port angegeben." -#: ../src/coldsync.c:1417 +#: ../src/coldsync.c:1480 msgid "No such database" msgstr "Nichtexistierende Datenbank" -#: ../src/coldsync.c:1412 +#: ../src/coldsync.c:1475 #, c-format msgid "No such database: \"%s\"." msgstr "Kann Datenbank \"%s\" nicht öffnen." -#: ../src/coldsync.c:1316 +#: ../src/coldsync.c:1417 #, c-format msgid "No such directory: \"%s\"." msgstr "Kein Verzeichnis \"%s\"." -#: ../src/GenericConduit.cc:492 ../src/GenericConduit.cc:989 -#: ../src/GenericConduit.cc:1531 ../src/backup.c:686 ../src/install.c:703 -#: ../src/install.c:735 ../src/restore.c:197 +#: ../src/GenericConduit.cc:465 ../src/GenericConduit.cc:924 +#: ../src/GenericConduit.cc:1425 ../src/backup.c:665 ../src/install.c:675 +#: ../src/install.c:707 ../src/restore.c:192 msgid "OK" msgstr "OK" -#: ../src/config.c:812 +#: ../src/config.c:954 msgid "Options:\n" msgstr "Optionen:\n" @@ -1611,68 +1651,69 @@ msgstr "Optionen:\n" msgid "Out of memory" msgstr "Kein Speicher mehr" -#: ../libpconn/PConnection_serial.c:653 ../libpconn/PConnection_usb.c:435 +#: ../libpconn/PConnection_serial.c:590 ../libpconn/PConnection_serial.c:657 +#: ../libpconn/PConnection_usb.c:458 msgid "Please press the HotSync button.\n" msgstr "Bitte starten Sie den HotSync auf dem Palm.\n" -#: ../src/install.c:711 +#: ../src/install.c:683 msgid "Problem" msgstr "Problem" -#: ../src/restore.c:181 ../src/restore.c:192 ../src/restore.c:197 +#: ../src/restore.c:176 ../src/restore.c:187 ../src/restore.c:192 #, fuzzy msgid "Restore" msgstr "Restore" -#: ../src/restore.c:149 +#: ../src/restore.c:151 #, c-format msgid "Restore: Can't delete database \"%s\": %d." msgstr "Restore: Kann Datenbank \"%s\" nicht löschen. Fehler: %d." -#: ../src/coldsync.c:1251 +#: ../src/coldsync.c:746 msgid "Running Dump conduits" msgstr "Starte Dump-Conduit" -#: ../src/coldsync.c:1050 +#: ../src/coldsync.c:781 msgid "Running Fetch conduits" msgstr "Starte Fetch-Conduit" -#: ../src/coldsync.c:994 ../src/coldsync.c:1213 ../src/coldsync.c:2587 -#: ../src/coldsync.c:2793 +#: ../src/coldsync.c:706 msgid "Running Install conduits" msgstr "Start Install-Conduit" -#: ../src/coldsync.c:1075 +#: ../src/coldsync.c:816 msgid "Running Sync conduits" msgstr "Starte Sync-Conduit" -#: ../libpconn/slp.c:391 +#: ../libpconn/slp.c:385 #, c-format msgid "SLP: bad CRC: expected 0x%04x, got 0x%04x.\n" msgstr "SLP: Fehlerhafte CRC. Erwartet 0x%04x, gefunden 0x%04x.\n" -#: ../src/coldsync.c:1855 +#: ../src/coldsync.c:2443 msgid "Set user ID" msgstr "Setze Benutzer ID" -#: ../src/coldsync.c:1890 +#: ../src/coldsync.c:2466 msgid "Set username" msgstr "Setze Benutzernamen" -#: ../src/coldsync.c:1120 +#: ../src/coldsync.c:1083 msgid "Sync cancelled by Palm." msgstr "Synchronisation von Palm abgebrochen." -#: ../src/coldsync.c:1089 ../src/coldsync.c:2678 -msgid "Sync cancelled." -msgstr "Sync abgebrochen." - -#: ../src/coldsync.c:621 +#: ../src/coldsync.c:1268 #, c-format msgid "Sync for %s at %s" msgstr "" -#: ../src/coldsync.c:649 +#: ../src/coldsync.c:834 +#, c-format +msgid "Syncing %s" +msgstr "" + +#: ../src/coldsync.c:1296 #, c-format msgid "" "This Palm has user ID %ld (I was expecting %ld).\n" @@ -1690,7 +1731,7 @@ msgstr "" "\tDie Konfigurationsdatei sollte einen PDA Abschnitt enthalten, der\n" "etwa so aussieht:" -#: ../src/coldsync.c:704 +#: ../src/coldsync.c:1350 #, c-format msgid "" "This Palm has user name \"%.*s\" (I was expecting \"%.*s\").\n" @@ -1708,7 +1749,7 @@ msgstr "" "\tDie Konfigurationsdatei sollte einen PDA Abschnitt enthalten, der\n" "etwa so aussieht:" -#: ../src/config.c:945 +#: ../src/config.c:1088 msgid "This host doesn't appear to have an IP address." msgstr "Dieser Rechner hat anscheinend keine IP-Adresse." @@ -1721,7 +1762,7 @@ msgstr "Zeit abgelaufen" msgid "Too many errors. Aborting." msgstr "%s: Zu viele offene Dateien. Abbruch." -#: ../src/coldsync.c:3103 +#: ../src/coldsync.c:2410 #, c-format msgid "Too many files named \"%s\" in the attic." msgstr "Zu viele Dateien heißen \"%s\"." @@ -1734,7 +1775,7 @@ msgstr " msgid "Unexpected timeout" msgstr "" -#: ../src/config.c:229 +#: ../src/config.c:295 #, c-format msgid "Unknown device type: \"%s\"." msgstr "Unbekannter Gerätetyp: \"%s\"." @@ -1743,17 +1784,17 @@ msgstr "Unbekannter Ger msgid "Unknown error" msgstr "Unbekannter Fehler" -#: ../src/config.c:706 +#: ../src/config.c:792 #, c-format msgid "Unknown facility \"%s\"." msgstr "Unbekannter Debug-Schalter \"%s\"." -#: ../src/config.c:755 +#: ../src/config.c:843 ../src/config.c:876 #, c-format msgid "Unknown mode: \"%s\"." msgstr "Unbekannter Modus: \"%s\"." -#: ../src/coldsync.c:345 +#: ../src/coldsync.c:353 #, c-format msgid "" "Unknown mode: %d.\n" @@ -1762,22 +1803,22 @@ msgstr "" "Bittem dem Entwickler des Programms melden:\n" "Unknown mode: %d." -#: ../src/config.c:242 +#: ../src/config.c:308 #, c-format msgid "Unknown protocol: \"%s\"." msgstr "" -#: ../src/coldsync.c:2261 +#: ../src/coldsync.c:2110 #, c-format msgid "Unknown user/uid: \"%s\"." msgstr "Unbekannter Benutzer: \"%s\"." -#: ../src/config.c:254 +#: ../src/config.c:327 #, c-format msgid "Unrecognized option: \"%s\"." msgstr "Option \"%s\" nicht erkannt." -#: lexer.l:505 +#: lexer.l:540 #, c-format msgid "Unterminated string at line %d (string started on line %d)\n" msgstr "" @@ -1792,7 +1833,7 @@ msgstr "Heraufladen von \"%s\" vom Palm abgebrochen.\n" msgid "Uploading \"%s\"" msgstr "Installiere \"%s\"" -#: ../src/config.c:834 +#: ../src/config.c:977 #, c-format msgid "Usage: %s [options] \n" msgstr "Verwendung: %s [Optionen] \n" @@ -1810,7 +1851,7 @@ msgstr "" "Warnung: AppInfo-Block in \"%.*s\" nicht an der erwarteten Stelle gefunden.\n" "Sollte an 0x%lx stehen, Dateizeiger befindet sich aber an 0x%lx.\n" -#: ../src/spalm.c:461 +#: ../src/spalm.c:426 #, c-format msgid "" "Warning: ROM serial number is %d characters long. Please notify the\n" @@ -1835,7 +1876,7 @@ msgstr "" "Warnung: Kann die gewünschte Geschwindigkeit %ld bps nicht setzen.\n" "Benutzte Standart.\n" -#: ../libpconn/PConnection_serial.c:603 +#: ../libpconn/PConnection_serial.c:607 #, c-format msgid "Warning: no device on %s. Sleeping\n" msgstr "Warnung: Kein Gerät an %s. Schlafe\n" @@ -1867,7 +1908,7 @@ msgstr "" "Warnung: Sortblock in \"%.*s\" nicht an der erwarteten Stelle gefunden.\n" "Sollte an 0x%lx stehen, Dateizeiger befindet sich aber an 0x%lx.\n" -#: ../libpconn/padp.c:647 +#: ../libpconn/padp.c:645 msgid "Write timeout. Attempting to resend.\n" msgstr "Zeitablauf beim Schreiben. Neuer Sendeversuch.\n" @@ -1875,7 +1916,7 @@ msgstr "Zeitablauf beim Schreiben. Neuer Sendeversuch.\n" msgid "XID on ACK doesn't match request" msgstr "" -#: ../src/spalm.c:563 +#: ../src/spalm.c:521 msgid "" "You have an old Palm, one that doesn't say how many\n" "databases it has. I can't cope with this." @@ -1883,7 +1924,7 @@ msgstr "" "Sie haben einen alten Palm, der nicht verrät, wieviele\n" "Datenbanken er hat. Damit kann dieses Programm nicht umgehen." -#: ../src/config.c:728 +#: ../src/config.c:814 #, c-format msgid "" "You shouldn't specify two -m options.\n" @@ -1892,7 +1933,7 @@ msgstr "" "Sie sollten keine zwei -m optionen angeben.\n" "\tBenutze -m%s." -#: ../src/config.c:269 +#: ../src/config.c:342 #, c-format msgid "" "You specified an apparently legal option (\"-%c\"), but I don't know what\n" @@ -1903,26 +1944,29 @@ msgstr "" "kann damit nichts anfangen. Das ist ein Fehler. Bitte informieren Sie den\n" "Entwickler." -#: ../src/GenericConduit.cc:177 +#: ../src/GenericConduit.cc:183 msgid "[generic]: Aborting." msgstr "[generic]: Abbruch." -#: ../libpconn/PConnection_usb.c:648 +#: ../libpconn/PConnection_usb.c:671 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" -#: ../libpconn/PConnection_usb.c:586 +#: ../libpconn/PConnection_usb.c:609 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" -#: ../src/GenericConduit.cc:340 +#: ../src/GenericConduit.cc:325 msgid "pdb_Download() failed." msgstr "Fehler in pdb_Download()." -#: ../libpconn/PConnection_usb.c:181 +#: ../libpconn/PConnection_usb.c:204 msgid "usb: trying to fill a non-empty buffer.\n" msgstr "usb: Versuch, einen nicht-leeren Puffer zu füllen.\n" +#~ msgid "Sync cancelled." +#~ msgstr "Sync abgebrochen." + #~ msgid "##### %s: Unknown argument type: 0x%02x\n" #~ msgstr "##### %s: Unbekannter Argumenttyp: 0x%02x\n" @@ -2053,10 +2097,6 @@ msgstr "usb: Versuch, einen nicht-leeren Puffer zu f #~ msgid "DlpWriteUserInfo failed: %d.\n" #~ msgstr "DlpWriteUserInfo gescheitert: %d\n" -#, fuzzy -#~ msgid "%s: realloc(%d) failed.\n" -#~ msgstr "%s: realloc gescheitert\n" - #, fuzzy #~ msgid "Can't reserve file descriptor %d.\n" #~ msgstr "Fehler: Kann Dateidescriptor %d nicht belegen\n" @@ -2095,9 +2135,6 @@ msgstr "usb: Versuch, einen nicht-leeren Puffer zu f #~ msgid "%s error: can't clean up database: %d\n" #~ msgstr "%s Fehler: Kann Datenbank nicht aufräumen: %d\n" -#~ msgid "%s: Can't open %s\n" -#~ msgstr "%s: Kann %s nicht öffnen\n" - #~ msgid "%s: realloc failed\n" #~ msgstr "%s: realloc gescheitert\n" diff --git a/i18n/fr.po b/i18n/fr.po index 539e9b5f..30d91794 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: coldsync 1.1.2\n" -"POT-Creation-Date: 2002-03-10 17:49+0100\n" +"POT-Creation-Date: 2002-06-21 16:10+0200\n" "PO-Revision-Date: 2000-02-05 17:48-0500\n" "Last-Translator: Nicolas Bouthors \n" "Language-Team: fr \n" @@ -13,54 +13,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/config.c:819 +#: ../src/config.c:961 msgid "\t-F:\t\tForce fast sync.\n" msgstr "\t-F:\t\tForcer une synchronisation rapide.\n" -#: ../src/config.c:817 +#: ../src/config.c:959 msgid "\t-I:\t\tForce installation of new databases.\n" msgstr "\t-I:\t\tForcer l'installation de nouvelles bases de données.\n" -#: ../src/config.c:823 +#: ../src/config.c:965 msgid "\t-P :\tSoftware protocol [default|full|simple|net].\n" msgstr "\t-P :\tProtocole en software [default|full|simple|net].\n" -#: ../src/config.c:820 +#: ../src/config.c:962 msgid "\t-R:\t\tCheck ROM databases.\n" msgstr "\t-R:\t\tRegarder aussi les bases de données en ROM.\n" -#: ../src/config.c:818 +#: ../src/config.c:960 msgid "\t-S:\t\tForce slow sync.\n" msgstr "\t-S:\t\tForcer une synchronisation lente.\n" -#: ../src/config.c:814 +#: ../src/config.c:956 msgid "\t-V:\t\tPrint version and exit.\n" msgstr "\t-V:\t\tAfficher la version et quitter.\n" -#: ../src/config.c:829 +#: ../src/config.c:972 msgid "\t-d :\tSet debugging level.\n" msgstr "" "\t-d :\n" "\t\t\tIndiquer le niveau de débogage\n" -#: ../src/config.c:815 +#: ../src/config.c:957 msgid "\t-f :\tRead configuration from \n" msgstr "\t-f :\tLire la configuration dans .\n" -#: ../src/config.c:813 +#: ../src/config.c:955 msgid "\t-h:\t\tPrint this help message and exit.\n" msgstr "\t-h:\t\tAfficher ce message et quitter.\n" -#: ../src/config.c:826 +#: ../src/config.c:968 msgid "\t-l: :\tWrite error/debugging messages to .\n" msgstr "" "\t-l :\tÉcrire les messages d'erreur/débogage dans .\n" -#: ../src/config.c:807 +#: ../src/config.c:949 msgid "\t-mI:\tInitialize.\n" msgstr "\t-mI:\t\tInitialiser.\n" -#: ../src/config.c:808 +#: ../src/config.c:950 msgid "" "\t-mb [database...]\n" "\t\tPerform a backup to .\n" @@ -68,7 +68,7 @@ msgstr "" "\t-mb [base de données...]\n" "\t\t\tFaire un backup dans .\n" -#: ../src/config.c:810 +#: ../src/config.c:952 #, fuzzy msgid "" "\t-mr ...\n" @@ -77,79 +77,83 @@ msgstr "" "\t-mr ...\n" "\t\t\tRestaurer ou installer des fichiers ou répertoires.\n" -#: ../src/config.c:806 +#: ../src/config.c:948 msgid "\t-ms:\tSynchronize (default).\n" msgstr "\t-ms:\t\tSynchroniser (défaut).\n" -#: ../src/config.c:821 +#: ../src/config.c:971 +msgid "\t-n :\tChoice the named listen block.\n" +msgstr "" + +#: ../src/config.c:963 msgid "\t-p :\tListen on device .\n" msgstr "\t-p :\tEcouter sur le port \n" -#: ../src/config.c:825 +#: ../src/config.c:967 msgid "\t-s:\t\tLog error messages to syslog.\n" msgstr "\t-s:\t\tUtiliser syslog pour les messages d'erreur.\n" -#: ../src/config.c:822 +#: ../src/config.c:964 msgid "\t-t :\tPort type [serial|usb|net].\n" msgstr "\t-t :\tType de port [serial|usb|tcp]\n" -#: ../src/config.c:828 +#: ../src/config.c:970 msgid "\t-v:\t\tIncrease verbosity.\n" msgstr "\t-v:\t\tDonner plus de détails lors de la synchronisation.\n" -#: ../src/config.c:816 +#: ../src/config.c:958 msgid "\t-z:\t\tInstall databases after sync.\n" msgstr "" "\t-z:\t\tInstaller les nouvelles bases de données aprčs\n" "\t\t\tla synchronisation.\n" -#: ../src/parser.y:327 ../src/parser.y:585 ../src/parser.y:1136 +#: ../src/parser.y:341 ../src/parser.y:658 ../src/parser.y:1229 #, c-format msgid "\tError near \"%s\"." msgstr "\tErreur prčs de Ť %s ť." -#: ../src/parser.y:1165 +#: ../src/parser.y:1258 msgid "\tMissing ':'." msgstr "\tŤ : ť manquant." -#: ../src/parser.y:1182 +#: ../src/parser.y:1274 msgid "\tMissing ';'." msgstr "\tŤ ; ť manquant." -#: ../src/parser.y:1174 +#: ../src/parser.y:1266 msgid "\tMissing '{'." msgstr "\tŤ { ť manquant." -#: ../src/parser.y:750 +#: ../src/parser.y:823 #, c-format msgid "\tMissing argument name near \": %s\"." msgstr "\tNom d'argument manquant prčs de Ť : %s ť." -#: ../src/parser.y:248 +#: ../src/parser.y:255 msgid "\tMissing listen block type." msgstr "\tType de bloc Ť listen ť manquant." -#: ../src/parser.y:829 +#: ../src/parser.y:919 #, fuzzy, c-format msgid "\tMissing option name near \"%s\"." msgstr "Argument manquant aprčs l'option Ť %s ť." -#: ../src/parser.y:415 +#: ../src/parser.y:461 #, c-format msgid "\tUnrecognized conduit flavor \"%s\"." msgstr "\tLe goűt de conduit Ť %s ť n'est pas reconnu." -#: ../src/parser.y:250 +#: ../src/parser.y:257 #, c-format msgid "\tUnrecognized listen type \"%s\"." msgstr "\tLe type d'écoute Ť %s ť n'est pas reconnu." -#: ../src/parser.y:449 +#: ../src/parser.y:495 #, c-format msgid "\tUnrecognized protocol: \"%s\"." msgstr "\tLe protocole Ť %.*s ť n'est pas reconnu." -#: ../src/config.c:874 +#: ../src/config.c:1017 #, c-format msgid "" "\n" @@ -158,14 +162,14 @@ msgstr "" "\n" " Fichier d'initialisation globale par défaut: %s\n" -#: ../src/coldsync.c:386 +#: ../src/coldsync.c:396 #, c-format msgid "" "\n" "Log closed on %s" msgstr "" -#: ../src/coldsync.c:1825 +#: ../src/coldsync.c:1787 msgid "" "\n" "This Palm already has user information that matches neither what's in your\n" @@ -176,7 +180,7 @@ msgid "" "\n" msgstr "" -#: ../src/config.c:869 +#: ../src/config.c:1012 msgid "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: strings are compared without regard\n" " to case, whenever possible.\n" @@ -185,13 +189,13 @@ msgstr "" " caractčres seront comparées sans faire la distinction entre\n" " les majuscules et les minuscules.\n" -#: ../src/config.c:864 +#: ../src/config.c:1007 msgid " WITH_EFENCE: buffer overruns will cause a segmentation violation.\n" msgstr "" " WITH_EFENCE: les débordements de mémoires tampon provoqueront une\n" "\tviolation de segmentation.\n" -#: ../src/config.c:860 +#: ../src/config.c:1003 msgid " WITH_USB: USB support.\n" msgstr " WITH_USB: support pour USB.\n" @@ -200,139 +204,144 @@ msgstr " WITH_USB: support pour USB.\n" msgid "\"%.*s\" record 0x%08lx has length 0.\n" msgstr "Dans Ť %.*s ť, l'enregistrement 0x%08lx a une longueur de 0.\n" -#: ../src/coldsync.c:1313 +#: ../src/coldsync.c:1414 #, c-format msgid "\"%s\" exists, but is not a directory." msgstr "Ť %s ť existe, mais n'est pas un répertoire." #: ../libpconn/dlp_cmd.c:191 ../libpconn/dlp_cmd.c:281 -#: ../libpconn/dlp_cmd.c:380 ../libpconn/dlp_cmd.c:439 -#: ../libpconn/dlp_cmd.c:503 ../libpconn/dlp_cmd.c:626 -#: ../libpconn/dlp_cmd.c:846 ../libpconn/dlp_cmd.c:935 -#: ../libpconn/dlp_cmd.c:1028 ../libpconn/dlp_cmd.c:1098 -#: ../libpconn/dlp_cmd.c:1168 ../libpconn/dlp_cmd.c:1252 -#: ../libpconn/dlp_cmd.c:1326 ../libpconn/dlp_cmd.c:1402 -#: ../libpconn/dlp_cmd.c:1477 ../libpconn/dlp_cmd.c:1564 -#: ../libpconn/dlp_cmd.c:1665 ../libpconn/dlp_cmd.c:1767 -#: ../libpconn/dlp_cmd.c:1875 ../libpconn/dlp_cmd.c:1946 -#: ../libpconn/dlp_cmd.c:2037 ../libpconn/dlp_cmd.c:2136 -#: ../libpconn/dlp_cmd.c:2218 ../libpconn/dlp_cmd.c:2290 -#: ../libpconn/dlp_cmd.c:2345 ../libpconn/dlp_cmd.c:2397 -#: ../libpconn/dlp_cmd.c:2533 ../libpconn/dlp_cmd.c:2578 -#: ../libpconn/dlp_cmd.c:2652 ../libpconn/dlp_cmd.c:2711 -#: ../libpconn/dlp_cmd.c:2774 ../libpconn/dlp_cmd.c:2819 -#: ../libpconn/dlp_cmd.c:2875 ../libpconn/dlp_cmd.c:2928 -#: ../libpconn/dlp_cmd.c:3038 ../libpconn/dlp_cmd.c:3133 -#: ../libpconn/dlp_cmd.c:3229 ../libpconn/dlp_cmd.c:3321 -#: ../libpconn/dlp_cmd.c:3401 ../libpconn/dlp_cmd.c:3499 -#: ../libpconn/dlp_cmd.c:3600 ../libpconn/dlp_cmd.c:3682 +#: ../libpconn/dlp_cmd.c:392 ../libpconn/dlp_cmd.c:451 +#: ../libpconn/dlp_cmd.c:515 ../libpconn/dlp_cmd.c:638 +#: ../libpconn/dlp_cmd.c:858 ../libpconn/dlp_cmd.c:947 +#: ../libpconn/dlp_cmd.c:1040 ../libpconn/dlp_cmd.c:1110 +#: ../libpconn/dlp_cmd.c:1180 ../libpconn/dlp_cmd.c:1264 +#: ../libpconn/dlp_cmd.c:1338 ../libpconn/dlp_cmd.c:1414 +#: ../libpconn/dlp_cmd.c:1489 ../libpconn/dlp_cmd.c:1576 +#: ../libpconn/dlp_cmd.c:1677 ../libpconn/dlp_cmd.c:1779 +#: ../libpconn/dlp_cmd.c:1887 ../libpconn/dlp_cmd.c:1958 +#: ../libpconn/dlp_cmd.c:2049 ../libpconn/dlp_cmd.c:2148 +#: ../libpconn/dlp_cmd.c:2230 ../libpconn/dlp_cmd.c:2302 +#: ../libpconn/dlp_cmd.c:2357 ../libpconn/dlp_cmd.c:2409 +#: ../libpconn/dlp_cmd.c:2545 ../libpconn/dlp_cmd.c:2590 +#: ../libpconn/dlp_cmd.c:2664 ../libpconn/dlp_cmd.c:2723 +#: ../libpconn/dlp_cmd.c:2786 ../libpconn/dlp_cmd.c:2831 +#: ../libpconn/dlp_cmd.c:2887 ../libpconn/dlp_cmd.c:2940 +#: ../libpconn/dlp_cmd.c:3050 ../libpconn/dlp_cmd.c:3145 +#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3333 +#: ../libpconn/dlp_cmd.c:3413 ../libpconn/dlp_cmd.c:3511 +#: ../libpconn/dlp_cmd.c:3612 ../libpconn/dlp_cmd.c:3694 #, c-format msgid "##### %s: Unknown argument type: 0x%02x.\n" msgstr "##### %s: Argument de type inconnu: 0x%02x.\n" -#: ../libpconn/padp.c:484 +#: ../libpconn/padp.c:482 #, c-format msgid "##### Bad offset: wanted %d, got %d.\n" msgstr "##### Mauvaise position: je voulais %d, mais j'ai trouvé %d.\n" -#: ../libpconn/dlp.c:291 +#: ../libpconn/dlp.c:292 #, c-format msgid "##### Bad response ID: expected 0x%02x, got 0x%02x.\n" msgstr "" "##### Mauvais numéro de réponse: je m'attendais ŕ 0x%02x, j'ai reçu 0x%02x.\n" -#: ../libpconn/padp.c:802 +#: ../libpconn/padp.c:800 #, c-format msgid "##### Expected XID 0x%02x, got 0x%02x.\n" msgstr "##### Je m'attendais au XID 0x%02x, mais j'ai reçu 0x%02x.\n" -#: ../libpconn/dlp.c:282 +#: ../libpconn/dlp.c:283 msgid "##### Expected a DLP response, but this isn't one!\n" msgstr "##### Je m'attendais ŕ une réponse DLP, mais ceci n'en est pas une!\n" -#: ../libpconn/padp.c:729 +#: ../libpconn/padp.c:727 msgid "##### Got an unexpected data packet. Sending an ACK to shut it up.\n" msgstr "" "##### J'ai reçu un paquet de données inattendu. J'envoie un ACK pour avoir\n" "la paix.\n" -#: ../libpconn/padp.c:198 ../libpconn/padp.c:446 +#: ../libpconn/padp.c:198 ../libpconn/padp.c:444 msgid "##### I just got an unexpected ACK. I'm confused!\n" msgstr "" "##### Je viens de recevoir un ACK inattendu. Je ne sais pas quoi faire!\n" -#: ../libpconn/padp.c:471 +#: ../libpconn/padp.c:469 msgid "##### I wasn't expecting a new fragment. I'm confused!\n" msgstr "" "##### Je ne m'attendais pas ŕ un nouveau fragment. Je ne sais pas quoi " "faire!\n" -#: ../libpconn/padp.c:217 ../libpconn/padp.c:461 ../libpconn/padp.c:790 +#: ../libpconn/padp.c:217 ../libpconn/padp.c:459 ../libpconn/padp.c:788 #, c-format msgid "##### Unexpected packet type %d.\n" msgstr "##### Paquet inattendu de type %d.\n" -#: lexer.l:460 +#: lexer.l:476 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: lexer.l:469 +#: lexer.l:485 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"${%.*s}\".\n" msgstr "" -#: lexer.l:474 +#: lexer.l:490 #, c-format msgid "" "%d: Unterminated variable reference near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: ../src/config.c:845 +#: ../src/config.c:988 #, c-format msgid "%s version %s.\n" msgstr "%s version %s.\n" -#: ../src/parser.y:614 +#: ../src/parser.y:687 #, c-format msgid "%s: %d: Bogus creator \"%s\"." msgstr "%s: %d: Créateur bidon: Ť %s ť." -#: ../src/parser.y:638 +#: ../src/parser.y:711 #, c-format msgid "%s: %d: Bogus type \"%s\"." msgstr "%s: %d: Type bidon: Ť %s ť." -#: ../src/parser.y:498 +#: ../src/parser.y:549 #, c-format msgid "%s: %d: Can't add creator-type pair to list. This is very bad." msgstr "" "%s: %d: Ne peux pas ajouter de paire createur-type ŕ la liste.\n" "C'est trčs mauvais." -#: ../src/parser.y:553 +#: ../src/parser.y:626 #, c-format msgid "%s: %d: Can't add preference to list. This is very bad." msgstr "" "%s: %d: Ne peux pas ajouter de préférence ŕ la liste.\n" "C'est trčs mauvais." -#: ../src/parser.y:287 +#: ../src/parser.y:590 +#, fuzzy, c-format +msgid "%s: %d: Cwd already defined." +msgstr "%s: %d: Vitesse déjŕ définie." + +#: ../src/parser.y:301 #, c-format msgid "%s: %d: Device already defined." msgstr "%s: %d: Commande Ť device ť déjŕ définie." -#: ../src/parser.y:1038 +#: ../src/parser.y:1131 #, c-format msgid "%s: %d: Directory already defined." msgstr "%s: %d: Le répertoire a déjŕ été défini." -#: ../src/parser.y:1008 +#: ../src/parser.y:1101 #, c-format msgid "" "%s: %d: Incorrect checksum\n" @@ -341,12 +350,12 @@ msgstr "" "%s: %d: Total de contrôle incorrect pour le numéro de série\n" "Ť %s-%c ť. Il devrait ętre Ť %s-%c ť." -#: ../src/parser.y:514 +#: ../src/parser.y:565 #, c-format msgid "%s: %d: Path already defined." msgstr "%s: %d: Commande Ť path ť déjŕ définie." -#: ../src/parser.y:987 +#: ../src/parser.y:1080 #, c-format msgid "" "%s: %d: Serial number \"%s\" has no checksum.\n" @@ -355,182 +364,182 @@ msgstr "" "%s: %d: Le numéro de série Ť %s ť n'a pas de total de contrôle.\n" "Vous voudrez peut-ętre le récrire comme Ť %s-%c ť." -#: ../src/parser.y:956 +#: ../src/parser.y:1049 #, c-format msgid "%s: %d: Serial number already defined." msgstr "%s: %d: Numéro de série déjŕ défini." -#: ../src/parser.y:301 +#: ../src/parser.y:315 #, c-format msgid "%s: %d: Speed already defined." msgstr "%s: %d: Vitesse déjŕ définie." -#: ../src/parser.y:1074 +#: ../src/parser.y:1167 #, c-format msgid "%s: %d: Userid already defined." msgstr "%s: %d: Numéro d'utilisateur déjŕ défini." -#: ../src/parser.y:1059 +#: ../src/parser.y:1152 #, c-format msgid "%s: %d: Username already defined." msgstr "%s: %d: Nom d'utilisateur déjŕ défini." -#: ../libpconn/dlp.c:152 +#: ../libpconn/dlp.c:153 #, c-format msgid "%s: Can't allocate %ld-byte buffer.\n" msgstr "%s: Je n'arrive pas ŕ allouer un tampon de %ld octets.\n" -#: ../src/parser.y:851 +#: ../src/parser.y:941 #, c-format msgid "%s: Can't allocate PDA block." msgstr "%s: Impossible d'allouer un bloc PDA." -#: ../src/parser.y:708 +#: ../src/parser.y:781 #, c-format msgid "%s: Can't allocate conduit header." msgstr "%s: Impossible d'allouer une entęte de conduit." -#: ../src/parser.y:340 +#: ../src/parser.y:354 #, c-format msgid "%s: Can't allocate conduit_block!" msgstr "%s: Impossible d'allouer un conduit_block!" -#: ../src/parser.y:177 +#: ../src/parser.y:180 #, c-format msgid "%s: Can't allocate listen block." msgstr "%s: Impossible d'allouer un bloc d'écoute." -#: ../src/GenericConduit.cc:1121 +#: ../src/GenericConduit.cc:1042 #, c-format msgid "%s: Can't allocate new record." msgstr "%s: J'arrive pas ŕ allouer un nouvel enregistrement." -#: ../src/GenericConduit.cc:1221 +#: ../src/GenericConduit.cc:1142 #, c-format msgid "%s: Can't append new record to database: %d." msgstr "" "%s: Je n'arrive pas ŕ ajouter un nouvel enregistrement ŕ la\n" "base de données: %d." -#: lexer.l:366 +#: lexer.l:382 #, fuzzy, c-format msgid "%s: Can't append to qstring." msgstr "%s: Impossible de copier une chaîne." -#: ../src/backup.c:716 +#: ../src/backup.c:695 #, c-format msgid "%s: Can't back up \"%s\"." msgstr "%s: Impossible de sauvegarder Ť %s ť." -#: ../src/GenericConduit.cc:448 ../src/GenericConduit.cc:948 -#: ../src/GenericConduit.cc:1490 +#: ../src/GenericConduit.cc:424 ../src/GenericConduit.cc:886 +#: ../src/GenericConduit.cc:1386 #, c-format msgid "%s: Can't clean up database: %d." msgstr "%s: Impossible de nettoyer une base de données: %d." -#: ../src/GenericConduit.cc:1960 ../src/GenericConduit.cc:1998 -#: ../src/GenericConduit.cc:2132 +#: ../src/GenericConduit.cc:1832 ../src/GenericConduit.cc:1869 +#: ../src/GenericConduit.cc:1994 #, c-format msgid "%s: Can't copy record." msgstr "%s: Je n'arrive pas ŕ copier un enregistrement." -#: ../src/conduit.c:1541 +#: ../src/conduit.c:1597 #, c-format msgid "%s: Can't create file handle to child's stdin." msgstr "" -#: ../src/conduit.c:1569 +#: ../src/conduit.c:1625 #, c-format msgid "%s: Can't create file handle to child's stdout." msgstr "" -#: ../src/coldsync.c:3681 ../src/coldsync.c:3701 +#: ../src/coldsync.c:3049 ../src/coldsync.c:3069 #, c-format msgid "%s: Can't create staging file \"%s\"." msgstr "%s: Impossible de créer le fichier intermédiaire Ť %s ť." -#: ../src/coldsync.c:3691 +#: ../src/coldsync.c:3059 #, c-format msgid "%s: Can't create staging file name." msgstr "%s: Impossible de créer le nom du fichier intermédiaire." -#: ../src/GenericConduit.cc:608 +#: ../src/GenericConduit.cc:560 #, c-format msgid "%s: Can't download \"%s\"." msgstr "%s: Impossible de télécharger Ť %s ť." -#: ../src/conduit.c:2057 +#: ../src/conduit.c:2137 #, c-format msgid "%s: Can't get child process status." msgstr "%s: Je n'arrive pas ŕ connaitre l'état du processus fils." -#: ../libpconn/PConnection_usb.c:505 +#: ../libpconn/PConnection_usb.c:528 #, c-format msgid "%s: Can't get information about USB device.\n" msgstr "%s: Je n'arrive pas ŕ obtenir les informations du port USB.\n" -#: ../src/GenericConduit.cc:2094 ../src/GenericConduit.cc:2143 +#: ../src/GenericConduit.cc:1956 ../src/GenericConduit.cc:2004 #, c-format msgid "%s: Can't insert record 0x%08lx." msgstr "%s: Je n'arrive pas ŕ insérer l'enregistrement 0x%08lx." -#: ../src/GenericConduit.cc:2505 +#: ../src/GenericConduit.cc:2354 #, c-format msgid "%s: Can't load \"%s\"." msgstr "%s: Impossible de charger Ť %s ť." -#: ../src/install.c:270 ../src/install.c:526 +#: ../src/install.c:270 ../src/install.c:512 #, c-format msgid "%s: Can't load database \"%s\"." msgstr "%s: Impossible de charger la base de données Ť %s ť." -#: ../src/conduit.c:1587 +#: ../src/conduit.c:1643 #, c-format msgid "%s: Can't make child's stdout be line-buffered." msgstr "" "%s: Impossible de mettre en place une sortie standard ligne ŕ ligne\n" "pour le fils." -#: lexer.l:135 lexer.l:148 lexer.l:228 lexer.l:303 lexer.l:518 lexer.l:568 +#: lexer.l:135 lexer.l:148 lexer.l:230 lexer.l:319 lexer.l:553 lexer.l:603 #, c-format msgid "%s: Can't make copy of string." msgstr "%s: Impossible de copier une chaîne." -#: ../src/GenericConduit.cc:2495 ../src/archive.c:68 ../src/archive.c:127 -#: ../src/install.c:260 ../src/install.c:425 ../src/install.c:516 -#: ../src/parser.y:1223 +#: ../src/GenericConduit.cc:2344 ../src/archive.c:68 ../src/archive.c:127 +#: ../src/install.c:260 ../src/install.c:411 ../src/install.c:502 +#: ../src/parser.y:1315 #, c-format msgid "%s: Can't open \"%s\"." msgstr "%s: Impossible d'ouvrir Ť %s ť." -#: ../libpconn/PConnection_usb.c:717 +#: ../libpconn/PConnection_usb.c:740 #, c-format msgid "%s: Can't open \"%s\".\n" msgstr "%s: Impossible d'ouvrir Ť %s ť.\n" -#: ../src/GenericConduit.cc:298 ../src/GenericConduit.cc:318 -#: ../src/GenericConduit.cc:568 ../src/GenericConduit.cc:587 -#: ../src/GenericConduit.cc:1063 ../src/GenericConduit.cc:1082 +#: ../src/GenericConduit.cc:297 ../src/GenericConduit.cc:310 +#: ../src/GenericConduit.cc:534 ../src/GenericConduit.cc:546 +#: ../src/GenericConduit.cc:991 ../src/GenericConduit.cc:1003 #, c-format msgid "%s: Can't open \"%s\": %d." msgstr "%s: Impossible d'ouvrir Ť %s ť: %d." -#: ../libpconn/PConnection_usb.c:491 +#: ../libpconn/PConnection_usb.c:514 #, c-format msgid "%s: Can't open USB device.\n" msgstr "%s: Je n'arrive pas ŕ ouvrir le port USB.\n" -#: ../src/coldsync.c:2942 +#: ../src/coldsync.c:2249 #, c-format msgid "%s: Can't open directory \"%s\"." msgstr "%s: impossible d'ouvrir le répertoire Ť %s ť." -#: ../src/install.c:403 ../src/install.c:468 +#: ../src/install.c:389 ../src/install.c:454 #, c-format msgid "%s: Can't open install directory." msgstr "%s: Impossible d'ouvrir le répertoire d'installation." -#: ../src/GenericConduit.cc:194 +#: ../src/GenericConduit.cc:200 #, c-format msgid "%s: Can't read %s backup file." msgstr "%s: Impossible de lire le fichier de secours pour %s." @@ -551,12 +560,12 @@ msgstr "" msgid "%s: Can't read sort block for %s: %d.\n" msgstr "%s: Je n'arrive pas ŕ lire le bloc de tri pour %s: %d.\n" -#: ../src/coldsync.c:3047 ../src/coldsync.c:3085 +#: ../src/coldsync.c:2354 ../src/coldsync.c:2392 #, c-format msgid "%s: Can't rename \"%s\" to \"%s\"." msgstr "%s: Impossible de renommer Ť %s ť en Ť %s ť." -#: ../src/GenericConduit.cc:2564 +#: ../src/GenericConduit.cc:2413 #, c-format msgid "" "%s: Can't rename staging file.\n" @@ -565,15 +574,15 @@ msgstr "" "%s: Ne peux pas renommer fichier en attente.\n" "Il devrait y avoir un backup dans Ť %s ť." -#: ../src/GenericConduit.cc:468 ../src/GenericConduit.cc:967 -#: ../src/GenericConduit.cc:1510 +#: ../src/GenericConduit.cc:444 ../src/GenericConduit.cc:905 +#: ../src/GenericConduit.cc:1406 #, c-format msgid "%s: Can't reset sync flags: %d." msgstr "" "%s: Erreur: Je n'arrive pas a remettre ŕ zéro les flags de\n" "synchronisation: %d." -#: ../src/restore.c:120 +#: ../src/restore.c:129 #, c-format msgid "%s: Can't restore %s: it is opened by another application." msgstr "%s: Ne peux pas restaurer %s: il est ouvert par un autre programme." @@ -583,12 +592,17 @@ msgstr "%s: Ne peux pas restaurer %s: il est ouvert par un autre programme." msgid "%s: Can't seek to end of file." msgstr "%s: Impossible de me positionner ŕ la fin du fichier." -#: ../src/conduit.c:373 +#: ../src/parser.y:909 +#, fuzzy, c-format +msgid "%s: Can't set option.\n" +msgstr "%s: Impossible d'ouvrir Ť %s ť.\n" + +#: ../src/conduit.c:390 #, c-format msgid "%s: Can't set signal handler." msgstr "%s: Impossible de mettre en place une fonction de gestion de signal." -#: ../src/conduit.c:427 +#: ../src/conduit.c:445 #, c-format msgid "%s: Can't spawn conduit." msgstr "%s: Impossible de lancer un conduit." @@ -603,8 +617,8 @@ msgstr "%s: Je n'arrive pas msgid "%s: Can't write archive file header." msgstr "%s: Impossible d'écrire l'entęte du fichier d'archive." -#: ../src/GenericConduit.cc:419 ../src/GenericConduit.cc:925 -#: ../src/GenericConduit.cc:1461 +#: ../src/GenericConduit.cc:402 ../src/GenericConduit.cc:870 +#: ../src/GenericConduit.cc:1364 #, c-format msgid "%s: Can't write backup file." msgstr "%s: Impossible d'écrire le fichier de sauvegarde." @@ -641,7 +655,7 @@ msgstr "" msgid "%s: Can't write sort block for \"%.*s\".\n" msgstr "%s: Je n'arrive pas ŕ écrire le bloc de tri de Ť %.*s ť.\n" -#: ../src/GenericConduit.cc:2552 +#: ../src/GenericConduit.cc:2401 #, c-format msgid "%s: Can't write staging file \"%s\"." msgstr "%s: Impossible d'écrire le fichier intermédiaire Ť %s ť." @@ -651,19 +665,19 @@ msgstr "%s: Impossible d' msgid "%s: Can't write the two useless NULs to \"%.*s\".\n" msgstr "%s: Je n'arrive pas ŕ écrire les deux octets inutiles dans Ť %.*s ť.\n" -#: ../src/conduit.c:1880 +#: ../src/conduit.c:1960 #, c-format msgid "%s: Conduit exited unexpectedly." msgstr "%s: conduit s'est terminé de maničre inattendue." -#: ../src/conduit.c:677 +#: ../src/conduit.c:698 #, c-format msgid "" "%s: Conduit handler is in an inconsistent state at\n" "%s, line %d. Please notify the maintainer." msgstr "" -#: ../src/conduit.c:1871 +#: ../src/conduit.c:1951 #, c-format msgid "" "%s: Conduit is running happily, but hasn't printed anything.\n" @@ -673,34 +687,34 @@ msgstr "" "Pourtant, on m'a averti. Ceci est un bug. Veuillez en informer le\n" "mainteneur." -#: ../libpconn/PConnection_usb.c:625 +#: ../libpconn/PConnection_usb.c:648 #, c-format msgid "%s: Could not find HotSync endpoint on Visor.\n" msgstr "%s: Je n'arrive pas ŕ établir la connection HotSync avec le Visor.\n" -#: ../src/conduit.c:1681 +#: ../src/conduit.c:1538 #, fuzzy, c-format msgid "%s: Couldn't change directory to \"%s\"\n" msgstr "%s: impossible d'ouvrir le répertoire Ť %s ť." -#: ../src/restore.c:109 +#: ../src/restore.c:118 #, c-format msgid "%s: Database %s doesn't exist, yet it is open. Huh?" msgstr "" "%s: La base de données %s n'existe pas, et pourtant elle est ouverte.\n" "Qu'est-ce qui se passe?" -#: ../src/install.c:335 ../src/install.c:580 +#: ../src/install.c:328 ../src/install.c:566 #, c-format msgid "%s: Error deleting \"%s\"." msgstr "%s: Erreur lors de l'effaçage de Ť %s ť." -#: ../src/GenericConduit.cc:1355 ../src/GenericConduit.cc:1394 +#: ../src/GenericConduit.cc:1267 ../src/GenericConduit.cc:1304 #, c-format msgid "%s: Error deleting record 0x%08lx: %d." msgstr "%s: Erreur lors de l'effaçage de l'enregistrement 0x%08lx: %d." -#: ../src/conduit.c:788 +#: ../src/conduit.c:809 #, fuzzy, c-format msgid "%s: Error header wrong length %ld." msgstr "%s: Erreur lors de l'effaçage de Ť %s ť." @@ -710,32 +724,32 @@ msgstr "%s: Erreur lors de l'effa msgid "%s: Error in DlpRPC().\n" msgstr "%s: Erreur dans Ť DlpRPC() ť.\n" -#: ../src/conduit.c:708 +#: ../src/conduit.c:729 #, c-format msgid "%s: Error in select()." msgstr "%s: Erreur dans Ť select() ť." -#: ../src/conduit.c:774 +#: ../src/conduit.c:795 #, c-format msgid "%s: Error reading SPC request from conduit." msgstr "%s: Erreur lors de la lecture d'une demande SPC du conduit." -#: ../src/conduit.c:847 +#: ../src/conduit.c:868 #, c-format msgid "%s: Error reading SPC request." msgstr "%s: Erreur lors de la lecture d'une demande SPC." -#: ../src/conduit.c:975 +#: ../src/conduit.c:996 #, c-format msgid "%s: Error sending SPC response data." msgstr "%s: Erreur en envoyant des données SPC." -#: ../libpconn/padp.c:757 +#: ../libpconn/padp.c:755 #, c-format msgid "%s: Error sending dummy ACK. This is serious.\n" msgstr "%s: erreur en envoyant un ACK bidon. C'est sérieux.\n" -#: ../src/install.c:356 ../src/install.c:612 +#: ../src/install.c:342 ../src/install.c:584 #, c-format msgid "%s: Error uploading \"%s\"." msgstr "%s: Erreur lors de l'installation de Ť %s ť." @@ -745,29 +759,29 @@ msgstr "%s: Erreur lors de l'installation de msgid "%s: Error: dlp.write returned %d.\n" msgstr "%s: Erreur: Ť dlp.write ť a retourné %d.\n" -#: ../src/conduit.c:353 +#: ../src/conduit.c:370 #, c-format msgid "" "%s: I just got file descriptor %d. There appears to be a file\n" "descriptor leak. Please notify the maintainer." msgstr "" -#: ../src/GenericConduit.cc:1347 ../src/GenericConduit.cc:1386 -#: ../src/GenericConduit.cc:1630 ../src/GenericConduit.cc:1680 -#: ../src/GenericConduit.cc:1846 ../src/GenericConduit.cc:2198 -#: ../src/GenericConduit.cc:2240 +#: ../src/GenericConduit.cc:1261 ../src/GenericConduit.cc:1298 +#: ../src/GenericConduit.cc:1524 ../src/GenericConduit.cc:1573 +#: ../src/GenericConduit.cc:1728 ../src/GenericConduit.cc:2058 +#: ../src/GenericConduit.cc:2099 #, c-format msgid "%s: Lost connection to Palm." msgstr "%s: J'ai perdu la connexion au Palm." -#: ../src/config.c:721 +#: ../src/config.c:807 #, c-format msgid "%s: Missing mode string. This should never happen." msgstr "" "%s: select() a retourné une erreur inattendue. Ceci ne devrait\n" "jamais arriver." -#: ../src/parser.y:352 +#: ../src/parser.y:398 #, c-format msgid "" "%s: No `type:' line seen\n" @@ -776,20 +790,25 @@ msgstr "" "%s: Il n'y a pas de ligne Ť type: ť\n" "\tdans la définition de Ť %s ť." -#: ../src/conduit.c:1663 +#: ../src/conduit.c:1719 #, c-format msgid "%s: No executable \"%s\" in $CONDUIT_PATH or $CONDUITDIR.\n" msgstr "" -#: ../src/config.c:1100 ../src/config.c:1136 ../src/config.c:1158 -#: ../src/pref.c:234 ../src/pref.c:299 lexer.l:705 +#: ../src/conduit.c:1757 +#, fuzzy, c-format +msgid "%s: No home directory for %s.\n" +msgstr "%s: impossible d'ouvrir le répertoire Ť %s ť." + +#: ../src/config.c:1243 ../src/config.c:1279 ../src/config.c:1301 +#: ../src/pref.c:220 ../src/pref.c:278 lexer.l:506 lexer.l:740 #, c-format msgid "%s: Out of memory." msgstr "%s: Plus de mémoire." -#: ../libpconn/dlp_cmd.c:1284 ../libpconn/dlp_cmd.c:1435 -#: ../libpconn/dlp_cmd.c:2183 ../libpconn/dlp_cmd.c:2437 -#: ../libpconn/dlp_cmd.c:3356 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 +#: ../libpconn/dlp_cmd.c:1296 ../libpconn/dlp_cmd.c:1447 +#: ../libpconn/dlp_cmd.c:2195 ../libpconn/dlp_cmd.c:2449 +#: ../libpconn/dlp_cmd.c:3368 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 #: ../libpdb/pdb.c:1090 ../libpdb/pdb.c:1137 ../libpdb/pdb.c:1448 #: ../libpdb/pdb.c:1563 ../libpdb/pdb.c:1676 ../libpdb/pdb.c:1840 #: ../libpdb/pdb.c:1981 ../src/backup.c:138 ../src/backup.c:187 @@ -799,24 +818,24 @@ msgstr "%s: Plus de m msgid "%s: Out of memory.\n" msgstr "%s: Plus de mémoire.\n" -#: ../src/conduit.c:361 +#: ../src/conduit.c:378 #, c-format msgid "%s: Too many file descriptors. Aborting." msgstr "" -#: ../src/GenericConduit.cc:1638 ../src/GenericConduit.cc:1688 -#: ../src/GenericConduit.cc:1854 ../src/GenericConduit.cc:2206 -#: ../src/GenericConduit.cc:2248 +#: ../src/GenericConduit.cc:1533 ../src/GenericConduit.cc:1581 +#: ../src/GenericConduit.cc:1737 ../src/GenericConduit.cc:2067 +#: ../src/GenericConduit.cc:2107 #, c-format msgid "%s: Warning: Can't delete record 0x%08lx: %d." msgstr "%s: Avertissement: Impossible d'effacer l'enregistrement 0x%08lx: %d." -#: ../libpconn/PConnection_usb.c:543 +#: ../libpconn/PConnection_usb.c:566 #, c-format msgid "%s: Warning: Unexpected USB vendor ID %#x.\n" msgstr "%s: Avertissement: Numéro de vendeur USB %#x inattendu.\n" -#: ../libpconn/slp.c:250 +#: ../libpconn/slp.c:248 #, c-format msgid "%s: bad checksum: expected 0x%02x, got 0x%02x.\n" msgstr "" @@ -855,7 +874,7 @@ msgstr "" "%s: Impossible de créer le nouveau fichier de secours %s\n" "Peut-ętre qu'il existe déjŕ." -#: ../src/backup.c:668 +#: ../src/backup.c:647 #, c-format msgid "%s: can't write database \"%s\" to \"%s\"." msgstr "%s: impossible d'écrire la base de données Ť %s ť a Ť %s ť." @@ -880,27 +899,32 @@ msgstr "" "%s: erreur lors de la lecture d'un élément de l'index des\n" "enregistrements dans Ť %.*s ť (%d octets): %d.\n" -#: ../src/conduit.c:942 +#: ../src/conduit.c:963 #, c-format msgid "%s: error sending SPC response header." msgstr "%s: erreur en envoyant l'entęte de réponse SPC." -#: ../src/conduit.c:1694 +#: ../src/conduit.c:1774 #, fuzzy, c-format msgid "%s: execv(%s) failed and returned %d." msgstr "%s: execv(%s) a échoué et a retourné %d." -#: ../src/config.c:1224 lexer.l:731 +#: ../src/conduit.c:1761 +#, fuzzy, c-format +msgid "%s: getpwuid(%d) failed.\n" +msgstr "%s: realloc(%d) a échoué.\n" + +#: ../src/config.c:1367 lexer.l:767 #, c-format msgid "%s: realloc(%d) failed." msgstr "%s: realloc(%d) a échoué." -#: ../src/conduit.c:722 +#: ../src/conduit.c:743 #, c-format msgid "%s: select() returned 0. I'm puzzled." msgstr "%s: select() a retourné 0. C'est bizarre." -#: ../src/conduit.c:1817 +#: ../src/conduit.c:1897 #, c-format msgid "" "%s: select() returned 0. This should never happen. Please notify the " @@ -909,29 +933,29 @@ msgstr "" "%s: select() a retourné 0. Ceci ne devrait jamais arriver.\n" "Veuillez en informer le mainteneur." -#: ../src/conduit.c:1774 +#: ../src/conduit.c:1854 #, c-format msgid "%s: select() returned an unexpected error. This should never happen." msgstr "" "%s: select() a retourné une erreur inattendue. Ceci ne devrait\n" "jamais arriver." -#: ../src/config.c:1025 +#: ../src/config.c:1168 #, c-format msgid "%s: socket() returned %d." msgstr "%s: socket() a retourné %d." -#: ../libpconn/PConnection_usb.c:662 +#: ../libpconn/PConnection_usb.c:685 #, c-format msgid "%s: unexpected response %d to GetBytesAvailable.\n" msgstr "%s: réponse inattendue ŕ GetBytesAvailable: %d.\n" -#: ../libpconn/PConnection.c:124 +#: ../libpconn/PConnection.c:125 #, c-format msgid "%s: unknown listen type %d.\n" msgstr "%s: l'argument %d est d'un type inconnu.\n" -#: lexer.l:632 +#: lexer.l:667 #, c-format msgid "" "%s: unknown start state %d.\n" @@ -940,18 +964,18 @@ msgstr "" "%s: état de départ %d inconnu.\n" "Veuillez dire au mainteneur de réparer Ť lexer.l ť." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:303 -#: ../src/GenericConduit.cc:323 ../src/GenericConduit.cc:343 -#: ../src/GenericConduit.cc:423 ../src/GenericConduit.cc:452 -#: ../src/GenericConduit.cc:480 ../src/GenericConduit.cc:492 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:302 +#: ../src/GenericConduit.cc:315 ../src/GenericConduit.cc:328 +#: ../src/GenericConduit.cc:406 ../src/GenericConduit.cc:428 +#: ../src/GenericConduit.cc:454 ../src/GenericConduit.cc:465 msgid "(1st)" msgstr "(1er)" -#: ../src/coldsync.c:1090 ../src/coldsync.c:2679 +#: ../src/coldsync.c:1084 msgid "*Cancelled*\n" msgstr "*Annulé*\n" -#: ../libpconn/padp.c:676 +#: ../libpconn/padp.c:674 msgid "ACK Timeout. Attempting to resend.\n" msgstr "Timeout en attendant un ACK. J'essaie d'envoyer de nouveau.\n" @@ -960,9 +984,9 @@ msgstr "Timeout en attendant un ACK. J'essaie d'envoyer de nouveau.\n" msgid "Backing up \"%s\"" msgstr "Backup de Ť %s ť." -#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:596 -#: ../src/backup.c:628 ../src/backup.c:655 ../src/backup.c:675 -#: ../src/backup.c:686 ../src/coldsync.c:1415 +#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:589 +#: ../src/backup.c:614 ../src/backup.c:634 ../src/backup.c:654 +#: ../src/backup.c:665 ../src/coldsync.c:1478 msgid "Backup" msgstr "Backup" @@ -970,7 +994,7 @@ msgstr "Backup" msgid "Bad file descriptor" msgstr "Mauvais descripteur de fichier" -#: ../src/coldsync.c:898 ../src/coldsync.c:2502 +#: ../src/coldsync.c:945 #, c-format msgid "CacheFromConduits() returned %d." msgstr "CacheFromConduits() a rendu le code de retour %d." @@ -979,15 +1003,15 @@ msgstr "CacheFromConduits() a rendu le code de retour %d." msgid "Can't allocate list of record IDs.\n" msgstr "Je ne peux pas allouer la liste des numéros d'enregistrements.\n" -#: ../src/config.c:467 ../src/config.c:508 +#: ../src/config.c:550 ../src/config.c:591 msgid "Can't allocate listen block." msgstr "Impossible d'allouer un bloc d'écoute." -#: ../src/config.c:320 +#: ../src/config.c:394 msgid "Can't allocate new conduit block." msgstr "Impossible d'allouer un conduit_block." -#: ../src/config.c:297 +#: ../src/config.c:370 msgid "Can't allocate new configuration." msgstr "Impossible d'allouer une nouvelle configuration." @@ -995,62 +1019,60 @@ msgstr "Impossible d'allouer une nouvelle configuration." msgid "Can't allocate new connection.\n" msgstr "J'arrive pas ŕ allouer une nouvelle connexion.\n" -#: ../src/coldsync.c:566 ../src/coldsync.c:1360 ../src/coldsync.c:1507 -#: ../src/coldsync.c:1650 ../src/coldsync.c:2103 +#: ../src/coldsync.c:562 msgid "Can't allocate struct Palm." msgstr "Je n'arrive pas ŕ allouer un Ť struct Palm ť." -#: ../src/coldsync.c:557 ../src/coldsync.c:1352 ../src/coldsync.c:1499 -#: ../src/coldsync.c:1642 ../src/coldsync.c:2094 +#: ../src/coldsync.c:553 msgid "Can't connect to Palm." msgstr "Impossible de se connecter au Palm." -#: ../libpconn/PConnection_net.c:411 +#: ../libpconn/PConnection_net.c:449 msgid "Can't connect to server.\n" msgstr "Impossible de se connecter au serveur.\n" -#: ../src/GenericConduit.cc:720 ../src/GenericConduit.cc:2085 +#: ../src/GenericConduit.cc:672 ../src/GenericConduit.cc:1947 msgid "Can't copy a new record." msgstr "Je n'arrive pas ŕ copier un nouvel enregistrement." -#: ../src/coldsync.c:2299 +#: ../src/coldsync.c:2140 msgid "Can't copy config file name" msgstr "Impossible de copier le nom du fichier de configuration" -#: ../src/config.c:475 ../src/config.c:516 +#: ../src/config.c:558 ../src/config.c:599 msgid "Can't copy string." msgstr "Impossible de copier une chaîne." -#: ../src/GenericConduit.cc:2436 +#: ../src/GenericConduit.cc:2285 #, c-format msgid "Can't create \"%s\"." msgstr "Impossible de créer Ť %s ť." -#: ../src/config.c:1627 +#: ../src/config.c:1813 #, c-format msgid "Can't create archive directory %s." msgstr "Je n'arrive pas ŕ créer le répertoire d'archive %s." -#: ../src/config.c:1609 +#: ../src/config.c:1795 #, c-format msgid "Can't create attic directory %s." msgstr "Je n'arrive pas ŕ créer le répertoire grenier %s." -#: ../src/config.c:1591 +#: ../src/config.c:1777 #, c-format msgid "Can't create backup directory %s." msgstr "Je n'arrive pas ŕ créer le répertoire de backup %s." -#: ../src/config.c:1573 +#: ../src/config.c:1759 #, c-format msgid "Can't create base sync directory %s." msgstr "Je n'arrive pas ŕ créer le répertoire de synchronisation de base %s." -#: ../src/coldsync.c:824 ../src/coldsync.c:2422 +#: ../src/coldsync.c:658 msgid "Can't create connection to forwarding host." msgstr "Je n'arrive pas ŕ lire l'index des enregistrements." -#: ../src/config.c:1645 +#: ../src/config.c:1831 #, c-format msgid "Can't create install directory %s." msgstr "Je n'arrive pas ŕ créer le répertoire d'installation %s." @@ -1060,19 +1082,19 @@ msgid "Can't download record or resource index.\n" msgstr "" "Je n'arrive pas ŕ télécharger l'index d'enregistrements ou de resources.\n" -#: ../src/coldsync.c:461 +#: ../src/coldsync.c:471 msgid "Can't dup(stderr)." msgstr "Impossible de dup(stderr)." -#: ../src/coldsync.c:836 ../src/coldsync.c:2434 +#: ../src/coldsync.c:675 msgid "Can't establish connection with forwarding host." msgstr "" -#: ../src/coldsync.c:975 ../src/coldsync.c:2568 +#: ../src/coldsync.c:1020 msgid "Can't fetch list of databases." msgstr "Impossible de télécharger la liste des bases de données." -#: ../src/coldsync.c:1195 ../src/coldsync.c:2775 +#: ../src/coldsync.c:1164 #, c-format msgid "Can't fetch preference 0x%08lx/%d." msgstr "Impossible de télécharger la préférence 0x%08lx/%d." @@ -1097,62 +1119,61 @@ msgstr "Je n'arrive pas msgid "Can't find the sort block in \"%.*s\"!\n" msgstr "Je n'arrive pas ŕ trouver le bloc de tri dans Ť %.*s ť!\n" -#: ../src/coldsync.c:232 +#: ../src/coldsync.c:235 msgid "Can't get host ID." msgstr "Impossible de trouver le numéro d'identification de l'hôte." -#: ../src/coldsync.c:784 ../src/coldsync.c:2383 +#: ../src/coldsync.c:623 msgid "Can't get host addresses." msgstr "Impossible de trouver les addresses de l'hôte." -#: ../src/config.c:899 +#: ../src/config.c:1042 msgid "Can't get host name." msgstr "Impossible de trouver le nom de l'hôte." -#: ../src/coldsync.c:909 ../src/coldsync.c:2513 +#: ../src/coldsync.c:955 msgid "Can't get last sync PC from Palm" msgstr "" "Impossible d'obtenir le numéro du dernier PC avec lequel le Palm a\n" "synchronisé." -#: ../src/spalm.c:451 +#: ../src/spalm.c:416 msgid "Can't get location of serial number." msgstr "Ne peux pas trouver l'endroit oů se trouve le numéro de série." -#: ../src/conduit.c:503 +#: ../src/conduit.c:524 msgid "Can't get preference item." msgstr "Impossible d'obtenir une préférence." -#: ../src/spalm.c:224 +#: ../src/spalm.c:211 msgid "Can't get system info." msgstr "Impossible d'obtenir les informations sur le systčme." -#: ../src/coldsync.c:641 ../src/coldsync.c:1764 +#: ../src/coldsync.c:1288 ../src/coldsync.c:1727 msgid "Can't get user ID from Palm." msgstr "Impossible d'obtenir le numéro de l'utilisateur." -#: ../src/config.c:373 ../src/spalm.c:324 +#: ../src/config.c:447 ../src/spalm.c:304 msgid "Can't get user info." msgstr "Impossible d'obtenir les informations sur l'utilisateur." -#: ../src/coldsync.c:694 +#: ../src/coldsync.c:1340 msgid "Can't get user name from Palm." msgstr "Impossible d'obtenir le nom de l'utilisateur du Palm." -#: ../src/config.c:1799 +#: ../src/config.c:1985 msgid "Can't get user's full name." msgstr "Impossible d'obtenir le nom complet de l'utilisateur." -#: ../src/coldsync.c:1010 ../src/coldsync.c:1229 ../src/coldsync.c:2603 -#: ../src/coldsync.c:2809 +#: ../src/coldsync.c:731 msgid "Can't install new files." msgstr "Impossible d'installer de nouveaux fichiers." -#: ../src/coldsync.c:225 ../src/coldsync.c:2316 +#: ../src/coldsync.c:228 ../src/coldsync.c:2156 msgid "Can't load configuration." msgstr "Impossible de lire la configuration." -#: ../src/install.c:434 +#: ../src/install.c:420 msgid "Can't load header." msgstr "Je n'arrive pas ŕ lire l'entęte." @@ -1167,11 +1188,11 @@ msgstr "" "%s: je n'arrive pas ŕ écrire l'entęte de la liste des enregistrements\n" "dans Ť %*.s ť.\n" -#: ../src/coldsync.c:589 +#: ../src/coldsync.c:1236 msgid "Can't look up Palm." msgstr "Impossible de trouver la description du Palm." -#: ../src/config.c:908 +#: ../src/config.c:1051 msgid "Can't look up my address." msgstr "Impossible de trouver mon adresse." @@ -1180,7 +1201,7 @@ msgstr "Impossible de trouver mon adresse." msgid "Can't open %s." msgstr "Impossible d'ouvrir %s." -#: ../src/backup.c:593 +#: ../src/backup.c:586 msgid "Can't open backup conduit." msgstr "Impossible d'ouvrir le conduit de copie." @@ -1189,26 +1210,25 @@ msgstr "Impossible d'ouvrir le conduit de copie." msgid "Can't open conduit for \"%s\": %d.\n" msgstr "Je n'arrive pas ŕ ouvrir de conduit pour Ť %s ť: %d.\n" -#: ../src/coldsync.c:548 ../src/coldsync.c:1344 ../src/coldsync.c:1491 -#: ../src/coldsync.c:1634 ../src/coldsync.c:2085 +#: ../src/coldsync.c:544 msgid "Can't open connection." msgstr "Je n'arrive pas ŕ ouvrir la connexion." -#: ../src/backup.c:624 +#: ../src/backup.c:610 #, c-format msgid "Can't open database \"%s\"." msgstr "Impossible d'ouvrir la base de données Ť %s ť." -#: ../src/coldsync.c:475 +#: ../src/coldsync.c:485 #, c-format msgid "Can't open log file \"%s\"." msgstr "Impossible d'ouvrir l'historique Ť %s ť." -#: ../src/coldsync.c:489 +#: ../src/coldsync.c:499 msgid "Can't open log file on stderr." msgstr "Impossible d'ouvrir l'historique sur stderr." -#: ../src/coldsync.c:178 +#: ../src/coldsync.c:181 msgid "Can't parse command-line arguments." msgstr "Je n'arrive pas ŕ lire l'index des enregistrements." @@ -1222,16 +1242,16 @@ msgstr "Impossible de lire msgid "Can't read AppInfo block for \"%.*s\".\n" msgstr "Je n'arrive pas ŕ lire le bloc AppInfo pour Ť %.*s ť: %d.\n" -#: ../src/spalm.c:300 +#: ../src/spalm.c:280 msgid "Can't read NetSync info." msgstr "Erreur lors de la lecture des informations sur NetSync." -#: ../src/restore.c:227 +#: ../src/restore.c:222 #, c-format msgid "Can't read contents of directory %s." msgstr "Impossible de lire le contenu du répertoire %s." -#: ../src/coldsync.c:1659 +#: ../src/coldsync.c:1623 msgid "Can't read length of serial number." msgstr "Impossible de lire la longueur du numéro de série." @@ -1279,7 +1299,7 @@ msgstr "Je n'arrive pas msgid "Can't read resources for \"%.*s\".\n" msgstr "Je n'arrive pas ŕ lire les resources de Ť %.*s ť.\n" -#: ../src/coldsync.c:1671 ../src/spalm.c:484 +#: ../src/coldsync.c:1635 ../src/spalm.c:442 msgid "Can't read serial number." msgstr "Impossible de lire le numéro de série." @@ -1288,85 +1308,89 @@ msgstr "Impossible de lire le num msgid "Can't read sort block for \"%.*s\".\n" msgstr "Je n'arrive pas ŕ lire le bloc de tri de Ť %.*s ť.\n" -#: ../src/coldsync.c:156 ../src/coldsync.c:161 ../src/coldsync.c:166 +#: ../src/coldsync.c:159 ../src/coldsync.c:164 ../src/coldsync.c:169 #, c-format msgid "Can't reserve file descriptor %d." msgstr "impossible de réserver le descripteur de fichier %d." -#: ../src/spalm.c:1006 +#: ../src/spalm.c:983 msgid "Can't resize palm->dblist." msgstr "Impossible de changer la taille de palm->dblist." -#: ../src/coldsync.c:793 ../src/coldsync.c:2392 +#: ../src/coldsync.c:630 msgid "Can't resolve forwarding address." msgstr "" -#: ../src/coldsync.c:1534 ../src/coldsync.c:1557 +#: ../src/coldsync.c:1549 ../src/coldsync.c:1572 msgid "Can't restore directory." msgstr "Je n'arrive pas ŕ restaurer un répertoire." -#: ../src/coldsync.c:2281 +#: ../src/coldsync.c:2123 msgid "Can't setuid" msgstr "Impossible d'exécuter Ť setuid ť." -#: ../src/coldsync.c:1161 ../src/coldsync.c:2741 +#: ../src/coldsync.c:1132 msgid "Can't write user info." msgstr "Impossible d'écrire les informations sur l'utilisateur." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:522 -#: ../src/GenericConduit.cc:1019 ../src/backup.c:581 ../src/restore.c:181 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:495 +#: ../src/GenericConduit.cc:954 ../src/backup.c:581 ../src/restore.c:176 msgid "Cancelled" msgstr "Annulé" -#: ../src/backup.c:576 ../src/coldsync.c:1380 ../src/coldsync.c:1428 -#: ../src/coldsync.c:1527 ../src/coldsync.c:1550 ../src/conduit.c:1183 -#: ../src/conduit.c:1243 ../src/restore.c:274 +#: ../src/backup.c:576 ../src/coldsync.c:1442 ../src/coldsync.c:1491 +#: ../src/coldsync.c:1541 ../src/coldsync.c:1564 ../src/conduit.c:1226 +#: ../src/conduit.c:1287 ../src/restore.c:269 msgid "Cancelled by Palm." msgstr "Annulé sur le Palm." -#: ../src/config.c:850 +#: ../src/config.c:993 msgid "ColdSync homepage at http://www.ooblick.com/software/coldsync/\n" msgstr "" "La page oučbe de ColdSync est http://www.ooblick.com/software/coldsync/\n" -#: ../src/config.c:856 +#: ../src/config.c:999 msgid "Compile-type options:\n" msgstr "Options lors de la compilation:\n" -#: ../src/conduit.c:1189 ../src/conduit.c:1249 +#: ../src/conduit.c:1232 ../src/conduit.c:1293 #, c-format msgid "Conduit %s exited abnormally. Continuing." msgstr "Le conduit %s a terminé de façon anormale. Je continue." -#: ../src/conduit.c:1169 ../src/conduit.c:1229 +#: ../src/conduit.c:1212 ../src/conduit.c:1273 #, c-format msgid "Conduit %s is not a %s conduit." msgstr "Le conduit %s n'est pas un conduit de type %s." -#: ../src/coldsync.c:1103 ../src/coldsync.c:2692 +#: ../src/coldsync.c:846 msgid "Conduit failed for unknown reason." msgstr "Un conduit a échoué pour une raison inconnue." -#: ../src/config.c:384 +#: ../src/config.c:458 #, c-format msgid "Config file \"%s\" doesn't exist." msgstr "Le fichier de configuration Ť %s ť n'existe pas." -#: ../src/coldsync.c:1244 ../src/coldsync.c:1454 ../src/coldsync.c:1575 -#: ../src/coldsync.c:1960 ../src/coldsync.c:2824 +#: ../src/coldsync.c:581 msgid "Couldn't disconnect." msgstr "Erreur lors de la déconnexion" -#: ../src/config.c:336 +#: ../src/config.c:1719 +#, fuzzy, c-format +msgid "Couldn't find the requested listen block: \"%s\"" +msgstr "Je n'arrive pas ŕ trouver le bloc de tri dans Ť %.*s ť!\n" + +#: ../src/config.c:410 msgid "Couldn't initialize configuration." msgstr "Erreur lors de l'initialisation de la configuration." -#: ../src/config.c:359 ../src/config.c:418 +#: ../src/config.c:433 ../src/config.c:492 #, c-format msgid "Couldn't read configuration file \"%s\"." msgstr "Erreur lors de la lecture du fichier de configuration Ť %s ť." -#: ../src/conduit.c:619 +#: ../src/conduit.c:640 msgid "Couldn't send header to conduit." msgstr "Je n'ai pas pu envoyer une entęte au conduit." @@ -1375,20 +1399,30 @@ msgid "DlpReadRecordIDList() read 0 records. What happened?\n" msgstr "" "DlpReadRecordIDList() a lu 0 enregistrements. Qu'est-ce qui s'est passé?\n" -#: ../libpconn/dlp_cmd.c:1805 +#: ../libpconn/dlp_cmd.c:1817 msgid "DlpWriteRecord: Can't allocate output buffer.\n" msgstr "DlpWriteRecord: J'arrive pas ŕ allouer un tampon de sortie.\n" -#: ../src/coldsync.c:1900 ../src/coldsync.c:3217 +#: ../src/coldsync.c:1828 ../src/coldsync.c:2599 #, c-format msgid "DlpWriteUserInfo failed: %d." msgstr "DlpWriteUserInfo a échoué: %d." -#: ../src/coldsync.c:930 ../src/coldsync.c:934 +#: ../src/coldsync.c:975 +#, fuzzy +msgid "Doing a (forced) fast sync." +msgstr "\t-F:\t\tForcer une synchronisation rapide.\n" + +#: ../src/coldsync.c:973 +#, fuzzy +msgid "Doing a (forced) slow sync." +msgstr "\t-S:\t\tForcer une synchronisation lente.\n" + +#: ../src/coldsync.c:979 msgid "Doing a fast sync." msgstr "" -#: ../src/coldsync.c:928 ../src/coldsync.c:932 +#: ../src/coldsync.c:977 msgid "Doing a slow sync." msgstr "" @@ -1396,43 +1430,47 @@ msgstr "" msgid "End of file" msgstr "Fin de fichier" -#: ../src/GenericConduit.cc:303 ../src/GenericConduit.cc:323 -#: ../src/GenericConduit.cc:343 ../src/GenericConduit.cc:423 -#: ../src/GenericConduit.cc:452 ../src/GenericConduit.cc:481 -#: ../src/GenericConduit.cc:572 ../src/GenericConduit.cc:591 -#: ../src/GenericConduit.cc:612 ../src/GenericConduit.cc:723 -#: ../src/GenericConduit.cc:929 ../src/GenericConduit.cc:952 -#: ../src/GenericConduit.cc:978 ../src/GenericConduit.cc:1067 -#: ../src/GenericConduit.cc:1086 ../src/GenericConduit.cc:1127 -#: ../src/GenericConduit.cc:1229 ../src/GenericConduit.cc:1465 -#: ../src/GenericConduit.cc:1494 ../src/GenericConduit.cc:1521 -#: ../src/backup.c:563 ../src/backup.c:596 ../src/backup.c:628 -#: ../src/backup.c:655 ../src/backup.c:675 ../src/install.c:586 -#: ../src/install.c:618 ../src/install.c:730 ../src/restore.c:192 +#: ../src/GenericConduit.cc:302 ../src/GenericConduit.cc:315 +#: ../src/GenericConduit.cc:328 ../src/GenericConduit.cc:406 +#: ../src/GenericConduit.cc:428 ../src/GenericConduit.cc:455 +#: ../src/GenericConduit.cc:538 ../src/GenericConduit.cc:550 +#: ../src/GenericConduit.cc:564 ../src/GenericConduit.cc:675 +#: ../src/GenericConduit.cc:874 ../src/GenericConduit.cc:890 +#: ../src/GenericConduit.cc:914 ../src/GenericConduit.cc:995 +#: ../src/GenericConduit.cc:1007 ../src/GenericConduit.cc:1048 +#: ../src/GenericConduit.cc:1150 ../src/GenericConduit.cc:1368 +#: ../src/GenericConduit.cc:1390 ../src/GenericConduit.cc:1416 +#: ../src/backup.c:563 ../src/backup.c:589 ../src/backup.c:614 +#: ../src/backup.c:634 ../src/backup.c:654 ../src/install.c:572 +#: ../src/install.c:590 ../src/install.c:702 ../src/restore.c:187 msgid "Error" msgstr "Erreur" -#: ../src/install.c:338 ../src/install.c:359 +#: ../src/install.c:331 ../src/install.c:345 msgid "Error\n" msgstr "Erreur\n" -#: ../src/coldsync.c:998 ../src/coldsync.c:1217 ../src/coldsync.c:2591 -#: ../src/coldsync.c:2797 +#: ../src/coldsync.c:712 ../src/coldsync.c:721 #, c-format msgid "Error %d running install conduits." msgstr "Erreur %d lors de l'éxecution des conduits d'installation." -#: ../src/coldsync.c:1258 ../src/coldsync.c:2837 +#: ../src/coldsync.c:752 ../src/coldsync.c:764 #, c-format msgid "Error %d running post-dump conduits." msgstr "Erreur %d lors de l'éxecution des conduits post-dump." -#: ../src/coldsync.c:1057 ../src/coldsync.c:2648 +#: ../src/coldsync.c:787 ../src/coldsync.c:800 #, c-format msgid "Error %d running pre-fetch conduits." msgstr "Erreur %d lors de l'exécution des conduits pre-fetch." -#: ../src/coldsync.c:1436 +#: ../src/coldsync.c:822 +#, fuzzy, c-format +msgid "Error %d running sync conduits." +msgstr "Erreur %d lors de l'éxecution des conduits d'installation." + +#: ../src/coldsync.c:1500 #, c-format msgid "Error backing up \"%s\"." msgstr "Erreur lors du backup de Ť %s ť." @@ -1442,17 +1480,17 @@ msgstr "Erreur lors du backup de msgid "Error creating database \"%s\": %d.\n" msgstr "Erreur lors de la création de la base de données Ť %s ť: %d.\n" -#: ../src/install.c:751 +#: ../src/install.c:723 #, c-format msgid "Error deleting \"%s\"." msgstr "Erreur en effaçant Ť %s ť." -#: ../src/coldsync.c:2904 +#: ../src/coldsync.c:2211 #, c-format msgid "Error during DlpEndOfSync: (%d) %s." msgstr "Erreur dans DlpEndOfSync: (%d) %s." -#: ../libpconn/cmp.c:141 +#: ../libpconn/cmp.c:142 #, c-format msgid "Error during cmp_read: (%d) %s.\n" msgstr "Erreur dans cmp_read: (%d) %s.\n" @@ -1465,16 +1503,16 @@ msgstr "Erreur lors de l'ouverture de la connexion CMP.\n" msgid "Error in system call or library function" msgstr "Erreur dans un appel de systčme ou une fonction dans une bibliothčque" -#: ../src/install.c:705 +#: ../src/install.c:677 #, c-format msgid "Error opening \"%s\"." msgstr "Erreur lors de l'ouverture de Ť %s ť." -#: ../libpconn/netsync.c:488 +#: ../libpconn/netsync.c:514 msgid "Error reading NetSync packet header.\n" msgstr "Erreur lors de la lecture de l'entęte d'un paquet NetSync.\n" -#: ../libpconn/netsync.c:624 +#: ../libpconn/netsync.c:659 msgid "Error sending NetSync header.\n" msgstr "Erreur lors de l'envoi d'une entęte de paquet NetSync.\n" @@ -1482,9 +1520,9 @@ msgstr "Erreur lors de l'envoi d'une ent msgid "Error trying to set speed.\n" msgstr "Erreur lors du rčglage de vitesse.\n" -#: ../src/GenericConduit.cc:888 ../src/GenericConduit.cc:1431 -#: ../src/GenericConduit.cc:1744 ../src/GenericConduit.cc:1889 -#: ../src/GenericConduit.cc:2055 ../src/GenericConduit.cc:2289 +#: ../src/GenericConduit.cc:833 ../src/GenericConduit.cc:1334 +#: ../src/GenericConduit.cc:1627 ../src/GenericConduit.cc:1762 +#: ../src/GenericConduit.cc:1917 ../src/GenericConduit.cc:2138 #, c-format msgid "Error uploading record 0x%08lx: %d." msgstr "Erreur lors de l'installation de l'enregistrement 0x%08lx: %d." @@ -1493,7 +1531,7 @@ msgstr "Erreur lors de l'installation de l'enregistrement 0x%08lx: %d." msgid "Error: " msgstr "Erreur: " -#: ../libpconn/PConnection_serial.c:612 ../libpconn/PConnection_usb.c:460 +#: ../libpconn/PConnection_serial.c:616 ../libpconn/PConnection_usb.c:483 #, c-format msgid "Error: Can't open \"%s\".\n" msgstr "Erreur: Impossible d'ouvrir Ť %s ť.\n" @@ -1509,11 +1547,11 @@ msgstr "" msgid "Error: Palm suggested unknown speed %ld\n" msgstr "" -#: ../libpconn/PConnection.c:118 +#: ../libpconn/PConnection.c:119 msgid "Error: USB support not enabled.\n" msgstr "" -#: ../libpconn/netsync.c:496 +#: ../libpconn/netsync.c:521 #, c-format msgid "Error: only read %d bytes of NetSync packet header.\n" msgstr "" @@ -1532,22 +1570,22 @@ msgstr "H msgid "Hey! I can't find the %dth resource in \"%.*s\"!\n" msgstr "Hé! Je n'arrive pas ŕ trouver la resource N° %d de Ť %.*s ť!\n" -#: ../src/config.c:924 +#: ../src/config.c:1067 msgid "Hey! This isn't an AF_INET address!" msgstr "M'enfin! Ceci n'est pas une adresse AF_INET!" -#: ../src/GenericConduit.cc:1200 +#: ../src/GenericConduit.cc:1121 msgid "" "I have a new, deleted record that is neither archived nor expunged\n" "What am I supposed to do?" msgstr "" -#: ../src/conduit.c:2191 +#: ../src/conduit.c:2279 msgid "Inside run_DummyConduit.\n" msgstr "" -#: ../src/install.c:584 ../src/install.c:616 ../src/install.c:701 -#: ../src/install.c:709 ../src/install.c:728 ../src/install.c:733 +#: ../src/install.c:570 ../src/install.c:588 ../src/install.c:673 +#: ../src/install.c:681 ../src/install.c:700 ../src/install.c:705 msgid "Install" msgstr "Installation de" @@ -1568,43 +1606,41 @@ msgstr "Num msgid "Invalid result ID" msgstr "Numéro de résultat invalable" -#: ../src/coldsync.c:500 +#: ../src/coldsync.c:510 #, c-format msgid "Log started on %s" msgstr "" -#: ../src/coldsync.c:583 ../src/coldsync.c:635 ../src/coldsync.c:688 -#: ../src/coldsync.c:970 ../src/coldsync.c:1069 ../src/coldsync.c:1098 -#: ../src/coldsync.c:1125 ../src/coldsync.c:1191 ../src/coldsync.c:1267 -#: ../src/coldsync.c:1385 ../src/coldsync.c:1433 ../src/coldsync.c:1530 -#: ../src/coldsync.c:1553 ../src/coldsync.c:2564 ../src/coldsync.c:2660 -#: ../src/coldsync.c:2687 ../src/coldsync.c:2708 ../src/coldsync.c:2771 -#: ../src/coldsync.c:2846 ../src/conduit.c:500 ../src/restore.c:278 +#: ../src/coldsync.c:1015 ../src/coldsync.c:1093 ../src/coldsync.c:1160 +#: ../src/coldsync.c:1194 ../src/coldsync.c:1231 ../src/coldsync.c:1283 +#: ../src/coldsync.c:1335 ../src/coldsync.c:1447 ../src/coldsync.c:1496 +#: ../src/coldsync.c:1544 ../src/coldsync.c:1567 ../src/conduit.c:521 +#: ../src/restore.c:273 msgid "Lost connection to Palm." msgstr "J'ai perdu la connexion au Palm." -#: ../src/conduit.c:1186 ../src/conduit.c:1246 +#: ../src/conduit.c:1229 ../src/conduit.c:1290 msgid "Lost connection to Palm. Aborting." msgstr "J'ai perdu la connexion au Palm. J'annulle." -#: ../src/config.c:263 +#: ../src/config.c:336 #, c-format msgid "Missing option argument after \"%s\"." msgstr "Argument manquant aprčs l'option Ť %s ť." -#: ../src/config.c:805 +#: ../src/config.c:947 msgid "Modes:\n" msgstr "Modes:\n" -#: ../src/coldsync.c:848 ../src/coldsync.c:2446 +#: ../src/coldsync.c:685 msgid "Network sync forwarding failed." msgstr "" -#: ../src/spalm.c:288 +#: ../src/spalm.c:275 msgid "No NetSync info.\n" msgstr "Pas d'informations sur NetSync.\n" -#: ../src/coldsync.c:1291 +#: ../src/coldsync.c:1392 msgid "No backup directory specified." msgstr "Vous n'avez pas précisé de répertoire de backup." @@ -1612,37 +1648,41 @@ msgstr "Vous n'avez pas pr msgid "No error" msgstr "Pas d'erreur" -#: ../src/coldsync.c:2230 +#: ../src/coldsync.c:2088 +#, c-format +msgid "No matching entry in %s, couldn't autoinit." +msgstr "" + +#: ../src/coldsync.c:2099 #, c-format msgid "No matching entry in %s." msgstr "" -#: ../src/coldsync.c:529 ../src/coldsync.c:1326 ../src/coldsync.c:1473 -#: ../src/coldsync.c:1616 ../src/coldsync.c:2064 +#: ../src/coldsync.c:525 msgid "No port specified." msgstr "Vous n'avez pas précisé de port." -#: ../src/coldsync.c:1417 +#: ../src/coldsync.c:1480 msgid "No such database" msgstr "Base de données inexistante" -#: ../src/coldsync.c:1412 +#: ../src/coldsync.c:1475 #, c-format msgid "No such database: \"%s\"." msgstr "La base de données Ť %s ť n'existe pas." -#: ../src/coldsync.c:1316 +#: ../src/coldsync.c:1417 #, c-format msgid "No such directory: \"%s\"." msgstr "Le répertoire Ť %s ť n'existe pas." -#: ../src/GenericConduit.cc:492 ../src/GenericConduit.cc:989 -#: ../src/GenericConduit.cc:1531 ../src/backup.c:686 ../src/install.c:703 -#: ../src/install.c:735 ../src/restore.c:197 +#: ../src/GenericConduit.cc:465 ../src/GenericConduit.cc:924 +#: ../src/GenericConduit.cc:1425 ../src/backup.c:665 ../src/install.c:675 +#: ../src/install.c:707 ../src/restore.c:192 msgid "OK" msgstr "OK" -#: ../src/config.c:812 +#: ../src/config.c:954 msgid "Options:\n" msgstr "Options:\n" @@ -1650,67 +1690,68 @@ msgstr "Options:\n" msgid "Out of memory" msgstr "Plus de mémoire" -#: ../libpconn/PConnection_serial.c:653 ../libpconn/PConnection_usb.c:435 +#: ../libpconn/PConnection_serial.c:590 ../libpconn/PConnection_serial.c:657 +#: ../libpconn/PConnection_usb.c:458 msgid "Please press the HotSync button.\n" msgstr "Appuyez sur le bouton HotSync.\n" -#: ../src/install.c:711 +#: ../src/install.c:683 msgid "Problem" msgstr "Problčme" -#: ../src/restore.c:181 ../src/restore.c:192 ../src/restore.c:197 +#: ../src/restore.c:176 ../src/restore.c:187 ../src/restore.c:192 msgid "Restore" msgstr "Restauration" -#: ../src/restore.c:149 +#: ../src/restore.c:151 #, c-format msgid "Restore: Can't delete database \"%s\": %d." msgstr "Restore: Impossible d'effacer la base de données Ť %s ť: %d." -#: ../src/coldsync.c:1251 +#: ../src/coldsync.c:746 msgid "Running Dump conduits" msgstr "En train d'exécuter les conduits Dump" -#: ../src/coldsync.c:1050 +#: ../src/coldsync.c:781 msgid "Running Fetch conduits" msgstr "En train d'exécuter les conduits Fetch" -#: ../src/coldsync.c:994 ../src/coldsync.c:1213 ../src/coldsync.c:2587 -#: ../src/coldsync.c:2793 +#: ../src/coldsync.c:706 msgid "Running Install conduits" msgstr "En train d'exécuter les conduits Install" -#: ../src/coldsync.c:1075 +#: ../src/coldsync.c:816 msgid "Running Sync conduits" msgstr "En train d'exécuter les conduits Sync" -#: ../libpconn/slp.c:391 +#: ../libpconn/slp.c:385 #, c-format msgid "SLP: bad CRC: expected 0x%04x, got 0x%04x.\n" msgstr "SLP: mauvais CRC: je m'attendais ŕ 0x%04x, mais j'ai reçu 0x%04x.\n" -#: ../src/coldsync.c:1855 +#: ../src/coldsync.c:2443 msgid "Set user ID" msgstr "" -#: ../src/coldsync.c:1890 +#: ../src/coldsync.c:2466 msgid "Set username" msgstr "" -#: ../src/coldsync.c:1120 +#: ../src/coldsync.c:1083 msgid "Sync cancelled by Palm." msgstr "Synchronisation annulée par le Palm." -#: ../src/coldsync.c:1089 ../src/coldsync.c:2678 -msgid "Sync cancelled." -msgstr "Synchronisation annulée." - -#: ../src/coldsync.c:621 +#: ../src/coldsync.c:1268 #, c-format msgid "Sync for %s at %s" msgstr "" -#: ../src/coldsync.c:649 +#: ../src/coldsync.c:834 +#, c-format +msgid "Syncing %s" +msgstr "" + +#: ../src/coldsync.c:1296 #, c-format msgid "" "This Palm has user ID %ld (I was expecting %ld).\n" @@ -1721,7 +1762,7 @@ msgid "" "something like this:" msgstr "" -#: ../src/coldsync.c:704 +#: ../src/coldsync.c:1350 #, c-format msgid "" "This Palm has user name \"%.*s\" (I was expecting \"%.*s\").\n" @@ -1732,7 +1773,7 @@ msgid "" "something like this:" msgstr "" -#: ../src/config.c:945 +#: ../src/config.c:1088 msgid "This host doesn't appear to have an IP address." msgstr "Cet hôte n'a pas l'air d'avoir une adresse IP." @@ -1745,7 +1786,7 @@ msgstr "Timeout" msgid "Too many errors. Aborting." msgstr "" -#: ../src/coldsync.c:3103 +#: ../src/coldsync.c:2410 #, c-format msgid "Too many files named \"%s\" in the attic." msgstr "Trop de fichiers nommés Ť %s ť au grenier." @@ -1758,7 +1799,7 @@ msgstr "Transfert annul msgid "Unexpected timeout" msgstr "" -#: ../src/config.c:229 +#: ../src/config.c:295 #, c-format msgid "Unknown device type: \"%s\"." msgstr "Type d'appareil Ť %s ť inconnu." @@ -1767,17 +1808,17 @@ msgstr "Type d'appareil msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/config.c:706 +#: ../src/config.c:792 #, c-format msgid "Unknown facility \"%s\"." msgstr "Catégorie de débogage inconnue: Ť %s ť." -#: ../src/config.c:755 +#: ../src/config.c:843 ../src/config.c:876 #, c-format msgid "Unknown mode: \"%s\"." msgstr "Mode Ť %s ť inconnu." -#: ../src/coldsync.c:345 +#: ../src/coldsync.c:353 #, c-format msgid "" "Unknown mode: %d.\n" @@ -1786,22 +1827,22 @@ msgstr "" "mode %d inconnu.\n" "Ceci est un bug. Veuillez en informer le mainteneur." -#: ../src/config.c:242 +#: ../src/config.c:308 #, c-format msgid "Unknown protocol: \"%s\"." msgstr "Protocole Ť %s ť inconnu." -#: ../src/coldsync.c:2261 +#: ../src/coldsync.c:2110 #, c-format msgid "Unknown user/uid: \"%s\"." msgstr "Utilisateur ou numéro d'utilisateur Ť %s ť inconnu." -#: ../src/config.c:254 +#: ../src/config.c:327 #, c-format msgid "Unrecognized option: \"%s\"." msgstr "L'option Ť %s ť n'est pas reconnue." -#: lexer.l:505 +#: lexer.l:540 #, c-format msgid "Unterminated string at line %d (string started on line %d)\n" msgstr "" @@ -1816,7 +1857,7 @@ msgstr "Installation de msgid "Uploading \"%s\"" msgstr "J'installe Ť %s ť." -#: ../src/config.c:834 +#: ../src/config.c:977 #, c-format msgid "Usage: %s [options] \n" msgstr "Usage: %s [options] \n" @@ -1834,7 +1875,7 @@ msgstr "" "Attention: Le bloc AppInfo dans Ť %.*s ť n'est pas lŕ oů je m'y\n" "attendais. Je croyais qu'il serait ŕ 0x%lx, mais nous sommes ŕ 0x%lx.\n" -#: ../src/spalm.c:461 +#: ../src/spalm.c:426 #, c-format msgid "" "Warning: ROM serial number is %d characters long. Please notify the\n" @@ -1861,7 +1902,7 @@ msgstr "" "Avertissement: ne peux pas transmettre ŕ la vitesse que vous avez demandé\n" "(%ld o/s). Je mettrai la vitesse de défaut.\n" -#: ../libpconn/PConnection_serial.c:603 +#: ../libpconn/PConnection_serial.c:607 #, c-format msgid "Warning: no device on %s. Sleeping\n" msgstr "" @@ -1894,7 +1935,7 @@ msgstr "" "Je croyais qu'il serait ŕ 0x%lx, mais nous sommes ŕ 0x%lx.\n" # XXX -#: ../libpconn/padp.c:647 +#: ../libpconn/padp.c:645 msgid "Write timeout. Attempting to resend.\n" msgstr "Timeout lors de l'écriture. J'essaie d'envoyer de nouveau.\n" @@ -1902,7 +1943,7 @@ msgstr "Timeout lors de l' msgid "XID on ACK doesn't match request" msgstr "" -#: ../src/spalm.c:563 +#: ../src/spalm.c:521 msgid "" "You have an old Palm, one that doesn't say how many\n" "databases it has. I can't cope with this." @@ -1910,7 +1951,7 @@ msgstr "" "Vous avez un vieux Palm, qui n'indique pas combien il a de bases de\n" "données. J'arrive pas ŕ bosser avec ce matos." -#: ../src/config.c:728 +#: ../src/config.c:814 #, c-format msgid "" "You shouldn't specify two -m options.\n" @@ -1919,7 +1960,7 @@ msgstr "" "Il ne faut pas donner deux options -m.\n" "\tJ'utiliserai l'option -m%s." -#: ../src/config.c:269 +#: ../src/config.c:342 #, c-format msgid "" "You specified an apparently legal option (\"-%c\"), but I don't know what\n" @@ -1928,26 +1969,29 @@ msgstr "" "Vous avez apparemment donné une option légale (Ť -%c ť), mais je ne sais\n" "pas qu'en faire. Ceci est un bug. Veuillez en informer le mainteneur." -#: ../src/GenericConduit.cc:177 +#: ../src/GenericConduit.cc:183 msgid "[generic]: Aborting." msgstr "" -#: ../libpconn/PConnection_usb.c:648 +#: ../libpconn/PConnection_usb.c:671 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable a échoué" -#: ../libpconn/PConnection_usb.c:586 +#: ../libpconn/PConnection_usb.c:609 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo a échoué" -#: ../src/GenericConduit.cc:340 +#: ../src/GenericConduit.cc:325 msgid "pdb_Download() failed." msgstr "pdb_Download() a échoué." -#: ../libpconn/PConnection_usb.c:181 +#: ../libpconn/PConnection_usb.c:204 msgid "usb: trying to fill a non-empty buffer.\n" msgstr "usb: tentat de remplir un tampon qui n'est pas vide.\n" +#~ msgid "Sync cancelled." +#~ msgstr "Synchronisation annulée." + #~ msgid "##### %s: Unknown argument type: 0x%02x\n" #~ msgstr "##### %s: Argument de type inconnu: 0x%02x\n" @@ -2083,9 +2127,6 @@ msgstr "usb: tentat de remplir un tampon qui n'est pas vide.\n" #~ msgid "DlpWriteUserInfo failed: %d.\n" #~ msgstr "DlpWriteUserInfo a échoué: %d.\n" -#~ msgid "%s: realloc(%d) failed.\n" -#~ msgstr "%s: realloc(%d) a échoué.\n" - #, fuzzy #~ msgid "Can't reserve file descriptor %d.\n" #~ msgstr "impossible de réserver le descripteur de fichier %d." diff --git a/i18n/it.po b/i18n/it.po index 96858367..7a70ca47 100644 --- a/i18n/it.po +++ b/i18n/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: coldsync 2.1.2\n" -"POT-Creation-Date: 2002-03-10 17:49+0100\n" +"POT-Creation-Date: 2002-06-21 16:10+0200\n" "PO-Revision-Date: 2001-06-19 04:03:+0100\n" "Last-Translator: Alessandro Gatti \n" "Language-Team: it \n" @@ -13,51 +13,51 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/config.c:819 +#: ../src/config.c:961 msgid "\t-F:\t\tForce fast sync.\n" msgstr "\t-F:\t\tForza la sincronizzazione veloce.\n" -#: ../src/config.c:817 +#: ../src/config.c:959 msgid "\t-I:\t\tForce installation of new databases.\n" msgstr "\t-I:\t\tForza l'installazione di nuovi database.\n" -#: ../src/config.c:823 +#: ../src/config.c:965 msgid "\t-P :\tSoftware protocol [default|full|simple|net].\n" msgstr "" -#: ../src/config.c:820 +#: ../src/config.c:962 msgid "\t-R:\t\tCheck ROM databases.\n" msgstr "\t-R:\t\tControlla i database della ROM.\n" -#: ../src/config.c:818 +#: ../src/config.c:960 msgid "\t-S:\t\tForce slow sync.\n" msgstr "\t-S:\t\tForza la sincronizzazione lenta.\n" -#: ../src/config.c:814 +#: ../src/config.c:956 msgid "\t-V:\t\tPrint version and exit.\n" msgstr "\t-V:\t\tStampa la versione ed esce.\n" -#: ../src/config.c:829 +#: ../src/config.c:972 msgid "\t-d :\tSet debugging level.\n" msgstr "\t-d :\tSetta il livello di debugging.\n" -#: ../src/config.c:815 +#: ../src/config.c:957 msgid "\t-f :\tRead configuration from \n" msgstr "\t-f :\tLegge la configurazione da \n" -#: ../src/config.c:813 +#: ../src/config.c:955 msgid "\t-h:\t\tPrint this help message and exit.\n" msgstr "\t-h:\t\tStampa questo messaggio ed esce.\n" -#: ../src/config.c:826 +#: ../src/config.c:968 msgid "\t-l: :\tWrite error/debugging messages to .\n" msgstr "\t-l: :\tScrivi i messaggi di errore/debug su .\n" -#: ../src/config.c:807 +#: ../src/config.c:949 msgid "\t-mI:\tInitialize.\n" msgstr "\t-mI:\tInizializza.\n" -#: ../src/config.c:808 +#: ../src/config.c:950 msgid "" "\t-mb [database...]\n" "\t\tPerform a backup to .\n" @@ -65,7 +65,7 @@ msgstr "" "\t-mb: [database...]\n" "\t\tEffettua un backup in .\n" -#: ../src/config.c:810 +#: ../src/config.c:952 msgid "" "\t-mr ...\n" "\t\tRestore or install new databases.\n" @@ -73,77 +73,81 @@ msgstr "" "\t-mr ...\n" "\t\tRipristina o installa nuovi database.\n" -#: ../src/config.c:806 +#: ../src/config.c:948 msgid "\t-ms:\tSynchronize (default).\n" msgstr "\t-ms:\tSincronizza (default).\n" -#: ../src/config.c:821 +#: ../src/config.c:971 +msgid "\t-n :\tChoice the named listen block.\n" +msgstr "" + +#: ../src/config.c:963 msgid "\t-p :\tListen on device .\n" msgstr "\t-p :\tSi mette in attesa sul device .\n" -#: ../src/config.c:825 +#: ../src/config.c:967 msgid "\t-s:\t\tLog error messages to syslog.\n" msgstr "\t-s:\t\tScrivi i messaggi di errore sul syslog.\n" -#: ../src/config.c:822 +#: ../src/config.c:964 msgid "\t-t :\tPort type [serial|usb|net].\n" msgstr "\t-t :\tTipo di porta [serial|usb|tcp].\n" -#: ../src/config.c:828 +#: ../src/config.c:970 msgid "\t-v:\t\tIncrease verbosity.\n" msgstr "\t-v:\t\tAumenta il livello di verbosita'.\n" -#: ../src/config.c:816 +#: ../src/config.c:958 msgid "\t-z:\t\tInstall databases after sync.\n" msgstr "\t-z:\t\tInstalla i database dopo la sincronizzazione.\n" -#: ../src/parser.y:327 ../src/parser.y:585 ../src/parser.y:1136 +#: ../src/parser.y:341 ../src/parser.y:658 ../src/parser.y:1229 #, c-format msgid "\tError near \"%s\"." msgstr "\tErrore vicino a \"%s\"." -#: ../src/parser.y:1165 +#: ../src/parser.y:1258 msgid "\tMissing ':'." msgstr "\tManca ':'." -#: ../src/parser.y:1182 +#: ../src/parser.y:1274 msgid "\tMissing ';'." msgstr "\tManca ';'." -#: ../src/parser.y:1174 +#: ../src/parser.y:1266 msgid "\tMissing '{'." msgstr "\tManca '{'." -#: ../src/parser.y:750 +#: ../src/parser.y:823 #, c-format msgid "\tMissing argument name near \": %s\"." msgstr "\tManca il nome dell'argomento vicino a \": %s\"." -#: ../src/parser.y:248 +#: ../src/parser.y:255 msgid "\tMissing listen block type." msgstr "\tManca il tipo del listen block." -#: ../src/parser.y:829 +#: ../src/parser.y:919 #, fuzzy, c-format msgid "\tMissing option name near \"%s\"." msgstr "Manca l'argomento dell'opzione dopo \"%s\"." -#: ../src/parser.y:415 +#: ../src/parser.y:461 #, c-format msgid "\tUnrecognized conduit flavor \"%s\"." msgstr "\tTipo di conduit non riconosciuto \"%s\"." -#: ../src/parser.y:250 +#: ../src/parser.y:257 #, c-format msgid "\tUnrecognized listen type \"%s\"." msgstr "\tTipo di listen non riconosciuto \"%s\"." -#: ../src/parser.y:449 +#: ../src/parser.y:495 #, fuzzy, c-format msgid "\tUnrecognized protocol: \"%s\"." msgstr "\tOpzione sconosciuta: \"%s\"." -#: ../src/config.c:874 +#: ../src/config.c:1017 #, c-format msgid "" "\n" @@ -152,7 +156,7 @@ msgstr "" "\n" " File globale di configurazione di default: %s\n" -#: ../src/coldsync.c:386 +#: ../src/coldsync.c:396 #, c-format msgid "" "\n" @@ -161,7 +165,7 @@ msgstr "" "\n" "Log chiuso il %s" -#: ../src/coldsync.c:1825 +#: ../src/coldsync.c:1787 msgid "" "\n" "This Palm already has user information that matches neither what's in your\n" @@ -179,7 +183,7 @@ msgstr "" "Il tuo file .coldsyncrc dovrebbe contenere qualcosa simile a questo:\n" "\n" -#: ../src/config.c:869 +#: ../src/config.c:1012 msgid "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: strings are compared without regard\n" " to case, whenever possible.\n" @@ -187,11 +191,11 @@ msgstr "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: le stringhe sono confrontate\n" " ignorando se sono maiuscole o minuscole ove possibile.\n" -#: ../src/config.c:864 +#: ../src/config.c:1007 msgid " WITH_EFENCE: buffer overruns will cause a segmentation violation.\n" msgstr " CON_EFENCE: scritture fuori dai buffer causeranno un segfault.\n" -#: ../src/config.c:860 +#: ../src/config.c:1003 msgid " WITH_USB: USB support.\n" msgstr " CON_USB: supporto USB.\n" @@ -200,134 +204,139 @@ msgstr " CON_USB: supporto USB.\n" msgid "\"%.*s\" record 0x%08lx has length 0.\n" msgstr "\"%.*s\" record 0x%08lx ha lunghezza 0.\n" -#: ../src/coldsync.c:1313 +#: ../src/coldsync.c:1414 #, c-format msgid "\"%s\" exists, but is not a directory." msgstr "\"%s\" esiste, ma non e' una directory." #: ../libpconn/dlp_cmd.c:191 ../libpconn/dlp_cmd.c:281 -#: ../libpconn/dlp_cmd.c:380 ../libpconn/dlp_cmd.c:439 -#: ../libpconn/dlp_cmd.c:503 ../libpconn/dlp_cmd.c:626 -#: ../libpconn/dlp_cmd.c:846 ../libpconn/dlp_cmd.c:935 -#: ../libpconn/dlp_cmd.c:1028 ../libpconn/dlp_cmd.c:1098 -#: ../libpconn/dlp_cmd.c:1168 ../libpconn/dlp_cmd.c:1252 -#: ../libpconn/dlp_cmd.c:1326 ../libpconn/dlp_cmd.c:1402 -#: ../libpconn/dlp_cmd.c:1477 ../libpconn/dlp_cmd.c:1564 -#: ../libpconn/dlp_cmd.c:1665 ../libpconn/dlp_cmd.c:1767 -#: ../libpconn/dlp_cmd.c:1875 ../libpconn/dlp_cmd.c:1946 -#: ../libpconn/dlp_cmd.c:2037 ../libpconn/dlp_cmd.c:2136 -#: ../libpconn/dlp_cmd.c:2218 ../libpconn/dlp_cmd.c:2290 -#: ../libpconn/dlp_cmd.c:2345 ../libpconn/dlp_cmd.c:2397 -#: ../libpconn/dlp_cmd.c:2533 ../libpconn/dlp_cmd.c:2578 -#: ../libpconn/dlp_cmd.c:2652 ../libpconn/dlp_cmd.c:2711 -#: ../libpconn/dlp_cmd.c:2774 ../libpconn/dlp_cmd.c:2819 -#: ../libpconn/dlp_cmd.c:2875 ../libpconn/dlp_cmd.c:2928 -#: ../libpconn/dlp_cmd.c:3038 ../libpconn/dlp_cmd.c:3133 -#: ../libpconn/dlp_cmd.c:3229 ../libpconn/dlp_cmd.c:3321 -#: ../libpconn/dlp_cmd.c:3401 ../libpconn/dlp_cmd.c:3499 -#: ../libpconn/dlp_cmd.c:3600 ../libpconn/dlp_cmd.c:3682 +#: ../libpconn/dlp_cmd.c:392 ../libpconn/dlp_cmd.c:451 +#: ../libpconn/dlp_cmd.c:515 ../libpconn/dlp_cmd.c:638 +#: ../libpconn/dlp_cmd.c:858 ../libpconn/dlp_cmd.c:947 +#: ../libpconn/dlp_cmd.c:1040 ../libpconn/dlp_cmd.c:1110 +#: ../libpconn/dlp_cmd.c:1180 ../libpconn/dlp_cmd.c:1264 +#: ../libpconn/dlp_cmd.c:1338 ../libpconn/dlp_cmd.c:1414 +#: ../libpconn/dlp_cmd.c:1489 ../libpconn/dlp_cmd.c:1576 +#: ../libpconn/dlp_cmd.c:1677 ../libpconn/dlp_cmd.c:1779 +#: ../libpconn/dlp_cmd.c:1887 ../libpconn/dlp_cmd.c:1958 +#: ../libpconn/dlp_cmd.c:2049 ../libpconn/dlp_cmd.c:2148 +#: ../libpconn/dlp_cmd.c:2230 ../libpconn/dlp_cmd.c:2302 +#: ../libpconn/dlp_cmd.c:2357 ../libpconn/dlp_cmd.c:2409 +#: ../libpconn/dlp_cmd.c:2545 ../libpconn/dlp_cmd.c:2590 +#: ../libpconn/dlp_cmd.c:2664 ../libpconn/dlp_cmd.c:2723 +#: ../libpconn/dlp_cmd.c:2786 ../libpconn/dlp_cmd.c:2831 +#: ../libpconn/dlp_cmd.c:2887 ../libpconn/dlp_cmd.c:2940 +#: ../libpconn/dlp_cmd.c:3050 ../libpconn/dlp_cmd.c:3145 +#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3333 +#: ../libpconn/dlp_cmd.c:3413 ../libpconn/dlp_cmd.c:3511 +#: ../libpconn/dlp_cmd.c:3612 ../libpconn/dlp_cmd.c:3694 #, c-format msgid "##### %s: Unknown argument type: 0x%02x.\n" msgstr "##### %s: Tipo di argomento sconosciuto: 0x%02x.\n" -#: ../libpconn/padp.c:484 +#: ../libpconn/padp.c:482 #, c-format msgid "##### Bad offset: wanted %d, got %d.\n" msgstr "##### Offset errato: volevo %d, ho ricevuto %d.\n" -#: ../libpconn/dlp.c:291 +#: ../libpconn/dlp.c:292 #, c-format msgid "##### Bad response ID: expected 0x%02x, got 0x%02x.\n" msgstr "" "##### ID di risposta errato: mi aspettavo 0x%02x, ho ricevuto 0x%02x.\n" -#: ../libpconn/padp.c:802 +#: ../libpconn/padp.c:800 #, c-format msgid "##### Expected XID 0x%02x, got 0x%02x.\n" msgstr "##### MI aspettavo uno XID 0x%02x, ho ricevuto 0x%02x.\n" -#: ../libpconn/dlp.c:282 +#: ../libpconn/dlp.c:283 msgid "##### Expected a DLP response, but this isn't one!\n" msgstr "##### Mi aspettavo una risposta DLP, ma questa non lo e'!\n" -#: ../libpconn/padp.c:729 +#: ../libpconn/padp.c:727 msgid "##### Got an unexpected data packet. Sending an ACK to shut it up.\n" msgstr "" "##### Ho ricevuto un data packet inaspettato. Mando un ACK per zittirlo.\n" -#: ../libpconn/padp.c:198 ../libpconn/padp.c:446 +#: ../libpconn/padp.c:198 ../libpconn/padp.c:444 msgid "##### I just got an unexpected ACK. I'm confused!\n" msgstr "##### Ho appena ricevuto un ACK inaspettato. Sono confuso!\n" -#: ../libpconn/padp.c:471 +#: ../libpconn/padp.c:469 msgid "##### I wasn't expecting a new fragment. I'm confused!\n" msgstr "##### Non mi aspettavo un nuovo frammento. Sono confuso!\n" -#: ../libpconn/padp.c:217 ../libpconn/padp.c:461 ../libpconn/padp.c:790 +#: ../libpconn/padp.c:217 ../libpconn/padp.c:459 ../libpconn/padp.c:788 #, c-format msgid "##### Unexpected packet type %d.\n" msgstr "##### Packet inaspettato di tipo %d.\n" -#: lexer.l:460 +#: lexer.l:476 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: lexer.l:469 +#: lexer.l:485 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"${%.*s}\".\n" msgstr "" -#: lexer.l:474 +#: lexer.l:490 #, c-format msgid "" "%d: Unterminated variable reference near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: ../src/config.c:845 +#: ../src/config.c:988 #, c-format msgid "%s version %s.\n" msgstr "%s versione %s.\n" -#: ../src/parser.y:614 +#: ../src/parser.y:687 #, c-format msgid "%s: %d: Bogus creator \"%s\"." msgstr "%s: %d: Creatore \"%s\" non valido." -#: ../src/parser.y:638 +#: ../src/parser.y:711 #, c-format msgid "%s: %d: Bogus type \"%s\"." msgstr "%s: %d: Tipo \"%s\" non valido." -#: ../src/parser.y:498 +#: ../src/parser.y:549 #, c-format msgid "%s: %d: Can't add creator-type pair to list. This is very bad." msgstr "" "%s: %d: Non posso aggiungere la coppia creatore-tipo alla lista. Questo e' " "grave." -#: ../src/parser.y:553 +#: ../src/parser.y:626 #, c-format msgid "%s: %d: Can't add preference to list. This is very bad." msgstr "" "%s: %d: Non posso aggiungere la preference alla lista. Questo e' grave." -#: ../src/parser.y:287 +#: ../src/parser.y:590 +#, fuzzy, c-format +msgid "%s: %d: Cwd already defined." +msgstr "%s: %s: Velocita' gia' definita." + +#: ../src/parser.y:301 #, c-format msgid "%s: %d: Device already defined." msgstr "%s: %d: Device gia' definito." -#: ../src/parser.y:1038 +#: ../src/parser.y:1131 #, c-format msgid "%s: %d: Directory already defined." msgstr "%s: %d: Directory gia' definita." -#: ../src/parser.y:1008 +#: ../src/parser.y:1101 #, c-format msgid "" "%s: %d: Incorrect checksum\n" @@ -336,12 +345,12 @@ msgstr "" "%s: %d: Checksum non corretto\n" "per il numero di serie \"%s-%c\". Dovrebbe essere \"%s-%c\"." -#: ../src/parser.y:514 +#: ../src/parser.y:565 #, c-format msgid "%s: %d: Path already defined." msgstr "%s: %d: Percorso gia' definito." -#: ../src/parser.y:987 +#: ../src/parser.y:1080 #, c-format msgid "" "%s: %d: Serial number \"%s\" has no checksum.\n" @@ -350,178 +359,178 @@ msgstr "" "%s: %d: Il numero di serie \"%s\" non ha checksum.\n" "Forse dovresti riscriverlo come \"%s-%c\"." -#: ../src/parser.y:956 +#: ../src/parser.y:1049 #, c-format msgid "%s: %d: Serial number already defined." msgstr "%s: %d: Numero di serie gia' definito." -#: ../src/parser.y:301 +#: ../src/parser.y:315 #, c-format msgid "%s: %d: Speed already defined." msgstr "%s: %s: Velocita' gia' definita." -#: ../src/parser.y:1074 +#: ../src/parser.y:1167 #, c-format msgid "%s: %d: Userid already defined." msgstr "%s: %d: Userid gia' definito." -#: ../src/parser.y:1059 +#: ../src/parser.y:1152 #, c-format msgid "%s: %d: Username already defined." msgstr "%s: %d: Username gia' definito." -#: ../libpconn/dlp.c:152 +#: ../libpconn/dlp.c:153 #, c-format msgid "%s: Can't allocate %ld-byte buffer.\n" msgstr "%s: Non posso allocare un buffer di %ld bytes.\n" -#: ../src/parser.y:851 +#: ../src/parser.y:941 #, c-format msgid "%s: Can't allocate PDA block." msgstr "%s: Non posso allocare un PDA block." -#: ../src/parser.y:708 +#: ../src/parser.y:781 #, c-format msgid "%s: Can't allocate conduit header." msgstr "%s: Non posso allocare un conduit header." -#: ../src/parser.y:340 +#: ../src/parser.y:354 #, c-format msgid "%s: Can't allocate conduit_block!" msgstr "%s: Non posso allocare conduit_block!" -#: ../src/parser.y:177 +#: ../src/parser.y:180 #, c-format msgid "%s: Can't allocate listen block." msgstr "%s: Non posso allocare un listen block." -#: ../src/GenericConduit.cc:1121 +#: ../src/GenericConduit.cc:1042 #, c-format msgid "%s: Can't allocate new record." msgstr "%s: Non posso allocare un nuovo record." -#: ../src/GenericConduit.cc:1221 +#: ../src/GenericConduit.cc:1142 #, c-format msgid "%s: Can't append new record to database: %d." msgstr "%s: Non posso aggiungere nuovi record in coda al database: %d." -#: lexer.l:366 +#: lexer.l:382 #, fuzzy, c-format msgid "%s: Can't append to qstring." msgstr "%s: Non posso copiare la stringa." -#: ../src/backup.c:716 +#: ../src/backup.c:695 #, c-format msgid "%s: Can't back up \"%s\"." msgstr "%s: Non posso archiviare \"%s\"." -#: ../src/GenericConduit.cc:448 ../src/GenericConduit.cc:948 -#: ../src/GenericConduit.cc:1490 +#: ../src/GenericConduit.cc:424 ../src/GenericConduit.cc:886 +#: ../src/GenericConduit.cc:1386 #, c-format msgid "%s: Can't clean up database: %d." msgstr "%s: Non posso pulire il database: %d." -#: ../src/GenericConduit.cc:1960 ../src/GenericConduit.cc:1998 -#: ../src/GenericConduit.cc:2132 +#: ../src/GenericConduit.cc:1832 ../src/GenericConduit.cc:1869 +#: ../src/GenericConduit.cc:1994 #, c-format msgid "%s: Can't copy record." msgstr "%s: Non posso copiare il record." -#: ../src/conduit.c:1541 +#: ../src/conduit.c:1597 #, c-format msgid "%s: Can't create file handle to child's stdin." msgstr "%s: Non posso creare il filehandle per l'input del figlio." -#: ../src/conduit.c:1569 +#: ../src/conduit.c:1625 #, c-format msgid "%s: Can't create file handle to child's stdout." msgstr "%s: Non posso creare il filehandle per l'output del figlio." -#: ../src/coldsync.c:3681 ../src/coldsync.c:3701 +#: ../src/coldsync.c:3049 ../src/coldsync.c:3069 #, c-format msgid "%s: Can't create staging file \"%s\"." msgstr "%s: Non posso creare il file di staging \"%s\"." -#: ../src/coldsync.c:3691 +#: ../src/coldsync.c:3059 #, c-format msgid "%s: Can't create staging file name." msgstr "%s: Non posso creare il nome del file di staging." -#: ../src/GenericConduit.cc:608 +#: ../src/GenericConduit.cc:560 #, c-format msgid "%s: Can't download \"%s\"." msgstr "%s: Non posso ricevere \"%s\"." -#: ../src/conduit.c:2057 +#: ../src/conduit.c:2137 #, c-format msgid "%s: Can't get child process status." msgstr "%s: Non posso acquisire lo stato del processo figlio." -#: ../libpconn/PConnection_usb.c:505 +#: ../libpconn/PConnection_usb.c:528 #, c-format msgid "%s: Can't get information about USB device.\n" msgstr "%s: Non posso acquisire informazioni sul device USB.\n" -#: ../src/GenericConduit.cc:2094 ../src/GenericConduit.cc:2143 +#: ../src/GenericConduit.cc:1956 ../src/GenericConduit.cc:2004 #, c-format msgid "%s: Can't insert record 0x%08lx." msgstr "%s: Non posso inserire il record 0x%08lx." -#: ../src/GenericConduit.cc:2505 +#: ../src/GenericConduit.cc:2354 #, c-format msgid "%s: Can't load \"%s\"." msgstr "%s: Non posso caricare \"%s\"." -#: ../src/install.c:270 ../src/install.c:526 +#: ../src/install.c:270 ../src/install.c:512 #, c-format msgid "%s: Can't load database \"%s\"." msgstr "%s: Non posso caricare il database \"%s\"." -#: ../src/conduit.c:1587 +#: ../src/conduit.c:1643 #, c-format msgid "%s: Can't make child's stdout be line-buffered." msgstr "%s: Non posso settare l'output del figlio come linea-per-linea." -#: lexer.l:135 lexer.l:148 lexer.l:228 lexer.l:303 lexer.l:518 lexer.l:568 +#: lexer.l:135 lexer.l:148 lexer.l:230 lexer.l:319 lexer.l:553 lexer.l:603 #, c-format msgid "%s: Can't make copy of string." msgstr "%s: Non posso copiare la stringa." -#: ../src/GenericConduit.cc:2495 ../src/archive.c:68 ../src/archive.c:127 -#: ../src/install.c:260 ../src/install.c:425 ../src/install.c:516 -#: ../src/parser.y:1223 +#: ../src/GenericConduit.cc:2344 ../src/archive.c:68 ../src/archive.c:127 +#: ../src/install.c:260 ../src/install.c:411 ../src/install.c:502 +#: ../src/parser.y:1315 #, c-format msgid "%s: Can't open \"%s\"." msgstr "%s: Non posso aprire \"%s\"." -#: ../libpconn/PConnection_usb.c:717 +#: ../libpconn/PConnection_usb.c:740 #, c-format msgid "%s: Can't open \"%s\".\n" msgstr "%s: Non posso aprire \"%s\".\n" -#: ../src/GenericConduit.cc:298 ../src/GenericConduit.cc:318 -#: ../src/GenericConduit.cc:568 ../src/GenericConduit.cc:587 -#: ../src/GenericConduit.cc:1063 ../src/GenericConduit.cc:1082 +#: ../src/GenericConduit.cc:297 ../src/GenericConduit.cc:310 +#: ../src/GenericConduit.cc:534 ../src/GenericConduit.cc:546 +#: ../src/GenericConduit.cc:991 ../src/GenericConduit.cc:1003 #, c-format msgid "%s: Can't open \"%s\": %d." msgstr "%s: Non posso aprire \"%s\": %d." -#: ../libpconn/PConnection_usb.c:491 +#: ../libpconn/PConnection_usb.c:514 #, c-format msgid "%s: Can't open USB device.\n" msgstr "%s: Non posso aprire il device USB.\n" -#: ../src/coldsync.c:2942 +#: ../src/coldsync.c:2249 #, c-format msgid "%s: Can't open directory \"%s\"." msgstr "%s: Non posso aprire la directory \"%s\"." -#: ../src/install.c:403 ../src/install.c:468 +#: ../src/install.c:389 ../src/install.c:454 #, c-format msgid "%s: Can't open install directory." msgstr "%s: Non posso aprire la directory di installazione." -#: ../src/GenericConduit.cc:194 +#: ../src/GenericConduit.cc:200 #, c-format msgid "%s: Can't read %s backup file." msgstr "%s: Non posso leggere il file di backup %s." @@ -541,12 +550,12 @@ msgstr "%s: Non posso leggere le informazioni sul database: %d.\n" msgid "%s: Can't read sort block for %s: %d.\n" msgstr "%s: Non posso leggere il sort block per %s: %d.\n" -#: ../src/coldsync.c:3047 ../src/coldsync.c:3085 +#: ../src/coldsync.c:2354 ../src/coldsync.c:2392 #, c-format msgid "%s: Can't rename \"%s\" to \"%s\"." msgstr "%s: Non posso rinominare \"%s\" in \"%s\"." -#: ../src/GenericConduit.cc:2564 +#: ../src/GenericConduit.cc:2413 #, c-format msgid "" "%s: Can't rename staging file.\n" @@ -555,13 +564,13 @@ msgstr "" "%s: Non posso rinominare il file di staging.\n" "Per fortuna il backup e' rimasto in \"%s\"" -#: ../src/GenericConduit.cc:468 ../src/GenericConduit.cc:967 -#: ../src/GenericConduit.cc:1510 +#: ../src/GenericConduit.cc:444 ../src/GenericConduit.cc:905 +#: ../src/GenericConduit.cc:1406 #, c-format msgid "%s: Can't reset sync flags: %d." msgstr "%s: Non posso resettare i flags di sincronizzazione: %d." -#: ../src/restore.c:120 +#: ../src/restore.c:129 #, c-format msgid "%s: Can't restore %s: it is opened by another application." msgstr "%s: Non posso ripristinare %s: e' aperto da un'altra applicazione." @@ -571,12 +580,17 @@ msgstr "%s: Non posso ripristinare %s: e' aperto da un'altra applicazione." msgid "%s: Can't seek to end of file." msgstr "%s: Non posso leggere alla fine del file." -#: ../src/conduit.c:373 +#: ../src/parser.y:909 +#, fuzzy, c-format +msgid "%s: Can't set option.\n" +msgstr "%s: Non posso aprire \"%s\".\n" + +#: ../src/conduit.c:390 #, c-format msgid "%s: Can't set signal handler." msgstr "%s: Non posso installare l'handler dei segnali." -#: ../src/conduit.c:427 +#: ../src/conduit.c:445 #, c-format msgid "%s: Can't spawn conduit." msgstr "%s: Non posso invocare il conduit." @@ -591,8 +605,8 @@ msgstr "%s: Non posso scrivere l'AppInfo block.\n" msgid "%s: Can't write archive file header." msgstr "%s: Non posso scrivere l'header del file di archivio." -#: ../src/GenericConduit.cc:419 ../src/GenericConduit.cc:925 -#: ../src/GenericConduit.cc:1461 +#: ../src/GenericConduit.cc:402 ../src/GenericConduit.cc:870 +#: ../src/GenericConduit.cc:1364 #, c-format msgid "%s: Can't write backup file." msgstr "%s: Non posso scrivere il file di backup." @@ -622,7 +636,7 @@ msgstr "%s: Non posso scrivere l'entry dell'indice delle risorse.\n" msgid "%s: Can't write sort block for \"%.*s\".\n" msgstr "%s: Non posso scrivere il sort block.\n" -#: ../src/GenericConduit.cc:2552 +#: ../src/GenericConduit.cc:2401 #, c-format msgid "%s: Can't write staging file \"%s\"." msgstr "%s: Non posso scrivere il file di staging \"%s\"." @@ -632,12 +646,12 @@ msgstr "%s: Non posso scrivere il file di staging \"%s\"." msgid "%s: Can't write the two useless NULs to \"%.*s\".\n" msgstr "%s: Non posso scrivere i due NUL inutili.\n" -#: ../src/conduit.c:1880 +#: ../src/conduit.c:1960 #, c-format msgid "%s: Conduit exited unexpectedly." msgstr "%s: Il conduit e' uscito in maniera inaspettata." -#: ../src/conduit.c:677 +#: ../src/conduit.c:698 #, c-format msgid "" "%s: Conduit handler is in an inconsistent state at\n" @@ -646,7 +660,7 @@ msgstr "" "%s: L'handler del conduit e' in uno stato instabile in %s, riga %d. Per " "favore, avverti il mantainer del progetto." -#: ../src/conduit.c:1871 +#: ../src/conduit.c:1951 #, c-format msgid "" "%s: Conduit is running happily, but hasn't printed anything.\n" @@ -656,32 +670,32 @@ msgstr "" "Pero' sono stato avvertito. Questo e' un bug. Per favore, avverti il\n" "mantainer del progetto." -#: ../libpconn/PConnection_usb.c:625 +#: ../libpconn/PConnection_usb.c:648 #, c-format msgid "%s: Could not find HotSync endpoint on Visor.\n" msgstr "%s: Non posso trovare l'endpoint HotSync sul Visor.\n" -#: ../src/conduit.c:1681 +#: ../src/conduit.c:1538 #, fuzzy, c-format msgid "%s: Couldn't change directory to \"%s\"\n" msgstr "%s: Non posso aprire la directory \"%s\"." -#: ../src/restore.c:109 +#: ../src/restore.c:118 #, c-format msgid "%s: Database %s doesn't exist, yet it is open. Huh?" msgstr "%s: Il database %s non esiste, pero' e' aperto. Che sta succedendo?" -#: ../src/install.c:335 ../src/install.c:580 +#: ../src/install.c:328 ../src/install.c:566 #, c-format msgid "%s: Error deleting \"%s\"." msgstr "%s: Errore durante la cancellazione di \"%s\"." -#: ../src/GenericConduit.cc:1355 ../src/GenericConduit.cc:1394 +#: ../src/GenericConduit.cc:1267 ../src/GenericConduit.cc:1304 #, c-format msgid "%s: Error deleting record 0x%08lx: %d." msgstr "%s: Errore durante la cancellazione del record 0x%08lx: %d." -#: ../src/conduit.c:788 +#: ../src/conduit.c:809 #, fuzzy, c-format msgid "%s: Error header wrong length %ld." msgstr "%s: Errore durante la cancellazione di \"%s\"." @@ -691,33 +705,33 @@ msgstr "%s: Errore durante la cancellazione di \"%s\"." msgid "%s: Error in DlpRPC().\n" msgstr "%s: Errore in DlpRPC().\n" -#: ../src/conduit.c:708 +#: ../src/conduit.c:729 #, c-format msgid "%s: Error in select()." msgstr "%s: Errore nella select()." -#: ../src/conduit.c:774 +#: ../src/conduit.c:795 #, c-format msgid "%s: Error reading SPC request from conduit." msgstr "" "%s: Errore durante la lettura della richiesta SPC da parte del conduit." -#: ../src/conduit.c:847 +#: ../src/conduit.c:868 #, c-format msgid "%s: Error reading SPC request." msgstr "%s: Errore durante la lettura della richiesta SPC." -#: ../src/conduit.c:975 +#: ../src/conduit.c:996 #, c-format msgid "%s: Error sending SPC response data." msgstr "%s: Errore durante l'invio dei dati di risposta SPC." -#: ../libpconn/padp.c:757 +#: ../libpconn/padp.c:755 #, c-format msgid "%s: Error sending dummy ACK. This is serious.\n" msgstr "%s: Errore durante l'invio del dummy ACK. Questo e' grave.\n" -#: ../src/install.c:356 ../src/install.c:612 +#: ../src/install.c:342 ../src/install.c:584 #, c-format msgid "%s: Error uploading \"%s\"." msgstr "%s: Errore durante l'invio di \"%s\"." @@ -727,7 +741,7 @@ msgstr "%s: Errore durante l'invio di \"%s\"." msgid "%s: Error: dlp.write returned %d.\n" msgstr "%s: Errore: dlp.write ha restituito %d.\n" -#: ../src/conduit.c:353 +#: ../src/conduit.c:370 #, c-format msgid "" "%s: I just got file descriptor %d. There appears to be a file\n" @@ -737,20 +751,20 @@ msgstr "" "una perdita di descrittori di file. Per favore, avverti il mantainer del\n" "progetto." -#: ../src/GenericConduit.cc:1347 ../src/GenericConduit.cc:1386 -#: ../src/GenericConduit.cc:1630 ../src/GenericConduit.cc:1680 -#: ../src/GenericConduit.cc:1846 ../src/GenericConduit.cc:2198 -#: ../src/GenericConduit.cc:2240 +#: ../src/GenericConduit.cc:1261 ../src/GenericConduit.cc:1298 +#: ../src/GenericConduit.cc:1524 ../src/GenericConduit.cc:1573 +#: ../src/GenericConduit.cc:1728 ../src/GenericConduit.cc:2058 +#: ../src/GenericConduit.cc:2099 #, c-format msgid "%s: Lost connection to Palm." msgstr "%s: Connessione al Palm persa." -#: ../src/config.c:721 +#: ../src/config.c:807 #, c-format msgid "%s: Missing mode string. This should never happen." msgstr "%s: Manca la stringa con la modalita'. Questo non dovrebbe accadere." -#: ../src/parser.y:352 +#: ../src/parser.y:398 #, c-format msgid "" "%s: No `type:' line seen\n" @@ -759,20 +773,25 @@ msgstr "" "%s: Non ho trovato la linea `type:'\n" "\tnella definizione di \"%s\"." -#: ../src/conduit.c:1663 +#: ../src/conduit.c:1719 #, c-format msgid "%s: No executable \"%s\" in $CONDUIT_PATH or $CONDUITDIR.\n" msgstr "" -#: ../src/config.c:1100 ../src/config.c:1136 ../src/config.c:1158 -#: ../src/pref.c:234 ../src/pref.c:299 lexer.l:705 +#: ../src/conduit.c:1757 +#, fuzzy, c-format +msgid "%s: No home directory for %s.\n" +msgstr "%s: Non posso aprire la directory \"%s\"." + +#: ../src/config.c:1243 ../src/config.c:1279 ../src/config.c:1301 +#: ../src/pref.c:220 ../src/pref.c:278 lexer.l:506 lexer.l:740 #, c-format msgid "%s: Out of memory." msgstr "%s: Memoria esaurita." -#: ../libpconn/dlp_cmd.c:1284 ../libpconn/dlp_cmd.c:1435 -#: ../libpconn/dlp_cmd.c:2183 ../libpconn/dlp_cmd.c:2437 -#: ../libpconn/dlp_cmd.c:3356 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 +#: ../libpconn/dlp_cmd.c:1296 ../libpconn/dlp_cmd.c:1447 +#: ../libpconn/dlp_cmd.c:2195 ../libpconn/dlp_cmd.c:2449 +#: ../libpconn/dlp_cmd.c:3368 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 #: ../libpdb/pdb.c:1090 ../libpdb/pdb.c:1137 ../libpdb/pdb.c:1448 #: ../libpdb/pdb.c:1563 ../libpdb/pdb.c:1676 ../libpdb/pdb.c:1840 #: ../libpdb/pdb.c:1981 ../src/backup.c:138 ../src/backup.c:187 @@ -782,24 +801,24 @@ msgstr "%s: Memoria esaurita." msgid "%s: Out of memory.\n" msgstr "%s: Memoria esaurita.\n" -#: ../src/conduit.c:361 +#: ../src/conduit.c:378 #, c-format msgid "%s: Too many file descriptors. Aborting." msgstr "%s: Troppi descrittori di file aperti. Interrompo." -#: ../src/GenericConduit.cc:1638 ../src/GenericConduit.cc:1688 -#: ../src/GenericConduit.cc:1854 ../src/GenericConduit.cc:2206 -#: ../src/GenericConduit.cc:2248 +#: ../src/GenericConduit.cc:1533 ../src/GenericConduit.cc:1581 +#: ../src/GenericConduit.cc:1737 ../src/GenericConduit.cc:2067 +#: ../src/GenericConduit.cc:2107 #, c-format msgid "%s: Warning: Can't delete record 0x%08lx: %d." msgstr "%s: Attenzione: Non posso cancellare il record 0x%08lx: %d." -#: ../libpconn/PConnection_usb.c:543 +#: ../libpconn/PConnection_usb.c:566 #, c-format msgid "%s: Warning: Unexpected USB vendor ID %#x.\n" msgstr "%s: Attenzione: ID del produttore USB inatteso %#x.\n" -#: ../libpconn/slp.c:250 +#: ../libpconn/slp.c:248 #, c-format msgid "%s: bad checksum: expected 0x%02x, got 0x%02x.\n" msgstr "%s: checksum errato: mi aspettavo 0x%02x, ho ricevuto 0x%02x.\n" @@ -833,7 +852,7 @@ msgstr "" "%s: non posso creare il file di backup %s.\n" "Potrebbe esistere gia'." -#: ../src/backup.c:668 +#: ../src/backup.c:647 #, c-format msgid "%s: can't write database \"%s\" to \"%s\"." msgstr "%s: non posso scrivere il database \"%s\" su \"%s\"." @@ -855,27 +874,32 @@ msgstr "" "%s: errore durante la lettura dell'entry dell'indice dei record (%d bytes): %" "d.\n" -#: ../src/conduit.c:942 +#: ../src/conduit.c:963 #, c-format msgid "%s: error sending SPC response header." msgstr "%s: errore durante l'invio dell'header di risposta SPC." -#: ../src/conduit.c:1694 +#: ../src/conduit.c:1774 #, fuzzy, c-format msgid "%s: execv(%s) failed and returned %d." msgstr "%s: execv(%s) fallita con %d." -#: ../src/config.c:1224 lexer.l:731 +#: ../src/conduit.c:1761 +#, fuzzy, c-format +msgid "%s: getpwuid(%d) failed.\n" +msgstr "%s: realloc(%d) fallita." + +#: ../src/config.c:1367 lexer.l:767 #, c-format msgid "%s: realloc(%d) failed." msgstr "%s: realloc(%d) fallita." -#: ../src/conduit.c:722 +#: ../src/conduit.c:743 #, c-format msgid "%s: select() returned 0. I'm puzzled." msgstr "%s: select() ha restituito 0. Non so piu' cosa pensare." -#: ../src/conduit.c:1817 +#: ../src/conduit.c:1897 #, c-format msgid "" "%s: select() returned 0. This should never happen. Please notify the " @@ -884,28 +908,28 @@ msgstr "" "%s: select() ha restituito 0. Questo non dovrebbe succedere. Per favore " "avvisa il mantainer del progetto." -#: ../src/conduit.c:1774 +#: ../src/conduit.c:1854 #, c-format msgid "%s: select() returned an unexpected error. This should never happen." msgstr "" "%s: select() ha restituito un errore inatteso. Questo non dovrebbe succedere." -#: ../src/config.c:1025 +#: ../src/config.c:1168 #, c-format msgid "%s: socket() returned %d." msgstr "%s: socket() ha restituito %d." -#: ../libpconn/PConnection_usb.c:662 +#: ../libpconn/PConnection_usb.c:685 #, c-format msgid "%s: unexpected response %d to GetBytesAvailable.\n" msgstr "%s: risposta %d inattesa a GetBytesAvaliable.\n" -#: ../libpconn/PConnection.c:124 +#: ../libpconn/PConnection.c:125 #, c-format msgid "%s: unknown listen type %d.\n" msgstr "%s: tipo %d di listen sconosciuto.\n" -#: lexer.l:632 +#: lexer.l:667 #, c-format msgid "" "%s: unknown start state %d.\n" @@ -914,18 +938,18 @@ msgstr "" "%s: stato d'inizio sconosciuto %d.\n" "Per favore avverti il mantainer del progetto di fixare `lexer.l'." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:303 -#: ../src/GenericConduit.cc:323 ../src/GenericConduit.cc:343 -#: ../src/GenericConduit.cc:423 ../src/GenericConduit.cc:452 -#: ../src/GenericConduit.cc:480 ../src/GenericConduit.cc:492 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:302 +#: ../src/GenericConduit.cc:315 ../src/GenericConduit.cc:328 +#: ../src/GenericConduit.cc:406 ../src/GenericConduit.cc:428 +#: ../src/GenericConduit.cc:454 ../src/GenericConduit.cc:465 msgid "(1st)" msgstr "(1o)" -#: ../src/coldsync.c:1090 ../src/coldsync.c:2679 +#: ../src/coldsync.c:1084 msgid "*Cancelled*\n" msgstr "*Cancellato*\n" -#: ../libpconn/padp.c:676 +#: ../libpconn/padp.c:674 msgid "ACK Timeout. Attempting to resend.\n" msgstr "ACK Timeout. Ritento l'invio.\n" @@ -934,9 +958,9 @@ msgstr "ACK Timeout. Ritento l'invio.\n" msgid "Backing up \"%s\"" msgstr "Sto archiviando \"%s\"" -#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:596 -#: ../src/backup.c:628 ../src/backup.c:655 ../src/backup.c:675 -#: ../src/backup.c:686 ../src/coldsync.c:1415 +#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:589 +#: ../src/backup.c:614 ../src/backup.c:634 ../src/backup.c:654 +#: ../src/backup.c:665 ../src/coldsync.c:1478 msgid "Backup" msgstr "Backup" @@ -944,7 +968,7 @@ msgstr "Backup" msgid "Bad file descriptor" msgstr "Descrittore di file errato" -#: ../src/coldsync.c:898 ../src/coldsync.c:2502 +#: ../src/coldsync.c:945 #, c-format msgid "CacheFromConduits() returned %d." msgstr "CacheFromConduits() ha restituito %d." @@ -953,15 +977,15 @@ msgstr "CacheFromConduits() ha restituito %d." msgid "Can't allocate list of record IDs.\n" msgstr "Non posso allocare l'elenco degli ID dei record.\n" -#: ../src/config.c:467 ../src/config.c:508 +#: ../src/config.c:550 ../src/config.c:591 msgid "Can't allocate listen block." msgstr "Non posso allocare un nuovo listen block." -#: ../src/config.c:320 +#: ../src/config.c:394 msgid "Can't allocate new conduit block." msgstr "Non posso allocare un nuovo conduit block." -#: ../src/config.c:297 +#: ../src/config.c:370 msgid "Can't allocate new configuration." msgstr "Non posso allocare una nuova configurazione." @@ -969,62 +993,60 @@ msgstr "Non posso allocare una nuova configurazione." msgid "Can't allocate new connection.\n" msgstr "Non posso allocare una nuova connessione.\n" -#: ../src/coldsync.c:566 ../src/coldsync.c:1360 ../src/coldsync.c:1507 -#: ../src/coldsync.c:1650 ../src/coldsync.c:2103 +#: ../src/coldsync.c:562 msgid "Can't allocate struct Palm." msgstr "Non posso allocare la struttura Palm." -#: ../src/coldsync.c:557 ../src/coldsync.c:1352 ../src/coldsync.c:1499 -#: ../src/coldsync.c:1642 ../src/coldsync.c:2094 +#: ../src/coldsync.c:553 msgid "Can't connect to Palm." msgstr "Non posso collegarmi al Palm." -#: ../libpconn/PConnection_net.c:411 +#: ../libpconn/PConnection_net.c:449 msgid "Can't connect to server.\n" msgstr "Non posso collegarmi al server.\n" -#: ../src/GenericConduit.cc:720 ../src/GenericConduit.cc:2085 +#: ../src/GenericConduit.cc:672 ../src/GenericConduit.cc:1947 msgid "Can't copy a new record." msgstr "Non posso copiare un nuovo record." -#: ../src/coldsync.c:2299 +#: ../src/coldsync.c:2140 msgid "Can't copy config file name" msgstr "Non posso copiare il nome del file di configurazione" -#: ../src/config.c:475 ../src/config.c:516 +#: ../src/config.c:558 ../src/config.c:599 msgid "Can't copy string." msgstr "Non posso copiare la stringa." -#: ../src/GenericConduit.cc:2436 +#: ../src/GenericConduit.cc:2285 #, c-format msgid "Can't create \"%s\"." msgstr "Non posso creare \"%s\"." -#: ../src/config.c:1627 +#: ../src/config.c:1813 #, c-format msgid "Can't create archive directory %s." msgstr "Non posso creare la directory archivio %s." -#: ../src/config.c:1609 +#: ../src/config.c:1795 #, c-format msgid "Can't create attic directory %s." msgstr "Non posso creare la directory solaio %s." -#: ../src/config.c:1591 +#: ../src/config.c:1777 #, c-format msgid "Can't create backup directory %s." msgstr "Non posso creare la directory di backup %s." -#: ../src/config.c:1573 +#: ../src/config.c:1759 #, c-format msgid "Can't create base sync directory %s." msgstr "Non posso creare la directory principale per la sincronizzazione %s." -#: ../src/coldsync.c:824 ../src/coldsync.c:2422 +#: ../src/coldsync.c:658 msgid "Can't create connection to forwarding host." msgstr "Non posso creare una connessione con l'host di forwarding." -#: ../src/config.c:1645 +#: ../src/config.c:1831 #, c-format msgid "Can't create install directory %s." msgstr "Non posso creare la directory di installazione %s." @@ -1033,19 +1055,19 @@ msgstr "Non posso creare la directory di installazione %s." msgid "Can't download record or resource index.\n" msgstr "Non riesco a ricevere l'elenco dei record o l'elenco delle risorse.\n" -#: ../src/coldsync.c:461 +#: ../src/coldsync.c:471 msgid "Can't dup(stderr)." msgstr "Non posso duplicare(stderr)." -#: ../src/coldsync.c:836 ../src/coldsync.c:2434 +#: ../src/coldsync.c:675 msgid "Can't establish connection with forwarding host." msgstr "Non riesco a stabilire una connessione con l'host di forwarding." -#: ../src/coldsync.c:975 ../src/coldsync.c:2568 +#: ../src/coldsync.c:1020 msgid "Can't fetch list of databases." msgstr "Non riesco a prelevare la lista dei database." -#: ../src/coldsync.c:1195 ../src/coldsync.c:2775 +#: ../src/coldsync.c:1164 #, c-format msgid "Can't fetch preference 0x%08lx/%d." msgstr "Non riesco a prelevare la preference 0x%08lx/%d." @@ -1070,62 +1092,61 @@ msgstr "Non riesco a trovare l'AppInfo block!\n" msgid "Can't find the sort block in \"%.*s\"!\n" msgstr "Non riesco a trovare il sort block!\n" -#: ../src/coldsync.c:232 +#: ../src/coldsync.c:235 msgid "Can't get host ID." msgstr "Non riesco ad acquisire l'ID dell'host." -#: ../src/coldsync.c:784 ../src/coldsync.c:2383 +#: ../src/coldsync.c:623 msgid "Can't get host addresses." msgstr "Non riesco ad acquisire gli indirizzi dei vari host." -#: ../src/config.c:899 +#: ../src/config.c:1042 msgid "Can't get host name." msgstr "Non riesco ad acquisire l'hostname." -#: ../src/coldsync.c:909 ../src/coldsync.c:2513 +#: ../src/coldsync.c:955 msgid "Can't get last sync PC from Palm" msgstr "" "Non riesco ad acquisire dal Palm l'ID dell'ultimo PC che ha fatto\n" "la sincronizzazione" -#: ../src/spalm.c:451 +#: ../src/spalm.c:416 msgid "Can't get location of serial number." msgstr "Non riesco ad acquisire la posizione del numero di serie." -#: ../src/conduit.c:503 +#: ../src/conduit.c:524 msgid "Can't get preference item." msgstr "Non riesco ad acquisire il preference item." -#: ../src/spalm.c:224 +#: ../src/spalm.c:211 msgid "Can't get system info." msgstr "Non riesco ad acquisire le informazioni sul sistema." -#: ../src/coldsync.c:641 ../src/coldsync.c:1764 +#: ../src/coldsync.c:1288 ../src/coldsync.c:1727 msgid "Can't get user ID from Palm." msgstr "Non riesco ad acquisire lo user ID dal Palm." -#: ../src/config.c:373 ../src/spalm.c:324 +#: ../src/config.c:447 ../src/spalm.c:304 msgid "Can't get user info." msgstr "Non riesco ad acquisire le userinfo." -#: ../src/coldsync.c:694 +#: ../src/coldsync.c:1340 msgid "Can't get user name from Palm." msgstr "Non riesco ad acquisire lo username dal Palm." -#: ../src/config.c:1799 +#: ../src/config.c:1985 msgid "Can't get user's full name." msgstr "Non posso acquisire il nome completo dell'utente." -#: ../src/coldsync.c:1010 ../src/coldsync.c:1229 ../src/coldsync.c:2603 -#: ../src/coldsync.c:2809 +#: ../src/coldsync.c:731 msgid "Can't install new files." msgstr "Non posso installare nuovi files." -#: ../src/coldsync.c:225 ../src/coldsync.c:2316 +#: ../src/coldsync.c:228 ../src/coldsync.c:2156 msgid "Can't load configuration." msgstr "Non posso caricare la configurazione." -#: ../src/install.c:434 +#: ../src/install.c:420 msgid "Can't load header." msgstr "Non posso caricare l'header." @@ -1138,11 +1159,11 @@ msgstr "Non posso leggere l'header.\n" msgid "Can't load record list header for \"%.*s\".\n" msgstr "%s: non posso scrivere l'header della lista dei record.\n" -#: ../src/coldsync.c:589 +#: ../src/coldsync.c:1236 msgid "Can't look up Palm." msgstr "Non posso controllare il Palm." -#: ../src/config.c:908 +#: ../src/config.c:1051 msgid "Can't look up my address." msgstr "Non posso controllare il mio indirizzo." @@ -1151,7 +1172,7 @@ msgstr "Non posso controllare il mio indirizzo." msgid "Can't open %s." msgstr "Non posso aprire %s." -#: ../src/backup.c:593 +#: ../src/backup.c:586 msgid "Can't open backup conduit." msgstr "Non posso aprire il conduit di backup." @@ -1160,26 +1181,25 @@ msgstr "Non posso aprire il conduit di backup." msgid "Can't open conduit for \"%s\": %d.\n" msgstr "Non posso aprire il conduit per \"%s\": %d.\n" -#: ../src/coldsync.c:548 ../src/coldsync.c:1344 ../src/coldsync.c:1491 -#: ../src/coldsync.c:1634 ../src/coldsync.c:2085 +#: ../src/coldsync.c:544 msgid "Can't open connection." msgstr "Non posso aprire la connessione." -#: ../src/backup.c:624 +#: ../src/backup.c:610 #, c-format msgid "Can't open database \"%s\"." msgstr "Non posso aprire il database \"%s\"." -#: ../src/coldsync.c:475 +#: ../src/coldsync.c:485 #, c-format msgid "Can't open log file \"%s\"." msgstr "Non posso aprire il file di log \"%s\"." -#: ../src/coldsync.c:489 +#: ../src/coldsync.c:499 msgid "Can't open log file on stderr." msgstr "Non posso redirigere il log su stderr." -#: ../src/coldsync.c:178 +#: ../src/coldsync.c:181 msgid "Can't parse command-line arguments." msgstr "Non posso interpretare i parametri della linea di comando." @@ -1193,16 +1213,16 @@ msgstr "Non posso leggere %s." msgid "Can't read AppInfo block for \"%.*s\".\n" msgstr "%s: Non posso leggere l'AppInfo block di %s: %d.\n" -#: ../src/spalm.c:300 +#: ../src/spalm.c:280 msgid "Can't read NetSync info." msgstr "Non posso leggere le informazioni di NetSync." -#: ../src/restore.c:227 +#: ../src/restore.c:222 #, c-format msgid "Can't read contents of directory %s." msgstr "Non posso leggere il contenuto della directory %s." -#: ../src/coldsync.c:1659 +#: ../src/coldsync.c:1623 msgid "Can't read length of serial number." msgstr "Non posso leggere la lunghezza del numero di serie." @@ -1250,7 +1270,7 @@ msgstr "Non posso leggere l'indice delle risorse.\n" msgid "Can't read resources for \"%.*s\".\n" msgstr "Non posso leggere la risorsa %d.\n" -#: ../src/coldsync.c:1671 ../src/spalm.c:484 +#: ../src/coldsync.c:1635 ../src/spalm.c:442 msgid "Can't read serial number." msgstr "Non posso leggere il numero di serie." @@ -1259,84 +1279,88 @@ msgstr "Non posso leggere il numero di serie." msgid "Can't read sort block for \"%.*s\".\n" msgstr "%s: Non posso leggere il sort block per %s: %d.\n" -#: ../src/coldsync.c:156 ../src/coldsync.c:161 ../src/coldsync.c:166 +#: ../src/coldsync.c:159 ../src/coldsync.c:164 ../src/coldsync.c:169 #, c-format msgid "Can't reserve file descriptor %d." msgstr "Non posso riservare il descrittore di file %d." -#: ../src/spalm.c:1006 +#: ../src/spalm.c:983 msgid "Can't resize palm->dblist." msgstr "Non posso ridimensioanre palm->dblist." -#: ../src/coldsync.c:793 ../src/coldsync.c:2392 +#: ../src/coldsync.c:630 msgid "Can't resolve forwarding address." msgstr "Non posso risolvere l'indirizzo di forwarding." -#: ../src/coldsync.c:1534 ../src/coldsync.c:1557 +#: ../src/coldsync.c:1549 ../src/coldsync.c:1572 msgid "Can't restore directory." msgstr "Non posso ripristinare la directory." -#: ../src/coldsync.c:2281 +#: ../src/coldsync.c:2123 msgid "Can't setuid" msgstr "Non posso effettuare un setuid" -#: ../src/coldsync.c:1161 ../src/coldsync.c:2741 +#: ../src/coldsync.c:1132 msgid "Can't write user info." msgstr "Non posso scrivere le user info." -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:522 -#: ../src/GenericConduit.cc:1019 ../src/backup.c:581 ../src/restore.c:181 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:495 +#: ../src/GenericConduit.cc:954 ../src/backup.c:581 ../src/restore.c:176 msgid "Cancelled" msgstr "Cancellato" -#: ../src/backup.c:576 ../src/coldsync.c:1380 ../src/coldsync.c:1428 -#: ../src/coldsync.c:1527 ../src/coldsync.c:1550 ../src/conduit.c:1183 -#: ../src/conduit.c:1243 ../src/restore.c:274 +#: ../src/backup.c:576 ../src/coldsync.c:1442 ../src/coldsync.c:1491 +#: ../src/coldsync.c:1541 ../src/coldsync.c:1564 ../src/conduit.c:1226 +#: ../src/conduit.c:1287 ../src/restore.c:269 msgid "Cancelled by Palm." msgstr "Cancellato dal Palm." -#: ../src/config.c:850 +#: ../src/config.c:993 msgid "ColdSync homepage at http://www.ooblick.com/software/coldsync/\n" msgstr "La homepage di ColdSync e' http://www.ooblick.com/software/coldsync/\n" -#: ../src/config.c:856 +#: ../src/config.c:999 msgid "Compile-type options:\n" msgstr "Opzioni di compilazione:\n" -#: ../src/conduit.c:1189 ../src/conduit.c:1249 +#: ../src/conduit.c:1232 ../src/conduit.c:1293 #, c-format msgid "Conduit %s exited abnormally. Continuing." msgstr "Il conduit %s e' terminato in maniera anormale. Continuo." -#: ../src/conduit.c:1169 ../src/conduit.c:1229 +#: ../src/conduit.c:1212 ../src/conduit.c:1273 #, c-format msgid "Conduit %s is not a %s conduit." msgstr "Il conduit %s non e' un conduit %s." -#: ../src/coldsync.c:1103 ../src/coldsync.c:2692 +#: ../src/coldsync.c:846 msgid "Conduit failed for unknown reason." msgstr "Il conduit e' fallito per motivi sconosciuti." -#: ../src/config.c:384 +#: ../src/config.c:458 #, c-format msgid "Config file \"%s\" doesn't exist." msgstr "Il file di configurazione \"%s\" non esiste." -#: ../src/coldsync.c:1244 ../src/coldsync.c:1454 ../src/coldsync.c:1575 -#: ../src/coldsync.c:1960 ../src/coldsync.c:2824 +#: ../src/coldsync.c:581 msgid "Couldn't disconnect." msgstr "Non posso scollegarmi." -#: ../src/config.c:336 +#: ../src/config.c:1719 +#, fuzzy, c-format +msgid "Couldn't find the requested listen block: \"%s\"" +msgstr "Non riesco a trovare il sort block!\n" + +#: ../src/config.c:410 msgid "Couldn't initialize configuration." msgstr "Non posso inizializzare la configurazione." -#: ../src/config.c:359 ../src/config.c:418 +#: ../src/config.c:433 ../src/config.c:492 #, c-format msgid "Couldn't read configuration file \"%s\"." msgstr "Non posso leggere il file di configurazione \"%s\"." -#: ../src/conduit.c:619 +#: ../src/conduit.c:640 msgid "Couldn't send header to conduit." msgstr "Non posso mandare l'header al conduit." @@ -1344,20 +1368,30 @@ msgstr "Non posso mandare l'header al conduit." msgid "DlpReadRecordIDList() read 0 records. What happened?\n" msgstr "DlpReadRecordIDList() ha letto 0 records. Che e' successo?\n" -#: ../libpconn/dlp_cmd.c:1805 +#: ../libpconn/dlp_cmd.c:1817 msgid "DlpWriteRecord: Can't allocate output buffer.\n" msgstr "DlpWriteRecord: Non posso allocare il buffer di output.\n" -#: ../src/coldsync.c:1900 ../src/coldsync.c:3217 +#: ../src/coldsync.c:1828 ../src/coldsync.c:2599 #, c-format msgid "DlpWriteUserInfo failed: %d." msgstr "DlpWriteUserInfo fallita: %d." -#: ../src/coldsync.c:930 ../src/coldsync.c:934 +#: ../src/coldsync.c:975 +#, fuzzy +msgid "Doing a (forced) fast sync." +msgstr "Sto facendo una sincronizzazione veloce." + +#: ../src/coldsync.c:973 +#, fuzzy +msgid "Doing a (forced) slow sync." +msgstr "Sto facendo una sincronizzazione lenta." + +#: ../src/coldsync.c:979 msgid "Doing a fast sync." msgstr "Sto facendo una sincronizzazione veloce." -#: ../src/coldsync.c:928 ../src/coldsync.c:932 +#: ../src/coldsync.c:977 msgid "Doing a slow sync." msgstr "Sto facendo una sincronizzazione lenta." @@ -1365,43 +1399,47 @@ msgstr "Sto facendo una sincronizzazione lenta." msgid "End of file" msgstr "Fine del file" -#: ../src/GenericConduit.cc:303 ../src/GenericConduit.cc:323 -#: ../src/GenericConduit.cc:343 ../src/GenericConduit.cc:423 -#: ../src/GenericConduit.cc:452 ../src/GenericConduit.cc:481 -#: ../src/GenericConduit.cc:572 ../src/GenericConduit.cc:591 -#: ../src/GenericConduit.cc:612 ../src/GenericConduit.cc:723 -#: ../src/GenericConduit.cc:929 ../src/GenericConduit.cc:952 -#: ../src/GenericConduit.cc:978 ../src/GenericConduit.cc:1067 -#: ../src/GenericConduit.cc:1086 ../src/GenericConduit.cc:1127 -#: ../src/GenericConduit.cc:1229 ../src/GenericConduit.cc:1465 -#: ../src/GenericConduit.cc:1494 ../src/GenericConduit.cc:1521 -#: ../src/backup.c:563 ../src/backup.c:596 ../src/backup.c:628 -#: ../src/backup.c:655 ../src/backup.c:675 ../src/install.c:586 -#: ../src/install.c:618 ../src/install.c:730 ../src/restore.c:192 +#: ../src/GenericConduit.cc:302 ../src/GenericConduit.cc:315 +#: ../src/GenericConduit.cc:328 ../src/GenericConduit.cc:406 +#: ../src/GenericConduit.cc:428 ../src/GenericConduit.cc:455 +#: ../src/GenericConduit.cc:538 ../src/GenericConduit.cc:550 +#: ../src/GenericConduit.cc:564 ../src/GenericConduit.cc:675 +#: ../src/GenericConduit.cc:874 ../src/GenericConduit.cc:890 +#: ../src/GenericConduit.cc:914 ../src/GenericConduit.cc:995 +#: ../src/GenericConduit.cc:1007 ../src/GenericConduit.cc:1048 +#: ../src/GenericConduit.cc:1150 ../src/GenericConduit.cc:1368 +#: ../src/GenericConduit.cc:1390 ../src/GenericConduit.cc:1416 +#: ../src/backup.c:563 ../src/backup.c:589 ../src/backup.c:614 +#: ../src/backup.c:634 ../src/backup.c:654 ../src/install.c:572 +#: ../src/install.c:590 ../src/install.c:702 ../src/restore.c:187 msgid "Error" msgstr "Errore" -#: ../src/install.c:338 ../src/install.c:359 +#: ../src/install.c:331 ../src/install.c:345 msgid "Error\n" msgstr "Errore\n" -#: ../src/coldsync.c:998 ../src/coldsync.c:1217 ../src/coldsync.c:2591 -#: ../src/coldsync.c:2797 +#: ../src/coldsync.c:712 ../src/coldsync.c:721 #, c-format msgid "Error %d running install conduits." msgstr "Errore %d durante l'esecuzione di conduits di install." -#: ../src/coldsync.c:1258 ../src/coldsync.c:2837 +#: ../src/coldsync.c:752 ../src/coldsync.c:764 #, c-format msgid "Error %d running post-dump conduits." msgstr "Errore %d durante l'esecuzione di conduits di post-dump." -#: ../src/coldsync.c:1057 ../src/coldsync.c:2648 +#: ../src/coldsync.c:787 ../src/coldsync.c:800 #, c-format msgid "Error %d running pre-fetch conduits." msgstr "Errore %d durante l'esecuzione di conduits di pre-fetch." -#: ../src/coldsync.c:1436 +#: ../src/coldsync.c:822 +#, fuzzy, c-format +msgid "Error %d running sync conduits." +msgstr "Errore %d durante l'esecuzione di conduits di install." + +#: ../src/coldsync.c:1500 #, c-format msgid "Error backing up \"%s\"." msgstr "Errore durante il backup di \"%s\"." @@ -1411,17 +1449,17 @@ msgstr "Errore durante il backup di \"%s\"." msgid "Error creating database \"%s\": %d.\n" msgstr "Errore durante la creazione del database \"%s\": %d.\n" -#: ../src/install.c:751 +#: ../src/install.c:723 #, c-format msgid "Error deleting \"%s\"." msgstr "Errore durante la cancellazione \"%s\"." -#: ../src/coldsync.c:2904 +#: ../src/coldsync.c:2211 #, c-format msgid "Error during DlpEndOfSync: (%d) %s." msgstr "Errore durante DlpEndOfSync: (%d) %s." -#: ../libpconn/cmp.c:141 +#: ../libpconn/cmp.c:142 #, c-format msgid "Error during cmp_read: (%d) %s.\n" msgstr "Errore durante cmp_read: (%d) %s.\n" @@ -1434,16 +1472,16 @@ msgstr "Errore durante la creazione di una connessione CMP.\n" msgid "Error in system call or library function" msgstr "Errore durante una chiamata di sistema o di libreria." -#: ../src/install.c:705 +#: ../src/install.c:677 #, c-format msgid "Error opening \"%s\"." msgstr "Errore durante l'apertura di \"%s\"." -#: ../libpconn/netsync.c:488 +#: ../libpconn/netsync.c:514 msgid "Error reading NetSync packet header.\n" msgstr "Errore durante la lettura dell'header del packet NetSync.\n" -#: ../libpconn/netsync.c:624 +#: ../libpconn/netsync.c:659 msgid "Error sending NetSync header.\n" msgstr "Errore durante l'invio dell'header NetSync.\n" @@ -1451,9 +1489,9 @@ msgstr "Errore durante l'invio dell'header NetSync.\n" msgid "Error trying to set speed.\n" msgstr "Errore durante l'impostazione della velocita'.\n" -#: ../src/GenericConduit.cc:888 ../src/GenericConduit.cc:1431 -#: ../src/GenericConduit.cc:1744 ../src/GenericConduit.cc:1889 -#: ../src/GenericConduit.cc:2055 ../src/GenericConduit.cc:2289 +#: ../src/GenericConduit.cc:833 ../src/GenericConduit.cc:1334 +#: ../src/GenericConduit.cc:1627 ../src/GenericConduit.cc:1762 +#: ../src/GenericConduit.cc:1917 ../src/GenericConduit.cc:2138 #, c-format msgid "Error uploading record 0x%08lx: %d." msgstr "Errore durante l'invio del record 0x%08lx: %d." @@ -1462,7 +1500,7 @@ msgstr "Errore durante l'invio del record 0x%08lx: %d." msgid "Error: " msgstr "Errore: " -#: ../libpconn/PConnection_serial.c:612 ../libpconn/PConnection_usb.c:460 +#: ../libpconn/PConnection_serial.c:616 ../libpconn/PConnection_usb.c:483 #, c-format msgid "Error: Can't open \"%s\".\n" msgstr "Errore: Non posso aprire \"%s\".\n" @@ -1478,11 +1516,11 @@ msgstr "" msgid "Error: Palm suggested unknown speed %ld\n" msgstr "" -#: ../libpconn/PConnection.c:118 +#: ../libpconn/PConnection.c:119 msgid "Error: USB support not enabled.\n" msgstr "Errore: il supporto USB non e' abilitato.\n" -#: ../libpconn/netsync.c:496 +#: ../libpconn/netsync.c:521 #, c-format msgid "Error: only read %d bytes of NetSync packet header.\n" msgstr "Errore: ho letto solo %d bytes dell'header del packet di NetSync.\n" @@ -1501,11 +1539,11 @@ msgstr "Attento! Non posso trovare il %do record!\n" msgid "Hey! I can't find the %dth resource in \"%.*s\"!\n" msgstr "Attento! Non posso trovare la %da risorsa!\n" -#: ../src/config.c:924 +#: ../src/config.c:1067 msgid "Hey! This isn't an AF_INET address!" msgstr "Attento! Questo non e' un indirizzo AF_INET!" -#: ../src/GenericConduit.cc:1200 +#: ../src/GenericConduit.cc:1121 msgid "" "I have a new, deleted record that is neither archived nor expunged\n" "What am I supposed to do?" @@ -1513,12 +1551,12 @@ msgstr "" "Ho un nuovo record cancellato che non e' stato ne' archiviato, ne'\n" "rimosso. Che devo fare?" -#: ../src/conduit.c:2191 +#: ../src/conduit.c:2279 msgid "Inside run_DummyConduit.\n" msgstr "Dentro run_DummyConduit.\n" -#: ../src/install.c:584 ../src/install.c:616 ../src/install.c:701 -#: ../src/install.c:709 ../src/install.c:728 ../src/install.c:733 +#: ../src/install.c:570 ../src/install.c:588 ../src/install.c:673 +#: ../src/install.c:681 ../src/install.c:700 ../src/install.c:705 msgid "Install" msgstr "Installazione" @@ -1538,43 +1576,41 @@ msgstr "Request ID invalido" msgid "Invalid result ID" msgstr "Result ID invalido" -#: ../src/coldsync.c:500 +#: ../src/coldsync.c:510 #, c-format msgid "Log started on %s" msgstr "Log cominciato il %s" -#: ../src/coldsync.c:583 ../src/coldsync.c:635 ../src/coldsync.c:688 -#: ../src/coldsync.c:970 ../src/coldsync.c:1069 ../src/coldsync.c:1098 -#: ../src/coldsync.c:1125 ../src/coldsync.c:1191 ../src/coldsync.c:1267 -#: ../src/coldsync.c:1385 ../src/coldsync.c:1433 ../src/coldsync.c:1530 -#: ../src/coldsync.c:1553 ../src/coldsync.c:2564 ../src/coldsync.c:2660 -#: ../src/coldsync.c:2687 ../src/coldsync.c:2708 ../src/coldsync.c:2771 -#: ../src/coldsync.c:2846 ../src/conduit.c:500 ../src/restore.c:278 +#: ../src/coldsync.c:1015 ../src/coldsync.c:1093 ../src/coldsync.c:1160 +#: ../src/coldsync.c:1194 ../src/coldsync.c:1231 ../src/coldsync.c:1283 +#: ../src/coldsync.c:1335 ../src/coldsync.c:1447 ../src/coldsync.c:1496 +#: ../src/coldsync.c:1544 ../src/coldsync.c:1567 ../src/conduit.c:521 +#: ../src/restore.c:273 msgid "Lost connection to Palm." msgstr "La connessione col Palm e' stata persa." -#: ../src/conduit.c:1186 ../src/conduit.c:1246 +#: ../src/conduit.c:1229 ../src/conduit.c:1290 msgid "Lost connection to Palm. Aborting." msgstr "La connessione col Palm e' stata persa. Interrompo." -#: ../src/config.c:263 +#: ../src/config.c:336 #, c-format msgid "Missing option argument after \"%s\"." msgstr "Manca l'argomento dell'opzione dopo \"%s\"." -#: ../src/config.c:805 +#: ../src/config.c:947 msgid "Modes:\n" msgstr "Modalita':\n" -#: ../src/coldsync.c:848 ../src/coldsync.c:2446 +#: ../src/coldsync.c:685 msgid "Network sync forwarding failed." msgstr "Il forwarding della sincronizzazione via rete e' fallito." -#: ../src/spalm.c:288 +#: ../src/spalm.c:275 msgid "No NetSync info.\n" msgstr "Non ci sono informazioni su NetSync.\n" -#: ../src/coldsync.c:1291 +#: ../src/coldsync.c:1392 msgid "No backup directory specified." msgstr "Non e' stata specificata alcuna directory di backup." @@ -1582,37 +1618,41 @@ msgstr "Non e' stata specificata alcuna directory di backup." msgid "No error" msgstr "Nessun errore" -#: ../src/coldsync.c:2230 +#: ../src/coldsync.c:2088 +#, fuzzy, c-format +msgid "No matching entry in %s, couldn't autoinit." +msgstr "Non ho trovato nulla in %s." + +#: ../src/coldsync.c:2099 #, c-format msgid "No matching entry in %s." msgstr "Non ho trovato nulla in %s." -#: ../src/coldsync.c:529 ../src/coldsync.c:1326 ../src/coldsync.c:1473 -#: ../src/coldsync.c:1616 ../src/coldsync.c:2064 +#: ../src/coldsync.c:525 msgid "No port specified." msgstr "Nessuna porta specificata" -#: ../src/coldsync.c:1417 +#: ../src/coldsync.c:1480 msgid "No such database" msgstr "Il database non esiste" -#: ../src/coldsync.c:1412 +#: ../src/coldsync.c:1475 #, c-format msgid "No such database: \"%s\"." msgstr "Il database \"%s\" non esiste." -#: ../src/coldsync.c:1316 +#: ../src/coldsync.c:1417 #, c-format msgid "No such directory: \"%s\"." msgstr "La directory \"%s\" non esiste." -#: ../src/GenericConduit.cc:492 ../src/GenericConduit.cc:989 -#: ../src/GenericConduit.cc:1531 ../src/backup.c:686 ../src/install.c:703 -#: ../src/install.c:735 ../src/restore.c:197 +#: ../src/GenericConduit.cc:465 ../src/GenericConduit.cc:924 +#: ../src/GenericConduit.cc:1425 ../src/backup.c:665 ../src/install.c:675 +#: ../src/install.c:707 ../src/restore.c:192 msgid "OK" msgstr "OK" -#: ../src/config.c:812 +#: ../src/config.c:954 msgid "Options:\n" msgstr "" @@ -1620,67 +1660,68 @@ msgstr "" msgid "Out of memory" msgstr "Memoria esaurita" -#: ../libpconn/PConnection_serial.c:653 ../libpconn/PConnection_usb.c:435 +#: ../libpconn/PConnection_serial.c:590 ../libpconn/PConnection_serial.c:657 +#: ../libpconn/PConnection_usb.c:458 msgid "Please press the HotSync button.\n" msgstr "Premi il tasto HotSync\n" -#: ../src/install.c:711 +#: ../src/install.c:683 msgid "Problem" msgstr "Problema" -#: ../src/restore.c:181 ../src/restore.c:192 ../src/restore.c:197 +#: ../src/restore.c:176 ../src/restore.c:187 ../src/restore.c:192 msgid "Restore" msgstr "Ripristino" -#: ../src/restore.c:149 +#: ../src/restore.c:151 #, c-format msgid "Restore: Can't delete database \"%s\": %d." msgstr "Ripristino: Non posso cancellare il database \"%s\": %d." -#: ../src/coldsync.c:1251 +#: ../src/coldsync.c:746 msgid "Running Dump conduits" msgstr "Sto eseguendo i conduits di Dump" -#: ../src/coldsync.c:1050 +#: ../src/coldsync.c:781 msgid "Running Fetch conduits" msgstr "Sto eseguendo i conduits di Fetch" -#: ../src/coldsync.c:994 ../src/coldsync.c:1213 ../src/coldsync.c:2587 -#: ../src/coldsync.c:2793 +#: ../src/coldsync.c:706 msgid "Running Install conduits" msgstr "Sto eseguendo i conduits di Install" -#: ../src/coldsync.c:1075 +#: ../src/coldsync.c:816 msgid "Running Sync conduits" msgstr "Sto eseguendo i conduits di Sync" -#: ../libpconn/slp.c:391 +#: ../libpconn/slp.c:385 #, c-format msgid "SLP: bad CRC: expected 0x%04x, got 0x%04x.\n" msgstr "SLP: CRC non corretto: mi aspettavo 0x%04x, ho ricevuto 0x%04x.\n" -#: ../src/coldsync.c:1855 +#: ../src/coldsync.c:2443 msgid "Set user ID" msgstr "Setta lo user ID" -#: ../src/coldsync.c:1890 +#: ../src/coldsync.c:2466 msgid "Set username" msgstr "Setta lo username" -#: ../src/coldsync.c:1120 +#: ../src/coldsync.c:1083 msgid "Sync cancelled by Palm." msgstr "Sincronizzazione cancellata dal Palm." -#: ../src/coldsync.c:1089 ../src/coldsync.c:2678 -msgid "Sync cancelled." -msgstr "Sincronizzazione cancellata." - -#: ../src/coldsync.c:621 +#: ../src/coldsync.c:1268 #, c-format msgid "Sync for %s at %s" msgstr "" -#: ../src/coldsync.c:649 +#: ../src/coldsync.c:834 +#, c-format +msgid "Syncing %s" +msgstr "" + +#: ../src/coldsync.c:1296 #, c-format msgid "" "This Palm has user ID %ld (I was expecting %ld).\n" @@ -1697,7 +1738,7 @@ msgstr "" "\tIl tuo file di configurazione dovrebbe contenere un PDA block simile\n" "a questo:" -#: ../src/coldsync.c:704 +#: ../src/coldsync.c:1350 #, c-format msgid "" "This Palm has user name \"%.*s\" (I was expecting \"%.*s\").\n" @@ -1714,7 +1755,7 @@ msgstr "" "\tIl tuo file di configurazione dovrebbe contenere un PDA block simile\n" "a questo:" -#: ../src/config.c:945 +#: ../src/config.c:1088 msgid "This host doesn't appear to have an IP address." msgstr "Questo host sembra che non abbia un indirizzo IP." @@ -1727,7 +1768,7 @@ msgstr "Tempo scaduto" msgid "Too many errors. Aborting." msgstr "%s: Troppi descrittori di file aperti. Interrompo." -#: ../src/coldsync.c:3103 +#: ../src/coldsync.c:2410 #, c-format msgid "Too many files named \"%s\" in the attic." msgstr "Troppi files chiamati \"%s\" in soffitta." @@ -1740,7 +1781,7 @@ msgstr "Trasferimento interrotto" msgid "Unexpected timeout" msgstr "" -#: ../src/config.c:229 +#: ../src/config.c:295 #, c-format msgid "Unknown device type: \"%s\"." msgstr "Tipo di device sconosciuto: \"%s\"." @@ -1750,17 +1791,17 @@ msgstr "Tipo di device sconosciuto: \"%s\"." msgid "Unknown error" msgstr "Nessun errore" -#: ../src/config.c:706 +#: ../src/config.c:792 #, c-format msgid "Unknown facility \"%s\"." msgstr "Facility sconosciuta \"%s\"." -#: ../src/config.c:755 +#: ../src/config.c:843 ../src/config.c:876 #, c-format msgid "Unknown mode: \"%s\"." msgstr "Modalita' sconosciuta: \"%s\"." -#: ../src/coldsync.c:345 +#: ../src/coldsync.c:353 #, c-format msgid "" "Unknown mode: %d.\n" @@ -1769,22 +1810,22 @@ msgstr "" "Modalita' sconosciuta: %d.\n" "Questo e' un bug. Per favore, avverti il mantainer del progetto." -#: ../src/config.c:242 +#: ../src/config.c:308 #, fuzzy, c-format msgid "Unknown protocol: \"%s\"." msgstr "Opzione sconosciuta: \"%s\"." -#: ../src/coldsync.c:2261 +#: ../src/coldsync.c:2110 #, c-format msgid "Unknown user/uid: \"%s\"." msgstr "Utente/UID sconosciuto: \"%s\"." -#: ../src/config.c:254 +#: ../src/config.c:327 #, c-format msgid "Unrecognized option: \"%s\"." msgstr "Opzione sconosciuta: \"%s\"." -#: lexer.l:505 +#: lexer.l:540 #, c-format msgid "Unterminated string at line %d (string started on line %d)\n" msgstr "" @@ -1799,7 +1840,7 @@ msgstr "L'invio di \"%s\" e' stato cancellato dal Palm.\n" msgid "Uploading \"%s\"" msgstr "Sto inviando \"%s\"" -#: ../src/config.c:834 +#: ../src/config.c:977 #, c-format msgid "Usage: %s [options] \n" msgstr "Uso: %s [opzioni] \n" @@ -1817,7 +1858,7 @@ msgstr "" "Attenzione: l'AppInfo block non e' dove dovrebbe essere.\n" "Mi aspettavo 0x%lx, ma siamo a 0x%lx.\n" -#: ../src/spalm.c:461 +#: ../src/spalm.c:426 #, c-format msgid "" "Warning: ROM serial number is %d characters long. Please notify the\n" @@ -1844,7 +1885,7 @@ msgstr "" "Attenzione: non posso usare la velocita' che hai richiesto (%ld bps).\n" "Uso la velocita' di default.\n" -#: ../libpconn/PConnection_serial.c:603 +#: ../libpconn/PConnection_serial.c:607 #, c-format msgid "Warning: no device on %s. Sleeping\n" msgstr "Attenzione: non ho trovato alcun device su %s. Torno in attesa\n" @@ -1876,7 +1917,7 @@ msgstr "" "Attenzione: il sort block non e' dove dovrebbe essere.\n" "Mi aspettavo 0x%lx, ma siamo a 0x%lx.\n" -#: ../libpconn/padp.c:647 +#: ../libpconn/padp.c:645 msgid "Write timeout. Attempting to resend.\n" msgstr "Timeout in scrittura. Ritento l'invio\n" @@ -1884,7 +1925,7 @@ msgstr "Timeout in scrittura. Ritento l'invio\n" msgid "XID on ACK doesn't match request" msgstr "" -#: ../src/spalm.c:563 +#: ../src/spalm.c:521 msgid "" "You have an old Palm, one that doesn't say how many\n" "databases it has. I can't cope with this." @@ -1892,7 +1933,7 @@ msgstr "" "Hai un Palm di tipo vecchio, che non dice quanti\n" "database ha in memoria. Non posso farci nulla." -#: ../src/config.c:728 +#: ../src/config.c:814 #, c-format msgid "" "You shouldn't specify two -m options.\n" @@ -1901,7 +1942,7 @@ msgstr "" "Non puoi specificare due opzioni -m\n" "\tUso -m%s." -#: ../src/config.c:269 +#: ../src/config.c:342 #, c-format msgid "" "You specified an apparently legal option (\"-%c\"), but I don't know what\n" @@ -1910,26 +1951,29 @@ msgstr "" "Hai specificato un'opzione apparentemente valida (\"-%c\"), ma non so\n" "cosa farne. Questo e' un bug. Per favore, avverti il mantainer del progetto." -#: ../src/GenericConduit.cc:177 +#: ../src/GenericConduit.cc:183 msgid "[generic]: Aborting." msgstr "[generic]: Operazione interrotta." -#: ../libpconn/PConnection_usb.c:648 +#: ../libpconn/PConnection_usb.c:671 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable fallito" -#: ../libpconn/PConnection_usb.c:586 +#: ../libpconn/PConnection_usb.c:609 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo fallito" -#: ../src/GenericConduit.cc:340 +#: ../src/GenericConduit.cc:325 msgid "pdb_Download() failed." msgstr "pdb_Download() fallito" -#: ../libpconn/PConnection_usb.c:181 +#: ../libpconn/PConnection_usb.c:204 msgid "usb: trying to fill a non-empty buffer.\n" msgstr "usb: si sta riempendo un buffer gia' pieno.\n" +#~ msgid "Sync cancelled." +#~ msgstr "Sincronizzazione cancellata." + #~ msgid "##### %s: Unknown argument type: 0x%02x\n" #~ msgstr "##### %s: Tipo di argomento sconosciuto: 0x%02x\n" diff --git a/i18n/ja.po b/i18n/ja.po index fd12a9ee..cdbb1160 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -3,11 +3,10 @@ # This file is distributed under the same license as the coldsync package. # Takeshi Aihana , 2002. # -#, no-wrap msgid "" msgstr "" "Project-Id-Version: coldsync 2.2.5\n" -"POT-Creation-Date: 2002-05-01 03:18+0900\n" +"POT-Creation-Date: 2002-06-21 16:10+0200\n" "PO-Revision-Date: 2002-05-02 01:59+0900\n" "Last-Translator: Takeshi AIHANA \n" "Language-Team: Japanese\n" @@ -15,51 +14,53 @@ msgstr "" "Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/config.c:819 +#: ../src/config.c:961 msgid "\t-F:\t\tForce fast sync.\n" msgstr "\t-F:\t\tśŻŔŠĹޤ˚âÂŽ¤ÇĆą´ü¤š¤ëĄŁ\n" -#: ../src/config.c:817 +#: ../src/config.c:959 msgid "\t-I:\t\tForce installation of new databases.\n" msgstr "\t-I:\t\tżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňśŻŔŠĹŞ¤ËĽ¤ĽóĽšĽČĄźĽë¤š¤ëĄŁ\n" -#: ../src/config.c:823 +#: ../src/config.c:965 msgid "\t-P :\tSoftware protocol [default|full|simple|net].\n" -msgstr "\t-P :\tĽ˝ĽŐĽČĽŚĽ§Ľ˘ĄŚĽ×ĽíĽČĽłĽë [default|full|simple|net] ¤ňťŘÄꤚ¤ëĄŁ\n" +msgstr "" +"\t-P :\tĽ˝ĽŐĽČĽŚĽ§Ľ˘ĄŚĽ×ĽíĽČĽłĽë [default|full|simple|net] ¤ňťŘÄꤚ" +"¤ëĄŁ\n" -#: ../src/config.c:820 +#: ../src/config.c:962 msgid "\t-R:\t\tCheck ROM databases.\n" msgstr "\t-R:\t\tROM ĽÇĄźĽżĽŮĄźĽš¤ňĽÁĽ§ĽĂĽŻ¤š¤ëĄŁ\n" -#: ../src/config.c:818 +#: ../src/config.c:960 msgid "\t-S:\t\tForce slow sync.\n" msgstr "\t-S:\t\tśŻŔŠĹޤËÄăÂŽ¤ÇĆą´ü¤š¤ëĄŁ\n" -#: ../src/config.c:814 +#: ../src/config.c:956 msgid "\t-V:\t\tPrint version and exit.\n" msgstr "\t-V:\t\tColdSync ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ć˝ŞÎť¤š¤ëĄŁ\n" -#: ../src/config.c:829 +#: ../src/config.c:972 msgid "\t-d :\tSet debugging level.\n" msgstr "\t-d :\tĽÇĽĐĽĂĽ°ĄŚĽěĽŮĽë level ¤ňĽťĽĂĽČ¤š¤ëĄŁ\n" -#: ../src/config.c:815 +#: ../src/config.c:957 msgid "\t-f :\tRead configuration from \n" msgstr "\t-f :\t ¤Ť¤éŔßÄę¤ňĆɤߚţ¤ŕĄŁ\n" -#: ../src/config.c:813 +#: ../src/config.c:955 msgid "\t-h:\t\tPrint this help message and exit.\n" msgstr "\t-h:\t\t¤ł¤ÎĽŘĽëĽ×¤ňÉ˝ź¨¤ˇ¤Ć˝ŞÎť¤š¤ëĄŁ\n" -#: ../src/config.c:826 +#: ../src/config.c:968 msgid "\t-l: :\tWrite error/debugging messages to .\n" msgstr "\t-l: :\tĽ¨ĽéĄź/ĽÇĽĐĽĂĽ°ĄŚĽáĽĂĽťĄźĽ¸¤ň ¤Ë˝ń¤­šţ¤ŕĄŁ\n" -#: ../src/config.c:807 +#: ../src/config.c:949 msgid "\t-mI:\tInitialize.\n" msgstr "\t-mI:\t˝é´ü˛˝¤š¤ëĄŁ\n" -#: ../src/config.c:808 +#: ../src/config.c:950 msgid "" "\t-mb [database...]\n" "\t\tPerform a backup to .\n" @@ -67,7 +68,7 @@ msgstr "" "\t-mb [database...]\n" "\t\t ¤Ë (databese ¤ň) ĽĐĽĂĽŻĽ˘ĽĂĽ×¤š¤ëĄŁ\n" -#: ../src/config.c:810 +#: ../src/config.c:952 msgid "" "\t-mr ...\n" "\t\tRestore or install new databases.\n" @@ -75,91 +76,99 @@ msgstr "" "\t-mr ...\n" "\t\tżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňĽęĽšĽČĽ˘/Ľ¤ĽóĽšĽČĄźĽë¤š¤ëĄŁ\n" -#: ../src/config.c:806 +#: ../src/config.c:948 msgid "\t-ms:\tSynchronize (default).\n" msgstr "\t-ms:\tĆą´ü¤š¤ëĄŁ(ĽÇĽŐĽŠĽëĽČ)\n" -#: ../src/config.c:821 +#: ../src/config.c:971 +msgid "\t-n :\tChoice the named listen block.\n" +msgstr "" + +#: ../src/config.c:963 msgid "\t-p :\tListen on device .\n" msgstr "\t-p :\t ¤ÎĽÇĽĐĽ¤Ľš¤ň´Ćťë¤š¤ëĄŁ\n" -#: ../src/config.c:825 +#: ../src/config.c:967 msgid "\t-s:\t\tLog error messages to syslog.\n" msgstr "\t-s:\t\tĽ¨ĽéĄźĽáĽĂĽťĄźĽ¸¤ň Syslog ¤ËĽíĽ°¤š¤ëĄŁ\n" -#: ../src/config.c:822 +#: ../src/config.c:964 msgid "\t-t :\tPort type [serial|usb|net].\n" msgstr "\t-t :\tĽÝĄźĽČ¤ÎźďÎŕ devtype ¤ňťŘÄꤚ¤ëĄŁ[serial|usb|net]\n" -#: ../src/config.c:828 +#: ../src/config.c:970 msgid "\t-v:\t\tIncrease verbosity.\n" msgstr "\t-v:\t\t˝ĐÎϤš¤ëĽáĽĂĽťĄźĽ¸¤ňžÜşŮ¤Ë¤š¤ëĄŁ\n" -#: ../src/config.c:816 +#: ../src/config.c:958 msgid "\t-z:\t\tInstall databases after sync.\n" msgstr "\t-z:\t\tĆą´ü¤ˇ¤ż¸ĺ¤ËĽÇĄźĽżĽŮĄźĽš¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ëĄŁ\n" -#: ../src/parser.y:326 ../src/parser.y:584 ../src/parser.y:1128 +#: ../src/parser.y:341 ../src/parser.y:658 ../src/parser.y:1229 #, c-format msgid "\tError near \"%s\"." msgstr "\t\"%s\" ¤ÇĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/parser.y:1157 +#: ../src/parser.y:1258 msgid "\tMissing ':'." msgstr "\t':' ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:1174 +#: ../src/parser.y:1274 msgid "\tMissing ';'." msgstr "\t';' ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:1166 +#: ../src/parser.y:1266 msgid "\tMissing '{'." msgstr "\t'{' ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:749 +#: ../src/parser.y:823 #, c-format msgid "\tMissing argument name near \": %s\"." msgstr "\t\": %s\" ¤Î°úżôĚž¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:247 +#: ../src/parser.y:255 msgid "\tMissing listen block type." msgstr "\t´Ćťë¤š¤ëĽÖĽíĽĂĽŻ¤ÎźďÎए¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:821 +#: ../src/parser.y:919 #, c-format msgid "\tMissing option name near \"%s\"." msgstr "\t\"%s\" ¤ÎĽŞĽ×ĽˇĽçĽóĚž¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:414 +#: ../src/parser.y:461 #, c-format msgid "\tUnrecognized conduit flavor \"%s\"." msgstr "\tǧźą¤Ç¤­¤Ę¤¤ĽłĽóĽ¸ĽĂĽČˇÁź°: \"%s\"" -#: ../src/parser.y:249 +#: ../src/parser.y:257 #, c-format msgid "\tUnrecognized listen type \"%s\"." msgstr "\tǧźą¤Ç¤­¤Ę¤¤´ĆťëˇÁź°: \"%s\"" -#: ../src/parser.y:448 +#: ../src/parser.y:495 #, c-format msgid "\tUnrecognized protocol: \"%s\"." msgstr "\tǧźą¤Ç¤­¤Ę¤¤Ľ×ĽíĽČĽłĽë: \"%s\"" -#: ../src/config.c:874 +#: ../src/config.c:1017 #, c-format msgid "" "\n" " Default global configuration file: %s\n" -msgstr "\n ĽÇĽŐĽŠĽëĽČ¤ÎĽˇĽšĽĆĽŕŔßÄęĽŐĽĄĽ¤Ľë: %s\n" +msgstr "" +"\n" +" ĽÇĽŐĽŠĽëĽČ¤ÎĽˇĽšĽĆĽŕŔßÄęĽŐĽĄĽ¤Ľë: %s\n" -#: ../src/coldsync.c:386 +#: ../src/coldsync.c:396 #, c-format msgid "" "\n" "Log closed on %s" -msgstr "\n%s ¤ÎĽíĽ°´°Îť" +msgstr "" +"\n" +"%s ¤ÎĽíĽ°´°Îť" -#: ../src/coldsync.c:1824 +#: ../src/coldsync.c:1787 msgid "" "\n" "This Palm already has user information that matches neither what's in your\n" @@ -177,19 +186,22 @@ msgstr "" ".coldsyncrc ŔßÄęĽŐĽĄĽ¤Ľë¤Ë¤ĎźĄ¤Î¤č¤Ś¤ĘžđĘ󤏾­şÜ¤ľ¤ě¤Ć¤¤¤Ţ¤š:\n" "\n" -#: ../src/config.c:869 +#: ../src/config.c:1012 msgid "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: strings are compared without regard\n" " to case, whenever possible.\n" msgstr "" -" HAVE_STRCASECMP, HAVE_STRNCASECMP: ˛ÄÇ˝¤Ę¤é¤ĐĄ˘Âçʸťú/žŽĘ¸ťú¤ÎśčĘ̤ʤˇ¤Ë\n" +" HAVE_STRCASECMP, HAVE_STRNCASECMP: ˛ÄÇ˝¤Ę¤é¤ĐĄ˘Âçʸťú/žŽĘ¸ťú¤ÎśčĘ̤ʤˇ" +"¤Ë\n" " ʸťúÎó¤ÎČćłÓ¤ňšÔ¤ŚĄŁ\n" -#: ../src/config.c:864 +#: ../src/config.c:1007 msgid " WITH_EFENCE: buffer overruns will cause a segmentation violation.\n" -msgstr " WITH_EFENCE: ĽĐĽĂĽŐĽĄĄŚĽŞĄźĽĐĄźĽéĽó¤ĎĽťĽ°ĽáĽóĽĆĄźĽˇĽçĽóĄŚĽŐĽŠĽëĽČ¤ň°ú¤­ľŻ¤ł¤ˇ¤Ţ¤šĄŁ\n" +msgstr "" +" WITH_EFENCE: ĽĐĽĂĽŐĽĄĄŚĽŞĄźĽĐĄźĽéĽó¤ĎĽťĽ°ĽáĽóĽĆĄźĽˇĽçĽóĄŚĽŐĽŠĽëĽČ¤ň°ú¤­ľŻ" +"¤ł¤ˇ¤Ţ¤šĄŁ\n" -#: ../src/config.c:860 +#: ../src/config.c:1003 msgid " WITH_USB: USB support.\n" msgstr " WITH_USB: USB ¤ňĽľĽÝĄźĽČ¤š¤ëĄŁ\n" @@ -198,78 +210,76 @@ msgstr " WITH_USB: USB msgid "\"%.*s\" record 0x%08lx has length 0.\n" msgstr "\"%.*s\" ĽěĽłĄźĽÉ 0x%08lx ¤ÎÄš¤ľ¤Ź 0 ¤Ç¤šĄŁ\n" -#: ../src/coldsync.c:1312 +#: ../src/coldsync.c:1414 #, c-format msgid "\"%s\" exists, but is not a directory." msgstr "\"%s\" ¤Ď¸şß¤ˇ¤Ţ¤š¤ŹĄ˘ĽÇĽŁĽěĽŻĽČĽę¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../libpconn/dlp_cmd.c:1517 ../libpconn/dlp_cmd.c:1606 -#: ../libpconn/dlp_cmd.c:1697 ../libpconn/dlp_cmd.c:1799 -#: ../libpconn/dlp_cmd.c:2352 ../libpconn/dlp_cmd.c:2792 -#: ../libpconn/dlp_cmd.c:2946 ../libpconn/dlp_cmd.c:3005 -#: ../libpconn/dlp_cmd.c:3092 ../libpconn/dlp_cmd.c:3164 -#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3300 -#: ../libpconn/dlp_cmd.c:3369 ../libpconn/dlp_cmd.c:3436 -#: ../libpconn/dlp_cmd.c:3560 ../libpconn/dlp_cmd.c:3670 -#: ../libpconn/dlp_cmd.c:3782 ../libpconn/dlp_cmd.c:3889 -#: ../libpconn/dlp_cmd.c:3986 ../libpconn/dlp_cmd.c:4098 -#: ../libpconn/dlp_cmd.c:4213 -#, c-format -msgid "##### %s: Unknown argument type: 0x%02x\n" -msgstr "##### %s: ÉÔĚŔ¤Ę°úżô¤ÎźďÎŕ: 0x%02x\n" - -#: ../libpconn/dlp_cmd.c:218 ../libpconn/dlp_cmd.c:322 -#: ../libpconn/dlp_cmd.c:432 ../libpconn/dlp_cmd.c:501 -#: ../libpconn/dlp_cmd.c:579 ../libpconn/dlp_cmd.c:716 -#: ../libpconn/dlp_cmd.c:950 ../libpconn/dlp_cmd.c:1053 -#: ../libpconn/dlp_cmd.c:1160 ../libpconn/dlp_cmd.c:1244 -#: ../libpconn/dlp_cmd.c:1328 ../libpconn/dlp_cmd.c:1426 -#: ../libpconn/dlp_cmd.c:1914 ../libpconn/dlp_cmd.c:2031 -#: ../libpconn/dlp_cmd.c:2160 ../libpconn/dlp_cmd.c:2246 -#: ../libpconn/dlp_cmd.c:2466 ../libpconn/dlp_cmd.c:2570 -#: ../libpconn/dlp_cmd.c:2657 ../libpconn/dlp_cmd.c:2726 -#: ../libpconn/dlp_cmd.c:4309 +#: ../libpconn/dlp_cmd.c:191 ../libpconn/dlp_cmd.c:281 +#: ../libpconn/dlp_cmd.c:392 ../libpconn/dlp_cmd.c:451 +#: ../libpconn/dlp_cmd.c:515 ../libpconn/dlp_cmd.c:638 +#: ../libpconn/dlp_cmd.c:858 ../libpconn/dlp_cmd.c:947 +#: ../libpconn/dlp_cmd.c:1040 ../libpconn/dlp_cmd.c:1110 +#: ../libpconn/dlp_cmd.c:1180 ../libpconn/dlp_cmd.c:1264 +#: ../libpconn/dlp_cmd.c:1338 ../libpconn/dlp_cmd.c:1414 +#: ../libpconn/dlp_cmd.c:1489 ../libpconn/dlp_cmd.c:1576 +#: ../libpconn/dlp_cmd.c:1677 ../libpconn/dlp_cmd.c:1779 +#: ../libpconn/dlp_cmd.c:1887 ../libpconn/dlp_cmd.c:1958 +#: ../libpconn/dlp_cmd.c:2049 ../libpconn/dlp_cmd.c:2148 +#: ../libpconn/dlp_cmd.c:2230 ../libpconn/dlp_cmd.c:2302 +#: ../libpconn/dlp_cmd.c:2357 ../libpconn/dlp_cmd.c:2409 +#: ../libpconn/dlp_cmd.c:2545 ../libpconn/dlp_cmd.c:2590 +#: ../libpconn/dlp_cmd.c:2664 ../libpconn/dlp_cmd.c:2723 +#: ../libpconn/dlp_cmd.c:2786 ../libpconn/dlp_cmd.c:2831 +#: ../libpconn/dlp_cmd.c:2887 ../libpconn/dlp_cmd.c:2940 +#: ../libpconn/dlp_cmd.c:3050 ../libpconn/dlp_cmd.c:3145 +#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3333 +#: ../libpconn/dlp_cmd.c:3413 ../libpconn/dlp_cmd.c:3511 +#: ../libpconn/dlp_cmd.c:3612 ../libpconn/dlp_cmd.c:3694 #, c-format msgid "##### %s: Unknown argument type: 0x%02x.\n" msgstr "##### %s: ÉÔĚŔ¤Ę°úżô¤ÎźďÎŕ: 0x%02x\n" -#: ../libpconn/padp.c:484 +#: ../libpconn/padp.c:482 #, c-format msgid "##### Bad offset: wanted %d, got %d.\n" msgstr "##### ¤Ş¤Ť¤ˇ¤ĘĽŞĽŐĽťĽĂĽČ: ´üÂÔĂÍ %d, źčĆŔĂÍ: %d\n" -#: ../libpconn/dlp.c:286 +#: ../libpconn/dlp.c:292 #, c-format msgid "##### Bad response ID: expected 0x%02x, got 0x%02x.\n" msgstr "##### ¤Ş¤Ť¤ˇ¤ĘąţĹú ID: ´üÂÔĂÍ 0x%02x, źčĆŔĂÍ 0x%02x\n" -#: ../libpconn/padp.c:802 +#: ../libpconn/padp.c:800 #, c-format msgid "##### Expected XID 0x%02x, got 0x%02x.\n" msgstr "##### XID ´üÂÔĂÍ 0x%02x, źčĆŔĂÍ 0x%02x\n" -#: ../libpconn/dlp.c:277 +#: ../libpconn/dlp.c:283 msgid "##### Expected a DLP response, but this isn't one!\n" msgstr "##### DLP ąţĹú¤ň´üÂÔ¤ˇ¤Ţ¤ˇ¤ż¤ŹĄ˘¤ł¤ě¤Ď°ă¤¤¤Ţ¤šĄŞ\n" -#: ../libpconn/padp.c:729 +#: ../libpconn/padp.c:727 msgid "##### Got an unexpected data packet. Sending an ACK to shut it up.\n" -msgstr "##### ´üÂÔ¤ˇ¤Ć¤¤¤Ę¤¤ĽŃĽąĽĂĽČ¤ňźőżŽ¤ˇ¤Ţ¤ˇ¤żĄŁĚľ¸ú¤Ë¤š¤ë¤ż¤á¤Ë ACK ¤ňÁ÷żŽ¤ˇ¤Ţ¤šĄŁ\n" +msgstr "" +"##### ´üÂÔ¤ˇ¤Ć¤¤¤Ę¤¤ĽŃĽąĽĂĽČ¤ňźőżŽ¤ˇ¤Ţ¤ˇ¤żĄŁĚľ¸ú¤Ë¤š¤ë¤ż¤á¤Ë ACK ¤ňÁ÷żŽ¤ˇ¤Ţ" +"¤šĄŁ\n" -#: ../libpconn/padp.c:198 ../libpconn/padp.c:446 +#: ../libpconn/padp.c:198 ../libpconn/padp.c:444 msgid "##### I just got an unexpected ACK. I'm confused!\n" msgstr "##### ´üÂÔ¤ˇ¤Ć¤¤¤Ę¤¤ ACK ¤ňźőżŽ¤ˇ¤ż¤Î¤ÇĄ˘ÂĐ˝č¤Ç¤­¤Ţ¤ť¤óĄŞ\n" -#: ../libpconn/padp.c:471 +#: ../libpconn/padp.c:469 msgid "##### I wasn't expecting a new fragment. I'm confused!\n" -msgstr "##### ´üÂÔ¤ˇ¤Ć¤¤¤Ę¤¤żˇ¤ˇ¤¤ĽŐĽéĽ°ĽáĽóĽČ¤ňźőżŽ¤ˇ¤ż¤Î¤ÇĄ˘ÂĐ˝č¤Ç¤­¤Ţ¤ť¤óĄŞ\n" +msgstr "" +"##### ´üÂÔ¤ˇ¤Ć¤¤¤Ę¤¤żˇ¤ˇ¤¤ĽŐĽéĽ°ĽáĽóĽČ¤ňźőżŽ¤ˇ¤ż¤Î¤ÇĄ˘ÂĐ˝č¤Ç¤­¤Ţ¤ť¤óĄŞ\n" -#: ../libpconn/padp.c:217 ../libpconn/padp.c:461 ../libpconn/padp.c:790 +#: ../libpconn/padp.c:217 ../libpconn/padp.c:459 ../libpconn/padp.c:788 #, c-format msgid "##### Unexpected packet type %d.\n" msgstr "##### %d ¤ĎÍ˝ÁŰł°¤ÎĽŃĽąĽĂĽČˇÁź°¤Ç¤šĄŁ\n" -#: lexer.l:459 +#: lexer.l:476 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" @@ -278,7 +288,7 @@ msgstr "" "%d: \"%s\" ¤ÇÍ˝ÁŰł°¤Îʸťú¤Ź¤˘¤ę¤Ţ¤šĄŁ\n" " ¤Ş¤˝¤é¤Ż \"$(%.*s)\" ¤Î¤č¤Ś¤Ç¤šĄŁ\n" -#: lexer.l:468 +#: lexer.l:485 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" @@ -287,7 +297,7 @@ msgstr "" "%d: \"%s\" ¤ÇÍ˝ÁŰł°¤Îʸťú¤Ź¤˘¤ę¤Ţ¤šĄŁ\n" " ¤Ş¤˝¤é¤Ż \"${%.*s}\" ¤Î¤č¤Ś¤Ç¤šĄŁ\n" -#: lexer.l:473 +#: lexer.l:490 #, c-format msgid "" "%d: Unterminated variable reference near \"%s\".\n" @@ -296,42 +306,48 @@ msgstr "" "%d: \"%s\" ¤Ç˝ŞÎť¤ˇ¤Ć¤¤¤Ę¤¤ĘŃżôť˛žČ¤Ź¤˘¤ę¤Ţ¤šĄŁ\n" " ¤Ş¤˝¤é¤Ż \"$(%.*s)\" ¤Î¤č¤Ś¤Ç¤šĄŁ\n" -#: ../src/config.c:845 +#: ../src/config.c:988 #, c-format msgid "%s version %s.\n" msgstr "%s ĽĐĄźĽ¸ĽçĽó %s\n" -#: ../src/parser.y:613 +#: ../src/parser.y:687 #, c-format msgid "%s: %d: Bogus creator \"%s\"." msgstr "%s: %d: \"%s\" ¤Ď¤Ş¤Ť¤ˇ¤ĘĽŻĽęĽ¨ĄźĽżĄź¤Ç¤šĄŁ" -#: ../src/parser.y:637 +#: ../src/parser.y:711 #, c-format msgid "%s: %d: Bogus type \"%s\"." msgstr "%s: %d: \"%s\" ¤Ď¤Ş¤Ť¤ˇ¤ĘˇÁź°¤Ç¤šĄŁ" -#: ../src/parser.y:497 +#: ../src/parser.y:549 #, c-format msgid "%s: %d: Can't add creator-type pair to list. This is very bad." -msgstr "%s: %d: °ěÍ÷¤ËÂФμŻĽęĽ¨ĄźĽżĄźˇÁź°¤ňÄɲäǤ­¤Ţ¤ť¤óĄŁ¤ł¤ě¤ĎĂ×̿Ū¤ĘžőÂ֤ǤšĄŁ" +msgstr "" +"%s: %d: °ěÍ÷¤ËÂФμŻĽęĽ¨ĄźĽżĄźˇÁź°¤ňÄɲäǤ­¤Ţ¤ť¤óĄŁ¤ł¤ě¤ĎĂ×̿Ū¤ĘžőÂ֤ǤšĄŁ" -#: ../src/parser.y:552 +#: ../src/parser.y:626 #, c-format msgid "%s: %d: Can't add preference to list. This is very bad." msgstr "%s: %d: °ěÍ÷¤ËŔßÄę¤ňÄɲäǤ­¤Ţ¤ť¤óĄŁ¤ł¤ě¤ĎĂ×̿Ū¤ĘžőÂ֤ǤšĄŁ" -#: ../src/parser.y:286 +#: ../src/parser.y:590 +#, fuzzy, c-format +msgid "%s: %d: Cwd already defined." +msgstr "%s: %d: ÂŽĹ٤ϴű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" + +#: ../src/parser.y:301 #, c-format msgid "%s: %d: Device already defined." msgstr "%s: %d: ĽÇĽĐĽ¤Ľš¤Ď´ű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../src/parser.y:1030 +#: ../src/parser.y:1131 #, c-format msgid "%s: %d: Directory already defined." msgstr "%s: %d: ĽÇĽŁĽěĽŻĽČĽę¤Ď´ű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../src/parser.y:1000 +#: ../src/parser.y:1101 #, c-format msgid "" "%s: %d: Incorrect checksum\n" @@ -340,12 +356,12 @@ msgstr "" "%s: %d: ĽˇĽęĽ˘ĽëČÖšć \"%s-%c\" ¤Î\n" "ĽÁĽ§ĽĂĽŻĽľĽŕ¤ŹÉÔŔľ¤Ç¤šĄŁ\"%s-%c\" ¤Ë¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/parser.y:513 +#: ../src/parser.y:565 #, c-format msgid "%s: %d: Path already defined." msgstr "%s: %d: ĽŃĽš¤Ď´ű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../src/parser.y:979 +#: ../src/parser.y:1080 #, c-format msgid "" "%s: %d: Serial number \"%s\" has no checksum.\n" @@ -354,178 +370,178 @@ msgstr "" "%s: %d: ĽˇĽęĽ˘ĽëČÖšć \"%s\" ¤ĎĽÁĽ§ĽĂĽŻĽľĽŕ¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤óĄŁ\n" "\"%s-%c\" ¤ňťŘÄꤡ¤ĆşĆĹŮ˝ń¤­šţ¤ó¤Ç˛ź¤ľ¤¤ĄŁ" -#: ../src/parser.y:948 +#: ../src/parser.y:1049 #, c-format msgid "%s: %d: Serial number already defined." msgstr "%s: %d: ĽˇĽęĽ˘ĽëČÖšć¤Ď´ű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../src/parser.y:300 +#: ../src/parser.y:315 #, c-format msgid "%s: %d: Speed already defined." msgstr "%s: %d: ÂŽĹ٤ϴű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../src/parser.y:1066 +#: ../src/parser.y:1167 #, c-format msgid "%s: %d: Userid already defined." msgstr "%s: %d: ĽćĄźĽś ID ¤Ď´ű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../src/parser.y:1051 +#: ../src/parser.y:1152 #, c-format msgid "%s: %d: Username already defined." msgstr "%s: %d: ĽćĄźĽśĚž¤Ď´ű¤ËÄęľÁ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ" -#: ../libpconn/dlp.c:152 +#: ../libpconn/dlp.c:153 #, c-format msgid "%s: Can't allocate %ld-byte buffer.\n" msgstr "%s: %ld ĽĐĽ¤ĽČ¤ÎĽĐĽĂĽŐĽĄ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ\n" -#: ../src/parser.y:843 +#: ../src/parser.y:941 #, c-format msgid "%s: Can't allocate PDA block." msgstr "%s: PDA ĽÖĽíĽĂĽŻ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:707 +#: ../src/parser.y:781 #, c-format msgid "%s: Can't allocate conduit header." msgstr "%s: ĽłĽóĽ¸ĽĂĽČĄŚĽŘĽĂĽŔ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/parser.y:339 +#: ../src/parser.y:354 #, c-format msgid "%s: Can't allocate conduit_block!" msgstr "%s: conduit_block ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŞ" -#: ../src/parser.y:176 +#: ../src/parser.y:180 #, c-format msgid "%s: Can't allocate listen block." msgstr "%s: ´ĆťëĽÖĽíĽĂĽŻ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:1121 +#: ../src/GenericConduit.cc:1042 #, c-format msgid "%s: Can't allocate new record." msgstr "%s: żˇ¤ˇ¤¤ĽěĽłĄźĽÉ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:1221 +#: ../src/GenericConduit.cc:1142 #, c-format msgid "%s: Can't append new record to database: %d." msgstr "%s: ĽÇĄźĽżĽŮĄźĽš¤Ëżˇ¤ˇ¤¤ĽěĽłĄźĽÉ¤ňÄɲäǤ­¤Ţ¤ť¤ó: %d" -#: lexer.l:365 +#: lexer.l:382 #, c-format msgid "%s: Can't append to qstring." msgstr "%s: qstring ¤ËÄɲäǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/backup.c:716 +#: ../src/backup.c:695 #, c-format msgid "%s: Can't back up \"%s\"." msgstr "%s: \"%s\" ¤ňĽĐĽĂĽŻĽ˘ĽĂĽ×¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:448 ../src/GenericConduit.cc:948 -#: ../src/GenericConduit.cc:1490 +#: ../src/GenericConduit.cc:424 ../src/GenericConduit.cc:886 +#: ../src/GenericConduit.cc:1386 #, c-format msgid "%s: Can't clean up database: %d." msgstr "%s: ĽÇĄźĽżĽŮĄźĽš¤ňĽŻĽęĽ˘¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %d" -#: ../src/GenericConduit.cc:1960 ../src/GenericConduit.cc:1998 -#: ../src/GenericConduit.cc:2132 +#: ../src/GenericConduit.cc:1832 ../src/GenericConduit.cc:1869 +#: ../src/GenericConduit.cc:1994 #, c-format msgid "%s: Can't copy record." msgstr "%s: ĽěĽłĄźĽÉ¤ňĘŁźĚ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:1540 +#: ../src/conduit.c:1597 #, c-format msgid "%s: Can't create file handle to child's stdin." msgstr "%s: ɸ˝ŕĆţÎĎ (ťŇĽ×ĽíĽťĽš) ¤ËÂФš¤ëĽŐĽĄĽ¤ĽëĽĎĽóĽÉĽë¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:1568 +#: ../src/conduit.c:1625 #, c-format msgid "%s: Can't create file handle to child's stdout." msgstr "%s: ɸ˝ŕ˝ĐÎĎ (ťŇĽ×ĽíĽťĽš) ¤ËÂФš¤ëĽŐĽĄĽ¤ĽëĽĎĽóĽÉĽë¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:3680 ../src/coldsync.c:3700 +#: ../src/coldsync.c:3049 ../src/coldsync.c:3069 #, c-format msgid "%s: Can't create staging file \"%s\"." msgstr "%s: Staging ĽŐĽĄĽ¤Ľë \"%s\" ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:3690 +#: ../src/coldsync.c:3059 #, c-format msgid "%s: Can't create staging file name." msgstr "%s: Staging ĽŐĽĄĽ¤ĽëĚž¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:608 +#: ../src/GenericConduit.cc:560 #, c-format msgid "%s: Can't download \"%s\"." msgstr "%s: \"%s\" ¤ňĽŔĽŚĽóĽíĄźĽÉ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:2035 +#: ../src/conduit.c:2137 #, c-format msgid "%s: Can't get child process status." msgstr "%s: ťŇĽ×ĽíĽťĽš¤ÎžőÂÖ¤ňźčĆŔ¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../libpconn/PConnection_usb.c:505 +#: ../libpconn/PConnection_usb.c:528 #, c-format msgid "%s: Can't get information about USB device.\n" msgstr "%s: USB ĽÇĽĐĽ¤ĽšžđĘó¤ňźčĆŔ¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤óĄŁ\n" -#: ../src/GenericConduit.cc:2094 ../src/GenericConduit.cc:2143 +#: ../src/GenericConduit.cc:1956 ../src/GenericConduit.cc:2004 #, c-format msgid "%s: Can't insert record 0x%08lx." msgstr "%s: ĽěĽłĄźĽÉ 0x%08lx ¤ňÁŢĆţ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:2505 +#: ../src/GenericConduit.cc:2354 #, c-format msgid "%s: Can't load \"%s\"." msgstr "%s: \"%s\" ¤ňĆɤߚţ¤á¤Ţ¤ť¤óĄŁ" -#: ../src/install.c:270 ../src/install.c:526 +#: ../src/install.c:270 ../src/install.c:512 #, c-format msgid "%s: Can't load database \"%s\"." msgstr "%s: ĽÇĄźĽżĽŮĄźĽš \"%s\" ¤ňĆɤߚţ¤á¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:1586 +#: ../src/conduit.c:1643 #, c-format msgid "%s: Can't make child's stdout be line-buffered." msgstr "%s: ɸ˝ŕ˝ĐÎĎ (ťŇĽ×ĽíĽťĽš) ¤ňĽéĽ¤ĽóĽĐĽĂĽŐĽĄ˛˝¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: lexer.l:135 lexer.l:148 lexer.l:227 lexer.l:302 lexer.l:517 lexer.l:567 +#: lexer.l:135 lexer.l:148 lexer.l:230 lexer.l:319 lexer.l:553 lexer.l:603 #, c-format msgid "%s: Can't make copy of string." msgstr "%s: ʸťúÎó¤ňĘŁźĚ¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/archive.c:68 ../src/archive.c:127 ../src/install.c:260 -#: ../src/install.c:425 ../src/install.c:516 ../src/parser.y:1215 -#: ../src/GenericConduit.cc:2495 +#: ../src/GenericConduit.cc:2344 ../src/archive.c:68 ../src/archive.c:127 +#: ../src/install.c:260 ../src/install.c:411 ../src/install.c:502 +#: ../src/parser.y:1315 #, c-format msgid "%s: Can't open \"%s\"." msgstr "%s: \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../libpconn/PConnection_usb.c:718 +#: ../libpconn/PConnection_usb.c:740 #, c-format msgid "%s: Can't open \"%s\".\n" msgstr "%s: \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ\n" -#: ../src/GenericConduit.cc:298 ../src/GenericConduit.cc:318 -#: ../src/GenericConduit.cc:568 ../src/GenericConduit.cc:587 -#: ../src/GenericConduit.cc:1063 ../src/GenericConduit.cc:1082 +#: ../src/GenericConduit.cc:297 ../src/GenericConduit.cc:310 +#: ../src/GenericConduit.cc:534 ../src/GenericConduit.cc:546 +#: ../src/GenericConduit.cc:991 ../src/GenericConduit.cc:1003 #, c-format msgid "%s: Can't open \"%s\": %d." msgstr "%s: \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤ó: %d" -#: ../libpconn/PConnection_usb.c:491 +#: ../libpconn/PConnection_usb.c:514 #, c-format msgid "%s: Can't open USB device.\n" msgstr "%s: USB ĽÇĽĐĽ¤Ľš¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:2941 +#: ../src/coldsync.c:2249 #, c-format msgid "%s: Can't open directory \"%s\"." msgstr "%s: ĽÇĽŁĽěĽŻĽČĽę \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/install.c:403 ../src/install.c:468 +#: ../src/install.c:389 ../src/install.c:454 #, c-format msgid "%s: Can't open install directory." msgstr "%s: Ľ¤ĽóĽšĽČĄźĽë¤š¤ëĽÇĽŁĽěĽŻĽČĽę¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:194 +#: ../src/GenericConduit.cc:200 #, c-format msgid "%s: Can't read %s backup file." msgstr "%s: ĽĐĽĂĽŻĽ˘ĽĂĽ×ĄŚĽŐĽĄĽ¤Ľë %s ¤ŹĆɤá¤Ţ¤ť¤óĄŁ" @@ -545,12 +561,12 @@ msgstr "%s: msgid "%s: Can't read sort block for %s: %d.\n" msgstr "%s: %s ¤ÎĽ˝ĄźĽČĄŚĽÖĽíĽĂĽŻ¤ŹĆɤá¤Ţ¤ť¤ó: %d.\n" -#: ../src/coldsync.c:3046 ../src/coldsync.c:3084 +#: ../src/coldsync.c:2354 ../src/coldsync.c:2392 #, c-format msgid "%s: Can't rename \"%s\" to \"%s\"." msgstr "%s: \"%s\" ¤Ť¤é \"%s\" ¤ËĽŐĽĄĽ¤ĽëĚž¤ňĘŃšš¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:2564 +#: ../src/GenericConduit.cc:2413 #, c-format msgid "" "%s: Can't rename staging file.\n" @@ -559,28 +575,34 @@ msgstr "" "%s: Staging ĽŐĽĄĽ¤Ľë¤ÎĚžÁ°¤ňĘŃšš¤Ç¤­¤Ţ¤ť¤óĄŁ\n" "¤Ś¤Ţ¤Ż¤¤¤ą¤ĐĄ˘\"%s\" ¤ÎĂć¤ËĽĐĽĂĽŻĽ˘ĽĂĽ×¤ŹşîŔŽ¤ľ¤ě¤Ţ¤šĄŁ" -#: ../src/GenericConduit.cc:468 ../src/GenericConduit.cc:967 -#: ../src/GenericConduit.cc:1510 +#: ../src/GenericConduit.cc:444 ../src/GenericConduit.cc:905 +#: ../src/GenericConduit.cc:1406 #, c-format msgid "%s: Can't reset sync flags: %d." msgstr "%s: Ćą´üĽŐĽéĽ°¤ň˝é´ü˛˝¤Ç¤­¤Ţ¤ť¤ó: %d" -#: ../src/restore.c:120 +#: ../src/restore.c:129 #, c-format msgid "%s: Can't restore %s: it is opened by another application." -msgstr "%s: %s ¤ňĽęĽšĽČĽ˘¤Ç¤­¤Ţ¤ť¤ó: ž¤ÎĽ˘Ľ×ĽęĽąĄźĽˇĽçĽó¤ŹťČÍѤˇ¤Ć¤¤¤ë¤č¤Ś¤Ç¤šĄŁ" +msgstr "" +"%s: %s ¤ňĽęĽšĽČĽ˘¤Ç¤­¤Ţ¤ť¤ó: ž¤ÎĽ˘Ľ×ĽęĽąĄźĽˇĽçĽó¤ŹťČÍѤˇ¤Ć¤¤¤ë¤č¤Ś¤Ç¤šĄŁ" #: ../src/archive.c:138 #, c-format msgid "%s: Can't seek to end of file." msgstr "%s: ĽŐĽĄĽ¤Ľë¤Î˝ŞĂź¤Ë°ÜĆ°¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:373 +#: ../src/parser.y:909 +#, fuzzy, c-format +msgid "%s: Can't set option.\n" +msgstr "%s: \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ\n" + +#: ../src/conduit.c:390 #, c-format msgid "%s: Can't set signal handler." msgstr "%s: ĽˇĽ°ĽĘĽëĄŚĽĎĽóĽÉĽé¤ňĽťĽĂĽČ¤š¤ë¤ł¤Č¤Ź¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:427 +#: ../src/conduit.c:445 #, c-format msgid "%s: Can't spawn conduit." msgstr "%s: ĽłĽóĽ¸ĽĂĽČ¤ňľŻĆ°¤Ç¤­¤Ţ¤ť¤óĄŁ" @@ -595,8 +617,8 @@ msgstr "%s: \"%.*s\" msgid "%s: Can't write archive file header." msgstr "%s: Ľ˘ĄźĽŤĽ¤ĽÖĄŚĽŐĽĄĽ¤Ľë¤ÎĽŘĽĂĽŔ¤ň˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:419 ../src/GenericConduit.cc:925 -#: ../src/GenericConduit.cc:1461 +#: ../src/GenericConduit.cc:402 ../src/GenericConduit.cc:870 +#: ../src/GenericConduit.cc:1364 #, c-format msgid "%s: Can't write backup file." msgstr "%s: ĽĐĽĂĽŻĽ˘ĽĂĽ×ĄŚĽŐĽĄĽ¤Ľë¤ň˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ" @@ -626,7 +648,7 @@ msgstr "%s: \"%.*s\" msgid "%s: Can't write sort block for \"%.*s\".\n" msgstr "%s: \"%.*s\" ÍѤμ˝ĄźĽČĄŚĽÖĽíĽĂĽŻ¤ň˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ\n" -#: ../src/GenericConduit.cc:2552 +#: ../src/GenericConduit.cc:2401 #, c-format msgid "%s: Can't write staging file \"%s\"." msgstr "%s: Staging ĽŐĽĄĽ¤Ľë \"%s\" ¤ň˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ" @@ -636,12 +658,12 @@ msgstr "%s: Staging msgid "%s: Can't write the two useless NULs to \"%.*s\".\n" msgstr "%s: ĚľÍѤĘĆó¤Ä¤Î NUL ʸťú¤ň \"%.*s\" ¤Ë˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ\n" -#: ../src/conduit.c:1858 +#: ../src/conduit.c:1960 #, c-format msgid "%s: Conduit exited unexpectedly." msgstr "%s: ĆÍÁłĄ˘ĽłĽóĽ¸ĽĂĽČ¤ŹśŻŔŠ˝ŞÎť¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:677 +#: ../src/conduit.c:698 #, c-format msgid "" "%s: Conduit handler is in an inconsistent state at\n" @@ -650,7 +672,7 @@ msgstr "" "%s: ĽłĽóĽ¸ĽĂĽČĄŚĽĎĽóĽÉĽé¤Ź %s:%d šÔ¤Ç̡˝â¤ˇ¤ż\n" "žőÂÖ¤ÎĂć¤Ë¤˘¤ę¤Ţ¤šĄŁşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/conduit.c:1849 +#: ../src/conduit.c:1951 #, c-format msgid "" "%s: Conduit is running happily, but hasn't printed anything.\n" @@ -659,27 +681,32 @@ msgstr "" "%s: ĽłĽóĽ¸ĽĂĽČ¤ŹľŻĆ°¤ˇ¤Ć¤¤¤Ţ¤š¤ŹĄ˘˛ż¤â˝ĐÎϤˇ¤Ć¤¤¤Ţ¤ť¤óĄŁ\n" "¤ł¤ě¤ĎĽĐĽ°¤Ç¤šĄŁşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../libpconn/PConnection_usb.c:626 +#: ../libpconn/PConnection_usb.c:648 #, c-format msgid "%s: Could not find HotSync endpoint on Visor.\n" msgstr "%s: Visor ¤Ë HotSync endpoint ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó¤Ç¤ˇ¤żĄŁ\n" -#: ../src/restore.c:109 +#: ../src/conduit.c:1538 +#, fuzzy, c-format +msgid "%s: Couldn't change directory to \"%s\"\n" +msgstr "%s: ĽÇĽŁĽěĽŻĽČĽę \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" + +#: ../src/restore.c:118 #, c-format msgid "%s: Database %s doesn't exist, yet it is open. Huh?" msgstr "%s: ĽÇĄźĽżĽŮĄźĽš %s ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ¤Ţ¤ŔłŤ¤¤¤Ć¤¤¤Ţ¤šĄŁHuh?" -#: ../src/install.c:335 ../src/install.c:580 +#: ../src/install.c:328 ../src/install.c:566 #, c-format msgid "%s: Error deleting \"%s\"." msgstr "%s: \"%s\" ¤Îşď˝üĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/GenericConduit.cc:1355 ../src/GenericConduit.cc:1394 +#: ../src/GenericConduit.cc:1267 ../src/GenericConduit.cc:1304 #, c-format msgid "%s: Error deleting record 0x%08lx: %d." msgstr "%s: ĽěĽłĄźĽÉ 0x%08lx ¤Îşď˝üĂć¤ËĽ¨ĽéĄź: %d" -#: ../src/conduit.c:788 +#: ../src/conduit.c:809 #, c-format msgid "%s: Error header wrong length %ld." msgstr "%s: ĽŘĽĂĽŔ¤ÎÄš¤ľ %ld ¤Ź´Ö°ă¤Ă¤Ć¤¤¤Ţ¤šĄŁ" @@ -689,32 +716,33 @@ msgstr "%s: msgid "%s: Error in DlpRPC().\n" msgstr "%s: DlpRPC() ¤ÎĂć¤ÇĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ\n" -#: ../src/conduit.c:708 +#: ../src/conduit.c:729 #, c-format msgid "%s: Error in select()." msgstr "%s: select() ¤ÎĂć¤ÇĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:774 +#: ../src/conduit.c:795 #, c-format msgid "%s: Error reading SPC request from conduit." msgstr "%s: ĽłĽóĽ¸ĽĂĽČ¤Ť¤é SPC Í׾á¤ÎĆɤߟč¤ęĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:847 +#: ../src/conduit.c:868 #, c-format msgid "%s: Error reading SPC request." msgstr "%s: SPC Í׾á¤ÎĆɤߟč¤ęĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:975 +#: ../src/conduit.c:996 #, c-format msgid "%s: Error sending SPC response data." msgstr "%s: SPC ąţĹúĽÇĄźĽż¤ÎÁ÷żŽĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../libpconn/padp.c:757 +#: ../libpconn/padp.c:755 #, c-format msgid "%s: Error sending dummy ACK. This is serious.\n" -msgstr "%s: ĽŔĽßĄź ACK ¤ÎÁ÷żŽĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ¤ł¤ě¤Ď˝ĹÂç¤ĘĽ¨ĽéĄź¤Ç¤šĄŁ\n" +msgstr "" +"%s: ĽŔĽßĄź ACK ¤ÎÁ÷żŽĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ¤ł¤ě¤Ď˝ĹÂç¤ĘĽ¨ĽéĄź¤Ç¤šĄŁ\n" -#: ../src/install.c:356 ../src/install.c:612 +#: ../src/install.c:342 ../src/install.c:584 #, c-format msgid "%s: Error uploading \"%s\"." msgstr "%s: \"%s\" ¤ÎĽ˘ĽĂĽ×ĽíĄźĽÉĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" @@ -724,7 +752,7 @@ msgstr "%s: \"%s\" msgid "%s: Error: dlp.write returned %d.\n" msgstr "%s: ERROR: dlp.write ¤Ź %d ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ\n" -#: ../src/conduit.c:353 +#: ../src/conduit.c:370 #, c-format msgid "" "%s: I just got file descriptor %d. There appears to be a file\n" @@ -733,20 +761,20 @@ msgstr "" "%s: ĽŐĽĄĽ¤ĽëĄŚĽÇĽšĽŻĽęĽ×Ľż %d ¤ňźčĆŔ¤ˇ¤Ţ¤ˇ¤żĄŁ\n" "ĽŐĽĄĽ¤ĽëĄŚĽÇĽšĽŻĽęĽ×Ľż¤Ź leak ¤ˇ¤Ć¤¤¤ë¤č¤Ś¤Ç¤šĄŁşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/GenericConduit.cc:1347 ../src/GenericConduit.cc:1386 -#: ../src/GenericConduit.cc:1630 ../src/GenericConduit.cc:1680 -#: ../src/GenericConduit.cc:1846 ../src/GenericConduit.cc:2198 -#: ../src/GenericConduit.cc:2240 +#: ../src/GenericConduit.cc:1261 ../src/GenericConduit.cc:1298 +#: ../src/GenericConduit.cc:1524 ../src/GenericConduit.cc:1573 +#: ../src/GenericConduit.cc:1728 ../src/GenericConduit.cc:2058 +#: ../src/GenericConduit.cc:2099 #, c-format msgid "%s: Lost connection to Palm." msgstr "%s: Palm ¤Č¤ÎŔÜÂł¤ŹŔÚ¤ě¤Ţ¤ˇ¤żĄŁ" -#: ../src/config.c:721 +#: ../src/config.c:807 #, c-format msgid "%s: Missing mode string. This should never happen." msgstr "%s: ĽâĄźĽÉ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ¤ł¤ě¤ĎŔäÂФËČŻŔ¸¤ˇ¤Ć¤Ď¤¤¤ą¤Ę¤¤¤ł¤Č¤Ç¤šĄŁ" -#: ../src/parser.y:351 +#: ../src/parser.y:398 #, c-format msgid "" "%s: No `type:' line seen\n" @@ -755,20 +783,26 @@ msgstr "" "%s: \"%s\" ¤ÎÄęľÁ¤ÎĂć¤Ë\n" "'type:' ¤ÎšÔ¤Ź¸Ť¤˘¤ż¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:1662 +#: ../src/conduit.c:1719 #, c-format msgid "%s: No executable \"%s\" in $CONDUIT_PATH or $CONDUITDIR.\n" -msgstr "%s: $CONDUIT_PATH ¤Ţ¤ż¤Ď $CONDUITDIR Ăć¤Ë¤ĎźÂšÔˇżź° \"%s\" ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ\n" +msgstr "" +"%s: $CONDUIT_PATH ¤Ţ¤ż¤Ď $CONDUITDIR Ăć¤Ë¤ĎźÂšÔˇżź° \"%s\" ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ\n" + +#: ../src/conduit.c:1757 +#, fuzzy, c-format +msgid "%s: No home directory for %s.\n" +msgstr "%s: ĽÇĽŁĽěĽŻĽČĽę \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1100 ../src/config.c:1136 ../src/config.c:1158 lexer.l:704 -#: ../src/pref.c:234 ../src/pref.c:299 +#: ../src/config.c:1243 ../src/config.c:1279 ../src/config.c:1301 +#: ../src/pref.c:220 ../src/pref.c:278 lexer.l:506 lexer.l:740 #, c-format msgid "%s: Out of memory." msgstr "%s: ĽáĽâĽę¤ŹÂ­¤ę¤Ţ¤ť¤óĄŁ" -#: ../libpconn/dlp_cmd.c:1458 ../libpconn/dlp_cmd.c:1639 -#: ../libpconn/dlp_cmd.c:2513 ../libpconn/dlp_cmd.c:2832 -#: ../libpconn/dlp_cmd.c:3924 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 +#: ../libpconn/dlp_cmd.c:1296 ../libpconn/dlp_cmd.c:1447 +#: ../libpconn/dlp_cmd.c:2195 ../libpconn/dlp_cmd.c:2449 +#: ../libpconn/dlp_cmd.c:3368 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 #: ../libpdb/pdb.c:1090 ../libpdb/pdb.c:1137 ../libpdb/pdb.c:1448 #: ../libpdb/pdb.c:1563 ../libpdb/pdb.c:1676 ../libpdb/pdb.c:1840 #: ../libpdb/pdb.c:1981 ../src/backup.c:138 ../src/backup.c:187 @@ -778,24 +812,24 @@ msgstr "%s: msgid "%s: Out of memory.\n" msgstr "%s: ĽáĽâĽę¤ŹÂ­¤ę¤Ţ¤ť¤óĄŁ\n" -#: ../src/conduit.c:361 +#: ../src/conduit.c:378 #, c-format msgid "%s: Too many file descriptors. Aborting." msgstr "%s: ĽŐĽĄĽ¤ĽëĄŚĽÇĽšĽŻĽęĽ×Ľż¤ŹÂż¤š¤Ž¤Ţ¤šĄŁĂćťß¤ˇ¤Ţ¤šĄŁ" -#: ../src/GenericConduit.cc:1638 ../src/GenericConduit.cc:1688 -#: ../src/GenericConduit.cc:1854 ../src/GenericConduit.cc:2206 -#: ../src/GenericConduit.cc:2248 +#: ../src/GenericConduit.cc:1533 ../src/GenericConduit.cc:1581 +#: ../src/GenericConduit.cc:1737 ../src/GenericConduit.cc:2067 +#: ../src/GenericConduit.cc:2107 #, c-format msgid "%s: Warning: Can't delete record 0x%08lx: %d." msgstr "%s: WARNNING: ĽěĽłĄźĽÉ 0x%08lx ¤ňşď˝ü¤Ç¤­¤Ţ¤ť¤ó: %d" -#: ../libpconn/PConnection_usb.c:543 +#: ../libpconn/PConnection_usb.c:566 #, c-format msgid "%s: Warning: Unexpected USB vendor ID %#x.\n" msgstr "%s: WARNING: Í˝ÁŰł°¤Î USB ĽŮĽóĽŔĄź ID %#x ¤Ç¤šĄŁ\n" -#: ../libpconn/slp.c:250 +#: ../libpconn/slp.c:248 #, c-format msgid "%s: bad checksum: expected 0x%02x, got 0x%02x.\n" msgstr "%s: ¤Ş¤Ť¤ˇ¤ĘĽÁĽ§ĽĂĽŻĽľĽŕ: ´üÂÔĂÍ 0x%02x, źčĆŔĂÍ 0x%02x\n" @@ -829,7 +863,7 @@ msgstr "" "%s: żˇ¤ˇ¤¤ĽĐĽĂĽŻĽ˘ĽĂĽ×ĽŐĽĄĽ¤Ľë %s ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ\n" "´ű¤Ë¸şß¤ˇ¤Ć¤¤¤ë¤č¤Ś¤Ç¤šĄŁ" -#: ../src/backup.c:668 +#: ../src/backup.c:647 #, c-format msgid "%s: can't write database \"%s\" to \"%s\"." msgstr "%s: ĽÇĄźĽżĽŮĄźĽš \"%s\" ¤Ť¤é \"%s\" ¤Ë˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ" @@ -849,54 +883,63 @@ msgstr "%s: \"%.*s\" msgid "%s: error reading record index entry for \"%.*s\" (%d bytes): %d.\n" msgstr "%s: \"%.*s\" ¤ÎĽěĽłĄźĽÉĚÜĎżĽ¨ĽóĽČĽę (%d ĽĐĽ¤ĽČ) ¤ňĆɤߚţ¤á¤Ţ¤ť¤ó: %d\n" -#: ../src/conduit.c:942 +#: ../src/conduit.c:963 #, c-format msgid "%s: error sending SPC response header." msgstr "%s: SPC ąţĹúĽŘĽĂĽŔ¤ÎÁ÷żŽ¤ÇĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:1672 -#, c-format -msgid "%s: execvp(%s) failed and returned %d." +#: ../src/conduit.c:1774 +#, fuzzy, c-format +msgid "%s: execv(%s) failed and returned %d." msgstr "%s: execvp(%s) ¤ËźşÇÔ¤ˇ¤Ć %d ¤ŹĘÖ¤ľ¤ě¤Ţ¤ˇ¤żĄŁ" -#: ../src/config.c:1224 lexer.l:730 +#: ../src/conduit.c:1761 +#, fuzzy, c-format +msgid "%s: getpwuid(%d) failed.\n" +msgstr "%s: realloc(%d) ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" + +#: ../src/config.c:1367 lexer.l:767 #, c-format msgid "%s: realloc(%d) failed." msgstr "%s: realloc(%d) ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:722 +#: ../src/conduit.c:743 #, c-format msgid "%s: select() returned 0. I'm puzzled." msgstr "%s: select() ¤Ź 0 ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁÉÔĚŔ¤ĘĘÖ¤ęĂͤǤšĄŁ" -#: ../src/conduit.c:1795 +#: ../src/conduit.c:1897 #, c-format msgid "" "%s: select() returned 0. This should never happen. Please notify the " "maintainer." -msgstr "%s: select() ¤Ź 0 ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ¤ł¤ě¤ĎŔäÂФËČŻŔ¸¤ˇ¤Ć¤Ď¤¤¤ą¤Ę¤¤¤ł¤Č¤Ç¤šĄŁşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" +msgstr "" +"%s: select() ¤Ź 0 ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ¤ł¤ě¤ĎŔäÂФËČŻŔ¸¤ˇ¤Ć¤Ď¤¤¤ą¤Ę¤¤¤ł¤Č¤Ç¤šĄŁşîźÔ" +"¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/conduit.c:1752 +#: ../src/conduit.c:1854 #, c-format msgid "%s: select() returned an unexpected error. This should never happen." -msgstr "%s: select() ¤ŹÍ˝ÁŰł°¤ÎĽ¨ĽéĄź¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ¤ł¤ě¤ĎŔäÂФËČŻŔ¸¤ˇ¤Ć¤Ď¤¤¤ą¤Ę¤¤¤ł¤Č¤Ç¤šĄŁ" +msgstr "" +"%s: select() ¤ŹÍ˝ÁŰł°¤ÎĽ¨ĽéĄź¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ¤ł¤ě¤ĎŔäÂФËČŻŔ¸¤ˇ¤Ć¤Ď¤¤¤ą¤Ę¤¤¤ł¤Č" +"¤Ç¤šĄŁ" -#: ../src/config.c:1025 +#: ../src/config.c:1168 #, c-format msgid "%s: socket() returned %d." msgstr "%s: socket() ¤Ź %d ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../libpconn/PConnection_usb.c:663 +#: ../libpconn/PConnection_usb.c:685 #, c-format msgid "%s: unexpected response %d to GetBytesAvailable.\n" msgstr "%s: GetBytesAvailable ¤ËÂФš¤ëÍ˝ÁŰł°¤ÎąţĹú %d ¤Ç¤šĄŁ\n" -#: ../libpconn/PConnection.c:124 +#: ../libpconn/PConnection.c:125 #, c-format msgid "%s: unknown listen type %d.\n" msgstr "%s: ÉÔĚŔ¤Ę´Ćťë¤š¤ëźďÎŕ %d ¤Ç¤šĄŁ\n" -#: lexer.l:631 +#: lexer.l:667 #, c-format msgid "" "%s: unknown start state %d.\n" @@ -905,18 +948,18 @@ msgstr "" "%s: ÉÔĚŔ¤ĘľŻĆ°žőÂÖ %d ¤Ç¤šĄŁ\n" "'lexer.l' ¤ň˝¤Ŕľ¤š¤ë¤č¤ŚşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:303 -#: ../src/GenericConduit.cc:323 ../src/GenericConduit.cc:343 -#: ../src/GenericConduit.cc:423 ../src/GenericConduit.cc:452 -#: ../src/GenericConduit.cc:480 ../src/GenericConduit.cc:492 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:302 +#: ../src/GenericConduit.cc:315 ../src/GenericConduit.cc:328 +#: ../src/GenericConduit.cc:406 ../src/GenericConduit.cc:428 +#: ../src/GenericConduit.cc:454 ../src/GenericConduit.cc:465 msgid "(1st)" msgstr "(1ČÖĚÜ)" -#: ../src/coldsync.c:1089 ../src/coldsync.c:2678 +#: ../src/coldsync.c:1084 msgid "*Cancelled*\n" msgstr "*Ľ­ĽăĽóĽťĽë*\n" -#: ../libpconn/padp.c:676 +#: ../libpconn/padp.c:674 msgid "ACK Timeout. Attempting to resend.\n" msgstr "ACK ¤ŹĽżĽ¤ĽŕĽ˘ĽŚĽČ¤ˇ¤Ţ¤ˇ¤żĄŁşĆÁ÷¤ˇ¤Ć¤ß¤Ţ¤šĄŁ\n" @@ -925,17 +968,17 @@ msgstr "ACK msgid "Backing up \"%s\"" msgstr "\"%s\" ¤ÎĽĐĽĂĽŻĽ˘ĽĂĽ×" -#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:596 -#: ../src/backup.c:628 ../src/backup.c:655 ../src/backup.c:675 -#: ../src/backup.c:686 ../src/coldsync.c:1414 +#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:589 +#: ../src/backup.c:614 ../src/backup.c:634 ../src/backup.c:654 +#: ../src/backup.c:665 ../src/coldsync.c:1478 msgid "Backup" msgstr "ĽĐĽĂĽŻĽ˘ĽĂĽ×" -#: ../libpconn/palm_errno.c:48 +#: ../libpconn/palm_errno.c:50 msgid "Bad file descriptor" msgstr "¤Ş¤Ť¤ˇ¤ĘĽŐĽĄĽ¤ĽëĄŚĽÇĽšĽŻĽęĽ×Ľż" -#: ../src/coldsync.c:897 ../src/coldsync.c:2501 +#: ../src/coldsync.c:945 #, c-format msgid "CacheFromConduits() returned %d." msgstr "CacheFromConduits() ¤Ź %d ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤żĄŁ" @@ -944,15 +987,15 @@ msgstr "CacheFromConduits() msgid "Can't allocate list of record IDs.\n" msgstr "ĽěĽłĄźĽÉ ID ¤Î°ěÍ÷¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ\n" -#: ../src/config.c:467 ../src/config.c:508 +#: ../src/config.c:550 ../src/config.c:591 msgid "Can't allocate listen block." msgstr "´ĆťëĽÖĽíĽĂĽŻ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:320 +#: ../src/config.c:394 msgid "Can't allocate new conduit block." msgstr "żˇ¤ˇ¤¤ĽłĽóĽ¸ĽĂĽČĄŚĽÖĽíĽĂĽŻ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:297 +#: ../src/config.c:370 msgid "Can't allocate new configuration." msgstr "żˇ¤ˇ¤¤ŔßÄę¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" @@ -960,62 +1003,60 @@ msgstr " msgid "Can't allocate new connection.\n" msgstr "żˇ¤ˇ¤¤ŔÜÂł¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:566 ../src/coldsync.c:1359 ../src/coldsync.c:1506 -#: ../src/coldsync.c:1649 ../src/coldsync.c:2102 +#: ../src/coldsync.c:562 msgid "Can't allocate struct Palm." msgstr "Palm š˝Â¤ÂΤňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:557 ../src/coldsync.c:1351 ../src/coldsync.c:1498 -#: ../src/coldsync.c:1641 ../src/coldsync.c:2093 +#: ../src/coldsync.c:553 msgid "Can't connect to Palm." msgstr "Palm ¤ËŔÜÂł¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../libpconn/PConnection_net.c:407 +#: ../libpconn/PConnection_net.c:449 msgid "Can't connect to server.\n" msgstr "ĽľĄźĽĐ¤ËŔÜÂł¤Ç¤­¤Ţ¤ť¤óĄŁ\n" -#: ../src/GenericConduit.cc:720 ../src/GenericConduit.cc:2085 +#: ../src/GenericConduit.cc:672 ../src/GenericConduit.cc:1947 msgid "Can't copy a new record." msgstr "żˇ¤ˇ¤¤ĽěĽłĄźĽÉ¤ňĘŁźĚ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:2298 +#: ../src/coldsync.c:2140 msgid "Can't copy config file name" msgstr "ŔßÄęĽŐĽĄĽ¤ĽëĚž¤ňĘŁźĚ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:475 ../src/config.c:516 +#: ../src/config.c:558 ../src/config.c:599 msgid "Can't copy string." msgstr "ʸťúÎó¤ňĘŁźĚ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/GenericConduit.cc:2436 +#: ../src/GenericConduit.cc:2285 #, c-format msgid "Can't create \"%s\"." msgstr "\"%s\" ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1626 +#: ../src/config.c:1813 #, c-format msgid "Can't create archive directory %s." msgstr "Ľ˘ĄźĽŤĽ¤ĽÖĄŚĽÇĽŁĽěĽŻĽČĽę %s ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1608 +#: ../src/config.c:1795 #, c-format msgid "Can't create attic directory %s." msgstr "attic ĽÇĽŁĽěĽŻĽČĽę %s ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1590 +#: ../src/config.c:1777 #, c-format msgid "Can't create backup directory %s." msgstr "ĽĐĽĂĽŻĽ˘ĽĂĽ×ĄŚĽÇĽŁĽěĽŻĽČĽę %s ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1572 +#: ../src/config.c:1759 #, c-format msgid "Can't create base sync directory %s." msgstr "Ćą´üĽÇĽŁĽěĽŻĽČĽę %s ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:823 ../src/coldsync.c:2421 +#: ../src/coldsync.c:658 msgid "Can't create connection to forwarding host." msgstr "ĽŰĽšĽČ¤ËĽŐĽŠĽďĄźĽÉ¤š¤ëŔÜÂł¤ňłÎΊ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1644 +#: ../src/config.c:1831 #, c-format msgid "Can't create install directory %s." msgstr "Ľ¤ĽóĽšĽČĄźĽëĄŚĽÇĽŁĽěĽŻĽČĽę %s ¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" @@ -1024,19 +1065,19 @@ msgstr " msgid "Can't download record or resource index.\n" msgstr "ĽěĽłĄźĽÉ¤Ţ¤ż¤ĎĽęĽ˝ĄźĽšĚÜĎż¤ňĽŔĽŚĽóĽíĄźĽÉ¤Ç¤­¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:461 +#: ../src/coldsync.c:471 msgid "Can't dup(stderr)." msgstr "dup (ɸ˝ŕĽ¨ĽéĄź˝ĐÎĎ) ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:835 ../src/coldsync.c:2433 +#: ../src/coldsync.c:675 msgid "Can't establish connection with forwarding host." msgstr "ĽŰĽšĽČ¤ËĽŐĽŠĽďĄźĽÉ¤š¤ëŔÜÂł¤ňłÎΊ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:974 ../src/coldsync.c:2567 +#: ../src/coldsync.c:1020 msgid "Can't fetch list of databases." msgstr "ĽÇĄźĽżĽŮĄźĽš°ěÍ÷¤ČĆą´ü¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1194 ../src/coldsync.c:2774 +#: ../src/coldsync.c:1164 #, c-format msgid "Can't fetch preference 0x%08lx/%d." msgstr "ŔßÄę 0x%08lx/%d ¤ňĆą´ü¤Ç¤­¤Ţ¤ť¤óĄŁ" @@ -1061,60 +1102,59 @@ msgstr "\"%.*s\" msgid "Can't find the sort block in \"%.*s\"!\n" msgstr "\"%.*s\" ¤ÎĂć¤ËĽ˝ĄźĽČĄŚĽÖĽíĽĂĽŻ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:173 +#: ../src/coldsync.c:235 msgid "Can't get host ID." msgstr "ĽŰĽšĽČ ID ¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:783 ../src/coldsync.c:2382 +#: ../src/coldsync.c:623 msgid "Can't get host addresses." msgstr "ĽŰĽšĽČ¤ÎĽ˘ĽÉĽěĽš¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:899 +#: ../src/config.c:1042 msgid "Can't get host name." msgstr "ĽŰĽšĽČĚž¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:908 ../src/coldsync.c:2512 +#: ../src/coldsync.c:955 msgid "Can't get last sync PC from Palm" msgstr "Palm - PC ´Ö¤ÇşÇ¸ĺ¤ÎĆą´ü¤ŹźÂšÔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/spalm.c:451 +#: ../src/spalm.c:416 msgid "Can't get location of serial number." msgstr "ĽˇĽęĽ˘ĽëČÖšć¤Îžě˝ę¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:503 +#: ../src/conduit.c:524 msgid "Can't get preference item." msgstr "¤Şľ¤¤ËĆţ¤ę¤ÎĽ˘Ľ¤ĽĆĽŕ¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/spalm.c:224 +#: ../src/spalm.c:211 msgid "Can't get system info." msgstr "ĽˇĽšĽĆĽŕžđĘó¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:640 ../src/coldsync.c:1763 +#: ../src/coldsync.c:1288 ../src/coldsync.c:1727 msgid "Can't get user ID from Palm." msgstr "Palm ¤Ť¤éĽćĄźĽś ID ¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:373 ../src/spalm.c:324 +#: ../src/config.c:447 ../src/spalm.c:304 msgid "Can't get user info." msgstr "ĽćĄźĽśžđĘó¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:693 +#: ../src/coldsync.c:1340 msgid "Can't get user name from Palm." msgstr "Palm ¤Ť¤éĽćĄźĽśĚž¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:1798 +#: ../src/config.c:1985 msgid "Can't get user's full name." msgstr "ĽćĄźĽś¤ÎťáĚž¤ňźčĆŔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1009 ../src/coldsync.c:1228 ../src/coldsync.c:2602 -#: ../src/coldsync.c:2808 +#: ../src/coldsync.c:731 msgid "Can't install new files." msgstr "żˇ¤ˇ¤¤ĽŐĽĄĽ¤Ľë¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:232 ../src/coldsync.c:2315 +#: ../src/coldsync.c:228 ../src/coldsync.c:2156 msgid "Can't load configuration." msgstr "ŔßÄę¤ňĆɤߚţ¤á¤Ţ¤ť¤óĄŁ" -#: ../src/install.c:434 +#: ../src/install.c:420 msgid "Can't load header." msgstr "ĽŘĽĂĽŔ¤ňĆɤߚţ¤á¤Ţ¤ť¤óĄŁ" @@ -1127,11 +1167,11 @@ msgstr " msgid "Can't load record list header for \"%.*s\".\n" msgstr "\"%.*s\" ¤ÎĽěĽłĄźĽÉ°ěÍ÷ĽŘĽĂĽŔ¤ňĆɤߚţ¤á¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:589 +#: ../src/coldsync.c:1236 msgid "Can't look up Palm." msgstr "Palm ¤ň¸Ąş÷¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:908 +#: ../src/config.c:1051 msgid "Can't look up my address." msgstr "źŤĘŹ¤ÎĽ˘ĽÉĽěĽš¤ň¸Ąş÷¤Ç¤­¤Ţ¤ť¤óĄŁ" @@ -1140,7 +1180,7 @@ msgstr " msgid "Can't open %s." msgstr "%s ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/backup.c:593 +#: ../src/backup.c:586 msgid "Can't open backup conduit." msgstr "ĽĐĽĂĽŻĽ˘ĽĂĽ×ĄŚĽłĽóĽ¸ĽĂĽČ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" @@ -1149,26 +1189,25 @@ msgstr " msgid "Can't open conduit for \"%s\": %d.\n" msgstr "\"%s\" ¤ÎĽłĽóĽ¸ĽĂĽČ¤ňłŤ¤ą¤Ţ¤ť¤ó: %d\n" -#: ../src/coldsync.c:548 ../src/coldsync.c:1343 ../src/coldsync.c:1490 -#: ../src/coldsync.c:1633 ../src/coldsync.c:2084 +#: ../src/coldsync.c:544 msgid "Can't open connection." msgstr "ŔÜÂł¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/backup.c:624 +#: ../src/backup.c:610 #, c-format msgid "Can't open database \"%s\"." msgstr "ĽÇĄźĽżĽŮĄźĽš \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:475 +#: ../src/coldsync.c:485 #, c-format msgid "Can't open log file \"%s\"." msgstr "ĽíĽ°ĄŚĽŐĽĄĽ¤Ľë \"%s\" ¤ňłŤ¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:489 +#: ../src/coldsync.c:499 msgid "Can't open log file on stderr." msgstr "ĽíĽ°ĽŐĽĄĽ¤Ľë¤ňɸ˝ŕĽ¨ĽéĄź˝ĐÎϤ˳Ť¤ą¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:185 +#: ../src/coldsync.c:181 msgid "Can't parse command-line arguments." msgstr "ĽłĽŢĽóĽÉĽéĽ¤Ľó¤Î°úżô¤ň˛ňŔϤǤ­¤Ţ¤ť¤óĄŁ" @@ -1182,16 +1221,16 @@ msgstr "%s msgid "Can't read AppInfo block for \"%.*s\".\n" msgstr "\"%.*s\" ¤Î AppInfo ĽÖĽíĽĂĽŻ¤ŹĆɤá¤Ţ¤ť¤óĄŁ\n" -#: ../src/spalm.c:300 +#: ../src/spalm.c:280 msgid "Can't read NetSync info." msgstr "NetSync žđĘó¤ŹĆɤá¤Ţ¤ť¤óĄŁ" -#: ../src/restore.c:227 +#: ../src/restore.c:222 #, c-format msgid "Can't read contents of directory %s." msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ÎĆâÍƤŹĆɤá¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1658 +#: ../src/coldsync.c:1623 msgid "Can't read length of serial number." msgstr "ĽˇĽęĽ˘ĽëČÖšć¤ÎÄš¤ľ¤ŹĆɤá¤Ţ¤ť¤óĄŁ" @@ -1239,7 +1278,7 @@ msgstr "\"%.*s\" msgid "Can't read resources for \"%.*s\".\n" msgstr "\"%.*s\" ¤ÎĽęĽ˝ĄźĽš¤ŹĆɤá¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:1670 ../src/spalm.c:484 +#: ../src/coldsync.c:1635 ../src/spalm.c:442 msgid "Can't read serial number." msgstr "ĽˇĽęĽ˘ĽëČ֚椏Ćɤá¤Ţ¤ť¤óĄŁ" @@ -1248,84 +1287,88 @@ msgstr " msgid "Can't read sort block for \"%.*s\".\n" msgstr "\"%.*s\" ¤ÎĽ˝ĄźĽČĄŚĽÖĽíĽĂĽŻ¤ŹĆɤá¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:156 ../src/coldsync.c:161 ../src/coldsync.c:166 +#: ../src/coldsync.c:159 ../src/coldsync.c:164 ../src/coldsync.c:169 #, c-format msgid "Can't reserve file descriptor %d." msgstr "ĽŐĽĄĽ¤ĽëĄŚĽÇĽšĽŻĽęĽ×Ľż %d ¤ňÍ˝Ěó¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/spalm.c:1006 +#: ../src/spalm.c:983 msgid "Can't resize palm->dblist." msgstr "palm->dblist ¤ÎĽľĽ¤Ľş¤ňĘŃšš¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:792 ../src/coldsync.c:2391 +#: ../src/coldsync.c:630 msgid "Can't resolve forwarding address." msgstr "ĽŐĽŠĽďĄźĽÉ¤š¤ëĽ˘ĽÉĽěĽš¤Ź˛ňˇč¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1533 ../src/coldsync.c:1556 +#: ../src/coldsync.c:1549 ../src/coldsync.c:1572 msgid "Can't restore directory." msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ňĽęĽšĽČĽ˘¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:2280 +#: ../src/coldsync.c:2123 msgid "Can't setuid" msgstr "setuid ¤ŹźÂšÔ¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1160 ../src/coldsync.c:2740 +#: ../src/coldsync.c:1132 msgid "Can't write user info." msgstr "ĽćĄźĽśžđĘó¤ň˝ń¤­šţ¤á¤Ţ¤ť¤óĄŁ" -#: ../src/backup.c:581 ../src/restore.c:181 ../src/GenericConduit.cc:250 -#: ../src/GenericConduit.cc:522 ../src/GenericConduit.cc:1019 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:495 +#: ../src/GenericConduit.cc:954 ../src/backup.c:581 ../src/restore.c:176 msgid "Cancelled" msgstr "Ľ­ĽăĽóĽťĽë" -#: ../src/backup.c:576 ../src/coldsync.c:1379 ../src/coldsync.c:1427 -#: ../src/coldsync.c:1526 ../src/coldsync.c:1549 ../src/conduit.c:1183 -#: ../src/conduit.c:1243 ../src/restore.c:274 +#: ../src/backup.c:576 ../src/coldsync.c:1442 ../src/coldsync.c:1491 +#: ../src/coldsync.c:1541 ../src/coldsync.c:1564 ../src/conduit.c:1226 +#: ../src/conduit.c:1287 ../src/restore.c:269 msgid "Cancelled by Palm." msgstr "Palm ¤Ë¤č¤Ă¤ĆĽ­ĽăĽóĽťĽë¤ľ¤ě¤Ţ¤ˇ¤żĄŁ" -#: ../src/config.c:850 +#: ../src/config.c:993 msgid "ColdSync homepage at http://www.ooblick.com/software/coldsync/\n" msgstr "ColdSync ¤ÎĽŰĄźĽŕĽÚĄźĽ¸ ˘Ş http://www.ooblick.com/software/coldsync/\n" -#: ../src/config.c:856 +#: ../src/config.c:999 msgid "Compile-type options:\n" msgstr "ĽłĽóĽŃĽ¤Ľëžňˇď:\n" -#: ../src/conduit.c:1189 ../src/conduit.c:1249 +#: ../src/conduit.c:1232 ../src/conduit.c:1293 #, c-format msgid "Conduit %s exited abnormally. Continuing." msgstr "ĽłĽóĽ¸ĽĂĽČ %s ¤Ź°Űžď˝ŞÎť¤ˇ¤Ţ¤ˇ¤żĄŁÂłšÔ¤ˇ¤Ţ¤šĄŁ" -#: ../src/conduit.c:1169 ../src/conduit.c:1229 +#: ../src/conduit.c:1212 ../src/conduit.c:1273 #, c-format msgid "Conduit %s is not a %s conduit." msgstr "ĽłĽóĽ¸ĽĂĽČ %s ¤Ď %s ĽłĽóĽ¸ĽĂĽČ¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1102 ../src/coldsync.c:2691 +#: ../src/coldsync.c:846 msgid "Conduit failed for unknown reason." msgstr "ÉÔĚŔ¤ĘÍýÍł¤Ë¤č¤ęĽłĽóĽ¸ĽĂĽČ¤Ź˝ŞÎť¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/config.c:384 +#: ../src/config.c:458 #, c-format msgid "Config file \"%s\" doesn't exist." msgstr "ŔßÄęĽŐĽĄĽ¤Ľë \"%s\" ¤ŹÂ¸şß¤ˇ¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1243 ../src/coldsync.c:1453 ../src/coldsync.c:1574 -#: ../src/coldsync.c:1959 ../src/coldsync.c:2823 +#: ../src/coldsync.c:581 msgid "Couldn't disconnect." msgstr "ŔÜÂłĂǤǤ­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:336 +#: ../src/config.c:1719 +#, fuzzy, c-format +msgid "Couldn't find the requested listen block: \"%s\"" +msgstr "\"%.*s\" ¤ÎĂć¤ËĽ˝ĄźĽČĄŚĽÖĽíĽĂĽŻ¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ\n" + +#: ../src/config.c:410 msgid "Couldn't initialize configuration." msgstr "ŔßÄę¤ň˝é´ü˛˝¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:359 ../src/config.c:418 +#: ../src/config.c:433 ../src/config.c:492 #, c-format msgid "Couldn't read configuration file \"%s\"." msgstr "ŔßÄęĽŐĽĄĽ¤Ľë \"%s\" ¤ŹĆɤá¤Ţ¤ť¤óĄŁ" -#: ../src/conduit.c:619 +#: ../src/conduit.c:640 msgid "Couldn't send header to conduit." msgstr "ĽłĽóĽ¸ĽĂĽČ¤ËÂФš¤ëĽŘĽĂĽŔ¤ňÁ÷żŽ¤Ç¤­¤Ţ¤ť¤óĄŁ" @@ -1333,64 +1376,78 @@ msgstr " msgid "DlpReadRecordIDList() read 0 records. What happened?\n" msgstr "DlpReadRecordIDList() ¤Ź 0 ¸Ä¤ÎĽěĽłĄźĽÉ¤ňĆɤߤޤˇ¤żĄŁ˛ż¤ŹľŻ¤ł¤Ă¤żĄŠ\n" -#: ../libpconn/dlp_cmd.c:2069 +#: ../libpconn/dlp_cmd.c:1817 msgid "DlpWriteRecord: Can't allocate output buffer.\n" msgstr "DlpWriteRecord: ˝ĐÎĎĽĐĽĂĽŐĽĄ¤ňłÎĘݤǤ­¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:1899 ../src/coldsync.c:3216 +#: ../src/coldsync.c:1828 ../src/coldsync.c:2599 #, c-format msgid "DlpWriteUserInfo failed: %d." msgstr "DlpWriteUserInfo ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %d" -#: ../src/coldsync.c:929 ../src/coldsync.c:933 +#: ../src/coldsync.c:975 +#, fuzzy +msgid "Doing a (forced) fast sync." +msgstr "šâÂŽĆą´ü¤ÎźÂšÔĂć¤Ç¤šĄŁ" + +#: ../src/coldsync.c:973 +#, fuzzy +msgid "Doing a (forced) slow sync." +msgstr "ÄăÂŽĆą´ü¤ÎźÂšÔĂć¤Ç¤šĄŁ" + +#: ../src/coldsync.c:979 msgid "Doing a fast sync." msgstr "šâÂŽĆą´ü¤ÎźÂšÔĂć¤Ç¤šĄŁ" -#: ../src/coldsync.c:927 ../src/coldsync.c:931 +#: ../src/coldsync.c:977 msgid "Doing a slow sync." msgstr "ÄăÂŽĆą´ü¤ÎźÂšÔĂć¤Ç¤šĄŁ" -#: ../libpconn/palm_errno.c:50 +#: ../libpconn/palm_errno.c:52 msgid "End of file" msgstr "ĽŐĽĄĽ¤Ľë¤ÎşÇ¸ĺ (EOF)" -#: ../src/backup.c:563 ../src/backup.c:596 ../src/backup.c:628 -#: ../src/backup.c:655 ../src/backup.c:675 ../src/install.c:586 -#: ../src/install.c:618 ../src/install.c:730 ../src/restore.c:192 -#: ../src/GenericConduit.cc:303 ../src/GenericConduit.cc:323 -#: ../src/GenericConduit.cc:343 ../src/GenericConduit.cc:423 -#: ../src/GenericConduit.cc:452 ../src/GenericConduit.cc:481 -#: ../src/GenericConduit.cc:572 ../src/GenericConduit.cc:591 -#: ../src/GenericConduit.cc:612 ../src/GenericConduit.cc:723 -#: ../src/GenericConduit.cc:929 ../src/GenericConduit.cc:952 -#: ../src/GenericConduit.cc:978 ../src/GenericConduit.cc:1067 -#: ../src/GenericConduit.cc:1086 ../src/GenericConduit.cc:1127 -#: ../src/GenericConduit.cc:1229 ../src/GenericConduit.cc:1465 -#: ../src/GenericConduit.cc:1494 ../src/GenericConduit.cc:1521 +#: ../src/GenericConduit.cc:302 ../src/GenericConduit.cc:315 +#: ../src/GenericConduit.cc:328 ../src/GenericConduit.cc:406 +#: ../src/GenericConduit.cc:428 ../src/GenericConduit.cc:455 +#: ../src/GenericConduit.cc:538 ../src/GenericConduit.cc:550 +#: ../src/GenericConduit.cc:564 ../src/GenericConduit.cc:675 +#: ../src/GenericConduit.cc:874 ../src/GenericConduit.cc:890 +#: ../src/GenericConduit.cc:914 ../src/GenericConduit.cc:995 +#: ../src/GenericConduit.cc:1007 ../src/GenericConduit.cc:1048 +#: ../src/GenericConduit.cc:1150 ../src/GenericConduit.cc:1368 +#: ../src/GenericConduit.cc:1390 ../src/GenericConduit.cc:1416 +#: ../src/backup.c:563 ../src/backup.c:589 ../src/backup.c:614 +#: ../src/backup.c:634 ../src/backup.c:654 ../src/install.c:572 +#: ../src/install.c:590 ../src/install.c:702 ../src/restore.c:187 msgid "Error" msgstr "ERROR" -#: ../src/install.c:338 ../src/install.c:359 +#: ../src/install.c:331 ../src/install.c:345 msgid "Error\n" msgstr "ERROR\n" -#: ../src/coldsync.c:997 ../src/coldsync.c:1216 ../src/coldsync.c:2590 -#: ../src/coldsync.c:2796 +#: ../src/coldsync.c:712 ../src/coldsync.c:721 #, c-format msgid "Error %d running install conduits." msgstr "Ľ¤ĽóĽšĽČĄźĽëĄŚĽłĽóĽ¸ĽĂĽČ¤ÎźÂšÔĂć¤Ë %d ¸Ä¤ÎĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/coldsync.c:1257 ../src/coldsync.c:2836 +#: ../src/coldsync.c:752 ../src/coldsync.c:764 #, c-format msgid "Error %d running post-dump conduits." msgstr "post-dump ĽłĽóĽ¸ĽĂĽČ¤ÎźÂšÔĂć¤Ë %d ¸Ä¤ÎĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/coldsync.c:1056 ../src/coldsync.c:2647 +#: ../src/coldsync.c:787 ../src/coldsync.c:800 #, c-format msgid "Error %d running pre-fetch conduits." msgstr "pre-fetch ĽłĽóĽ¸ĽĂĽČ¤ÎľŻĆ°Ăć¤Ë %d ¸Ä¤ÎĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/coldsync.c:1435 +#: ../src/coldsync.c:822 +#, fuzzy, c-format +msgid "Error %d running sync conduits." +msgstr "Ľ¤ĽóĽšĽČĄźĽëĄŚĽłĽóĽ¸ĽĂĽČ¤ÎźÂšÔĂć¤Ë %d ¸Ä¤ÎĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" + +#: ../src/coldsync.c:1500 #, c-format msgid "Error backing up \"%s\"." msgstr "\"%s\" ¤ÎĽĐĽĂĽŻĽ˘ĽĂĽ×Ăć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" @@ -1400,17 +1457,17 @@ msgstr "\"%s\" msgid "Error creating database \"%s\": %d.\n" msgstr "ĽÇĄźĽżĽŮĄźĽš \"%s\" ¤ÎŔ¸ŔŽĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤ż: %d\n" -#: ../src/install.c:751 +#: ../src/install.c:723 #, c-format msgid "Error deleting \"%s\"." msgstr "\"%s\" ¤Îşď˝üĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/coldsync.c:2903 +#: ../src/coldsync.c:2211 #, c-format msgid "Error during DlpEndOfSync: (%d) %s." msgstr "DlpEndOfSync Ăć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤ż: (%d) %s" -#: ../libpconn/cmp.c:141 +#: ../libpconn/cmp.c:142 #, c-format msgid "Error during cmp_read: (%d) %s.\n" msgstr "cmp_read Ăć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤ż: (%d) %s\n" @@ -1423,16 +1480,16 @@ msgstr "CMP msgid "Error in system call or library function" msgstr "ĽˇĽšĽĆĽŕĽłĄźĽë¤Ţ¤ż¤ĎĽéĽ¤ĽÖĽéĽę´Řżô¤Î¸Ć¤Ó˝Đ¤ˇ¤ÇĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/install.c:705 +#: ../src/install.c:677 #, c-format msgid "Error opening \"%s\"." msgstr "\"%s\" ¤ňĽŞĄźĽ×ĽóĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../libpconn/netsync.c:467 +#: ../libpconn/netsync.c:514 msgid "Error reading NetSync packet header.\n" msgstr "NetSync ĽŃĽąĽĂĽČĄŚĽŘĽĂĽŔ¤ÎĆɤߚţ¤ßĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ\n" -#: ../libpconn/netsync.c:588 +#: ../libpconn/netsync.c:659 msgid "Error sending NetSync header.\n" msgstr "NetSync ĽŘĽĂĽŔ¤ÎÁ÷żŽĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ\n" @@ -1440,9 +1497,9 @@ msgstr "NetSync msgid "Error trying to set speed.\n" msgstr "ÂŽĹ٤ňĽťĽĂĽČ¤ˇ¤ç¤Ś¤Č¤ˇ¤ż¤éĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤żĄŁ\n" -#: ../src/GenericConduit.cc:888 ../src/GenericConduit.cc:1431 -#: ../src/GenericConduit.cc:1744 ../src/GenericConduit.cc:1889 -#: ../src/GenericConduit.cc:2055 ../src/GenericConduit.cc:2289 +#: ../src/GenericConduit.cc:833 ../src/GenericConduit.cc:1334 +#: ../src/GenericConduit.cc:1627 ../src/GenericConduit.cc:1762 +#: ../src/GenericConduit.cc:1917 ../src/GenericConduit.cc:2138 #, c-format msgid "Error uploading record 0x%08lx: %d." msgstr "ĽěĽłĄźĽÉ 0x%08lx ¤ÎĽ˘ĽĂĽ×ĽíĄźĽÉĂć¤ËĽ¨ĽéĄź¤ŹČŻŔ¸¤ˇ¤Ţ¤ˇ¤ż: %d" @@ -1451,7 +1508,7 @@ msgstr " msgid "Error: " msgstr "ERROR: " -#: ../libpconn/PConnection_serial.c:612 ../libpconn/PConnection_usb.c:460 +#: ../libpconn/PConnection_serial.c:616 ../libpconn/PConnection_usb.c:483 #, c-format msgid "Error: Can't open \"%s\".\n" msgstr "ERROR: \"%s\" ¤ŹłŤ¤ą¤Ţ¤ť¤óĄŁ\n" @@ -1460,18 +1517,20 @@ msgstr "ERROR: \"%s\" #, c-format msgid "" "Error: Palm suggested %ld bps, but the serial port can't go that fast.\n" -msgstr "ERROR: Palm ¤Ť¤é %ld ĽÓĽĂĽČ/ÉäČĘóšđ¤ľ¤ě¤Ţ¤ˇ¤ż¤ŹĄ˘ĽˇĽęĽ˘ĽëĽÝĄźĽČ¤Ď¤˝¤ó¤Ę¤ËÂŽ¤Ż¤˘¤ę¤Ţ¤ť¤óĄŁ\n" +msgstr "" +"ERROR: Palm ¤Ť¤é %ld ĽÓĽĂĽČ/ÉäČĘóšđ¤ľ¤ě¤Ţ¤ˇ¤ż¤ŹĄ˘ĽˇĽęĽ˘ĽëĽÝĄźĽČ¤Ď¤˝¤ó¤Ę¤ËÂŽ" +"¤Ż¤˘¤ę¤Ţ¤ť¤óĄŁ\n" #: ../libpconn/PConnection_serial.c:358 #, c-format msgid "Error: Palm suggested unknown speed %ld\n" msgstr "ERROR: Palm ¤Ť¤éÉÔĚŔ¤ĘÂŽĹŮ %ld ¤ŹĘóšđ¤ľ¤ě¤Ţ¤ˇ¤żĄŁ\n" -#: ../libpconn/PConnection.c:118 +#: ../libpconn/PConnection.c:119 msgid "Error: USB support not enabled.\n" msgstr "ERROR: USB ĽľĽÝĄźĽČ¤ŹÍ­¸ú¤Ë¤Ę¤Ă¤Ć¤¤¤Ţ¤ť¤óĄŁ\n" -#: ../libpconn/netsync.c:474 +#: ../libpconn/netsync.c:521 #, c-format msgid "Error: only read %d bytes of NetSync packet header.\n" msgstr "ERROR: NetSync ĽŃĽąĽĂĽČĄŚĽŘĽĂĽŔ¤Î %d ĽĐĽ¤ĽČ¤Î¤ßĆɤߚţ¤ß¤Ţ¤šĄŁ\n" @@ -1490,11 +1549,11 @@ msgstr " msgid "Hey! I can't find the %dth resource in \"%.*s\"!\n" msgstr "¤Ş¤¤¤Ş¤¤Ą˘%d ČÖĚܤμ꼽ĄźĽš¤Ź \"%.*s\" ¤ÎĂć¤Ë¤˘¤ę¤Ţ¤ť¤ó¤čĄŞ\n" -#: ../src/config.c:924 +#: ../src/config.c:1067 msgid "Hey! This isn't an AF_INET address!" msgstr "¤Ş¤¤¤Ş¤¤Ą˘¤ł¤ě¤Ď AF_INET Ľ˘ĽÉĽěĽš¤Ç¤Ď¤Ę¤¤¤Ç¤š¤čĄŞ" -#: ../src/GenericConduit.cc:1200 +#: ../src/GenericConduit.cc:1121 msgid "" "I have a new, deleted record that is neither archived nor expunged\n" "What am I supposed to do?" @@ -1502,12 +1561,12 @@ msgstr "" "żˇ¤ˇ¤¤şď˝üşŃ¤ß¤ÎĽěĽłĄźĽÉ¤Ź¤˘¤ę¤Ţ¤šĄŁ¤ł¤ÎĽěĽłĄźĽÉ¤ĎĽ˘ĄźĽŤĽ¤ĽÖ¤ľ¤ě¤Ć¤â¤Ę¤Ż\n" "şď˝ü¤â¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤óĄŁ¤É¤Î¤č¤Ś¤Ë°ˇ¤¤¤Ţ¤š¤ŤĄŠ" -#: ../src/conduit.c:2169 +#: ../src/conduit.c:2279 msgid "Inside run_DummyConduit.\n" msgstr "run_DummyConduit ¤ÎĆâÉô¤Ç¤šĄŁ\n" -#: ../src/install.c:584 ../src/install.c:616 ../src/install.c:701 -#: ../src/install.c:709 ../src/install.c:728 ../src/install.c:733 +#: ../src/install.c:570 ../src/install.c:588 ../src/install.c:673 +#: ../src/install.c:681 ../src/install.c:700 ../src/install.c:705 msgid "Install" msgstr "Ľ¤ĽóĽšĽČĄźĽë" @@ -1515,55 +1574,53 @@ msgstr " msgid "Install " msgstr "Ľ¤ĽóĽšĽČĄźĽë " -#: ../libpconn/palm_errno.c:58 +#: ../libpconn/palm_errno.c:60 msgid "Invalid argument ID" msgstr "ÉÔŔľ¤Ę°úżô ID" -#: ../libpconn/palm_errno.c:54 +#: ../libpconn/palm_errno.c:56 msgid "Invalid request ID" msgstr "ÉÔŔľ¤ĘÍ׾á ID" -#: ../libpconn/palm_errno.c:56 +#: ../libpconn/palm_errno.c:58 msgid "Invalid result ID" msgstr "ÉÔŔľ¤Ęˇë˛Ě ID" -#: ../src/coldsync.c:500 +#: ../src/coldsync.c:510 #, c-format msgid "Log started on %s" msgstr "%s ¤ËĽíĽŽĽóĽ°¤ÎłŤťĎ" -#: ../src/coldsync.c:583 ../src/coldsync.c:634 ../src/coldsync.c:687 -#: ../src/coldsync.c:969 ../src/coldsync.c:1068 ../src/coldsync.c:1097 -#: ../src/coldsync.c:1124 ../src/coldsync.c:1190 ../src/coldsync.c:1266 -#: ../src/coldsync.c:1384 ../src/coldsync.c:1432 ../src/coldsync.c:1529 -#: ../src/coldsync.c:1552 ../src/coldsync.c:2563 ../src/coldsync.c:2659 -#: ../src/coldsync.c:2686 ../src/coldsync.c:2707 ../src/coldsync.c:2770 -#: ../src/coldsync.c:2845 ../src/conduit.c:500 ../src/restore.c:278 +#: ../src/coldsync.c:1015 ../src/coldsync.c:1093 ../src/coldsync.c:1160 +#: ../src/coldsync.c:1194 ../src/coldsync.c:1231 ../src/coldsync.c:1283 +#: ../src/coldsync.c:1335 ../src/coldsync.c:1447 ../src/coldsync.c:1496 +#: ../src/coldsync.c:1544 ../src/coldsync.c:1567 ../src/conduit.c:521 +#: ../src/restore.c:273 msgid "Lost connection to Palm." msgstr "Palm ¤Č¤ÎŔÜÂł¤ŹŔÚ¤ě¤Ţ¤ˇ¤żĄŁ" -#: ../src/conduit.c:1186 ../src/conduit.c:1246 +#: ../src/conduit.c:1229 ../src/conduit.c:1290 msgid "Lost connection to Palm. Aborting." msgstr "Palm ¤Č¤ÎŔÜÂł¤ŹŔÚ¤ě¤Ţ¤ˇ¤żĄŁĂćťß¤ˇ¤Ţ¤šĄŁ" -#: ../src/config.c:263 +#: ../src/config.c:336 #, c-format msgid "Missing option argument after \"%s\"." msgstr "\"%s\" °Ęšß¤ÎĽŞĽ×ĽˇĽçĽó°úżô¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:805 +#: ../src/config.c:947 msgid "Modes:\n" msgstr "ĽâĄźĽÉ:\n" -#: ../src/coldsync.c:847 ../src/coldsync.c:2445 +#: ../src/coldsync.c:685 msgid "Network sync forwarding failed." msgstr "NetSync ¤ÎĽŐĽŠĽďĄźĽÉ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/spalm.c:288 +#: ../src/spalm.c:275 msgid "No NetSync info.\n" msgstr "NetSync žđĘ󤏤˘¤ę¤Ţ¤ť¤óĄŁ\n" -#: ../src/coldsync.c:1290 +#: ../src/coldsync.c:1392 msgid "No backup directory specified." msgstr "ĽĐĽĂĽŻĽ˘ĽĂĽ×ĄŚĽÇĽŁĽěĽŻĽČĽę¤ŹťŘÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤óĄŁ" @@ -1571,37 +1628,41 @@ msgstr " msgid "No error" msgstr "Ľ¨ĽéĄź¤Ę¤ˇ" -#: ../src/coldsync.c:2229 +#: ../src/coldsync.c:2088 +#, fuzzy, c-format +msgid "No matching entry in %s, couldn't autoinit." +msgstr "%s ¤ÎĂć¤Ë°ěĂפš¤ëĽ¨ĽóĽČĽę¤Ď¤˘¤ę¤Ţ¤ť¤óĄŁ" + +#: ../src/coldsync.c:2099 #, c-format msgid "No matching entry in %s." msgstr "%s ¤ÎĂć¤Ë°ěĂפš¤ëĽ¨ĽóĽČĽę¤Ď¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:529 ../src/coldsync.c:1325 ../src/coldsync.c:1472 -#: ../src/coldsync.c:1615 ../src/coldsync.c:2063 +#: ../src/coldsync.c:525 msgid "No port specified." msgstr "ĽÝĄźĽČ¤ŹťŘÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1416 +#: ../src/coldsync.c:1480 msgid "No such database" msgstr "¤˝¤Î¤č¤Ś¤ĘĽÇĄźĽżĽŮĄźĽš¤Ď¤˘¤ę¤Ţ¤ť¤óĄŁ" -#: ../src/coldsync.c:1411 +#: ../src/coldsync.c:1475 #, c-format msgid "No such database: \"%s\"." msgstr "¤˝¤Î¤č¤Ś¤ĘĽÇĄźĽżĽŮĄźĽš¤Ď¤˘¤ę¤Ţ¤ť¤ó: \"%s\"" -#: ../src/coldsync.c:1315 +#: ../src/coldsync.c:1417 #, c-format msgid "No such directory: \"%s\"." msgstr "¤˝¤Î¤č¤Ś¤ĘĽÇĽŁĽěĽŻĽČĽę¤Ď¤˘¤ę¤Ţ¤ť¤ó: \"%s\"" -#: ../src/backup.c:686 ../src/install.c:703 ../src/install.c:735 -#: ../src/restore.c:197 ../src/GenericConduit.cc:492 -#: ../src/GenericConduit.cc:989 ../src/GenericConduit.cc:1531 +#: ../src/GenericConduit.cc:465 ../src/GenericConduit.cc:924 +#: ../src/GenericConduit.cc:1425 ../src/backup.c:665 ../src/install.c:675 +#: ../src/install.c:707 ../src/restore.c:192 msgid "OK" msgstr "OK" -#: ../src/config.c:812 +#: ../src/config.c:954 msgid "Options:\n" msgstr "ĽŞĽ×ĽˇĽçĽó:\n" @@ -1609,67 +1670,68 @@ msgstr " msgid "Out of memory" msgstr "ĽáĽâĽę¤ŹÂ­¤ę¤Ţ¤ť¤ó" -#: ../libpconn/PConnection_serial.c:653 ../libpconn/PConnection_usb.c:435 +#: ../libpconn/PConnection_serial.c:590 ../libpconn/PConnection_serial.c:657 +#: ../libpconn/PConnection_usb.c:458 msgid "Please press the HotSync button.\n" msgstr "HotSync ĽÜĽżĽó¤ň˛Ą¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ\n" -#: ../src/install.c:711 +#: ../src/install.c:683 msgid "Problem" msgstr "ĚäÂę" -#: ../src/restore.c:181 ../src/restore.c:192 ../src/restore.c:197 +#: ../src/restore.c:176 ../src/restore.c:187 ../src/restore.c:192 msgid "Restore" msgstr "ĽęĽšĽČĽ˘" -#: ../src/restore.c:149 +#: ../src/restore.c:151 #, c-format msgid "Restore: Can't delete database \"%s\": %d." msgstr "ĽęĽšĽČĽ˘: ĽÇĄźĽżĽŮĄźĽš \"%s\" ¤ňşď˝ü¤Ç¤­¤Ţ¤ť¤ó: %d" -#: ../src/coldsync.c:1250 +#: ../src/coldsync.c:746 msgid "Running Dump conduits" msgstr "ĽŔĽóĽ×ĄŚĽłĽóĽ¸ĽĂĽČ¤ŹľŻĆ°Ăć¤Ç¤šĄŁ" -#: ../src/coldsync.c:1049 +#: ../src/coldsync.c:781 msgid "Running Fetch conduits" msgstr "źčĆŔĽłĽóĽ¸ĽĂĽČ¤ŹľŻĆ°Ăć¤Ç¤šĄŁ" -#: ../src/coldsync.c:993 ../src/coldsync.c:1212 ../src/coldsync.c:2586 -#: ../src/coldsync.c:2792 +#: ../src/coldsync.c:706 msgid "Running Install conduits" msgstr "Ľ¤ĽóĽšĽČĄźĽëĄŚĽłĽóĽ¸ĽĂĽČ¤ŹľŻĆ°Ăć¤Ç¤šĄŁ" -#: ../src/coldsync.c:1074 +#: ../src/coldsync.c:816 msgid "Running Sync conduits" msgstr "Ćą´üĽłĽóĽ¸ĽĂĽČ¤ŹľŻĆ°Ăć¤Ç¤šĄŁ" -#: ../libpconn/slp.c:391 +#: ../libpconn/slp.c:385 #, c-format msgid "SLP: bad CRC: expected 0x%04x, got 0x%04x.\n" msgstr "SLP: ¤Ş¤Ť¤ˇ¤Ę CRC: ´üÂÔĂÍ 0x%04x, źčĆŔĂÍ 0x%04x\n" -#: ../src/coldsync.c:1854 +#: ../src/coldsync.c:2443 msgid "Set user ID" msgstr "ĽćĄźĽś ID ¤ÎĽťĽĂĽČ" -#: ../src/coldsync.c:1889 +#: ../src/coldsync.c:2466 msgid "Set username" msgstr "ĽćĄźĽśĚž¤ÎĽťĽĂĽČ" -#: ../src/coldsync.c:1119 +#: ../src/coldsync.c:1083 msgid "Sync cancelled by Palm." msgstr "Ćą´ü¤Ź Palm ¤Ë¤č¤Ă¤ĆĽ­ĽăĽóĽťĽë¤ľ¤ě¤Ţ¤ˇ¤żĄŁ" -#: ../src/coldsync.c:1088 ../src/coldsync.c:2677 -msgid "Sync cancelled." -msgstr "Ćą´ü¤ŹĽ­ĽăĽóĽťĽë¤ľ¤ě¤Ţ¤ˇ¤żĄŁ" - -#: ../src/coldsync.c:621 +#: ../src/coldsync.c:1268 #, c-format msgid "Sync for %s at %s" msgstr "%s ¤ÎĆą´ü (%s)" -#: ../src/coldsync.c:648 +#: ../src/coldsync.c:834 +#, c-format +msgid "Syncing %s" +msgstr "" + +#: ../src/coldsync.c:1296 #, c-format msgid "" "This Palm has user ID %ld (I was expecting %ld).\n" @@ -1686,7 +1748,7 @@ msgstr "" "\t¤ŞťČ¤¤¤ÎŔßÄęĽŐĽĄĽ¤Ľë¤Ë¤ĎĄ˘źĄ¤Î¤č¤Ś¤Ę\n" "PDA ĽÖĽíĽĂĽŻ¤ň´Ţ¤á¤ë¤č¤Ś¤Ë¤ˇ¤Ć˛ź¤ľ¤¤:" -#: ../src/coldsync.c:703 +#: ../src/coldsync.c:1350 #, c-format msgid "" "This Palm has user name \"%.*s\" (I was expecting \"%.*s\").\n" @@ -1703,7 +1765,7 @@ msgstr "" "\t¤ŞťČ¤¤¤ÎŔßÄęĽŐĽĄĽ¤Ľë¤Ë¤ĎĄ˘źĄ¤Î¤č¤Ś¤Ę\n" "PDA ĽÖĽíĽĂĽŻ¤ň´Ţ¤á¤ë¤č¤Ś¤Ë¤ˇ¤Ć˛ź¤ľ¤¤:" -#: ../src/config.c:945 +#: ../src/config.c:1088 msgid "This host doesn't appear to have an IP address." msgstr "¤ł¤ÎĽŰĽšĽČ¤Ď IP-Ľ˘ĽÉĽěĽš¤ňťý¤Ă¤Ć¤¤¤Ę¤¤¤č¤Ś¤Ç¤šĄŁ" @@ -1715,35 +1777,39 @@ msgstr " msgid "Too many errors. Aborting." msgstr "Ľ¨ĽéĄź¤ŹÂż¤š¤Ž¤Ţ¤šĄŁĂćťß¤ˇ¤Ţ¤šĄŁ" -#: ../src/coldsync.c:3102 +#: ../src/coldsync.c:2410 #, c-format msgid "Too many files named \"%s\" in the attic." msgstr "attic ¤ÎĂć¤Ë \"%s\" ¤Č¤¤¤ŚĚžÁ°¤ÎĽŐĽĄĽ¤Ľë¤ŹÂż¤š¤Ž¤Ţ¤šĄŁ" -#: ../libpconn/palm_errno.c:52 +#: ../libpconn/palm_errno.c:54 msgid "Transfer aborted" msgstr "ĹžÁ÷¤ÎĂćťß" -#: ../src/config.c:229 +#: ../libpconn/palm_errno.c:48 +msgid "Unexpected timeout" +msgstr "" + +#: ../src/config.c:295 #, c-format msgid "Unknown device type: \"%s\"." msgstr "ÉÔĚŔ¤ĘĽÇĽĐĽ¤Ľš¤ÎźďÎŕ: \"%s\"" -#: ../libpconn/palm_errno.c:64 +#: ../libpconn/palm_errno.c:66 msgid "Unknown error" msgstr "ÉÔĚŔ¤ĘĽ¨ĽéĄź" -#: ../src/config.c:706 +#: ../src/config.c:792 #, c-format msgid "Unknown facility \"%s\"." msgstr "ÉÔĚŔ¤ĘľĄÇ˝ \"%s\" ¤Ç¤šĄŁ" -#: ../src/config.c:755 +#: ../src/config.c:843 ../src/config.c:876 #, c-format msgid "Unknown mode: \"%s\"." msgstr "ÉÔĚŔ¤ĘĽâĄźĽÉ: \"%s\"" -#: ../src/coldsync.c:345 +#: ../src/coldsync.c:353 #, c-format msgid "" "Unknown mode: %d.\n" @@ -1752,22 +1818,22 @@ msgstr "" "ÉÔĚŔ¤ĘĽâĄźĽÉ: %d\n" "¤ł¤ě¤ĎĽĐĽ°¤Ç¤šĄŁşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/config.c:242 +#: ../src/config.c:308 #, c-format msgid "Unknown protocol: \"%s\"." msgstr "ÉÔĚŔ¤ĘĽ×ĽíĽČĽłĽë: \"%s\"" -#: ../src/coldsync.c:2260 +#: ../src/coldsync.c:2110 #, c-format msgid "Unknown user/uid: \"%s\"." msgstr "ÉÔĚŔ¤ĘĽćĄźĽśĚž/ĽćĄźĽśID: \"%s\"" -#: ../src/config.c:254 +#: ../src/config.c:327 #, c-format msgid "Unrecognized option: \"%s\"." msgstr "ǧźą¤Ç¤­¤Ę¤¤ĽŞĽ×ĽˇĽçĽó: \"%s\"" -#: lexer.l:504 +#: lexer.l:540 #, c-format msgid "Unterminated string at line %d (string started on line %d)\n" msgstr "%d šÔ¤ÇʸťúÎ󤏽ŞÎť¤ˇ¤Ć¤¤¤Ţ¤ť¤ó (%d šÔ¤Ť¤éʸťúÎó¤ĎłŤťĎ)ĄŁ\n" @@ -1782,7 +1848,7 @@ msgstr "\"%s\" msgid "Uploading \"%s\"" msgstr "\"%s\" ¤ÎĽ˘ĽĂĽ×ĽíĄźĽÉ" -#: ../src/config.c:834 +#: ../src/config.c:977 #, c-format msgid "Usage: %s [options] \n" msgstr "ÍŃËĄ: %s [ĽŞĽ×ĽˇĽçĽó] <ĽâĄźĽÉ> <ĽâĄźĽÉ¤Î°úżô>\n" @@ -1800,7 +1866,7 @@ msgstr "" "WARNING: \"%.*s\" ¤Ë¤˘¤ë AppInfo ĽÖĽíĽĂĽŻ¤ĎÍ˝´ü¤ˇ¤żžě˝ę¤Ë¤˘¤ę¤Ţ¤ť¤óĄŁ\n" "´üÂÔĂÍ 0x%lx, źÂşÝ¤Ď 0x%lx ¤Ë¤˘¤ę¤Ţ¤šĄŁ\n" -#: ../src/spalm.c:461 +#: ../src/spalm.c:426 #, c-format msgid "" "Warning: ROM serial number is %d characters long. Please notify the\n" @@ -1827,7 +1893,7 @@ msgstr "" "WARNING: ťŘÄꤡ¤żÂŽĹŮ (%ld ĽĐĽ¤ĽČ/ÉĂ) ¤ňĽťĽĂĽČ¤Ç¤­¤Ţ¤ť¤óĄŁ\n" "ĽÇĽŐĽŠĽëĽČ¤ÎÂŽĹ٤ňťČÍѤˇ¤Ţ¤šĄŁ\n" -#: ../libpconn/PConnection_serial.c:603 +#: ../libpconn/PConnection_serial.c:607 #, c-format msgid "Warning: no device on %s. Sleeping\n" msgstr "WARNING: %s ¤ËĽÇĽĐĽ¤Ľš¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁĽšĽęĄźĽ×¤ˇ¤Ţ¤šĄŁ\n" @@ -1859,23 +1925,24 @@ msgstr "" "WARNING: \"%.*s\" ¤Ë¤˘¤ëĽ˝ĄźĽČĄŚĽÖĽíĽĂĽŻ¤ŹÍ˝´ü¤ˇ¤żžě˝ę¤Ë¤˘¤ę¤Ţ¤ť¤óĄŁ\n" "´üÂÔĂÍ 0x%lx, źÂşÝ¤Ď 0x%lx ¤Ë¤˘¤ę¤Ţ¤šĄŁ\n" -#: ../libpconn/padp.c:647 +#: ../libpconn/padp.c:645 msgid "Write timeout. Attempting to resend.\n" msgstr "˝ń¤­šţ¤ß¤ŹĽżĽ¤ĽŕĽ˘ĽŚĽČ¤ˇ¤Ţ¤ˇ¤żĄŁşĆÁ÷¤ˇ¤Ć¤ß¤Ţ¤šĄŁ\n" -#: ../libpconn/palm_errno.c:60 +#: ../libpconn/palm_errno.c:62 msgid "XID on ACK doesn't match request" msgstr "ACK žĺ¤Î XID ¤ŹÍ׾á¤Ë°ěĂפˇ¤Ţ¤ť¤óĄŁ" -#: ../src/spalm.c:563 +#: ../src/spalm.c:521 msgid "" "You have an old Palm, one that doesn't say how many\n" "databases it has. I can't cope with this." msgstr "" -"¸Ĺ¤¤ Palm ¤ň¤ŞťČ¤¤¤Î¤č¤Ś¤Ç¤šĄŁ¤ł¤Î¤č¤Ś¤Ę Palm ¤Ç¤ĎĽÇĄźĽżĽŮĄźĽš¤Î¸Äżô¤ňĘÖ¤ˇ¤Ţ¤ť¤óĄŁ\n" +"¸Ĺ¤¤ Palm ¤ň¤ŞťČ¤¤¤Î¤č¤Ś¤Ç¤šĄŁ¤ł¤Î¤č¤Ś¤Ę Palm ¤Ç¤ĎĽÇĄźĽżĽŮĄźĽš¤Î¸Äżô¤ňĘÖ¤ˇ¤Ţ" +"¤ť¤óĄŁ\n" "¤ł¤Î¤č¤Ś¤Ę Palm ¤Ë¤ĎÂĐ˝č¤Ç¤­¤Ţ¤ť¤óĄŁ" -#: ../src/config.c:728 +#: ../src/config.c:814 #, c-format msgid "" "You shouldn't specify two -m options.\n" @@ -1884,31 +1951,40 @@ msgstr "" "Ćó¤Ä¤Î -m ĽŞĽ×ĽˇĽçĽó¤ňťŘÄꤡ¤Ę¤¤¤Ç˛ź¤ľ¤¤ĄŁ\n" "\t-m%s ¤ňťČÍѤˇ¤Ţ¤šĄŁ" -#: ../src/config.c:269 +#: ../src/config.c:342 #, c-format msgid "" "You specified an apparently legal option (\"-%c\"), but I don't know what\n" "to do with it. This is a bug. Please notify the maintainer." msgstr "" -"ĚŔ¤é¤Ť¤ËŔľľŹ¤ÎĽŞĽ×ĽˇĽçĽó (\"-%c\") ¤ňťŘÄꤡ¤Ţ¤ˇ¤ż¤ŹĄ˘¤Ţ¤ŔźÂÁő¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤óĄŁ\n" +"ĚŔ¤é¤Ť¤ËŔľľŹ¤ÎĽŞĽ×ĽˇĽçĽó (\"-%c\") ¤ňťŘÄꤡ¤Ţ¤ˇ¤ż¤ŹĄ˘¤Ţ¤ŔźÂÁő¤ľ¤ě¤Ć¤¤¤Ţ¤ť" +"¤óĄŁ\n" "¤ł¤ě¤ĎĽĐĽ°¤Ç¤šĄŁşîźÔ¤ËϢÍí¤ˇ¤Ć˛ź¤ľ¤¤ĄŁ" -#: ../src/GenericConduit.cc:177 +#: ../src/GenericConduit.cc:183 msgid "[generic]: Aborting." msgstr "[generic]: Ăćťß¤ˇ¤Ţ¤šĄŁ" -#: ../libpconn/PConnection_usb.c:649 +#: ../libpconn/PConnection_usb.c:671 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" -msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" +msgstr "" +"ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../libpconn/PConnection_usb.c:586 +#: ../libpconn/PConnection_usb.c:609 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" -msgstr "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" +msgstr "" +"ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../src/GenericConduit.cc:340 +#: ../src/GenericConduit.cc:325 msgid "pdb_Download() failed." msgstr "pdb_Download() ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄŁ" -#: ../libpconn/PConnection_usb.c:181 +#: ../libpconn/PConnection_usb.c:204 msgid "usb: trying to fill a non-empty buffer.\n" msgstr "USB: śő¤Ç¤Ę¤¤ĽĐĽĂĽŐĽĄ¤ňËä¤á¤Ć¤ß¤Ţ¤šĄŁ\n" + +#~ msgid "##### %s: Unknown argument type: 0x%02x\n" +#~ msgstr "##### %s: ÉÔĚŔ¤Ę°úżô¤ÎźďÎŕ: 0x%02x\n" + +#~ msgid "Sync cancelled." +#~ msgstr "Ćą´ü¤ŹĽ­ĽăĽóĽťĽë¤ľ¤ě¤Ţ¤ˇ¤żĄŁ" diff --git a/i18n/ru.po b/i18n/ru.po index c6c8b5ba..51b61d7a 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ColdSync 2.2.4\n" -"POT-Creation-Date: 2002-03-10 17:49+0100\n" +"POT-Creation-Date: 2002-06-21 16:10+0200\n" "PO-Revision-Date: 2001-11-23 18:30+02:00\n" "Last-Translator: Grigory Milev \n" "Language-Team: ru \n" @@ -13,51 +13,51 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/config.c:819 +#: ../src/config.c:961 msgid "\t-F:\t\tForce fast sync.\n" msgstr "\t-F:\t\tđŇÉÎŐÄÉÔĹĚŘÎÁŃ ÂŮÓÔŇÁŃ ÓÉÎČŇĎÎÉÚÁĂÉŃ.\n" -#: ../src/config.c:817 +#: ../src/config.c:959 msgid "\t-I:\t\tForce installation of new databases.\n" msgstr "\t-I:\t\tđŇÉÎŐÄÉÔĹĚŘÎÁŃ ÉÎÓÔÁĚŃĂÉŃ ÎĎ×ĎĘ ÂÁÚŮ.\n" -#: ../src/config.c:823 +#: ../src/config.c:965 msgid "\t-P :\tSoftware protocol [default|full|simple|net].\n" msgstr "\t-P <ĐŇĎÔĎËĎĚ>:\tđŇĎÇŇÁÍÍÎŮĘ ĐŇĎÔĎËĎĚ [default|full|simple|net].\n" -#: ../src/config.c:820 +#: ../src/config.c:962 msgid "\t-R:\t\tCheck ROM databases.\n" msgstr "\t-R:\t\tđŇĎ×ĹŇËÁ ÂÁÚ × đúő.\n" -#: ../src/config.c:818 +#: ../src/config.c:960 msgid "\t-S:\t\tForce slow sync.\n" msgstr "\t-S:\t\tđŇÉÎŐÄÉÔĹĚŘÎÁŃ ÍĹÄĚĹÎÎÁŃ ÓÉÎČŇĎÎÉÚÁĂÉŃ.\n" -#: ../src/config.c:814 +#: ../src/config.c:956 msgid "\t-V:\t\tPrint version and exit.\n" msgstr "\t-V:\t\tîÁĐĹŢÁÔÁÔŘ ×ĹŇÓÉŔ É ×ŮĘÔÉ.\n" -#: ../src/config.c:829 +#: ../src/config.c:972 msgid "\t-d :\tSet debugging level.\n" msgstr "\t-d :\tőÓÔÁÎĎ×ÉÔŘ ŐŇĎ×ĹÎŘ ĎÔĚÁÄËÉ.\n" -#: ../src/config.c:815 +#: ../src/config.c:957 msgid "\t-f :\tRead configuration from \n" msgstr "\t-f <ĆÁĘĚ>:\tđŇĎŢÉÔÁÔŘ ÎÁÓÔŇĎĘËÉ ÉÚ <ĆÁĘĚÁ>\n" -#: ../src/config.c:813 +#: ../src/config.c:955 msgid "\t-h:\t\tPrint this help message and exit.\n" msgstr "\t-h:\t\tîÁĐĹŢÁÔÁÔŘ ÜÔĎÔ ĐĎÄÓËÁÚËŐ É ×ŮĘÔÉ.\n" -#: ../src/config.c:826 +#: ../src/config.c:968 msgid "\t-l: :\tWrite error/debugging messages to .\n" msgstr "\t-l: <ĆÁĘĚ>:\túÁĐÉÓŮ×ÁÔŘ ÓĎĎÂÝĹÎÉŃ Ď ĎŰÉÂËÁČ/ĎÔĚÁÄËĹ × <ĆÁĘĚ>.\n" -#: ../src/config.c:807 +#: ../src/config.c:949 msgid "\t-mI:\tInitialize.\n" msgstr "\t-mI:\téÎÉĂÉÁĚÉÚÁĂÉŃ.\n" -#: ../src/config.c:808 +#: ../src/config.c:950 msgid "" "\t-mb [database...]\n" "\t\tPerform a backup to .\n" @@ -65,7 +65,7 @@ msgstr "" "\t-mb <ÄÉŇĹËÔĎŇÉŃ> [ÄÁÎÎŮĹ...]\n" "\t\tđŇĎÉÚ×ĹÓÔÉ ŇĹÚĹŇ×ÉŇĎ×ÁÎÉĹ × <ÄÉŇĹËÔĎŇÉŔ>.\n" -#: ../src/config.c:810 +#: ../src/config.c:952 msgid "" "\t-mr ...\n" "\t\tRestore or install new databases.\n" @@ -73,77 +73,81 @@ msgstr "" "\t-mr <ĆÁĘĚ|ÄÉŇĹËÔĎŇÉŃ>...\n" "\t\t÷ĎÓÔÁÎĎ×ÉÔŘ ÉĚÉ ŐÓÔÁÎĎ×ÉÔŘ ÎĎ×ŮĹ ÄÁÎÎŮĹ.\n" -#: ../src/config.c:806 +#: ../src/config.c:948 msgid "\t-ms:\tSynchronize (default).\n" msgstr "\t-ms:\tóÉÎČŇĎÎÉÚÉŇĎ×ÁÔŘ (ĐĎ ŐÍĎĚŢÁÎÉŔ).\n" -#: ../src/config.c:821 +#: ../src/config.c:971 +msgid "\t-n :\tChoice the named listen block.\n" +msgstr "" + +#: ../src/config.c:963 msgid "\t-p :\tListen on device .\n" msgstr "\t-p <ĐĎŇÔ>:\téÓËÁÔŘ ŐÓÔŇĎĘÓÔ×Ď ÎÁ <ĐĎŇÔŐ>.\n" -#: ../src/config.c:825 +#: ../src/config.c:967 msgid "\t-s:\t\tLog error messages to syslog.\n" msgstr "\t-s:\t\tđÉÓÁÔŘ ÓĎĎÂÝĹÎÉŃ × ÓÉÓÔĹÍÎŮĘ ĚĎÇ.\n" -#: ../src/config.c:822 +#: ../src/config.c:964 msgid "\t-t :\tPort type [serial|usb|net].\n" msgstr "\t-t <ÔÉĐ ŐÓÔŇĎĘÓÔ×Á>:\tôÉĐ ĐĎŇÔÁ [serial|usb|net].\n" -#: ../src/config.c:828 +#: ../src/config.c:970 msgid "\t-v:\t\tIncrease verbosity.\n" msgstr "\t-v:\t\tő×ĹĚÉŢÉÔŘ ÉÎĆĎŇÍÁÔÉ×ÎĎÓÔŘ ÓĎĎÂÝĹÎÉĘ.\n" -#: ../src/config.c:816 +#: ../src/config.c:958 msgid "\t-z:\t\tInstall databases after sync.\n" msgstr "\t-z:\t\tőÓÔÁÎĎ×ÉÔŘ ÄÁÎÎŮĹ ĐĎÓĚĹ ÓÉÎČŇĎÎÉÚÁĂÉÉ.\n" -#: ../src/parser.y:327 ../src/parser.y:585 ../src/parser.y:1136 +#: ../src/parser.y:341 ../src/parser.y:658 ../src/parser.y:1229 #, c-format msgid "\tError near \"%s\"." msgstr "\tďŰÉ×ËÁ × \"%s\"." -#: ../src/parser.y:1165 +#: ../src/parser.y:1258 msgid "\tMissing ':'." msgstr "\tďÔÓŐÔÓÔ×ŐĹÔ ':'." -#: ../src/parser.y:1182 +#: ../src/parser.y:1274 msgid "\tMissing ';'." msgstr "\tďÔÓŐÔÓÔ×ŐĹÔ ';'." -#: ../src/parser.y:1174 +#: ../src/parser.y:1266 msgid "\tMissing '{'." msgstr "\tďÔÓŐÔÓÔ×ŐĹÔ '{'." -#: ../src/parser.y:750 +#: ../src/parser.y:823 #, c-format msgid "\tMissing argument name near \": %s\"." msgstr "\tďÔÓŐÔÓÔ×ŐĹÔ ÁŇÇŐÍĹÎÔ ÄĚŃ \": %s\"." -#: ../src/parser.y:248 +#: ../src/parser.y:255 msgid "\tMissing listen block type." msgstr "\tďÔÓŐÔÓÔ×ŐĹÔ ÔÉĐ ÓĚŐŰÁĹÍĎÇĎ ÂĚĎËÁ." -#: ../src/parser.y:829 +#: ../src/parser.y:919 #, c-format msgid "\tMissing option name near \"%s\"." msgstr "\tďÔÓŐÔÓÔ×ŐĹÔ ĎĐĂÉŃ ÄĚŃ \"%s\"." -#: ../src/parser.y:415 +#: ../src/parser.y:461 #, c-format msgid "\tUnrecognized conduit flavor \"%s\"." msgstr "" -#: ../src/parser.y:250 +#: ../src/parser.y:257 #, c-format msgid "\tUnrecognized listen type \"%s\"." msgstr "\tîĹÉÚ×ĹÓÔÎŮĘ ÓĚŐŰĹÍŮĘ ÔÉĐ \"%s\"." -#: ../src/parser.y:449 +#: ../src/parser.y:495 #, c-format msgid "\tUnrecognized protocol: \"%s\"." msgstr "\tîĹÉÚ×ĹÓÔÎŮĘ ĐŇĎÔĎËĎĚ: \"%s\"." -#: ../src/config.c:874 +#: ../src/config.c:1017 #, c-format msgid "" "\n" @@ -152,7 +156,7 @@ msgstr "" "\n" " óÔÁÎÄÁŇÔÎŮĘ ĆÁĘĚ ËĎÎĆÉÇŐŇ×ĂÉÉ ĐĎ ŐÍĎĚŢÁÎÉŔ: %s\n" -#: ../src/coldsync.c:386 +#: ../src/coldsync.c:396 #, c-format msgid "" "\n" @@ -161,7 +165,7 @@ msgstr "" "\n" "ěĎÇ ÚÁËŇŮÔ × %s" -#: ../src/coldsync.c:1825 +#: ../src/coldsync.c:1787 msgid "" "\n" "This Palm already has user information that matches neither what's in your\n" @@ -181,7 +185,7 @@ msgstr "" "÷ÁŰ .coldsyncrc ÄĎĚÖĹÎ ÓĎÄĹŇÖÁÔŘ ŢÔĎ-ÔĎ ĐĎČĎÖĹĹ ÎÁ: \n" "\n" -#: ../src/config.c:869 +#: ../src/config.c:1012 msgid "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: strings are compared without regard\n" " to case, whenever possible.\n" @@ -189,12 +193,12 @@ msgstr "" " HAVE_STRCASECMP, HAVE_STRNCASECMP: ÓÔŇĎËÉ ÓŇÁ×ÎÉ×ÁŔÔÓŃ ÂĹÚ ŐŢĹÔÁ\n" " ŇĹÇÉÓÔŇÁ, ËĎÇÄÁ ÜÔĎ ×ĎÚÍĎÖÎĎ.\n" -#: ../src/config.c:864 +#: ../src/config.c:1007 msgid " WITH_EFENCE: buffer overruns will cause a segmentation violation.\n" msgstr "" " WITH_EFENCE: đĹŇĹĐĎĚÎĹÎÉĹ ÂŐĆĹŇÁ ĐŇÉ×ĹĚĎ Ë ÎÁŇŐŰĹÎÉŔ ÓĹÇÍĹÎÔÁĂÉÉ.\n" -#: ../src/config.c:860 +#: ../src/config.c:1003 msgid " WITH_USB: USB support.\n" msgstr " WITH_USB: ĐĎÔÄĹŇÖËÁ USB.\n" @@ -203,131 +207,136 @@ msgstr " WITH_USB: msgid "\"%.*s\" record 0x%08lx has length 0.\n" msgstr "\"%.*s\" ÚÁĐÉÓŘ 0x%08lx ÉÍĹĹÔ ÄĚÉÎÎŐ 0.\n" -#: ../src/coldsync.c:1313 +#: ../src/coldsync.c:1414 #, c-format msgid "\"%s\" exists, but is not a directory." msgstr "\"%s\" ÉÍĹĹÔÓŃ, ÎĎ ÎĹ ÄÉŇĹËÔĎŇÉŃ." #: ../libpconn/dlp_cmd.c:191 ../libpconn/dlp_cmd.c:281 -#: ../libpconn/dlp_cmd.c:380 ../libpconn/dlp_cmd.c:439 -#: ../libpconn/dlp_cmd.c:503 ../libpconn/dlp_cmd.c:626 -#: ../libpconn/dlp_cmd.c:846 ../libpconn/dlp_cmd.c:935 -#: ../libpconn/dlp_cmd.c:1028 ../libpconn/dlp_cmd.c:1098 -#: ../libpconn/dlp_cmd.c:1168 ../libpconn/dlp_cmd.c:1252 -#: ../libpconn/dlp_cmd.c:1326 ../libpconn/dlp_cmd.c:1402 -#: ../libpconn/dlp_cmd.c:1477 ../libpconn/dlp_cmd.c:1564 -#: ../libpconn/dlp_cmd.c:1665 ../libpconn/dlp_cmd.c:1767 -#: ../libpconn/dlp_cmd.c:1875 ../libpconn/dlp_cmd.c:1946 -#: ../libpconn/dlp_cmd.c:2037 ../libpconn/dlp_cmd.c:2136 -#: ../libpconn/dlp_cmd.c:2218 ../libpconn/dlp_cmd.c:2290 -#: ../libpconn/dlp_cmd.c:2345 ../libpconn/dlp_cmd.c:2397 -#: ../libpconn/dlp_cmd.c:2533 ../libpconn/dlp_cmd.c:2578 -#: ../libpconn/dlp_cmd.c:2652 ../libpconn/dlp_cmd.c:2711 -#: ../libpconn/dlp_cmd.c:2774 ../libpconn/dlp_cmd.c:2819 -#: ../libpconn/dlp_cmd.c:2875 ../libpconn/dlp_cmd.c:2928 -#: ../libpconn/dlp_cmd.c:3038 ../libpconn/dlp_cmd.c:3133 -#: ../libpconn/dlp_cmd.c:3229 ../libpconn/dlp_cmd.c:3321 -#: ../libpconn/dlp_cmd.c:3401 ../libpconn/dlp_cmd.c:3499 -#: ../libpconn/dlp_cmd.c:3600 ../libpconn/dlp_cmd.c:3682 +#: ../libpconn/dlp_cmd.c:392 ../libpconn/dlp_cmd.c:451 +#: ../libpconn/dlp_cmd.c:515 ../libpconn/dlp_cmd.c:638 +#: ../libpconn/dlp_cmd.c:858 ../libpconn/dlp_cmd.c:947 +#: ../libpconn/dlp_cmd.c:1040 ../libpconn/dlp_cmd.c:1110 +#: ../libpconn/dlp_cmd.c:1180 ../libpconn/dlp_cmd.c:1264 +#: ../libpconn/dlp_cmd.c:1338 ../libpconn/dlp_cmd.c:1414 +#: ../libpconn/dlp_cmd.c:1489 ../libpconn/dlp_cmd.c:1576 +#: ../libpconn/dlp_cmd.c:1677 ../libpconn/dlp_cmd.c:1779 +#: ../libpconn/dlp_cmd.c:1887 ../libpconn/dlp_cmd.c:1958 +#: ../libpconn/dlp_cmd.c:2049 ../libpconn/dlp_cmd.c:2148 +#: ../libpconn/dlp_cmd.c:2230 ../libpconn/dlp_cmd.c:2302 +#: ../libpconn/dlp_cmd.c:2357 ../libpconn/dlp_cmd.c:2409 +#: ../libpconn/dlp_cmd.c:2545 ../libpconn/dlp_cmd.c:2590 +#: ../libpconn/dlp_cmd.c:2664 ../libpconn/dlp_cmd.c:2723 +#: ../libpconn/dlp_cmd.c:2786 ../libpconn/dlp_cmd.c:2831 +#: ../libpconn/dlp_cmd.c:2887 ../libpconn/dlp_cmd.c:2940 +#: ../libpconn/dlp_cmd.c:3050 ../libpconn/dlp_cmd.c:3145 +#: ../libpconn/dlp_cmd.c:3241 ../libpconn/dlp_cmd.c:3333 +#: ../libpconn/dlp_cmd.c:3413 ../libpconn/dlp_cmd.c:3511 +#: ../libpconn/dlp_cmd.c:3612 ../libpconn/dlp_cmd.c:3694 #, c-format msgid "##### %s: Unknown argument type: 0x%02x.\n" msgstr "##### %s: îĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ ÁŇÇŐÍĹÎÔÁ: 0x%02x.\n" -#: ../libpconn/padp.c:484 +#: ../libpconn/padp.c:482 #, c-format msgid "##### Bad offset: wanted %d, got %d.\n" msgstr "##### îĹĐŇÁ×ÉĚŘÎĎĹ ÓÍĹÝĹÎÉĹ: ÎĹĎÂČĎÄÉÍĎ %d, ÉÍĹĹÔÓŃ %d.\n" -#: ../libpconn/dlp.c:291 +#: ../libpconn/dlp.c:292 #, c-format msgid "##### Bad response ID: expected 0x%02x, got 0x%02x.\n" msgstr "##### îĹĐŇÁ×ÉĚŘÎŮĘ ĎÔ×ĹÔ ID: ĎÖÉÄÁĚÓŃ 0x%02x, ĐĎĚŐŢÉĚÉ 0x%02x.\n" -#: ../libpconn/padp.c:802 +#: ../libpconn/padp.c:800 #, c-format msgid "##### Expected XID 0x%02x, got 0x%02x.\n" msgstr "##### ďÖÉÄÁĚÓŃ XID 0x%02x, ĐĎĚŐŢÉĚÉ 0x%02x.\n" -#: ../libpconn/dlp.c:282 +#: ../libpconn/dlp.c:283 msgid "##### Expected a DLP response, but this isn't one!\n" msgstr "##### ďÖÉÄÁĚÓŃ DLP ĎÔ×ĹÔ, ÎĎ ÜÔĎ ÎĹ ÔĎ!\n" # XXX -#: ../libpconn/padp.c:729 +#: ../libpconn/padp.c:727 msgid "##### Got an unexpected data packet. Sending an ACK to shut it up.\n" msgstr "" "##### đĎĚŐŢÉĚÉ ÎĹĎÖÉÄÁĹÍŮĘ ĐÁËĹÔ ÄÁÎÎŮČ. đĎÓŮĚÁĹÍ ACK ÄĚŃ ĹÇĎ ÚÁËŇŮÔÉŃ.\n" -#: ../libpconn/padp.c:198 ../libpconn/padp.c:446 +#: ../libpconn/padp.c:198 ../libpconn/padp.c:444 msgid "##### I just got an unexpected ACK. I'm confused!\n" msgstr "##### ń ĐĎĚŐŢÉĚ ÎĹĎÖÉÄÁÎÎŮĘ ACK. ń ŇÁÓÔĹŇŃÎ!\n" -#: ../libpconn/padp.c:471 +#: ../libpconn/padp.c:469 msgid "##### I wasn't expecting a new fragment. I'm confused!\n" msgstr "" -#: ../libpconn/padp.c:217 ../libpconn/padp.c:461 ../libpconn/padp.c:790 +#: ../libpconn/padp.c:217 ../libpconn/padp.c:459 ../libpconn/padp.c:788 #, c-format msgid "##### Unexpected packet type %d.\n" msgstr "" -#: lexer.l:460 +#: lexer.l:476 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: lexer.l:469 +#: lexer.l:485 #, c-format msgid "" "%d: Unexpected character near \"%s\".\n" " You probably meant \"${%.*s}\".\n" msgstr "" -#: lexer.l:474 +#: lexer.l:490 #, c-format msgid "" "%d: Unterminated variable reference near \"%s\".\n" " You probably meant \"$(%.*s)\".\n" msgstr "" -#: ../src/config.c:845 +#: ../src/config.c:988 #, c-format msgid "%s version %s.\n" msgstr "%s ×ĹŇÓÉŃ %s.\n" -#: ../src/parser.y:614 +#: ../src/parser.y:687 #, c-format msgid "%s: %d: Bogus creator \"%s\"." msgstr "%s: %d: îĹĐŇÁ×ÉĚŘÎŮĘ ÓĎÚÄÁÔĹĚŘ \"%s\"." -#: ../src/parser.y:638 +#: ../src/parser.y:711 #, c-format msgid "%s: %d: Bogus type \"%s\"." msgstr "%s: %d: îĹĐŇÁ×ÉĚŘÎŮĘ ÔÉĐ \"%s\"." -#: ../src/parser.y:498 +#: ../src/parser.y:549 #, c-format msgid "%s: %d: Can't add creator-type pair to list. This is very bad." msgstr "" -#: ../src/parser.y:553 +#: ../src/parser.y:626 #, c-format msgid "%s: %d: Can't add preference to list. This is very bad." msgstr "" -#: ../src/parser.y:287 +#: ../src/parser.y:590 +#, fuzzy, c-format +msgid "%s: %d: Cwd already defined." +msgstr "%s: %d: óËĎŇĎÓÔŘ ŐÖĹ ÚÁÄÁÎÁ." + +#: ../src/parser.y:301 #, c-format msgid "%s: %d: Device already defined." msgstr "%s: %d: őÓÔŇĎĘÓÔ×Ď ŐÖĹ ĎĐŇĹÄĹĚĹÎĎ." -#: ../src/parser.y:1038 +#: ../src/parser.y:1131 #, c-format msgid "%s: %d: Directory already defined." msgstr "%s: %d: äÉŇĹËÔĎŇÉŃ ŐÖĹ ŐËÁÚÁÎÁ." -#: ../src/parser.y:1008 +#: ../src/parser.y:1101 #, c-format msgid "" "%s: %d: Incorrect checksum\n" @@ -336,12 +345,12 @@ msgstr "" "%s: %d: îĹĐŇÁ×ÉĚŘÎÁŃ ËĎÎÔŇĎĚŘÎÁŃ ÓŐÍÍÁ\n" "ÄĚŃ ÓĹŇÉĘÎĎÇĎ ÎĎÍĹŇÁ \"%s-%c\". äĎĚÖÎÁ ÂŮÔŘ \"%s-%c\"." -#: ../src/parser.y:514 +#: ../src/parser.y:565 #, c-format msgid "%s: %d: Path already defined." msgstr "%s: %d: đŐÔŘ ŐÖĹ ĎĐŇĹÄĹĚĹÎ." -#: ../src/parser.y:987 +#: ../src/parser.y:1080 #, c-format msgid "" "%s: %d: Serial number \"%s\" has no checksum.\n" @@ -350,178 +359,178 @@ msgstr "" "%s: %d: óĹŇÉÁĚŘÎŮĘ ÎĎÍĹŇ \"%s\" ÎĹÉÍĹĹÔ ËĎÎÔŇĎĚŘÎĎĘ ÓŐÍÍŮ.\n" "÷Ů ÍĎÖĹÔĹ ĐĹŇĹĐÉÓÁÔŘ ĹÇĎ ËÁË \"%s-%c\"." -#: ../src/parser.y:956 +#: ../src/parser.y:1049 #, c-format msgid "%s: %d: Serial number already defined." msgstr "%s: %d: óĹŇÉĘÎŮĘ ÎĎÍĹŇ ŐÖĹ ŐËÁÚÁÎ." -#: ../src/parser.y:301 +#: ../src/parser.y:315 #, c-format msgid "%s: %d: Speed already defined." msgstr "%s: %d: óËĎŇĎÓÔŘ ŐÖĹ ÚÁÄÁÎÁ." -#: ../src/parser.y:1074 +#: ../src/parser.y:1167 #, c-format msgid "%s: %d: Userid already defined." msgstr "%s: %d: éÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ ŐÖĹ ÚÁÄÁÎ." -#: ../src/parser.y:1059 +#: ../src/parser.y:1152 #, c-format msgid "%s: %d: Username already defined." msgstr "%s: %d: éÍŃ ĐĎĚŘÚĎ×ÁÔĹĚŃ ŐÖĹ ŐËÁÚÁÎĎ." -#: ../libpconn/dlp.c:152 +#: ../libpconn/dlp.c:153 #, c-format msgid "%s: Can't allocate %ld-byte buffer.\n" msgstr "" -#: ../src/parser.y:851 +#: ../src/parser.y:941 #, c-format msgid "%s: Can't allocate PDA block." msgstr "" -#: ../src/parser.y:708 +#: ../src/parser.y:781 #, c-format msgid "%s: Can't allocate conduit header." msgstr "" -#: ../src/parser.y:340 +#: ../src/parser.y:354 #, c-format msgid "%s: Can't allocate conduit_block!" msgstr "" -#: ../src/parser.y:177 +#: ../src/parser.y:180 #, c-format msgid "%s: Can't allocate listen block." msgstr "" -#: ../src/GenericConduit.cc:1121 +#: ../src/GenericConduit.cc:1042 #, c-format msgid "%s: Can't allocate new record." msgstr "" -#: ../src/GenericConduit.cc:1221 +#: ../src/GenericConduit.cc:1142 #, c-format msgid "%s: Can't append new record to database: %d." msgstr "%s: îĹÍĎÇŐ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ Ë ÂÁÚĹ ÄÁÎÎŮČ: %d." -#: lexer.l:366 +#: lexer.l:382 #, c-format msgid "%s: Can't append to qstring." msgstr "" -#: ../src/backup.c:716 +#: ../src/backup.c:695 #, c-format msgid "%s: Can't back up \"%s\"." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ÓÄĹĚÁÔŘ ŇĹÚĹŇ×ÎŐŔ ËĎĐÉŔ \"%s\"." -#: ../src/GenericConduit.cc:448 ../src/GenericConduit.cc:948 -#: ../src/GenericConduit.cc:1490 +#: ../src/GenericConduit.cc:424 ../src/GenericConduit.cc:886 +#: ../src/GenericConduit.cc:1386 #, c-format msgid "%s: Can't clean up database: %d." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎŢÉÓÔÉÔŘ ÂÁÚŐ: %d." -#: ../src/GenericConduit.cc:1960 ../src/GenericConduit.cc:1998 -#: ../src/GenericConduit.cc:2132 +#: ../src/GenericConduit.cc:1832 ../src/GenericConduit.cc:1869 +#: ../src/GenericConduit.cc:1994 #, c-format msgid "%s: Can't copy record." msgstr "%s: îĹĚŘÚŃ ÓËĎĐÉŇĎ×ÁÔŘ ÚÁĐÉÓŘ." -#: ../src/conduit.c:1541 +#: ../src/conduit.c:1597 #, c-format msgid "%s: Can't create file handle to child's stdin." msgstr "" -#: ../src/conduit.c:1569 +#: ../src/conduit.c:1625 #, c-format msgid "%s: Can't create file handle to child's stdout." msgstr "" -#: ../src/coldsync.c:3681 ../src/coldsync.c:3701 +#: ../src/coldsync.c:3049 ../src/coldsync.c:3069 #, c-format msgid "%s: Can't create staging file \"%s\"." msgstr "" -#: ../src/coldsync.c:3691 +#: ../src/coldsync.c:3059 #, c-format msgid "%s: Can't create staging file name." msgstr "" -#: ../src/GenericConduit.cc:608 +#: ../src/GenericConduit.cc:560 #, c-format msgid "%s: Can't download \"%s\"." msgstr "%s: îĹĚŘÚŃ ÚÁÇŇŐÚÉÔŘ \"%s\"." -#: ../src/conduit.c:2057 +#: ../src/conduit.c:2137 #, c-format msgid "%s: Can't get child process status." msgstr "" -#: ../libpconn/PConnection_usb.c:505 +#: ../libpconn/PConnection_usb.c:528 #, c-format msgid "%s: Can't get information about USB device.\n" msgstr "" -#: ../src/GenericConduit.cc:2094 ../src/GenericConduit.cc:2143 +#: ../src/GenericConduit.cc:1956 ../src/GenericConduit.cc:2004 #, c-format msgid "%s: Can't insert record 0x%08lx." msgstr "" -#: ../src/GenericConduit.cc:2505 +#: ../src/GenericConduit.cc:2354 #, c-format msgid "%s: Can't load \"%s\"." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ÚÁÇŇŐÚÉÔŘ \"%s\"." -#: ../src/install.c:270 ../src/install.c:526 +#: ../src/install.c:270 ../src/install.c:512 #, c-format msgid "%s: Can't load database \"%s\"." msgstr "" -#: ../src/conduit.c:1587 +#: ../src/conduit.c:1643 #, c-format msgid "%s: Can't make child's stdout be line-buffered." msgstr "" -#: lexer.l:135 lexer.l:148 lexer.l:228 lexer.l:303 lexer.l:518 lexer.l:568 +#: lexer.l:135 lexer.l:148 lexer.l:230 lexer.l:319 lexer.l:553 lexer.l:603 #, c-format msgid "%s: Can't make copy of string." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ÓÄĹĚÁÔŘ ËĎĐÉŔ ÓÔŇĎËÉ." -#: ../src/GenericConduit.cc:2495 ../src/archive.c:68 ../src/archive.c:127 -#: ../src/install.c:260 ../src/install.c:425 ../src/install.c:516 -#: ../src/parser.y:1223 +#: ../src/GenericConduit.cc:2344 ../src/archive.c:68 ../src/archive.c:127 +#: ../src/install.c:260 ../src/install.c:411 ../src/install.c:502 +#: ../src/parser.y:1315 #, c-format msgid "%s: Can't open \"%s\"." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ \"%s\"." -#: ../libpconn/PConnection_usb.c:717 +#: ../libpconn/PConnection_usb.c:740 #, c-format msgid "%s: Can't open \"%s\".\n" msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ \"%s\".\n" -#: ../src/GenericConduit.cc:298 ../src/GenericConduit.cc:318 -#: ../src/GenericConduit.cc:568 ../src/GenericConduit.cc:587 -#: ../src/GenericConduit.cc:1063 ../src/GenericConduit.cc:1082 +#: ../src/GenericConduit.cc:297 ../src/GenericConduit.cc:310 +#: ../src/GenericConduit.cc:534 ../src/GenericConduit.cc:546 +#: ../src/GenericConduit.cc:991 ../src/GenericConduit.cc:1003 #, c-format msgid "%s: Can't open \"%s\": %d." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ \"%s\": %d." -#: ../libpconn/PConnection_usb.c:491 +#: ../libpconn/PConnection_usb.c:514 #, c-format msgid "%s: Can't open USB device.\n" msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ USB ŐÓÔŇĎĘÓÔ×Ď.\n" -#: ../src/coldsync.c:2942 +#: ../src/coldsync.c:2249 #, c-format msgid "%s: Can't open directory \"%s\"." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÄÉŇĹËÔĎŇÉŔ \"%s\"." -#: ../src/install.c:403 ../src/install.c:468 +#: ../src/install.c:389 ../src/install.c:454 #, c-format msgid "%s: Can't open install directory." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÉÎÓÔÁĚŃĂÉĎÎÎŐŔ ÄÉŇĹËÔĎŇÉŔ." -#: ../src/GenericConduit.cc:194 +#: ../src/GenericConduit.cc:200 #, c-format msgid "%s: Can't read %s backup file." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ %s ŇĹÚĹŇ×ÎŮĘ ĆÁĘĚ." @@ -541,25 +550,25 @@ msgstr "%s: msgid "%s: Can't read sort block for %s: %d.\n" msgstr "" -#: ../src/coldsync.c:3047 ../src/coldsync.c:3085 +#: ../src/coldsync.c:2354 ../src/coldsync.c:2392 #, c-format msgid "%s: Can't rename \"%s\" to \"%s\"." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĐĹŇĹÉÍĹÎĎ×ÁÔŘ \"%s\" × \"%s\"." -#: ../src/GenericConduit.cc:2564 +#: ../src/GenericConduit.cc:2413 #, c-format msgid "" "%s: Can't rename staging file.\n" "Backup left in \"%s\", hopefully." msgstr "" -#: ../src/GenericConduit.cc:468 ../src/GenericConduit.cc:967 -#: ../src/GenericConduit.cc:1510 +#: ../src/GenericConduit.cc:444 ../src/GenericConduit.cc:905 +#: ../src/GenericConduit.cc:1406 #, c-format msgid "%s: Can't reset sync flags: %d." msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ÓÂŇĎÓÉÔŘ ÓÉÎČŇÁÎÉÚÉĂÉĎÎÎŮĘ ĆĚÁÇ: %d." -#: ../src/restore.c:120 +#: ../src/restore.c:129 #, c-format msgid "%s: Can't restore %s: it is opened by another application." msgstr "" @@ -569,12 +578,17 @@ msgstr "" msgid "%s: Can't seek to end of file." msgstr "" -#: ../src/conduit.c:373 +#: ../src/parser.y:909 +#, fuzzy, c-format +msgid "%s: Can't set option.\n" +msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ \"%s\".\n" + +#: ../src/conduit.c:390 #, c-format msgid "%s: Can't set signal handler." msgstr "" -#: ../src/conduit.c:427 +#: ../src/conduit.c:445 #, c-format msgid "%s: Can't spawn conduit." msgstr "" @@ -589,8 +603,8 @@ msgstr "" msgid "%s: Can't write archive file header." msgstr "" -#: ../src/GenericConduit.cc:419 ../src/GenericConduit.cc:925 -#: ../src/GenericConduit.cc:1461 +#: ../src/GenericConduit.cc:402 ../src/GenericConduit.cc:870 +#: ../src/GenericConduit.cc:1364 #, c-format msgid "%s: Can't write backup file." msgstr "" @@ -620,7 +634,7 @@ msgstr "" msgid "%s: Can't write sort block for \"%.*s\".\n" msgstr "" -#: ../src/GenericConduit.cc:2552 +#: ../src/GenericConduit.cc:2401 #, c-format msgid "%s: Can't write staging file \"%s\"." msgstr "" @@ -630,51 +644,51 @@ msgstr "" msgid "%s: Can't write the two useless NULs to \"%.*s\".\n" msgstr "" -#: ../src/conduit.c:1880 +#: ../src/conduit.c:1960 #, c-format msgid "%s: Conduit exited unexpectedly." msgstr "" -#: ../src/conduit.c:677 +#: ../src/conduit.c:698 #, c-format msgid "" "%s: Conduit handler is in an inconsistent state at\n" "%s, line %d. Please notify the maintainer." msgstr "" -#: ../src/conduit.c:1871 +#: ../src/conduit.c:1951 #, c-format msgid "" "%s: Conduit is running happily, but hasn't printed anything.\n" "And yet, I was notified. This is a bug. Please notify the maintainer." msgstr "" -#: ../libpconn/PConnection_usb.c:625 +#: ../libpconn/PConnection_usb.c:648 #, c-format msgid "%s: Could not find HotSync endpoint on Visor.\n" msgstr "" -#: ../src/conduit.c:1681 +#: ../src/conduit.c:1538 #, fuzzy, c-format msgid "%s: Couldn't change directory to \"%s\"\n" msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÄÉŇĹËÔĎŇÉŔ \"%s\"." -#: ../src/restore.c:109 +#: ../src/restore.c:118 #, c-format msgid "%s: Database %s doesn't exist, yet it is open. Huh?" msgstr "" -#: ../src/install.c:335 ../src/install.c:580 +#: ../src/install.c:328 ../src/install.c:566 #, c-format msgid "%s: Error deleting \"%s\"." msgstr "" -#: ../src/GenericConduit.cc:1355 ../src/GenericConduit.cc:1394 +#: ../src/GenericConduit.cc:1267 ../src/GenericConduit.cc:1304 #, c-format msgid "%s: Error deleting record 0x%08lx: %d." msgstr "" -#: ../src/conduit.c:788 +#: ../src/conduit.c:809 #, c-format msgid "%s: Error header wrong length %ld." msgstr "" @@ -684,32 +698,32 @@ msgstr "" msgid "%s: Error in DlpRPC().\n" msgstr "" -#: ../src/conduit.c:708 +#: ../src/conduit.c:729 #, c-format msgid "%s: Error in select()." msgstr "" -#: ../src/conduit.c:774 +#: ../src/conduit.c:795 #, c-format msgid "%s: Error reading SPC request from conduit." msgstr "" -#: ../src/conduit.c:847 +#: ../src/conduit.c:868 #, c-format msgid "%s: Error reading SPC request." msgstr "" -#: ../src/conduit.c:975 +#: ../src/conduit.c:996 #, c-format msgid "%s: Error sending SPC response data." msgstr "" -#: ../libpconn/padp.c:757 +#: ../libpconn/padp.c:755 #, c-format msgid "%s: Error sending dummy ACK. This is serious.\n" msgstr "" -#: ../src/install.c:356 ../src/install.c:612 +#: ../src/install.c:342 ../src/install.c:584 #, c-format msgid "%s: Error uploading \"%s\"." msgstr "" @@ -719,47 +733,52 @@ msgstr "" msgid "%s: Error: dlp.write returned %d.\n" msgstr "" -#: ../src/conduit.c:353 +#: ../src/conduit.c:370 #, c-format msgid "" "%s: I just got file descriptor %d. There appears to be a file\n" "descriptor leak. Please notify the maintainer." msgstr "" -#: ../src/GenericConduit.cc:1347 ../src/GenericConduit.cc:1386 -#: ../src/GenericConduit.cc:1630 ../src/GenericConduit.cc:1680 -#: ../src/GenericConduit.cc:1846 ../src/GenericConduit.cc:2198 -#: ../src/GenericConduit.cc:2240 +#: ../src/GenericConduit.cc:1261 ../src/GenericConduit.cc:1298 +#: ../src/GenericConduit.cc:1524 ../src/GenericConduit.cc:1573 +#: ../src/GenericConduit.cc:1728 ../src/GenericConduit.cc:2058 +#: ../src/GenericConduit.cc:2099 #, c-format msgid "%s: Lost connection to Palm." msgstr "" -#: ../src/config.c:721 +#: ../src/config.c:807 #, c-format msgid "%s: Missing mode string. This should never happen." msgstr "" -#: ../src/parser.y:352 +#: ../src/parser.y:398 #, c-format msgid "" "%s: No `type:' line seen\n" "\tin definition of \"%s\"." msgstr "" -#: ../src/conduit.c:1663 +#: ../src/conduit.c:1719 #, c-format msgid "%s: No executable \"%s\" in $CONDUIT_PATH or $CONDUITDIR.\n" msgstr "" -#: ../src/config.c:1100 ../src/config.c:1136 ../src/config.c:1158 -#: ../src/pref.c:234 ../src/pref.c:299 lexer.l:705 +#: ../src/conduit.c:1757 +#, fuzzy, c-format +msgid "%s: No home directory for %s.\n" +msgstr "%s: îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÄÉŇĹËÔĎŇÉŔ \"%s\"." + +#: ../src/config.c:1243 ../src/config.c:1279 ../src/config.c:1301 +#: ../src/pref.c:220 ../src/pref.c:278 lexer.l:506 lexer.l:740 #, c-format msgid "%s: Out of memory." msgstr "" -#: ../libpconn/dlp_cmd.c:1284 ../libpconn/dlp_cmd.c:1435 -#: ../libpconn/dlp_cmd.c:2183 ../libpconn/dlp_cmd.c:2437 -#: ../libpconn/dlp_cmd.c:3356 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 +#: ../libpconn/dlp_cmd.c:1296 ../libpconn/dlp_cmd.c:1447 +#: ../libpconn/dlp_cmd.c:2195 ../libpconn/dlp_cmd.c:2449 +#: ../libpconn/dlp_cmd.c:3368 ../libpdb/pdb.c:965 ../libpdb/pdb.c:1036 #: ../libpdb/pdb.c:1090 ../libpdb/pdb.c:1137 ../libpdb/pdb.c:1448 #: ../libpdb/pdb.c:1563 ../libpdb/pdb.c:1676 ../libpdb/pdb.c:1840 #: ../libpdb/pdb.c:1981 ../src/backup.c:138 ../src/backup.c:187 @@ -769,24 +788,24 @@ msgstr "" msgid "%s: Out of memory.\n" msgstr "" -#: ../src/conduit.c:361 +#: ../src/conduit.c:378 #, c-format msgid "%s: Too many file descriptors. Aborting." msgstr "" -#: ../src/GenericConduit.cc:1638 ../src/GenericConduit.cc:1688 -#: ../src/GenericConduit.cc:1854 ../src/GenericConduit.cc:2206 -#: ../src/GenericConduit.cc:2248 +#: ../src/GenericConduit.cc:1533 ../src/GenericConduit.cc:1581 +#: ../src/GenericConduit.cc:1737 ../src/GenericConduit.cc:2067 +#: ../src/GenericConduit.cc:2107 #, c-format msgid "%s: Warning: Can't delete record 0x%08lx: %d." msgstr "" -#: ../libpconn/PConnection_usb.c:543 +#: ../libpconn/PConnection_usb.c:566 #, c-format msgid "%s: Warning: Unexpected USB vendor ID %#x.\n" msgstr "" -#: ../libpconn/slp.c:250 +#: ../libpconn/slp.c:248 #, c-format msgid "%s: bad checksum: expected 0x%02x, got 0x%02x.\n" msgstr "" @@ -818,7 +837,7 @@ msgid "" "It may already exist." msgstr "" -#: ../src/backup.c:668 +#: ../src/backup.c:647 #, c-format msgid "%s: can't write database \"%s\" to \"%s\"." msgstr "" @@ -838,72 +857,77 @@ msgstr "" msgid "%s: error reading record index entry for \"%.*s\" (%d bytes): %d.\n" msgstr "" -#: ../src/conduit.c:942 +#: ../src/conduit.c:963 #, c-format msgid "%s: error sending SPC response header." msgstr "" -#: ../src/conduit.c:1694 +#: ../src/conduit.c:1774 #, c-format msgid "%s: execv(%s) failed and returned %d." msgstr "" -#: ../src/config.c:1224 lexer.l:731 +#: ../src/conduit.c:1761 +#, c-format +msgid "%s: getpwuid(%d) failed.\n" +msgstr "" + +#: ../src/config.c:1367 lexer.l:767 #, c-format msgid "%s: realloc(%d) failed." msgstr "" -#: ../src/conduit.c:722 +#: ../src/conduit.c:743 #, c-format msgid "%s: select() returned 0. I'm puzzled." msgstr "" -#: ../src/conduit.c:1817 +#: ../src/conduit.c:1897 #, c-format msgid "" "%s: select() returned 0. This should never happen. Please notify the " "maintainer." msgstr "" -#: ../src/conduit.c:1774 +#: ../src/conduit.c:1854 #, c-format msgid "%s: select() returned an unexpected error. This should never happen." msgstr "" -#: ../src/config.c:1025 +#: ../src/config.c:1168 #, c-format msgid "%s: socket() returned %d." msgstr "" -#: ../libpconn/PConnection_usb.c:662 +#: ../libpconn/PConnection_usb.c:685 #, c-format msgid "%s: unexpected response %d to GetBytesAvailable.\n" msgstr "" -#: ../libpconn/PConnection.c:124 +#: ../libpconn/PConnection.c:125 #, c-format msgid "%s: unknown listen type %d.\n" msgstr "" -#: lexer.l:632 +#: lexer.l:667 #, c-format msgid "" "%s: unknown start state %d.\n" "Please tell the maintainer to fix `lexer.l'." msgstr "" -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:303 -#: ../src/GenericConduit.cc:323 ../src/GenericConduit.cc:343 -#: ../src/GenericConduit.cc:423 ../src/GenericConduit.cc:452 -#: ../src/GenericConduit.cc:480 ../src/GenericConduit.cc:492 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:302 +#: ../src/GenericConduit.cc:315 ../src/GenericConduit.cc:328 +#: ../src/GenericConduit.cc:406 ../src/GenericConduit.cc:428 +#: ../src/GenericConduit.cc:454 ../src/GenericConduit.cc:465 msgid "(1st)" msgstr "" -#: ../src/coldsync.c:1090 ../src/coldsync.c:2679 +#: ../src/coldsync.c:1084 msgid "*Cancelled*\n" msgstr "" -#: ../libpconn/padp.c:676 +#: ../libpconn/padp.c:674 msgid "ACK Timeout. Attempting to resend.\n" msgstr "" @@ -912,9 +936,9 @@ msgstr "" msgid "Backing up \"%s\"" msgstr "" -#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:596 -#: ../src/backup.c:628 ../src/backup.c:655 ../src/backup.c:675 -#: ../src/backup.c:686 ../src/coldsync.c:1415 +#: ../src/backup.c:563 ../src/backup.c:581 ../src/backup.c:589 +#: ../src/backup.c:614 ../src/backup.c:634 ../src/backup.c:654 +#: ../src/backup.c:665 ../src/coldsync.c:1478 msgid "Backup" msgstr "" @@ -922,7 +946,7 @@ msgstr "" msgid "Bad file descriptor" msgstr "" -#: ../src/coldsync.c:898 ../src/coldsync.c:2502 +#: ../src/coldsync.c:945 #, c-format msgid "CacheFromConduits() returned %d." msgstr "" @@ -931,15 +955,15 @@ msgstr "" msgid "Can't allocate list of record IDs.\n" msgstr "" -#: ../src/config.c:467 ../src/config.c:508 +#: ../src/config.c:550 ../src/config.c:591 msgid "Can't allocate listen block." msgstr "" -#: ../src/config.c:320 +#: ../src/config.c:394 msgid "Can't allocate new conduit block." msgstr "" -#: ../src/config.c:297 +#: ../src/config.c:370 msgid "Can't allocate new configuration." msgstr "" @@ -947,62 +971,60 @@ msgstr "" msgid "Can't allocate new connection.\n" msgstr "" -#: ../src/coldsync.c:566 ../src/coldsync.c:1360 ../src/coldsync.c:1507 -#: ../src/coldsync.c:1650 ../src/coldsync.c:2103 +#: ../src/coldsync.c:562 msgid "Can't allocate struct Palm." msgstr "" -#: ../src/coldsync.c:557 ../src/coldsync.c:1352 ../src/coldsync.c:1499 -#: ../src/coldsync.c:1642 ../src/coldsync.c:2094 +#: ../src/coldsync.c:553 msgid "Can't connect to Palm." msgstr "" -#: ../libpconn/PConnection_net.c:411 +#: ../libpconn/PConnection_net.c:449 msgid "Can't connect to server.\n" msgstr "" -#: ../src/GenericConduit.cc:720 ../src/GenericConduit.cc:2085 +#: ../src/GenericConduit.cc:672 ../src/GenericConduit.cc:1947 msgid "Can't copy a new record." msgstr "" -#: ../src/coldsync.c:2299 +#: ../src/coldsync.c:2140 msgid "Can't copy config file name" msgstr "" -#: ../src/config.c:475 ../src/config.c:516 +#: ../src/config.c:558 ../src/config.c:599 msgid "Can't copy string." msgstr "" -#: ../src/GenericConduit.cc:2436 +#: ../src/GenericConduit.cc:2285 #, c-format msgid "Can't create \"%s\"." msgstr "" -#: ../src/config.c:1627 +#: ../src/config.c:1813 #, c-format msgid "Can't create archive directory %s." msgstr "" -#: ../src/config.c:1609 +#: ../src/config.c:1795 #, c-format msgid "Can't create attic directory %s." msgstr "" -#: ../src/config.c:1591 +#: ../src/config.c:1777 #, c-format msgid "Can't create backup directory %s." msgstr "" -#: ../src/config.c:1573 +#: ../src/config.c:1759 #, c-format msgid "Can't create base sync directory %s." msgstr "" -#: ../src/coldsync.c:824 ../src/coldsync.c:2422 +#: ../src/coldsync.c:658 msgid "Can't create connection to forwarding host." msgstr "" -#: ../src/config.c:1645 +#: ../src/config.c:1831 #, c-format msgid "Can't create install directory %s." msgstr "" @@ -1011,19 +1033,19 @@ msgstr "" msgid "Can't download record or resource index.\n" msgstr "" -#: ../src/coldsync.c:461 +#: ../src/coldsync.c:471 msgid "Can't dup(stderr)." msgstr "" -#: ../src/coldsync.c:836 ../src/coldsync.c:2434 +#: ../src/coldsync.c:675 msgid "Can't establish connection with forwarding host." msgstr "" -#: ../src/coldsync.c:975 ../src/coldsync.c:2568 +#: ../src/coldsync.c:1020 msgid "Can't fetch list of databases." msgstr "" -#: ../src/coldsync.c:1195 ../src/coldsync.c:2775 +#: ../src/coldsync.c:1164 #, c-format msgid "Can't fetch preference 0x%08lx/%d." msgstr "" @@ -1048,60 +1070,59 @@ msgstr "" msgid "Can't find the sort block in \"%.*s\"!\n" msgstr "" -#: ../src/coldsync.c:232 +#: ../src/coldsync.c:235 msgid "Can't get host ID." msgstr "" -#: ../src/coldsync.c:784 ../src/coldsync.c:2383 +#: ../src/coldsync.c:623 msgid "Can't get host addresses." msgstr "" -#: ../src/config.c:899 +#: ../src/config.c:1042 msgid "Can't get host name." msgstr "" -#: ../src/coldsync.c:909 ../src/coldsync.c:2513 +#: ../src/coldsync.c:955 msgid "Can't get last sync PC from Palm" msgstr "" -#: ../src/spalm.c:451 +#: ../src/spalm.c:416 msgid "Can't get location of serial number." msgstr "" -#: ../src/conduit.c:503 +#: ../src/conduit.c:524 msgid "Can't get preference item." msgstr "" -#: ../src/spalm.c:224 +#: ../src/spalm.c:211 msgid "Can't get system info." msgstr "" -#: ../src/coldsync.c:641 ../src/coldsync.c:1764 +#: ../src/coldsync.c:1288 ../src/coldsync.c:1727 msgid "Can't get user ID from Palm." msgstr "" -#: ../src/config.c:373 ../src/spalm.c:324 +#: ../src/config.c:447 ../src/spalm.c:304 msgid "Can't get user info." msgstr "" -#: ../src/coldsync.c:694 +#: ../src/coldsync.c:1340 msgid "Can't get user name from Palm." msgstr "" -#: ../src/config.c:1799 +#: ../src/config.c:1985 msgid "Can't get user's full name." msgstr "" -#: ../src/coldsync.c:1010 ../src/coldsync.c:1229 ../src/coldsync.c:2603 -#: ../src/coldsync.c:2809 +#: ../src/coldsync.c:731 msgid "Can't install new files." msgstr "" -#: ../src/coldsync.c:225 ../src/coldsync.c:2316 +#: ../src/coldsync.c:228 ../src/coldsync.c:2156 msgid "Can't load configuration." msgstr "" -#: ../src/install.c:434 +#: ../src/install.c:420 msgid "Can't load header." msgstr "" @@ -1114,11 +1135,11 @@ msgstr "" msgid "Can't load record list header for \"%.*s\".\n" msgstr "" -#: ../src/coldsync.c:589 +#: ../src/coldsync.c:1236 msgid "Can't look up Palm." msgstr "" -#: ../src/config.c:908 +#: ../src/config.c:1051 msgid "Can't look up my address." msgstr "" @@ -1127,7 +1148,7 @@ msgstr "" msgid "Can't open %s." msgstr "" -#: ../src/backup.c:593 +#: ../src/backup.c:586 msgid "Can't open backup conduit." msgstr "" @@ -1136,26 +1157,25 @@ msgstr "" msgid "Can't open conduit for \"%s\": %d.\n" msgstr "" -#: ../src/coldsync.c:548 ../src/coldsync.c:1344 ../src/coldsync.c:1491 -#: ../src/coldsync.c:1634 ../src/coldsync.c:2085 +#: ../src/coldsync.c:544 msgid "Can't open connection." msgstr "" -#: ../src/backup.c:624 +#: ../src/backup.c:610 #, c-format msgid "Can't open database \"%s\"." msgstr "" -#: ../src/coldsync.c:475 +#: ../src/coldsync.c:485 #, c-format msgid "Can't open log file \"%s\"." msgstr "" -#: ../src/coldsync.c:489 +#: ../src/coldsync.c:499 msgid "Can't open log file on stderr." msgstr "" -#: ../src/coldsync.c:178 +#: ../src/coldsync.c:181 msgid "Can't parse command-line arguments." msgstr "" @@ -1169,16 +1189,16 @@ msgstr "" msgid "Can't read AppInfo block for \"%.*s\".\n" msgstr "" -#: ../src/spalm.c:300 +#: ../src/spalm.c:280 msgid "Can't read NetSync info." msgstr "" -#: ../src/restore.c:227 +#: ../src/restore.c:222 #, c-format msgid "Can't read contents of directory %s." msgstr "" -#: ../src/coldsync.c:1659 +#: ../src/coldsync.c:1623 msgid "Can't read length of serial number." msgstr "" @@ -1226,7 +1246,7 @@ msgstr "" msgid "Can't read resources for \"%.*s\".\n" msgstr "" -#: ../src/coldsync.c:1671 ../src/spalm.c:484 +#: ../src/coldsync.c:1635 ../src/spalm.c:442 msgid "Can't read serial number." msgstr "" @@ -1235,84 +1255,88 @@ msgstr "" msgid "Can't read sort block for \"%.*s\".\n" msgstr "" -#: ../src/coldsync.c:156 ../src/coldsync.c:161 ../src/coldsync.c:166 +#: ../src/coldsync.c:159 ../src/coldsync.c:164 ../src/coldsync.c:169 #, c-format msgid "Can't reserve file descriptor %d." msgstr "" -#: ../src/spalm.c:1006 +#: ../src/spalm.c:983 msgid "Can't resize palm->dblist." msgstr "" -#: ../src/coldsync.c:793 ../src/coldsync.c:2392 +#: ../src/coldsync.c:630 msgid "Can't resolve forwarding address." msgstr "" -#: ../src/coldsync.c:1534 ../src/coldsync.c:1557 +#: ../src/coldsync.c:1549 ../src/coldsync.c:1572 msgid "Can't restore directory." msgstr "" -#: ../src/coldsync.c:2281 +#: ../src/coldsync.c:2123 msgid "Can't setuid" msgstr "" -#: ../src/coldsync.c:1161 ../src/coldsync.c:2741 +#: ../src/coldsync.c:1132 msgid "Can't write user info." msgstr "" -#: ../src/GenericConduit.cc:250 ../src/GenericConduit.cc:522 -#: ../src/GenericConduit.cc:1019 ../src/backup.c:581 ../src/restore.c:181 +#: ../src/GenericConduit.cc:256 ../src/GenericConduit.cc:495 +#: ../src/GenericConduit.cc:954 ../src/backup.c:581 ../src/restore.c:176 msgid "Cancelled" msgstr "" -#: ../src/backup.c:576 ../src/coldsync.c:1380 ../src/coldsync.c:1428 -#: ../src/coldsync.c:1527 ../src/coldsync.c:1550 ../src/conduit.c:1183 -#: ../src/conduit.c:1243 ../src/restore.c:274 +#: ../src/backup.c:576 ../src/coldsync.c:1442 ../src/coldsync.c:1491 +#: ../src/coldsync.c:1541 ../src/coldsync.c:1564 ../src/conduit.c:1226 +#: ../src/conduit.c:1287 ../src/restore.c:269 msgid "Cancelled by Palm." msgstr "" -#: ../src/config.c:850 +#: ../src/config.c:993 msgid "ColdSync homepage at http://www.ooblick.com/software/coldsync/\n" msgstr "" -#: ../src/config.c:856 +#: ../src/config.c:999 msgid "Compile-type options:\n" msgstr "" -#: ../src/conduit.c:1189 ../src/conduit.c:1249 +#: ../src/conduit.c:1232 ../src/conduit.c:1293 #, c-format msgid "Conduit %s exited abnormally. Continuing." msgstr "" -#: ../src/conduit.c:1169 ../src/conduit.c:1229 +#: ../src/conduit.c:1212 ../src/conduit.c:1273 #, c-format msgid "Conduit %s is not a %s conduit." msgstr "" -#: ../src/coldsync.c:1103 ../src/coldsync.c:2692 +#: ../src/coldsync.c:846 msgid "Conduit failed for unknown reason." msgstr "" -#: ../src/config.c:384 +#: ../src/config.c:458 #, c-format msgid "Config file \"%s\" doesn't exist." msgstr "" -#: ../src/coldsync.c:1244 ../src/coldsync.c:1454 ../src/coldsync.c:1575 -#: ../src/coldsync.c:1960 ../src/coldsync.c:2824 +#: ../src/coldsync.c:581 msgid "Couldn't disconnect." msgstr "" -#: ../src/config.c:336 +#: ../src/config.c:1719 +#, c-format +msgid "Couldn't find the requested listen block: \"%s\"" +msgstr "" + +#: ../src/config.c:410 msgid "Couldn't initialize configuration." msgstr "" -#: ../src/config.c:359 ../src/config.c:418 +#: ../src/config.c:433 ../src/config.c:492 #, c-format msgid "Couldn't read configuration file \"%s\"." msgstr "" -#: ../src/conduit.c:619 +#: ../src/conduit.c:640 msgid "Couldn't send header to conduit." msgstr "" @@ -1320,20 +1344,30 @@ msgstr "" msgid "DlpReadRecordIDList() read 0 records. What happened?\n" msgstr "" -#: ../libpconn/dlp_cmd.c:1805 +#: ../libpconn/dlp_cmd.c:1817 msgid "DlpWriteRecord: Can't allocate output buffer.\n" msgstr "" -#: ../src/coldsync.c:1900 ../src/coldsync.c:3217 +#: ../src/coldsync.c:1828 ../src/coldsync.c:2599 #, c-format msgid "DlpWriteUserInfo failed: %d." msgstr "" -#: ../src/coldsync.c:930 ../src/coldsync.c:934 +#: ../src/coldsync.c:975 +#, fuzzy +msgid "Doing a (forced) fast sync." +msgstr "\t-F:\t\tđŇÉÎŐÄÉÔĹĚŘÎÁŃ ÂŮÓÔŇÁŃ ÓÉÎČŇĎÎÉÚÁĂÉŃ.\n" + +#: ../src/coldsync.c:973 +#, fuzzy +msgid "Doing a (forced) slow sync." +msgstr "\t-S:\t\tđŇÉÎŐÄÉÔĹĚŘÎÁŃ ÍĹÄĚĹÎÎÁŃ ÓÉÎČŇĎÎÉÚÁĂÉŃ.\n" + +#: ../src/coldsync.c:979 msgid "Doing a fast sync." msgstr "" -#: ../src/coldsync.c:928 ../src/coldsync.c:932 +#: ../src/coldsync.c:977 msgid "Doing a slow sync." msgstr "" @@ -1341,43 +1375,47 @@ msgstr "" msgid "End of file" msgstr "" -#: ../src/GenericConduit.cc:303 ../src/GenericConduit.cc:323 -#: ../src/GenericConduit.cc:343 ../src/GenericConduit.cc:423 -#: ../src/GenericConduit.cc:452 ../src/GenericConduit.cc:481 -#: ../src/GenericConduit.cc:572 ../src/GenericConduit.cc:591 -#: ../src/GenericConduit.cc:612 ../src/GenericConduit.cc:723 -#: ../src/GenericConduit.cc:929 ../src/GenericConduit.cc:952 -#: ../src/GenericConduit.cc:978 ../src/GenericConduit.cc:1067 -#: ../src/GenericConduit.cc:1086 ../src/GenericConduit.cc:1127 -#: ../src/GenericConduit.cc:1229 ../src/GenericConduit.cc:1465 -#: ../src/GenericConduit.cc:1494 ../src/GenericConduit.cc:1521 -#: ../src/backup.c:563 ../src/backup.c:596 ../src/backup.c:628 -#: ../src/backup.c:655 ../src/backup.c:675 ../src/install.c:586 -#: ../src/install.c:618 ../src/install.c:730 ../src/restore.c:192 +#: ../src/GenericConduit.cc:302 ../src/GenericConduit.cc:315 +#: ../src/GenericConduit.cc:328 ../src/GenericConduit.cc:406 +#: ../src/GenericConduit.cc:428 ../src/GenericConduit.cc:455 +#: ../src/GenericConduit.cc:538 ../src/GenericConduit.cc:550 +#: ../src/GenericConduit.cc:564 ../src/GenericConduit.cc:675 +#: ../src/GenericConduit.cc:874 ../src/GenericConduit.cc:890 +#: ../src/GenericConduit.cc:914 ../src/GenericConduit.cc:995 +#: ../src/GenericConduit.cc:1007 ../src/GenericConduit.cc:1048 +#: ../src/GenericConduit.cc:1150 ../src/GenericConduit.cc:1368 +#: ../src/GenericConduit.cc:1390 ../src/GenericConduit.cc:1416 +#: ../src/backup.c:563 ../src/backup.c:589 ../src/backup.c:614 +#: ../src/backup.c:634 ../src/backup.c:654 ../src/install.c:572 +#: ../src/install.c:590 ../src/install.c:702 ../src/restore.c:187 msgid "Error" msgstr "" -#: ../src/install.c:338 ../src/install.c:359 +#: ../src/install.c:331 ../src/install.c:345 msgid "Error\n" msgstr "" -#: ../src/coldsync.c:998 ../src/coldsync.c:1217 ../src/coldsync.c:2591 -#: ../src/coldsync.c:2797 +#: ../src/coldsync.c:712 ../src/coldsync.c:721 #, c-format msgid "Error %d running install conduits." msgstr "" -#: ../src/coldsync.c:1258 ../src/coldsync.c:2837 +#: ../src/coldsync.c:752 ../src/coldsync.c:764 #, c-format msgid "Error %d running post-dump conduits." msgstr "" -#: ../src/coldsync.c:1057 ../src/coldsync.c:2648 +#: ../src/coldsync.c:787 ../src/coldsync.c:800 #, c-format msgid "Error %d running pre-fetch conduits." msgstr "" -#: ../src/coldsync.c:1436 +#: ../src/coldsync.c:822 +#, c-format +msgid "Error %d running sync conduits." +msgstr "" + +#: ../src/coldsync.c:1500 #, c-format msgid "Error backing up \"%s\"." msgstr "" @@ -1387,17 +1425,17 @@ msgstr "" msgid "Error creating database \"%s\": %d.\n" msgstr "" -#: ../src/install.c:751 +#: ../src/install.c:723 #, c-format msgid "Error deleting \"%s\"." msgstr "" -#: ../src/coldsync.c:2904 +#: ../src/coldsync.c:2211 #, c-format msgid "Error during DlpEndOfSync: (%d) %s." msgstr "" -#: ../libpconn/cmp.c:141 +#: ../libpconn/cmp.c:142 #, c-format msgid "Error during cmp_read: (%d) %s.\n" msgstr "" @@ -1410,16 +1448,16 @@ msgstr "" msgid "Error in system call or library function" msgstr "" -#: ../src/install.c:705 +#: ../src/install.c:677 #, c-format msgid "Error opening \"%s\"." msgstr "" -#: ../libpconn/netsync.c:488 +#: ../libpconn/netsync.c:514 msgid "Error reading NetSync packet header.\n" msgstr "" -#: ../libpconn/netsync.c:624 +#: ../libpconn/netsync.c:659 msgid "Error sending NetSync header.\n" msgstr "" @@ -1427,9 +1465,9 @@ msgstr "" msgid "Error trying to set speed.\n" msgstr "" -#: ../src/GenericConduit.cc:888 ../src/GenericConduit.cc:1431 -#: ../src/GenericConduit.cc:1744 ../src/GenericConduit.cc:1889 -#: ../src/GenericConduit.cc:2055 ../src/GenericConduit.cc:2289 +#: ../src/GenericConduit.cc:833 ../src/GenericConduit.cc:1334 +#: ../src/GenericConduit.cc:1627 ../src/GenericConduit.cc:1762 +#: ../src/GenericConduit.cc:1917 ../src/GenericConduit.cc:2138 #, c-format msgid "Error uploading record 0x%08lx: %d." msgstr "" @@ -1438,7 +1476,7 @@ msgstr "" msgid "Error: " msgstr "" -#: ../libpconn/PConnection_serial.c:612 ../libpconn/PConnection_usb.c:460 +#: ../libpconn/PConnection_serial.c:616 ../libpconn/PConnection_usb.c:483 #, c-format msgid "Error: Can't open \"%s\".\n" msgstr "" @@ -1454,11 +1492,11 @@ msgstr "" msgid "Error: Palm suggested unknown speed %ld\n" msgstr "" -#: ../libpconn/PConnection.c:118 +#: ../libpconn/PConnection.c:119 msgid "Error: USB support not enabled.\n" msgstr "" -#: ../libpconn/netsync.c:496 +#: ../libpconn/netsync.c:521 #, c-format msgid "Error: only read %d bytes of NetSync packet header.\n" msgstr "" @@ -1477,22 +1515,22 @@ msgstr "" msgid "Hey! I can't find the %dth resource in \"%.*s\"!\n" msgstr "" -#: ../src/config.c:924 +#: ../src/config.c:1067 msgid "Hey! This isn't an AF_INET address!" msgstr "" -#: ../src/GenericConduit.cc:1200 +#: ../src/GenericConduit.cc:1121 msgid "" "I have a new, deleted record that is neither archived nor expunged\n" "What am I supposed to do?" msgstr "" -#: ../src/conduit.c:2191 +#: ../src/conduit.c:2279 msgid "Inside run_DummyConduit.\n" msgstr "" -#: ../src/install.c:584 ../src/install.c:616 ../src/install.c:701 -#: ../src/install.c:709 ../src/install.c:728 ../src/install.c:733 +#: ../src/install.c:570 ../src/install.c:588 ../src/install.c:673 +#: ../src/install.c:681 ../src/install.c:700 ../src/install.c:705 msgid "Install" msgstr "" @@ -1512,43 +1550,41 @@ msgstr "" msgid "Invalid result ID" msgstr "" -#: ../src/coldsync.c:500 +#: ../src/coldsync.c:510 #, c-format msgid "Log started on %s" msgstr "" -#: ../src/coldsync.c:583 ../src/coldsync.c:635 ../src/coldsync.c:688 -#: ../src/coldsync.c:970 ../src/coldsync.c:1069 ../src/coldsync.c:1098 -#: ../src/coldsync.c:1125 ../src/coldsync.c:1191 ../src/coldsync.c:1267 -#: ../src/coldsync.c:1385 ../src/coldsync.c:1433 ../src/coldsync.c:1530 -#: ../src/coldsync.c:1553 ../src/coldsync.c:2564 ../src/coldsync.c:2660 -#: ../src/coldsync.c:2687 ../src/coldsync.c:2708 ../src/coldsync.c:2771 -#: ../src/coldsync.c:2846 ../src/conduit.c:500 ../src/restore.c:278 +#: ../src/coldsync.c:1015 ../src/coldsync.c:1093 ../src/coldsync.c:1160 +#: ../src/coldsync.c:1194 ../src/coldsync.c:1231 ../src/coldsync.c:1283 +#: ../src/coldsync.c:1335 ../src/coldsync.c:1447 ../src/coldsync.c:1496 +#: ../src/coldsync.c:1544 ../src/coldsync.c:1567 ../src/conduit.c:521 +#: ../src/restore.c:273 msgid "Lost connection to Palm." msgstr "" -#: ../src/conduit.c:1186 ../src/conduit.c:1246 +#: ../src/conduit.c:1229 ../src/conduit.c:1290 msgid "Lost connection to Palm. Aborting." msgstr "" -#: ../src/config.c:263 +#: ../src/config.c:336 #, c-format msgid "Missing option argument after \"%s\"." msgstr "" -#: ../src/config.c:805 +#: ../src/config.c:947 msgid "Modes:\n" msgstr "" -#: ../src/coldsync.c:848 ../src/coldsync.c:2446 +#: ../src/coldsync.c:685 msgid "Network sync forwarding failed." msgstr "" -#: ../src/spalm.c:288 +#: ../src/spalm.c:275 msgid "No NetSync info.\n" msgstr "" -#: ../src/coldsync.c:1291 +#: ../src/coldsync.c:1392 msgid "No backup directory specified." msgstr "" @@ -1556,37 +1592,41 @@ msgstr "" msgid "No error" msgstr "" -#: ../src/coldsync.c:2230 +#: ../src/coldsync.c:2088 +#, c-format +msgid "No matching entry in %s, couldn't autoinit." +msgstr "" + +#: ../src/coldsync.c:2099 #, c-format msgid "No matching entry in %s." msgstr "" -#: ../src/coldsync.c:529 ../src/coldsync.c:1326 ../src/coldsync.c:1473 -#: ../src/coldsync.c:1616 ../src/coldsync.c:2064 +#: ../src/coldsync.c:525 msgid "No port specified." msgstr "" -#: ../src/coldsync.c:1417 +#: ../src/coldsync.c:1480 msgid "No such database" msgstr "" -#: ../src/coldsync.c:1412 +#: ../src/coldsync.c:1475 #, c-format msgid "No such database: \"%s\"." msgstr "" -#: ../src/coldsync.c:1316 +#: ../src/coldsync.c:1417 #, c-format msgid "No such directory: \"%s\"." msgstr "" -#: ../src/GenericConduit.cc:492 ../src/GenericConduit.cc:989 -#: ../src/GenericConduit.cc:1531 ../src/backup.c:686 ../src/install.c:703 -#: ../src/install.c:735 ../src/restore.c:197 +#: ../src/GenericConduit.cc:465 ../src/GenericConduit.cc:924 +#: ../src/GenericConduit.cc:1425 ../src/backup.c:665 ../src/install.c:675 +#: ../src/install.c:707 ../src/restore.c:192 msgid "OK" msgstr "" -#: ../src/config.c:812 +#: ../src/config.c:954 msgid "Options:\n" msgstr "" @@ -1594,67 +1634,68 @@ msgstr "" msgid "Out of memory" msgstr "" -#: ../libpconn/PConnection_serial.c:653 ../libpconn/PConnection_usb.c:435 +#: ../libpconn/PConnection_serial.c:590 ../libpconn/PConnection_serial.c:657 +#: ../libpconn/PConnection_usb.c:458 msgid "Please press the HotSync button.\n" msgstr "" -#: ../src/install.c:711 +#: ../src/install.c:683 msgid "Problem" msgstr "" -#: ../src/restore.c:181 ../src/restore.c:192 ../src/restore.c:197 +#: ../src/restore.c:176 ../src/restore.c:187 ../src/restore.c:192 msgid "Restore" msgstr "" -#: ../src/restore.c:149 +#: ../src/restore.c:151 #, c-format msgid "Restore: Can't delete database \"%s\": %d." msgstr "" -#: ../src/coldsync.c:1251 +#: ../src/coldsync.c:746 msgid "Running Dump conduits" msgstr "" -#: ../src/coldsync.c:1050 +#: ../src/coldsync.c:781 msgid "Running Fetch conduits" msgstr "" -#: ../src/coldsync.c:994 ../src/coldsync.c:1213 ../src/coldsync.c:2587 -#: ../src/coldsync.c:2793 +#: ../src/coldsync.c:706 msgid "Running Install conduits" msgstr "" -#: ../src/coldsync.c:1075 +#: ../src/coldsync.c:816 msgid "Running Sync conduits" msgstr "" -#: ../libpconn/slp.c:391 +#: ../libpconn/slp.c:385 #, c-format msgid "SLP: bad CRC: expected 0x%04x, got 0x%04x.\n" msgstr "" -#: ../src/coldsync.c:1855 +#: ../src/coldsync.c:2443 msgid "Set user ID" msgstr "" -#: ../src/coldsync.c:1890 +#: ../src/coldsync.c:2466 msgid "Set username" msgstr "" -#: ../src/coldsync.c:1120 +#: ../src/coldsync.c:1083 msgid "Sync cancelled by Palm." msgstr "" -#: ../src/coldsync.c:1089 ../src/coldsync.c:2678 -msgid "Sync cancelled." +#: ../src/coldsync.c:1268 +#, c-format +msgid "Sync for %s at %s" msgstr "" -#: ../src/coldsync.c:621 +#: ../src/coldsync.c:834 #, c-format -msgid "Sync for %s at %s" +msgid "Syncing %s" msgstr "" -#: ../src/coldsync.c:649 +#: ../src/coldsync.c:1296 #, c-format msgid "" "This Palm has user ID %ld (I was expecting %ld).\n" @@ -1665,7 +1706,7 @@ msgid "" "something like this:" msgstr "" -#: ../src/coldsync.c:704 +#: ../src/coldsync.c:1350 #, c-format msgid "" "This Palm has user name \"%.*s\" (I was expecting \"%.*s\").\n" @@ -1676,7 +1717,7 @@ msgid "" "something like this:" msgstr "" -#: ../src/config.c:945 +#: ../src/config.c:1088 msgid "This host doesn't appear to have an IP address." msgstr "" @@ -1688,7 +1729,7 @@ msgstr "" msgid "Too many errors. Aborting." msgstr "" -#: ../src/coldsync.c:3103 +#: ../src/coldsync.c:2410 #, c-format msgid "Too many files named \"%s\" in the attic." msgstr "" @@ -1701,7 +1742,7 @@ msgstr "" msgid "Unexpected timeout" msgstr "" -#: ../src/config.c:229 +#: ../src/config.c:295 #, c-format msgid "Unknown device type: \"%s\"." msgstr "" @@ -1710,39 +1751,39 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../src/config.c:706 +#: ../src/config.c:792 #, c-format msgid "Unknown facility \"%s\"." msgstr "" -#: ../src/config.c:755 +#: ../src/config.c:843 ../src/config.c:876 #, c-format msgid "Unknown mode: \"%s\"." msgstr "" -#: ../src/coldsync.c:345 +#: ../src/coldsync.c:353 #, c-format msgid "" "Unknown mode: %d.\n" "This is a bug. Please report it to the maintainer." msgstr "" -#: ../src/config.c:242 +#: ../src/config.c:308 #, c-format msgid "Unknown protocol: \"%s\"." msgstr "" -#: ../src/coldsync.c:2261 +#: ../src/coldsync.c:2110 #, c-format msgid "Unknown user/uid: \"%s\"." msgstr "" -#: ../src/config.c:254 +#: ../src/config.c:327 #, c-format msgid "Unrecognized option: \"%s\"." msgstr "" -#: lexer.l:505 +#: lexer.l:540 #, c-format msgid "Unterminated string at line %d (string started on line %d)\n" msgstr "" @@ -1757,7 +1798,7 @@ msgstr "" msgid "Uploading \"%s\"" msgstr "" -#: ../src/config.c:834 +#: ../src/config.c:977 #, c-format msgid "Usage: %s [options] \n" msgstr "" @@ -1773,7 +1814,7 @@ msgid "" "Expected 0x%lx, but we're at 0x%lx.\n" msgstr "" -#: ../src/spalm.c:461 +#: ../src/spalm.c:426 #, c-format msgid "" "Warning: ROM serial number is %d characters long. Please notify the\n" @@ -1794,7 +1835,7 @@ msgid "" "Using default.\n" msgstr "" -#: ../libpconn/PConnection_serial.c:603 +#: ../libpconn/PConnection_serial.c:607 #, c-format msgid "Warning: no device on %s. Sleeping\n" msgstr "" @@ -1820,7 +1861,7 @@ msgid "" "Expected 0x%lx, but we're at 0x%lx.\n" msgstr "" -#: ../libpconn/padp.c:647 +#: ../libpconn/padp.c:645 msgid "Write timeout. Attempting to resend.\n" msgstr "" @@ -1828,43 +1869,43 @@ msgstr "" msgid "XID on ACK doesn't match request" msgstr "" -#: ../src/spalm.c:563 +#: ../src/spalm.c:521 msgid "" "You have an old Palm, one that doesn't say how many\n" "databases it has. I can't cope with this." msgstr "" -#: ../src/config.c:728 +#: ../src/config.c:814 #, c-format msgid "" "You shouldn't specify two -m options.\n" "\tUsing -m%s." msgstr "" -#: ../src/config.c:269 +#: ../src/config.c:342 #, c-format msgid "" "You specified an apparently legal option (\"-%c\"), but I don't know what\n" "to do with it. This is a bug. Please notify the maintainer." msgstr "" -#: ../src/GenericConduit.cc:177 +#: ../src/GenericConduit.cc:183 msgid "[generic]: Aborting." msgstr "" -#: ../libpconn/PConnection_usb.c:648 +#: ../libpconn/PConnection_usb.c:671 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetBytesAvailable failed" msgstr "" -#: ../libpconn/PConnection_usb.c:586 +#: ../libpconn/PConnection_usb.c:609 msgid "ioctl(USB_DO_REQUEST) usbRequestVendorGetConnectionInfo failed" msgstr "" -#: ../src/GenericConduit.cc:340 +#: ../src/GenericConduit.cc:325 msgid "pdb_Download() failed." msgstr "" -#: ../libpconn/PConnection_usb.c:181 +#: ../libpconn/PConnection_usb.c:204 msgid "usb: trying to fill a non-empty buffer.\n" msgstr "" diff --git a/include/pconn/PConnection.h b/include/pconn/PConnection.h index 62409d98..a7320b2c 100644 --- a/include/pconn/PConnection.h +++ b/include/pconn/PConnection.h @@ -7,7 +7,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: PConnection.h,v 1.30 2002-05-02 22:45:46 azummo Exp $ + * $Id: PConnection.h,v 1.31 2002-07-04 21:03:27 azummo Exp $ */ #ifndef _PConnection_h_ #define _PConnection_h_ @@ -76,6 +76,7 @@ typedef enum { #define PCONNFL_PROMPT 0x0002 /* Prompt the user to press the * HotSync button. */ +#define PCONNFL_MODEM 0x0004 /* This is a modem, don't change speeds */ /* Misc defines */ #define PCONN_NET_CONNECT_RETRIES 10 /* connect() retries */ diff --git a/libpconn/PConnection.c b/libpconn/PConnection.c index 7e06576d..95cd117b 100644 --- a/libpconn/PConnection.c +++ b/libpconn/PConnection.c @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: PConnection.c,v 1.29 2002-04-27 18:36:31 azummo Exp $ + * $Id: PConnection.c,v 1.30 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" #include @@ -32,18 +32,15 @@ int io_trace = 0; extern int pconn_serial_open(PConnection *pconn, const char *fname, - const pconn_proto_t protocol, - const Bool prompt_for_hotsync); + const pconn_proto_t protocol); extern int pconn_net_open(PConnection *pconn, const char *fname, - const pconn_proto_t protocol, - const Bool prompt_for_hotsync); + const pconn_proto_t protocol); #if WITH_USB extern int pconn_usb_open(PConnection *pconn, const char *fname, - const pconn_proto_t protocol, - const Bool prompt_for_hotsync); + const pconn_proto_t protocol); #endif /* new_PConnection @@ -67,7 +64,8 @@ new_PConnection(char *device, } /* Initialize the common part, if only in case the constructor fails */ - pconn->fd = -1; + pconn->fd = -1; + pconn->flags = flags; pconn->io_bind = NULL; pconn->io_read = NULL; pconn->io_write = NULL; @@ -82,7 +80,7 @@ new_PConnection(char *device, switch (listenType) { case LISTEN_SERIAL: - if (pconn_serial_open(pconn, device, protocol, flags) + if (pconn_serial_open(pconn, device, protocol) < 0) { free(pconn); @@ -91,7 +89,7 @@ new_PConnection(char *device, break; case LISTEN_NET: - if (pconn_net_open(pconn, device, protocol, flags) < 0) + if (pconn_net_open(pconn, device, protocol) < 0) { free(pconn); return NULL; @@ -103,7 +101,7 @@ new_PConnection(char *device, /* XXX - Should be able to specify "-" for the filename to * listen on stdin/stdout. */ - if (pconn_usb_open(pconn, device, protocol, flags) < 0) + if (pconn_usb_open(pconn, device, protocol) < 0) { free(pconn); return NULL; diff --git a/libpconn/PConnection_net.c b/libpconn/PConnection_net.c index 34497466..6495caa5 100644 --- a/libpconn/PConnection_net.c +++ b/libpconn/PConnection_net.c @@ -4,7 +4,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: PConnection_net.c,v 1.27 2002-04-27 23:24:47 azummo Exp $ + * $Id: PConnection_net.c,v 1.28 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" #include @@ -538,8 +538,7 @@ net_drain(PConnection *p) int pconn_net_open(PConnection *pconn, const char *device, - const pconn_proto_t protocol, - const unsigned short flags) + const pconn_proto_t protocol) { IO_TRACE(1) fprintf(stderr, "Opening net connection.\n"); diff --git a/libpconn/PConnection_serial.c b/libpconn/PConnection_serial.c index 00487166..b511b3a7 100644 --- a/libpconn/PConnection_serial.c +++ b/libpconn/PConnection_serial.c @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: PConnection_serial.c,v 1.37 2002-05-02 22:45:46 azummo Exp $ + * $Id: PConnection_serial.c,v 1.38 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" #include @@ -276,7 +276,11 @@ serial_read(PConnection *p, unsigned char *buf, int len) static int serial_write(PConnection *p, unsigned const char *buf, const int len) { - return write(p->fd, buf, len); + if (p->fd == STDIN_FILENO) { + return write(STDOUT_FILENO, buf, len); + } else { + return write(p->fd, buf, len); + } } static int @@ -335,6 +339,7 @@ serial_accept(PConnection *pconn) } } + newspeed = cmp_accept(pconn, pconn->speed); if (newspeed == ~0) { @@ -373,10 +378,17 @@ serial_accept(PConnection *pconn) tcspeed = speeds[speed_ix].tcspeed; /* Change the speed */ - if ((err = setspeed(pconn, tcspeed)) < 0) - { - fprintf(stderr, _("Error trying to set speed.\n")); - return -1; + if (pconn->flags & PCONNFL_MODEM) { + IO_TRACE(5) + fprintf(stderr, "This is a modem, so not changing speed.\n"); + } else { + if ((err = setspeed(pconn, tcspeed)) < 0) + { + fprintf(stderr, _("Error trying to set speed.\n")); + return -1; + } + IO_TRACE(5) + fprintf(stderr, "This is not a modem, so changing speed.\n"); } break; @@ -481,6 +493,7 @@ serial_select(PConnection *p, * 'pconn' is a partly-initialized PConnection; it must still be * initialized as a serial PConnection. * 'device' is the pathname of the serial port. If it is NULL, use stdin. + * Also the special string 'stdin' use stdin. * 'protocol' is the software protcol stack to use: ordinary serial devices * use DLP->PADP->SLP, whereas Palm m50x'es use DLP->netsync * 'prompt': if set, prompt the user to press the HotSync button. @@ -488,8 +501,7 @@ serial_select(PConnection *p, int pconn_serial_open(PConnection *pconn, const char *device, - const pconn_proto_t protocol, - const unsigned short flags) + const pconn_proto_t protocol) { struct termios term; @@ -566,7 +578,7 @@ pconn_serial_open(PConnection *pconn, pconn->io_drain = &serial_drain; pconn->io_private = 0; - if (device == NULL) + if ((device == NULL) || strcasecmp("stdin", device) == 0 ) { /* Use stdin */ pconn->fd = STDIN_FILENO; @@ -586,7 +598,7 @@ pconn_serial_open(PConnection *pconn, * hacks. */ - if (flags & (PCONNFL_PROMPT | PCONNFL_TRANSIENT)) + if (pconn->flags & (PCONNFL_PROMPT | PCONNFL_TRANSIENT)) printf(_("Please press the HotSync button.\n")); while (1) @@ -598,7 +610,7 @@ pconn_serial_open(PConnection *pconn, switch (errno) { case ENOENT: - if ((flags & PCONNFL_TRANSIENT) == 0) + if ((pconn->flags & PCONNFL_TRANSIENT) == 0) goto abort; /* If PCONNFL_TRANSIENT is set, fall * through */ @@ -644,8 +656,15 @@ pconn_serial_open(PConnection *pconn, tcgetattr(pconn->fd, &term); /* Get current characteristics */ /* Set initial rate. 9600 bps required for handshaking */ - cfsetispeed(&term, B9600); - cfsetospeed(&term, B9600); + if (pconn->flags & PCONNFL_MODEM) { + IO_TRACE(5) + fprintf(stderr, "This is a modem, so not setting initial speed.\n"); + } else { + cfsetispeed(&term, B9600); + cfsetospeed(&term, B9600); + IO_TRACE(5) + fprintf(stderr, "This is a not modem, so setting initial speed.\n"); + } cfmakeraw(&term); /* Make it raw */ /* XXX - Error-checking */ @@ -653,7 +672,7 @@ pconn_serial_open(PConnection *pconn, /* XXX - Error-checking */ /* Make it so */ - if ((flags & PCONNFL_PROMPT) && !(flags & PCONNFL_TRANSIENT)) + if ((pconn->flags & PCONNFL_PROMPT) && !(pconn->flags & PCONNFL_TRANSIENT)) printf(_("Please press the HotSync button.\n")); return pconn->fd; diff --git a/libpconn/PConnection_usb.c b/libpconn/PConnection_usb.c index 416bd021..d48e5c3f 100644 --- a/libpconn/PConnection_usb.c +++ b/libpconn/PConnection_usb.c @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: PConnection_usb.c,v 1.36 2002-05-09 13:50:59 arensb Exp $ + * $Id: PConnection_usb.c,v 1.37 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" @@ -359,8 +359,7 @@ usb_drain(PConnection *p) int pconn_usb_open(PConnection *pconn, const char *device, - const pconn_proto_t protocol, - const unsigned short flags) + const pconn_proto_t protocol) { struct usb_data *u; struct usb_device_info udi; @@ -454,7 +453,7 @@ pconn_usb_open(PConnection *pconn, * operation on the Visor logically plugs it into the USB * hub port, where it's noticed and enumerated. */ - if (flags & PCONNFL_PROMPT) + if (pconn->flags & PCONNFL_PROMPT) printf(_("Please press the HotSync button.\n")); /* @@ -476,7 +475,7 @@ pconn_usb_open(PConnection *pconn, IO_TRACE(1) perror(device); - if ((errno == ENOENT) && ((flags & PCONNFL_TRANSIENT) != 0)) + if ((errno == ENOENT) && ((pconn->flags & PCONNFL_TRANSIENT) != 0)) /* Just ignore this error */ ; else if (errno != ENXIO) { @@ -730,7 +729,7 @@ pconn_usb_open(PConnection *pconn, if (pconn->fd < 0) { if ((errno == ENOENT) && - ((flags & PCONNFL_TRANSIENT) != 0)) + ((pconn->flags & PCONNFL_TRANSIENT) != 0)) { /* Ignore this error and try again */ sleep(1); diff --git a/src/coldsync.c b/src/coldsync.c index 418949f4..fe11ccdd 100644 --- a/src/coldsync.c +++ b/src/coldsync.c @@ -4,7 +4,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: coldsync.c,v 1.137 2002-05-03 00:01:42 arensb Exp $ + * $Id: coldsync.c,v 1.138 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" #include @@ -217,10 +217,12 @@ main(int argc, char *argv[]) /* Load the configuration: in daemon mode, just load the global * configuration from /etc/coldsync.conf. In other modes, read the - * current user's ~/.coldsyncrc as well. + * current user's ~/.coldsyncrc as well. On the other hand, if the + * user has specified the config file name on the command line, they + * really want it - even in Daemon mode.. */ if (global_opts.mode == mode_Daemon) - err = load_config(False); + err = load_config(global_opts.conf_fname_given); else err = load_config(True); if (err < 0) @@ -536,7 +538,10 @@ palm_Connect( void ) listen->protocol, PCONNFL_PROMPT | (listen->flags & - LISTENFL_TRANSIENT ? LISTENFL_TRANSIENT : + LISTENFL_TRANSIENT ? PCONNFL_TRANSIENT : + 0) | + (listen->flags & + LISTENFL_MODEM ? PCONNFL_MODEM : 0) )) == NULL) diff --git a/src/coldsync.h b/src/coldsync.h index 8f657fb1..659dc92f 100644 --- a/src/coldsync.h +++ b/src/coldsync.h @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: coldsync.h,v 1.64 2002-04-17 23:18:34 azummo Exp $ + * $Id: coldsync.h,v 1.65 2002-07-04 21:03:27 azummo Exp $ */ #ifndef _coldsync_h_ #define _coldsync_h_ @@ -134,6 +134,7 @@ typedef struct listen_block * fails with ENOENT isn't an * error. */ +#define LISTENFL_MODEM 0x04 /* This device is a modem */ /* cond_header * A (name, value) pair that will be passed to a conduit. diff --git a/src/lexer.l b/src/lexer.l index 3d9da988..2b394b1f 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: lexer.l,v 2.48 2002-04-17 23:18:34 azummo Exp $ + * $Id: lexer.l,v 2.49 2002-07-04 21:03:27 azummo Exp $ */ #include #include @@ -174,6 +174,7 @@ QSTR [^\\\$\"\n] "autoinit" { KEYWORD(AUTOINIT); } "listen" { KEYWORD(LISTEN); } "options" { KEYWORD(OPTIONS); } +"modem" { KEYWORD(MODEM); } "path" { KEYWORD(PATH); } "cwd" { KEYWORD(CWD); } "pda" { KEYWORD(PDA); } diff --git a/src/palment.c b/src/palment.c index ad0f53b4..36e79783 100644 --- a/src/palment.c +++ b/src/palment.c @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: palment.c,v 2.4 2002-05-03 00:01:03 arensb Exp $ + * $Id: palment.c,v 2.5 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" @@ -230,7 +230,16 @@ find_palment(const char *p_snum, const char *p_username, const udword p_userid, if (match_type & PMATCH_SERIAL) { - if (strncasecmp(entserial, p_snum, SNUM_MAX) != 0) + /* NULL or "*" matches any entry + * but only if there's another match critera + * - ok, lots of negatives in this logic, but it works! + */ + if (( + (PMATCH_SERIAL == match_type) || ( + (entserial[0] != '\0') && + (strncasecmp(entserial, "*", SNUM_MAX) != 0) + ) + ) && (strncasecmp(entserial, p_snum, SNUM_MAX) != 0)) { SYNC_TRACE(4) fprintf(stderr, @@ -249,8 +258,11 @@ find_palment(const char *p_snum, const char *p_username, const udword p_userid, if (match_type & PMATCH_USERNAME) { + /* NULL or "*" matches any entry */ if ((palment->username != NULL) && (palment->username[0] != '\0') && + strncmp(palment->username, "*", + DLPCMD_USERNAME_LEN) != 0 && strncmp(palment->username, p_username, DLPCMD_USERNAME_LEN) != 0) { @@ -271,7 +283,15 @@ find_palment(const char *p_snum, const char *p_username, const udword p_userid, if (match_type & PMATCH_USERID) { - if (palment->userid != p_userid) + /* unfortunately, the is an unsigned int, so * and -1 + * are not options - the only choice left is zero! + * Since the documented behaviour is that root (0) + * isn't allowed to be the user, testing for zero here + * is fine. We don't use this number to SETUID anyway. + */ + + /* 0 matches any entry (in Daemon mode only) */ + if ((palment->userid != 0) && (palment->userid != p_userid)) { SYNC_TRACE(4) fprintf(stderr, diff --git a/src/parser.y b/src/parser.y index 73ed6a39..2d2667f8 100644 --- a/src/parser.y +++ b/src/parser.y @@ -6,7 +6,7 @@ * You may distribute this file under the terms of the Artistic * License, as specified in the README file. * - * $Id: parser.y,v 2.64 2002-04-17 23:18:34 azummo Exp $ + * $Id: parser.y,v 2.65 2002-07-04 21:03:27 azummo Exp $ */ #include "config.h" #include @@ -93,6 +93,7 @@ static struct sync_config *file_config; /* As the parser runs, it will fill %token SPEED %token SNUM %token TRANSIENT +%token MODEM %token TYPE %token UNSAVED @@ -336,6 +337,14 @@ listen_directive: /* Mark this device as being transient */ cur_listen->flags |= LISTENFL_TRANSIENT; } + | MODEM semicolon + { + PARSE_TRACE(4) + fprintf(stderr, "This is a modem device.\n"); + + /* Mark this device as being a modem */ + cur_listen->flags |= LISTENFL_MODEM; + } | error { Error(_("\tError near \"%s\"."),