Merge lenny branch (through the tag '1.14.20')

Conflicts:

	ChangeLog
	configure.ac
	debian/changelog
	man/ChangeLog
	man/dpkg.1
	man/po/de.po

ChangeLog

@@ -241,6 +241,140 @@
 
 	* configure.ac: Bump version to 1.15.0~.
 
+2008-06-16  Guillem Jover  <guillem@debian.org>
+
+	* lib/triglib.c (trig_file_interests_ensure): Pass the proper mask
+	to push_cleanup to make sure pop_cleanup closes the file.
+
+2008-06-15  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-divert.pl (checkrename): Do not check the target file
+	if the source does not exist and dorename was thus disabled.
+
+2008-06-09  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/dpkg-divert.pl, scripts/update-alternatives.pl,
+	scripts/install-info.pl, scripts/dpkg-statoverride.pl: Set
+	PERL_DL_NONLAZY to 1 so that the usage of Locale::Gettext doesn't
+	cause run-time failures when this perl binary module is not
+	compiled for the corresponding perl version (and this happens in
+	configuration scripts, in particular preinst, during upgrades).
+
+2008-06-08  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Patch.pm (analyze): Be less strict in
+	filenames accepted on ---/+++ lines. Don't blow up on absolute
+	filenames if the other one is fine. Make sure to use the one that
+	is relative and that corresponds to a real file when possible.
+
+2008-06-08  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: Use absolute path names
+	when giving directories and filenames to quilt to avoid any
+	problems due to quilt's feature of trying relative paths in parent
+	directories too.
+
+2008-06-07  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Patch.pm (analyze): Accept unexpected
+	end-of-file in patches if we're missing no more than 2 lines
+	of context. Output a warning instead.
+
+2008-06-07  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm (register_autopatch):
+	Register the newly created patch with quilt only if quilt has
+	already been used to apply the existing patches (or if we don't
+	have any patch yet), otherwise register it manually at the end of
+	the series.
+
+2008-06-05  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Patch.pm (add_diff_directory): If option
+	use_dev_null is set, then the label of the "old" file will be
+	'/dev/null' if we're creating a new file (instead of using the
+	name of the created file, like it's currently done in .diff
+	of version "1.0" source packages).
+	* scripts/Dpkg/Source/Package/V2.pm (prepare_build): Use the new
+	option "use_dev_null" when creating the automatic patch.
+
+2008-06-05  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm (get_patches): Really
+	skip all comments in the series files.
+
+2008-06-04  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Patch.pm (analyze): Enhance function to
+	parse correctly many more patches that are accepted by the patch
+	utility itself:
+	- ignore/strip carriage return of patches with Windows end of lines
+	- accept empty lines as contextual lines (instead of the expected " ")
+	- accept spaces as separator between filename and timestamp if
+	  there's no tab
+	- accept a name that differs on the +++ line if the name in --- is
+	  correct, and use the name in +++ if this one exists while the one
+	  on --- doesn't.
+
+2008-05-28  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package.pm (extract): If we extract a
+	source package that uses a non-standard (!= 1.0) source package
+	then we create debian/source/format to remember it.
+	* scripts/dpkg-source.pl: Use debian/source/format as a new source
+	of format to try when building the package. Prioritize it lower than
+	command line and debian/control but higher than the default build
+	formats.
+	* man/dpkg-source.1: Document the above changes.
+
+2008-05-28  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: Factorize calls to
+	quilt in a new run_quilt() function. And check only once
+	if quilt is available while setting the default value of
+	without_quilt option. Last but not least, register properly the
+	automatically generated patch with quilt import.
+
+2008-05-28  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Patch.pm (check_apply): New function to
+	verify if a patch will successfully apply on top of a given
+	directory.
+	* scripts/Dpkg/Source/Package/V3/quilt.pm (check_patches_applied):
+	Don't trust debian/patches/.dpkg-source-applied blindly. Get a
+	list of (supposedly unapplied) patches and verify if the first
+	patch applies or not. If yes, then apply the patch series,
+	otherwise do not (and assume that the patch series is already
+	applied).
+
+2008-05-23  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V2.pm (do_build): Display a
+	message when local modifications are stored in a new
+	automatic patch. This messages includes a list of
+	modified files.
+
+2008-05-23  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: Remove the .diff
+	from the name of the automatically generated patch. It will
+	facilitate the switch to this format: packages using
+	patch system that apply debian/patches/*.{patch,diff}
+	will not be bothered by the presence of the quilt serie
+	created by dpkg-source itself.
+	* man/dpkg-source.1: Update the documentation accordingly.
+	* man/po/*.po: Fix all the filenames to avoid fuzzying
+	translations.
+
+2008-05-22  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: Add missing "use
+	File::Path" for mkpath().
+
+2008-05-13  Guillem Jover  <guillem@debian.org>
+
+	* src/main.c (setforce): Add help output for '--force-breaks'.
+
 2008-05-12  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Bump version to 1.14.20~.

debian/changelog

@@ -45,11 +45,73 @@ dpkg (1.15.0) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 29 Apr 2008 06:01:40 +0300
 
-dpkg (1.14.20) UNRELEASED; urgency=low
+dpkg (1.14.20) unstable; urgency=low
 
-  *
+  [ Guillem Jover ]
+  * Change UTF-8 '©' to '(C)' in deb-version.5 (unfuzzy translations).
+  * Document --force-breaks in 'dpkg --force-help' output.
+  * Document triggers --debug values in dpkg.1. Thanks to Sven Joachim.
+  * Improve package descriptions for dpkg, dpkg-dev and dselect.
+    Thanks to Justin B Rye for the review and corrections. Closes: #484002
+  * When dpkg-divert does renames do no check the target file if the source
+    does not exist and the rename is thus being disabled. This also allows
+    to remove bogus diversions. Closes: #476973, #469033
+  * Properly close triggers 'File' file, so it does not get leaked to childs.
+
+  [ Raphael Hertzog ]
+  * Add missing 'use File::Path' in Dpkg::Source::Package::V3::quilt.
+  * Use debian/patches/debian-changes-<version> (without the trailing ".diff")
+    as default name for the automatic patch created by the format "3.0
+    (quilt)". This ensures a saner cohabitation with patch systems that
+    apply all of debian/patches/*.{diff,patch}.
+  * Improve patch parser to accept more patches that are accepted by patch
+    itself.
+  * Correctly skip comments in quilt series files (concerns "3.0 (quilt)" source
+    packages). Closes: #486323
+  * The automatically created patches (in source package formats "2.0" and
+    "3.0 (quilt)") will now contain "/dev/null" as previous filename when the
+    patch creates a new file (instead of putting the same name).
+  * Set PERL_DL_NONLZY to 1 in perl scripts that are likely to be called in
+    package's configuration scripts to work around the perl bug #479711.
+
+  [ Helge Kreutzmann ]
+  * Fix a typo in dselect.1.
+
+  [ Updated dpkg translations ]
+  * Basque (Piarres Beobide). Closes: #481043
+  * Brazilian Portuguese (Felipe Augusto van de Wiel).
+  * Catalan (Jordi Mallach). Closes: #383448
+  * Czech (Miroslav Kure).
+  * Galician (Jacobo Tarrio). Closes: #483441
+  * German (Sven Joachim).
+  * Norwegian Bokmal (Hans Fredrik Nordhaug). Closes: #480626
+  * Polish (Wiktor Wandachowicz).
+  * Simplified Chinese (Deng Xiyue). Closes: #483143
+  * Swedish (Peter Karlsson).
+  * Vietnamese (Clytie Siddall). Closes: #481199
+
+  [ Updated manpages translations ]
+  * German (Helge Kreutzmann).
+  * Polish (Wiktor Wandachowicz).
+  * Swedish (Peter Karlsson).
+
+  [ Updated scripts translations ]
+  * French (Christian Perrier).
+  * German (Helge Kreutzmann).
+  * Polish (Wiktor Wandachowicz).
+  * Russian (Yuri Kozlov).
+  * Swedish (Peter Karlsson).
+
+  [ Updated programs translations ]
+  * Basque (Piarres Beobide). Closes: #481043
+  * French (Christian Perrier).
+  * Polish (Wiktor Wandachowicz).
+
+  [ Updated dselect translations ]
+  * Brazilian Portuguese (Felipe Augusto van de Wiel).
+  * Polish (Wiktor Wandachowicz).
 
- -- Guillem Jover <guillem@debian.org>  Mon, 12 May 2008 09:04:34 +0300
+ -- Raphael Hertzog <hertzog@debian.org>  Wed, 18 Jun 2008 09:33:54 +0200
 
 dpkg (1.14.19) unstable; urgency=low
 

debian/control

@@ -23,12 +23,11 @@ Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11),
  dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
 Replaces: manpages-de (<= 0.4-3), manpages-pl (<= 20051117-1)
 Suggests: apt, lzma
-Description: package maintenance system for Debian
- This package contains the low-level commands for handling the installation
- and removal of packages on your system.
+Description: Debian package management system
+ This package privides the low-level infrastructure for handling the
+ installation and removal of Debian software packages.
  .
- In order to unpack and build Debian source packages you will need to
- install the developers' package `dpkg-dev' as well as this one.
+ For Debian package development tools, install dpkg-dev.
 
 Package: dpkg-dev
 Section: utils
@@ -40,21 +39,21 @@ Recommends: gcc | c-compiler, build-essential
 Suggests: gnupg, debian-keyring
 Conflicts: dpkg-cross (<< 2.0.0), devscripts (<< 2.10.26)
 Replaces: manpages-pl (<= 20051117-1)
-Description: package building tools for Debian
- This package contains the tools (including dpkg-source) required to
- unpack, build and upload Debian source packages.
+Description: Debian package development tools
+ This package provides the development tools (including dpkg-source)
+ required to unpack, build and upload Debian source packages.
  .
- Most Debian source packages will require additional tools to build -
- for example, most packages need the `make' and the C compiler `gcc'.
+ Most Debian source packages will require additional tools to build;
+ for example, most packages need make and the C compiler gcc.
 
 Package: dselect
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, dpkg (>= 1.13.1)
 Replaces: dpkg (<< 1.10.3)
-Description: user tool to manage Debian packages
- dselect is an interface for managing the installation and removal of
- packages on your system.
+Description: Debian package management front-end
+ dselect is a high-level interface for managing the installation and
+ removal of Debian software packages.
  .
  Many users find dselect intimidating and new users may prefer to use
- `apt'-based user interfaces.
+ apt-based user interfaces.

dselect/po/ChangeLog

@@ -1,3 +1,15 @@
+2008-06-10  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* pl.po: Updated to 288t.
+
+2008-06-09  Felipe Augusto van de Wiel  <faw@debian.org>
+
+	* pt_BR: Updated to 288t.
+
+2008-06-07  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* pl.po: Updated to 286t0f2u.
+
 2008-05-12  Guillem Jover  <guillem@debian.org>
 
 	* dselect.pot: Regenerated.

dselect/po/pl.po

@@ -1,19 +1,23 @@
-# dpkg.pl.po
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Polish translation of dselect
+# Copyright (C) 1999 Software in the Public Interest, Inc.
 # Piotr Roszatycki <dexter@debian.org>, 1999.
 # Bartosz Feński <fenio@debian.org>, 2004-2005
 # Robert Luberda <robert@debian.org>, 2006-2008
+# Wiktor Wandachowicz <siryes@gmail.com>, 2008
+#
+# Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych:
+# http://wiki.debian.org/PolishL10N/PackageInstallers
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.14.17\n"
+"Project-Id-Version: dpkg 1.14.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-03-30 10:09+0300\n"
-"PO-Revision-Date: 2008-03-10 20:59+0100\n"
-"Last-Translator: Robert Luberda <robert@debian.org>\n"
+"PO-Revision-Date: 2008-06-10 14:05+0100\n"
+"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
 
@@ -49,7 +53,7 @@ msgstr ""
 
 #: dselect/basecmds.cc:198
 msgid "error reading keyboard in help"
-msgstr "nie można odczytać klawisza pomocy"
+msgstr "błąd odczytu klawiatury w pomocy"
 
 #: dselect/baselist.cc:57
 msgid "ioctl(TIOCGWINSZ) failed"
@@ -170,11 +174,11 @@ msgstr "[nieznane: %d]"
 
 #: dselect/bindings.cc:129
 msgid "Scroll onwards through help/information"
-msgstr "Przewinięcie pomocy/informacji"
+msgstr "Przewinięcie pomocy/informacji w dół"
 
 #: dselect/bindings.cc:130
 msgid "Scroll backwards through help/information"
-msgstr "Cofnięcie pomocy/informacji"
+msgstr "Przewinięcie pomocy/informacji w górę"
 
 #: dselect/bindings.cc:131
 msgid "Move up"
@@ -194,31 +198,31 @@ msgstr "Koniec listy"
 
 #: dselect/bindings.cc:135
 msgid "Request help (cycle through help screens)"
-msgstr "Wywołanie pomocy (przewijanie ekranów pomocy)"
+msgstr "Wywołanie pomocy (przełączanie ekranów pomocy)"
 
 #: dselect/bindings.cc:136
 msgid "Cycle through information displays"
-msgstr "Przewijanie ekranów z informacjami"
+msgstr "Przełączanie ekranów z informacjami"
 
 #: dselect/bindings.cc:137
 msgid "Redraw display"
-msgstr "Przerysowanie ekranu"
+msgstr "Odświeżenie ekranu"
 
 #: dselect/bindings.cc:138
 msgid "Scroll onwards through list by 1 line"
-msgstr "Przesunięcie listy o jedną linię"
+msgstr "Przewinięcie listy o jedną linię w dół"
 
 #: dselect/bindings.cc:139
 msgid "Scroll backwards through list by 1 line"
-msgstr "Cofnięcie listy o jedną linię"
+msgstr "Przewinięcie listy o jedną linię w górę"
 
 #: dselect/bindings.cc:140
 msgid "Scroll onwards through help/information by 1 line"
-msgstr "Przesunięcie ekranu pomocy/informacji o jedną linię"
+msgstr "Przewinięcie ekranu pomocy/informacji o jedną linię w dół"
 
 #: dselect/bindings.cc:141
 msgid "Scroll backwards through help/information by 1 line"
-msgstr "Cofnięcie ekranu pomocy/informacji o jedną linię"
+msgstr "Przewinięcie ekranu pomocy/informacji o jedną linię w górę"
 
 #: dselect/bindings.cc:142
 msgid "Scroll onwards through list"
@@ -250,11 +254,11 @@ msgstr "Wyłączenie szczegółowych informacji"
 
 #: dselect/bindings.cc:151
 msgid "Search for a package whose name contains a string"
-msgstr "Szukanie nazwy pakietu zawierającej ciąg znaków"
+msgstr "Wyszukiwanie pakietu o nazwie zawierającej ciąg znaków"
 
 #: dselect/bindings.cc:152
 msgid "Repeat last search."
-msgstr "Powtórzenie ostatniego szukania."
+msgstr "Powtórzenie ostatniego wyszukiwania."
 
 #: dselect/bindings.cc:153
 msgid "Swap sort order priority/section"
@@ -346,9 +350,9 @@ msgstr ""
 "  ^b                    ^f                    przesunięcie w bok o 1 znak\n"
 "\n"
 "Zaznaczenie pakietów do późniejszego przetwarzania:\n"
-" +, Insert  instaluj lub aktualizuj =, H  wstrzymaj\n"
-" -, Delete  usuń                    :, G  ponów przetwarzanie\n"
-" _          usuń i wyczyść konfigurację\n"
+" +, Insert  instalacja lub aktualizacja   =, H  wstrzymanie\n"
+" -, Delete  usunięcie                     :, G  ponowienie przetwarzania\n"
+" _          usunięcie i wyczyszczenie konfiguracji\n"
 "                                             Pozostałe klawisze:\n"
 "Zakończenie wyboru pakietów:                   ?, F1 przywołanie pomocy\n"
 " Return  Potwiedź, wyjdź (sprawdź zależności)  i, I  przełącz/wyłącz "
@@ -357,10 +361,10 @@ msgstr ""
 "sortowania\n"
 " X, Esc  Wyjdź, anuluj wszelkie zmiany         v, V  zmiana sposobu "
 "wyświetlania\n"
-"   R     Przywrócenie stanu przed wyborem      ^l   odświeżenie ekranu\n"
-"   U     Wybierz sugerowane pakiety             /   szukaj (Return - "
+"   R     Przywrócenie stanu przed wyborem      ^l    odświeżenie ekranu\n"
+"   U     Wybierz sugerowane pakiety             /    szukaj (Return - "
 "anuluj)\n"
-"   D     Wybierz niezbędne pakiety              \\   powtórz ostatnie "
+"   D     Wybierz niezbędne pakiety             n, \\   powtórz ostatnie "
 "szukanie\n"
 
 #: dselect/helpmsgs.cc:51
@@ -397,15 +401,15 @@ msgid ""
 "\n"
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
-"Witaj w głównym ekranie wyboru pakietów dselecta.\n"
+"Witaj w głównym ekranie wyboru pakietów programu dselect.\n"
 "\n"
 "Ukaże się lista pakietów, które są już zainstalowane lub można je dopiero\n"
 "zainstalować. Po liście można się poruszać klawiszami kursora. Klawiszem\n"
-"\"+\" możesz zaznaczyć pakiet do instalacji, klawiszem \"-\" do usunięcia.\n"
+"\"+\" można zaznaczyć pakiet do instalacji, klawiszem \"-\" do usunięcia.\n"
 "\n"
 "Pakiety mogą być zaznaczane pojedynczo lub grupami. Początkowo kursor "
 "znajduje\n"
-"się na pozycji \"Wszystkie pakiety\". Klawisze \"+\", \"-\" spowodują zmianę "
+"się na pozycji \"Wszystkie pakiety\". Klawisze \"+\", \"-\" powodują zmianę "
 "stanu\n"
 "dla wszystkich pakietów z danej grupy.\n"
 "\n"
@@ -413,7 +417,7 @@ msgstr ""
 "wtedy\n"
 "lista pakietów, których dotyczy dany problem, który należy rozwiązać.\n"
 "\n"
-"Powinieneś/aś przeczytać listę klawiszy oraz opis ekranu.\n"
+"Zalecane jest zaznajomienie się z opisem listy klawiszy oraz ekranu.\n"
 "Wiele pomocy można uzyskać naciskając \"?\" w każdym momencie.\n"
 "\n"
 "Jeżeli wybór pakietów został dokonany, należy wcisnąć <enter> dla\n"
@@ -422,7 +426,8 @@ msgstr ""
 " ostateczne sprawdzenie konfliktów i zależności - tu też może pojawić się\n"
 " lista pakietów.\n"
 "\n"
-"Wciśnij <spację>, aby opuścić ekran pomocy i przejść do listy pakietów.\n"
+"Proszę wcisnąć <spację>, aby opuścić ekran pomocy i przejść do listy "
+"pakietów.\n"
 
 #: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
@@ -448,7 +453,7 @@ msgid ""
 "\n"
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
-"Witaj w głównym ekranie wyboru pakietów dselecta.\n"
+"Witaj w głównym ekranie wyboru pakietów programu dselect.\n"
 "\n"
 "Ukaże się lista pakietów, które są już zainstalowane lub można je dopiero\n"
 "zainstalować. Ponieważ nie masz odpowiednich uprawnień do aktualizacji,\n"
@@ -456,12 +461,14 @@ msgstr ""
 "poruszać klawiszami kursora (proszę przeczytać ekran pomocy z opisem\n"
 "klawiszy), obserwować stan pakietów oraz czytać informacje o nich.\n"
 "\n"
-"Proszę przeczytać listę klawiszy oraz wyjaśnienie wyświetlanych informacji.\n"
+"Zalecane jest zaznajomienie się z opisem listy klawiszy oraz ekranu.\n"
 "Wiele pomocy można uzyskać naciskając \"?\" w każdym momencie.\n"
 "\n"
-"Po zakończonym przeglądaniu listy pakietów, wciśnij \"Q\" lub <enter>.\n"
+"Po zakończonym przeglądaniu listy pakietów, proszę wcisnąć \"Q\" lub "
+"<enter>.\n"
 "\n"
-"Wciśnij <spację>, aby opuścić ekran pomocy i przejść do listy pakietów.\n"
+"Proszę wcisnać <spację>, aby opuścić ekran pomocy i przejść do listy "
+"pakietów.\n"
 
 #: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
@@ -501,7 +508,7 @@ msgid ""
 "Press <space> to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
 msgstr ""
-"Rozwiązywanie problemu zależności/konfliktu - wprowadzenie.\n"
+"Rozwiązywanie problemów zależności/konfliktów - wprowadzenie.\n"
 "\n"
 "Jeden lub więcej wybranych pakietów powoduje konflikt lub problem zależności "
 "-\n"
@@ -515,27 +522,25 @@ msgstr ""
 "się pomiędzy tą informacją a opisem pakietu.\n"
 "\n"
 "Został przygotowany zestaw pakietów \"sugerowanych\" wraz ze wstępnymi\n"
-"ustawieniami dotyczącymi ich instalacji, więc jeśli chcesz możesz je\n"
-"zaakceptować naciskając <enter>. Możesz anulować problematyczne zmiany\n"
+"ustawieniami dotyczącymi ich instalacji, więc jeśli się chce, można je\n"
+"zaakceptować naciskając <enter>. Można anulować problematyczne zmiany\n"
 "naciskając \"X\", a tym samym powracając do głównej listy.\n"
 "\n"
-"Możesz również poruszać się po liście i zmieniać ustawienia tak, by\n"
-"dostosować je do swoich potrzeb lub odrzucić moje sugestie używając\n"
+"Można również poruszać się po liście i zmieniać ustawienia tak, by\n"
+"dostosować je do swoich potrzeb lub odrzucić sugestie dselect używając\n"
 "wielkich liter \"D\" lub \"R\" (zobacz opis klawiszy). Używając klawisza\n"
-"\"Q\", możesz zmusić mnie do zaakceptowania aktualnie przedstawionej "
-"sytuacji,\n"
-"w przypadku gdybyś chciał zmienić moje zalecenia lub gdybyś myślał, że\n"
-"popełniłem błąd.\n"
+"\"Q\", można zmusić dselect do zaakceptowania aktualnie przedstawionej\n"
+"sytuacji, w przypadku gdy chce się zmienić podane zalecenia lub gdy uważa\n"
+"się, że dselect popełnił błąd.\n"
 "\n"
-"Wciśnij <spację>, aby opuścić ekran pomocy i przejść do listy pakietów; "
-"pamiętaj - wciśnij \"?\", aby przywołać ten ekran.\n"
+"Proszę wcisnąć <spację>, aby opuścić ekran pomocy i przejść do listy "
+"pakietów; proszę pamiętać, że \"?\" przywołuje ponownie ten ekran.\n"
 
 #: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Wybór pakietów, część 1: lista pakietów i oznaczenie stanu"
 
 #: dselect/helpmsgs.cc:121
-#, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -569,25 +574,26 @@ msgid ""
 msgstr ""
 "Górna część ekranu przedstawia listę pakietów. Dla każdego pakietu "
 "wyświetlane\n"
-"są cztery kolumny oznaczające aktualny jego stan w systemie. W trybie "
-"domyślnym\n"
-"(klawisz \"v\" przełącza na tryb szczegółowy) są to cztery znaki, "
-"wymieniając od\n"
-"lewej strony:\n"
+"są cztery kolumny oznaczające aktualny jego stan w systemie i zaznaczenie.\n"
+"W trybie domyślnym (klawisz \"v\" przełącza na tryb szczegółowy) są to "
+"cztery\n"
+"znaki, wymieniając od lewej strony:\n"
 "\n"
 " Flaga błędu: Spacja - brak błędu (ale pakiet może być w nieprawidłowym "
 "stanie)\n"
 "                \"R\"  - poważny błąd podczas instalacji - konieczna "
 "reinstalacja\n"
-" Stan zainstalowania:  Spacja - nie zainstalowany\n"
-"                         \"*\"  - zainstalowany\n"
-"                         \"-\"  - nie zainstalowany, zostały pliki "
+" Stan zainstalowania: Spacja  - nie zainstalowany\n"
+"                      \"*\"     - zainstalowany\n"
+"                      \"-\"     - nie zainstalowany, zostały pliki "
 "konfiguracyjne\n"
-" tak oznaczone pakiety { \"U\"  - rozpakowany, jeszcze nie skonfigurowany\n"
-"   są w nieprawidłowym { \"C\"  - wpół-skonfigurowany (wystąpił błąd)\n"
-"                stanie { \"I\"  - wpół-zainstalowany (wystąpił błąd).\n"
+"      takie pakiety { \"U\"     - rozpakowany, jeszcze nie skonfigurowany\n"
+"   nie są (całkiem) { \"C\"     - wpół-skonfigurowany (wystąpił błąd)\n"
+"         prawidłowo { \"I\"     - wpół-zainstalowany (wystąpił błąd).\n"
+"      zainstalowane { \"W\",\"t\" - oczekiwanie na wyzwalacze lub wyzw. "
+"zaplanowane\n"
 " Poprzedni wybór: to, co zostało wybrane przed pojawieniem się tej listy;\n"
-" Znak: to, co zostało określone dla danego pakietu:\n"
+" Zaznaczenie: to, co zostało określone dla danego pakietu:\n"
 "  \"*\": zaznaczony do instalacji lub aktualizacji\n"
 "  \"-\": zaznaczony do usunięcia, pliki konfiguracyjne zostaną zachowane\n"
 "  \"=\": wstrzymany; pakiet nie będzie przetwarzany\n"
@@ -635,11 +641,12 @@ msgstr ""
 "* Pasek na środku ekranu wyświetla informacje o stanie pakietu, który "
 "został\n"
 "  wskazany kursorem, lub wyświetla krótki opis grupy, w przypadku gdy taka\n"
-"  zostanie wskazana. Jeżeli nie rozumiesz znaczenia poszczególnych znaków\n"
-"  oznaczających stan pakietu, pełny opis stanu znajduje się na tym pasku "
-"(można\n"
-"  także skorzystać z klawisza \"v\" przełączającego listę na tryb "
-"szczegółowy).\n"
+"  zostanie wskazana. Jeżeli nie rozumie się znaczenia poszczególnych znaków\n"
+"  oznaczających stan pakietu, pełny opis stanu wybranego pakietu można "
+"znaleźć\n"
+"  na tym pasku (można także skorzystać z klawisza \"v\" przełączającego "
+"listę\n"
+"  na tryb szczegółowy).\n"
 "\n"
 "* Na dole ekranu wyświetlane są szczegółowe informacje o wskazanym kursorem\n"
 "  pakiecie (jeśli w ogóle został wskazany).\n"
@@ -680,14 +687,15 @@ msgid ""
 "help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
-"dselect i dpkg potrafi dokonać automatycznej instalacji, ładując pliki\n"
-"przeznaczone do zainstalowania z wybranego miejsca.\n"
+"Programy dselect i dpkg potrafią dokonać automatycznej instalacji, "
+"pobierając\n"
+"pliki przeznaczone do zainstalowania z wielu różnych możliwych miejsc.\n"
 "\n"
 "Ta lista pozwala na wybranie jednej z podanych metod instalacji.\n"
 "\n"
-"Proszę wybrać metodę instalacji i wcisnąć Enter. Następnie należy "
-"odpowiedzieć\n"
-"na pytania dotyczące wybranej metody.\n"
+"Najpierw należy wskazać wybraną metodę instalacji i wcisnąć Enter. "
+"Następnie\n"
+"należy odpowiedzieć na pytania dotyczące wybranej metody.\n"
 "\n"
 "Po przesunięciu kursora na daną metodę, na dole ekranu pojawi się jej opis.\n"
 "\n"
@@ -742,15 +750,15 @@ msgstr ""
 "(To są te same klawisze ruchu jak przy wyborze pakietów.)\n"
 "\n"
 "Wyjście:\n"
-" Return, Enter    Wybór metody instalacji i wywołanie jej konfiguracji\n"
+" Return, Enter    wybór metody instalacji i wywołanie jej konfiguracji\n"
 " x, X             wyjście bez dokonania zmian w dotychczasowych "
 "ustawieniach\n"
 "\n"
 "Pozostałe:\n"
 "  ?, Help, F1      wywołanie pomocy\n"
 " ^l                odświeżenie ekranu\n"
-"  /                szukaj (return - anuluj)\n"
-"  \\                powtórz ostatnie szukanie\n"
+"  /                wyszukiwanie (return - anulowanie)\n"
+"  \\                powtórzenie ostatniego wyszukiwania\n"
 
 #: dselect/main.cc:52
 msgid "Type dselect --help for help."
@@ -864,7 +872,7 @@ msgid ""
 "later for copying conditions. There is NO warranty.\n"
 "See %s --license for copyright and license details.\n"
 msgstr ""
-"Niniejszy program jest oprogramowaniem wolnym, sprawdź \n"
+"Niniejszy program jest wolnym oprogramowaniem, proszę sprawdzić\n"
 "Powszechną Licencję Publiczną GNU w wersji drugiej lub późniejszej,\n"
 "by dowiedzieć się o warunkach rozpowszechniania.\n"
 "Brak JAKIEJKOLWIEK gwarancji.\n"
@@ -953,7 +961,7 @@ msgstr "część widoku"
 
 #: dselect/main.cc:254
 msgid "Null colour specification\n"
-msgstr "Specyfikacja pustego koloru\n"
+msgstr "Pusta specyfikacja koloru\n"
 
 #: dselect/main.cc:262 dselect/main.cc:267
 msgid "colour"
@@ -978,11 +986,11 @@ msgid ""
 "or make do with the per-package management tool %s.\n"
 msgstr ""
 "Proszę poprawnie ustawić zmienną TERM, użyć lepszego terminala,\n"
-"lub wykorzystać narzędzie do zarządzania pakietami %s\n"
+"lub wykorzystać narzędzie do zarządzania pakietami %s.\n"
 
 #: dselect/main.cc:316
 msgid "terminal lacks necessary features, giving up"
-msgstr "brak potrzebnych funkcji terminala"
+msgstr "brak potrzebnych funkcji terminala, przerywanie"
 
 #: dselect/main.cc:394
 msgid ""
@@ -994,8 +1002,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Użyj ^P oraz ^N, klawiszy kursora, pierwszych liter lub cyfr;\n"
-"Wciśnij <enter> dla potwiedzenie wyboru. ^L - przerysowanie ekranu.\n"
+"Poruszanie: ^P oraz ^N, klawisze kursora, pierwsze litery lub cyfry;\n"
+"Wciśnij <enter> aby potwierdzić wybór.  ^L - odświeżenie ekranu.\n"
 "\n"
 
 #: dselect/main.cc:409
@@ -1044,7 +1052,7 @@ msgstr "nie można odblokować SIGWINCH"
 
 #: dselect/methlist.cc:172
 msgid "failed to re-block SIGWINCH"
-msgstr "nie można przeblokować SIGWINCH"
+msgstr "nie można ponownie zablokować SIGWINCH"
 
 #: dselect/methlist.cc:173
 msgid "getch failed"
@@ -1120,7 +1128,7 @@ msgstr "został przerwany.\n"
 #: dselect/method.cc:192
 #, c-format
 msgid "was terminated by a signal: %s.\n"
-msgstr "został zatrzymany sygnałem: %s.\n"
+msgstr "został zakończony sygnałem: %s.\n"
 
 #: dselect/method.cc:195
 #, c-format
@@ -1319,7 +1327,7 @@ msgstr "nie zainstalowany"
 
 #: dselect/pkgdisplay.cc:53
 msgid "removed (configs remain)"
-msgstr "usunięty (konfiguracja pozostała)"
+msgstr "usunięty (zostały pliki konfiguracyjne)"
 
 #: dselect/pkgdisplay.cc:54
 msgid "half installed"
@@ -1335,11 +1343,11 @@ msgstr "błędna konfiguracja"
 
 #: dselect/pkgdisplay.cc:57
 msgid "awaiting trigger processing"
-msgstr ""
+msgstr "oczekiwanie na przetworzenie wyzwalaczy"
 
 #: dselect/pkgdisplay.cc:58
 msgid "triggered"
-msgstr ""
+msgstr "wyzwalacz pobudzony"
 
 #: dselect/pkgdisplay.cc:59
 msgid "installed"
@@ -1391,15 +1399,15 @@ msgstr "poleca"
 
 #: dselect/pkgdisplay.cc:75
 msgid "depends on"
-msgstr "zależy od"
+msgstr "wymaga"
 
 #: dselect/pkgdisplay.cc:76
 msgid "pre-depends on"
-msgstr "zależy-przed od"
+msgstr "wymaga wstępnie"
 
 #: dselect/pkgdisplay.cc:77
 msgid "breaks"
-msgstr "psuje"
+msgstr "uszkadza"
 
 #: dselect/pkgdisplay.cc:78
 msgid "conflicts with"
@@ -1419,7 +1427,7 @@ msgstr "rozszerza"
 
 #: dselect/pkgdisplay.cc:84
 msgid "Req"
-msgstr "Kon"
+msgstr "Wym"
 
 #: dselect/pkgdisplay.cc:85
 msgid "Imp"
@@ -1463,7 +1471,7 @@ msgstr "Nowe"
 
 #: dselect/pkgdisplay.cc:102
 msgid "Updated"
-msgstr "Do zaktualizowania"
+msgstr "Do aktualizacji"
 
 #: dselect/pkgdisplay.cc:103
 msgid "Obsolete/local"
@@ -1491,7 +1499,7 @@ msgstr "Pakiety nowo dostępne"
 
 #: dselect/pkgdisplay.cc:109
 msgid "Updated packages (newer version is available)"
-msgstr "Pakiety o dostępnej aktualnej wersji"
+msgstr "Pakiety do aktualizacji (dostępna nowsza wersja)"
 
 #: dselect/pkgdisplay.cc:110
 msgid "Obsolete and local packages present on system"
@@ -1503,7 +1511,7 @@ msgstr "Pakiety aktualne"
 
 #: dselect/pkgdisplay.cc:112
 msgid "Available packages (not currently installed)"
-msgstr "Pakiety dostępne i jeszcze nie zainstalowane"
+msgstr "Pakiety dostępne (jeszcze nie zainstalowane)"
 
 #: dselect/pkgdisplay.cc:113
 msgid "Removed and no longer available packages"
@@ -1515,7 +1523,7 @@ msgstr "Pakiety zainstalowane"
 
 #: dselect/pkgdisplay.cc:118
 msgid "Removed packages (configuration still present)"
-msgstr "Pakiety usunięte (konfiguracja pozostała)"
+msgstr "Pakiety usunięte (pozostały pliki konfiguracyjne)"
 
 #: dselect/pkgdisplay.cc:119
 msgid "Purged packages and those never installed"

dselect/po/pt_BR.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-03-30 10:09+0300\n"
-"PO-Revision-Date: 2008-05-11 16:29-0300\n"
+"PO-Revision-Date: 2008-06-09 02:53-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
@@ -352,7 +352,7 @@ msgstr ""
 "  ^b                    ^f                      rola 1 caracter para o lado\n"
 "\n"
 "Marca pacotes para processamento posterior:\n"
-" +, Insere  instala ou atualiza     =, H  manter no estado atual\n"
+" +, Insere  instala ou atualiza     =, H  reter no estado atual\n"
 " -, Exclui  remove                  :, G  liberar: atualizar ou deixar "
 "desinst.\n"
 " _          remover e expurgar configuração\n"
@@ -608,7 +608,7 @@ msgstr ""
 " Marca: o que é requisitado para este pacote:\n"
 "  '*': marcado para instalação ou atualização;\n"
 "  '-': marcado para remoção, mas os arquivos de configuração permanecerão;\n"
-"  '=': mantido: pacote não será processado de forma alguma;\n"
+"  '=': retido: pacote não será processado de forma alguma;\n"
 "  '_': marcado para ser completamente expurgado - remover até a "
 "configuração;\n"
 "  'n': pacote é novo e ainda tem que ser marcado para instalação/remoção/"
@@ -1309,7 +1309,7 @@ msgstr "instalar"
 
 #: dselect/pkgdisplay.cc:40
 msgid "hold"
-msgstr "manter"
+msgstr "reter"
 
 #: dselect/pkgdisplay.cc:41
 msgid "remove"
@@ -1619,7 +1619,7 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 "A linha que você realçou representa muitos pacotes; se você pedir para "
-"instalá-la, removê-la, mantê-la, etc, você afetará todos os pacotes que "
+"instalá-la, removê-la, retê-la, etc, você afetará todos os pacotes que "
 "combinam com o critério exibido.\n"
 "\n"
 "Se você mover o realce para uma linha de um pacote em particular você verá "

lib/triglib.c

@@ -480,7 +480,7 @@ trig_file_interests_ensure(void)
 		        triggersfilefile);
 	}
 
-	push_cleanup(cu_closefile, 0, NULL, 0, 1, f);
+	push_cleanup(cu_closefile, ~0, NULL, 0, 1, f);
 	while (fgets_checked(linebuf, sizeof(linebuf), f, triggersfilefile) >= 0) {
 		space = strchr(linebuf, ' ');
 		if (!space || linebuf[0] != '/')

man/ChangeLog

@@ -13,6 +13,75 @@
 	* dpkg-source.1: Improve explanation of -i when used with
 	VCS-based source packages.
 
+2008-06-10  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* po/pl.add: Update.
+
+2008-06-07  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* po/pl.po: Ack typo fix.
+	* po/pl.add: Add conents.
+
+2008-06-06  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* po/pl.po: Updated to 1601t.
+
+2008-06-04  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1601t.
+
+2008-06-03  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* Regenerated all po(t) files, including updating the German one.
+	* Add Sven in de.add, he translated some paragraphs as well.
+	* Take translation fix from Frank Lichtenheld <djpig@debian.org>
+	from the trunk.
+
+2008-05-27  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1600t.
+
+2008-05-26  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* dselect.1: Fixed a typo and regenerated all po(t) files, including
+	updating the German one.
+
+2008-05-25  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1591t0f9u and further fixes found/FIXMEs
+	removed.
+
+2008-05-22  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1590t0f10u and one improvement (thanks Sven).
+
+2008-05-19  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1589t0f11u and more fixes (thanks Sven).
+
+2008-05-18  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1588t0f12u and thorough proof reading.
+
+2008-05-13  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1600t.
+
+2008-05-13  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2008-05-13  Sven Joachim  <svenjoac@gmx.de>
+
+	* dpkg.1: Document triggers --debug values.
+
+2008-05-13  Guillem Jover  <guillem@debian.org>
+
+	* deb-version.5: Change '©' to '(C)'.
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot and unfuzzy translations.
+
 2008-05-12  Guillem Jover  <guillem@debian.org>
 
 	* po/dpkg-man.pot: Regenerated.
@@ -64,7 +133,7 @@
 2008-04-21  Helge Kreutzmann  <debian@helgefjell.de>
 
 	* dpkg-shlibdeps.1: Fix a typo
-	* dpkg-source.1: Improve a sentence (with agreement from Raphäel)
+	* dpkg-source.1: Improve a sentence (with agreement from Raphäel)
 
 2008-04-21  Helge Kreutzmann  <debian@helgefjell.de>
 

man/deb-version.5

@@ -118,9 +118,9 @@ support for it later in the 1.10.x series.
 .BR deb (5),
 .BR dpkg (1)
 .SH AUTHORS
-Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz.
+Copyright (C) 1996,1997,1998 Ian Jackson and Christian Schwarz
 .br
-Copyright © 2007 Frank Lichtenheld
+Copyright (C) 2007 Frank Lichtenheld
 .sp
 This is free software; see the GNU General Public Licence version 2 or later
 for copying conditions. There is NO WARRANTY.

man/dpkg-source.1

@@ -41,6 +41,12 @@ files will be 0777 and plain files will be 0666, both modified by the
 extractors' umask; if the parent directory is setgid then the
 extracted directories will be too, and all the files and directories
 will inherit its group ownership.
+
+If the source package uses a non-standard format (currently this means all
+formats except "1.0"), its name will be stored in
+\fBdebian/source/format\fP so that the following builds of the source
+package use the same format by default.
+
 .TP
 .RI "\fB\-b\fP " directory " [" format-specific-parameters ]
 Build a source package. The first non-option argument is taken as the
@@ -53,6 +59,7 @@ additional parameters might be accepted.
 that works from this ordered list:
 the format indicated in the \fIFormat\fP field of \fBdebian/control\fP,
 the format(s) indicated with the \fI\-\-format\fP command-line option(s),
+the format indicated in \fBdebian/source/format\fP,
 "1.0", "3.0 (native)". See below for an extensive description of
 various source package formats.
 
@@ -86,9 +93,9 @@ defaults to the debian standard format.
 .TP
 .BI \-\-format= value
 Try first the given format for building the source package. If used
-multiple times, the last value is tried first and the first one is
-tried last just before trying the default formats. It doesn't override
-any explicit \fIFormat\fP field in \fBdebian/control\fP.
+multiple times, they are tried in order. It doesn't override
+any explicit \fIFormat\fP field in \fBdebian/control\fP but it does
+override any format given in \fBdebian/source/format\fP.
 .TP
 .BI \-V name = value
 \fBDeprecated\fP. Set an output substitution variable.
@@ -372,10 +379,10 @@ patches have been applied during the extraction.
 All original tarballs found in the current directory are extracted in a
 temporary directory by following the same logic as for the unpack, the
 debian directory is copied over in the temporary directory, and all
-patches except \fBdebian-changes-\fP\fIversion\fP\fB.diff\fP are applied.
+patches except \fBdebian-changes-\fP\fIversion\fP are applied.
 The temporary directory is compared to the source package directory
 and the diff (if non-empty) is stored in
-\fBdebian/patches/debian-changes-\fP\fIversion\fP\fB.diff\fP. Any change
+\fBdebian/patches/debian-changes-\fP\fIversion\fP. Any change
 on a binary file is not representable in a diff and will thus lead to a
 failure unless the maintainer deliberately decided to include that
 modified binary file in the debian tarball (by listing it in

man/dpkg.1

@@ -330,20 +330,20 @@ values together from the list below (note that these values may change
 in future releases). \fB\-Dh\fP or \fB\-\-debug=help\fP display these
 debugging values.
 
- number  description
-     1   Generally helpful progress information
-     2   Invocation and status of maintainer scripts
-    10   Output for each file processed
-   100   Lots of output for each file processed
-    20   Output for each configuration file
-   200   Lots of output for each configuration file
-    40   Dependencies and conflicts
-   400   Lots of dependencies/conflicts output
- 10000   Trigger activation and processing
- 20000   Lots of output regarding triggers
- 40000   Silly amounts of output regarding triggers
-  1000   Lots of drivel about e.g. the dpkg/info dir
-  2000   Insane amounts of drivel
+    number  description
+         1   Generally helpful progress information
+         2   Invocation and status of maintainer scripts
+        10   Output for each file processed
+       100   Lots of output for each file processed
+        20   Output for each configuration file
+       200   Lots of output for each configuration file
+        40   Dependencies and conflicts
+       400   Lots of dependencies/conflicts output
+     10000   Trigger activation and processing
+     20000   Lots of output regarding triggers
+     40000   Silly amounts of output regarding triggers
+      1000   Lots of drivel about e.g. the dpkg/info dir
+      2000   Insane amounts of drivel
 .TP
 \fB\-\-force\-\fP\fIthings\fP, \fB\-\-no\-force\-\fP\fIthings\fP, \fB\-\-refuse\-\fP\fIthings\fP
 

man/dselect.1

@@ -390,7 +390,7 @@ cause the currently selected package to be listed.
 .sp
 When the sublist of packages is displayed initially, \fBdselect\fP
 may have already set the requested selection status of some of the
-listed packages, in order to resolve the depends of conflicts that
+listed packages, in order to resolve the depends or conflicts that
 caused the dependency resolution screen to be displayed. Usually,
 it is best to follow up the suggestions made by \fBdselect\fP.
 .sp

man/po/de.add

@@ -1,7 +1,8 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=^\.SH "SIEHE AUCH"
 .SH ÜBERSETZUNG
 Die deutsche Übersetzung wurde 2004, 2006-2008 von Helge Kreutzmann
-<debian@helgefjell.de> und 2007 von Florian Rehnisch <eixman@gmx.de> 
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
 angefertigt. Diese Übersetzung ist Freie Dokumentation; lesen Sie die
 GNU General Public License Version 2 oder neuer für die Kopierbedingungen.
 Es gibt KEINE HAFTUNG.

man/po/pl.add

@@ -1 +1,9 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
+.SH "T£UMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feñski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008

po/ChangeLog

@@ -1,3 +1,60 @@
+2008-06-09  Felipe Augusto van de Wiel  <faw@debian.org>
+
+	* pt_BR.po: Updated to 984t.
+
+2008-06-06  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* pl.po: Updated to 984t.
+
+2008-06-06  Jordi Mallach  <jordi@debian.org>
+
+	* ca.po: Updated to 887t71f26u.
+
+2008-05-31  Deng Xiyue  <manphiz-guest@users.alioth.debian.org>
+
+	* zh_CN.po: Updated to 984t.
+
+2008-05-31  Piarres Beobide  <pi+debian@beobide.net>
+
+	* eu.po: Updated to 984t.
+
+2008-05-31  Hans Fredrik Nordhaug  <hans@nordhaug.priv.no>
+
+	* nb.po: Updated to 984t.
+
+2008-05-28  Jacobo Tarrio  <jtarrio@debian.org>
+
+	* gl.po: Updated to 984t
+
+2008-05-18  Miroslav Kure  <kurem@debian.cz>
+
+	* cs.po: Updated to 984t
+
+2008-05-17  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: Updated to 984t
+
+2008-05-13  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: Updated to 984t.
+
+2008-05-13  Sven Joachim  <svenjoac@gmx.de>
+
+	* de.po: Updated to 984t.
+
+2008-05-13  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 984t.
+
+2008-05-13  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot.
+
+2008-05-13  Piarres Beobide  <pi+debian@beobide.net>
+
+	* eu.po: Updated to 984t.
+
 2008-05-12  Guillem Jover  <guillem@debian.org>
 
 	* dpkg.pot: Regenerated.

po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-02-17 08:50+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -2515,6 +2515,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2526,44 +2527,44 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr ""

po/cs.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-04 13:56+0200\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-18 15:34+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -601,7 +601,7 @@ msgstr "nelze přečíst příznaky filedescriptoru pro `%.250s'"
 #: lib/mlib.c:161
 #, c-format
 msgid "unable to set close-on-exec flag for %.250s"
-msgstr "nelze nastavit příznak zapřít-při-spuštění pro `%.250s'"
+msgstr "nelze nastavit příznak zavřít-při-spuštění pro `%.250s'"
 
 #: lib/mlib.c:215
 #, c-format
@@ -2747,6 +2747,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2758,83 +2759,80 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 "%s donucovací přepínače - ovládají chování při vzniku potíží:\n"
-"  varuje, ale pokračuje:  --force-<co>,<co>,...\n"
-"  zastaví s chybou:       --refuse-<co>,<co>,... | --no-force-<co>,...\n"
+"  varuje, ale pokračuje: --force-<co>,<co>,...\n"
+"  zastaví s chybou:      --refuse-<co>,<co>,... | --no-force-<co>,...\n"
 " Donucovací akce:\n"
-"  all [!]                  Nastaví všechny donucovací volby\n"
-"  downgrade [*]            Nahradí balík starší verzí\n"
-"  configure-any            Nakonfiguruje všechny balíky, které mohou tomuto\n"
-"                           balíku pomoci\n"
-"  hold                     Zpracuje balíky, i když jsou podrženy\n"
-"  bad-path                 v PATH chybí důležité programy, což způsobuje\n"
-"                           problémy\n"
-"  not-root                 Zkusí (od|na)instalovat balík, i když není root\n"
-"  overwrite                Přepisuje soubory patřící jinému balíku\n"
-"  overwrite-diverted       Přepíše odkloněné soubory normální verzí\n"
-"  bad-verify               Nainstaluje balík, i když selže kontrola "
+"  all [!]                Nastaví všechny donucovací volby\n"
+"  downgrade [*]          Nahradí balík starší verzí\n"
+"  configure-any          Nakonfiguruje všechny balíky, které mohou tomuto\n"
+"                         balíku pomoci\n"
+"  hold                   Zpracuje balíky, i když jsou podrženy\n"
+"  bad-path               v PATH chybí důležité programy, což způsobuje\n"
+"                         problémy\n"
+"  not-root               Zkusí (od|na)instalovat balík, i když není root\n"
+"  overwrite              Přepisuje soubory patřící jinému balíku\n"
+"  overwrite-diverted     Přepíše odkloněné soubory normální verzí\n"
+"  bad-verify             Nainstaluje balík, i když selže kontrola "
 "autenticity\n"
-"  depends-version [!]      Změní problémy se závislostmi verzí na varování\n"
-"  depends [!]              Změní všechny problémy se závislostmi na "
-"varování\n"
-"  confnew [!]              Vždy použije nový konfigurační soubor, bez "
+"  depends-version [!]    Změní problémy se závislostmi verzí na varování\n"
+"  depends [!]            Změní všechny problémy se závislostmi na varování\n"
+"  confnew [!]            Vždy použije nový konfigurační soubor, bez dotazu\n"
+"  confold [!]            Vždy použije starý konfigurační soubor, bez "
 "dotazu\n"
-"  confold [!]              Vždy použije starý konfigurační soubor, bez "
-"dotazu\n"
-"  confdef [!]              Použije implicitní volbu pro nové konfigurační\n"
-"                            soubory, pokud existuje, neptá se. Pokud žádná\n"
-"                            implicitní volba neexistuje, budete dotázán, "
-"ale\n"
-"                            pouze pokud nebyly zadány přepínače confold "
-"nebo\n"
-"                            confnew\n"
-"  confmiss [!]             Vždy nainstaluje chybějící konfigurační soubory\n"
-"  conflicts [!]            Povolí nainstalování balíku kolidujícího balíku\n"
-"  architecture [!]         Zpracuje i balík s jinou architekturou\n"
-"  overwrite-dir [!]        Přepíše adresář balíku souborem z jiného balíku\n"
-"  remove-reinstreq [!]     Odstraní balík, který vyžaduje přeinstalování\n"
-"  remove-essential [!]     Odstraní nezbytný balík\n"
+"  confdef [!]            Použije implicitní volbu pro nové konfigurační\n"
+"                         soubory, pokud existuje, neptá se. Pokud žádná\n"
+"                         implicitní volba neexistuje, budete dotázán, ale\n"
+"                         pouze pokud nebyly zadány přepínače confold nebo\n"
+"                         confnew\n"
+"  confmiss [!]           Vždy nainstaluje chybějící konfigurační soubory\n"
+"  breaks [!]             Instaluje, i když tím poruší jiný balík\n"
+"  conflicts [!]          Povolí instalaci kolidujících balíků\n"
+"  architecture [!]       Zpracuje i balík s jinou architekturou\n"
+"  overwrite-dir [!]      Přepíše adresář balíku souborem z jiného balíku\n"
+"  remove-reinstreq [!]   Odstraní balík, který vyžaduje přeinstalování\n"
+"  remove-essential [!]   Odstraní nezbytný balík\n"
 "\n"
 "VAROVÁNÍ - použití označených [!] přepínačů může vážně poškodit instalaci.\n"
 "Implicitně zapnuté donucovací volby jsou označeny [*].\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznámá force/refuse volba `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Varování: zastaralá force/refuse volba `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "nelze spustit %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd vyžaduje jeden argument"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd vyžaduje pouze jeden argument"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "neplatné číslo pro --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nelze otevřít `%i' pro proud"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "neočekávaný konec souboru před koncem řádku %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "potřebuji zadat akci"
@@ -4907,7 +4905,7 @@ msgstr "--%s vyžaduje jako argument <adresář>"
 #: scripts/update-alternatives.pl:338
 #, perl-format
 msgid "unknown option `%s'"
-msgstr "neznámá volba \"%s\""
+msgstr "neznámá volba „%s“"
 
 #: scripts/dpkg-divert.pl:122
 #, perl-format
@@ -5580,7 +5578,7 @@ msgstr "Nejsou k dispozici žádné verze."
 #: scripts/update-alternatives.pl:211
 #, perl-format
 msgid "Current `best' version is %s."
-msgstr "Momentálně \"nejlepší\" verze je \"%s\"."
+msgstr "Momentálně „nejlepší“ verze je „%s“."
 
 #: scripts/update-alternatives.pl:228
 #, perl-format
@@ -5604,7 +5602,7 @@ msgstr "Aktualizuji %s (%s), aby ukazoval na %s."
 #: scripts/update-alternatives.pl:252
 #, perl-format
 msgid "Using '%s' to provide '%s'."
-msgstr "Používám '%s' pro poskytnutí `%s'."
+msgstr "Používám „%s“ pro poskytnutí „%s“."
 
 #: scripts/update-alternatives.pl:266 scripts/update-alternatives.pl:610
 #, perl-format
@@ -5619,7 +5617,7 @@ msgstr "nelze odstranit %s: %s"
 #: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "unknown argument `%s'"
-msgstr "neznámý argument `%s'"
+msgstr "neznámý argument „%s“"
 
 #: scripts/update-alternatives.pl:308
 msgid "--install needs <link> <name> <path> <priority>"
@@ -5701,7 +5699,7 @@ msgid ""
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 "Kontroluji dostupné verze %s, aktualizuji odkazy v %s ...\n"
-"(Symbolické odkazy můžete měnit i ručně - viz `man ln'.)"
+"(Symbolické odkazy můžete měnit i ručně - viz „man ln“.)"
 
 #: scripts/update-alternatives.pl:442
 #, perl-format
@@ -5747,8 +5745,8 @@ msgstr "Automatické aktualizace %s jsou zakázány, ponechávám bez změn."
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
-"K automatickým aktualizacím se vrátíte příkazem `update-alternatives --auto %"
-"s'."
+"K automatickým aktualizacím se vrátíte příkazem „update-alternatives --auto %"
+"s“."
 
 #: scripts/update-alternatives.pl:549
 #, perl-format
@@ -5791,7 +5789,7 @@ msgid ""
 "  Selection    Alternative\n"
 "-----------------------------------------------\n"
 msgstr ""
-"Existuje několik alternativ (%s), které poskytují `%s'.\n"
+"Existuje několik alternativ (%s), které poskytují „%s“.\n"
 "\n"
 "  Výběr        Alternativa\n"
 "-----------------------------------------------\n"
@@ -5803,7 +5801,7 @@ msgstr "Pro výchozí možnost[*] stiskněte enter, jinak zadejte číslo: "
 #: scripts/update-alternatives.pl:678
 #, perl-format
 msgid "Cannot find alternative `%s'."
-msgstr "Nemohu najít alternativu `%s'."
+msgstr "Nemohu najít alternativu „%s“."
 
 #: scripts/update-alternatives.pl:683 scripts/update-alternatives.pl:686
 #, perl-format

po/da.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-09-06 22:02+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -2733,7 +2733,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldigt heltal for --%s: '%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2761,6 +2761,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2811,44 +2812,44 @@ msgstr ""
 "alvorligt.\n"
 "Gennemtvingsningstilvalg mærket [*] er aktiveret som standard.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Advarsel: forældet gennemtvangs/afvisnings-tilvalg '--%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunne ikke eksekvere %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tager een parameter, ikke nul"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tager kun en parameter"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "ugyldigt tal for  --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunne ikke åbne '%i' for strøm"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"

po/de.po

@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debian dpkg 1.14.18\n"
+"Project-Id-Version: Debian dpkg 1.14.20~\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-09 12:39+0200\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-13 15:59+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2802,6 +2802,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2847,6 +2848,8 @@ msgstr ""
 "confold\n"
 "                           oder confnew ist auch angegeben.\n"
 "  confmiss [!]           Immer fehlende Konf.-dateien installieren\n"
+"  breaks [!]             Installieren, selbst wenn es andere Pakete\n"
+"                           beschädigt.\n"
 "  conflicts [!]          Installation kollidierender Pakete erlauben\n"
 "  architecture [!]       Selbst Pakete mit falscher Architektur bearbeiten\n"
 "  overwrite-dir [!]      Verzeichnis eines Pakets mit Datei eines\n"
@@ -2857,44 +2860,44 @@ msgstr ""
 "WARNUNG - Anwenden der mit [!] markierten Optionen kann Ihre Installation\n"
 "schwer beschädigen. Mit [*] markierte Optionen sind per Vorgabe aktiviert.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "unbekannte force/refuse-Option »%.*s«"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Warnung: veraltete force/refuse-Option »%s«\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "Konnte %s nicht ausführen"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd akzeptiert ein Argument, nicht null"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd akzeptiert nur ein Argument"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "ungültige Zahl für --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "Konnte »%i« nicht für Datenstrom öffnen"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes EOF vor Ende der Zeile %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "brauche eine Aktions-Option"

po/dpkg.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2505,6 +2505,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2516,44 +2517,44 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr ""

po/dz.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg po.pot\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-06-29 04:06+0530\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -2722,7 +2722,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s: `%.250s' གི་དོན་ལུ་ནུས་མེད་ཧྲིལ་ཨང་།"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2750,6 +2750,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2801,44 +2802,44 @@ msgstr ""
 "འོང་།\n"
 "བང་བཙོང་ནིའི་གདམ་ཁ་ [*] རྟགས་བཀལ་ཡོད་མི་ཚུ་ སྔོན་སྒྲིག་གིས་སྦེ་ལྕོགས་ཅན་བཟོ།\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd གིས་སྒྲུབ་རྟགས་གཅིག་འབགཔ་ཨིན་ ཀླད་ཀོར་མེན།"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd གིས་སྒྲུབ་རྟགས་གཅིག་རྐྱངམ་ཅིག་འབགཔ་ཨིན།"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--command-fd གི་དོན་ལུ་ནུས་མེད་ཨང་གྲངས།"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "རྒྱུན་རིམ་གྱི་དོན་ལུ་ `%i' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "གྲལ་ཐིག་ %d གི་མཇུག་གི་ཧེ་མ་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"

po/el.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-02-17 08:51+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -2727,6 +2727,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2782,46 +2783,46 @@ msgstr ""
 "για το σύστημά σας. Ο εξαναγκασμός των επιλογών με σήμανση [*] είναι εξ'\n"
 "ορισμού ενεργοποιημένος.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "άγνωστη επιλογή force/refuse `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "αδύνατη η εκτέλεση του %s"
 
-#: src/main.c:534
+#: src/main.c:535
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "η --command-fd παίρνει 1 όρισμα, όχι 0"
 
-#: src/main.c:536
+#: src/main.c:537
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd παίρνει μόνο 1 όρισμα"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "μη έγκυρος αριθμός για το --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "χρειάζεται μια επιλογή ενέργειας"

po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.13.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-12-18 21:50+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2847,7 +2847,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "entero inválido para --%s: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2875,6 +2875,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2936,44 +2937,44 @@ msgstr ""
 "la instalación. Las opciones de forzado marcadas con [*] están activadas\n"
 "por omisión.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción «force/refuse» desconocida `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Atención: opción «force/refuse» obsoleta `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "fallo al ejecutar %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd toma un argumento, no cero"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd sólo toma un argumento"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no se pudo abrir `%i' para un flujo"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "se necesita una opción de acción"

po/et.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-07-12 22:06+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -2590,6 +2590,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2601,44 +2602,44 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "tõrgi %s käivitamisel"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd vajab ühte argumenti, mis pole null"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd vajab ainult ühte argumenti"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "vigane number --command-fd jaoks"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "tegevuse võti on vajalik"

po/fr.po

@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg.fr.po\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-08 18:18+0200\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-13 20:28+0200\n"
 "Last-Translator: Florent USSEIL <swiip81@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2955,6 +2955,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -3003,6 +3004,7 @@ msgstr ""
 "                           confold ou confnew soit aussi choisie\n"
 "  confmiss [!]           Toujours installer les fichiers de configuration\n"
 "                           manquants\n"
+"  breaks [!]             Installer même si cela casse un autre paquet\n"
 "  conflicts [!]          Autoriser l'installation de paquets conflictuels\n"
 "  architecture [!]       Traiter même les paquets d'une autre architecture\n"
 "  overwrite-dir [!]      Remplacer le répertoire d'un paquet par le fichier\n"
@@ -3015,44 +3017,44 @@ msgstr ""
 "           installation.\n"
 "Les options de forçage marquées [*] sont activées par défaut.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "option de forçage/refus « %.*s » inconnue"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Attention : option de forçage/refus « %s » obsolète\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "échec de l'exécution de « %s »"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd prend un paramètre et non zéro"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd ne prend qu'un paramètre"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "nombre invalide pour --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossible d'ouvrir le flux d'entrée « %i »"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "requiert une option d'action"

po/gl.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-04-13 12:53+0100\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-28 20:45+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -2840,6 +2840,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2857,7 +2858,7 @@ msgstr ""
 " Forzar cousas:\n"
 "  all [!]              Establece tódalas opcións de forzado\n"
 "  downgrade [*]        Substitúe un paquete por unha versión anterior\n"
-"  configure-any        Configura un paquete que poida axudar a estte\n"
+"  configure-any        Configura un paquete que poida axudar a este\n"
 "  hold                 Procesa os paquetes incidentais mesmo se están "
 "retidos\n"
 "  bad-path             Fallan programas imporantes en PATH, problema seguro\n"
@@ -2876,6 +2877,7 @@ msgstr ""
 "                       se non dá tamén unha opción confnew ou confold\n"
 "  confmiss [!]         Sempre instala os ficheiros de configuración que "
 "fallan\n"
+"  breaks [!]           Instala incluso se había romper outro paquete\n"
 "  conflicts [!]        Permite instalar paquetes que teñen un conflicto\n"
 "  architecture [!]     Procesa incluso paquetes dunha arquitectura "
 "incorrecta\n"
@@ -2886,44 +2888,44 @@ msgstr ""
 "AVISO - o emprego das opcións marcadas [!] pode danar gravemente a súa\n"
 "instalación. O forzado das opcións marcadas [*] está activado por defecto.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción de forzar/rexeitar \"%.*s\" descoñecida"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Aviso: opción de forzado/rexeitado \"%s\" obsoleta\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "non se puido executar %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd toma un argumento, non cero"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd só toma un argumento"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "número non válido para --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "non se puido abrir \"%i\" para fluxo"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "fin de ficheiro inesperada antes da fin da liña %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "precísase dunha opción de acción"

po/hu.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2008-05-02 15:45+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -2700,7 +2700,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "érvénytelem egész a --%s számára: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2728,6 +2728,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2787,44 +2788,44 @@ msgstr ""
 "FIGYELMEZTETÉS - a [!] jelű kapcsolók használata súlyosan károsíthatja a\n"
 "telepítést. A [*] jelű kapcsolók alapértelmezésben engedélyezettek.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ismeretlen `%.*s' kényszerítő/elutasító opció"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Figyelem: elavult `--%s' kényszerítő/elutasító opció\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "sikertelen futtatás: %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "a --command-fd 1 argumentumot vár"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "a --command-fd csak 1 argumentumot vár"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "érvénytelen szám a --command-fd számára"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' nem nyitható meg az áramoltatásra"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "váratlan eof e sor vége előtt: %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "egy művelet opciót igényel"

po/id.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Parlin Imanuel <parlin_i@yahoo.com>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
@@ -2689,6 +2689,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2738,46 +2739,46 @@ msgstr ""
 "parah.\n"
 "Pilihan paksaan bertanda [*] akan langsung diaktifkan.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "Pilihan force/refuse `%.*s' tak dikenal"
 
-#: src/main.c:370
+#: src/main.c:371
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "PERINGATAN: pilihan '--%s' sudah usang \n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "Gagal menjalankan perintah %s"
 
-#: src/main.c:534
+#: src/main.c:535
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd butuh 1 argumen, bukan 0"
 
-#: src/main.c:536
+#: src/main.c:537
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd hanya butuh 1 argumen"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "angka tidak sah untuk --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "tidak dapat membuka `%i' untuk stream"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof tidak diharapkan sebelum akhir baris %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "butuh suatu pilihan aksi"

po/it.po

@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-09-09 15:11+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -2815,7 +2815,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "numero intero non valido per l'opzione --%s: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2843,6 +2843,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2901,44 +2902,44 @@ msgstr ""
 "seriamente la vostra installazione.\n"
 "Le opzioni contrassegnate da [*] sono abilitate di default.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opzione force/refuse sconosciuta: `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Attenzione: opzione di force/refuse obsoleta `--%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "impossibile eseguire %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd accetta un parametro, che non è stato specificato"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd accetta un solo parametro"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "numero non valido in --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossibile aprire `%i' per ricevere il flusso"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inaspettato prima della fine della linea %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "è necessaria una opzione che indichi che azione svolgere"

po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13 r503\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-12-20 14:53+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -2755,7 +2755,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s に対する不正な整数です: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2783,6 +2783,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2826,44 +2827,44 @@ msgstr ""
 "警告: [!] のあるオプションを使用すると、インストール時に深刻なダメージを\n"
 "受ける場合がある。[*] の付いたオプションはデフォルトで有効。\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告: 時代遅れの強制・拒否 (force/refuse) オプション `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s の実行に失敗しました"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd は 1 つの引数 (なしではありません) をとります"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd は引数を 1 つだけ引数をとります"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--command-fd への値が不正です"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' をストリームとしてオープンできませんでした"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "アクションを指定するオプションが必要です"

po/km.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_km\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-10-04 09:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team:  <en@li.org>\n"
@@ -2665,7 +2665,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "ចំនួន​គត់​មិន​ត្រឹមត្រូវ​សម្រាប់ --%s: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2693,6 +2693,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2736,44 +2737,44 @@ msgstr ""
 "ព្រមាន - ប្រើ​​ជម្រើ​ស​​បាន​សម្គាល់ ​[!] អា​ចប​ង្ខូចការ​ដំឡើ​ងរបស់អ្នក​យ៉ាង​ធ្ងន់ធ្ងរ ។\n"
 "ជម្រើស​បង្ខំ​បាន​សម្គាល់ [*] ត្រូវ​បាន​អនុញ្ញាត​ដោយ​លំនាំដើម ។\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ជម្រើស​បង្ខំ/បដិសេធ​ដែល​មិនស្គាល់ `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "ព្រមាន ៖ ជម្រើស​បង្ខំ/បដិសេធ ដែល​លែង​ប្រើ `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--ពាក្យ​បញ្ជា-fd ​ត្រូវការ​អាគុយម៉ង់​មួយ មិនមែន​សូន្យ"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--ពាក្យ​បញ្ជា-fd ត្រូវការ​តែ​អាគុយម៉ង់​មួយ​ប៉ុណ្ណោះ"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "លេខ​មិន​ត្រឹមត្រូវ​សម្រាប់ --ពាក្យ​បញ្ជា-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "មិនអាចបើក​ `%i' សម្រាប់​ស្ទ្រីម​"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "ចុង​ឯកសា​រដែល​មិន​បាន​រំពឹង​ទុក​មុន​ចុង​បន្ទាត់ %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "ត្រូវ​ការ​ជម្រើស​សកម្មភាព​មួយ"

po/ko.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2008-02-04 16:26+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -2726,7 +2726,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 옵션에 숫자가 잘못되었습니다: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2754,6 +2754,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2794,45 +2795,45 @@ msgstr ""
 "경고 - [!]가 붙은 옵션을 사용하면 설치 상태를 심각하게 망가질 수 있습니다.\n"
 "[*]가 표시된 강제 옵션은 기본적으로 사용합니다.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "경고: `%s' force/refuse 옵션은 더 이상 사용하지 않습니다\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s 실행이 실패했습니다"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 옵션의 인자는 0개가 아니라 1개입니다"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 옵션의 인자는 정확히 1개입니다"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 옵션에 번호가 올바르지 않습니다"
 
 # fdopen() 실패 상황
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' 파일디스크립터를 스트림으로 열 수 없습니다"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습니다"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "명령 옵션이 필요합니다"

po/ku.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-04-07 13:50+0100\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -2532,6 +2532,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2543,44 +2544,44 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr ""

po/mr.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-08-17 16:02+0200\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -2674,7 +2674,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%sसाठी अयोग्य पूर्णांक : `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2702,6 +2702,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2744,44 +2745,44 @@ msgstr ""
 "ताकिद - [!] ठळक पर्यायांचा वापर तुमच्या स्थापनेला गंभीर नुकसान पोहचवू शकते.\n"
 "[*] हे फोर्सिंगचे ठळक पर्याय डिफॉल्टनी शक्य असतात.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr " अज्ञात फोर्स/रिफ्युज पर्याय `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "ताकिद: अप्रचलित फोर्स/रिफ्युज पर्याय `%.*s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s एग्झेक करण्यास अयशस्वी"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--कमांड-एफडि एक आर्ग्युमेन्ट/पर्याय घेते, शून्य नाही"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--कमांड-एफडि फक्त एक आर्ग्युमेन्ट/पर्याय घेते"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--कमांड-एफडिसाठी अयोग्य संख्या/क्रमांक"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "स्ट्रीमसाठी `%i' उघडू शकत नाही"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d ओळीच्या शेवटाच्या अगोदर अनपेक्षित इओएफ/फाइलचा शेवट"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "क्रियेच्या पर्यायाची आवश्यक्ता आहे"

po/ne.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_ne\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-08-05 17:41+0545\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -2697,7 +2697,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s का लागि इन्जिटर अवैध: `%.250s'   "
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2725,6 +2725,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2773,44 +2774,44 @@ msgstr ""
 "सक्छ ।\n"
 " [*] चिन्ह लगाएको जोडदार विकल्पहरू पूर्वनिर्धारित सक्षम हुन्छन् ।\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "अज्ञात दवाब/अविस्कार विकल्प `%.*s"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "चेतावनी: अप्रचलित दवाव/अस्विकार विकल्प `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s कार्यान्वयन गर्न असफल"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--आदेश-fd एउटा तर्क लिन्छ, शुन्य होइन"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--आदेश-fd ले मात्र एउटा तर्क लिन्छ"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--आदेश-fd का लागि अवैध नम्बर"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "प्रवाहका लागि`%i' खोोल्न सकेन"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "लाइनको समाप्ती पहिले %d अप्रत्यासित eof"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "एउटा कार्य विकल्प आवश्यक"

po/nl.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2007-05-10 16:19+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -2748,7 +2748,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2776,6 +2776,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2831,44 +2832,44 @@ msgstr ""
 "ernstig beschadigen.\n"
 "Forceeropties gemarkeerd met [*] staan standaard aan.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "onbekende force/refuse optie `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Let op: verouderde forceer/weiger optie `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "kan %s niet uitvoeren"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd aanvaard slechts één argument, en dat mag niet nul zijn"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd aanvaard slechts één argument"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "ongeldig nummer voor --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kan `%i' niet openen voor stream"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"

po/nn.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -2686,6 +2686,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2735,46 +2736,46 @@ msgstr ""
 "alvorleg.\n"
 "Vala som er merkte med [*] er slått på som standard.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjend tvingings-/avvisingsval «%.*s»"
 
-#: src/main.c:370
+#: src/main.c:371
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Åtvaring: Forelda val «%s»\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikkje køyra %s"
 
-#: src/main.c:534
+#: src/main.c:535
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tek éin parameter, ikkje null"
 
-#: src/main.c:536
+#: src/main.c:537
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tek berre ein parameter"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tal for --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikkje opna «%i» for straum"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "treng eit handlingsval"

po/pa.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-12-25 08:23+0530\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -2565,7 +2565,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2593,6 +2593,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2639,44 +2640,44 @@ msgstr ""
 "WARNING - use of options marked [!] can seriously damage your installation.\n"
 "Forcing options marked [*] are enabled by default.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr ""

po/pl.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-01 14:33+0100\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-06-06 06:08+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10-n-polish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1093,24 +1093,24 @@ msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
-"plik informacji kontrolnych wyzwalaczy \"%.250s\" ma nieprawidłową składnię "
-"w nazwie wyzwalacza \"%.250s\": %.250s"
+"plik informacji kontrolnych triggers \"%.250s\" ma nieprawidłową składnię w "
+"nazwie wyzwalacza \"%.250s\": %.250s"
 
 #: lib/triglib.c:605
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
-msgstr "nie można otworzyć pliku informacji kontrolnych wyzwalaczy \"%.250s\""
+msgstr "nie można otworzyć pliku informacji kontrolnych triggers \"%.250s\""
 
 #: lib/triglib.c:620
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
-"plik informacji kontrolnych wyzwalaczy zawiera niepoprawną składnię dyrektywy"
+"plik informacji kontrolnych triggers zawiera niepoprawną składnię dyrektywy"
 
 #: lib/triglib.c:629
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
-"plik informacji kontrolnych wyzwalaczy zawiera nieznaną dyrektywę \"%.250s\""
+"plik informacji kontrolnych triggers zawiera nieznaną dyrektywę \"%.250s\""
 
 #: lib/triglib.c:684
 #, c-format
@@ -2826,6 +2826,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2863,6 +2864,7 @@ msgstr ""
 "                        podano również opcji confold ani confnew.\n"
 "  confmiss [!]          Zainstalowanie brakujących plików konfig. bez "
 "pytania\n"
+"  breaks [!]            Instalacja mimo możliwości uszkodzenia innych pakietów\n"
 "  conflicts [!]         Zainstalowanie pakietów tworzących konflikt\n"
 "  architecture [!]      Przetwarzanie pakietów dla innej architektury\n"
 "  overwrite-dir [!]     Nadpisanie katalogów plikami z innych pakietów\n"
@@ -2872,44 +2874,44 @@ msgstr ""
 "UWAGA - użycie opcji oznaczonej [!] może poważnie uszkodzić instalację.\n"
 "Opcje wymuszeń oznaczone [*] są domyślnie włączone.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nieznana opcja force/refuse \"%.*s\""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Uwaga: niewykorzystywana już opcja force/refuse \"%s\"\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "wywołanie %s nie powiodło się"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd wymaga jednego argumentu, nie zero"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd wymaga tylko jednego argumentu"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "nieprawidłowy numer przy --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie udało się otworzyć \"%i\" jako strumienia"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed końcem linii %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "należy określić działanie"
@@ -2954,7 +2956,7 @@ msgid ""
 " (current status `%.250s' with no pending triggers)"
 msgstr ""
 "pakiet %.250s jest nie gotowy na przetwarzanie wyzwalaczy\n"
-" (bieżący stan \"%.250s\", bez oczekujących wyzwalaczy)"
+" (bieżący stan \"%.250s\", bez zaplanowanych wyzwalaczy)"
 
 #: src/packages.c:334
 #, c-format
@@ -3692,8 +3694,8 @@ msgid ""
 msgstr ""
 "Opcje:\n"
 "  --admindir=<katalog>           Użycie <katalogu> zamiast %s.\n"
-"  --by-package=<pakiet>          Wymuszenie oczekiwania wyzwalacza dla "
-"pakietu\n"
+"  --by-package=<pakiet>          Wymuszenie pakietu oczekującego na "
+"wyzwalacz\n"
 "                                   (normalnie ustawiane przez dpkg).\n"
 "  --no-await                     Pakiety nie będą czekać na przetwarzanie.\n"
 "  --no-act                       Tylko test - bez wykonywania żadnych "
@@ -5386,7 +5388,7 @@ msgstr ""
 "  --infodir=<katalog>      to samo co \"--dir-file=<katalog>/dir\".\n"
 "  --info-dir=<katalog>     jak wyżej.\n"
 "  --keep-old               nie zamienia wpisów i nie usuwa pustych.\n"
-"  --remove                 usuwa wpis pasujący do bazowej <nazwy pliku>.\n"
+"  --remove                 usuwa wpis pasujący do bazowej <nazwy_pliku>.\n"
 "  --remove-exactly         usuwa wpis ściśle pasujący do <nazwy_pliku>.\n"
 "  --test                   włącza tryb testowy (nie wykonuje żadnych "
 "akcji).\n"

po/pt.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-02 22:36+0100\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-20 18:53+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -2813,6 +2813,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2823,91 +2824,77 @@ msgid ""
 "WARNING - use of options marked [!] can seriously damage your installation.\n"
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"opções para forçar o %s - controla o comportamento quando são encontrados "
-"problemas:\n"
+"opções para forçar o %s - controla o comportamento quando são encontrados problemas:\n"
 "  avisar mas continuar:  --force-<coisa>,<coisa>,...\n"
-"  parar com erro:        --refuse-<coisa>,<coisa>,... | --no-force-"
-"<coisa>,...\n"
+"  parar com erro:        --refuse-<coisa>,<coisa>,... | --no-force-<coisa>,...\n"
 " Forçar coisas:\n"
 "  all [!]                Definir todas opções de forçar\n"
 "  downgrade [*]          Substituir um pacote por uma versão mais anterior\n"
-"  configure-any          Configurar qualquer pacote que possa vir a ajudar "
-"este\n"
-"  hold                   Processar pacotes incidentais mesmo quando estão a "
-"ser mantidos\n"
-"  bad-path               Faltam programas importantes no PATH, devendo "
-"aparecer problemas\n"
+"  configure-any          Configurar qualquer pacote que possa judar este\n"
+"  hold                   Processar pacotes incidentais mesmo quando estão a ser mantidos\n"
+"  bad-path               Faltam programas importantes no PATH, provavelmente problemas\n"
 "  not-root               Tentar (des)instalar coisas mesmo não sendo root\n"
-"  overwrite              Sobrescrever um ficheiro de um pacote com outro\n"
-"  overwrite-diverted     Sobrescrever um ficheiro desviado com uma versão "
-"sem desvios\n"
-"  bad-verify             Instalar um pacote mesmo que falhe a verificação de "
-"autenticação\n"
-"  depends-version [!]    Tornar problemas de dependências da versão em "
-"avisos\n"
-"  depends [!]            Tornar todos os problemas de dependências em "
-"avisos\n"
-"  confnew [!]            Utilizar sempre os novos ficheiros de configuração, "
-"sem perguntar\n"
-"  confold [!]            Utilizar sempre os antigos ficheiros de "
-"configuração, sem perguntar\n"
-"  confdef [!]            Usar as opções padrões para novos ficheiros de "
-"configuração se um\n"
-"                         estiver disponível, não perguntar. Se nenhum padrão "
-"pode ser encontrado,\n"
-"                         você será questionado a menos que uma das opções, "
-"confold ou\n"
-"                         confnew também sejam dadas\n"
+"  overwrite              Substituir um ficheiro de um pacote com outro\n"
+"  overwrite-diverted     Substituir um ficheiro desviado com uma versão sem desvios\n"
+"  bad-verify             Instalar um pacote mesmo que falhe a verificação de autenticidade\n"
+"  depends-version [!]    Tornar problemas de dependências de versão em avisos\n"
+"  depends [!]            Tornar todos os problemas de dependências em avisos\n"
+"  confnew [!]            Utilizar sempre os novos ficheiros de configuração, sem perguntar\n"
+"  confold [!]            Utilizar sempre os antigos ficheiros de configuração, sem perguntar\n"
+"  confdef [!]            Utilizar as opções pré-definidas para novos \n"
+"                         ficheiros de configuração se estiver algum \n"
+"                         disponível, sem perguntar. Se não for encontrada uma\n"
+"                         pré-definição, você será questionado a menos que seja\n"
+"                         utilizada uma das opções confold ou confnew\n"
 "  confmiss [!]           Instalar sempre ficheiros de configuração em falta\n"
 "  conflicts [!]          Permitir instalação de pacotes em conflito\n"
-"  architecture [!]       Processar até mesmo pacotes com arquitetura errada\n"
-"  overwrite-dir [!]      Sobrescrever um diretório de um pacote com um "
-"ficheiro de outro\n"
+"  architecture [!]       Processar até pacotes com arquitetura errada\n"
+"  overwrite-dir [!]      Substituir o diretório de um pacote por um ficheiro\n"
+"                         de outro\n"
 "  remove-reinstreq [!]   Remover pacotes que necessitem de instalação\n"
 "  remove-essential [!]   Remover um pacote essencial\n"
 "\n"
-"AVISO - o uso das opções marcadas com [!] pode danificar seriamente a sua "
-"instalação.\n"
-"Opções para forçar marcadas com [*] estão habilitadas por omissão.\n"
+"AVISO - as opções marcadas com [!] podem danificar seriamente a sua instalação.\n"
+"Opções para forçar marcadas com [*] estão habilitadas por pré-definição.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção desconhecida de forçar/recusar `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Aviso: opção forçar/recusar obsoleta `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "falhou executar %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd leva um argumento, não zero"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-df leva um argumento"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não pode abrir `%i' para stream"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"

po/pt_BR.po

@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-11 16:29-0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-06-09 02:48-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2185,14 +2185,14 @@ msgstr "Processamento parou porque havia muitos erros.\n"
 #, c-format
 msgid "Package %s was on hold, processing it anyway as you request\n"
 msgstr ""
-"Pacote %s estava sendo mantido, processando-o assim mesmo como pedido\n"
+"Pacote %s estava sendo retido, processando-o assim mesmo como pedido\n"
 
 #: src/errors.c:98
 #, c-format
 msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
-"Pacote %s está sendo mantido, não vou tocá-lo. Use --force-hold para "
+"Pacote %s está sendo retido, não vou tocá-lo. Use --force-hold para "
 "sobrepor.\n"
 
 #: src/errors.c:107
@@ -2819,6 +2819,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2838,7 +2839,7 @@ msgstr ""
 "  all [!]                Define todas as opções de forçar\n"
 "  downgrade [*]          Substitui um pacote por uma versão menor\n"
 "  configure-any          Configura qualquer pacote que possa ajudar esse\n"
-"  hold                   Processa pacotes incidentais mesmo quando mantidos\n"
+"  hold                   Processa pacotes incidentais mesmo quando retidos\n"
 "  bad-path               Faltam programas importantes no PATH, chances de\n"
 "                         problemas\n"
 "  not-root               Tenta (des)instalar coisas mesmo não sendo root\n"
@@ -2861,6 +2862,7 @@ msgstr ""
 "                         questionado, a menos que uma das opções, confold\n"
 "                         ou confnew também tenham sido informadas\n"
 "  confmiss [!]           Sempre instalar arquivos de configuração faltando\n"
+"  breaks [!]             Instala mesmo que isso quebre outro pacote\n"
 "  conflicts [!]          Permite a instalação de pacotes conflitantes\n"
 "  architecture [!]       Processa até mesmo pacotes com arquitetura errada\n"
 "  overwrite-dir [!]      Sobrepõe o diretório de um pacote com arquivo de\n"
@@ -2871,44 +2873,44 @@ msgstr ""
 "AVISO - o uso das opções marcadas com [!] pode danificar seriamente a sua\n"
 "instalação. Opções para forçar marcadas com [*] são habilitadas por padrão.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção de forçar/recusar '%.*s' desconhecida"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Aviso: opção forçar/recusar obsoleta '%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "falhou ao executar %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd aceita um argumento, não zero"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd aceita somente um argumento"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não foi possível abrir '%i' para \"stream\""
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "fim de arquivo inesperado após fim da linha %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "necessário uma opção de ação"
@@ -3293,10 +3295,10 @@ msgid ""
 "|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
 "uppercase=bad)\n"
 msgstr ""
-"Desejado=U=Desconhecido/Instalar/Remover/exPurgar/H=Manter\n"
+"Desejado=U=Desconhecido/Instalar/Remover/exPurgar/H=Reter\n"
 "| Estado=Não/Inst/arqs-Cfg/U=Descomp/Falhou-cfg/H=semi-inst/W=trig-adiado/"
 "Trig-pend\n"
-"|/ Erro?=(nenhum)/H=Mant/precisa-Reinst/X=ambos-problemas (Est,Err: "
+"|/ Erro?=(nenhum)/H=Ret/precisa-Reinst/X=ambos-problemas (Est,Err: "
 "maiúsculas=ruim)\n"
 
 #: src/query.c:129

po/ro.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2008-02-09 12:34+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -2809,7 +2809,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "întreg nevalid pentru --%s: „%.250s”"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2837,6 +2837,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2892,44 +2893,44 @@ msgstr ""
 "sistemul dvs.\n"
 "Forțarea opțiunilor marcate cu [*] sunt implicit activate.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opțiune de forțare/refuzare necunoscută „%.*s”"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Avertisment: opțiune învechită de forțare/refuzare „%s”\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "eșec la execuția %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd ia 1 argument, nu zero"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd ia doar un argument"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "număr nevalid pentru --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nu s-a putut deschide „%i” pentru fluxul de date"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "sfârșit neașteptat de fișier înainte de terminarea liniei %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "e necesară o opțiune de acțiune"

po/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2008-05-01 14:28+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2824,7 +2824,7 @@ msgstr ""
 "аргумент --%s (`%.250s') не является допустимым целочисленным значением"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2852,6 +2852,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2909,44 +2910,44 @@ msgstr ""
 "повредить\n"
 "вашу систему. Параметры, отмеченные [*], задействованы по умолчанию.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "недопустимый параметр игнорирования/обработки проблем `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Предупреждение: устаревший параметр игнорирования/обработки `%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "не удалось запустить %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "параметр --command-fd принимает один аргумент, а не ноль"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "параметр --command-fd принимает только один аргумент"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "аргумент параметра --command-fd не является числом"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "не удалось открыть поток дескриптора `%i'"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончилась строка %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "требуется параметр действия"

po/sk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2008-05-03 20:54+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2766,7 +2766,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné číslo pre --%s: „%.250s“"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2794,6 +2794,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2849,44 +2850,44 @@ msgstr ""
 "inštaláciu.\n"
 "Vynútenie volieb označených [*] je štandardne povolené.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznáma vynucovacia/odmietacia voľba „%.*s“"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Upozornenie: zastaralá vynucovacia/zakazovacia voľba „%s“\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "nie je možné spustiť %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd vyžaduje jeden parameter, nie nula"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd vyžaduje len jeden parameter"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "neplatné číslo pre --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie je možné otvoriť „%i“ pre tok"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "nečakaný koniec súboru pred koncom riadka %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "vyžaduje sa zadanie voľby akcia"

po/sv.po

@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-04-28 22:14+0200\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-13 09:26+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
 #: lib/compat.c:46
 msgid "unable to open tmpfile for vsnprintf"
@@ -2759,6 +2759,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2794,6 +2795,7 @@ msgstr ""
 "har\n"
 "                         angivits\n"
 "  confmiss [!]           Installera alltid saknade konfigurationsfiler\n"
+"  breaks [!]             Installera även om det skulle förstöra ett annat paket\n"
 "  conflicts [!]          Tillåt installation av paket som är i konflikt\n"
 "  architecture [!]       Hantera även paket med fel arkitektur\n"
 "  overwrite-dir [!]      Skriv över ett pakets katalog med ett annats fil\n"
@@ -2804,44 +2806,44 @@ msgstr ""
 "installation\n"
 "om de används. Flaggor markerade [*] är förvalda.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "okänd flagga för force/refuse: \"%.*s\""
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Varning: föråldrad tvingande/vägrande flagga \"%s\"\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunde inte köra %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tar ett argument, inte noll"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tar bara ett argument"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "ogiltigt tal för --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunde inte öppna \"%i\" för ström"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "behöver en åtgärd att utföra"

po/th.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2008-03-02 18:14+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -2664,7 +2664,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "ค่าจำนวนเต็มผิดสำหรับ --%s: `%.250s'"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2692,6 +2692,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2733,44 +2734,44 @@ msgstr ""
 "*คำเตือน* - การใช้ตัวเลือกที่ทำเครื่องหมาย [!] ไว้ อาจทำให้ระบบเสียหายอย่างร้ายแรงได้\n"
 "รายการการบังคับที่ทำเครื่องหมาย [*] ไว้ จะถูกเปิดใช้โดยปริยายอยู่แล้ว\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ไม่รู้จักตัวเลือก force/refuse `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "คำเตือน: ตัวเลือก force/refuse `%s' เลิกใช้แล้ว\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "ไม่สามารถเรียกทำงาน %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd รับอาร์กิวเมนต์หนึ่งตัว ไม่ใช่ไม่มี"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd รับอาร์กิวเมนต์เพียงหนึ่งตัว"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "ค่าตัวเลขไม่ถูกต้องสำหรับ --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "ไม่สามารถเปิด `%i' สำหรับสตรีม"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "แฟ้มจบก่อนที่จะจบบรรทัดที่บรรทัด %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "ต้องมีตัวเลือกระบุการกระทำด้วย"

po/tl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-02-17 08:53+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -2718,6 +2718,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2780,46 +2781,46 @@ msgstr ""
 "ay\n"
 "naka-enable na default.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "di kilalang opsyon na force/refuse `%.*s'"
 
-#: src/main.c:370
+#: src/main.c:371
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Babala: laos na opsyon `--%s'\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "bigo sa pag-exec ng %s"
 
-#: src/main.c:534
+#: src/main.c:535
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd ay tumatanggap ng 1 argumento, hindi 0"
 
-#: src/main.c:536
+#: src/main.c:537
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd ay tumatanggap lamang ng 1 argumento"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "di tanggap na numero para sa --command-fd"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "hindi mabuksan ang `%i' para sa stream"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "di inaasahang eof bago matapos ang linya %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "kailangan ng opsyon ng gagawin"

po/vi.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-04-03 21:51+1030\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-14 23:14+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -2875,6 +2875,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2933,6 +2934,7 @@ msgstr ""
 "\t(cấu hình mặc định)\n"
 "  confmiss [!]           Luôn luôn cài đặt tập tin cấu hình còn thiếu\n"
 "\t(cấu hình con thiếu)\n"
+"  breaks [!]             Cài đặt thậm chí nếu nó sẽ hỏng gói khác\n"
 "  conflicts [!]            Cho phép cài đặt các gói xung đột với nhau\n"
 "\t(xung đột)\n"
 "  architecture [!]       Xử lý ngay cả các gói có sai kiến trúc\n"
@@ -2949,45 +2951,45 @@ msgstr ""
 "thống.\n"
 "Tùy chọn ép buộc có dấu sao [*] được bật theo mặc định.\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "tùy chọn ép buộc/từ chối không rõ « %.*s »"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Cảnh báo: tùy chọn ép buộc/từ chối cũ « %s »\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "lỗi thực hiện %s"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 "« --command-fd » (lệnh mô tả tập tin) chấp nhận một đối số (không phải 0)"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "« --command-fd » (lệnh mô tả tập tin) chỉ chấp nhận một đối số"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "số không hợp lệ cho « --command-fd »"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "không thể mở « %i » cho luồng"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "gặp kết thúc tập tin bất ngờ trước kết thúc dòng %d"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "cần một tùy chọn hành động"
@@ -6137,117 +6139,3 @@ msgstr "không thể cài đặt %s như là %s: %s"
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Gặp lỗi nghiêm trọng: %s"
-
-#~ msgid "couldn't allocate memory for strdup in findpackage(%s)"
-#~ msgstr ""
-#~ "không thể cấp phát bộ nhớ cho strdup trong findpackage(%s) (tìm gói)"
-
-#~ msgid "failed to allocate buffer in buffer_copy (%s)"
-#~ msgstr "lỗi cấp phát bộ đệm trong buffer_copy [bộ đệm_chép] (%s)"
-
-#~ msgid "Error allocating memory for cfgfilename"
-#~ msgstr "Gặp lỗi khi cấp phát bộ nhớ cho cfgfilename (tên tập tin cấu hình)"
-
-#~ msgid "failed to malloc for info file `%.255s'"
-#~ msgstr "lỗi malloc (cấp phát bộ nhớ) cho tập tin thông tin « %.255s »"
-
-#~ msgid "diversions file has too-long line or EOF [i]"
-#~ msgstr ""
-#~ "tập tin diversions (sự trệch đi) có dòng quá dài hoặc kết thúc tập tin [i]"
-
-#~ msgid "read error in diversions [ii]"
-#~ msgstr "lỗi đọc trong diversions (sự trệch đi) [ii]"
-
-#~ msgid "unexpected EOF in diversions [ii]"
-#~ msgstr "gặp kết thúc tập tin bất ngờ trong diversions (sự trệch đi) [ii]"
-
-#~ msgid "fgets gave an empty string from diversions [ii]"
-#~ msgstr "fgets đưa ra một chuỗi rỗng từ diversions (sự trệch đi) [ii]"
-
-#~ msgid "diversions file has too-long line or EOF [ii]"
-#~ msgstr ""
-#~ "tập tin diversions (sự trệch đi) có dòng quá dài hoặc kết thúc tập tin "
-#~ "[ii]"
-
-#~ msgid "read error in diversions [iii]"
-#~ msgstr "lỗi đọc trong diversions (sự trệch đi) [iii]"
-
-#~ msgid "unexpected EOF in diversions [iii]"
-#~ msgstr "gặp kết thúc tập tin bất ngờ trong diversions (sự trệch đi) [iii]"
-
-#~ msgid "fgets gave an empty string from diversions [iii]"
-#~ msgstr "fgets đưa ra một chuỗi rỗng từ diversions (sự trệch đi) [iii]"
-
-#~ msgid "couldn't malloc in execbackend"
-#~ msgstr ""
-#~ "không thể malloc (cấp phát bộ nhớ) trong execbackend (thực hiện hậu "
-#~ "phương)"
-
-#~ msgid "couldn't strdup in execbackend"
-#~ msgstr ""
-#~ "không thể strdup (sao lại chuỗi) trong execbackend (thực hiện hbậu phương)"
-
-#~ msgid "failed allocating memory for variable `ctrlarea'"
-#~ msgstr "lỗi cấp phát bộ nhớ cho biến « ctrlarea » (vùng điều khiển)"
-
-#~ msgid "Cannot get ENOENT value from %s: %s"
-#~ msgstr "Không thể lấy giá trị ENOENT từ %s: %s"
-
-#~ msgid "unable to ensure %s nonexistent: %s"
-#~ msgstr "không thể đảm bảo %s không tồn tại: %s"
-
-#~ msgid ""
-#~ "warning: %s is supposed to be a slave symlink to\n"
-#~ " %s, or nonexistent; however, readlink failed: %s"
-#~ msgstr ""
-#~ "cảnh báo : %s nên là liên kết tượng trưng phụ đến %s,\n"
-#~ " hoặc không tồn tại; tuy nhiên, việc readlink bị lỗi: %s"
-
-#~ msgid "warning"
-#~ msgstr "cảnh báo"
-
-#~ msgid "parse error"
-#~ msgstr "lỗi phân tách"
-
-#~ msgid " (package: "
-#~ msgstr " (gói: "
-
-#~ msgid ""
-#~ "dpkg: regarding %s containing %s:\n"
-#~ " package uses Breaks; not supported in this dpkg\n"
-#~ msgstr ""
-#~ "dpkg: về %s chứa %s:\n"
-#~ " gói sử dụng Ngắt; không được hỗ trơ trong dpkg này\n"
-
-#~ msgid "unsupported dependency problem - not installing %.250s"
-#~ msgstr "vấn đề quan hệ phụ thuộc không được hỗ trợ nên không cài đặt %.250s"
-
-#~ msgid "dpkg: warning - ignoring Breaks !\n"
-#~ msgstr "dpkg: cảnh báo — đang lờ đi Ngắt.\n"
-
-#~ msgid "diversion by %s"
-#~ msgstr "làm trệch bởi %s"
-
-#~ msgid "to"
-#~ msgstr "đến"
-
-#~ msgid "from"
-#~ msgstr "từ"
-
-#~ msgid "error reading %s"
-#~ msgstr "gặp lỗi khi đọc %s"
-
-#~ msgid "two modes specified: %s and --%s"
-#~ msgstr "hai chế độ đã xác định: %s và « --%s »"
-
-#~ msgid "manflag"
-#~ msgstr "manflag (cờ trang hướng dẫn)"
-
-#~ msgid "%s: failed to exec gzip -dc"
-#~ msgstr "%s: việc thực hiện « gzip -dc » bị lỗi"
-
-#~ msgid "%s: failed to exec bzip2 -dc"
-#~ msgstr "%s: việc thực hiện « bzip2 -dc » bị lỗi"
-
-#~ msgid "%s: failed to exec bzip2 %s"
-#~ msgstr "%s: việc thực hiện bzip2 bị lỗi %s"

po/zh_CN.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-04-01 07:42+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
+"PO-Revision-Date: 2008-05-27 21:13+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -975,7 +975,8 @@ msgstr "触发器名包含无效字符"
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
-msgstr "触发器名“%.250s”包含无效或者位置的语法(在软件包“%.250s”的触发器兴趣中)"
+msgstr ""
+"触发器名“%.250s”包含无效或者未知的语法(在对软件包“%.250s”感兴趣的触发器中)"
 
 #: lib/triglib.c:291
 #, c-format
@@ -1986,7 +1987,7 @@ msgid ""
 "have activated in other packages.  This processing can be requested using\n"
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
-"下列软件包正在等待它们在其他软件包激活的触发器处理。\n"
+"下列软件包正在等待由它们在其他软件包激活的触发器处理。\n"
 "该处理可以使用 dselect 或者 dpkg --configure --pending\n"
 "(或者 dpkg --triggers-only)来请求：\n"
 
@@ -1996,7 +1997,7 @@ msgid ""
 "has not yet been done.  Trigger processing can be requested using\n"
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
-"下列软件包被触发，但触发器处理尚未完成。触发器可以使用 dselect 或者 \n"
+"下列软件包被触发，但触发器处理尚未完成。触发器处理可以使用 dselect 或者 \n"
 "dpkg --configure --pending (或者 dpkg --triggers-only)来请求：\n"
 
 #: src/enquiry.c:131
@@ -2708,6 +2709,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2751,44 +2753,44 @@ msgstr ""
 "警告 - 使用带有[!]标记的选项可能会严重破坏您的系统。\n"
 "缺省情况下，是使用带有[*]标记的强制手段的。\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "无法识别的 force/refuse 选项“%.*s”"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告：已废弃不用的强制或拒绝选项“--%s”\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失败"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 需要带一个参数，而非零个"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 只需带一个参数"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一个无效的数字参数"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "无法打开“%i”，并把它作为字符流操作"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时，发现了预料之外的 eof"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "需要一个指示操作的选项"

po/zh_TW.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-05-13 05:54+0300\n"
 "PO-Revision-Date: 2006-10-16 21:31+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -2668,7 +2668,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一個無效的數字參數：“%.250s”"
 
 #: src/main.c:320
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2696,6 +2696,7 @@ msgid ""
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
@@ -2738,44 +2739,44 @@ msgstr ""
 "警告 - 使用帶有[!]標記的選項可能會嚴重破壞您的系統安裝。\n"
 "預設情況下，是使用帶有[*]標記的強制方法。\n"
 
-#: src/main.c:365
+#: src/main.c:366
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "無法識別的 force/refuse 選項“%.*s”"
 
-#: src/main.c:370
+#: src/main.c:371
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告：已廢棄不用的選項“%s”\n"
 
-#: src/main.c:519
+#: src/main.c:520
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失敗"
 
-#: src/main.c:534
+#: src/main.c:535
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 需要一個參數，而不是零個"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 只需一個參數"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一個無效的數字參數"
 
-#: src/main.c:540
+#: src/main.c:541
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "無法打開“%i”，並把它作為串流處理"
 
-#: src/main.c:565
+#: src/main.c:566
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行還未結束時，發現了預料之外的 eof"
 
-#: src/main.c:610 src/main.c:625 src/query.c:563 dpkg-deb/main.c:199
+#: src/main.c:611 src/main.c:626 src/query.c:563 dpkg-deb/main.c:199
 #: dpkg-split/main.c:165
 msgid "need an action option"
 msgstr "需要一個指示操作的選項"

scripts/Dpkg/Source/Package.pm

@@ -327,6 +327,16 @@ sub extract {
         die $@;
     }
 
+    # Store format if non-standard so that next build keeps the same format
+    if ($self->{'fields'}{'Format'} ne "1.0") {
+        my $srcdir = File::Spec->catdir($newdirectory, "debian", "source");
+        my $format_file = File::Spec->catfile($srcdir, "format");
+        mkdir($srcdir) unless -e $srcdir;
+        open(FORMAT, ">", $format_file) || syserr(_g("can't write %s"), $format_file);
+        print FORMAT $self->{'fields'}{'Format'} . "\n";
+        close(FORMAT);
+    }
+
     # Make sure debian/rules is executable
     my $rules = File::Spec->catfile($newdirectory, "debian", "rules");
     my @s = lstat($rules);

scripts/Dpkg/Source/Package/V2.pm

@@ -204,6 +204,7 @@ sub prepare_build {
         diff_ignore_regexp => $self->{'options'}{'diff_ignore_regexp'},
         include_removal => $self->{'options'}{'include_removal'},
         include_timestamp => $self->{'options'}{'include_timestamp'},
+        use_dev_null => 1,
     };
     push @{$self->{'options'}{'tar_ignore'}}, "debian/patches/.dpkg-source-applied";
     $self->check_patches_applied($dir) if $self->{'options'}{'preparation'};
@@ -348,6 +349,11 @@ sub do_build {
         unlink($tmpdiff) || syserr(_g("cannot remove %s"), $tmpdiff);
     } else {
         mkpath(File::Spec->catdir($dir, "debian", "patches"));
+        info(_g("local changes stored in %s, the modified files are:"), $autopatch);
+        my $analysis = $diff->analyze($dir);
+        foreach my $fn (sort keys %{$analysis->{'filepatched'}}) {
+            print " $fn\n";
+        }
         rename($tmpdiff, $autopatch) ||
                 syserr(_g("cannot rename %s to %s"), $tmpdiff, $autopatch);
     }

scripts/Dpkg/Source/Package/V3/quilt.pm

@@ -31,13 +31,15 @@ use Dpkg::IPC;
 use POSIX;
 use File::Basename;
 use File::Spec;
+use File::Path;
 
 our $CURRENT_MINOR_VERSION = "0";
 
 sub init_options {
     my ($self) = @_;
     $self->SUPER::init_options();
-    $self->{'options'}{'without_quilt'} = 0
+    # By default use quilt, unless it's not available
+    $self->{'options'}{'without_quilt'} = (-x "/usr/bin/quilt") ? 0 : 1
         unless exists $self->{'options'}{'without_quilt'};
 }
 
@@ -53,7 +55,7 @@ sub parse_cmdline_option {
 
 sub get_autopatch_name {
     my ($self) = @_;
-    return "debian-changes-" . $self->{'fields'}{'Version'} . ".diff";
+    return "debian-changes-" . $self->{'fields'}{'Version'};
 }
 
 sub get_series_file {
@@ -77,7 +79,7 @@ sub get_patches {
         open(SERIES, "<" , $series) || syserr(_g("cannot read %s"), $series);
         while(defined($_ = <SERIES>)) {
             chomp; s/^\s+//; s/\s+$//; # Strip leading/trailing spaces
-            s/\s#.*$//; # Strip trailing comment
+            s/(^|\s+)#.*$//; # Strip comment
             next unless $_;
             if (/^(\S+)\s+(.*)$/) {
                 $_ = $1;
@@ -96,12 +98,26 @@ sub get_patches {
     return @patches;
 }
 
+sub run_quilt {
+    my ($self, $dir, $params, %more_opts) = @_;
+    $params = [ $params ] unless ref($params) eq "ARRAY";
+    my $absdir = $dir;
+    unless (File::Spec->file_name_is_absolute($absdir)) {
+        $absdir = File::Spec->rel2abs($dir);
+    }
+    my %opts = (
+        env => { QUILT_PATCHES => "$absdir/debian/patches" },
+        'chdir' => $dir,
+        'exec' => [ 'quilt', '--quiltrc', '/dev/null', @$params ],
+        %more_opts
+    );
+    my $pid = fork_and_exec(%opts);
+    return $pid;
+}
+
 sub apply_patches {
     my ($self, $dir, $skip_auto) = @_;
 
-    # Check if quilt is available
-    my $have_quilt = (-x "/usr/bin/quilt") ? 1 : 0;
-
     # Update debian/patches/series symlink if needed to allow quilt usage
     my $series = $self->get_series_file($dir);
     return unless $series; # No series, no patches
@@ -122,22 +138,17 @@ sub apply_patches {
     foreach my $patch ($self->get_patches($dir, $skip_auto)) {
         my $path = File::Spec->catfile($dir, "debian", "patches", $patch);
         my $patch_obj = Dpkg::Source::Patch->new(filename => $path);
-        if ($have_quilt and not $self->{'options'}{'without_quilt'}) {
+        if (not $self->{'options'}{'without_quilt'}) {
             info(_g("applying %s with quilt"), $patch) unless $skip_auto;
             my $analysis = $patch_obj->analyze($dir);
             foreach my $dir (keys %{$analysis->{'dirtocreate'}}) {
                 eval { mkpath($dir); };
                 syserr(_g("cannot create directory %s"), $dir) if $@;
             }
-            my %opts = (
-                env => { QUILT_PATCHES => 'debian/patches' },
-                delete_env => [ 'QUILT_PATCH_OPTS' ],
-                'chdir' => $dir,
-                'exec' => [ 'quilt', '--quiltrc', '/dev/null', 'push', $patch ],
-                wait_child => 1,
-                to_file => '/dev/null',
-            );
-            fork_and_exec(%opts);
+            $self->run_quilt($dir, ['push', $patch],
+                             delete_env => ['QUILT_PATCH_OPTS'],
+                             wait_child => 1,
+                             to_file => '/dev/null');
             foreach my $fn (keys %{$analysis->{'filepatched'}}) {
                 utime($now, $now, $fn) || $! == ENOENT ||
                     syserr(_g("cannot change timestamp for %s"), $fn);
@@ -172,39 +183,26 @@ sub prepare_build {
 sub check_patches_applied {
     my ($self, $dir) = @_;
     my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
-    my $quiltdir = File::Spec->catdir($dir, ".pc");
-    if (-d $quiltdir) {
-        my $auto_patch = $self->get_autopatch_name();
+    my $auto_patch = $self->get_autopatch_name();
+    my @patches ;
+    # First we try to get a list of patches that are probably not napplied
+    if (not $self->{'options'}{'without_quilt'}) {
         my $pipe;
-        my %opts = (env => { QUILT_PATCHES => 'debian/patches' },
-                    delete_env => [ 'QUILT_PATCH_OPTS' ],
-                    'chdir' => $dir,
-                    'exec' => [ 'quilt', '--quiltrc', '/dev/null', 'unapplied' ],
-                    error_to_file => "/dev/null",
-                    to_pipe => \$pipe);
-        my $pid = fork_and_exec(%opts);
-        # We skip auto_patch as this one might be applied but not by
-        # quilt... but by the user who made changes live in the tree
-        # and whose changes lead to this patch addition by a previous
-        # dpkg-source run.
-        my @patches = grep { chomp; $_ ne $auto_patch } (<$pipe>);
+        my $pid = $self->run_quilt($dir, ['unapplied'], error_to_file => '/dev/null',
+                                   to_pipe => \$pipe);
+        @patches = map { chomp; $_ } (<$pipe>);
         close ($pipe) || syserr("close on 'quilt unapplied' pipe");
         wait_child($pid, cmdline => "quilt unapplied", nocheck => 1);
-        if (@patches) {
-            warning(_g("patches have not been applied, applying them now (use --no-preparation to override)"));
-            $opts{'wait_child'} = 1;
-            $opts{'to_file'} = "/dev/null";
-            delete $opts{'to_pipe'};
-            foreach my $patch (@patches) {
-                info(_g("applying %s with quilt"), $patch);
-                $opts{'exec'} = [ 'quilt', '--quiltrc', '/dev/null', 'push', $patch ];
-                fork_and_exec(%opts);
-            }
-        }
-        return;
+        subprocerr("quilt unapplied") unless WIFEXITED($?);
+    } else {
+        @patches = $self->get_patches($dir);
     }
-    unless (-e $applied) {
-        if (scalar($self->get_patches($dir))) {
+    # Then we check if it's applicable, and if yes, we make the
+    # assumption that patches are not applied and need to be applied
+    if (scalar(@patches)) {
+        my $first_patch = File::Spec->catfile($dir, "debian", "patches", $patches[0]);
+        my $patch_obj = Dpkg::Source::Patch->new(filename => $first_patch);
+        if ($patch_obj->check_apply($dir)) {
             warning(_g("patches have not been applied, applying them now (use --no-preparation to override)"));
             $self->apply_patches($dir);
         }
@@ -214,16 +212,38 @@ sub check_patches_applied {
 sub register_autopatch {
     my ($self, $dir) = @_;
     my $auto_patch = $self->get_autopatch_name();
-    my $has_patch = (grep { $_ eq $auto_patch } $self->get_patches($dir)) ? 1 : 0;
+    my @patches = $self->get_patches($dir);
+    my $has_patch = (grep { $_ eq $auto_patch } @patches) ? 1 : 0;
     my $series = $self->get_series_file($dir);
     $series ||= File::Spec->catfile($dir, "debian", "patches", "series");
     my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
-    if (-e "$dir/debian/patches/$auto_patch") {
+    my $patch = File::Spec->catfile($dir, "debian", "patches", $auto_patch);
+    my $absdir = $dir;
+    unless (File::Spec->file_name_is_absolute($absdir)) {
+        $absdir = File::Spec->rel2abs($dir);
+    }
+    if (-e $patch) {
         # Add auto_patch to series file
         if (not $has_patch) {
-            open(SERIES, ">>", $series) || syserr(_g("cannot write %s"), $series);
-            print SERIES "$auto_patch\n";
-            close(SERIES);
+            # Use quilt to register only if it's wanted/available AND :
+            # - either we have patches and quilt has been used (.pc dir exists)
+            # - or we don't have patches, hence quilt couldn't be used
+            if ((-d "$dir/.pc" or not scalar(@patches)) and
+                not $self->{'options'}{'without_quilt'})
+            {
+                # Registering the new patch with quilt requires some
+                # trickery: reverse-apply the patch, import it, apply it
+                # again with quilt this time
+                my $patch_obj = Dpkg::Source::Patch->new(filename => $patch);
+                $patch_obj->apply($dir, add_options => ['-R', '-E']);
+                $self->run_quilt($dir, ['import', "$absdir/debian/patches/$auto_patch"],
+                                 wait_child => 1, to_file => '/dev/null');
+                $self->run_quilt($dir, ['push'], wait_child => 1, to_file => '/dev/null');
+            } else {
+                open(SERIES, ">>", $series) || syserr(_g("cannot write %s"), $series);
+                print SERIES "$auto_patch\n";
+                close(SERIES);
+            }
             open(APPLIED, ">>", $applied) || syserr(_g("cannot write %s"), $applied);
             print APPLIED "$auto_patch\n";
             close(APPLIED);
@@ -231,12 +251,17 @@ sub register_autopatch {
     } else {
         # Remove auto_patch from series
         if ($has_patch) {
-            open(SERIES, "<", $series) || syserr(_g("cannot read %s"), $series);
-            my @lines = <SERIES>;
-            close(SERIES);
-            open(SERIES, ">", $series) || syserr(_g("cannot write %s"), $series);
-            print(SERIES $_) foreach grep { not /^\Q$auto_patch\E\s*$/ } @lines;
-            close(SERIES);
+            if ($self->{'options'}{'without_quilt'}) {
+                open(SERIES, "<", $series) || syserr(_g("cannot read %s"), $series);
+                my @lines = <SERIES>;
+                close(SERIES);
+                open(SERIES, ">", $series) || syserr(_g("cannot write %s"), $series);
+                print(SERIES $_) foreach grep { not /^\Q$auto_patch\E\s*$/ } @lines;
+                close(SERIES);
+            } else {
+                $self->run_quilt($dir, ['delete', $auto_patch],
+                                 wait_child => 1, to_file => '/dev/null');
+            }
         }
     }
 }

scripts/Dpkg/Source/Patch.pm

@@ -175,8 +175,12 @@ sub add_diff_directory {
                 return;
             }
 
+            my $label_old = "$basedir.orig/$fn";
+            if ($opts{'use_dev_null'}) {
+                $label_old = $old_file if $old_file eq '/dev/null';
+            }
             my $success = $self->add_diff_file($old_file, "$new/$fn",
-                label_old => "$basedir.orig/$fn",
+                label_old => $label_old,
                 label_new => "$basedir/$fn",
                 %opts);
 
@@ -279,48 +283,75 @@ sub analyze {
     my %dirtocreate;
     my $diff_count = 0;
 
-    $_ = <$diff_handle>;
+    sub getline {
+        my $handle = shift;
+        my $line = <$handle>;
+        if (defined $line) {
+            # Strip end-of-line chars
+            chomp($line);
+            $line =~ s/\r$//;
+        }
+        return $line;
+    }
+    sub strip_ts { # Strip timestamp
+        my $header = shift;
+        # Tab is the official separator, it's always used when
+        # filename contain spaces. Try it first, otherwise strip on space
+        # if there's no tab
+        $header =~ s/\s.*// unless ($header =~ s/\t.*//);
+        return $header;
+    }
+    $_ = getline($diff_handle);
 
   HUNK:
     while (defined($_) || not eof($diff_handle)) {
+	my ($fn, $fn2);
 	# skip comments leading up to patch (if any)
 	until (/^--- /) {
-	    last HUNK if not defined($_ = <$diff_handle>);
+	    last HUNK if not defined($_ = getline($diff_handle));
 	}
-	chomp;
 	$diff_count++;
 	# read file header (---/+++ pair)
 	unless(s/^--- //) {
 	    error(_g("expected ^--- in line %d of diff `%s'"), $., $diff);
 	}
-	s/\t.*//; # Strip any timestamp at the end
-	unless ($_ eq '/dev/null' or s{^(\./)?[^/]+/}{$destdir/}) {
-	    error(_g("diff `%s' patches file with no subdirectory"), $diff);
-	}
+        $_ = strip_ts($_);
+        if ($_ eq '/dev/null' or s{^(\./)?[^/]+/}{$destdir/}) {
+            $fn = $_;
+        }
 	if (/\.dpkg-orig$/) {
 	    error(_g("diff `%s' patches file with name ending .dpkg-orig"), $diff);
 	}
-	my $fn = $_;
 
-	unless (defined($_= <$diff_handle>) and chomp) {
+	unless (defined($_ = getline($diff_handle))) {
 	    error(_g("diff `%s' finishes in middle of ---/+++ (line %d)"), $diff, $.);
 	}
-	s/\t.*//; # Strip any timestamp at the end
-	unless (s/^\+\+\+ // and ($_ eq '/dev/null' or s!^(\./)?[^/]+/!!)) {
-	    error(_g("line after --- isn't as expected in diff `%s' (line %d)"),
-	          $diff, $.);
+	unless (s/^\+\+\+ //) {
+	    error(_g("line after --- isn't as expected in diff `%s' (line %d)"), $diff, $.);
 	}
+        $_ = strip_ts($_);
+        if ($_ eq '/dev/null' or s{^(\./)?[^/]+/}{$destdir/}) {
+            $fn2 = $_;
+        } else {
+            unless (defined $fn) {
+                error(_g("none of the filenames in ---/+++ are relative in diff `%s' (line %d)"),
+                      $diff, $.);
+            }
+        }
 
-	if ($fn eq '/dev/null') {
-	    error(_g("original and modified files are /dev/null in diff `%s' (line %d)"),
-		  $diff, $.) if $_ eq '/dev/null';
-	    $fn = "$destdir/$_";
-	} else {
-	    unless ($_ eq '/dev/null' or $_ eq substr($fn, length($destdir) + 1)) {
-	        error(_g("line after --- isn't as expected in diff `%s' (line %d)"),
-	              $diff, $.);
-	    }
-	}
+        if (defined($fn) and $fn eq '/dev/null') {
+            error(_g("original and modified files are /dev/null in diff `%s' (line %d)"),
+                  $diff, $.) if (defined($fn2) and $fn2 eq '/dev/null');
+            $fn = $fn2;
+        } elsif (defined($fn2) and $fn2 ne '/dev/null') {
+            $fn = $fn2 unless defined $fn;
+            $fn = $fn2 if ((not -e $fn) and -e $fn2);
+        } elsif (defined($fn2) and $fn2 eq '/dev/null') {
+            error(_g("file removal without proper filename in diff `%s' (line %d)"),
+                  $diff, $. - 1) unless defined $fn;
+            warning(_g("diff %s removes a non-existing file %s (line %d)"),
+                    $diff, $fn, $.) unless -e $fn;
+        }
 
 	my $dirname = $fn;
 	if ($dirname =~ s{/[^/]+$}{} && not -d $dirname) {
@@ -337,23 +368,24 @@ sub analyze {
 
 	# read hunks
 	my $hunk = 0;
-	while (defined($_ = <$diff_handle>)) {
+	while (defined($_ = getline($diff_handle))) {
 	    # read hunk header (@@)
-	    chomp;
 	    next if /^\\ No newline/;
 	    last unless (/^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@( .*)?$/);
 	    my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1);
 	    # read hunk
 	    while ($olines || $nlines) {
-		unless (defined($_ = <$diff_handle>)) {
-		    error(_g("unexpected end of diff `%s'"), $diff);
-		}
-		unless (chomp) {
-		    error(_g("diff `%s' is missing trailing newline"), $diff);
+		unless (defined($_ = getline($diff_handle))) {
+                    if (($olines == $nlines) and ($olines < 3)) {
+                        warning(_g("unexpected end of diff `%s'"), $diff);
+                        last;
+                    } else {
+                        error(_g("unexpected end of diff `%s'"), $diff);
+                    }
 		}
 		next if /^\\ No newline/;
 		# Check stats
-		if    (/^ /)  { --$olines; --$nlines; }
+		if    (/^ / || /^$/)  { --$olines; --$nlines; }
 		elsif (/^-/)  { --$olines; }
 		elsif (/^\+/) { --$nlines; }
 		else {
@@ -377,6 +409,16 @@ sub analyze {
     return $self->{'analysis'}{$destdir};
 }
 
+sub prepare_apply {
+    my ($self, $analysis, %opts) = @_;
+    if ($opts{"create_dirs"}) {
+	foreach my $dir (keys %{$analysis->{'dirtocreate'}}) {
+	    eval { mkpath($dir, 0, 0777); };
+	    syserr(_g("cannot create directory %s"), $dir) if $@;
+	}
+    }
+}
+
 sub apply {
     my ($self, $destdir, %opts) = @_;
     # Set default values to options
@@ -389,12 +431,7 @@ sub apply {
     push @{$opts{"options"}}, @{$opts{"add_options"}};
     # Check the diff and create missing directories
     my $analysis = $self->analyze($destdir, %opts);
-    if ($opts{"create_dirs"}) {
-	foreach my $dir (keys %{$analysis->{'dirtocreate'}}) {
-	    eval { mkpath($dir, 0, 0777); };
-	    syserr(_g("cannot create directory %s"), $dir) if $@;
-	}
-    }
+    $self->prepare_apply($analysis, %opts);
     # Apply the patch
     my $diff_handle = $self->open_for_read();
     fork_and_exec(
@@ -421,6 +458,37 @@ sub apply {
     }
 }
 
+# Verify if check will work...
+sub check_apply {
+    my ($self, $destdir, %opts) = @_;
+    # Set default values to options
+    $opts{"create_dirs"} = 1 unless exists $opts{"create_dirs"};
+    $opts{"options"} ||= [ '--dry-run', '-s', '-t', '-F', '0', '-N', '-p1', '-u',
+            '-V', 'never', '-g0', '-b', '-z', '.dpkg-orig'];
+    $opts{"add_options"} ||= [];
+    push @{$opts{"options"}}, @{$opts{"add_options"}};
+    # Check the diff and create missing directories
+    my $analysis = $self->analyze($destdir, %opts);
+    $self->prepare_apply($analysis, %opts);
+    # Apply the patch
+    my $diff_handle = $self->open_for_read();
+    my $error;
+    my $patch_pid = fork_and_exec(
+	'exec' => [ 'patch', @{$opts{"options"}} ],
+	'chdir' => $destdir,
+	'env' => { LC_ALL => 'C', LANG => 'C' },
+	'delete_env' => [ 'POSIXLY_CORRECT' ], # ensure expected patch behaviour
+	'from_handle' => $diff_handle,
+        'to_file' => '/dev/null',
+        'error_to_file' => '/dev/null',
+    );
+    wait_child($patch_pid, nocheck => 1);
+    my $exit = WEXITSTATUS($?);
+    subprocerr("patch --dry-run") unless WIFEXITED($?);
+    $self->cleanup_after_open();
+    return ($exit == 0);
+}
+
 # Helper functions
 sub get_type {
     my $file = shift;

scripts/dpkg-divert.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/perl --
 
+BEGIN { # Work-around for bug #479711 in perl
+    $ENV{PERL_DL_NONLAZY} = 1;
+}
+
 use strict;
 use warnings;
 
@@ -240,6 +244,9 @@ sub checkrename {
 	unlink ("${rsrc}.dpkg-devert.tmp");
     } elsif ($! == ENOENT) {
 	$dorename = !$dorename;
+	# If the source file is not present and we are not going to do the
+	# rename anyway there's no point in checking the target.
+	return;
     } else {
 	quit(sprintf(_g("error checking \`%s': %s"), $rsrc, $!));
     }

scripts/dpkg-source.pl

@@ -52,6 +52,7 @@ my $substvars = Dpkg::Substvars->new();
 my $tar_ignore_default_pattern_done;
 
 my @cmdline_options;
+my @cmdline_formats;
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_ = shift(@ARGV);
     if (m/^-b$/) {
@@ -59,7 +60,7 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     } elsif (m/^-x$/) {
         setopmode('extract');
     } elsif (m/^--format=(.*)$/) {
-        unshift @build_formats, $1;
+        push @cmdline_formats, $1;
     } elsif (m/^-Z/) {
 	my $compression = $POSTMATCH;
 	$options{'compression'} = $compression;
@@ -247,9 +248,21 @@ if ($options{'opmode'} eq 'build') {
     
     $fields->{'Binary'} = join(', ', @binarypackages);
 
-    unshift @build_formats, $fields->{'Format'} if exists $fields->{'Format'};
+    # Generate list of formats to try
+    my @try_formats;
+    push @try_formats, $fields->{'Format'} if exists $fields->{'Format'};
+    push @try_formats, @cmdline_formats;
+    if (-e "$dir/debian/source/format") {
+        open(FORMAT, "<", "$dir/debian/source/format") ||
+            syserr(_g("cannot read %s"), "$dir/debian/source/format");
+        my $format = <FORMAT>;
+        chomp($format);
+        close(FORMAT);
+        push @try_formats, $format;
+    }
+    push @try_formats, @build_formats;
     # Try all suggested formats until one is acceptable
-    foreach my $format (@build_formats) {
+    foreach my $format (@try_formats) {
         $fields->{'Format'} = $format;
         $srcpkg->upgrade_object_type(); # Fails if format is unsupported
         my ($res, $msg) = $srcpkg->can_build($dir);

scripts/dpkg-statoverride.pl

@@ -1,5 +1,9 @@
 #! /usr/bin/perl
 
+BEGIN { # Work-around for bug #479711 in perl
+    $ENV{PERL_DL_NONLAZY} = 1;
+}
+
 use strict;
 use warnings;
 

scripts/install-info.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/perl --
 
+BEGIN { # Work-around for bug #479711 in perl
+    $ENV{PERL_DL_NONLAZY} = 1;
+}
+
 use Text::Wrap;
 use Dpkg;
 use Dpkg::Gettext;

scripts/po/ChangeLog

@@ -1,3 +1,48 @@
+2008-06-10  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* pl.po: Updated to 473t.
+
+2008-06-09  Christian perrier  <bubulle@debian.org>
+
+	* fr.po: Updated to 473t
+
+2008-06-09  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* de.po: Updated to 471t0f2u.
+
+2008-06-09  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 473t.
+
+2008-06-09  Raphael Hertzog  <hertzog@debian.org>
+
+	* dpkg-dev.pot: Regenerated.
+	* *.po: Merged with dpkg-dev.pot (2 new strings).
+
+2008-06-07  Christian perrier  <bubulle@debian.org>
+
+	* fr.po: Updated to 471t
+
+2008-06-06  Wiktor Wandachowicz  <siryes@gmail.com>
+
+	* pl.po: Updated to 471t.
+
+2008-05-19  Yuri Kozlov  <kozlov.y@gmail.com>
+
+	* ru.po: Updated to 469t.
+
+2008-05-18  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* de.po: Updated to 469t0f2u.
+
+2008-05-13  Christian perrier  <bubulle@debian.org>
+
+	* fr.po: 326t78f67u
+
+2008-05-13  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 471t.
+
 2008-05-12  Guillem Jover  <guillem@debian.org>
 
 	* dpkg-dev.pot: Regenerated.

scripts/po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-06-09 09:08+0200\n"
 "PO-Revision-Date: 2006-12-04 13:59+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl:46 scripts/dpkg-gensymbols.pl:30
 #: scripts/dpkg-parsechangelog.pl:19 scripts/dpkg-scanpackages.pl:51
 #: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:455
-#: scripts/dpkg-source.pl:338 scripts/changelog/debian.pl:19
+#: scripts/dpkg-source.pl:351 scripts/changelog/debian.pl:19
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
@@ -48,7 +48,7 @@ msgstr ""
 #: scripts/dpkg-distaddfile.pl:23 scripts/dpkg-genchanges.pl:95
 #: scripts/dpkg-gencontrol.pl:52 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:25 scripts/dpkg-shlibdeps.pl:464
-#: scripts/dpkg-source.pl:344 scripts/changelog/debian.pl:24
+#: scripts/dpkg-source.pl:357 scripts/changelog/debian.pl:24
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -343,7 +343,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Conflictes de construcció: "
 
 #: scripts/dpkg-checkbuilddeps.pl:164 scripts/dpkg-gencontrol.pl:243
-#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:173
+#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:174
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "s'ha produït un error en analitzar %s"
@@ -453,8 +453,8 @@ msgstr ""
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:102
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:106
 msgid "substvars support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 
@@ -483,7 +483,7 @@ msgid "badly formed line in files list file, line %d"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:269 scripts/dpkg-gencontrol.pl:160
-#: scripts/dpkg-source.pl:183
+#: scripts/dpkg-source.pl:184
 msgid "general section of control info file"
 msgstr ""
 
@@ -493,12 +493,12 @@ msgid "package %s in control file but not in files list"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:323 scripts/dpkg-gencontrol.pl:193
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 msgid "package's section of control info file"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:340 scripts/dpkg-gencontrol.pl:210
-#: scripts/dpkg-source.pl:244
+#: scripts/dpkg-source.pl:245
 msgid "parsed version of changelog"
 msgstr ""
 
@@ -584,13 +584,13 @@ msgstr ""
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:394
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:399
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -1268,61 +1268,69 @@ msgstr ""
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:67 scripts/Dpkg/Source/Compressor.pm:35
+#: scripts/dpkg-source.pl:68 scripts/Dpkg/Source/Compressor.pm:35
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr ""
 
-#: scripts/dpkg-source.pl:73 scripts/Dpkg/Source/Compressor.pm:42
+#: scripts/dpkg-source.pl:74 scripts/Dpkg/Source/Compressor.pm:42
 #: scripts/Dpkg/Source/Compressor.pm:68
 #, perl-format
 msgid "%s is not a compression level"
 msgstr ""
 
-#: scripts/dpkg-source.pl:114
+#: scripts/dpkg-source.pl:115
 msgid "-E and -W are deprecated, they are without effect"
 msgstr ""
 
-#: scripts/dpkg-source.pl:126
+#: scripts/dpkg-source.pl:127
 msgid "need -x or -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:132
+#: scripts/dpkg-source.pl:133
 msgid "-b needs a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:135
+#: scripts/dpkg-source.pl:136
 #, fuzzy, perl-format
 msgid "cannot stat directory %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-source.pl:137
+#: scripts/dpkg-source.pl:138
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:207
+#: scripts/dpkg-source.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:210
+#: scripts/dpkg-source.pl:211
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:257
+#: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
+#: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#, perl-format
+msgid "cannot read %s"
+msgstr ""
+
+#: scripts/dpkg-source.pl:270
 #, perl-format
 msgid "source format `%s' discarded: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:259
+#: scripts/dpkg-source.pl:272
 #, perl-format
 msgid "using source format `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:270 scripts/Dpkg/Source/Package/V1.pm:284
-#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:375
+#: scripts/dpkg-source.pl:283 scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:381
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:82
 #: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1330,38 +1338,38 @@ msgstr ""
 msgid "building %s in %s"
 msgstr "%s: s'està construint %s a %s"
 
-#: scripts/dpkg-source.pl:282
+#: scripts/dpkg-source.pl:295
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:285
+#: scripts/dpkg-source.pl:298
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:289
+#: scripts/dpkg-source.pl:302
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:305
+#: scripts/dpkg-source.pl:318
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:327
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "s'està extraient el paquet font sense signar (%s)"
 
-#: scripts/dpkg-source.pl:323
+#: scripts/dpkg-source.pl:336
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: s'està extraient %s a %s"
 
-#: scripts/dpkg-source.pl:332
+#: scripts/dpkg-source.pl:345
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:340
+#: scripts/dpkg-source.pl:353
 #, fuzzy
 msgid ""
 "\n"
@@ -1372,7 +1380,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert Akkerman."
 
-#: scripts/dpkg-source.pl:352
+#: scripts/dpkg-source.pl:365
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1727,14 +1735,6 @@ msgstr ""
 msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
 msgstr ""
 
-#: scripts/Dpkg/Control.pm:81 scripts/Dpkg/Shlibs/Objdump.pm:89
-#: scripts/Dpkg/Source/CompressedFile.pm:131
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:77
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
-#, perl-format
-msgid "cannot read %s"
-msgstr ""
-
 #: scripts/Dpkg/Control.pm:86
 msgid "first block lacks a source field"
 msgstr ""
@@ -1835,12 +1835,12 @@ msgstr ""
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:412 scripts/Dpkg/Source/Package/V2.pm:180
-#: scripts/Dpkg/Source/Package/V2.pm:393
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:237
+#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package/V2.pm:399
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
 #, fuzzy, perl-format
 msgid "cannot write %s"
 msgstr "no es pot combinar -b o -B amb -S"
@@ -1953,7 +1953,7 @@ msgstr ""
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:304
+#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:305
 msgid "binary file contents changed"
 msgstr ""
 
@@ -1977,7 +1977,7 @@ msgid "diff on %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:152 scripts/Dpkg/Source/Patch.pm:171
-#: scripts/Dpkg/Source/Patch.pm:209 scripts/Dpkg/Source/Patch.pm:221
+#: scripts/Dpkg/Source/Patch.pm:213 scripts/Dpkg/Source/Patch.pm:225
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
@@ -1987,186 +1987,191 @@ msgstr ""
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:185
+#: scripts/Dpkg/Source/Patch.pm:189
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:189
+#: scripts/Dpkg/Source/Patch.pm:193
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:194
+#: scripts/Dpkg/Source/Patch.pm:198
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:205
+#: scripts/Dpkg/Source/Patch.pm:209
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:214
+#: scripts/Dpkg/Source/Patch.pm:218
 msgid "unknown file type"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:229
+#: scripts/Dpkg/Source/Patch.pm:233
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:232
+#: scripts/Dpkg/Source/Patch.pm:236
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:234
+#: scripts/Dpkg/Source/Patch.pm:238
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:247
+#: scripts/Dpkg/Source/Patch.pm:251
 #, fuzzy, perl-format
 msgid "cannot close %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Patch.pm:259 scripts/Dpkg/Source/Package/V2.pm:303
+#: scripts/Dpkg/Source/Patch.pm:263 scripts/Dpkg/Source/Package/V2.pm:304
 #, fuzzy, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/Dpkg/Source/Patch.pm:266
+#: scripts/Dpkg/Source/Patch.pm:270
 #, fuzzy, perl-format
 msgid "cannot represent change to %s:"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/Dpkg/Source/Patch.pm:267
+#: scripts/Dpkg/Source/Patch.pm:271
 #, perl-format
 msgid "  new version is %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:268
+#: scripts/Dpkg/Source/Patch.pm:272
 #, perl-format
 msgid "  old version is %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:294
+#: scripts/Dpkg/Source/Patch.pm:316
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:298
-#, perl-format
-msgid "diff `%s' patches file with no subdirectory"
-msgstr ""
-
-#: scripts/Dpkg/Source/Patch.pm:301
+#: scripts/Dpkg/Source/Patch.pm:323
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:306
+#: scripts/Dpkg/Source/Patch.pm:327
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:310 scripts/Dpkg/Source/Patch.pm:320
+#: scripts/Dpkg/Source/Patch.pm:330
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:315
+#: scripts/Dpkg/Source/Patch.pm:337
+#, perl-format
+msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
 msgid "original and modified files are /dev/null in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:330
+#: scripts/Dpkg/Source/Patch.pm:350
+#, perl-format
+msgid "file removal without proper filename in diff `%s' (line %d)"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm:352
+#, perl-format
+msgid "diff %s removes a non-existing file %s (line %d)"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:334
+#: scripts/Dpkg/Source/Patch.pm:365
 #, fuzzy, perl-format
 msgid "diff `%s' patches file %s twice"
 msgstr "diff aplica pedaços al fitxer %s dues vegades"
 
-#: scripts/Dpkg/Source/Patch.pm:349
+#: scripts/Dpkg/Source/Patch.pm:380 scripts/Dpkg/Source/Patch.pm:383
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:352
-#, perl-format
-msgid "diff `%s' is missing trailing newline"
-msgstr ""
-
-#: scripts/Dpkg/Source/Patch.pm:360
+#: scripts/Dpkg/Source/Patch.pm:392
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:367
+#: scripts/Dpkg/Source/Patch.pm:399
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:372
+#: scripts/Dpkg/Source/Patch.pm:404
 #, perl-format
 msgid "diff `%s' doesn't contain any patch"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:395 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
 #, fuzzy, perl-format
 msgid "cannot create directory %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Patch.pm:415
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:143
+#: scripts/Dpkg/Source/Patch.pm:452
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:419
+#: scripts/Dpkg/Source/Patch.pm:456
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:428
+#: scripts/Dpkg/Source/Patch.pm:496
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:429 scripts/Dpkg/Source/Package.pm:333
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:431
+#: scripts/Dpkg/Source/Patch.pm:499
 msgid "plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:432
+#: scripts/Dpkg/Source/Patch.pm:500
 msgid "directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:433
+#: scripts/Dpkg/Source/Patch.pm:501
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:434
+#: scripts/Dpkg/Source/Patch.pm:502
 msgid "block device"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:435
+#: scripts/Dpkg/Source/Patch.pm:503
 msgid "character device"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:436
+#: scripts/Dpkg/Source/Patch.pm:504
 msgid "named pipe"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:437
+#: scripts/Dpkg/Source/Patch.pm:505
 msgid "named socket"
 msgstr ""
 
@@ -2216,22 +2221,27 @@ msgstr ""
 msgid "%s is not a valid option for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:335
+#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#, fuzzy, perl-format
+msgid "can't write %s"
+msgstr "no es pot combinar -b o -B amb -S"
+
+#: scripts/Dpkg/Source/Package.pm:345
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:338
+#: scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:340
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:372
+#: scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
@@ -2294,7 +2304,7 @@ msgid "failed to rename saved %s to %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
 #, fuzzy, perl-format
 msgid "applying %s"
 msgstr "%s: s'està aplicant %s"
@@ -2396,7 +2406,7 @@ msgstr ""
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:257
+#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:258
 #, fuzzy, perl-format
 msgid "building %s using existing %s"
 msgstr "%s: s'està construint %s a %s"
@@ -2432,19 +2442,18 @@ msgstr ""
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:255
+#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:256
 msgid "no orig.tar file found"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:216
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:194
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V2.pm:217
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:226
+#: scripts/Dpkg/Source/Package/V2.pm:227
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:97
 #: scripts/Dpkg/Source/Package/V3/native.pm:74
 #: scripts/Dpkg/Source/Package/V3/git.pm:125
@@ -2452,55 +2461,55 @@ msgstr ""
 msgid "-b takes only one parameter with format `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:277
+#: scripts/Dpkg/Source/Package/V2.pm:278
 msgid "copy of the debian directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:286
+#: scripts/Dpkg/Source/Package/V2.pm:287
 #, fuzzy, perl-format
 msgid "can't read %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V2.pm:305
+#: scripts/Dpkg/Source/Package/V2.pm:306
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
 "binary in the debian tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:319
+#: scripts/Dpkg/Source/Package/V2.pm:320
 #, fuzzy, perl-format
 msgid "unwanted binary file: %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
 msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:338
+#: scripts/Dpkg/Source/Package/V2.pm:339
 #, fuzzy
 msgid "unrepresentable changes to source"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/Dpkg/Source/Package/V2.pm:344 scripts/Dpkg/Source/Package/V2.pm:348
+#: scripts/Dpkg/Source/Package/V2.pm:345 scripts/Dpkg/Source/Package/V2.pm:349
 #, fuzzy, perl-format
 msgid "cannot remove %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
 #: scripts/Dpkg/Source/Package/V2.pm:352
-#, fuzzy, perl-format
-msgid "cannot rename %s to %s"
-msgstr "no es pot combinar -b o -B amb -S"
+#, perl-format
+msgid "local changes stored in %s, the modified files are:"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:364
+#: scripts/Dpkg/Source/Package/V2.pm:358
 #, fuzzy, perl-format
-msgid "can't write %s"
+msgid "cannot rename %s to %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V2.pm:368
+#: scripts/Dpkg/Source/Package/V2.pm:374
 #, fuzzy, perl-format
 msgid "adding %s to %s"
 msgstr "%s: s'està construint %s a %s"
@@ -2639,20 +2648,19 @@ msgstr ""
 msgid "The following setting(s) were disabled by dpkg-source"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:85
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:87
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
 "source might fail when applying patches."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:114
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
 #, fuzzy, perl-format
 msgid "can't create symlink %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:199
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
 #, perl-format
 msgid "applying %s with quilt"
 msgstr ""

scripts/po/de.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-05 18:44+0200\n"
+"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"PO-Revision-Date: 2008-06-09 21:17+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl:46 scripts/dpkg-gensymbols.pl:30
 #: scripts/dpkg-parsechangelog.pl:19 scripts/dpkg-scanpackages.pl:51
 #: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:455
-#: scripts/dpkg-source.pl:338 scripts/changelog/debian.pl:19
+#: scripts/dpkg-source.pl:351 scripts/changelog/debian.pl:19
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s Version %s.\n"
@@ -48,7 +48,7 @@ msgstr ""
 #: scripts/dpkg-distaddfile.pl:23 scripts/dpkg-genchanges.pl:95
 #: scripts/dpkg-gencontrol.pl:52 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:25 scripts/dpkg-shlibdeps.pl:464
-#: scripts/dpkg-source.pl:344 scripts/changelog/debian.pl:24
+#: scripts/dpkg-source.pl:357 scripts/changelog/debian.pl:24
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -436,7 +436,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Baukonflikte: "
 
 #: scripts/dpkg-checkbuilddeps.pl:164 scripts/dpkg-gencontrol.pl:243
-#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:173
+#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:174
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "Fehler beim Parsen von %s"
@@ -589,8 +589,8 @@ msgstr ""
 "%s: architektur-unabhängiger Upload - schließe architektur-spezifische "
 "Pakete nicht ein"
 
-#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:102
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:106
 msgid "substvars support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "Substvars-Unterstützung ist veraltet (lesen Sie README.feature-removal-"
@@ -621,7 +621,7 @@ msgid "badly formed line in files list file, line %d"
 msgstr "ungültige Zeile in Dateienliste-Datei, Zeile %d"
 
 #: scripts/dpkg-genchanges.pl:269 scripts/dpkg-gencontrol.pl:160
-#: scripts/dpkg-source.pl:183
+#: scripts/dpkg-source.pl:184
 msgid "general section of control info file"
 msgstr "allgemeiner Abschnitt der Steuer-Infodatei"
 
@@ -631,12 +631,12 @@ msgid "package %s in control file but not in files list"
 msgstr "Paket %s in Steuerdatei aber nicht in Dateiliste"
 
 #: scripts/dpkg-genchanges.pl:323 scripts/dpkg-gencontrol.pl:193
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 msgid "package's section of control info file"
 msgstr "Paketabschnitt der Steuer-Infodatei"
 
 #: scripts/dpkg-genchanges.pl:340 scripts/dpkg-gencontrol.pl:210
-#: scripts/dpkg-source.pl:244
+#: scripts/dpkg-source.pl:245
 msgid "parsed version of changelog"
 msgstr "ausgewertete Version des changelogs"
 
@@ -722,13 +722,13 @@ msgstr "rein-bin
 msgid "write original source message"
 msgstr "schreibe ursprüngliche Quell-Nachricht"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:394
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:399
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "fehlende Informationen für Ausgabefeld %s"
@@ -1399,7 +1399,7 @@ msgstr ""
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr ""
-"%s sollte nicht gegen %s gelinkt werden (es verwendet keine seiner Symbole)."
+"%s sollte nicht gegen %s gelinkt werden (es verwendet keines ihrer Symbole)."
 
 #: scripts/dpkg-shlibdeps.pl:355
 #, perl-format
@@ -1408,7 +1408,7 @@ msgid ""
 "against it (they use none of its symbols)."
 msgstr ""
 "Abhängigkeit von %s könnte vermieden werden, falls »%s« nicht unnötigerweise "
-"dagegen gelinkt wäre (es verwendet keine seiner Symbole)."
+"dagegen gelinkt wäre (es verwendet keines seiner Symbole)."
 
 #: scripts/dpkg-shlibdeps.pl:368
 #, perl-format
@@ -1569,61 +1569,69 @@ msgstr "schreibe Informationen zu Umlenkungen auf Stderr"
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "unbekannte Ausgabe von »dpkg --search«: »%s«"
 
-#: scripts/dpkg-source.pl:67 scripts/Dpkg/Source/Compressor.pm:35
+#: scripts/dpkg-source.pl:68 scripts/Dpkg/Source/Compressor.pm:35
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s ist keine unterstützte Kompression"
 
-#: scripts/dpkg-source.pl:73 scripts/Dpkg/Source/Compressor.pm:42
+#: scripts/dpkg-source.pl:74 scripts/Dpkg/Source/Compressor.pm:42
 #: scripts/Dpkg/Source/Compressor.pm:68
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s ist keine Komprimierungsstufe"
 
-#: scripts/dpkg-source.pl:114
+#: scripts/dpkg-source.pl:115
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E und -W sind veraltet, sie haben keine Wirkung"
 
-#: scripts/dpkg-source.pl:126
+#: scripts/dpkg-source.pl:127
 msgid "need -x or -b"
 msgstr "benötige -x oder -b"
 
-#: scripts/dpkg-source.pl:132
+#: scripts/dpkg-source.pl:133
 msgid "-b needs a directory"
 msgstr "-b benötigt ein Verzeichnis"
 
-#: scripts/dpkg-source.pl:135
+#: scripts/dpkg-source.pl:136
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "kann Stat von Verzeichnis %s nicht durchführen"
 
-#: scripts/dpkg-source.pl:137
+#: scripts/dpkg-source.pl:138
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "Verzeichnis-Argument %s ist kein Verzeichnis"
 
-#: scripts/dpkg-source.pl:207
+#: scripts/dpkg-source.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "»%s« ist keine gültige Architektur-Zeichenkette"
 
-#: scripts/dpkg-source.pl:210
+#: scripts/dpkg-source.pl:211
 #, perl-format
 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:257
+#: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
+#: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#, perl-format
+msgid "cannot read %s"
+msgstr "kann %s nicht lesen"
+
+#: scripts/dpkg-source.pl:270
 #, perl-format
 msgid "source format `%s' discarded: %s"
 msgstr "Quellformat »%s« verworfen: %s"
 
-#: scripts/dpkg-source.pl:259
+#: scripts/dpkg-source.pl:272
 #, perl-format
 msgid "using source format `%s'"
 msgstr "verwende Quellformat »%s«"
 
-#: scripts/dpkg-source.pl:270 scripts/Dpkg/Source/Package/V1.pm:284
-#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:375
+#: scripts/dpkg-source.pl:283 scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:381
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:82
 #: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1631,38 +1639,38 @@ msgstr "verwende Quellformat
 msgid "building %s in %s"
 msgstr "baue %s in %s"
 
-#: scripts/dpkg-source.pl:282
+#: scripts/dpkg-source.pl:295
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x benötigt mindestens ein Argument, die .dsc"
 
-#: scripts/dpkg-source.pl:285
+#: scripts/dpkg-source.pl:298
 msgid "-x takes no more than two arguments"
 msgstr "-x akzeptiert nicht mehr als zwei Argumente"
 
-#: scripts/dpkg-source.pl:289
+#: scripts/dpkg-source.pl:302
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x benötigt die .dsc-Datei als erstes Argument, kein Verzeichnis"
 
-#: scripts/dpkg-source.pl:305
+#: scripts/dpkg-source.pl:318
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "Entpackziel existiert: %s"
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:327
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extrahiere unsigniertes Quellpaket (%s)"
 
-#: scripts/dpkg-source.pl:323
+#: scripts/dpkg-source.pl:336
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: extrahiere %s nach %s"
 
-#: scripts/dpkg-source.pl:332
+#: scripts/dpkg-source.pl:345
 msgid "only one of -x or -b allowed, and only once"
 msgstr "nur entweder -x oder -b erlaubt, und nur einmal"
 
-#: scripts/dpkg-source.pl:340
+#: scripts/dpkg-source.pl:353
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
@@ -1672,7 +1680,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson und Klee Dienes.\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:352
+#: scripts/dpkg-source.pl:365
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2100,14 +2108,6 @@ msgstr "Datei %s hat Gr
 msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
 msgstr "Datei %s hat Prüfsumme %s statt der erwarteten %s (Algorithmus %s)"
 
-#: scripts/Dpkg/Control.pm:81 scripts/Dpkg/Shlibs/Objdump.pm:89
-#: scripts/Dpkg/Source/CompressedFile.pm:131
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:77
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
-#, perl-format
-msgid "cannot read %s"
-msgstr "kann %s nicht lesen"
-
 #: scripts/Dpkg/Control.pm:86
 msgid "first block lacks a source field"
 msgstr "im ersten Block fehlt ein Feld »source«"
@@ -2207,12 +2207,12 @@ msgstr "
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:412 scripts/Dpkg/Source/Package/V2.pm:180
-#: scripts/Dpkg/Source/Package/V2.pm:393
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:237
+#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package/V2.pm:399
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
 #, perl-format
 msgid "cannot write %s"
 msgstr "kann %s nicht schreiben"
@@ -2328,7 +2328,7 @@ msgstr "kann nicht auf Entfernung des Verzeichnisses
 msgid "rm -rf failed to remove `%s'"
 msgstr "rm -rf entfernte »%s« nicht"
 
-#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:304
+#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:305
 msgid "binary file contents changed"
 msgstr "Inhalt der Binärdatei geändert"
 
@@ -2354,7 +2354,7 @@ msgid "diff on %s"
 msgstr "Diff auf %s"
 
 #: scripts/Dpkg/Source/Patch.pm:152 scripts/Dpkg/Source/Patch.pm:171
-#: scripts/Dpkg/Source/Patch.pm:209 scripts/Dpkg/Source/Patch.pm:221
+#: scripts/Dpkg/Source/Patch.pm:213 scripts/Dpkg/Source/Patch.pm:225
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "kann keinen Stat auf Datei %s durchführen"
@@ -2364,187 +2364,192 @@ msgstr "kann keinen Stat auf Datei %s durchf
 msgid "cannot read link %s"
 msgstr "kann Link %s nicht lesen"
 
-#: scripts/Dpkg/Source/Patch.pm:185
+#: scripts/Dpkg/Source/Patch.pm:189
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr "neu erstellte leere Datei »%s« wird im Diff nicht dargestellt werden"
 
-#: scripts/Dpkg/Source/Patch.pm:189
+#: scripts/Dpkg/Source/Patch.pm:193
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr "ausführbarer Modus %04o von »%s« wird nicht im Diff dargestellt werden"
 
-#: scripts/Dpkg/Source/Patch.pm:194
+#: scripts/Dpkg/Source/Patch.pm:198
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "besonderer Modus %04o von »%s« wird nicht im Diff dargestellt werden"
 
-#: scripts/Dpkg/Source/Patch.pm:205
+#: scripts/Dpkg/Source/Patch.pm:209
 msgid "device or socket is not allowed"
 msgstr "Gerät oder Socket ist nicht erlaubt"
 
-#: scripts/Dpkg/Source/Patch.pm:214
+#: scripts/Dpkg/Source/Patch.pm:218
 msgid "unknown file type"
 msgstr "unbekannter Dateityp"
 
-#: scripts/Dpkg/Source/Patch.pm:229
+#: scripts/Dpkg/Source/Patch.pm:233
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "ignoriere Löschen der Datei %s"
 
-#: scripts/Dpkg/Source/Patch.pm:232
+#: scripts/Dpkg/Source/Patch.pm:236
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "ignoriere Löschen des Verzeichnisses %s"
 
-#: scripts/Dpkg/Source/Patch.pm:234
+#: scripts/Dpkg/Source/Patch.pm:238
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "ignoriere Löschen des Symlinks %s"
 
-#: scripts/Dpkg/Source/Patch.pm:247
+#: scripts/Dpkg/Source/Patch.pm:251
 #, perl-format
 msgid "cannot close %s"
 msgstr "kann %s nicht schließen"
 
-#: scripts/Dpkg/Source/Patch.pm:259 scripts/Dpkg/Source/Package/V2.pm:303
+#: scripts/Dpkg/Source/Patch.pm:263 scripts/Dpkg/Source/Package/V2.pm:304
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "kann Änderungen an %s nicht darstellen: %s"
 
-#: scripts/Dpkg/Source/Patch.pm:266
+#: scripts/Dpkg/Source/Patch.pm:270
 #, perl-format
 msgid "cannot represent change to %s:"
 msgstr "kann Änderungen an %s nicht darstellen:^"
 
-#: scripts/Dpkg/Source/Patch.pm:267
+#: scripts/Dpkg/Source/Patch.pm:271
 #, perl-format
 msgid "  new version is %s"
 msgstr "  neue Version ist %s"
 
-#: scripts/Dpkg/Source/Patch.pm:268
+#: scripts/Dpkg/Source/Patch.pm:272
 #, perl-format
 msgid "  old version is %s"
 msgstr "  alte Version ist %s"
 
-#: scripts/Dpkg/Source/Patch.pm:294
+#: scripts/Dpkg/Source/Patch.pm:316
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "erwartes ^--- in Zeile %d des Diffs »%s«"
 
-#: scripts/Dpkg/Source/Patch.pm:298
-#, perl-format
-msgid "diff `%s' patches file with no subdirectory"
-msgstr "Diff »%s« patcht Datei ohne Unterverzeichnis"
-
-#: scripts/Dpkg/Source/Patch.pm:301
+#: scripts/Dpkg/Source/Patch.pm:323
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "Diff »%s« patcht Datei deren Namen auf .dpkg-orig endet"
 
-#: scripts/Dpkg/Source/Patch.pm:306
+#: scripts/Dpkg/Source/Patch.pm:327
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr "Diff »%s« endet in der Mitte von ---/+++ (Zeile %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:310 scripts/Dpkg/Source/Patch.pm:320
+#: scripts/Dpkg/Source/Patch.pm:330
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "Zeile nach --- ist im Diff »%s« (Zeile %d) nicht wie erwartet"
 
-#: scripts/Dpkg/Source/Patch.pm:315
+#: scripts/Dpkg/Source/Patch.pm:337
+#, perl-format
+msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+msgstr "keine der Dateinamen in ---/+++ ist im Diff »%s« (Zeile %d) relativ"
+
+#: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
 msgid "original and modified files are /dev/null in diff `%s' (line %d)"
 msgstr ""
 "ursprüngliche und geänderte Dateien sind im Diff »%s« /dev/null (Zeile %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:330
+#: scripts/Dpkg/Source/Patch.pm:350
+#, perl-format
+msgid "file removal without proper filename in diff `%s' (line %d)"
+msgstr "Datei-Entfernung ohne passenden Dateinamen im Diff »%s« (Zeile %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:352
+#, perl-format
+msgid "diff %s removes a non-existing file %s (line %d)"
+msgstr "Diff %s entfernt eine nicht-existierende Datei %s (Zeile %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "Diff »%s« patcht etwas, das keine einfache Datei ist"
 
-#: scripts/Dpkg/Source/Patch.pm:334
+#: scripts/Dpkg/Source/Patch.pm:365
 #, perl-format
 msgid "diff `%s' patches file %s twice"
 msgstr "Diff »%s« patcht Datei %s zweifach"
 
-#: scripts/Dpkg/Source/Patch.pm:349
+#: scripts/Dpkg/Source/Patch.pm:380 scripts/Dpkg/Source/Patch.pm:383
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "unerwartetes Ende des Diffs »%s«"
 
-#: scripts/Dpkg/Source/Patch.pm:352
-#, perl-format
-msgid "diff `%s' is missing trailing newline"
-msgstr "Diff »%s« fehlt ein abschließender Zeilenumbruch"
-
-#: scripts/Dpkg/Source/Patch.pm:360
+#: scripts/Dpkg/Source/Patch.pm:392
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "erwartete [ +-] am Anfang der Zeile %d des Diffs »%s«"
 
-#: scripts/Dpkg/Source/Patch.pm:367
+#: scripts/Dpkg/Source/Patch.pm:399
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "erwartete ^@@ in Zeile %d des Diff »%s«"
 
-#: scripts/Dpkg/Source/Patch.pm:372
+#: scripts/Dpkg/Source/Patch.pm:404
 #, perl-format
 msgid "diff `%s' doesn't contain any patch"
 msgstr "Diff »%s« enthält keinen Patch"
 
-#: scripts/Dpkg/Source/Patch.pm:395 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
-#: scripts/Dpkg/Source/Patch.pm:415
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:143
+#: scripts/Dpkg/Source/Patch.pm:452
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "kann Zeitstempel für %s nicht ändern"
 
-#: scripts/Dpkg/Source/Patch.pm:419
+#: scripts/Dpkg/Source/Patch.pm:456
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "entferne Patch-Sicherungskopiedatei %s"
 
-#: scripts/Dpkg/Source/Patch.pm:428
+#: scripts/Dpkg/Source/Patch.pm:496
 msgid "nonexistent"
 msgstr "nichtexistierend"
 
-#: scripts/Dpkg/Source/Patch.pm:429 scripts/Dpkg/Source/Package.pm:333
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
 #, perl-format
 msgid "cannot stat %s"
 msgstr "kann Stat von %s nicht ausführen"
 
-#: scripts/Dpkg/Source/Patch.pm:431
+#: scripts/Dpkg/Source/Patch.pm:499
 msgid "plain file"
 msgstr "einfache Datei"
 
-#: scripts/Dpkg/Source/Patch.pm:432
+#: scripts/Dpkg/Source/Patch.pm:500
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: scripts/Dpkg/Source/Patch.pm:433
+#: scripts/Dpkg/Source/Patch.pm:501
 #, perl-format
 msgid "symlink to %s"
 msgstr "Symlink auf %s"
 
-#: scripts/Dpkg/Source/Patch.pm:434
+#: scripts/Dpkg/Source/Patch.pm:502
 msgid "block device"
 msgstr "Blockgerät"
 
-#: scripts/Dpkg/Source/Patch.pm:435
+#: scripts/Dpkg/Source/Patch.pm:503
 msgid "character device"
 msgstr "Zeichengerät"
 
-#: scripts/Dpkg/Source/Patch.pm:436
+#: scripts/Dpkg/Source/Patch.pm:504
 msgid "named pipe"
 msgstr "benannte Pipe"
 
-#: scripts/Dpkg/Source/Patch.pm:437
+#: scripts/Dpkg/Source/Patch.pm:505
 msgid "named socket"
 msgstr "benannter Socket"
 
@@ -2593,22 +2598,27 @@ msgstr "konnte Signatur von %s nicht
 msgid "%s is not a valid option for %s"
 msgstr "%s ist keine gültige Option für %s"
 
-#: scripts/Dpkg/Source/Package.pm:335
+#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#, perl-format
+msgid "can't write %s"
+msgstr "kann %s nicht schreiben"
+
+#: scripts/Dpkg/Source/Package.pm:345
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: scripts/Dpkg/Source/Package.pm:338
+#: scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "kann Programm %s nicht ausführbar machen"
 
-#: scripts/Dpkg/Source/Package.pm:340
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s ist keine gewöhnliche Datei"
 
-#: scripts/Dpkg/Source/Package.pm:372
+#: scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "versuchte zweimal Datei »%s« hinzuzufügen"
@@ -2671,7 +2681,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "Fehler beim Umbenennen des gesicherten %s in %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
 #, perl-format
 msgid "applying %s"
 msgstr "wende %s an"
@@ -2788,7 +2798,7 @@ msgstr "konnte
 msgid "unable to change permission of `%s'"
 msgstr "konnte Berechtigungen auf »%s« nicht ändern"
 
-#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:257
+#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:258
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "baue %s unter Benutzung des existierenden %s"
@@ -2826,13 +2836,12 @@ msgstr "fehlende orig.tar- oder debian.tar-Datei in v2.0-Quellpaket"
 msgid "required removal of `%s' installed by original tarball"
 msgstr "erforderliche Entfernung von »%s«, installiert durch Original-Tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:255
+#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:256
 msgid "no orig.tar file found"
 msgstr "keine orig.tar-Datei gefunden"
 
-#: scripts/Dpkg/Source/Package/V2.pm:216
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:194
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V2.pm:217
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2840,7 +2849,7 @@ msgstr ""
 "Patches wurden noch nicht angewandt, wende sie jetzt an (verwenden Sie --no-"
 "preparation zum Aufheben)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:226
+#: scripts/Dpkg/Source/Package/V2.pm:227
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:97
 #: scripts/Dpkg/Source/Package/V3/native.pm:74
 #: scripts/Dpkg/Source/Package/V3/git.pm:125
@@ -2848,16 +2857,16 @@ msgstr ""
 msgid "-b takes only one parameter with format `%s'"
 msgstr "-b akzeptiert nur einen Parameter mit dem Format »%s«"
 
-#: scripts/Dpkg/Source/Package/V2.pm:277
+#: scripts/Dpkg/Source/Package/V2.pm:278
 msgid "copy of the debian directory"
 msgstr "Kopie des debian-Verzeichnisses"
 
-#: scripts/Dpkg/Source/Package/V2.pm:286
+#: scripts/Dpkg/Source/Package/V2.pm:287
 #, perl-format
 msgid "can't read %s"
 msgstr "kann %s nicht lesen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:305
+#: scripts/Dpkg/Source/Package/V2.pm:306
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -2866,38 +2875,40 @@ msgstr ""
 "fügen Sie %s zu debian/source/include-binaries hinzu, falls Sie das "
 "veränderte Programme im Debian-Tarball speichern möchten."
 
-#: scripts/Dpkg/Source/Package/V2.pm:319
-#, fuzzy, perl-format
+#: scripts/Dpkg/Source/Package/V2.pm:320
+#, perl-format
 msgid "unwanted binary file: %s"
-msgstr "doppeltes Binärfeld in %s"
+msgstr "unerwünschte Binärdate: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
 msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
+"erkannte %d unerwünschte Binärdatei(en) (fügen sie zu debian/source/include-"
+"binaries hinzu, um ihre Aufnahme zu erlauben)."
 
-#: scripts/Dpkg/Source/Package/V2.pm:338
+#: scripts/Dpkg/Source/Package/V2.pm:339
 msgid "unrepresentable changes to source"
 msgstr "nicht darstellbare Änderungen an den Quellen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:344 scripts/Dpkg/Source/Package/V2.pm:348
+#: scripts/Dpkg/Source/Package/V2.pm:345 scripts/Dpkg/Source/Package/V2.pm:349
 #, perl-format
 msgid "cannot remove %s"
 msgstr "kann %s nicht entfernen"
 
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "kann %s nicht in %s umbenennen"
+msgid "local changes stored in %s, the modified files are:"
+msgstr "lokale Änderungen in %s gespeichert, die veränderten Dateien sind:"
 
-#: scripts/Dpkg/Source/Package/V2.pm:364
+#: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
-msgid "can't write %s"
-msgstr "kann %s nicht schreiben"
+msgid "cannot rename %s to %s"
+msgstr "kann %s nicht in %s umbenennen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:368
+#: scripts/Dpkg/Source/Package/V2.pm:374
 #, perl-format
 msgid "adding %s to %s"
 msgstr "füge %s zu %s hinzu"
@@ -3045,7 +3056,7 @@ msgstr "kann nicht an %s anh
 msgid "The following setting(s) were disabled by dpkg-source"
 msgstr "Die folgende(n) Einstellungen wurden von dpkg-source deaktiviert"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:85
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:87
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3054,13 +3065,12 @@ msgstr ""
 "die Seriendatei (%s) enthält nicht unterstützte Optionen (»%s«, Zeile %s), "
 "dpkg-source könnte beim Anwenden der Patches scheitern."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:114
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "kann Symlink %s nicht erstellen"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:199
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "wende %s mit Quilt an"
@@ -3105,6 +3115,12 @@ msgstr "Quellpaket hat zwei widerspr
 msgid "version number contains illegal character `%s'"
 msgstr "Versionsnummer enthält ungültiges Zeichen »%s«"
 
+#~ msgid "diff `%s' patches file with no subdirectory"
+#~ msgstr "Diff »%s« patcht Datei ohne Unterverzeichnis"
+
+#~ msgid "diff `%s' is missing trailing newline"
+#~ msgstr "Diff »%s« fehlt ein abschließender Zeilenumbruch"
+
 #~ msgid "cannot open upload file %s for reading"
 #~ msgstr "kann hochzuladene Datei %s nicht zum Lesen öffnen"
 
@@ -3324,9 +3340,6 @@ msgstr "Versionsnummer enth
 #~ msgid "value from nowhere, with key >%s< and value >%s<"
 #~ msgstr "Wert von nirgendwo, mit Schlüssel >%s< und Wert >%s<"
 
-#~ msgid "%s, at file %s line %d"
-#~ msgstr "%s, in Datei %s Zeile %d"
-
 #~ msgid "cannot combine -b or -B and -S"
 #~ msgstr "kann -b oder -B nicht mit -S kombinieren"
 

scripts/po/dpkg-dev.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
+"POT-Creation-Date: 2008-06-09 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl:46 scripts/dpkg-gensymbols.pl:30
 #: scripts/dpkg-parsechangelog.pl:19 scripts/dpkg-scanpackages.pl:51
 #: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:455
-#: scripts/dpkg-source.pl:338 scripts/changelog/debian.pl:19
+#: scripts/dpkg-source.pl:351 scripts/changelog/debian.pl:19
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 #: scripts/dpkg-distaddfile.pl:23 scripts/dpkg-genchanges.pl:95
 #: scripts/dpkg-gencontrol.pl:52 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:25 scripts/dpkg-shlibdeps.pl:464
-#: scripts/dpkg-source.pl:344 scripts/changelog/debian.pl:24
+#: scripts/dpkg-source.pl:357 scripts/changelog/debian.pl:24
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -334,7 +334,7 @@ msgid "%s: Build conflicts: "
 msgstr ""
 
 #: scripts/dpkg-checkbuilddeps.pl:164 scripts/dpkg-gencontrol.pl:243
-#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:173
+#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:174
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr ""
@@ -439,8 +439,8 @@ msgstr ""
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:102
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:106
 msgid "substvars support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 
@@ -469,7 +469,7 @@ msgid "badly formed line in files list file, line %d"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:269 scripts/dpkg-gencontrol.pl:160
-#: scripts/dpkg-source.pl:183
+#: scripts/dpkg-source.pl:184
 msgid "general section of control info file"
 msgstr ""
 
@@ -479,12 +479,12 @@ msgid "package %s in control file but not in files list"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:323 scripts/dpkg-gencontrol.pl:193
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 msgid "package's section of control info file"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:340 scripts/dpkg-gencontrol.pl:210
-#: scripts/dpkg-source.pl:244
+#: scripts/dpkg-source.pl:245
 msgid "parsed version of changelog"
 msgstr ""
 
@@ -570,13 +570,13 @@ msgstr ""
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:394
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:399
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -1250,61 +1250,69 @@ msgstr ""
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:67 scripts/Dpkg/Source/Compressor.pm:35
+#: scripts/dpkg-source.pl:68 scripts/Dpkg/Source/Compressor.pm:35
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr ""
 
-#: scripts/dpkg-source.pl:73 scripts/Dpkg/Source/Compressor.pm:42
+#: scripts/dpkg-source.pl:74 scripts/Dpkg/Source/Compressor.pm:42
 #: scripts/Dpkg/Source/Compressor.pm:68
 #, perl-format
 msgid "%s is not a compression level"
 msgstr ""
 
-#: scripts/dpkg-source.pl:114
+#: scripts/dpkg-source.pl:115
 msgid "-E and -W are deprecated, they are without effect"
 msgstr ""
 
-#: scripts/dpkg-source.pl:126
+#: scripts/dpkg-source.pl:127
 msgid "need -x or -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:132
+#: scripts/dpkg-source.pl:133
 msgid "-b needs a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:135
+#: scripts/dpkg-source.pl:136
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:137
+#: scripts/dpkg-source.pl:138
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:207
+#: scripts/dpkg-source.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:210
+#: scripts/dpkg-source.pl:211
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:257
+#: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
+#: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#, perl-format
+msgid "cannot read %s"
+msgstr ""
+
+#: scripts/dpkg-source.pl:270
 #, perl-format
 msgid "source format `%s' discarded: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:259
+#: scripts/dpkg-source.pl:272
 #, perl-format
 msgid "using source format `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:270 scripts/Dpkg/Source/Package/V1.pm:284
-#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:375
+#: scripts/dpkg-source.pl:283 scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:381
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:82
 #: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1312,45 +1320,45 @@ msgstr ""
 msgid "building %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:282
+#: scripts/dpkg-source.pl:295
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:285
+#: scripts/dpkg-source.pl:298
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:289
+#: scripts/dpkg-source.pl:302
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:305
+#: scripts/dpkg-source.pl:318
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:327
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:323
+#: scripts/dpkg-source.pl:336
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:332
+#: scripts/dpkg-source.pl:345
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:340
+#: scripts/dpkg-source.pl:353
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
 "Copyright (C) 2008 Raphael Hertzog"
 msgstr ""
 
-#: scripts/dpkg-source.pl:352
+#: scripts/dpkg-source.pl:365
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1698,14 +1706,6 @@ msgstr ""
 msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
 msgstr ""
 
-#: scripts/Dpkg/Control.pm:81 scripts/Dpkg/Shlibs/Objdump.pm:89
-#: scripts/Dpkg/Source/CompressedFile.pm:131
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:77
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
-#, perl-format
-msgid "cannot read %s"
-msgstr ""
-
 #: scripts/Dpkg/Control.pm:86
 msgid "first block lacks a source field"
 msgstr ""
@@ -1805,12 +1805,12 @@ msgstr ""
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:412 scripts/Dpkg/Source/Package/V2.pm:180
-#: scripts/Dpkg/Source/Package/V2.pm:393
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:237
+#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package/V2.pm:399
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
 #, perl-format
 msgid "cannot write %s"
 msgstr ""
@@ -1923,7 +1923,7 @@ msgstr ""
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:304
+#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:305
 msgid "binary file contents changed"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgid "diff on %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:152 scripts/Dpkg/Source/Patch.pm:171
-#: scripts/Dpkg/Source/Patch.pm:209 scripts/Dpkg/Source/Patch.pm:221
+#: scripts/Dpkg/Source/Patch.pm:213 scripts/Dpkg/Source/Patch.pm:225
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
@@ -1957,186 +1957,191 @@ msgstr ""
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:185
+#: scripts/Dpkg/Source/Patch.pm:189
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:189
+#: scripts/Dpkg/Source/Patch.pm:193
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:194
+#: scripts/Dpkg/Source/Patch.pm:198
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:205
+#: scripts/Dpkg/Source/Patch.pm:209
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:214
+#: scripts/Dpkg/Source/Patch.pm:218
 msgid "unknown file type"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:229
+#: scripts/Dpkg/Source/Patch.pm:233
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:232
+#: scripts/Dpkg/Source/Patch.pm:236
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:234
+#: scripts/Dpkg/Source/Patch.pm:238
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:247
+#: scripts/Dpkg/Source/Patch.pm:251
 #, perl-format
 msgid "cannot close %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:259 scripts/Dpkg/Source/Package/V2.pm:303
+#: scripts/Dpkg/Source/Patch.pm:263 scripts/Dpkg/Source/Package/V2.pm:304
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:266
+#: scripts/Dpkg/Source/Patch.pm:270
 #, perl-format
 msgid "cannot represent change to %s:"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:267
+#: scripts/Dpkg/Source/Patch.pm:271
 #, perl-format
 msgid "  new version is %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:268
+#: scripts/Dpkg/Source/Patch.pm:272
 #, perl-format
 msgid "  old version is %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:294
+#: scripts/Dpkg/Source/Patch.pm:316
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:298
-#, perl-format
-msgid "diff `%s' patches file with no subdirectory"
-msgstr ""
-
-#: scripts/Dpkg/Source/Patch.pm:301
+#: scripts/Dpkg/Source/Patch.pm:323
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:306
+#: scripts/Dpkg/Source/Patch.pm:327
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:310 scripts/Dpkg/Source/Patch.pm:320
+#: scripts/Dpkg/Source/Patch.pm:330
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:315
+#: scripts/Dpkg/Source/Patch.pm:337
+#, perl-format
+msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
 msgid "original and modified files are /dev/null in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:330
+#: scripts/Dpkg/Source/Patch.pm:350
 #, perl-format
-msgid "diff `%s' patches something which is not a plain file"
+msgid "file removal without proper filename in diff `%s' (line %d)"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm:352
+#, perl-format
+msgid "diff %s removes a non-existing file %s (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:334
+#: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
-msgid "diff `%s' patches file %s twice"
+msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:349
+#: scripts/Dpkg/Source/Patch.pm:365
 #, perl-format
-msgid "unexpected end of diff `%s'"
+msgid "diff `%s' patches file %s twice"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:352
+#: scripts/Dpkg/Source/Patch.pm:380 scripts/Dpkg/Source/Patch.pm:383
 #, perl-format
-msgid "diff `%s' is missing trailing newline"
+msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:360
+#: scripts/Dpkg/Source/Patch.pm:392
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:367
+#: scripts/Dpkg/Source/Patch.pm:399
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:372
+#: scripts/Dpkg/Source/Patch.pm:404
 #, perl-format
 msgid "diff `%s' doesn't contain any patch"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:395 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
 #, perl-format
 msgid "cannot create directory %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:415
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:143
+#: scripts/Dpkg/Source/Patch.pm:452
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:419
+#: scripts/Dpkg/Source/Patch.pm:456
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:428
+#: scripts/Dpkg/Source/Patch.pm:496
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:429 scripts/Dpkg/Source/Package.pm:333
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:431
+#: scripts/Dpkg/Source/Patch.pm:499
 msgid "plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:432
+#: scripts/Dpkg/Source/Patch.pm:500
 msgid "directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:433
+#: scripts/Dpkg/Source/Patch.pm:501
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:434
+#: scripts/Dpkg/Source/Patch.pm:502
 msgid "block device"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:435
+#: scripts/Dpkg/Source/Patch.pm:503
 msgid "character device"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:436
+#: scripts/Dpkg/Source/Patch.pm:504
 msgid "named pipe"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:437
+#: scripts/Dpkg/Source/Patch.pm:505
 msgid "named socket"
 msgstr ""
 
@@ -2185,22 +2190,27 @@ msgstr ""
 msgid "%s is not a valid option for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:335
+#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#, perl-format
+msgid "can't write %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package.pm:345
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:338
+#: scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:340
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:372
+#: scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
@@ -2263,7 +2273,7 @@ msgid "failed to rename saved %s to %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
 #, perl-format
 msgid "applying %s"
 msgstr ""
@@ -2365,7 +2375,7 @@ msgstr ""
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:257
+#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:258
 #, perl-format
 msgid "building %s using existing %s"
 msgstr ""
@@ -2401,19 +2411,18 @@ msgstr ""
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:255
+#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:256
 msgid "no orig.tar file found"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:216
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:194
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V2.pm:217
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:226
+#: scripts/Dpkg/Source/Package/V2.pm:227
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:97
 #: scripts/Dpkg/Source/Package/V3/native.pm:74
 #: scripts/Dpkg/Source/Package/V3/git.pm:125
@@ -2421,54 +2430,54 @@ msgstr ""
 msgid "-b takes only one parameter with format `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:277
+#: scripts/Dpkg/Source/Package/V2.pm:278
 msgid "copy of the debian directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:286
+#: scripts/Dpkg/Source/Package/V2.pm:287
 #, perl-format
 msgid "can't read %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:305
+#: scripts/Dpkg/Source/Package/V2.pm:306
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
 "binary in the debian tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:319
+#: scripts/Dpkg/Source/Package/V2.pm:320
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
 msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:338
+#: scripts/Dpkg/Source/Package/V2.pm:339
 msgid "unrepresentable changes to source"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:344 scripts/Dpkg/Source/Package/V2.pm:348
+#: scripts/Dpkg/Source/Package/V2.pm:345 scripts/Dpkg/Source/Package/V2.pm:349
 #, perl-format
 msgid "cannot remove %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
-msgid "cannot rename %s to %s"
+msgid "local changes stored in %s, the modified files are:"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:364
+#: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
-msgid "can't write %s"
+msgid "cannot rename %s to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:368
+#: scripts/Dpkg/Source/Package/V2.pm:374
 #, perl-format
 msgid "adding %s to %s"
 msgstr ""
@@ -2607,20 +2616,19 @@ msgstr ""
 msgid "The following setting(s) were disabled by dpkg-source"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:85
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:87
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
 "source might fail when applying patches."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:114
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
 #, perl-format
 msgid "can't create symlink %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:199
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
 #, perl-format
 msgid "applying %s with quilt"
 msgstr ""

scripts/po/pl.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-04 23:44+0100\n"
+"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"PO-Revision-Date: 2008-06-10 20:52+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "Ten program jest przestarzały. Proszę używać \"date -R\"."
 #: scripts/dpkg-gencontrol.pl:46 scripts/dpkg-gensymbols.pl:30
 #: scripts/dpkg-parsechangelog.pl:19 scripts/dpkg-scanpackages.pl:51
 #: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:455
-#: scripts/dpkg-source.pl:338 scripts/changelog/debian.pl:19
+#: scripts/dpkg-source.pl:351 scripts/changelog/debian.pl:19
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s w wersji %s.\n"
@@ -50,7 +50,7 @@ msgstr ""
 #: scripts/dpkg-distaddfile.pl:23 scripts/dpkg-genchanges.pl:95
 #: scripts/dpkg-gencontrol.pl:52 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:25 scripts/dpkg-shlibdeps.pl:464
-#: scripts/dpkg-source.pl:344 scripts/changelog/debian.pl:24
+#: scripts/dpkg-source.pl:357 scripts/changelog/debian.pl:24
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -429,7 +429,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Konfliktu budowania pakietu:"
 
 #: scripts/dpkg-checkbuilddeps.pl:164 scripts/dpkg-gencontrol.pl:243
-#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:173
+#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:174
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "wystąpił błąd podczas przetwarzania %s"
@@ -583,8 +583,8 @@ msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s: wydanie niezależne od arch - niedołączanie pakietów zależnych od arch"
 
-#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:102
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:106
 msgid "substvars support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "wsparcie dla substvars jest przestarzałe (patrz README.feature-removal-"
@@ -615,7 +615,7 @@ msgid "badly formed line in files list file, line %d"
 msgstr "niepoprawna linia w pliku z listą plików w linii %d"
 
 #: scripts/dpkg-genchanges.pl:269 scripts/dpkg-gencontrol.pl:160
-#: scripts/dpkg-source.pl:183
+#: scripts/dpkg-source.pl:184
 msgid "general section of control info file"
 msgstr "sekcja ogólna pliku z informacjami kontrolnymi"
 
@@ -625,12 +625,12 @@ msgid "package %s in control file but not in files list"
 msgstr "pakiet %s w pliku kontrolnym, ale nie w liście plików"
 
 #: scripts/dpkg-genchanges.pl:323 scripts/dpkg-gencontrol.pl:193
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 msgid "package's section of control info file"
 msgstr "sekcja pakietu pliku z informacjami kontrolnymi"
 
 #: scripts/dpkg-genchanges.pl:340 scripts/dpkg-gencontrol.pl:210
-#: scripts/dpkg-source.pl:244
+#: scripts/dpkg-source.pl:245
 msgid "parsed version of changelog"
 msgstr "przetworzona wersja pliku zmian"
 
@@ -717,13 +717,13 @@ msgstr "wydanie tylko binarne - niedołączanie żadnych kodów źródłowych"
 msgid "write original source message"
 msgstr "wypisywanie oryginalnego komunikatu źródłowego"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:394
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "brak informacji o krytycznym polu wyjściowym %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:399
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "brak informacji o polu wyjściowym %s"
@@ -1571,62 +1571,70 @@ msgstr "wypisywanie informacji o ominięciach na stderr"
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "nierozpoznane wyjście z dpkg --search: \"%s\""
 
-#: scripts/dpkg-source.pl:67 scripts/Dpkg/Source/Compressor.pm:35
+#: scripts/dpkg-source.pl:68 scripts/Dpkg/Source/Compressor.pm:35
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s nie jest obsługiwanym typem kompresji"
 
-#: scripts/dpkg-source.pl:73 scripts/Dpkg/Source/Compressor.pm:42
+#: scripts/dpkg-source.pl:74 scripts/Dpkg/Source/Compressor.pm:42
 #: scripts/Dpkg/Source/Compressor.pm:68
 #, perl-format
 msgid "%s is not a compression level"
 msgstr " %s nie jest poziomem kompresji"
 
-#: scripts/dpkg-source.pl:114
+#: scripts/dpkg-source.pl:115
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E i -W są przestarzałe, nie mają żadnego efektu"
 
-#: scripts/dpkg-source.pl:126
+#: scripts/dpkg-source.pl:127
 msgid "need -x or -b"
 msgstr "potrzeba -x lub -b"
 
-#: scripts/dpkg-source.pl:132
+#: scripts/dpkg-source.pl:133
 msgid "-b needs a directory"
 msgstr "-b wymaga podania katalogu"
 
-#: scripts/dpkg-source.pl:135
+#: scripts/dpkg-source.pl:136
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "nie można ustalić stanu katalogu %s"
 
-#: scripts/dpkg-source.pl:137
+#: scripts/dpkg-source.pl:138
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "argument %s nie jest katalogiem"
 
-#: scripts/dpkg-source.pl:207
+#: scripts/dpkg-source.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "\"%s\" nie jest poprawną specyfikacją architektury"
 
-#: scripts/dpkg-source.pl:210
+#: scripts/dpkg-source.pl:211
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "architektura %s dopuszczalna tylko sama (listą dla pakietu %s jest \"%s\")"
 
-#: scripts/dpkg-source.pl:257
+#: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
+#: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#, perl-format
+msgid "cannot read %s"
+msgstr "nie można odczytać %s"
+
+#: scripts/dpkg-source.pl:270
 #, perl-format
 msgid "source format `%s' discarded: %s"
 msgstr "odrzucony format źródeł \"%s\": %s"
 
-#: scripts/dpkg-source.pl:259
+#: scripts/dpkg-source.pl:272
 #, perl-format
 msgid "using source format `%s'"
 msgstr "używania formatu źródeł \"%s\""
 
-#: scripts/dpkg-source.pl:270 scripts/Dpkg/Source/Package/V1.pm:284
-#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:375
+#: scripts/dpkg-source.pl:283 scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:381
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:82
 #: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1634,38 +1642,38 @@ msgstr "używania formatu źródeł \"%s\""
 msgid "building %s in %s"
 msgstr "budowanie %s w %s"
 
-#: scripts/dpkg-source.pl:282
+#: scripts/dpkg-source.pl:295
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x wymaga co najmniej jednego argumentu, .dsc"
 
-#: scripts/dpkg-source.pl:285
+#: scripts/dpkg-source.pl:298
 msgid "-x takes no more than two arguments"
 msgstr "-x pobiera nie więcej niż dwa argumenty"
 
-#: scripts/dpkg-source.pl:289
+#: scripts/dpkg-source.pl:302
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x wymaga pliku .dsc, a nie katalogu, jako pierwszego argumentu"
 
-#: scripts/dpkg-source.pl:305
+#: scripts/dpkg-source.pl:318
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cel rozpakowania istnieje: %s"
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:327
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "wydobywanie niepodpisanych pakietów źródłowych (%s)"
 
-#: scripts/dpkg-source.pl:323
+#: scripts/dpkg-source.pl:336
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: rozpakowywanie %s w %s"
 
-#: scripts/dpkg-source.pl:332
+#: scripts/dpkg-source.pl:345
 msgid "only one of -x or -b allowed, and only once"
 msgstr "dozwolona tylko jedna z opcji -x lub -b, i tylko raz"
 
-#: scripts/dpkg-source.pl:340
+#: scripts/dpkg-source.pl:353
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
@@ -1675,7 +1683,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:352
+#: scripts/dpkg-source.pl:365
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2098,14 +2106,6 @@ msgstr "Plik %s ma rozmiar %u zamiast oczekiwanego %u"
 msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
 msgstr "Plik %s ma sumę kontrolną %s zamiast oczekiwanej %s (algorytm %s)"
 
-#: scripts/Dpkg/Control.pm:81 scripts/Dpkg/Shlibs/Objdump.pm:89
-#: scripts/Dpkg/Source/CompressedFile.pm:131
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:77
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
-#, perl-format
-msgid "cannot read %s"
-msgstr "nie można odczytać %s"
-
 #: scripts/Dpkg/Control.pm:86
 msgid "first block lacks a source field"
 msgstr "pierwszy blok nie zawiera pola Source"
@@ -2205,12 +2205,12 @@ msgstr "ponowne otwieranie stdin"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:412 scripts/Dpkg/Source/Package/V2.pm:180
-#: scripts/Dpkg/Source/Package/V2.pm:393
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:237
+#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package/V2.pm:399
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
 #, perl-format
 msgid "cannot write %s"
 msgstr "nie można zapisać %s"
@@ -2325,7 +2325,7 @@ msgstr "nie można sprawdzić, czy usunąć katalog \"%s\""
 msgid "rm -rf failed to remove `%s'"
 msgstr "niepowodzenie rm -rf podczas usuwania \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:304
+#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:305
 msgid "binary file contents changed"
 msgstr "zawartość pliku binarnego zmieniła się"
 
@@ -2351,7 +2351,7 @@ msgid "diff on %s"
 msgstr "diff na %s"
 
 #: scripts/Dpkg/Source/Patch.pm:152 scripts/Dpkg/Source/Patch.pm:171
-#: scripts/Dpkg/Source/Patch.pm:209 scripts/Dpkg/Source/Patch.pm:221
+#: scripts/Dpkg/Source/Patch.pm:213 scripts/Dpkg/Source/Patch.pm:225
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "nie można ustalić stanu pliku %s"
@@ -2361,191 +2361,199 @@ msgstr "nie można ustalić stanu pliku %s"
 msgid "cannot read link %s"
 msgstr "nie można odczytać dowiązania %s"
 
-#: scripts/Dpkg/Source/Patch.pm:185
+#: scripts/Dpkg/Source/Patch.pm:189
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr "nowo utworzony pusty plik \"%s\" nie będzie dołączony do pliku różnic"
 
-#: scripts/Dpkg/Source/Patch.pm:189
+#: scripts/Dpkg/Source/Patch.pm:193
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 "prawa dostępu %04o wykonywalnego pliku \"%s\" nie będą dołączone do pliku "
 "różnic"
 
-#: scripts/Dpkg/Source/Patch.pm:194
+#: scripts/Dpkg/Source/Patch.pm:198
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 "specjalne prawa dostępu %04o pliku \"%s\" nie będą dołączone do pliku różnic"
 
-#: scripts/Dpkg/Source/Patch.pm:205
+#: scripts/Dpkg/Source/Patch.pm:209
 msgid "device or socket is not allowed"
 msgstr "urządzenie lub gniazdo nie są dozwolone"
 
-#: scripts/Dpkg/Source/Patch.pm:214
+#: scripts/Dpkg/Source/Patch.pm:218
 msgid "unknown file type"
 msgstr "nieznany typ pliku"
 
-#: scripts/Dpkg/Source/Patch.pm:229
+#: scripts/Dpkg/Source/Patch.pm:233
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "zignorowano usunięcie pliku %s"
 
-#: scripts/Dpkg/Source/Patch.pm:232
+#: scripts/Dpkg/Source/Patch.pm:236
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "zignorowano usunięcie katalogu %s"
 
-#: scripts/Dpkg/Source/Patch.pm:234
+#: scripts/Dpkg/Source/Patch.pm:238
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "zignorowano usunięcie dowiązania symbolicznego %s"
 
-#: scripts/Dpkg/Source/Patch.pm:247
+#: scripts/Dpkg/Source/Patch.pm:251
 #, perl-format
 msgid "cannot close %s"
 msgstr "nie można zamknąć %s"
 
-#: scripts/Dpkg/Source/Patch.pm:259 scripts/Dpkg/Source/Package/V2.pm:303
+#: scripts/Dpkg/Source/Patch.pm:263 scripts/Dpkg/Source/Package/V2.pm:304
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "niereprezentowalne zmiany w %s: %s"
 
-#: scripts/Dpkg/Source/Patch.pm:266
+#: scripts/Dpkg/Source/Patch.pm:270
 #, perl-format
 msgid "cannot represent change to %s:"
 msgstr "niereprezentowalna zmiana w %s:"
 
-#: scripts/Dpkg/Source/Patch.pm:267
+#: scripts/Dpkg/Source/Patch.pm:271
 #, perl-format
 msgid "  new version is %s"
 msgstr "  nową wersją jest %s"
 
-#: scripts/Dpkg/Source/Patch.pm:268
+#: scripts/Dpkg/Source/Patch.pm:272
 #, perl-format
 msgid "  old version is %s"
 msgstr "  starą wersją jest %s"
 
-#: scripts/Dpkg/Source/Patch.pm:294
+#: scripts/Dpkg/Source/Patch.pm:316
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "oczekiwano ^--- w linii %d pliku łatki \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:298
-#, perl-format
-msgid "diff `%s' patches file with no subdirectory"
-msgstr "diff \"%s\" łata plik, dla którego nie ma podkatalogu"
-
-#: scripts/Dpkg/Source/Patch.pm:301
+#: scripts/Dpkg/Source/Patch.pm:323
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
-msgstr "diff \"%s\" łata plik o nazwie kończącej się na .dpkg-orig"
+msgstr "plik łatki \"%s\" łata plik o nazwie kończącej się na .dpkg-orig"
 
-#: scripts/Dpkg/Source/Patch.pm:306
+#: scripts/Dpkg/Source/Patch.pm:327
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
-msgstr "diff \"%s\"  kończy się w środku ---/+++ (linia %d)"
+msgstr "plik łatki \"%s\"  kończy się w środku ---/+++ (linia %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:310 scripts/Dpkg/Source/Patch.pm:320
+#: scripts/Dpkg/Source/Patch.pm:330
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
-msgstr "linia po --- nie jest oczekiwana w pliku łaty \"%s\" (linia %d)"
+msgstr "linia po --- nie jest oczekiwana w pliku łatki \"%s\" (linia %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:337
+#, perl-format
+msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+msgstr ""
+"żadna z nazw plików w ---/+++ nie jest względna w pliku łatki \"%s\" (linia %"
+"d)"
 
-#: scripts/Dpkg/Source/Patch.pm:315
+#: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
 msgid "original and modified files are /dev/null in diff `%s' (line %d)"
 msgstr ""
 "oryginalnym i zmodyfikowanym plikiem jest /dev/null w pliku łatki \"%s"
 "\" (linia %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:330
+#: scripts/Dpkg/Source/Patch.pm:350
+#, perl-format
+msgid "file removal without proper filename in diff `%s' (line %d)"
+msgstr ""
+"usuwanie pliku bez właściwej nazwy w pliku łatki \"%s\" (linia %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:352
+#, perl-format
+msgid "diff %s removes a non-existing file %s (line %d)"
+msgstr "plik łatki \"%s\" usuwa nieistniejący plik %s (linia %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diff \"%s\" łata coś, co nie jest zwykłym plikiem"
 
-#: scripts/Dpkg/Source/Patch.pm:334
+#: scripts/Dpkg/Source/Patch.pm:365
 #, perl-format
 msgid "diff `%s' patches file %s twice"
 msgstr "diff \"%s\" dwukrotnie łata plik %s"
 
-#: scripts/Dpkg/Source/Patch.pm:349
+#: scripts/Dpkg/Source/Patch.pm:380 scripts/Dpkg/Source/Patch.pm:383
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "niespodziewany koniec łatki \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:352
-#, perl-format
-msgid "diff `%s' is missing trailing newline"
-msgstr "plik łatki \"%s\" nie kończy się znakiem nowej linii"
-
-#: scripts/Dpkg/Source/Patch.pm:360
+#: scripts/Dpkg/Source/Patch.pm:392
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "oczekiwano [+-] na początku linii %d pliku diff \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:367
+#: scripts/Dpkg/Source/Patch.pm:399
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "oczekiwano ^@@ w linii %d pliku łatki \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:372
+#: scripts/Dpkg/Source/Patch.pm:404
 #, perl-format
 msgid "diff `%s' doesn't contain any patch"
 msgstr "diff \"%s\" nie zawiera żadnej łatki"
 
-#: scripts/Dpkg/Source/Patch.pm:395 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "nie można utworzyć katalogu %s"
 
-#: scripts/Dpkg/Source/Patch.pm:415
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:143
+#: scripts/Dpkg/Source/Patch.pm:452
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "nie można zmienić czasu modyfikacji dla %s"
 
-#: scripts/Dpkg/Source/Patch.pm:419
+#: scripts/Dpkg/Source/Patch.pm:456
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "usuwanie kopii zapasowej pliku łatki %s"
 
-#: scripts/Dpkg/Source/Patch.pm:428
+#: scripts/Dpkg/Source/Patch.pm:496
 msgid "nonexistent"
 msgstr "nieistniejące"
 
-#: scripts/Dpkg/Source/Patch.pm:429 scripts/Dpkg/Source/Package.pm:333
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
 #, perl-format
 msgid "cannot stat %s"
 msgstr "nie można ustalić stanu %s"
 
-#: scripts/Dpkg/Source/Patch.pm:431
+#: scripts/Dpkg/Source/Patch.pm:499
 msgid "plain file"
 msgstr "zwykły plik"
 
-#: scripts/Dpkg/Source/Patch.pm:432
+#: scripts/Dpkg/Source/Patch.pm:500
 msgid "directory"
 msgstr "katalog"
 
-#: scripts/Dpkg/Source/Patch.pm:433
+#: scripts/Dpkg/Source/Patch.pm:501
 #, perl-format
 msgid "symlink to %s"
 msgstr "dowiązanie symboliczne do %s"
 
-#: scripts/Dpkg/Source/Patch.pm:434
+#: scripts/Dpkg/Source/Patch.pm:502
 msgid "block device"
 msgstr "urządzenie blokowe"
 
-#: scripts/Dpkg/Source/Patch.pm:435
+#: scripts/Dpkg/Source/Patch.pm:503
 msgid "character device"
 msgstr "urządzenie znakowe"
 
-#: scripts/Dpkg/Source/Patch.pm:436
+#: scripts/Dpkg/Source/Patch.pm:504
 msgid "named pipe"
 msgstr "nazwany potok"
 
-#: scripts/Dpkg/Source/Patch.pm:437
+#: scripts/Dpkg/Source/Patch.pm:505
 msgid "named socket"
 msgstr "nazwane gniazdo"
 
@@ -2596,22 +2604,27 @@ msgstr "nie można zweryfikować sygnatury w %s, ponieważ nie zainstalowano gpg
 msgid "%s is not a valid option for %s"
 msgstr "%s nie jest prawidłową opcją dla %s"
 
-#: scripts/Dpkg/Source/Package.pm:335
+#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#, perl-format
+msgid "can't write %s"
+msgstr "nie można zapisać %s"
+
+#: scripts/Dpkg/Source/Package.pm:345
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: scripts/Dpkg/Source/Package.pm:338
+#: scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "nie można uczynić %s plikiem wykonywalnym"
 
-#: scripts/Dpkg/Source/Package.pm:340
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s is not a plain file"
 msgstr " %s nie jest zwykłym plikiem"
 
-#: scripts/Dpkg/Source/Package.pm:372
+#: scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "próbowano dwukrotnie dodać plik \"%s\""
@@ -2674,7 +2687,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "nie można zmienić nazwy zachowanego %s na %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
 #, perl-format
 msgid "applying %s"
 msgstr "aplikowanie %s"
@@ -2790,7 +2803,7 @@ msgstr "nie można zmienić nazwy (nowo utworzonego) \"%s\" na \"%s\""
 msgid "unable to change permission of `%s'"
 msgstr "nie można zmienić praw dostępu \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:257
+#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:258
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "budowanie %s, używając istniejącego %s"
@@ -2830,13 +2843,12 @@ msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 "wymagane usunięcie \"%s\" zainstalowanego przez oryginalne archiwum tar"
 
-#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:255
+#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:256
 msgid "no orig.tar file found"
 msgstr "nie znaleziono pliku orig.tar"
 
-#: scripts/Dpkg/Source/Package/V2.pm:216
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:194
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V2.pm:217
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2844,7 +2856,7 @@ msgstr ""
 "nie zostały nałożone łatki, nakładanie ich teraz (proszę użyć --no-"
 "preparation aby to pominąć)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:226
+#: scripts/Dpkg/Source/Package/V2.pm:227
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:97
 #: scripts/Dpkg/Source/Package/V3/native.pm:74
 #: scripts/Dpkg/Source/Package/V3/git.pm:125
@@ -2852,16 +2864,16 @@ msgstr ""
 msgid "-b takes only one parameter with format `%s'"
 msgstr "-b przyjmuje tylko jeden parametr w formacie \"%s\""
 
-#: scripts/Dpkg/Source/Package/V2.pm:277
+#: scripts/Dpkg/Source/Package/V2.pm:278
 msgid "copy of the debian directory"
 msgstr "kopia katalogu debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:286
+#: scripts/Dpkg/Source/Package/V2.pm:287
 #, perl-format
 msgid "can't read %s"
 msgstr "nie można odczytać %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:305
+#: scripts/Dpkg/Source/Package/V2.pm:306
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -2870,38 +2882,40 @@ msgstr ""
 "proszę dodać %s w debian/source/include-binaries jeśli zmodyfikowane binaria "
 "mają się znaleźć w wynikowym archiwum Debiana"
 
-#: scripts/Dpkg/Source/Package/V2.pm:319
-#, fuzzy, perl-format
+#: scripts/Dpkg/Source/Package/V2.pm:320
+#, perl-format
 msgid "unwanted binary file: %s"
-msgstr "zduplikowane pole binarne w %s"
+msgstr "niechciany plik binarny: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
 msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
+"wykryto %d niechciany(ch) plik(ów) binarny(ch) (należy je wymienić w debian/"
+"source/include-binaries aby umożliwić ich włączenie)."
 
-#: scripts/Dpkg/Source/Package/V2.pm:338
+#: scripts/Dpkg/Source/Package/V2.pm:339
 msgid "unrepresentable changes to source"
 msgstr "niereprezentowalne zmiany w źródle"
 
-#: scripts/Dpkg/Source/Package/V2.pm:344 scripts/Dpkg/Source/Package/V2.pm:348
+#: scripts/Dpkg/Source/Package/V2.pm:345 scripts/Dpkg/Source/Package/V2.pm:349
 #, perl-format
 msgid "cannot remove %s"
 msgstr "nie można usunąć %s"
 
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "nie można przemianować %s na %s"
+msgid "local changes stored in %s, the modified files are:"
+msgstr "lokalne zmiany zachowane w %s, zmodyfikowane pliki to:"
 
-#: scripts/Dpkg/Source/Package/V2.pm:364
+#: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
-msgid "can't write %s"
-msgstr "nie można zapisać %s"
+msgid "cannot rename %s to %s"
+msgstr "nie można przemianować %s na %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:368
+#: scripts/Dpkg/Source/Package/V2.pm:374
 #, perl-format
 msgid "adding %s to %s"
 msgstr "dodawanie %s do %s"
@@ -3042,7 +3056,7 @@ msgstr ""
 "modyfikowanie .git/config w celu zamiany na komentarz niektórych ustawień"
 
 #: scripts/Dpkg/Source/Package/V3/git.pm:309
-#, fuzzy, perl-format
+#, perl-format
 msgid "unable to append to %s"
 msgstr "nie można dopisać do %s"
 
@@ -3050,7 +3064,7 @@ msgstr "nie można dopisać do %s"
 msgid "The following setting(s) were disabled by dpkg-source"
 msgstr "dpkg-source wyłączy następujące ustawienia"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:85
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:87
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3059,13 +3073,12 @@ msgstr ""
 "plik wydania (%s) zawiera nieobsługiwane opcje (\"%s\", linia %s), dpkg-"
 "source może zawieść przy nakładaniu łatek."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:114
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "nie można utworzyć linku symbolicznego \"%s\""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:199
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "nakładanie %s z użyciem quilt"

scripts/po/ru.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-05-03 10:05+0400\n"
+"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"PO-Revision-Date: 2008-05-03 22:40+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl:46 scripts/dpkg-gensymbols.pl:30
 #: scripts/dpkg-parsechangelog.pl:19 scripts/dpkg-scanpackages.pl:51
 #: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:455
-#: scripts/dpkg-source.pl:338 scripts/changelog/debian.pl:19
+#: scripts/dpkg-source.pl:351 scripts/changelog/debian.pl:19
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s, версия %s.\n"
@@ -51,7 +51,7 @@ msgstr ""
 #: scripts/dpkg-distaddfile.pl:23 scripts/dpkg-genchanges.pl:95
 #: scripts/dpkg-gencontrol.pl:52 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:25 scripts/dpkg-shlibdeps.pl:464
-#: scripts/dpkg-source.pl:344 scripts/changelog/debian.pl:24
+#: scripts/dpkg-source.pl:357 scripts/changelog/debian.pl:24
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -443,7 +443,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Сборочные конфликты: "
 
 #: scripts/dpkg-checkbuilddeps.pl:164 scripts/dpkg-gencontrol.pl:243
-#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:173
+#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:174
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "ошибка при анализе %s"
@@ -596,8 +596,8 @@ msgstr ""
 "%s: независимая от архитектуры закачка - не включаются зависимые от "
 "архитектуры пакеты"
 
-#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:102
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:106
 msgid "substvars support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "Поддержка substvars будет исключена (смотрите README.feature-removal-"
@@ -628,7 +628,7 @@ msgid "badly formed line in files list file, line %d"
 msgstr "неверный формат строки в файле со списком файлов, строка %d"
 
 #: scripts/dpkg-genchanges.pl:269 scripts/dpkg-gencontrol.pl:160
-#: scripts/dpkg-source.pl:183
+#: scripts/dpkg-source.pl:184
 msgid "general section of control info file"
 msgstr "общая секция управляющего информационного файла"
 
@@ -638,12 +638,12 @@ msgid "package %s in control file but not in files list"
 msgstr "пакет %s в управляющем файле, но его нет в файле со списком файлов"
 
 #: scripts/dpkg-genchanges.pl:323 scripts/dpkg-gencontrol.pl:193
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 msgid "package's section of control info file"
 msgstr "секция пакета управляющего информационного файла"
 
 #: scripts/dpkg-genchanges.pl:340 scripts/dpkg-gencontrol.pl:210
-#: scripts/dpkg-source.pl:244
+#: scripts/dpkg-source.pl:245
 msgid "parsed version of changelog"
 msgstr "получена версия changelog"
 
@@ -730,13 +730,13 @@ msgstr "закачка только бинарных пакетов, без па
 msgid "write original source message"
 msgstr "запись оригинального исходного сообщения"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:394
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "отсутствует информация о критическом поле вывода %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:399
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "отсутствует информация о поле вывода %s"
@@ -1578,63 +1578,71 @@ msgstr "запись информации об отклонениях в пот
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "неизвестный вывод от dpkg --search: '%s'"
 
-#: scripts/dpkg-source.pl:67 scripts/Dpkg/Source/Compressor.pm:35
+#: scripts/dpkg-source.pl:68 scripts/Dpkg/Source/Compressor.pm:35
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "неподдерживаемый метод сжатия %s"
 
-#: scripts/dpkg-source.pl:73 scripts/Dpkg/Source/Compressor.pm:42
+#: scripts/dpkg-source.pl:74 scripts/Dpkg/Source/Compressor.pm:42
 #: scripts/Dpkg/Source/Compressor.pm:68
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s не является степенью сжатия"
 
-#: scripts/dpkg-source.pl:114
+#: scripts/dpkg-source.pl:115
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E и -W устарели, они ничего не изменят"
 
-#: scripts/dpkg-source.pl:126
+#: scripts/dpkg-source.pl:127
 msgid "need -x or -b"
 msgstr "требуется параметр -x или -b"
 
-#: scripts/dpkg-source.pl:132
+#: scripts/dpkg-source.pl:133
 msgid "-b needs a directory"
 msgstr "в параметре -b требуется указать каталог"
 
-#: scripts/dpkg-source.pl:135
+#: scripts/dpkg-source.pl:136
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "не удалось выполнить функцию stat для каталога %s"
 
-#: scripts/dpkg-source.pl:137
+#: scripts/dpkg-source.pl:138
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "значение параметра каталога %s не является каталогом"
 
-#: scripts/dpkg-source.pl:207
+#: scripts/dpkg-source.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "`%s' не является разрешённой строкой архитектуры"
 
-#: scripts/dpkg-source.pl:210
+#: scripts/dpkg-source.pl:211
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "архитектура %s должна быть только из указанных в пакете (список для пакета %"
 "s: `%s')"
 
-#: scripts/dpkg-source.pl:257
+#: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
+#: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#, perl-format
+msgid "cannot read %s"
+msgstr "не удалось прочитать %s"
+
+#: scripts/dpkg-source.pl:270
 #, perl-format
 msgid "source format `%s' discarded: %s"
 msgstr "формат исходника `%s' отброшен: %s"
 
-#: scripts/dpkg-source.pl:259
+#: scripts/dpkg-source.pl:272
 #, perl-format
 msgid "using source format `%s'"
 msgstr "используется формат исходника `%s'"
 
-#: scripts/dpkg-source.pl:270 scripts/Dpkg/Source/Package/V1.pm:284
-#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:375
+#: scripts/dpkg-source.pl:283 scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:381
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:82
 #: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1642,38 +1650,38 @@ msgstr "используется формат исходника `%s'"
 msgid "building %s in %s"
 msgstr "сборка %s в %s"
 
-#: scripts/dpkg-source.pl:282
+#: scripts/dpkg-source.pl:295
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x требует указания хотя бы одного значения .dsc"
 
-#: scripts/dpkg-source.pl:285
+#: scripts/dpkg-source.pl:298
 msgid "-x takes no more than two arguments"
 msgstr "-x может иметь не более двух значений"
 
-#: scripts/dpkg-source.pl:289
+#: scripts/dpkg-source.pl:302
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x принимает .dsc файл первым значением, а не каталог"
 
-#: scripts/dpkg-source.pl:305
+#: scripts/dpkg-source.pl:318
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "цель распаковки существует: %s"
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:327
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "распаковка неподписанного пакета с исходниками (%s)"
 
-#: scripts/dpkg-source.pl:323
+#: scripts/dpkg-source.pl:336
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: извлечение %s в %s"
 
-#: scripts/dpkg-source.pl:332
+#: scripts/dpkg-source.pl:345
 msgid "only one of -x or -b allowed, and only once"
 msgstr "разрешено что-то одно: -x или -b и только один раз"
 
-#: scripts/dpkg-source.pl:340
+#: scripts/dpkg-source.pl:353
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
@@ -1683,7 +1691,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:352
+#: scripts/dpkg-source.pl:365
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2107,14 +2115,6 @@ msgstr "Файл %s имеет размер %u вместо ожидаемого
 msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
 msgstr "Файл %s имеет контрольную сумму %s вместо ожидаемой %s (алгоритм %s)"
 
-#: scripts/Dpkg/Control.pm:81 scripts/Dpkg/Shlibs/Objdump.pm:89
-#: scripts/Dpkg/Source/CompressedFile.pm:131
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:77
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
-#, perl-format
-msgid "cannot read %s"
-msgstr "не удалось прочитать %s"
-
 #: scripts/Dpkg/Control.pm:86
 msgid "first block lacks a source field"
 msgstr "в первом блоке отсутствует поле исходника"
@@ -2216,12 +2216,12 @@ msgstr "переоткрытие stdin"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:412 scripts/Dpkg/Source/Package/V2.pm:180
-#: scripts/Dpkg/Source/Package/V2.pm:393
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:237
+#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package/V2.pm:399
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
 #, perl-format
 msgid "cannot write %s"
 msgstr "не удалось записать %s"
@@ -2336,7 +2336,7 @@ msgstr "невозможно проверить удаление каталог
 msgid "rm -rf failed to remove `%s'"
 msgstr "при удалении `%s' команда rm -rf завершилась неудачно"
 
-#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:304
+#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:305
 msgid "binary file contents changed"
 msgstr "содержимое бинарного файла изменено"
 
@@ -2362,7 +2362,7 @@ msgid "diff on %s"
 msgstr "вызов diff для %s"
 
 #: scripts/Dpkg/Source/Patch.pm:152 scripts/Dpkg/Source/Patch.pm:171
-#: scripts/Dpkg/Source/Patch.pm:209 scripts/Dpkg/Source/Patch.pm:221
+#: scripts/Dpkg/Source/Patch.pm:213 scripts/Dpkg/Source/Patch.pm:225
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "не удалось выполнить функцию stat для файла %s"
@@ -2372,187 +2372,193 @@ msgstr "не удалось выполнить функцию stat для фай
 msgid "cannot read link %s"
 msgstr "не удалось прочитать ссылку %s"
 
-#: scripts/Dpkg/Source/Patch.pm:185
+#: scripts/Dpkg/Source/Patch.pm:189
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr "недавно созданный пустой файл '%s' не будет включён в diff"
 
-#: scripts/Dpkg/Source/Patch.pm:189
+#: scripts/Dpkg/Source/Patch.pm:193
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr "права исполнения %04o для '%s' не будут включёны в diff"
 
-#: scripts/Dpkg/Source/Patch.pm:194
+#: scripts/Dpkg/Source/Patch.pm:198
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "специальные права %04o для '%s' не будут включёны в diff"
 
-#: scripts/Dpkg/Source/Patch.pm:205
+#: scripts/Dpkg/Source/Patch.pm:209
 msgid "device or socket is not allowed"
 msgstr "устройства или сокеты не разрешены"
 
-#: scripts/Dpkg/Source/Patch.pm:214
+#: scripts/Dpkg/Source/Patch.pm:218
 msgid "unknown file type"
 msgstr "неизвестный тип файла"
 
-#: scripts/Dpkg/Source/Patch.pm:229
+#: scripts/Dpkg/Source/Patch.pm:233
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "игнорируется удаление файла %s"
 
-#: scripts/Dpkg/Source/Patch.pm:232
+#: scripts/Dpkg/Source/Patch.pm:236
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "игнорируется удаление каталога %s"
 
-#: scripts/Dpkg/Source/Patch.pm:234
+#: scripts/Dpkg/Source/Patch.pm:238
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "игнорируется удаление символической ссылки %s"
 
-#: scripts/Dpkg/Source/Patch.pm:247
+#: scripts/Dpkg/Source/Patch.pm:251
 #, perl-format
 msgid "cannot close %s"
 msgstr "не удалось закрыть %s"
 
-#: scripts/Dpkg/Source/Patch.pm:259 scripts/Dpkg/Source/Package/V2.pm:303
+#: scripts/Dpkg/Source/Patch.pm:263 scripts/Dpkg/Source/Package/V2.pm:304
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "не удалось представить изменение %s: %s"
 
-#: scripts/Dpkg/Source/Patch.pm:266
+#: scripts/Dpkg/Source/Patch.pm:270
 #, perl-format
 msgid "cannot represent change to %s:"
 msgstr "не удалось представить изменение %s:"
 
-#: scripts/Dpkg/Source/Patch.pm:267
+#: scripts/Dpkg/Source/Patch.pm:271
 #, perl-format
 msgid "  new version is %s"
 msgstr "  новая версия %s"
 
-#: scripts/Dpkg/Source/Patch.pm:268
+#: scripts/Dpkg/Source/Patch.pm:272
 #, perl-format
 msgid "  old version is %s"
 msgstr "  старая версия %s"
 
-#: scripts/Dpkg/Source/Patch.pm:294
+#: scripts/Dpkg/Source/Patch.pm:316
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "ожидается ^--- в строке %d в diff `%s'"
 
-#: scripts/Dpkg/Source/Patch.pm:298
-#, perl-format
-msgid "diff `%s' patches file with no subdirectory"
-msgstr "файл заплаток diff `%s' без подкаталога"
-
-#: scripts/Dpkg/Source/Patch.pm:301
+#: scripts/Dpkg/Source/Patch.pm:323
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "файл заплаток diff `%s' с именем, оканчивающимся на .dpkg-orig"
 
-#: scripts/Dpkg/Source/Patch.pm:306
+#: scripts/Dpkg/Source/Patch.pm:327
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr "diff `%s' завершился в середине ---/+++ (строка %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:310 scripts/Dpkg/Source/Patch.pm:320
+#: scripts/Dpkg/Source/Patch.pm:330
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "строка после --- не та, что ожидалась в diff `%s' (строка %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:315
+#: scripts/Dpkg/Source/Patch.pm:337
+#, fuzzy, perl-format
+msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+msgstr ""
+"оригинальный и изменённый файлы равны /dev/null для diff `%s' (строка %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
 msgid "original and modified files are /dev/null in diff `%s' (line %d)"
 msgstr ""
 "оригинальный и изменённый файлы равны /dev/null для diff `%s' (строка %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:330
+#: scripts/Dpkg/Source/Patch.pm:350
+#, fuzzy, perl-format
+msgid "file removal without proper filename in diff `%s' (line %d)"
+msgstr "строка после --- не та, что ожидалась в diff `%s' (строка %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:352
+#, perl-format
+msgid "diff %s removes a non-existing file %s (line %d)"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diff `%s' латает что-то не являющееся простым файлом"
 
-#: scripts/Dpkg/Source/Patch.pm:334
+#: scripts/Dpkg/Source/Patch.pm:365
 #, perl-format
 msgid "diff `%s' patches file %s twice"
 msgstr "diff `%s' латает файл %s дважды"
 
-#: scripts/Dpkg/Source/Patch.pm:349
+#: scripts/Dpkg/Source/Patch.pm:380 scripts/Dpkg/Source/Patch.pm:383
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "неожиданный конец diff `%s'"
 
-#: scripts/Dpkg/Source/Patch.pm:352
-#, perl-format
-msgid "diff `%s' is missing trailing newline"
-msgstr "в diff `%s' отсутствует завершающий символ новой строки"
-
-#: scripts/Dpkg/Source/Patch.pm:360
+#: scripts/Dpkg/Source/Patch.pm:392
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "ожидается [ +-] в начале строки %d в diff `%s'"
 
-#: scripts/Dpkg/Source/Patch.pm:367
+#: scripts/Dpkg/Source/Patch.pm:399
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "ожидается ^@@ в строке %d в diff `%s'"
 
-#: scripts/Dpkg/Source/Patch.pm:372
+#: scripts/Dpkg/Source/Patch.pm:404
 #, perl-format
 msgid "diff `%s' doesn't contain any patch"
 msgstr "diff `%s' не содержит заплатки"
 
-#: scripts/Dpkg/Source/Patch.pm:395 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "не удалось создать каталог %s"
 
-#: scripts/Dpkg/Source/Patch.pm:415
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:143
+#: scripts/Dpkg/Source/Patch.pm:452
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "не удалось изменить метку времени для %s"
 
-#: scripts/Dpkg/Source/Patch.pm:419
+#: scripts/Dpkg/Source/Patch.pm:456
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "удаление резервной копии заплатки %s"
 
-#: scripts/Dpkg/Source/Patch.pm:428
+#: scripts/Dpkg/Source/Patch.pm:496
 msgid "nonexistent"
 msgstr "несуществующий"
 
-#: scripts/Dpkg/Source/Patch.pm:429 scripts/Dpkg/Source/Package.pm:333
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
 #, perl-format
 msgid "cannot stat %s"
 msgstr "не удалось выполнить функцию stat %s"
 
-#: scripts/Dpkg/Source/Patch.pm:431
+#: scripts/Dpkg/Source/Patch.pm:499
 msgid "plain file"
 msgstr "простой файл"
 
-#: scripts/Dpkg/Source/Patch.pm:432
+#: scripts/Dpkg/Source/Patch.pm:500
 msgid "directory"
 msgstr "каталог"
 
-#: scripts/Dpkg/Source/Patch.pm:433
+#: scripts/Dpkg/Source/Patch.pm:501
 #, perl-format
 msgid "symlink to %s"
 msgstr "символическая ссылка на %s"
 
-#: scripts/Dpkg/Source/Patch.pm:434
+#: scripts/Dpkg/Source/Patch.pm:502
 msgid "block device"
 msgstr "блочное устройство"
 
-#: scripts/Dpkg/Source/Patch.pm:435
+#: scripts/Dpkg/Source/Patch.pm:503
 msgid "character device"
 msgstr "символьное устройство"
 
-#: scripts/Dpkg/Source/Patch.pm:436
+#: scripts/Dpkg/Source/Patch.pm:504
 msgid "named pipe"
 msgstr "именованный канал"
 
-#: scripts/Dpkg/Source/Patch.pm:437
+#: scripts/Dpkg/Source/Patch.pm:505
 msgid "named socket"
 msgstr "именованный сокет"
 
@@ -2602,22 +2608,27 @@ msgstr "невозможно проверить подпись для %s, так
 msgid "%s is not a valid option for %s"
 msgstr "%s не является допустимым параметром для %s"
 
-#: scripts/Dpkg/Source/Package.pm:335
+#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#, perl-format
+msgid "can't write %s"
+msgstr "не удалось записать %s"
+
+#: scripts/Dpkg/Source/Package.pm:345
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s не существует"
 
-#: scripts/Dpkg/Source/Package.pm:338
+#: scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "не удалось сделать %s исполняемым"
 
-#: scripts/Dpkg/Source/Package.pm:340
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s не является простым файлом"
 
-#: scripts/Dpkg/Source/Package.pm:372
+#: scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "попытка добавить файл `%s' дважды"
@@ -2680,7 +2691,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "отказ при переименовании сохранённого %s в %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
 #, perl-format
 msgid "applying %s"
 msgstr "накладывается %s"
@@ -2799,7 +2810,7 @@ msgstr "невозможно переименовать '%s' (недавно с
 msgid "unable to change permission of `%s'"
 msgstr "невозможно изменить права '%s'"
 
-#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:257
+#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:258
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "сборка %s с использованием существующего %s"
@@ -2837,13 +2848,12 @@ msgstr "отсутствует файл orig.tar или debian.tar в пакет
 msgid "required removal of `%s' installed by original tarball"
 msgstr "требуется удаление `%s', установленного из оригинального tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:255
+#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:256
 msgid "no orig.tar file found"
 msgstr "файл orig.tar не найден"
 
-#: scripts/Dpkg/Source/Package/V2.pm:216
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:194
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V2.pm:217
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2851,7 +2861,7 @@ msgstr ""
 "заплаты не были наложены, делаем это сейчас (используйте --no-preparation, "
 "чтобы не выполнять этого)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:226
+#: scripts/Dpkg/Source/Package/V2.pm:227
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:97
 #: scripts/Dpkg/Source/Package/V3/native.pm:74
 #: scripts/Dpkg/Source/Package/V3/git.pm:125
@@ -2859,16 +2869,16 @@ msgstr ""
 msgid "-b takes only one parameter with format `%s'"
 msgstr "значением параметра -b является только один аргумент в формате `%s'"
 
-#: scripts/Dpkg/Source/Package/V2.pm:277
+#: scripts/Dpkg/Source/Package/V2.pm:278
 msgid "copy of the debian directory"
 msgstr "копирование каталога debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:286
+#: scripts/Dpkg/Source/Package/V2.pm:287
 #, perl-format
 msgid "can't read %s"
 msgstr "не удалось прочитать %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:305
+#: scripts/Dpkg/Source/Package/V2.pm:306
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -2877,38 +2887,38 @@ msgstr ""
 "добавьте %s в debian/source/include-binaries, если хотите хранить "
 "изменённыйдвоичный файл в debian tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:319
+#: scripts/Dpkg/Source/Package/V2.pm:320
 #, fuzzy, perl-format
 msgid "unwanted binary file: %s"
 msgstr "повторение бинарного поля в %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
 msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:338
+#: scripts/Dpkg/Source/Package/V2.pm:339
 msgid "unrepresentable changes to source"
 msgstr "нехарактерные изменения в исходнике"
 
-#: scripts/Dpkg/Source/Package/V2.pm:344 scripts/Dpkg/Source/Package/V2.pm:348
+#: scripts/Dpkg/Source/Package/V2.pm:345 scripts/Dpkg/Source/Package/V2.pm:349
 #, perl-format
 msgid "cannot remove %s"
 msgstr "не удалось удалить %s"
 
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "не удалось переименовать %s в %s"
+msgid "local changes stored in %s, the modified files are:"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:364
+#: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
-msgid "can't write %s"
-msgstr "не удалось записать %s"
+msgid "cannot rename %s to %s"
+msgstr "не удалось переименовать %s в %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:368
+#: scripts/Dpkg/Source/Package/V2.pm:374
 #, perl-format
 msgid "adding %s to %s"
 msgstr "добавляется %s в %s"
@@ -3049,15 +3059,15 @@ msgid "modifying .git/config to comment out some settings"
 msgstr "изменяется .git/config для комментирования некоторых настроек"
 
 #: scripts/Dpkg/Source/Package/V3/git.pm:309
-#, fuzzy, perl-format
+#, perl-format
 msgid "unable to append to %s"
-msgstr "невозможно добавить %s"
+msgstr "невозможно добавить к %s"
 
 #: scripts/Dpkg/Source/Package/V3/git.pm:310
 msgid "The following setting(s) were disabled by dpkg-source"
 msgstr "Следующие настройки были выключены dpkg-source"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:85
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:87
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3066,13 +3076,12 @@ msgstr ""
 "файл series (%s) содержит неподдерживаемые параметры ('%s', строка %s), у "
 "dpkg-source может не получиться наложить заплатки."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:114
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "не удалось создать символическую ссылку %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:199
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "наложение %s с помощью quilt"
@@ -3116,3 +3125,9 @@ msgstr "пакет исходников содержит два конфликт
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "номер версии содержит недопустимый символ `%s'"
+
+#~ msgid "diff `%s' patches file with no subdirectory"
+#~ msgstr "файл заплаток diff `%s' без подкаталога"
+
+#~ msgid "diff `%s' is missing trailing newline"
+#~ msgstr "в diff `%s' отсутствует завершающий символ новой строки"

scripts/po/sv.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-05-12 08:17+0300\n"
-"PO-Revision-Date: 2008-04-29 06:30+0100\n"
+"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"PO-Revision-Date: 2008-06-09 14:22+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Detta program rekommenderas ej. Använd \"date -R\" istället."
 #: scripts/dpkg-gencontrol.pl:46 scripts/dpkg-gensymbols.pl:30
 #: scripts/dpkg-parsechangelog.pl:19 scripts/dpkg-scanpackages.pl:51
 #: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:455
-#: scripts/dpkg-source.pl:338 scripts/changelog/debian.pl:19
+#: scripts/dpkg-source.pl:351 scripts/changelog/debian.pl:19
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -47,7 +47,7 @@ msgstr ""
 #: scripts/dpkg-distaddfile.pl:23 scripts/dpkg-genchanges.pl:95
 #: scripts/dpkg-gencontrol.pl:52 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:25 scripts/dpkg-shlibdeps.pl:464
-#: scripts/dpkg-source.pl:344 scripts/changelog/debian.pl:24
+#: scripts/dpkg-source.pl:357 scripts/changelog/debian.pl:24
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -428,7 +428,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Byggkonflikter: "
 
 #: scripts/dpkg-checkbuilddeps.pl:164 scripts/dpkg-gencontrol.pl:243
-#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:173
+#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-source.pl:174
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "fel vid tolkning av %s"
@@ -574,8 +574,8 @@ msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s: arkitekturobereoende insändning - inkluderar inte ark.-specifik paket"
 
-#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:102
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-genchanges.pl:165 scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:106
 msgid "substvars support is deprecated (see README.feature-removal-schedule)"
 msgstr "substvars-stödet undanbes (se README.feature-removal-schedule)"
 
@@ -604,7 +604,7 @@ msgid "badly formed line in files list file, line %d"
 msgstr "felformaterad rad i fillistfilen, rad %d"
 
 #: scripts/dpkg-genchanges.pl:269 scripts/dpkg-gencontrol.pl:160
-#: scripts/dpkg-source.pl:183
+#: scripts/dpkg-source.pl:184
 msgid "general section of control info file"
 msgstr "allmän sektion i styrinfofilen"
 
@@ -614,12 +614,12 @@ msgid "package %s in control file but not in files list"
 msgstr "paketet %s i styrinfofilen men inte i fillistfilen"
 
 #: scripts/dpkg-genchanges.pl:323 scripts/dpkg-gencontrol.pl:193
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 msgid "package's section of control info file"
 msgstr "paketets sektion av styrinfofilen"
 
 #: scripts/dpkg-genchanges.pl:340 scripts/dpkg-gencontrol.pl:210
-#: scripts/dpkg-source.pl:244
+#: scripts/dpkg-source.pl:245
 msgid "parsed version of changelog"
 msgstr "tolkad version av ändringslogg"
 
@@ -705,13 +705,13 @@ msgstr "endast binär insändning - tar inte med någon källkod"
 msgid "write original source message"
 msgstr "skriver meddelande om originalkällkod"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:394
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "saknar information för kritiskt utdatafält %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:399
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "saknar information för utdatafält %s"
@@ -1535,61 +1535,69 @@ msgstr "skriv omdirigeringsinformation på standard fel"
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "okända utdata från dpkg --search: \"%s\""
 
-#: scripts/dpkg-source.pl:67 scripts/Dpkg/Source/Compressor.pm:35
+#: scripts/dpkg-source.pl:68 scripts/Dpkg/Source/Compressor.pm:35
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s är inte en komprimering som stöds"
 
-#: scripts/dpkg-source.pl:73 scripts/Dpkg/Source/Compressor.pm:42
+#: scripts/dpkg-source.pl:74 scripts/Dpkg/Source/Compressor.pm:42
 #: scripts/Dpkg/Source/Compressor.pm:68
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s är inte en komprimeringsnivå"
 
-#: scripts/dpkg-source.pl:114
+#: scripts/dpkg-source.pl:115
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E och -W rekommenderas ej, de har ingen effekt"
 
-#: scripts/dpkg-source.pl:126
+#: scripts/dpkg-source.pl:127
 msgid "need -x or -b"
 msgstr "behöver -x eller -b"
 
-#: scripts/dpkg-source.pl:132
+#: scripts/dpkg-source.pl:133
 msgid "-b needs a directory"
 msgstr "-b behöver en katalog"
 
-#: scripts/dpkg-source.pl:135
+#: scripts/dpkg-source.pl:136
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "kan inte ta status på katalogen %s"
 
-#: scripts/dpkg-source.pl:137
+#: scripts/dpkg-source.pl:138
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "katalogargumentet %s är inte en katalog"
 
-#: scripts/dpkg-source.pl:207
+#: scripts/dpkg-source.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "\"%s\" är inte en giltig arkitektursträng"
 
-#: scripts/dpkg-source.pl:210
+#: scripts/dpkg-source.pl:211
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")"
 
-#: scripts/dpkg-source.pl:257
+#: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
+#: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#, perl-format
+msgid "cannot read %s"
+msgstr "kan inte läsa %s"
+
+#: scripts/dpkg-source.pl:270
 #, perl-format
 msgid "source format `%s' discarded: %s"
 msgstr "källkodsformatet \"%s\" förkastades: %s"
 
-#: scripts/dpkg-source.pl:259
+#: scripts/dpkg-source.pl:272
 #, perl-format
 msgid "using source format `%s'"
 msgstr "använder källkodsformatet \"%s\""
 
-#: scripts/dpkg-source.pl:270 scripts/Dpkg/Source/Package/V1.pm:284
-#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:375
+#: scripts/dpkg-source.pl:283 scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:329 scripts/Dpkg/Source/Package/V2.pm:381
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:82
 #: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1597,38 +1605,38 @@ msgstr "använder källkodsformatet \"%s\""
 msgid "building %s in %s"
 msgstr "bygger %s i %s"
 
-#: scripts/dpkg-source.pl:282
+#: scripts/dpkg-source.pl:295
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x behöver åtminstone ett argument, .dsc-filen"
 
-#: scripts/dpkg-source.pl:285
+#: scripts/dpkg-source.pl:298
 msgid "-x takes no more than two arguments"
 msgstr "-x tar maximalt två argument"
 
-#: scripts/dpkg-source.pl:289
+#: scripts/dpkg-source.pl:302
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x måste ha .dsc-filen som första argument, inte en katalog"
 
-#: scripts/dpkg-source.pl:305
+#: scripts/dpkg-source.pl:318
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "mål för uppackning finns redan: %s"
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:327
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extraherar osignerat källkodspaket (%s)"
 
-#: scripts/dpkg-source.pl:323
+#: scripts/dpkg-source.pl:336
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: extraherar %s i %s"
 
-#: scripts/dpkg-source.pl:332
+#: scripts/dpkg-source.pl:345
 msgid "only one of -x or -b allowed, and only once"
 msgstr "endast en av -x och -b tillåts, och endast en gång"
 
-#: scripts/dpkg-source.pl:340
+#: scripts/dpkg-source.pl:353
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
@@ -1638,7 +1646,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson och Klee Dienes.\n"
 "Copyright © 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:352
+#: scripts/dpkg-source.pl:365
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2060,14 +2068,6 @@ msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
 msgstr ""
 "Filen %s har kontrollsumman %s istället för den förväntade %s (algoritm %s)"
 
-#: scripts/Dpkg/Control.pm:81 scripts/Dpkg/Shlibs/Objdump.pm:89
-#: scripts/Dpkg/Source/CompressedFile.pm:131
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:77
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
-#, perl-format
-msgid "cannot read %s"
-msgstr "kan inte läsa %s"
-
 #: scripts/Dpkg/Control.pm:86
 msgid "first block lacks a source field"
 msgstr "första blocket saknar source-fält"
@@ -2167,12 +2167,12 @@ msgstr "öppna standard in på nytt"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:412 scripts/Dpkg/Source/Package/V2.pm:180
-#: scripts/Dpkg/Source/Package/V2.pm:393
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:237
+#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package/V2.pm:399
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
 #, perl-format
 msgid "cannot write %s"
 msgstr "kan inte skriva %s"
@@ -2286,7 +2286,7 @@ msgstr "kan inte kontrollera för borttagning av katalogen \"%s\""
 msgid "rm -rf failed to remove `%s'"
 msgstr "rm -rf misslyckades att ta bort \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:304
+#: scripts/Dpkg/Source/Patch.pm:64 scripts/Dpkg/Source/Package/V2.pm:305
 msgid "binary file contents changed"
 msgstr "innehåll i binär fil ändrat"
 
@@ -2312,7 +2312,7 @@ msgid "diff on %s"
 msgstr "diff på %s"
 
 #: scripts/Dpkg/Source/Patch.pm:152 scripts/Dpkg/Source/Patch.pm:171
-#: scripts/Dpkg/Source/Patch.pm:209 scripts/Dpkg/Source/Patch.pm:221
+#: scripts/Dpkg/Source/Patch.pm:213 scripts/Dpkg/Source/Patch.pm:225
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "kan inte ta status på filen %s"
@@ -2322,188 +2322,193 @@ msgstr "kan inte ta status på filen %s"
 msgid "cannot read link %s"
 msgstr "kan inte läsa länken %s"
 
-#: scripts/Dpkg/Source/Patch.pm:185
+#: scripts/Dpkg/Source/Patch.pm:189
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 "den tomma katalogen \"%s\" som just skapats kommer inte representeras i "
 "diffen"
 
-#: scripts/Dpkg/Source/Patch.pm:189
+#: scripts/Dpkg/Source/Patch.pm:193
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr "exekveringsläge %04o på \"%s\" kommer inte representeras i diffen"
 
-#: scripts/Dpkg/Source/Patch.pm:194
+#: scripts/Dpkg/Source/Patch.pm:198
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "specialläge %04o på \"%s\" kommer inte representeras i diffen"
 
-#: scripts/Dpkg/Source/Patch.pm:205
+#: scripts/Dpkg/Source/Patch.pm:209
 msgid "device or socket is not allowed"
 msgstr "enhet eller uttag inte tillåtet"
 
-#: scripts/Dpkg/Source/Patch.pm:214
+#: scripts/Dpkg/Source/Patch.pm:218
 msgid "unknown file type"
 msgstr "okänd filtyp"
 
-#: scripts/Dpkg/Source/Patch.pm:229
+#: scripts/Dpkg/Source/Patch.pm:233
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "ignorerar borttagning av filen %s"
 
-#: scripts/Dpkg/Source/Patch.pm:232
+#: scripts/Dpkg/Source/Patch.pm:236
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "ignorerar borttagning av katalogen %s"
 
-#: scripts/Dpkg/Source/Patch.pm:234
+#: scripts/Dpkg/Source/Patch.pm:238
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "ignorerar borttagning av symboliska länken %s"
 
-#: scripts/Dpkg/Source/Patch.pm:247
+#: scripts/Dpkg/Source/Patch.pm:251
 #, perl-format
 msgid "cannot close %s"
 msgstr "kan inte stänga %s"
 
-#: scripts/Dpkg/Source/Patch.pm:259 scripts/Dpkg/Source/Package/V2.pm:303
+#: scripts/Dpkg/Source/Patch.pm:263 scripts/Dpkg/Source/Package/V2.pm:304
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "kan inte representera ändringen för %s: %s"
 
-#: scripts/Dpkg/Source/Patch.pm:266
+#: scripts/Dpkg/Source/Patch.pm:270
 #, perl-format
 msgid "cannot represent change to %s:"
 msgstr "kan inte representera ändringen för %s:"
 
-#: scripts/Dpkg/Source/Patch.pm:267
+#: scripts/Dpkg/Source/Patch.pm:271
 #, perl-format
 msgid "  new version is %s"
 msgstr "  ny version är %s"
 
-#: scripts/Dpkg/Source/Patch.pm:268
+#: scripts/Dpkg/Source/Patch.pm:272
 #, perl-format
 msgid "  old version is %s"
 msgstr "  gammal version är %s"
 
-#: scripts/Dpkg/Source/Patch.pm:294
+#: scripts/Dpkg/Source/Patch.pm:316
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "förväntade ^--- på rad %d i diffen \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:298
-#, perl-format
-msgid "diff `%s' patches file with no subdirectory"
-msgstr "diffen \"%s\" patchar fil utan underkatalog"
-
-#: scripts/Dpkg/Source/Patch.pm:301
+#: scripts/Dpkg/Source/Patch.pm:323
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "diffen \"%s\" patchar fil vars namn slutar på .dpkg-orig"
 
-#: scripts/Dpkg/Source/Patch.pm:306
+#: scripts/Dpkg/Source/Patch.pm:327
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr "diffen \"%s\" slutar mitt i en ---/+++ (rad %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:310 scripts/Dpkg/Source/Patch.pm:320
+#: scripts/Dpkg/Source/Patch.pm:330
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "raden efter --- är inte som förväntad i diffen \"%s\" (rad %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:315
+#: scripts/Dpkg/Source/Patch.pm:337
+#, perl-format
+msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+msgstr "inget av filnamnen i ---/+++ är relativa i diffen \"%s\" (rad %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
 msgid "original and modified files are /dev/null in diff `%s' (line %d)"
 msgstr "original och ändrad fil är /dev/null i diffen \"%s\" (rad %d)"
 
-#: scripts/Dpkg/Source/Patch.pm:330
+#: scripts/Dpkg/Source/Patch.pm:350
+#, perl-format
+msgid "file removal without proper filename in diff `%s' (line %d)"
+msgstr "borttagen fil saknar korrekt filnamn i diffen \"%s\" (rad %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:352
+#, perl-format
+msgid "diff %s removes a non-existing file %s (line %d)"
+msgstr "diffen %s tar bort filen %s som inte finns (rad %d)"
+
+#: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diffen \"%s\" patchar något som inte är en vanlig fil"
 
-#: scripts/Dpkg/Source/Patch.pm:334
+#: scripts/Dpkg/Source/Patch.pm:365
 #, perl-format
 msgid "diff `%s' patches file %s twice"
 msgstr "diffen \"%s\" patchar filen %s två gånger"
 
-#: scripts/Dpkg/Source/Patch.pm:349
+#: scripts/Dpkg/Source/Patch.pm:380 scripts/Dpkg/Source/Patch.pm:383
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "oväntad slut på diffen \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:352
-#, perl-format
-msgid "diff `%s' is missing trailing newline"
-msgstr "diffen \"%s\" saknar avslutande nyradstecken"
-
-#: scripts/Dpkg/Source/Patch.pm:360
+#: scripts/Dpkg/Source/Patch.pm:392
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "förväntade [ + ] vid början av rad %d i diffen \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:367
+#: scripts/Dpkg/Source/Patch.pm:399
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "förväntade ^@@ på rad %d i diffen \"%s\""
 
-#: scripts/Dpkg/Source/Patch.pm:372
+#: scripts/Dpkg/Source/Patch.pm:404
 #, perl-format
 msgid "diff `%s' doesn't contain any patch"
 msgstr "diffen \"%s\" innehåller inte någon patch"
 
-#: scripts/Dpkg/Source/Patch.pm:395 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "kan inte skapa katalogen %s"
 
-#: scripts/Dpkg/Source/Patch.pm:415
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:143
+#: scripts/Dpkg/Source/Patch.pm:452
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "kan inte ändra tidsstämpel på %s"
 
-#: scripts/Dpkg/Source/Patch.pm:419
+#: scripts/Dpkg/Source/Patch.pm:456
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "tar bort patchsäkerhetskopian %s"
 
-#: scripts/Dpkg/Source/Patch.pm:428
+#: scripts/Dpkg/Source/Patch.pm:496
 msgid "nonexistent"
 msgstr "saknas"
 
-#: scripts/Dpkg/Source/Patch.pm:429 scripts/Dpkg/Source/Package.pm:333
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
 #, perl-format
 msgid "cannot stat %s"
 msgstr "kan inte ta status på %s"
 
-#: scripts/Dpkg/Source/Patch.pm:431
+#: scripts/Dpkg/Source/Patch.pm:499
 msgid "plain file"
 msgstr "vanlig fil"
 
-#: scripts/Dpkg/Source/Patch.pm:432
+#: scripts/Dpkg/Source/Patch.pm:500
 msgid "directory"
 msgstr "katalog"
 
-#: scripts/Dpkg/Source/Patch.pm:433
+#: scripts/Dpkg/Source/Patch.pm:501
 #, perl-format
 msgid "symlink to %s"
 msgstr "symbolisk länk till %s"
 
-#: scripts/Dpkg/Source/Patch.pm:434
+#: scripts/Dpkg/Source/Patch.pm:502
 msgid "block device"
 msgstr "blockenhet"
 
-#: scripts/Dpkg/Source/Patch.pm:435
+#: scripts/Dpkg/Source/Patch.pm:503
 msgid "character device"
 msgstr "teckenenhet"
 
-#: scripts/Dpkg/Source/Patch.pm:436
+#: scripts/Dpkg/Source/Patch.pm:504
 msgid "named pipe"
 msgstr "namngivet rör"
 
-#: scripts/Dpkg/Source/Patch.pm:437
+#: scripts/Dpkg/Source/Patch.pm:505
 msgid "named socket"
 msgstr "namngivet uttag"
 
@@ -2552,22 +2557,27 @@ msgstr "kunde inte verifiera signaturen på %s eftersom gpg inte installerats"
 msgid "%s is not a valid option for %s"
 msgstr "%s är inte en giltig flagga för %s"
 
-#: scripts/Dpkg/Source/Package.pm:335
+#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#, perl-format
+msgid "can't write %s"
+msgstr "kan inte skriva %s"
+
+#: scripts/Dpkg/Source/Package.pm:345
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: scripts/Dpkg/Source/Package.pm:338
+#: scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "kan inte göra %s exekverbar"
 
-#: scripts/Dpkg/Source/Package.pm:340
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s är inte en vanlig fil"
 
-#: scripts/Dpkg/Source/Package.pm:372
+#: scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "försökte lägga till filen \"%s\" två gånger"
@@ -2630,7 +2640,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "misslyckades att byta namn på sparad %s till %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
 #, perl-format
 msgid "applying %s"
 msgstr "tillämpar %s"
@@ -2744,7 +2754,7 @@ msgstr "kunde inte byta namn på \"%s\" (precis skapad) till \"%s\""
 msgid "unable to change permission of `%s'"
 msgstr "kunde inte ändra beroenden på \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:257
+#: scripts/Dpkg/Source/Package/V1.pm:301 scripts/Dpkg/Source/Package/V2.pm:258
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "bygger %s med befintlig %s"
@@ -2782,13 +2792,12 @@ msgstr "saknad orig.tar- eller debian.tar-fil för v2.0-källkodspaket"
 msgid "required removal of `%s' installed by original tarball"
 msgstr "nödvändig borttagning av \"%s\" installerad av originaltarboll"
 
-#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:255
+#: scripts/Dpkg/Source/Package/V2.pm:198 scripts/Dpkg/Source/Package/V2.pm:256
 msgid "no orig.tar file found"
 msgstr "ingen orig.tar-fil hittades"
 
-#: scripts/Dpkg/Source/Package/V2.pm:216
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:194
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V2.pm:217
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2796,7 +2805,7 @@ msgstr ""
 "patcharna har inte tillämpats, tillämpar dem nu (använd -no-preparation för "
 "att överstyra)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:226
+#: scripts/Dpkg/Source/Package/V2.pm:227
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:97
 #: scripts/Dpkg/Source/Package/V3/native.pm:74
 #: scripts/Dpkg/Source/Package/V3/git.pm:125
@@ -2804,16 +2813,16 @@ msgstr ""
 msgid "-b takes only one parameter with format `%s'"
 msgstr "-b tar bara en parameter för formatet \"%s\""
 
-#: scripts/Dpkg/Source/Package/V2.pm:277
+#: scripts/Dpkg/Source/Package/V2.pm:278
 msgid "copy of the debian directory"
 msgstr "kopia av debian-katalogen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:286
+#: scripts/Dpkg/Source/Package/V2.pm:287
 #, perl-format
 msgid "can't read %s"
 msgstr "kan inte läsa %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:305
+#: scripts/Dpkg/Source/Package/V2.pm:306
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -2822,38 +2831,40 @@ msgstr ""
 "lägg till %s i debian/source/include-binaries om du vill spara den "
 "modifierade binären i debian-tarbollen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:319
-#, fuzzy, perl-format
+#: scripts/Dpkg/Source/Package/V2.pm:320
+#, perl-format
 msgid "unwanted binary file: %s"
-msgstr "duplicerat binärfält i %s"
+msgstr "oönskad binärfil: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
 msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
+"upptäckte %d oönskad(e) binärfil(er) (lägg till dem i debian/source/include-"
+"binaries för att tillåta att de tas med)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:338
+#: scripts/Dpkg/Source/Package/V2.pm:339
 msgid "unrepresentable changes to source"
 msgstr "ändring i källkod kan inte representeras"
 
-#: scripts/Dpkg/Source/Package/V2.pm:344 scripts/Dpkg/Source/Package/V2.pm:348
+#: scripts/Dpkg/Source/Package/V2.pm:345 scripts/Dpkg/Source/Package/V2.pm:349
 #, perl-format
 msgid "cannot remove %s"
 msgstr "kan inte ta bort %s"
 
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "kan inte byta namn på %s till %s"
+msgid "local changes stored in %s, the modified files are:"
+msgstr "lokala ändringar sparade i %s, de ändrade filerna är:"
 
-#: scripts/Dpkg/Source/Package/V2.pm:364
+#: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
-msgid "can't write %s"
-msgstr "kan inte skriva %s"
+msgid "cannot rename %s to %s"
+msgstr "kan inte byta namn på %s till %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:368
+#: scripts/Dpkg/Source/Package/V2.pm:374
 #, perl-format
 msgid "adding %s to %s"
 msgstr "lägger %s till %s"
@@ -2998,7 +3009,7 @@ msgstr "kunde inte lägga till till %s"
 msgid "The following setting(s) were disabled by dpkg-source"
 msgstr "följande inställning(ar) slogs av av dpkg-source"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:85
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:87
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3007,13 +3018,12 @@ msgstr ""
 "series-filen (%s) innehåller flaggor som inte stöds (\"%s\", rad %s), dpkg-"
 "source kanske kommer att misslyckas med att tillämpa patchar."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:114
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "kan inte skapa den symboliska länken %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:199
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "tillämpar %s med quilt"
@@ -3058,6 +3068,12 @@ msgstr "källkodspaketet har två emotsägande värden - %s och %s"
 msgid "version number contains illegal character `%s'"
 msgstr "versionsnummer innehåller ogiltigt tecken \"%s\""
 
+#~ msgid "diff `%s' patches file with no subdirectory"
+#~ msgstr "diffen \"%s\" patchar fil utan underkatalog"
+
+#~ msgid "diff `%s' is missing trailing newline"
+#~ msgstr "diffen \"%s\" saknar avslutande nyradstecken"
+
 #~ msgid ""
 #~ "\n"
 #~ "Copyright (C) 1996 Ian Jackson and Klee Dienes."

scripts/update-alternatives.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/perl --
 
+BEGIN { # Work-around for bug #479711 in perl
+    $ENV{PERL_DL_NONLAZY} = 1;
+}
+
 use strict;
 use warnings;
 

src/main.c

@@ -337,6 +337,7 @@ static void setforce(const struct cmdinfo *cip, const char *value) {
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's file\n"