Bug#314016: marked as done (kdiff3: [INTL:de] German PO file corrections)

[Debian Bug Tracking System]

Your message dated Wed, 07 Sep 2005 11:47:06 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#314016: fixed in kdiff3 0.9.88-5
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at maintonly) by bugs.debian.org; 14 Jun 2005 21:32:55 +0000
>From [EMAIL PROTECTED] Tue Jun 14 14:32:55 2005
Return-path: <[EMAIL PROTECTED]>
Received: from smtp05.web.de [217.72.192.209] 
        by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
        id 1DiJ1i-0006Ai-00; Tue, 14 Jun 2005 14:32:54 -0700
Received: from [84.180.153.47] (helo=pluto.sol)
        by smtp05.web.de with asmtp (TLSv1:DES-CBC3-SHA:168)
        (WEB.DE 4.105 #291)
        id 1DiJ1C-000292-00
        for [EMAIL PROTECTED]; Tue, 14 Jun 2005 23:32:23 +0200
Received: from jens by pluto.sol with local (Exim 4.50)
        id 1DiIxl-0007QS-EZ; Tue, 14 Jun 2005 23:28:49 +0200
Date: Tue, 14 Jun 2005 23:28:49 +0200
From: Jens Seidel <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: kdiff3: [INTL:de] German PO file corrections
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="M9NhX3UHpAaciwkO"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
User-Agent: Mutt/1.5.9i
Sender: [EMAIL PROTECTED]
X-Sender: [EMAIL PROTECTED]
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
        (1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_01,HAS_PACKAGE 
        autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level: 


--M9NhX3UHpAaciwkO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Package: kdiff3
Version: 0.9.88-4
Severity: minor
Tags: patch l10n

Hi,

attached you will find an update of the German PO file de.po.

Note that this is a semi automatic created mail which contains all issues I
found during checking most of Debians German PO files. This includes also
encoding but mostly typo fixes.  Please contact upstream for non-native
Debian packages to incorporate the changes (even if Debians version is old)
since I noticed that the same errors are made again and again over all
packages.

Jens




--M9NhX3UHpAaciwkO
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="de.po.diff"
Content-Transfer-Encoding: 8bit

--- de.po.gz.orig/kdiff3_0.9.88-4_de.po 2005-06-11 16:42:50.000000000 +0200
+++ de.po.gz/kdiff3_0.9.88-4_de.po      2005-06-14 20:40:55.000000000 +0200
@@ -402,7 +402,7 @@
 "Sie erwartet.\n"
 "WÀhlen Sie \"Simulieren\" um zu sehen, was passieren wÌrde.\n"
 "\n"
-"Sie sollten aber wissen, dass dieses Program noch Beta-Status hat und es "
+"Sie sollten aber wissen, dass dieses Programm noch Beta-Status hat und es "
 "KEINE GARANTIE gibt! Erstellen Sie Sicherungkopien Ihrer wichtigen Daten!"
 
 #: directorymergewindow.cpp:1698
@@ -603,7 +603,7 @@
 
 #: directorymergewindow.cpp:2301
 msgid "Link-Destination"
-msgstr "VerkÃŒpfungsziel"
+msgstr "VerknÃŒpfungsziel"
 
 #: directorymergewindow.cpp:2351
 msgid "not available"
@@ -876,13 +876,13 @@
 
 #: kdiff3.cpp:383
 msgid "(Skips white space differences when \"Show White Space\" is disabled.)"
-msgstr "(Unterschiede in weissen Zeichen werden ÃŒbersprungen, wenn \"Zeige 
weisse Zeichen\" ausgeschaltet ist.)"
+msgstr "(Unterschiede in weißen Zeichen werden ÃŒbersprungen, wenn 
\"Zeige weiße Zeichen\" ausgeschaltet ist.)"
 
 #: kdiff3.cpp:384
 msgid ""
 "(Does not skip white space differences even when \"Show White Space\" is "
 "disabled.)"
-msgstr "(Unterschiede in weissen Zeichen werden nicht ÃŒbersprungen, auch 
wenn \"Zeige weisse Zeichen\" ausgeschaltet ist.)"
+msgstr "(Unterschiede in weißen Zeichen werden nicht ÃŒbersprungen, auch 
wenn \"Zeige weiße Zeichen\" ausgeschaltet ist.)"
 
 #: kdiff3.cpp:385
 msgid "Go to Previous Delta"
@@ -930,7 +930,7 @@
 
 #: kdiff3.cpp:403
 msgid "Show White Space"
-msgstr "Zeige \"weisse\" Zeichen"
+msgstr "Zeige \"weiße\" Zeichen"
 
 #: kdiff3.cpp:405
 msgid "Show Line Numbers"
@@ -962,15 +962,15 @@
 
 #: kdiff3.cpp:412
 msgid "Choose A for All Unsolved Whitespace Conflicts"
-msgstr "WÀhle A fÌr alle ungelösten \"weissen\" Konflikte"
+msgstr "WÀhle A fÃŒr alle ungelösten \"weißen\" Konflikte"
 
 #: kdiff3.cpp:413
 msgid "Choose B for All Unsolved Whitespace Conflicts"
-msgstr "WÀhle B fÌr alle ungelösten \"weissen\" Konflikte"
+msgstr "WÀhle B fÃŒr alle ungelösten \"weißen\" Konflikte"
 
 #: kdiff3.cpp:414
 msgid "Choose C for All Unsolved Whitespace Conflicts"
-msgstr "WÀhle C fÌr alle ungelösten \"weissen\" Konflikte"
+msgstr "WÀhle C fÃŒr alle ungelösten \"weißen\" Konflikte"
 
 #: kdiff3.cpp:415
 msgid "Automatically Solve Simple Conflicts"
@@ -1200,7 +1200,7 @@
 #: mergeresultwindow.cpp:902 mergeresultwindow.cpp:913
 #: mergeresultwindow.cpp:924
 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
-msgstr "Anzahl der verbleibenden ungelösten Konflikte: %1 (wobei %2 davon 
weisse Konflikte sind)"
+msgstr "Anzahl der verbleibenden ungelösten Konflikte: %1 (wobei %2 davon 
weiße Konflikte sind)"
 
 #: mergeresultwindow.cpp:270
 msgid ""
@@ -1272,7 +1272,7 @@
 
 #: mergeresultwindow.cpp:1124
 msgid "<Merge Conflict (Whitespace only)>"
-msgstr "<ZusammenfÃŒhrungskonflikt (nur weisse Unterschiede)>"
+msgstr "<ZusammenfÃŒhrungskonflikt (nur weiße Unterschiede)>"
 
 #: mergeresultwindow.cpp:1126 mergeresultwindow.cpp:1897
 msgid "<Merge Conflict>"
@@ -1485,7 +1485,7 @@
 "white space.)\n"
 "Might help to compare files with numeric data."
 msgstr ""
-"Zahlen werden wÀhrend des Vergleichs wie \"weisse\" Zeichen behandelt.\n"
+"Zahlen werden wÀhrend des Vergleichs wie \"weiße\" Zeichen 
behandelt.\n"
 "Könnte helfen, wenn Dateien viele Zahlen enthalten."
 
 #: optiondialog.cpp:611
@@ -1494,7 +1494,7 @@
 
 #: optiondialog.cpp:613
 msgid "Treat C/C++ comments like white space."
-msgstr "Behandle C/C++ Kommentare wie \"weisse\" Zeichen."
+msgstr "Behandle C/C++ Kommentare wie \"weiße\" Zeichen."
 
 #: optiondialog.cpp:617
 msgid "Ignore case"
@@ -1503,7 +1503,7 @@
 #: optiondialog.cpp:620
 msgid "Treat case differences like white space changes. ('a'<=>'A')"
 msgstr ""
-"Unterschiede bei Groß- und Kleinschreibung wie weisse Unterschiede "
+"Unterschiede bei Groß- und Kleinschreibung wie weiße Unterschiede "
 "behandeln. ('a'<=>'A')"
 
 #: optiondialog.cpp:624
@@ -1554,7 +1554,7 @@
 
 #: optiondialog.cpp:656
 msgid "White space 2-file merge default:"
-msgstr "\"Weisse\" Zeichen Autoauswahl bei 2 Dateien:"
+msgstr "\"Weiße\" Zeichen Autoauswahl bei 2 Dateien:"
 
 #: optiondialog.cpp:660 optiondialog.cpp:673
 msgid "Manual Choice"
@@ -1566,11 +1566,11 @@
 "white-space-only changes."
 msgstr ""
 "Bei Datei-ZusammenfÃŒhrungen wird automatisch diese Vorauswahl fÃŒr "
-"ausschliesslich \"weisse\" Konflikte gewÀhlt."
+"ausschließlich \"weiße\" Konflikte gewÀhlt."
 
 #: optiondialog.cpp:669
 msgid "White space 3-file merge default:"
-msgstr "\"Weisse\" Zeichen Autoauswahl bei 3 Dateien:"
+msgstr "\"Weiße\" Zeichen Autoauswahl bei 3 Dateien:"
 
 #: optiondialog.cpp:688
 msgid "Directory Merge"
@@ -1668,14 +1668,14 @@
 
 #: optiondialog.cpp:758
 msgid "Follow directory links"
-msgstr "Folge Verzeichnis-VerkÃŒpfungen"
+msgstr "Folge Verzeichnis-VerknÃŒpfungen"
 
 #: optiondialog.cpp:761
 msgid ""
 "On: Compare the directory the link points to.\n"
 "Off: Compare the links."
 msgstr ""
-"Falls aktiv werden die Verzeichnisse, auf die eine VerkÃŒpfung zeigt, "
+"Falls aktiv werden die Verzeichnisse, auf die eine VerknÃŒpfung zeigt, "
 "verglichen.\n"
 "Sonst nur die VerknÃŒpfungen."
 
@@ -1757,13 +1757,13 @@
 
 #: optiondialog.cpp:801
 msgid "White space differences considered equal"
-msgstr "Dateien mit \"Weissen\" Unterschieden als gleich markieren"
+msgstr "Dateien mit \"Weißen\" Unterschieden als gleich markieren"
 
 #: optiondialog.cpp:804
 msgid ""
 "If files differ only by white space consider them equal.\n"
 "This is only active when full analysis is chosen."
-msgstr "Wenn sich Dateien nur durch weisse Zeichen unterscheiden, sollen diese 
wie gleiche Dateien behandelt werden.\n Dies ist nur wÀhlbar, wenn 
vollstÀndige Analyse ausgewÀhlt ist."
+msgstr "Wenn sich Dateien nur durch weiße Zeichen unterscheiden, sollen 
diese wie gleiche Dateien behandelt werden.\n Dies ist nur wÀhlbar, wenn 
vollstÀndige Analyse ausgewÀhlt ist."
 
 #: optiondialog.cpp:810
 msgid "Copy newer instead of merging (unsafe)"

--M9NhX3UHpAaciwkO--

---------------------------------------
Received: (at 314016-close) by bugs.debian.org; 7 Sep 2005 18:48:36 +0000
>From [EMAIL PROTECTED] Wed Sep 07 11:48:36 2005
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
        id 1ED4ws-0001Af-00; Wed, 07 Sep 2005 11:47:06 -0700
From: Eike Sauer <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.56 $
Subject: Bug#314016: fixed in kdiff3 0.9.88-5
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Wed, 07 Sep 2005 11:47:06 -0700
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
        (1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
        autolearn=no version=2.60-bugs.debian.org_2005_01_02

Source: kdiff3
Source-Version: 0.9.88-5

We believe that the bug you reported is fixed in the latest version of
kdiff3, which is due to be installed in the Debian FTP archive:

kdiff3_0.9.88-5.diff.gz
  to pool/main/k/kdiff3/kdiff3_0.9.88-5.diff.gz
kdiff3_0.9.88-5.dsc
  to pool/main/k/kdiff3/kdiff3_0.9.88-5.dsc
kdiff3_0.9.88-5_i386.deb
  to pool/main/k/kdiff3/kdiff3_0.9.88-5_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Eike Sauer <[EMAIL PROTECTED]> (supplier of updated kdiff3 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 7 Seb 2005 15:15:00 +0100
Source: kdiff3
Binary: kdiff3
Architecture: source i386
Version: 0.9.88-5
Distribution: unstable
Urgency: low
Maintainer: Eike Sauer <[EMAIL PROTECTED]>
Changed-By: Eike Sauer <[EMAIL PROTECTED]>
Description: 
 kdiff3     - compares and merges 2 or 3 files or directories
Closes: 314016
Changes: 
 kdiff3 (0.9.88-5) unstable; urgency=low
 .
   * corrections to German po file, thanks to Jens Seidel (closes: #314016)
   * mention GNU diff in copyright file (hint by Florian Ernst)
   * making manual known to doc-base, so obeying to Debian Policy 3.6.2
   * ABI transition to GCC 4.0 (closes #327048)
Files: 
 fba99a514aeaf24f2c11dd314a1848e0 649 kde optional kdiff3_0.9.88-5.dsc
 7055fbf96c730d48c070b5dea5931302 5314 kde optional kdiff3_0.9.88-5.diff.gz
 a45049cbf15da80e19efd33aa5a0ef21 1235284 kde optional kdiff3_0.9.88-5_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFDHzEQCV53xXnMZYYRAmeaAKDOeJv5r4PxrL9G2u6V4qjBBtLUJQCg5YL/
9iulCPgHmulJhfai/5HXxKA=
=G+Eo
-----END PGP SIGNATURE-----


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]