This is a multi-part message in MIME format. --nextPart2501091.tIAgqjz4sF Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Hallo Tobi, Am Freitag, 23. April 2021, 22:13:54 CEST schrieb onewayme001@posteo.de: >=20 > bei der Erstellung des diff zu der =C3=9Cbersetzung von krita.po wird die= ses > sehr gro=C3=9F (2,5 MiB). Krita.po selbst hat 2,2 MiB. Kann das so stimme= n? > Und wenn ja, wie bekomme ich das auf Phabricator? >=20 Der Diff ist eindeutig falsch, so gro=C3=9F wird ein Diff nur, wenn Du die= =20 =C3=9Cbersetzung *aller* Nachrichten in krita.po ge=C3=A4ndert hast. Um deinen Diff zu pr=C3=BCfen kannst Du ihn in Konsole mit "less /pfad/zu/d= eindiff"=20 lesen oder mit einem Editor wie Kate/KWrite =C3=B6ffnen. Als Beispiel f=C3=BCr einen Diff habe ich svn diff von kdiff3/diff_ext.po m= it einer=20 ge=C3=A4nderten Nachricht einmal mit Kontext, erstellt mit svn diff -x -U100 l10n-kf5/de/messages/kdiff3/diff_ext.po > /tmp/diff_ext.p= o.diff und einmal ohne Kontext, erstellt mit svn diff l10n-kf5/de/messages/kdiff3/diff_ext.po > /tmp/diff_ext.po.diffohn= eKontext angeh=C3=A4ngt. Ich benutze f=C3=BCr das Erstellen von diffs folgenden Befehl in Konsole: svn diff -x -U100 pfad/zu/krita.po >/tmp/krita.po.diff Gru=C3=9F =2D-=20 Burkhard L=C3=BCck --nextPart2501091.tIAgqjz4sF Content-Disposition: attachment; filename="diff_ext.po.diffohneKontext" Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset="UTF-8"; name="diff_ext.po.diffohneKontext" Index: l10n-kf5/de/messages/kdiff3/diff_ext.po =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- l10n-kf5/de/messages/kdiff3/diff_ext.po (revision 1599187) +++ l10n-kf5/de/messages/kdiff3/diff_ext.po (working copy) @@ -1,13 +1,13 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the kdiff3 package. # =2D# Burkhard L=C3=BCck , 2018, 2020. +# Burkhard L=C3=BCck , 2018, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-04-23 00:21+0000\n" =2D"PO-Revision-Date: 2020-09-29 08:39+0200\n" +"PO-Revision-Date: 2021-04-24 08:22+0200\n" "Last-Translator: Burkhard L=C3=BCck \n" "Language-Team: German \n" "Language: de\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=3DUTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3D2; plural=3Dn !=3D 1;\n" =2D"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 19.12.3\n" =20 #: diff_ext.cpp:206 #, kde-format @@ -74,10 +74,10 @@ "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\= n" =20 #: diff_ext.cpp:326 =2D#, fuzzy, kde-format +#, kde-format #| msgid "This software is distributable under the BSD license.\n" msgid "This software is distributable under the BSD-2-Clause license.\n" =2Dmsgstr "Diese Software wird unter der Lizenz BSD-Lizenz verteilt.\n" +msgstr "Diese Software wird unter der Lizenz BSD-2-Clause verteilt.\n" =20 #: diff_ext.cpp:327 #, kde-format --nextPart2501091.tIAgqjz4sF Content-Disposition: attachment; filename="diff_ext.po.diffmitKontext" Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset="UTF-8"; name="diff_ext.po.diffmitKontext" Index: l10n-kf5/de/messages/kdiff3/diff_ext.po =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- l10n-kf5/de/messages/kdiff3/diff_ext.po (revision 1599187) +++ l10n-kf5/de/messages/kdiff3/diff_ext.po (working copy) @@ -1,137 +1,137 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the kdiff3 package. # =2D# Burkhard L=C3=BCck , 2018, 2020. +# Burkhard L=C3=BCck , 2018, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-04-23 00:21+0000\n" =2D"PO-Revision-Date: 2020-09-29 08:39+0200\n" +"PO-Revision-Date: 2021-04-24 08:22+0200\n" "Last-Translator: Burkhard L=C3=BCck \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=3DUTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3D2; plural=3Dn !=3D 1;\n" =2D"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 19.12.3\n" =20 #: diff_ext.cpp:206 #, kde-format msgid "Compare with %1" msgstr "Mit %1 vergleichen" =20 #: diff_ext.cpp:207 #, kde-format msgid "Merge with %1" msgstr "Mit %1 zusammenf=C3=BChren" =20 #: diff_ext.cpp:217 #, kde-format msgid "3-way merge with base" msgstr "3-Wege-Zusammenf=C3=BChrung mit Basis" =20 #: diff_ext.cpp:220 #, kde-format msgid "Save '%1' for later" msgstr "=E2=80=9E%1=E2=80=9C f=C3=BCr sp=C3=A4ter speichern" =20 #: diff_ext.cpp:234 #, kde-format msgid "Compare with ..." msgstr "Vergleichen mit ..." =20 #: diff_ext.cpp:237 #, kde-format msgid "Clear list" msgstr "Liste leeren" =20 #: diff_ext.cpp:242 #, kde-format msgid "Compare" msgstr "Vergleichen" =20 #: diff_ext.cpp:246 #, kde-format msgid "3 way comparison" msgstr "3-Wege-Vergleich" =20 #: diff_ext.cpp:252 #, kde-format msgid "About Diff-Ext ..." msgstr "=C3=9Cber Diff-Ext ..." =20 #: diff_ext.cpp:323 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" =20 #: diff_ext.cpp:325 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved= =2E\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\= n" =20 #: diff_ext.cpp:326 =2D#, fuzzy, kde-format +#, kde-format #| msgid "This software is distributable under the BSD license.\n" msgid "This software is distributable under the BSD-2-Clause license.\n" =2Dmsgstr "Diese Software wird unter der Lizenz BSD-Lizenz verteilt.\n" +msgstr "Diese Software wird unter der Lizenz BSD-2-Clause verteilt.\n" =20 #: diff_ext.cpp:327 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Einige Erweiterungen f+r KDiff3 (c) 2006-2013 von Joachim Eibl.\n" =20 #: diff_ext.cpp:328 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Webseite von Diff-Ext: http://diff-ext.sourceforge.net\n" =20 #: diff_ext.cpp:329 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "=C3=9Cber Diff-Ext f=C3=BCr KDiff3 " =20 #: diff_ext.cpp:358 #, kde-format msgid "Compare selected files" msgstr "Ausgew=C3=A4hlte Dateien vergleichen" =20 #: diff_ext.cpp:364 diff_ext.cpp:382 #, kde-format msgid "Compare '%1' with '%2'" msgstr "=E2=80=9E%1=E2=80=9C mit =E2=80=9E%2=E2=80=9C vergleichen" =20 #: diff_ext.cpp:369 #, kde-format msgid "Save '%1' for later operation" msgstr "=E2=80=9E%1=E2=80=9C f=C3=BCr sp=C3=A4tere Operation speichern" =20 #: diff_ext.cpp:423 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" "KDiff3 kann nicht gestartet werden. Bitte installieren Sie KDiff3 erneut." =20 #: diff_ext.cpp:424 #, kde-format msgid "Command" msgstr "Befehl" =20 #: diff_ext.cpp:425 #, kde-format msgid "CommandLine" msgstr "Befehlszeile" =20 #: diff_ext.cpp:426 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext f=C3=BCr KDiff3" =20 #~ msgid "(64 Bit)" #~ msgstr "(64 Bit)" =20 #~ msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net" #~ msgstr "Webseite von KDiff3: http://kdiff3.sourceforge.net" --nextPart2501091.tIAgqjz4sF--