[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 492fa6c5c3fffa8edc99a2f821e8b37a93313457
Sune Vuorela
pusling-guest at alioth.debian.org
Tue Feb 24 22:45:50 UTC 2009
The following commit has been merged in the master branch:
commit 3428f6c5df4e6d6ffb4f34e29999e931c855ba87
Merge: 510dd3022f1ec6638d98321ab6478c716adbfeed dc90e21e6f131996973224c66d0f5b10104dd76c
Author: Sune Vuorela <sune at vuorela.dk>
Date: Tue Feb 24 23:43:42 2009 +0100
merge stuff
diff --combined kaboom_da.ts
index c96a702,db2e4be..ad4f40e
--- a/kaboom_da.ts
+++ b/kaboom_da.ts
@@@ -1,83 -1,87 +1,82 @@@
<?xml version="1.0" encoding="utf-8"?>
- <!DOCTYPE TS><TS version="1.1" language="da">
- <defaultcodec></defaultcodec>
-<!DOCTYPE TS>
-<TS version="2.0">
++<!DOCTYPE TS><TS version="1.1">
<context>
<name>ChoicePage</name>
<message>
<location filename="choicepage.cpp" line="40"/>
- <source>Kaboom - Migration Tool</source>
- <oldsource>Kaboom - MigrationTool</oldsource>
+ <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 your settings migration option</source>
- <oldsource>Please select your settings migratation option</oldsource>
+ <source>Please select your settings migratation option</source>
- <translation>Vælg migreringsmuligheder</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="choicepage.cpp" line="49"/>
<source>Migrate settings from KDE3 to KDE4 (standard)</source>
- <translation>Migrer indstillinger fra KDE 3 til KDE 4 (standard)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="choicepage.cpp" line="56"/>
<source>Use existing KDE 4 settings and <b>replace</b> KDE 3 settings</source>
- <translation>Brug eksisterende KDE 4 indstillinger og <b>erstat</b> KDE 3 indstillinger</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<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="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>Start med standard KDE indstillinger og data. Dette valg vil <b>fjerne</b> al data og alle indstillinger så som kontakter, lokalt gemte emails, konti i KMail og Kopete, bogmærker og anden sådan data</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="choicepage.cpp" line="73"/>
<source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
- <translation>Tag sikkerhedskopi af eksisterende indstillinger fra KDE3 til .kde3-backup. (Kraftigt anbefalet)</translation>
+ <translation type="unfinished"></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>Utilstrækkelig ledig plads til at fuldføre en sikkerhedskopi, overvej gerne at frigive mere plads. Du kan gå til TTY1 for at gøre dette.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="choicepage.cpp" line="96"/>
<source>The current KDE settings and data directory takes up %1 bytes</source>
- <translation>Nuværende KDE indstillings- og datafolder fylder %1 bytes</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="choicepage.cpp" line="112"/>
<source>Recheck</source>
- <translation>Gentjek</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>IntroPage</name>
<message>
<location filename="intropage.cpp" line="21"/>
- <source>Kaboom - Migration Tool</source>
- <oldsource>Kaboom - MigrationTool</oldsource>
+ <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>Denne guide vil hjælpe dig gennem processen med at migrere dine KDE indstillinger som påkrævet</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MigrationPage</name>
<message>
<location filename="migrationpage.cpp" line="103"/>
- <source>When you click "Start", settings migration will start</source>
- <oldsource>When you click "start", settitgs migration will start</oldsource>
+ <source>When you click "start", settitgs migration will start</source>
- <translation>Når du trykker på "start", vil migreringen af instillingerne starte</translation>
+ <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>
@@@ -85,17 -89,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>
@@@ -103,17 -107,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>&Næste</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="migrationtool.cpp" line="39"/>
<source>&Finish</source>
- <translation>&Færdig</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@@ -121,57 -125,57 +120,57 @@@
<message>
<location filename="diroperations/diroperations.cpp" line="33"/>
<source>User canceled the operation</source>
- <translation>Brugeren afbrød handlingen</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: ingen slig fil eller mappe</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="diroperations/diroperations.cpp" line="36"/>
<source>%1 already exists</source>
- <translation>%1 eksisterer allerede</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 fjerne %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>Fjerner filer...</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@@ -179,12 -183,12 +178,12 @@@
<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>Du har valgt en potentiel skadelig operation og fravalgt at tage sikkerhedskopier. Du vil sandsynligvis miste data. Er du helt sikker?</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list