[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 68e0538f0be610eaca530f50ed55bfb2919fc25d
Sune Vuorela
pusling-guest at alioth.debian.org
Tue Feb 24 20:47:14 UTC 2009
The following commit has been merged in the master branch:
commit 68e0538f0be610eaca530f50ed55bfb2919fc25d
Author: Sune Vuorela <sune at vuorela.dk>
Date: Tue Feb 24 21:47:10 2009 +0100
updated translation files
diff --git a/kaboom_da.ts b/kaboom_da.ts
index f2d49ec..ad4f40e 100644
--- a/kaboom_da.ts
+++ b/kaboom_da.ts
@@ -1,78 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="da">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS><TS version="1.1">
<context>
<name>ChoicePage</name>
<message>
<location filename="choicepage.cpp" line="40"/>
<source>Kaboom - MigrationTool</source>
- <translation>Kaboom - Migreringsværktøj</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="choicepage.cpp" line="44"/>
- <source>Please select the option on how you want to migrate your settings</source>
- <translation>Vælg venlist hvordan du vil migrere dine indstillinger</translation>
+ <source>Please select your settings migratation option</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="48"/>
- <source>Migrate settings from KDE3 to KDE4 (recommended)</source>
- <translation>Migrer indstillintger fra KDE3 til KDE4 (anbefalet)</translation>
+ <location filename="choicepage.cpp" line="49"/>
+ <source>Migrate settings from KDE3 to KDE4 (standard)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="55"/>
- <source>Move settings from KDE 4 dir and <b>replace</b> settings from KDE 3</source>
- <translation>Flyt indstillinger fra KDE 4 og <b>erstat</b> indstillingerne fra KDE 3</translation>
+ <location filename="choicepage.cpp" line="56"/>
+ <source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="60"/>
+ <location filename="choicepage.cpp" line="61"/>
<source>Merge settings from KDE3 and KDE4 (experimental)</source>
- <translation>Flet indstillinger fra KDE3 og KDE4 (experimentel)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="69"/>
- <source>Start with a fresh KDE. This option will <b>remove</b> data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data</source>
- <translation>Start med en ren KDE. Denne mulighed vil <b>fjerne</b> data og indstillinger som kontakter, lokalt gemte emails, kontoer i KMail og Kopete, bogmærker og anden sådan data</translation>
+ <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="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="86"/>
- <source>You have not enough free space to actually do a backup, please consider freeing up some space by going to TTY1</source>
- <translation>Du har ikke nok ledig plads til at lave en sikkerhedskopi. Du kan frigøre plads ved at skifte til TTY1 og rydde op</translation>
+ <location filename="choicepage.cpp" line="73"/>
+ <source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="90"/>
- <source>The current kde settings and data dir takes up %1 bytes</source>
- <translation>Nuværende KDE indstilings- og data-folder fylder %1 bytes</translation>
+ <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="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="98"/>
- <source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
- <translation>Tag sikkerhedskopi af indstillinger fra KDE3 til .kde3-backp. (Kraftigt anbefalet)</translation>
+ <location filename="choicepage.cpp" line="96"/>
+ <source>The current KDE settings and data directory takes up %1 bytes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="choicepage.cpp" line="112"/>
+ <source>Recheck</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
- <location filename="intropage.cpp" line="22"/>
- <source>This wizard will guide you thru the migration of KDE 3 and KDE 4 settings as required</source>
- <translation>Denne troldmand vil hjælpe dig gennem migreringen af KDE3 og KDE4-indstillenger som påkrævet</translation>
- </message>
- <message>
<location filename="intropage.cpp" line="21"/>
<source>Kaboom - MigrationTool</source>
- <translation>Kaboom - Migreringsværktøj</translation>
+ <translation type="unfinished"></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="unfinished"></translation>
</message>
</context>
<context>
<name>MigrationPage</name>
<message>
<location filename="migrationpage.cpp" line="103"/>
- <source>When you click "start", migration will start</source>
- <translation>Når du trykker på "start", vil migreringen starte</translation>
+ <source>When you click "start", settitgs migration will start</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="migrationpage.cpp" line="106"/>
<source>Start Migration</source>
- <translation>Start migrering</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -80,17 +84,17 @@
<message>
<location filename="migrationpage.cpp" line="30"/>
<source>Start</source>
- <translation>Start</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="migrationpage.cpp" line="32"/>
<source>Errors occured</source>
- <translation>Der opstod fejl</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="migrationpage.cpp" line="42"/>
<source>Migration running</source>
- <translation>Migrering i gang</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -98,17 +102,17 @@
<message>
<location filename="migrationtool.cpp" line="37"/>
<source>&Back</source>
- <translation>Til&bage</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="migrationtool.cpp" line="38"/>
<source>&Next</source>
- <translation>&Frem</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="migrationtool.cpp" line="39"/>
<source>&Finish</source>
- <translation>Fær&dig</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -116,70 +120,70 @@
<message>
<location filename="diroperations/diroperations.cpp" line="33"/>
<source>User canceled the operation</source>
- <translation>Brugeren afbrød operationen</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="34"/>
<source>Access was denied to the file or directory %1</source>
- <translation>Adgang nægtet til filen eller mappen %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="35"/>
<source>%1: No such file or directory</source>
- <translation>%1: Ikke sådan file eller mappe</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="36"/>
<source>%1 already exists</source>
- <translation>%1 eksisterer</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="37"/>
<source>Could not copy %1</source>
- <translation>Kunne ikke kopiere %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="38"/>
<source>Could not create directory %1</source>
- <translation>Kunne ikke oprette mappe %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="39"/>
<source>Could not remove %1</source>
- <translation>Kunne ikke slette %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="40"/>
<source>Unknown error</source>
- <translation>Ukendt fejl</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="109"/>
<source>Calculating... %1 bytes</source>
- <translation>Udregner... %1 bytes</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="153"/>
<source>Copying files...</source>
- <translation>Kopierer filer...</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="260"/>
<source>Removing files...</source>
- <translation>Sletter filer...</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WarningPage</name>
<message>
- <location filename="warningpage.cpp" line="22"/>
- <source>You have selected a potentially harmful operation and not to backup data. You will most likely lose data here. Are you completely sure?</source>
- <translation>Du har valgt en potentielt skadelig operation og undladt sikkerhedskopier. Du vil højst sandsynlig miste data. Er du helt sikker?</translation>
- </message>
- <message>
<location filename="warningpage.cpp" line="21"/>
<source>Warning</source>
- <translation>Advarsel</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="warningpage.cpp" line="22"/>
+ <source>You have selected a potentially harmful operation and to not backup data. You will most likely lose data here. Are you completely sure?</source>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
diff --git a/kaboom_template.ts b/kaboom_template.ts
index 46c9c2f..ad4f40e 100644
--- a/kaboom_template.ts
+++ b/kaboom_template.ts
@@ -9,55 +9,60 @@
</message>
<message>
<location filename="choicepage.cpp" line="44"/>
- <source>Please select the option on how you want to migrate your settings</source>
+ <source>Please select your settings migratation option</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="48"/>
- <source>Migrate settings from KDE3 to KDE4 (recommended)</source>
+ <location filename="choicepage.cpp" line="49"/>
+ <source>Migrate settings from KDE3 to KDE4 (standard)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="55"/>
- <source>Move settings from KDE 4 dir and <b>replace</b> settings from KDE 3</source>
+ <location filename="choicepage.cpp" line="56"/>
+ <source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="60"/>
+ <location filename="choicepage.cpp" line="61"/>
<source>Merge settings from KDE3 and KDE4 (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="69"/>
- <source>Start with a fresh KDE. This option will <b>remove</b> data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data</source>
+ <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="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="86"/>
- <source>You have not enough free space to actually do a backup, please consider freeing up some space by going to TTY1</source>
+ <location filename="choicepage.cpp" line="73"/>
+ <source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="90"/>
- <source>The current kde settings and data dir takes up %1 bytes</source>
+ <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="unfinished"></translation>
</message>
<message>
- <location filename="choicepage.cpp" line="98"/>
- <source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
+ <location filename="choicepage.cpp" line="96"/>
+ <source>The current KDE settings and data directory takes up %1 bytes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="choicepage.cpp" line="112"/>
+ <source>Recheck</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
- <location filename="intropage.cpp" line="22"/>
- <source>This wizard will guide you thru the migration of KDE 3 and KDE 4 settings as required</source>
+ <location filename="intropage.cpp" line="21"/>
+ <source>Kaboom - MigrationTool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="intropage.cpp" line="21"/>
- <source>Kaboom - MigrationTool</source>
+ <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="unfinished"></translation>
</message>
</context>
@@ -65,7 +70,7 @@
<name>MigrationPage</name>
<message>
<location filename="migrationpage.cpp" line="103"/>
- <source>When you click "start", migration will start</source>
+ <source>When you click "start", settitgs migration will start</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -171,13 +176,13 @@
<context>
<name>WarningPage</name>
<message>
- <location filename="warningpage.cpp" line="22"/>
- <source>You have selected a potentially harmful operation and not to backup data. You will most likely lose data here. Are you completely sure?</source>
+ <location filename="warningpage.cpp" line="21"/>
+ <source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="warningpage.cpp" line="21"/>
- <source>Warning</source>
+ <location filename="warningpage.cpp" line="22"/>
+ <source>You have selected a potentially harmful operation and to not backup data. You will most likely lose data here. Are you completely sure?</source>
<translation type="unfinished"></translation>
</message>
</context>
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list