The following commit has been merged in the master branch:
commit 9d8b4f21e1ba75d1e18e52767d1a095bbd997d53
Author: Helge Kreutzmann <[email protected]>
Date: Tue Apr 20 22:17:55 2010 +0200
Update German scripts translation
Update to 508t0f1u
The remaining string seems to require a conversion of the po file to
UTF-8...
diff --git a/scripts/po/de.po b/scripts/po/de.po
index b1cb5b3..641b7bc 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: dpkg scripts\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-03-24 13:59+0100\n"
-"PO-Revision-Date: 2010-04-14 21:01+0200\n"
+"PO-Revision-Date: 2010-04-20 22:17+0200\n"
"Last-Translator: Helge Kreutzmann <[email protected]>\n"
"Language-Team: de <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,7 @@ msgstr ""
#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-mergechangelogs.pl:51 scripts/dpkg-name.pl:46
#: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
#: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:518
#: scripts/dpkg-source.pl:395 scripts/changelog/debian.pl:34
@@ -41,6 +42,7 @@ msgstr ""
#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -530,7 +532,7 @@ msgstr ""
"\n"
"Optionen:\n"
" -f<Dateilistedatei> Dateien hierin statt in debian/files schreiben.\n"
-" -h, --help zeigt diese Hilfemeldung..\n"
+" -h, --help zeigt diese Hilfemeldung.\n"
" --version zeigt die Version.\n"
#: scripts/dpkg-distaddfile.pl:72
@@ -1039,6 +1041,50 @@ msgstr "%s passt nicht komplett auf %s"
msgid "no debian/symbols file used as basis for generating %s"
msgstr "keine debian/symbols-Datei als Basis zur Erzeugung von %s verwendet"
+#: scripts/dpkg-mergechangelogs.pl:56
+msgid ""
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+msgstr ""
+"Dies ist freie Software; lesen Sie die GNU General Public License Version 2\n"
+"oder neuer f�r die Kopierbedingungen. Es gibt KEINE Haftung.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+"Aufruf: %s [<Option>...] <alt> <neu-a> <neu-b> [<Ausgabe>]\n"
+"\n"
+"Optionen:\n"
+" --merge-prereleases, -m vorab-Ver�ffentlichungen zusammenf�hren,\n"
+" ignoriert alles nach dem letzten �~� in "
+"der Version\n"
+" -h, --help zeigt diese Hilfemeldung.\n"
+" --version zeigt die Version.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
+#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:347
+#: scripts/Dpkg/Source/Package.pm:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, perl-format
+msgid "cannot write %s"
+msgstr "kann %s nicht schreiben"
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -1726,6 +1772,7 @@ msgid "architecture %s only allowed on its own (list for
package %s is `%s')"
msgstr "Architektur %s ist nur alleine erlaubt (Liste f�r Paket %s lautet
�%s�)"
#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -2026,21 +2073,6 @@ msgstr "Zeile %d von %s ist ung
msgid "invalid flag in %s: %s"
msgstr "ung�ltiger Schalter in %s: %s"
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
-#, perl-format
-msgid "cannot write %s"
-msgstr "kann %s nicht schreiben"
-
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
