[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 5b3527d0fc409b9bde2c0d3e6cf06ce8a87bdfbd

Sune Vuorela pusling-guest at alioth.debian.org
Tue Feb 24 08:15:16 UTC 2009


The following commit has been merged in the master branch:
commit 146a4dd5a2a393dcf6bed150b36a9570c187f449
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Feb 24 09:05:59 2009 +0100

    string&translation update

diff --git a/kaboom_da.ts b/kaboom_da.ts
index 47cfb8a..f2d49ec 100644
--- a/kaboom_da.ts
+++ b/kaboom_da.ts
@@ -1,39 +1,50 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="da">
+<defaultcodec></defaultcodec>
 <context>
     <name>ChoicePage</name>
     <message>
+        <location filename="choicepage.cpp" line="40"/>
         <source>Kaboom - MigrationTool</source>
         <translation>Kaboom - Migreringsværktøj</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>
     </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>
     </message>
     <message>
+        <location filename="choicepage.cpp" line="55"/>
         <source>Move settings from KDE 4 dir and &lt;b&gt;replace&lt;/b&gt; settings from KDE 3</source>
         <translation>Flyt indstillinger fra KDE 4 og &lt;b&gt;erstat&lt;/b&gt; indstillingerne fra KDE 3</translation>
     </message>
     <message>
+        <location filename="choicepage.cpp" line="60"/>
         <source>Merge settings from KDE3 and KDE4 (experimental)</source>
         <translation>Flet indstillinger fra KDE3 og KDE4 (experimentel)</translation>
     </message>
     <message>
+        <location filename="choicepage.cpp" line="69"/>
         <source>Start with a fresh KDE. This option will &lt;b&gt;remove&lt;/b&gt; 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 &lt;b&gt;fjerne&lt;/b&gt; data og indstillinger som kontakter, lokalt gemte emails, kontoer i KMail og Kopete, bogmærker og anden sådan data</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>
     </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>
     </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>
     </message>
@@ -41,10 +52,12 @@
 <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>
     </message>
@@ -52,10 +65,12 @@
 <context>
     <name>MigrationPage</name>
     <message>
+        <location filename="migrationpage.cpp" line="103"/>
         <source>When you click &quot;start&quot;, migration will start</source>
         <translation>Når du trykker på &quot;start&quot;, vil migreringen starte</translation>
     </message>
     <message>
+        <location filename="migrationpage.cpp" line="106"/>
         <source>Start Migration</source>
         <translation>Start migrering</translation>
     </message>
@@ -63,57 +78,93 @@
 <context>
     <name>MigrationPagePrivate</name>
     <message>
+        <location filename="migrationpage.cpp" line="30"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
+        <location filename="migrationpage.cpp" line="32"/>
         <source>Errors occured</source>
         <translation>Der opstod fejl</translation>
     </message>
+    <message>
+        <location filename="migrationpage.cpp" line="42"/>
+        <source>Migration running</source>
+        <translation>Migrering i gang</translation>
+    </message>
+</context>
+<context>
+    <name>MigrationTool</name>
+    <message>
+        <location filename="migrationtool.cpp" line="37"/>
+        <source>&amp;Back</source>
+        <translation>Til&amp;bage</translation>
+    </message>
+    <message>
+        <location filename="migrationtool.cpp" line="38"/>
+        <source>&amp;Next</source>
+        <translation>&amp;Frem</translation>
+    </message>
+    <message>
+        <location filename="migrationtool.cpp" line="39"/>
+        <source>&amp;Finish</source>
+        <translation>Fær&amp;dig</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="33"/>
         <source>User canceled the operation</source>
         <translation>Brugeren afbrød operationen</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>
     </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>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="36"/>
         <source>%1 already exists</source>
         <translation>%1 eksisterer</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="37"/>
         <source>Could not copy %1</source>
         <translation>Kunne ikke kopiere %1</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="38"/>
         <source>Could not create directory %1</source>
         <translation>Kunne ikke oprette mappe %1</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="39"/>
         <source>Could not remove %1</source>
         <translation>Kunne ikke slette %1</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="40"/>
         <source>Unknown error</source>
         <translation>Ukendt fejl</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="109"/>
         <source>Calculating... %1 bytes</source>
         <translation>Udregner... %1 bytes</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="153"/>
         <source>Copying files...</source>
         <translation>Kopierer filer...</translation>
     </message>
     <message>
+        <location filename="diroperations/diroperations.cpp" line="260"/>
         <source>Removing files...</source>
         <translation>Sletter filer...</translation>
     </message>
@@ -121,8 +172,14 @@
 <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>
+    </message>
 </context>
 </TS>
diff --git a/kaboom_template.ts b/kaboom_template.ts
index a951d82..46c9c2f 100644
--- a/kaboom_template.ts
+++ b/kaboom_template.ts
@@ -43,7 +43,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="choicepage.cpp" line="97"/>
+        <location filename="choicepage.cpp" line="98"/>
         <source>Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -86,6 +86,29 @@
         <source>Errors occured</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="migrationpage.cpp" line="42"/>
+        <source>Migration running</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MigrationTool</name>
+    <message>
+        <location filename="migrationtool.cpp" line="37"/>
+        <source>&amp;Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="migrationtool.cpp" line="38"/>
+        <source>&amp;Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="migrationtool.cpp" line="39"/>
+        <source>&amp;Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -148,9 +171,14 @@
 <context>
     <name>WarningPage</name>
     <message>
-        <location filename="warningpage.cpp" line="21"/>
+        <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 type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="warningpage.cpp" line="21"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list