From b4f7d8b1566e3220d0e9004499ef9c257e079c57 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 7 Aug 2024 15:30:11 +0200 Subject: Merging upstream version 1.22.7. Signed-off-by: Daniel Baumann --- scripts/po/Makefile.in.in | 24 ++- scripts/po/POTFILES.in | 14 +- scripts/po/ca.gmo | Bin 121651 -> 118502 bytes scripts/po/ca.po | 473 ++++++++++++++++++++++++++++++------------ scripts/po/de.gmo | Bin 121226 -> 121524 bytes scripts/po/de.po | 467 ++++++++++++++++++++++++++++++------------ scripts/po/dpkg-dev.pot | 371 ++++++++++++++++++++++++--------- scripts/po/es.gmo | Bin 53962 -> 53574 bytes scripts/po/es.po | 453 +++++++++++++++++++++++++++++------------ scripts/po/fr.gmo | Bin 113434 -> 110270 bytes scripts/po/fr.po | 493 +++++++++++++++++++++++++++++++------------- scripts/po/nl.gmo | Bin 106650 -> 103509 bytes scripts/po/nl.po | 465 +++++++++++++++++++++++++++++++----------- scripts/po/pl.gmo | Bin 56253 -> 55896 bytes scripts/po/pl.po | 459 +++++++++++++++++++++++++++++------------ scripts/po/pt.gmo | Bin 106808 -> 103740 bytes scripts/po/pt.po | 465 +++++++++++++++++++++++++++++++----------- scripts/po/ru.gmo | Bin 74118 -> 73657 bytes scripts/po/ru.po | 453 +++++++++++++++++++++++++++++------------ scripts/po/sv.gmo | Bin 115257 -> 113149 bytes scripts/po/sv.po | 508 +++++++++++++++++++++++++++++++++------------- 21 files changed, 3363 insertions(+), 1282 deletions(-) (limited to 'scripts/po') diff --git a/scripts/po/Makefile.in.in b/scripts/po/Makefile.in.in index 6b25f0d..2b36b11 100644 --- a/scripts/po/Makefile.in.in +++ b/scripts/po/Makefile.in.in @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2023 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.21 +# Origin: gettext-0.22 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -248,15 +248,17 @@ $(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -464,15 +466,17 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 125792b..b5fe9c3 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -21,7 +21,11 @@ scripts/dpkg-source.pl scripts/dpkg-vendor.pl scripts/Dpkg.pm scripts/Dpkg/Arch.pm +scripts/Dpkg/Archive/Ar.pm +scripts/Dpkg/Build/Info.pm scripts/Dpkg/BuildAPI.pm +scripts/Dpkg/BuildDriver.pm +scripts/Dpkg/BuildDriver/DebianRules.pm scripts/Dpkg/BuildEnv.pm scripts/Dpkg/BuildFlags.pm scripts/Dpkg/BuildInfo.pm @@ -29,7 +33,6 @@ scripts/Dpkg/BuildOptions.pm scripts/Dpkg/BuildProfiles.pm scripts/Dpkg/BuildTree.pm scripts/Dpkg/BuildTypes.pm -scripts/Dpkg/Build/Info.pm scripts/Dpkg/Changelog.pm scripts/Dpkg/Changelog/Debian.pm scripts/Dpkg/Changelog/Entry.pm @@ -69,7 +72,12 @@ scripts/Dpkg/Index.pm scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Lock.pm scripts/Dpkg/OpenPGP.pm +scripts/Dpkg/OpenPGP/Backend.pm +scripts/Dpkg/OpenPGP/Backend/GnuPG.pm +scripts/Dpkg/OpenPGP/Backend/SOP.pm +scripts/Dpkg/OpenPGP/Backend/Sequoia.pm scripts/Dpkg/OpenPGP/ErrorCodes.pm +scripts/Dpkg/OpenPGP/KeyHandle.pm scripts/Dpkg/Package.pm scripts/Dpkg/Path.pm scripts/Dpkg/Shlibs.pm @@ -79,8 +87,9 @@ scripts/Dpkg/Shlibs/Objdump/Object.pm scripts/Dpkg/Shlibs/Symbol.pm scripts/Dpkg/Shlibs/SymbolFile.pm scripts/Dpkg/Source/Archive.pm -scripts/Dpkg/Source/Functions.pm scripts/Dpkg/Source/BinaryFiles.pm +scripts/Dpkg/Source/Format.pm +scripts/Dpkg/Source/Functions.pm scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V1.pm scripts/Dpkg/Source/Package/V2.pm @@ -95,5 +104,6 @@ scripts/Dpkg/Substvars.pm scripts/Dpkg/Vendor.pm scripts/Dpkg/Vendor/Debian.pm scripts/Dpkg/Vendor/Default.pm +scripts/Dpkg/Vendor/Devuan.pm scripts/Dpkg/Vendor/Ubuntu.pm scripts/Dpkg/Version.pm diff --git a/scripts/po/ca.gmo b/scripts/po/ca.gmo index 5a91b73..914a2e4 100644 Binary files a/scripts/po/ca.gmo and b/scripts/po/ca.gmo differ diff --git a/scripts/po/ca.po b/scripts/po/ca.po index 6b3ac8d..8a958fd 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.21.18\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-03-10 20:21+0100\n" +"POT-Creation-Date: 2024-07-17 01:10+0200\n" "PO-Revision-Date: 2023-12-17 20:30+0100\n" "Last-Translator: Guillem Jover \n" "Language-Team: Catalan \n" @@ -281,12 +281,11 @@ msgstr "s'ha especificat dos ordres: --%s i --%s" msgid "%s needs a parameter" msgstr "%s requereix un paràmetre" -#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl -#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl -#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [