[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-55-g3851e7c
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Sun Apr 5 22:17:04 UTC 2009
The following commit has been merged in the master branch:
commit 83e8af08d8eb64a278ad51bff37b112a86039a3e
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date: Mon Apr 6 00:35:53 2009 +0300
Regenerate translation templates and add Q_OBJECT macro to MigrationTool (lupdate complains about that).
diff --git a/kaboom_ca.ts b/kaboom_ca.ts
index 1ae2723..0d4acdf 100644
--- a/kaboom_ca.ts
+++ b/kaboom_ca.ts
@@ -1,99 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="ca">
+<!DOCTYPE TS>
+<TS version="2.0" language="ca">
<context>
<name>ChoicePage</name>
<message>
- <location filename="choicepage.cpp" line="40"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Eïna de migració</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="44"/>
<source>Please select your settings migration option</source>
<translation type="obsolete">Per favor seleccione les seves opcions de configuració </translation>
</message>
<message>
- <location filename="choicepage.cpp" line="49"/>
<source>Migrate settings from KDE3 to KDE4 (standard)</source>
<translation type="obsolete">Mirgrar configuració de KDE3 a KDE4 (estándar)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="56"/>
<source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
<translation type="obsolete">Usar la configuraciò de KDE4 i <b>sobreescriure</b> la de KDE3</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="61"/>
<source>Merge settings from KDE3 and KDE4 (experimental)</source>
<translation type="obsolete">Combinar la configuració de KDE3 i KDE4 (experimental)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="70"/>
<source>Start with default KDE settings and data. This option will <b>remove</b> all data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data</source>
<translation type="obsolete">Començar amb la configuració i dades per defecte de KDE. Esta opció <b>eliminarà</b> tota la informaciò i configuraciò, com ara els contactes, correus guardats, conters de KMail i Kopete, marcadors i altra informaciò semblant</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="73"/>
<source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
<translation type="obsolete">Fer una copia de seguretat de KDE3 a la carpeta .kde3-backup. (Altament recomanat)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="92"/>
<source>Insufficient free space to complete a backup, please consider freeing up some space. You can go to TTY1 to do this.</source>
<translation type="obsolete">Insuficient espai lliure per a completar una copia de seguretat. Per favor, lliure una mica d'espai. Pot anar a la TTY1 per a fer-ho.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="96"/>
<source>The current KDE settings and data directory takes up %1 bytes</source>
<translation type="obsolete">La configuraciò actual i la carpeta de dades de KDE ocupen %1 bytes</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="112"/>
<source>Recheck</source>
<translation type="obsolete">Comprovar de nou</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="53"/>
+ <location filename="choicepage.cpp" line="54"/>
<source>Setting migration options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="59"/>
+ <location filename="choicepage.cpp" line="60"/>
<source>Current configuration:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="64"/>
- <source>%1%2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="choicepage.cpp" line="65"/>
+ <location filename="choicepage.cpp" line="66"/>
<source><strong>KDE&nbsp;3</strong> settings and data are at <u>%1</u><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="67"/>
+ <location filename="choicepage.cpp" line="68"/>
<source><strong>KDE&nbsp;4</strong> settings and data are at <u>%1</u><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="76"/>
+ <location filename="choicepage.cpp" line="74"/>
<source>Once you finish with this wizard, <strong>KDE&nbsp;4</strong> will use <u>%1</u> to store user settings and data. Optionally, <strong>KDE&nbsp;3</strong> settings and data may be backed up to <u>%2</u>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="81"/>
+ <location filename="choicepage.cpp" line="82"/>
<source>Please choose one of the following migration scenarios:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="94"/>
+ <location filename="choicepage.cpp" line="95"/>
<source>Use current KDE&nbsp;3 settings as initial for KDE&nbsp;4. (<i>standard</i>)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="100"/>
+ <location filename="choicepage.cpp" line="96"/>
<source><p>The wizard will not make any changes to your current KDE&nbsp;3 settings directory. It may only optionally back this directory up if the appropriate option below is enabled. This scenario is recommended for users who have not actively used KDE&nbsp;4 or any of its applications (e.g. Okular or KTorrent which were released with Lenny) on this system previously and wish the new KDE&nbsp;4 desktop and its applications to use as much settings from the old KDE&nbsp;3 counterparts as possible.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -103,52 +89,52 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="110"/>
+ <location filename="choicepage.cpp" line="111"/>
<source> and <strong>replace</strong> current KDE&nbsp;3 settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="118"/>
- <source><p>The wizard will remove current KDE&nbsp;3 settings directory and move current KDE&nbsp;4 settings directory into its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <location filename="choicepage.cpp" line="113"/>
+ <source><p>The wizard will remove current KDE&nbsp;3 settings directory and copy current KDE&nbsp;4 settings directory to its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="choicepage.cpp" line="149"/>
+ <source>The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="121"/>
+ <location filename="choicepage.cpp" line="120"/>
<source><p>The wizard will rename your current old KDE&nbsp;4 settings directory. Select this option if you would like to keep all KDE 4 settings and continue using KDE 4 desktop as before.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="128"/>
+ <location filename="choicepage.cpp" line="129"/>
<source>Merge current KDE&nbsp;4 settings with current KDE&nbsp;3 settings. (<i>experimental</i>)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="136"/>
+ <location filename="choicepage.cpp" line="130"/>
<source><p>The wizard will copy contents of the current KDE&nbsp;4 settings directory on top of the current KDE&nbsp;3 settings directory giving preference to the KDE&nbsp;4 configuration files in case of filename collisions. In theory, this should let you preserve settings of both KDE&nbsp;4 and a few KDE&nbsp;3 applications you still use. The downside is that this migration path is not well tested and the resulting KDE&nbsp;4 settings directory might get polluted with useless configuration and data files which KDE&nbsp;4 ports no longer use. Use this scenario at your own risk.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="143"/>
+ <location filename="choicepage.cpp" line="144"/>
<source>Start with default KDE settings and data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="147"/>
+ <location filename="choicepage.cpp" line="145"/>
<source><p>%1The wizard will not touch KDE&nbsp;4 settings directory if it exists. Choose this scenario if you would like to start with default KDE&nbsp;4 desktop and/or want to do migration of old KDE settings manually (from backup).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="150"/>
- <source><p>The wizard will <strong>remove</strong> (or move to backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="choicepage.cpp" line="155"/>
+ <location filename="choicepage.cpp" line="156"/>
<source>Backup existing KDE 3 settings (highly recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="185"/>
+ <location filename="choicepage.cpp" line="186"/>
<source>Check again</source>
<translation type="unfinished"></translation>
</message>
@@ -158,22 +144,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="195"/>
+ <location filename="choicepage.cpp" line="196"/>
<source>To free up some disk case, cancel the wizard now or switch to the Linux virtual terminal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="267"/>
+ <location filename="choicepage.cpp" line="269"/>
<source><p><i>The current KDE&nbsp;3 settings and data directory takes up %1</i></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="269"/>
+ <location filename="choicepage.cpp" line="272"/>
<source>%1% of disk space currently used</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="274"/>
+ <location filename="choicepage.cpp" line="277"/>
<source>Backup needs <strong>%1</strong> of free disk space</source>
<translation type="unfinished"></translation>
</message>
@@ -181,22 +167,22 @@
<context>
<name>DirOperations</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="49"/>
+ <location filename="diroperations/diroperations.cpp" line="32"/>
<source>%L1 GiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="52"/>
+ <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%L1 MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="55"/>
+ <location filename="diroperations/diroperations.cpp" line="38"/>
<source>%L1 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="58"/>
+ <location filename="diroperations/diroperations.cpp" line="41"/>
<source>%L1 bytes</source>
<translation type="unfinished"></translation>
</message>
@@ -204,55 +190,21 @@
<context>
<name>DirOperations::Exception</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>User canceled the operation</source>
- <translation type="unfinished">El usuari cancelà la operaciò</translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
- <source>Access was denied to the file or directory "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
- <source>"%1": No such file or directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
- <source>"%1" already exists</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
- <source>Could not copy "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
- <source>Could not create directory "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
- <source>Could not remove "%1"</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">El usuari cancelà la operaciò</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="41"/>
<source>Unknown error</source>
- <translation type="unfinished">Error desconegut</translation>
+ <translation type="obsolete">Error desconegut</translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
- <location filename="intropage.cpp" line="21"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Eïna de migraciò</translation>
</message>
<message>
- <location filename="intropage.cpp" line="22"/>
<source>This wizard will guide you through the process of migrating your KDE settings as required</source>
<translation type="obsolete">Aquest asistent el guiarà a través del procés de migrar la seva configuraciò de KDE</translation>
</message>
@@ -262,7 +214,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="intropage.cpp" line="49"/>
+ <location filename="intropage.cpp" line="23"/>
<source><p align='justify'>This version of KDE&nbsp;4 in Debian uses <u>%1</u> directory (where ~ refers to the path of your Home directory) to store user settings and data. The wizard has detected that you have recently upgraded to this version of KDE&nbsp;4 from KDE&nbsp;3 and/or previous Debian KDE&nbsp;4 release that used <u>%2</u> directory to store user settings.</p><p align='justify'>This wizard will guide you through the process of backing up, copying, moving or merging your user settings and data which were created by the old KDE installation. Please note, however, that it does not migrate configuration files directly. It operates on the filesystem level and sets up <u>%1</u> directory the way you request in the next step.</p><p align='justify'>Once you finish with this wizard, migration of the configuration files will be performed by KDE&nbsp;4 applications themselves as necessary. Therefore, if you are upgrading from KDE&nbsp;3, it is <strong>highly recommended</strong> to enable backing up of your old settings and data in the next step to avoid data loss in hopefully rare cases when some KDE&nbsp;4 applications fail to migrate your important user settings and/or data properly.</p><p align='justify'>If you need to make manual adjustments, you can cancel the wizard. KDE will not start and the current session will be terminated. You will see this wizard when you try to start KDE session again.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -270,32 +222,30 @@
<context>
<name>MigrationPage</name>
<message>
- <location filename="migrationpage.cpp" line="103"/>
<source>When you click "Start", settings migration will start</source>
<translation type="obsolete">Quan clique "Iniciar", començará la migració de la configuració </translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="106"/>
<source>Start Migration</source>
<translation type="obsolete">Iniciar Migraciò</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="192"/>
+ <location filename="migrationpage.cpp" line="228"/>
<source>Click "Finish" to exit the wizard and start loading KDE 4.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="238"/>
+ <location filename="migrationpage.cpp" line="264"/>
<source><strong>Selected scenario:</strong> %1<br/><strong>Backup:</strong> %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -303,63 +253,71 @@
<context>
<name>MigrationPagePrivate</name>
<message>
- <location filename="migrationpage.cpp" line="38"/>
+ <location filename="migrationpage.cpp" line="39"/>
<source>Start</source>
<translation>Iniciar</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="32"/>
<source>Errors occurred</source>
<translation type="obsolete">Errors en el procés</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="42"/>
<source>Migration running</source>
<translation type="obsolete">Migraciò en marxa</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="39"/>
+ <location filename="migrationpage.cpp" line="40"/>
<source>Start migration process</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="52"/>
- <source>WARNING: depending on the severity of the errors above, it might not be safe to go back and you may need to resolve problems manually!</source>
+ <location filename="migrationpage.cpp" line="51"/>
+ <source>WARNING: if you go back, migration process will restarted over current state.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="57"/>
+ <location filename="migrationpage.cpp" line="56"/>
<source>The following error(s) occurred during migration process:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="84"/>
+ <location filename="migrationpage.cpp" line="83"/>
<source>Ready to start migration process</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="85"/>
+ <location filename="migrationpage.cpp" line="84"/>
<source>Please click "Start" button to proceed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="88"/>
+ <location filename="migrationpage.cpp" line="89"/>
<source>Migration - nothing to do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="89"/>
+ <location filename="migrationpage.cpp" line="90"/>
<source>According to the migration options you selected, nothing needs to be done.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="111"/>
+ <location filename="migrationpage.cpp" line="106"/>
<source>Migration is in progress...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="166"/>
- <source>Completed successfully.</source>
+ <location filename="migrationpage.cpp" line="113"/>
+ <source>Migration finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="116"/>
+ <source>Settings migration completed with errors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="120"/>
+ <source>Settings migration completed successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -399,75 +357,102 @@
<context>
<name>QObject</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="33"/>
<source>User canceled the operation</source>
<translation type="obsolete">El usuari cancelà la operaciò</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>Access was denied to the file or directory %1</source>
<translation type="obsolete">El acces fou denegat per al fitxer o directori %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%1: No such file or directory</source>
<translation type="obsolete">%1: Fitxer o directori </translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
<source>%1 already exists</source>
<translation type="obsolete">%1 ja existeix</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
<source>Could not copy %1</source>
<translation type="obsolete">No es pot copiar %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
<source>Could not create directory %1</source>
<translation type="obsolete">No es pot crear el directori %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
<source>Could not remove %1</source>
<translation type="obsolete">No es pot eliminar %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
<source>Unknown error</source>
<translation type="obsolete">Error desconegut</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="109"/>
<source>Calculating... %1 bytes</source>
<translation type="obsolete">Calculant... %1 bytes</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="153"/>
<source>Copying files...</source>
<translation type="obsolete">Copiant fitxers...</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="260"/>
<source>Removing files...</source>
<translation type="obsolete">Borrant fitxers...</translation>
</message>
</context>
<context>
+ <name>RecursiveDirJob::Error</name>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="40"/>
+ <source>Access was denied to the file or directory "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="41"/>
+ <source>"%1": No such file or directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="42"/>
+ <source>"%1" already exists</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="43"/>
+ <source>Could not copy "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="44"/>
+ <source>Could not create directory "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="45"/>
+ <source>Could not remove "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="46"/>
+ <source>Unknown error</source>
+ <translation type="unfinished">Error desconegut</translation>
+ </message>
+</context>
+<context>
<name>RecursiveDirJobHelper</name>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="172"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="213"/>
<source>Calculating the size of "%1"... %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="212"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="259"/>
<source>Copying files from "%1" to "%2"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="312"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="371"/>
<source>Removing directory "%1"...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/kaboom_da.ts b/kaboom_da.ts
index a081751..762f91b 100644
--- a/kaboom_da.ts
+++ b/kaboom_da.ts
@@ -1,109 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="da">
+<!DOCTYPE TS>
+<TS version="2.0" language="da">
<context>
<name>ChoicePage</name>
<message>
- <location filename="" line="0"/>
<source>Kaboom - MigrationTool</source>
<translation type="obsolete">Kaboom - Migreringsværktøj</translation>
</message>
<message>
- <location filename="" line="0"/>
<source>Please select your settings migratation option</source>
<translation type="obsolete">Vælg migreringsmuligheder</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="49"/>
<source>Migrate settings from KDE3 to KDE4 (standard)</source>
<translation type="obsolete">Migrér indstillinger fra KDE 3 til KDE 4 (standard)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="56"/>
<source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
<translation type="obsolete">Brug eksisterende KDE 4-indstillinger og <b>erstat</b> KDE 3-indstillinger</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="61"/>
<source>Merge settings from KDE3 and KDE4 (experimental)</source>
<translation type="obsolete">Flet indstillinger fra KDE3 og KDE4 (experimentel)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="70"/>
<source>Start with default KDE settings and data. This option will <b>remove</b> all data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data</source>
<translation type="obsolete">Start med standard KDE-indstillinger og -data. Dette valg vil <b>fjerne</b> al data og alle indstillinger såsom kontakter, lokalt gemte e-mails, konti i KMail og Kopete, bogmærker og anden sådan data</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="73"/>
<source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
<translation type="obsolete">Tag sikkerhedskopi af eksisterende indstillinger fra KDE 3 til .kde3-backup. (Kraftigt anbefalet)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="92"/>
<source>Insufficient free space to complete a backup, please consider freeing up some space. You can go to TTY1 to do this.</source>
<translation type="obsolete">Utilstrækkelig ledig plads til at fuldføre en sikkerhedskopi, overvej gerne at frigøre mere plads. Du kan gå til TTY1 for at gøre dette.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="96"/>
<source>The current KDE settings and data directory takes up %1 bytes</source>
<translation type="obsolete">Nuværende KDE indstillings- og datamappe fylder %1 bytes</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="112"/>
<source>Recheck</source>
<translation type="obsolete">Gentjek</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="40"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Migreringsværktøj</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="44"/>
<source>Please select your settings migration option</source>
<translation type="obsolete">Vælg migreringsmuligheder</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="53"/>
+ <location filename="choicepage.cpp" line="54"/>
<source>Setting migration options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="59"/>
+ <location filename="choicepage.cpp" line="60"/>
<source>Current configuration:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="64"/>
- <source>%1%2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="choicepage.cpp" line="65"/>
+ <location filename="choicepage.cpp" line="66"/>
<source><strong>KDE&nbsp;3</strong> settings and data are at <u>%1</u><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="67"/>
+ <location filename="choicepage.cpp" line="68"/>
<source><strong>KDE&nbsp;4</strong> settings and data are at <u>%1</u><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="76"/>
+ <location filename="choicepage.cpp" line="74"/>
<source>Once you finish with this wizard, <strong>KDE&nbsp;4</strong> will use <u>%1</u> to store user settings and data. Optionally, <strong>KDE&nbsp;3</strong> settings and data may be backed up to <u>%2</u>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="81"/>
+ <location filename="choicepage.cpp" line="82"/>
<source>Please choose one of the following migration scenarios:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="94"/>
+ <location filename="choicepage.cpp" line="95"/>
<source>Use current KDE&nbsp;3 settings as initial for KDE&nbsp;4. (<i>standard</i>)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="100"/>
+ <location filename="choicepage.cpp" line="96"/>
<source><p>The wizard will not make any changes to your current KDE&nbsp;3 settings directory. It may only optionally back this directory up if the appropriate option below is enabled. This scenario is recommended for users who have not actively used KDE&nbsp;4 or any of its applications (e.g. Okular or KTorrent which were released with Lenny) on this system previously and wish the new KDE&nbsp;4 desktop and its applications to use as much settings from the old KDE&nbsp;3 counterparts as possible.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -113,52 +97,52 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="110"/>
+ <location filename="choicepage.cpp" line="111"/>
<source> and <strong>replace</strong> current KDE&nbsp;3 settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="118"/>
- <source><p>The wizard will remove current KDE&nbsp;3 settings directory and move current KDE&nbsp;4 settings directory into its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <location filename="choicepage.cpp" line="113"/>
+ <source><p>The wizard will remove current KDE&nbsp;3 settings directory and copy current KDE&nbsp;4 settings directory to its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="choicepage.cpp" line="149"/>
+ <source>The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="121"/>
+ <location filename="choicepage.cpp" line="120"/>
<source><p>The wizard will rename your current old KDE&nbsp;4 settings directory. Select this option if you would like to keep all KDE 4 settings and continue using KDE 4 desktop as before.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="128"/>
+ <location filename="choicepage.cpp" line="129"/>
<source>Merge current KDE&nbsp;4 settings with current KDE&nbsp;3 settings. (<i>experimental</i>)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="136"/>
+ <location filename="choicepage.cpp" line="130"/>
<source><p>The wizard will copy contents of the current KDE&nbsp;4 settings directory on top of the current KDE&nbsp;3 settings directory giving preference to the KDE&nbsp;4 configuration files in case of filename collisions. In theory, this should let you preserve settings of both KDE&nbsp;4 and a few KDE&nbsp;3 applications you still use. The downside is that this migration path is not well tested and the resulting KDE&nbsp;4 settings directory might get polluted with useless configuration and data files which KDE&nbsp;4 ports no longer use. Use this scenario at your own risk.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="143"/>
+ <location filename="choicepage.cpp" line="144"/>
<source>Start with default KDE settings and data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="147"/>
+ <location filename="choicepage.cpp" line="145"/>
<source><p>%1The wizard will not touch KDE&nbsp;4 settings directory if it exists. Choose this scenario if you would like to start with default KDE&nbsp;4 desktop and/or want to do migration of old KDE settings manually (from backup).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="150"/>
- <source><p>The wizard will <strong>remove</strong> (or move to backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="choicepage.cpp" line="155"/>
+ <location filename="choicepage.cpp" line="156"/>
<source>Backup existing KDE 3 settings (highly recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="185"/>
+ <location filename="choicepage.cpp" line="186"/>
<source>Check again</source>
<translation type="unfinished"></translation>
</message>
@@ -168,22 +152,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="195"/>
+ <location filename="choicepage.cpp" line="196"/>
<source>To free up some disk case, cancel the wizard now or switch to the Linux virtual terminal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="267"/>
+ <location filename="choicepage.cpp" line="269"/>
<source><p><i>The current KDE&nbsp;3 settings and data directory takes up %1</i></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="269"/>
+ <location filename="choicepage.cpp" line="272"/>
<source>%1% of disk space currently used</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="274"/>
+ <location filename="choicepage.cpp" line="277"/>
<source>Backup needs <strong>%1</strong> of free disk space</source>
<translation type="unfinished"></translation>
</message>
@@ -191,22 +175,22 @@
<context>
<name>DirOperations</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="49"/>
+ <location filename="diroperations/diroperations.cpp" line="32"/>
<source>%L1 GiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="52"/>
+ <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%L1 MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="55"/>
+ <location filename="diroperations/diroperations.cpp" line="38"/>
<source>%L1 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="58"/>
+ <location filename="diroperations/diroperations.cpp" line="41"/>
<source>%L1 bytes</source>
<translation type="unfinished"></translation>
</message>
@@ -214,60 +198,25 @@
<context>
<name>DirOperations::Exception</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>User canceled the operation</source>
- <translation type="unfinished">Brugeren afbrød handlingen</translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
- <source>Access was denied to the file or directory "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
- <source>"%1": No such file or directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
- <source>"%1" already exists</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
- <source>Could not copy "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
- <source>Could not create directory "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
- <source>Could not remove "%1"</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Brugeren afbrød handlingen</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="41"/>
<source>Unknown error</source>
- <translation type="unfinished">Ukendt fejl</translation>
+ <translation type="obsolete">Ukendt fejl</translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
- <location filename="" line="0"/>
<source>Kaboom - MigrationTool</source>
<translation type="obsolete">Kaboom - Migreringsværktøj</translation>
</message>
<message>
- <location filename="intropage.cpp" line="22"/>
<source>This wizard will guide you through the process of migrating your KDE settings as required</source>
<translation type="obsolete">Denne guide vil hjælpe dig gennem processen med at migrere dine KDE indstillinger som påkrævet</translation>
</message>
<message>
- <location filename="intropage.cpp" line="21"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Migreringsværktøj</translation>
</message>
@@ -277,7 +226,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="intropage.cpp" line="49"/>
+ <location filename="intropage.cpp" line="23"/>
<source><p align='justify'>This version of KDE&nbsp;4 in Debian uses <u>%1</u> directory (where ~ refers to the path of your Home directory) to store user settings and data. The wizard has detected that you have recently upgraded to this version of KDE&nbsp;4 from KDE&nbsp;3 and/or previous Debian KDE&nbsp;4 release that used <u>%2</u> directory to store user settings.</p><p align='justify'>This wizard will guide you through the process of backing up, copying, moving or merging your user settings and data which were created by the old KDE installation. Please note, however, that it does not migrate configuration files directly. It operates on the filesystem level and sets up <u>%1</u> directory the way you request in the next step.</p><p align='justify'>Once you finish with this wizard, migration of the configuration files will be performed by KDE&nbsp;4 applications themselves as necessary. Therefore, if you are upgrading from KDE&nbsp;3, it is <strong>highly recommended</strong> to enable backing up of your old settings and data in the next step to avoid data loss in hopefully rare cases when some KDE&nbsp;4 applications fail to migrate your important user settings and/or data properly.</p><p align='justify'>If you need to make manual adjustments, you can cancel the wizard. KDE will not start and the current session will be terminated. You will see this wizard when you try to start KDE session again.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -285,37 +234,34 @@
<context>
<name>MigrationPage</name>
<message>
- <location filename="" line="0"/>
<source>When you click "start", settitgs migration will start</source>
<translation type="obsolete">Når du trykker på "start", vil migreringen af instillingerne starte</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="106"/>
<source>Start Migration</source>
<translation type="obsolete">Start migrering</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="103"/>
<source>When you click "Start", settings migration will start</source>
<translation type="obsolete">Når du trykker på "start", vil migreringen af instillingerne starte</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="192"/>
+ <location filename="migrationpage.cpp" line="228"/>
<source>Click "Finish" to exit the wizard and start loading KDE 4.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="238"/>
+ <location filename="migrationpage.cpp" line="264"/>
<source><strong>Selected scenario:</strong> %1<br/><strong>Backup:</strong> %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -323,63 +269,71 @@
<context>
<name>MigrationPagePrivate</name>
<message>
- <location filename="migrationpage.cpp" line="38"/>
+ <location filename="migrationpage.cpp" line="39"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="32"/>
<source>Errors occurred</source>
<translation type="obsolete">Der opstod fejl</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="42"/>
<source>Migration running</source>
<translation type="obsolete">Migrering i gang</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="39"/>
+ <location filename="migrationpage.cpp" line="40"/>
<source>Start migration process</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="52"/>
- <source>WARNING: depending on the severity of the errors above, it might not be safe to go back and you may need to resolve problems manually!</source>
+ <location filename="migrationpage.cpp" line="51"/>
+ <source>WARNING: if you go back, migration process will restarted over current state.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="57"/>
+ <location filename="migrationpage.cpp" line="56"/>
<source>The following error(s) occurred during migration process:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="84"/>
+ <location filename="migrationpage.cpp" line="83"/>
<source>Ready to start migration process</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="85"/>
+ <location filename="migrationpage.cpp" line="84"/>
<source>Please click "Start" button to proceed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="88"/>
+ <location filename="migrationpage.cpp" line="89"/>
<source>Migration - nothing to do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="89"/>
+ <location filename="migrationpage.cpp" line="90"/>
<source>According to the migration options you selected, nothing needs to be done.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="111"/>
+ <location filename="migrationpage.cpp" line="106"/>
<source>Migration is in progress...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="166"/>
- <source>Completed successfully.</source>
+ <location filename="migrationpage.cpp" line="113"/>
+ <source>Migration finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="116"/>
+ <source>Settings migration completed with errors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="120"/>
+ <source>Settings migration completed successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -419,75 +373,102 @@
<context>
<name>QObject</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="33"/>
<source>User canceled the operation</source>
<translation type="obsolete">Brugeren afbrød handlingen</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>Access was denied to the file or directory %1</source>
<translation type="obsolete">Adgang nægtet til filen eller mappen %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%1: No such file or directory</source>
<translation type="obsolete">%1: Ingen sådan fil eller mappe</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
<source>%1 already exists</source>
<translation type="obsolete">%1 eksisterer allerede</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
<source>Could not copy %1</source>
<translation type="obsolete">Kunne ikke kopiere %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
<source>Could not create directory %1</source>
<translation type="obsolete">Kunne ikke oprette mappen %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
<source>Could not remove %1</source>
<translation type="obsolete">Kunne ikke fjerne %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
<source>Unknown error</source>
<translation type="obsolete">Ukendt fejl</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="109"/>
<source>Calculating... %1 bytes</source>
<translation type="obsolete">Udregner... %1 bytes</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="153"/>
<source>Copying files...</source>
<translation type="obsolete">Kopierer filer...</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="260"/>
<source>Removing files...</source>
<translation type="obsolete">Fjerner filer...</translation>
</message>
</context>
<context>
+ <name>RecursiveDirJob::Error</name>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="40"/>
+ <source>Access was denied to the file or directory "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="41"/>
+ <source>"%1": No such file or directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="42"/>
+ <source>"%1" already exists</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="43"/>
+ <source>Could not copy "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="44"/>
+ <source>Could not create directory "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="45"/>
+ <source>Could not remove "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="46"/>
+ <source>Unknown error</source>
+ <translation type="unfinished">Ukendt fejl</translation>
+ </message>
+</context>
+<context>
<name>RecursiveDirJobHelper</name>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="172"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="213"/>
<source>Calculating the size of "%1"... %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="212"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="259"/>
<source>Copying files from "%1" to "%2"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="312"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="371"/>
<source>Removing directory "%1"...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/kaboom_es.ts b/kaboom_es.ts
index 0521d22..2270e95 100644
--- a/kaboom_es.ts
+++ b/kaboom_es.ts
@@ -1,99 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="es">
+<!DOCTYPE TS>
+<TS version="2.0" language="es">
<context>
<name>ChoicePage</name>
<message>
- <location filename="choicepage.cpp" line="40"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Utilidad de migración</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="44"/>
<source>Please select your settings migration option</source>
<translation type="obsolete">Seleccione la opción de migración de sus configuraciones</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="49"/>
<source>Migrate settings from KDE3 to KDE4 (standard)</source>
<translation type="obsolete">Migrar las configuraciones de KDE 3 a KDE 4 (estándar)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="56"/>
<source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
<translation type="obsolete">Usar las configuraciones actuales de KDE 4 y <b>reemplazar</b> las configuraciones de KDE 3</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="61"/>
<source>Merge settings from KDE3 and KDE4 (experimental)</source>
<translation type="obsolete">Fusionar las configuraciones de KDE 3 y KDE 4 (experimental)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="70"/>
<source>Start with default KDE settings and data. This option will <b>remove</b> all data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data</source>
<translation type="obsolete">Empezar con las configuraciones y datos por omisión de KDE . Esta opción <b>eliminará</b> todos los datos y configuraciones tales como contactos, correos almacenados, cuentas en KMail y Kopete, marcadores y otros datos por el estilo</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="73"/>
<source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
<translation type="obsolete">Crear una copia de seguridad de la configuración de KDE3 en .kde3-backup. (Altamente recomendado)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="92"/>
<source>Insufficient free space to complete a backup, please consider freeing up some space. You can go to TTY1 to do this.</source>
<translation type="obsolete">No hay suficiente espacio libre para crear una copia de seguridad, considere liberar algo de espacio en su disco. Puede ir a TTY1 para hacer esto.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="96"/>
<source>The current KDE settings and data directory takes up %1 bytes</source>
<translation type="obsolete">Los datos y configuraciones actuales de KDE ocupan %1 bytes</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="112"/>
<source>Recheck</source>
<translation type="obsolete">Recomprobar</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="53"/>
+ <location filename="choicepage.cpp" line="54"/>
<source>Setting migration options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="59"/>
+ <location filename="choicepage.cpp" line="60"/>
<source>Current configuration:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="64"/>
- <source>%1%2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="choicepage.cpp" line="65"/>
+ <location filename="choicepage.cpp" line="66"/>
<source><strong>KDE&nbsp;3</strong> settings and data are at <u>%1</u><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="67"/>
+ <location filename="choicepage.cpp" line="68"/>
<source><strong>KDE&nbsp;4</strong> settings and data are at <u>%1</u><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="76"/>
+ <location filename="choicepage.cpp" line="74"/>
<source>Once you finish with this wizard, <strong>KDE&nbsp;4</strong> will use <u>%1</u> to store user settings and data. Optionally, <strong>KDE&nbsp;3</strong> settings and data may be backed up to <u>%2</u>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="81"/>
+ <location filename="choicepage.cpp" line="82"/>
<source>Please choose one of the following migration scenarios:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="94"/>
+ <location filename="choicepage.cpp" line="95"/>
<source>Use current KDE&nbsp;3 settings as initial for KDE&nbsp;4. (<i>standard</i>)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="100"/>
+ <location filename="choicepage.cpp" line="96"/>
<source><p>The wizard will not make any changes to your current KDE&nbsp;3 settings directory. It may only optionally back this directory up if the appropriate option below is enabled. This scenario is recommended for users who have not actively used KDE&nbsp;4 or any of its applications (e.g. Okular or KTorrent which were released with Lenny) on this system previously and wish the new KDE&nbsp;4 desktop and its applications to use as much settings from the old KDE&nbsp;3 counterparts as possible.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -103,52 +89,52 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="110"/>
+ <location filename="choicepage.cpp" line="111"/>
<source> and <strong>replace</strong> current KDE&nbsp;3 settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="118"/>
- <source><p>The wizard will remove current KDE&nbsp;3 settings directory and move current KDE&nbsp;4 settings directory into its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <location filename="choicepage.cpp" line="113"/>
+ <source><p>The wizard will remove current KDE&nbsp;3 settings directory and copy current KDE&nbsp;4 settings directory to its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="choicepage.cpp" line="149"/>
+ <source>The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="121"/>
+ <location filename="choicepage.cpp" line="120"/>
<source><p>The wizard will rename your current old KDE&nbsp;4 settings directory. Select this option if you would like to keep all KDE 4 settings and continue using KDE 4 desktop as before.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="128"/>
+ <location filename="choicepage.cpp" line="129"/>
<source>Merge current KDE&nbsp;4 settings with current KDE&nbsp;3 settings. (<i>experimental</i>)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="136"/>
+ <location filename="choicepage.cpp" line="130"/>
<source><p>The wizard will copy contents of the current KDE&nbsp;4 settings directory on top of the current KDE&nbsp;3 settings directory giving preference to the KDE&nbsp;4 configuration files in case of filename collisions. In theory, this should let you preserve settings of both KDE&nbsp;4 and a few KDE&nbsp;3 applications you still use. The downside is that this migration path is not well tested and the resulting KDE&nbsp;4 settings directory might get polluted with useless configuration and data files which KDE&nbsp;4 ports no longer use. Use this scenario at your own risk.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="143"/>
+ <location filename="choicepage.cpp" line="144"/>
<source>Start with default KDE settings and data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="147"/>
+ <location filename="choicepage.cpp" line="145"/>
<source><p>%1The wizard will not touch KDE&nbsp;4 settings directory if it exists. Choose this scenario if you would like to start with default KDE&nbsp;4 desktop and/or want to do migration of old KDE settings manually (from backup).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="150"/>
- <source><p>The wizard will <strong>remove</strong> (or move to backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="choicepage.cpp" line="155"/>
+ <location filename="choicepage.cpp" line="156"/>
<source>Backup existing KDE 3 settings (highly recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="185"/>
+ <location filename="choicepage.cpp" line="186"/>
<source>Check again</source>
<translation type="unfinished"></translation>
</message>
@@ -158,22 +144,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="195"/>
+ <location filename="choicepage.cpp" line="196"/>
<source>To free up some disk case, cancel the wizard now or switch to the Linux virtual terminal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="267"/>
+ <location filename="choicepage.cpp" line="269"/>
<source><p><i>The current KDE&nbsp;3 settings and data directory takes up %1</i></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="269"/>
+ <location filename="choicepage.cpp" line="272"/>
<source>%1% of disk space currently used</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="274"/>
+ <location filename="choicepage.cpp" line="277"/>
<source>Backup needs <strong>%1</strong> of free disk space</source>
<translation type="unfinished"></translation>
</message>
@@ -181,22 +167,22 @@
<context>
<name>DirOperations</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="49"/>
+ <location filename="diroperations/diroperations.cpp" line="32"/>
<source>%L1 GiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="52"/>
+ <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%L1 MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="55"/>
+ <location filename="diroperations/diroperations.cpp" line="38"/>
<source>%L1 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="58"/>
+ <location filename="diroperations/diroperations.cpp" line="41"/>
<source>%L1 bytes</source>
<translation type="unfinished"></translation>
</message>
@@ -204,55 +190,21 @@
<context>
<name>DirOperations::Exception</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>User canceled the operation</source>
- <translation type="unfinished">Operación cancelada por el usuario</translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
- <source>Access was denied to the file or directory "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
- <source>"%1": No such file or directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
- <source>"%1" already exists</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
- <source>Could not copy "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
- <source>Could not create directory "%1"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
- <source>Could not remove "%1"</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Operación cancelada por el usuario</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="41"/>
<source>Unknown error</source>
- <translation type="unfinished">Error desconocido</translation>
+ <translation type="obsolete">Error desconocido</translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
- <location filename="intropage.cpp" line="21"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Utilidad de migración</translation>
</message>
<message>
- <location filename="intropage.cpp" line="22"/>
<source>This wizard will guide you through the process of migrating your KDE settings as required</source>
<translation type="obsolete">Este asistente le guiará a través del proceso de migración de las configuraciones de KDE</translation>
</message>
@@ -262,7 +214,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="intropage.cpp" line="49"/>
+ <location filename="intropage.cpp" line="23"/>
<source><p align='justify'>This version of KDE&nbsp;4 in Debian uses <u>%1</u> directory (where ~ refers to the path of your Home directory) to store user settings and data. The wizard has detected that you have recently upgraded to this version of KDE&nbsp;4 from KDE&nbsp;3 and/or previous Debian KDE&nbsp;4 release that used <u>%2</u> directory to store user settings.</p><p align='justify'>This wizard will guide you through the process of backing up, copying, moving or merging your user settings and data which were created by the old KDE installation. Please note, however, that it does not migrate configuration files directly. It operates on the filesystem level and sets up <u>%1</u> directory the way you request in the next step.</p><p align='justify'>Once you finish with this wizard, migration of the configuration files will be performed by KDE&nbsp;4 applications themselves as necessary. Therefore, if you are upgrading from KDE&nbsp;3, it is <strong>highly recommended</strong> to enable backing up of your old settings and data in the next step to avoid data loss in hopefully rare cases when some KDE&nbsp;4 applications fail to migrate your important user settings and/or data properly.</p><p align='justify'>If you need to make manual adjustments, you can cancel the wizard. KDE will not start and the current session will be terminated. You will see this wizard when you try to start KDE session again.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -270,32 +222,30 @@
<context>
<name>MigrationPage</name>
<message>
- <location filename="migrationpage.cpp" line="103"/>
<source>When you click "Start", settings migration will start</source>
<translation type="obsolete">Cuando seleccione "Comenzar", se comenzará la migración de configuraciones</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="106"/>
<source>Start Migration</source>
<translation type="obsolete">Comenzar migración</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="192"/>
+ <location filename="migrationpage.cpp" line="228"/>
<source>Click "Finish" to exit the wizard and start loading KDE 4.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="238"/>
+ <location filename="migrationpage.cpp" line="264"/>
<source><strong>Selected scenario:</strong> %1<br/><strong>Backup:</strong> %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -303,63 +253,71 @@
<context>
<name>MigrationPagePrivate</name>
<message>
- <location filename="migrationpage.cpp" line="38"/>
+ <location filename="migrationpage.cpp" line="39"/>
<source>Start</source>
<translation>Comenzar</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="32"/>
<source>Errors occurred</source>
<translation type="obsolete">Se encontró un problema</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="42"/>
<source>Migration running</source>
<translation type="obsolete">Ejecutando migración</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="39"/>
+ <location filename="migrationpage.cpp" line="40"/>
<source>Start migration process</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="52"/>
- <source>WARNING: depending on the severity of the errors above, it might not be safe to go back and you may need to resolve problems manually!</source>
+ <location filename="migrationpage.cpp" line="51"/>
+ <source>WARNING: if you go back, migration process will restarted over current state.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="57"/>
+ <location filename="migrationpage.cpp" line="56"/>
<source>The following error(s) occurred during migration process:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="84"/>
+ <location filename="migrationpage.cpp" line="83"/>
<source>Ready to start migration process</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="85"/>
+ <location filename="migrationpage.cpp" line="84"/>
<source>Please click "Start" button to proceed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="88"/>
+ <location filename="migrationpage.cpp" line="89"/>
<source>Migration - nothing to do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="89"/>
+ <location filename="migrationpage.cpp" line="90"/>
<source>According to the migration options you selected, nothing needs to be done.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="111"/>
+ <location filename="migrationpage.cpp" line="106"/>
<source>Migration is in progress...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="166"/>
- <source>Completed successfully.</source>
+ <location filename="migrationpage.cpp" line="113"/>
+ <source>Migration finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="116"/>
+ <source>Settings migration completed with errors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="120"/>
+ <source>Settings migration completed successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -399,75 +357,102 @@
<context>
<name>QObject</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="33"/>
<source>User canceled the operation</source>
<translation type="obsolete">Operación cancelada por el usuario</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>Access was denied to the file or directory %1</source>
<translation type="obsolete">Le fue denegado el acceso al fichero o directorio %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%1: No such file or directory</source>
<translation type="obsolete">%1: No existe ese fichero o directorio</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
<source>%1 already exists</source>
<translation type="obsolete">%1 ya existe</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
<source>Could not copy %1</source>
<translation type="obsolete">No se pudo copiar %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
<source>Could not create directory %1</source>
<translation type="obsolete">No se pudo crear el directorio %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
<source>Could not remove %1</source>
<translation type="obsolete">No se pudo eliminar %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
<source>Unknown error</source>
<translation type="obsolete">Error desconocido</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="109"/>
<source>Calculating... %1 bytes</source>
<translation type="obsolete">Calculando... %1 bytes</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="153"/>
<source>Copying files...</source>
<translation type="obsolete">Copiando ficheros...</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="260"/>
<source>Removing files...</source>
<translation type="obsolete">Eliminando ficheros...</translation>
</message>
</context>
<context>
+ <name>RecursiveDirJob::Error</name>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="40"/>
+ <source>Access was denied to the file or directory "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="41"/>
+ <source>"%1": No such file or directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="42"/>
+ <source>"%1" already exists</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="43"/>
+ <source>Could not copy "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="44"/>
+ <source>Could not create directory "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="45"/>
+ <source>Could not remove "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="46"/>
+ <source>Unknown error</source>
+ <translation type="unfinished">Error desconocido</translation>
+ </message>
+</context>
+<context>
<name>RecursiveDirJobHelper</name>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="172"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="213"/>
<source>Calculating the size of "%1"... %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="212"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="259"/>
<source>Copying files from "%1" to "%2"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="312"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="371"/>
<source>Removing directory "%1"...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/kaboom_it.ts b/kaboom_it.ts
index 1161604..2ec0a3c 100644
--- a/kaboom_it.ts
+++ b/kaboom_it.ts
@@ -1,90 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="it">
+<!DOCTYPE TS>
+<TS version="2.0" language="it">
<defaultcodec></defaultcodec>
<context>
<name>ChoicePage</name>
<message>
- <location filename="choicepage.cpp" line="40"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Strumento di migrazione</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="44"/>
<source>Please select your settings migration option</source>
<translation type="obsolete">Scegli come migrare le tue impostazioni</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="49"/>
<source>Migrate settings from KDE3 to KDE4 (standard)</source>
<translation type="obsolete">Migra le impostazioni da KDE3 a KDE4 (standard)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="56"/>
<source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
<translation type="obsolete">Usa le impostazioni esistenti di KDE 4 e <b>sostituisci</b> le impostazioni di KDE 3</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="70"/>
<source>Start with default KDE settings and data. This option will <b>remove</b> all data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data</source>
<translation type="obsolete">Incomincia con le impostazioni predefinite e i dati di KDE. Questa opzione <b>rimuoverà</b> tutti i dati e le impostazioni quali contatti, posta elettronica salvata localmente, account di KMail e Kopete, segnalibri e altri dati</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="73"/>
<source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
<translation type="obsolete">Salva le impostazioni esistenti di KDE 3 in .kde3-backup (altamente raccomandato)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="96"/>
<source>The current KDE settings and data directory takes up %1 bytes</source>
<translation type="obsolete">I dati e le impostazioni correnti di KDE occupano %1 byte</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="112"/>
<source>Recheck</source>
<translation type="obsolete">Controlla nuovamente</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="53"/>
+ <location filename="choicepage.cpp" line="54"/>
<source>Setting migration options</source>
<translation>Impostare le opzioni di migrazione</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="59"/>
+ <location filename="choicepage.cpp" line="60"/>
<source>Current configuration:</source>
<translation>Configurazione attuale:</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="64"/>
<source>%1%2</source>
- <translation>%1%2</translation>
+ <translation type="obsolete">%1%2</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="65"/>
+ <location filename="choicepage.cpp" line="66"/>
<source><strong>KDE&nbsp;3</strong> settings and data are at <u>%1</u><br/></source>
<translation>Le impostazioni e i dati di <strong>KDE&nbsp;3</strong> sono in <u>%1</u><br/></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="67"/>
+ <location filename="choicepage.cpp" line="68"/>
<source><strong>KDE&nbsp;4</strong> settings and data are at <u>%1</u><br/></source>
<translation>Le impostazioni e i dati di <strong>KDE&nbsp;4</strong> sono in <u>%1</u><br/></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="76"/>
+ <location filename="choicepage.cpp" line="74"/>
<source>Once you finish with this wizard, <strong>KDE&nbsp;4</strong> will use <u>%1</u> to store user settings and data. Optionally, <strong>KDE&nbsp;3</strong> settings and data may be backed up to <u>%2</u>.</source>
<translation>Una volta conclusa questa procedura guidata, <strong>KDE&nbsp;4</strong> userà <u>%1</u> per memorizzare i tuoi dati e impostazioni. Opzionalmente, i tuoi dati e impostazioni di <strong>KDE&nbsp;3</strong> possono essere salvati in <u>%2</u>.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="81"/>
+ <location filename="choicepage.cpp" line="82"/>
<source>Please choose one of the following migration scenarios:</source>
<translation>Scegli uno dei seguenti scenari di migrazione:</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="94"/>
+ <location filename="choicepage.cpp" line="95"/>
<source>Use current KDE&nbsp;3 settings as initial for KDE&nbsp;4. (<i>standard</i>)</source>
<translation>Usa le impostazioni attuali di KDE&nbsp;3 come base di partenza per KDE&nbsp;4 (<i>standard</i>)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="100"/>
+ <location filename="choicepage.cpp" line="96"/>
<source><p>The wizard will not make any changes to your current KDE&nbsp;3 settings directory. It may only optionally back this directory up if the appropriate option below is enabled. This scenario is recommended for users who have not actively used KDE&nbsp;4 or any of its applications (e.g. Okular or KTorrent which were released with Lenny) on this system previously and wish the new KDE&nbsp;4 desktop and its applications to use as much settings from the old KDE&nbsp;3 counterparts as possible.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -94,52 +86,60 @@
<translation><html>Usa le impostazioni esistenti di KDE&nbsp;4%1.</html></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="110"/>
+ <location filename="choicepage.cpp" line="111"/>
<source> and <strong>replace</strong> current KDE&nbsp;3 settings</source>
<translation> e <strong>sostituisci</strong> le impostazioni attuali di KDE&nbsp;3</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="118"/>
+ <location filename="choicepage.cpp" line="113"/>
+ <source><p>The wizard will remove current KDE&nbsp;3 settings directory and copy current KDE&nbsp;4 settings directory to its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="choicepage.cpp" line="149"/>
+ <source>The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source><p>The wizard will remove current KDE&nbsp;3 settings directory and move current KDE&nbsp;4 settings directory into its place. Effectively, you will lose all settings and data the KDE&nbsp;3 desktop and applications have stored unless the backup option below is enabled. This scenario should be useful for users who already actively and almost exclusively use KDE&nbsp;4 desktop and applications as previously packaged by Debian and do not care about losing settings of (a few) KDE&nbsp;3 applications anymore.</p></source>
- <translation><p>La procedura guidata non modificherà la directory delle impostazioni di KDE&nbsp;3. Può salvare questa directory solo se l'opzione sotto è abilitata. Questo scenario è raccomandato per utenti che non hanno già usato attivamente KDE&nbsp;4 o alcuna delle sue applicazioni (ad es. Okular o KTorrent, fornite in Lenny) su questo sistema, e desiderano che KDE&nbsp;4 e le sue applicazioni usino più impostazioni possibili dalle relative versioni KDE&nbsp;3.</p></translation>
+ <translation type="obsolete"><p>La procedura guidata non modificherà la directory delle impostazioni di KDE&nbsp;3. Può salvare questa directory solo se l'opzione sotto è abilitata. Questo scenario è raccomandato per utenti che non hanno già usato attivamente KDE&nbsp;4 o alcuna delle sue applicazioni (ad es. Okular o KTorrent, fornite in Lenny) su questo sistema, e desiderano che KDE&nbsp;4 e le sue applicazioni usino più impostazioni possibili dalle relative versioni KDE&nbsp;3.</p></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="121"/>
+ <location filename="choicepage.cpp" line="120"/>
<source><p>The wizard will rename your current old KDE&nbsp;4 settings directory. Select this option if you would like to keep all KDE 4 settings and continue using KDE 4 desktop as before.</p></source>
<translation><p>La procedura guidata rinominerà la directory con le vecchie impostazioni di KDE&nbsp;4. Scegli questa opzione se vuoi mantenere tutte le impostazioni di KDE&nbsp;4 e continuare ad usare KDE&nbsp;4 come prima.</p></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="128"/>
+ <location filename="choicepage.cpp" line="129"/>
<source>Merge current KDE&nbsp;4 settings with current KDE&nbsp;3 settings. (<i>experimental</i>)</source>
<translation>Fondi le impostazioni di KDE&nbsp;4 nelle impostazioni di KDE&nbsp;3. (<i>sperimentale</i>)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="136"/>
+ <location filename="choicepage.cpp" line="130"/>
<source><p>The wizard will copy contents of the current KDE&nbsp;4 settings directory on top of the current KDE&nbsp;3 settings directory giving preference to the KDE&nbsp;4 configuration files in case of filename collisions. In theory, this should let you preserve settings of both KDE&nbsp;4 and a few KDE&nbsp;3 applications you still use. The downside is that this migration path is not well tested and the resulting KDE&nbsp;4 settings directory might get polluted with useless configuration and data files which KDE&nbsp;4 ports no longer use. Use this scenario at your own risk.</p></source>
<translation><p>La procedura guidata copierà il contenuto della directory delle impostazioni di KDE&nbsp;4 nella directory delle impostazioni di KDE&nbsp;3, con preferenza ai file di configurazione di KDE&nbsp;4 in caso di conflitto. In teoria, questo scenario dovrebbe permetterti di preservare le impostazioni di applicazioni sia KDE&nbsp;4 sia KDE&nbsp;3 che usi. Lo svantaggio è che questo scenario non è ben testato e che la directory risultante delle impostazioni di KDE&nbsp;4 potrebbe avere dati e configurazioni inutili non usati da applicazioni KDE&nbsp;4. Usa questo scenario a tuo rischio.</p></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="143"/>
+ <location filename="choicepage.cpp" line="144"/>
<source>Start with default KDE settings and data.</source>
<translation>Avvia con le impostazioni e i dati predefiniti di KDE.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="147"/>
+ <location filename="choicepage.cpp" line="145"/>
<source><p>%1The wizard will not touch KDE&nbsp;4 settings directory if it exists. Choose this scenario if you would like to start with default KDE&nbsp;4 desktop and/or want to do migration of old KDE settings manually (from backup).</p></source>
<translation><p>%1La procedura guidata non toccherà la directory delle impostazioni di KDE&nbsp;4, se esiste. Scegli questo scenario se vuoi partire con il desktop predefinito di KDE&nbsp;4 e/o migrare manualmente le vecchie impostazioni di KDE (usando la copia di sicurezza).</p></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="150"/>
<source><p>The wizard will <strong>remove</strong> (or move to backup) existing KDE&nbsp;3 settings directory including such data as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. </source>
- <translation><p>La procedura guidata <strong>rimuoverà</strong> (o sposterà nella copia di sicurezza) la directory delle impostazioni di KDE&nbsp;3, con dati quali rubriche, posta elettronica salvata localmente, account in KMail e Kopete, segnalibri, ecc.</translation>
+ <translation type="obsolete"><p>La procedura guidata <strong>rimuoverà</strong> (o sposterà nella copia di sicurezza) la directory delle impostazioni di KDE&nbsp;3, con dati quali rubriche, posta elettronica salvata localmente, account in KMail e Kopete, segnalibri, ecc.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="155"/>
+ <location filename="choicepage.cpp" line="156"/>
<source>Backup existing KDE 3 settings (highly recommended)</source>
<translation>Salva le impostazioni esistenti di KDE 3 (fortemente raccomandato)</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="185"/>
+ <location filename="choicepage.cpp" line="186"/>
<source>Check again</source>
<translation>Controlla nuovamente</translation>
</message>
@@ -149,22 +149,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="195"/>
+ <location filename="choicepage.cpp" line="196"/>
<source>To free up some disk case, cancel the wizard now or switch to the Linux virtual terminal.</source>
<translation>Per liberare spazio su disco, annulla questa procedura guidata oppure passa ad una console virtuale di Linux.</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="267"/>
+ <location filename="choicepage.cpp" line="269"/>
<source><p><i>The current KDE&nbsp;3 settings and data directory takes up %1</i></p></source>
<translation><p><i>Le impostazioni e i dati attuali di KDE&nbsp;3 occupano %1</i></p></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="269"/>
+ <location filename="choicepage.cpp" line="272"/>
<source>%1% of disk space currently used</source>
<translation>Spazio su disco usato: %1%</translation>
</message>
<message>
- <location filename="choicepage.cpp" line="274"/>
+ <location filename="choicepage.cpp" line="277"/>
<source>Backup needs <strong>%1</strong> of free disk space</source>
<translation>La copia di sicurezza richiede <strong>%1</strong> di spazio libero</translation>
</message>
@@ -172,22 +172,22 @@
<context>
<name>DirOperations</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="49"/>
+ <location filename="diroperations/diroperations.cpp" line="32"/>
<source>%L1 GiB</source>
<translation>%L1 GiByte</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="52"/>
+ <location filename="diroperations/diroperations.cpp" line="35"/>
<source>%L1 MiB</source>
<translation>%L1 MiByte</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="55"/>
+ <location filename="diroperations/diroperations.cpp" line="38"/>
<source>%L1 KiB</source>
<translation>%L1 KiByte</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="58"/>
+ <location filename="diroperations/diroperations.cpp" line="41"/>
<source>%L1 bytes</source>
<translation>%L1 byte</translation>
</message>
@@ -195,55 +195,45 @@
<context>
<name>DirOperations::Exception</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>User canceled the operation</source>
- <translation>L'utente ha annullato l'operazione</translation>
+ <translation type="obsolete">L'utente ha annullato l'operazione</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="35"/>
<source>Access was denied to the file or directory "%1"</source>
- <translation>Accesso non consentito al file o alla directory «%1»</translation>
+ <translation type="obsolete">Accesso non consentito al file o alla directory «%1»</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
<source>"%1": No such file or directory</source>
- <translation>«%1»: file o directory non esistente</translation>
+ <translation type="obsolete">«%1»: file o directory non esistente</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
<source>"%1" already exists</source>
- <translation>«%1» esiste già</translation>
+ <translation type="obsolete">«%1» esiste già</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
<source>Could not copy "%1"</source>
- <translation>Impossibile copiare «%1»</translation>
+ <translation type="obsolete">Impossibile copiare «%1»</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
<source>Could not create directory "%1"</source>
- <translation>Impossibile create la directory «%1»</translation>
+ <translation type="obsolete">Impossibile create la directory «%1»</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
<source>Could not remove "%1"</source>
- <translation>Impossibile rimuovere «%1»</translation>
+ <translation type="obsolete">Impossibile rimuovere «%1»</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="41"/>
<source>Unknown error</source>
- <translation>Errore sconosciuto</translation>
+ <translation type="obsolete">Errore sconosciuto</translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
- <location filename="intropage.cpp" line="21"/>
<source>Kaboom - Migration Tool</source>
<translation type="obsolete">Kaboom - Strumento di migrazione</translation>
</message>
<message>
- <location filename="intropage.cpp" line="22"/>
<source>This wizard will guide you through the process of migrating your KDE settings as required</source>
<translation type="obsolete">Questa procedura ti guiderà nel processo di migrazione delle impostazioni di KDE, come richiesto</translation>
</message>
@@ -253,7 +243,7 @@
<translation>Benvenuto alla procedura guidata di Debian di migrazione delle impostazioni di KDE!</translation>
</message>
<message>
- <location filename="intropage.cpp" line="49"/>
+ <location filename="intropage.cpp" line="23"/>
<source><p align='justify'>This version of KDE&nbsp;4 in Debian uses <u>%1</u> directory (where ~ refers to the path of your Home directory) to store user settings and data. The wizard has detected that you have recently upgraded to this version of KDE&nbsp;4 from KDE&nbsp;3 and/or previous Debian KDE&nbsp;4 release that used <u>%2</u> directory to store user settings.</p><p align='justify'>This wizard will guide you through the process of backing up, copying, moving or merging your user settings and data which were created by the old KDE installation. Please note, however, that it does not migrate configuration files directly. It operates on the filesystem level and sets up <u>%1</u> directory the way you request in the next step.</p><p align='justify'>Once you finish with this wizard, migration of the configuration files will be performed by KDE&nbsp;4 applications themselves as necessary. Therefore, if you are upgrading from KDE&nbsp;3, it is <strong>highly recommended</strong> to enable backing up of your old settings and data in the next step to avoid data loss in hopefully rare cases when some KDE&nbsp;4 applications fail to migrate your important user settings and/or data properly.</p><p align='justify'>If you need to make manual adjustments, you can cancel the wizard. KDE will not start and the current session will be terminated. You will see this wizard when you try to start KDE session again.</p></source>
<translation><p align='justify'>Questa versione di KDE&nbsp;4 in Debian usa la directory <u>%1</u> (dove ~ è il percorso della tua directory Home) per memorizzare i tuoi dati e le tue impostazioni. La procedura guidata ha rilevato che hai aggiornato recentemente a questa versione di KDE&nbsp;4 da KDE&nbsp;3 e/o da precedenti rilasci di KDE&nbsp;4 in Debian che hanno usato la directory <u>%2</u> per memorizzare le impostazioni utente.</p><p align='justify'>Questa procedura ti guiderà per: salvare una copia di sicurezza, copiare, spostare oppure unire le impostazioni e i dati utente creati da una vecchia installazione di KDE. Tuttavia, non migra direttamente i file di configurazione, ma effettua operazioni al livello del file system e imposta la directory <u>%1</u> nel modo richiesto nel passo successivo.</p><p align='justify'>Una volta completata, la migrazione dei file di configurazione sarà effettuata - se necessario - dalle applicazioni stesse di KDE&nbsp;4. Quindi, se stai aggiornando da KDE&nbsp;3, è <strong>fortemente raccomandato</strong> abilitare nel passo successivo la copia di sicurezza dei vecchi dati e delle vecchie impostazioni, per evitare di perdere dati nel poco probabile caso in cui un'applicazione di KDE&nbsp;4 non riesca a migrare correttamente impostazioni e/o dati importanti.</p><p align='justify'>Se devi fare modifiche manualmente, puoi annullare questa procedura guidata. KDE non sarà avviato e la sessione corrente chiusa. Vedrai questa procedura guidata quando avvii nuovamente una sessione KDE.</p></translation>
</message>
@@ -261,32 +251,30 @@
<context>
<name>MigrationPage</name>
<message>
- <location filename="migrationpage.cpp" line="103"/>
<source>When you click "Start", settings migration will start</source>
<translation type="obsolete">Quando premi "avvia" sarà avviata la migrazione delle impostazioni</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="106"/>
<source>Start Migration</source>
<translation type="obsolete">Avvia la migrazione</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="192"/>
+ <location filename="migrationpage.cpp" line="228"/>
<source>Click "Finish" to exit the wizard and start loading KDE 4.</source>
<translation>Premi «Fine» per uscire dalla procedura guidata e avviare KDE 4.</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="238"/>
+ <location filename="migrationpage.cpp" line="264"/>
<source><strong>Selected scenario:</strong> %1<br/><strong>Backup:</strong> %2</source>
<translation><strong>Scenario selezionato:</strong> %1<br/><strong>Copia di sicurezza:</strong> %2</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>enabled</source>
<translation>abilitata</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="239"/>
+ <location filename="migrationpage.cpp" line="267"/>
<source>disabled</source>
<translation>disabilitata</translation>
</message>
@@ -294,64 +282,80 @@
<context>
<name>MigrationPagePrivate</name>
<message>
- <location filename="migrationpage.cpp" line="38"/>
+ <location filename="migrationpage.cpp" line="39"/>
<source>Start</source>
<translation>Avvia</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="32"/>
<source>Errors occurred</source>
<translation type="obsolete">Errori</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="42"/>
<source>Migration running</source>
<translation type="obsolete">Migrazione in corso</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="39"/>
+ <location filename="migrationpage.cpp" line="40"/>
<source>Start migration process</source>
<translation>Avvia migrazione</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="52"/>
<source>WARNING: depending on the severity of the errors above, it might not be safe to go back and you may need to resolve problems manually!</source>
- <translation>ATTENZIONE: a seconda dell'importanza degli errori sopra, potrebbe non essere sicuro tornare indietro e potresti dover risolvere i problemi manualmente!</translation>
+ <translation type="obsolete">ATTENZIONE: a seconda dell'importanza degli errori sopra, potrebbe non essere sicuro tornare indietro e potresti dover risolvere i problemi manualmente!</translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="51"/>
+ <source>WARNING: if you go back, migration process will restarted over current state.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="57"/>
+ <location filename="migrationpage.cpp" line="56"/>
<source>The following error(s) occurred during migration process:</source>
<translation>Si sono verificati i seguenti errori durante la migrazione:</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="84"/>
+ <location filename="migrationpage.cpp" line="83"/>
<source>Ready to start migration process</source>
<translation>Pronto per avviare la migrazione</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="85"/>
+ <location filename="migrationpage.cpp" line="84"/>
<source>Please click "Start" button to proceed.</source>
<translation>Premi «Avvia» per procedere.</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="88"/>
+ <location filename="migrationpage.cpp" line="89"/>
<source>Migration - nothing to do</source>
<translation>Migrazione - nulla da effettuare</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="89"/>
+ <location filename="migrationpage.cpp" line="90"/>
<source>According to the migration options you selected, nothing needs to be done.</source>
<translation></translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="111"/>
+ <location filename="migrationpage.cpp" line="106"/>
<source>Migration is in progress...</source>
<translation>Migrazione in corso...</translation>
</message>
<message>
- <location filename="migrationpage.cpp" line="166"/>
+ <location filename="migrationpage.cpp" line="113"/>
+ <source>Migration finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="116"/>
+ <source>Settings migration completed with errors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="migrationpage.cpp" line="120"/>
+ <source>Settings migration completed successfully.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Completed successfully.</source>
- <translation>Completata correttamente.</translation>
+ <translation type="obsolete">Completata correttamente.</translation>
</message>
</context>
<context>
@@ -390,70 +394,98 @@
<context>
<name>QObject</name>
<message>
- <location filename="diroperations/diroperations.cpp" line="33"/>
<source>User canceled the operation</source>
<translation type="obsolete">L'utente ha annullato l'operazione</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="34"/>
<source>Access was denied to the file or directory %1</source>
<translation type="obsolete">Accesso non consentito al file o alla directory %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="36"/>
<source>%1 already exists</source>
<translation type="obsolete">%1 esiste già</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="37"/>
<source>Could not copy %1</source>
<translation type="obsolete">Impossibile copiare %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="38"/>
<source>Could not create directory %1</source>
<translation type="obsolete">Impossibile creare la directory %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="39"/>
<source>Could not remove %1</source>
<translation type="obsolete">Impossibile rimuovere %1</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="40"/>
<source>Unknown error</source>
<translation type="obsolete">Errore sconosciuto</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="109"/>
<source>Calculating... %1 bytes</source>
<translation type="obsolete">Calcolo... %1 byte</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="153"/>
<source>Copying files...</source>
<translation type="obsolete">Copia dei file...</translation>
</message>
<message>
- <location filename="diroperations/diroperations.cpp" line="260"/>
<source>Removing files...</source>
<translation type="obsolete">Rimozione dei file...</translation>
</message>
</context>
<context>
+ <name>RecursiveDirJob::Error</name>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="40"/>
+ <source>Access was denied to the file or directory "%1"</source>
+ <translation type="unfinished">Accesso non consentito al file o alla directory «%1»</translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="41"/>
+ <source>"%1": No such file or directory</source>
+ <translation type="unfinished">«%1»: file o directory non esistente</translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="42"/>
+ <source>"%1" already exists</source>
+ <translation type="unfinished">«%1» esiste già</translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="43"/>
+ <source>Could not copy "%1"</source>
+ <translation type="unfinished">Impossibile copiare «%1»</translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="44"/>
+ <source>Could not create directory "%1"</source>
+ <translation type="unfinished">Impossibile create la directory «%1»</translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="45"/>
+ <source>Could not remove "%1"</source>
+ <translation type="unfinished">Impossibile rimuovere «%1»</translation>
+ </message>
+ <message>
+ <location filename="diroperations/recursivedirjob.cpp" line="46"/>
+ <source>Unknown error</source>
+ <translation type="unfinished">Errore sconosciuto</translation>
+ </message>
+</context>
+<context>
<name>RecursiveDirJobHelper</name>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="172"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="213"/>
<source>Calculating the size of "%1"... %2</source>
<translation>Calcolo dello spazio di «%1»... %2</translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="212"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="259"/>
<source>Copying files from "%1" to "%2"...</source>
<translation>Copia dei file da «%1» a «%2»...</translation>
</message>
<message>
- <location filename="diroperations/recursivedirjob.cpp" line="312"/>
+ <location filename="diroperations/recursivedirjob.cpp" line="371"/>
<source>Removing directory "%1"...</source>
<translation>Rimozione della directory «%1»...</translation>
</message>
diff --git a/migrationtool.h b/migrationtool.h
index 270e417..d79f960 100644
--- a/migrationtool.h
+++ b/migrationtool.h
@@ -21,6 +21,7 @@
class MigrationToolPrivate;
class MigrationTool : public QWizard
{
+ Q_OBJECT
public:
enum Selection
{
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list