Fixed some 64bit related stuff in psitime and plpdirent.

More work on restore in kpsion.

1 files changed, 242 insertions, 123 deletions

diff --git a/kde2/po/kpsion.pot b/kde2/po/kpsion.pot
index fcb5025..7c0bd61 100644
--- a/kde2/po/kpsion.pot
+++ b/kde2/po/kpsion.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-15 21:17+0100\n"
+"POT-Creation-Date: 2001-03-05 09:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,15 +14,37 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: kpsion.cpp:37
+#: kpsion.cpp:241
+msgid "Available backups"
+msgstr ""
+
+#: kpsion.cpp:275
+msgid "Full"
+msgstr ""
+
+#: kpsion.cpp:282
+msgid "Incremental"
+msgstr ""
+
+#: kpsion.cpp:289
+msgid "%1 backup, created at %2"
+msgstr ""
+
+#: kpsion.cpp:321
+msgid ""
+"<qt>Here, you can select the available backups. Select the items you want to "
+"restore, the click on <b>Start</b> to start restoring these items.</qt>"
+msgstr ""
+
+#: kpsion.cpp:460
 msgid "Idle"
 msgstr ""
 
-#: kpsion.cpp:62 wizards.cpp:210
+#: kpsion.cpp:499 wizards.cpp:232
 msgid "off"
 msgstr ""
 
-#: kpsion.cpp:66
+#: kpsion.cpp:503
 msgid ""
 "<qt>Here, you see your Psion's drives.<br/>Every drive is represented by an "
 "Icon. If you click on it, it gets selected for the next operation. E.g.: "
@@ -30,200 +52,287 @@ msgid ""
 "again.<br/>Select as many drives a you want, then choose an operation.</qt>"
 msgstr ""
 
-#: kpsion.cpp:101
+#: kpsion.cpp:566
 msgid "Start &Format"
 msgstr ""
 
-#: kpsion.cpp:103
+#: kpsion.cpp:568
 msgid "Start Full &Backup"
 msgstr ""
 
-#: kpsion.cpp:105
+#: kpsion.cpp:571
 msgid "Start &Incremental Backup"
 msgstr ""
 
-#: kpsion.cpp:107
+#: kpsion.cpp:573
 msgid "Start &Restore"
 msgstr ""
 
-#: kpsion.cpp:116
+#: kpsion.cpp:587
 msgid "Full backup of selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:117
+#: kpsion.cpp:589
 msgid "Incremental backup of selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:118
+#: kpsion.cpp:591
 msgid "Restore selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:119
+#: kpsion.cpp:593
 msgid "Format selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:187
+#: kpsion.cpp:664
 msgid "Retrieving machine info ..."
 msgstr ""
 
-#: kpsion.cpp:190
+#: kpsion.cpp:675
 msgid "Could not get Psion machine info"
 msgstr ""
 
-#: kpsion.cpp:202
+#: kpsion.cpp:688
 msgid "an unknown machine"
 msgstr ""
 
-#: kpsion.cpp:213
+#: kpsion.cpp:701
 msgid "Retrieving drive list ..."
 msgstr ""
 
-#: kpsion.cpp:215
+#: kpsion.cpp:704
 msgid "Could not get list of drives"
 msgstr ""
 
-#: kpsion.cpp:233
+#: kpsion.cpp:722 kpsion.cpp:913 kpsion.cpp:935 kpsion.cpp:958 kpsion.cpp:1068
+#: kpsion.cpp:1245 kpsion.cpp:1376 kpsion.cpp:1385
 #, c-format
 msgid "Connected to %1"
 msgstr ""
 
-#: kpsion.cpp:251
+#: kpsion.cpp:739
 msgid ""
 "A backup is running.\n"
 "Do you really want to quit?"
 msgstr ""
 
-#: kpsion.cpp:253
+#: kpsion.cpp:741
 msgid ""
 "A restore is running.\n"
 "Do you really want to quit?"
 msgstr ""
 
-#: kpsion.cpp:255
+#: kpsion.cpp:743
 msgid ""
 "A format is running.\n"
 "Do you really want to quit?"
 msgstr ""
 
-#: kpsion.cpp:280
+#: kpsion.cpp:769
 msgid "Connecting ..."
 msgstr ""
 
-#: kpsion.cpp:282
+#: kpsion.cpp:771
 msgid "RFSV could not connect to ncpd at %1:%2. "
 msgstr ""
 
-#: kpsion.cpp:285 kpsion.cpp:301 kpsion.cpp:319 kpsion.cpp:339
+#: kpsion.cpp:774 kpsion.cpp:791 kpsion.cpp:810 kpsion.cpp:831
 msgid " (Retry in %1 seconds.)"
 msgstr ""
 
-#: kpsion.cpp:296
+#: kpsion.cpp:786
 #, c-format
 msgid "RFSV could not establish link: %1."
 msgstr ""
 
-#: kpsion.cpp:312
+#: kpsion.cpp:803
 msgid "RPCS could not connect to ncpd at %1:%2."
 msgstr ""
 
-#: kpsion.cpp:330
+#: kpsion.cpp:822
 #, c-format
 msgid "RPCS could not establish link: %1."
 msgstr ""
 
-#: kpsion.cpp:380 kpsion.cpp:433
-msgid "Backup"
-msgstr ""
-
-#: kpsion.cpp:407
+#: kpsion.cpp:917
 #, c-format
 msgid "Could not retrieve drive details for drive %1"
 msgstr ""
 
-#: kpsion.cpp:414
+#: kpsion.cpp:922
 #, c-format
 msgid "Scanning drive %1"
 msgstr ""
 
-#: kpsion.cpp:423
+#: kpsion.cpp:931
 msgid "%1 files need backup"
 msgstr ""
 
-#: kpsion.cpp:425
+#: kpsion.cpp:937
 msgid "No files need backup"
 msgstr ""
 
-#: kpsion.cpp:446
+#: kpsion.cpp:960
 #, c-format
 msgid "Could not create backup folder %1"
 msgstr ""
 
-#: kpsion.cpp:499
-#, c-format
-msgid "Backing up %1"
+#: kpsion.cpp:984
+msgid "Backup %1% done"
 msgstr ""
 
-#: kpsion.cpp:511
+#: kpsion.cpp:1004
 msgid "<QT>Could not open<BR/><B>%1</B></QT>"
 msgstr ""
 
-#: kpsion.cpp:530
+#: kpsion.cpp:1024
 msgid "<QT>Could not read<BR/><B>%1</B></QT>"
 msgstr ""
 
-#: kpsion.cpp:551
+#: kpsion.cpp:1037
+msgid "Resetting archive attributes"
+msgstr ""
+
+#: kpsion.cpp:1050
+msgid "<QT>Could not set attributes of<BR/><B>%1</B></QT>"
+msgstr ""
+
+#: kpsion.cpp:1072
 msgid "Backup done"
 msgstr ""
 
-#: kpsion.cpp:563
+#: kpsion.cpp:1076
+msgid "Restore"
+msgstr ""
+
+#: kpsion.cpp:1080
+msgid "Start"
+msgstr ""
+
+#: kpsion.cpp:1083
 msgid ""
-"<QT>This erases <B>ALL</B> data on the drive(s).<BR/>Do you really want to "
-"proceed?"
+"Select items in the list of available backups, then click here to start "
+"restore of these items."
+msgstr ""
+
+#: kpsion.cpp:1130 kpsion.cpp:1343
+msgid "<QT>Could not get attributes of<BR/><B>%1</B><BR/>Reason: %2</QT>"
+msgstr ""
+
+#: kpsion.cpp:1159
+msgid "Overwrite"
+msgstr ""
+
+#: kpsion.cpp:1162
+msgid "Overwrite &All"
+msgstr ""
+
+#: kpsion.cpp:1175
+msgid ""
+"<QT>The file <B>%1</B> exists already on the Psion with different size "
+"and/or attributes.<P><B>On the Psion:</B><BR/>  Size: %2<BR/>  Date: %3<BR/> "
+" Attributes: %4</P><P><B>In backup:</B><BR/>  Size: %5<BR/>  Date: %6<BR/>  "
+"Attributes: %7</P>Do you want to overwrite it?</QT>"
+msgstr ""
+
+#: kpsion.cpp:1213
+msgid "Reading backups ..."
 msgstr ""
 
-#: kpsion.cpp:611
-msgid "Backup %1% complete"
+#: kpsion.cpp:1218
+msgid "Selecting backups ..."
 msgstr ""
 
-#: kpsion.cpp:676
+#: kpsion.cpp:1250
+msgid "Restore %1% done"
+msgstr ""
+
+#: kpsion.cpp:1298
+msgid "<QT>Could not create directory<BR/><B>%1</B><BR/>Reason: %2</QT>"
+msgstr ""
+
+#: kpsion.cpp:1313
+msgid "<QT>Could not create<BR/><B>%1</B><BR/>Reason: %2</QT>"
+msgstr ""
+
+#: kpsion.cpp:1335
+msgid "<QT>Could not write to<BR/><B>%1</B><BR/>Reason: %2</QT>"
+msgstr ""
+
+#: kpsion.cpp:1353
+msgid "<QT>Could not set attributes of<BR/><B>%1</B><BR/>Reason: %2</QT>"
+msgstr ""
+
+#: kpsion.cpp:1360
+msgid ""
+"<QT>Could not set modification time of<BR/><B>%1</B><BR/>Reason: %2</QT>"
+msgstr ""
+
+#: kpsion.cpp:1387
+msgid "Restore done"
+msgstr ""
+
+#: kpsion.cpp:1393
+msgid ""
+"<QT>This erases <B>ALL</B> data on the drive(s).<BR/>Do you really want to "
+"proceed?"
+msgstr ""
+
+#: kpsion.cpp:1510
 #, c-format
 msgid "Stopping %1"
 msgstr ""
 
-#: kpsion.cpp:697
+#: kpsion.cpp:1532
 #, c-format
 msgid "Starting %1"
 msgstr ""
 
-#: kpsion.moc.cpp:43 kpsion.moc.cpp:48
+#: kpsion.moc.cpp:42 kpsion.moc.cpp:47
+msgid "KPsionCheckListItem"
+msgstr ""
+
+#: kpsion.moc.cpp:109 kpsion.moc.cpp:114
+msgid "KPsionBackupListView"
+msgstr ""
+
+#: kpsion.moc.cpp:184 kpsion.moc.cpp:189
+msgid "KPsionRestoreDialog"
+msgstr ""
+
+#: kpsion.moc.cpp:246 kpsion.moc.cpp:251
 msgid "KPsionMainWindow"
 msgstr ""
 
-#: main.cpp:15
+#: main.cpp:48
+msgid "perform scheduled backup"
+msgstr ""
+
+#: main.cpp:50
 msgid "perform backup"
 msgstr ""
 
-#: main.cpp:17
+#: main.cpp:52
 msgid "perform restore"
 msgstr ""
 
-#: main.cpp:19
+#: main.cpp:54
 msgid "format drive"
 msgstr ""
 
-#: main.cpp:20
+#: main.cpp:55
 msgid "The drive letter to backup/restore or format."
 msgstr ""
 
-#: main.cpp:25
+#: main.cpp:60
 msgid "KPsion"
 msgstr ""
 
-#: main.cpp:26
+#: main.cpp:61
 msgid "Psion connectivity utility"
 msgstr ""
 
-#: main.cpp:31
+#: main.cpp:66
 msgid "Original Developer/Maintainer"
 msgstr ""
 
@@ -235,11 +344,11 @@ msgstr ""
 msgid "Backup &directory"
 msgstr ""
 
-#: setupdialog.cpp:30 wizards.cpp:87
+#: setupdialog.cpp:30 wizards.cpp:109
 msgid "Browse"
 msgstr ""
 
-#: setupdialog.cpp:33 wizards.cpp:160
+#: setupdialog.cpp:33 wizards.cpp:182
 msgid "Backup &generations"
 msgstr ""
 
@@ -255,25 +364,35 @@ msgstr ""
 msgid "Machine &UID"
 msgstr ""
 
-#: wizards.cpp:26
+#: statusbarprogress.cpp:357 statusbarprogress.cpp:370
+#: statusbarprogress.cpp:379 statusbarprogress.cpp:392
+#: statusbarprogress.cpp:401 statusbarprogress.cpp:412
+msgid "%1 %2 of %3"
+msgstr ""
+
+#: statusbarprogress.moc.cpp:42 statusbarprogress.moc.cpp:47
+msgid "KPsionStatusBarProgress"
+msgstr ""
+
+#: wizards.cpp:48
 msgid "KPsion Setup"
 msgstr ""
 
-#: wizards.cpp:28 wizards.cpp:411
+#: wizards.cpp:50 wizards.cpp:433
 msgid "Click this button to continue with the next page."
 msgstr ""
 
-#: wizards.cpp:30 wizards.cpp:413
+#: wizards.cpp:52 wizards.cpp:435
 msgid "Click this button, to go to a previous page."
 msgstr ""
 
-#: wizards.cpp:32
+#: wizards.cpp:54
 msgid ""
 "<QT>If you click this button, the setup of <B>KPSion</B> will be aborted and "
 "next time you start <B>KPsion</B>, it will run this setup again.</QT>"
 msgstr ""
 
-#: wizards.cpp:49
+#: wizards.cpp:71
 msgid ""
 "<QT><H2>Welcome to KPsion!</H2>It looks like you started <B>KPsion</B> the "
 "first time. At least, i could not find any valid configuration.</BR>On the "
@@ -281,11 +400,11 @@ msgid ""
 "working with <B>KPsion</B>.</BR> </BR>Have fun.</QT>"
 msgstr ""
 
-#: wizards.cpp:66
+#: wizards.cpp:88
 msgid "<QT><BIG><B>Welcome<B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:74
+#: wizards.cpp:96
 msgid ""
 "<QT>First, we need a folder for storing backups of your Psion. You probably "
 "don't want others to have access to it, so it's best to choose a location "
@@ -293,21 +412,21 @@ msgid ""
 "select a suitable location or simply accept the default shown below.</QT>"
 msgstr ""
 
-#: wizards.cpp:90
+#: wizards.cpp:112
 msgid "This is the name of the backup folder."
 msgstr ""
 
-#: wizards.cpp:92
+#: wizards.cpp:114
 msgid ""
 "Click here, for opening a dialog which lets you easily select the backup "
 "folder."
 msgstr ""
 
-#: wizards.cpp:107
+#: wizards.cpp:129
 msgid "<QT><BIG><B>Step 1</B></BIG> - Specify backup directory</QT>"
 msgstr ""
 
-#: wizards.cpp:114
+#: wizards.cpp:136
 msgid ""
 "<QT>Next, please specify some information regarding backup "
 "policy:<UL><LI>How many generations of backups do you want to "
@@ -315,63 +434,63 @@ msgid ""
 "intervals do you want to happen backups?</LI></UL></QT>"
 msgstr ""
 
-#: wizards.cpp:124
+#: wizards.cpp:146
 msgid "&Incremental backup reminder"
 msgstr ""
 
-#: wizards.cpp:127 wizards.cpp:145
+#: wizards.cpp:149 wizards.cpp:167
 msgid "none"
 msgstr ""
 
-#: wizards.cpp:128 wizards.cpp:146
+#: wizards.cpp:150 wizards.cpp:168
 msgid "daily"
 msgstr ""
 
-#: wizards.cpp:129 wizards.cpp:147
+#: wizards.cpp:151 wizards.cpp:169
 msgid "every 2 days"
 msgstr ""
 
-#: wizards.cpp:130 wizards.cpp:148
+#: wizards.cpp:152 wizards.cpp:170
 msgid "every 3 days"
 msgstr ""
 
-#: wizards.cpp:131 wizards.cpp:149
+#: wizards.cpp:153 wizards.cpp:171
 msgid "every 4 days"
 msgstr ""
 
-#: wizards.cpp:132 wizards.cpp:150
+#: wizards.cpp:154 wizards.cpp:172
 msgid "every 5 days"
 msgstr ""
 
-#: wizards.cpp:133 wizards.cpp:151
+#: wizards.cpp:155 wizards.cpp:173
 msgid "every 6 days"
 msgstr ""
 
-#: wizards.cpp:134 wizards.cpp:152
+#: wizards.cpp:156 wizards.cpp:174
 msgid "weekly"
 msgstr ""
 
-#: wizards.cpp:135 wizards.cpp:153
+#: wizards.cpp:157 wizards.cpp:175
 msgid "every 2 weeks"
 msgstr ""
 
-#: wizards.cpp:136 wizards.cpp:154
+#: wizards.cpp:158 wizards.cpp:176
 msgid "every 3 weeks"
 msgstr ""
 
-#: wizards.cpp:137 wizards.cpp:155
+#: wizards.cpp:159 wizards.cpp:177
 msgid "monthly"
 msgstr ""
 
-#: wizards.cpp:142
+#: wizards.cpp:164
 msgid "&Full backup reminder"
 msgstr ""
 
-#: wizards.cpp:178
+#: wizards.cpp:200
 msgid "<QT><BIG><B>Step 2</B></BIG> - Backup policy</QT>"
 msgstr ""
 
-#: wizards.cpp:186
+#: wizards.cpp:208
 msgid ""
 "<QT>If no connection could be established on startup, <B>KPsion</B> will "
 "attempt to connect in regular intervals. Please specify the interval after "
@@ -382,55 +501,55 @@ msgid ""
 "rate</LI><LI>have permission to use the specified port</LI></UL></QT>"
 msgstr ""
 
-#: wizards.cpp:201
+#: wizards.cpp:223
 msgid "&Connection retry interval (sec.)"
 msgstr ""
 
-#: wizards.cpp:207
+#: wizards.cpp:229
 msgid "Serial &device"
 msgstr ""
 
-#: wizards.cpp:211
+#: wizards.cpp:233
 msgid "/dev/ttyS0"
 msgstr ""
 
-#: wizards.cpp:212
+#: wizards.cpp:234
 msgid "/dev/ttyS1"
 msgstr ""
 
-#: wizards.cpp:213
+#: wizards.cpp:235
 msgid "/dev/ttyS2"
 msgstr ""
 
-#: wizards.cpp:214
+#: wizards.cpp:236
 msgid "/dev/ttyS3"
 msgstr ""
 
-#: wizards.cpp:215
+#: wizards.cpp:237
 msgid "/dev/ircomm0"
 msgstr ""
 
-#: wizards.cpp:216
+#: wizards.cpp:238
 msgid "/dev/ircomm1"
 msgstr ""
 
-#: wizards.cpp:217
+#: wizards.cpp:239
 msgid "/dev/ircomm2"
 msgstr ""
 
-#: wizards.cpp:218
+#: wizards.cpp:240
 msgid "/dev/ircomm3"
 msgstr ""
 
-#: wizards.cpp:223
+#: wizards.cpp:245
 msgid "Serial &speed"
 msgstr ""
 
-#: wizards.cpp:247
+#: wizards.cpp:269
 msgid "<QT><BIG><B>Step 3</B></BIG> - Connection parameters</QT>"
 msgstr ""
 
-#: wizards.cpp:255
+#: wizards.cpp:277
 msgid ""
 "<QT>That's it!<BR/>Next, i will start <B>KPsion</B> and if your Psion is "
 "already connected and it's communication turned on (use <B>Ctrl-T</B> at "
@@ -439,121 +558,121 @@ msgid ""
 "Backup.<BR/>Please click <B>Finish</B> now.</QT>"
 msgstr ""
 
-#: wizards.cpp:274
+#: wizards.cpp:296
 msgid "<QT><BIG><B>Finished</B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:282
+#: wizards.cpp:304
 msgid "Backup folder"
 msgstr ""
 
-#: wizards.cpp:292
+#: wizards.cpp:314
 msgid ""
 "<QT>You are about to abort the initial setup of <B>KPsion</B>. No "
 "configuration will be stored and you will have to repeat this procedure when "
 "you start <B>KPsion</B> next time.<BR/>Do you really want to exit now?</QT>"
 msgstr ""
 
-#: wizards.cpp:347
+#: wizards.cpp:369
 msgid ""
 "<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Shall it be created?</QT>"
 msgstr ""
 
-#: wizards.cpp:352
+#: wizards.cpp:374
 msgid "<QT>The specified folder<BR/><B>%1</B><BR/>could <B>not</B> be created"
 msgstr ""
 
-#: wizards.cpp:357
+#: wizards.cpp:379
 msgid ""
 ", because you either don't have sufficient rights to do that, or the "
 "filesystem is readonly."
 msgstr ""
 
-#: wizards.cpp:361
+#: wizards.cpp:383
 msgid ", because the filesystem has not enough space."
 msgstr ""
 
-#: wizards.cpp:367
+#: wizards.cpp:389
 msgid ", because there already exists another object with the same name."
 msgstr ""
 
-#: wizards.cpp:377
+#: wizards.cpp:399
 msgid ""
 ", because you specified a path which probably contains a dangling symbolic "
 "link."
 msgstr ""
 
-#: wizards.cpp:380
+#: wizards.cpp:402
 msgid ""
 ", because you specified a path which contains an element which is not a "
 "folder."
 msgstr ""
 
-#: wizards.cpp:384
+#: wizards.cpp:406
 msgid ", because you specified a path which contains too many symbolic links."
 msgstr ""
 
-#: wizards.cpp:391
+#: wizards.cpp:413
 msgid "<BR/>Please select another folder.</QT>"
 msgstr ""
 
-#: wizards.cpp:407
+#: wizards.cpp:429
 msgid "New Psion detected"
 msgstr ""
 
-#: wizards.cpp:415
+#: wizards.cpp:437
 msgid ""
 "<QT>If you click this button, the setup for the new connected Psion will be "
 "aborted and next time you connect this Psion again, <B>KPsion</B> will run "
 "this setup again.</QT>"
 msgstr ""
 
-#: wizards.cpp:424
+#: wizards.cpp:446
 msgid ""
 "<QT>The Psion with the unique ID <B>%1</B> is connected the first time. "
 "Please assign a name to it.</QT>"
 msgstr ""
 
-#: wizards.cpp:431
+#: wizards.cpp:453
 msgid "&Name of new Psion"
 msgstr ""
 
-#: wizards.cpp:433
+#: wizards.cpp:455
 msgid "My new Psion"
 msgstr ""
 
-#: wizards.cpp:450
+#: wizards.cpp:472
 msgid "<QT><BIG><B>New Psion detected<B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:458
+#: wizards.cpp:480
 msgid ""
 "<QT>Please select the Drive(s), you want to be backed up when running in "
 "unattended backup mode.</QT>"
 msgstr ""
 
-#: wizards.cpp:466
+#: wizards.cpp:488
 msgid "Available drives"
 msgstr ""
 
-#: wizards.cpp:490
+#: wizards.cpp:512
 msgid "<QT><BIG><B>Specify drives to backup<B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:514
+#: wizards.cpp:536
 msgid "The name cannot be empty."
 msgstr ""
 
-#: wizards.cpp:521
+#: wizards.cpp:543
 msgid ""
 "<QT>The name <B>%1</B> is already assigned to another machine.<BR/>Please "
 "choose a different name.</QT>"
 msgstr ""
 
-#: wizards.moc.cpp:43 wizards.moc.cpp:48
+#: wizards.moc.cpp:42 wizards.moc.cpp:47
 msgid "FirstTimeWizard"
 msgstr ""
 
-#: wizards.moc.cpp:112 wizards.moc.cpp:117
+#: wizards.moc.cpp:111 wizards.moc.cpp:116
 msgid "NewPsionWizard"
 msgstr ""