From af20dacc043b23b749e39fad76bf0a5679d24179 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 16 Sep 2023 13:02:14 +0200 Subject: Release 2.7.4 --- CMakeLists.txt | 2 +- debian/changelog | 22 ++++++++++++++++++++++ doc/apt-verbatim.ent | 2 +- doc/apt.conf.5.xml | 2 +- doc/po/apt-doc.pot | 4 ++-- po/apt-all.pot | 14 ++++++++++++-- po/ar.po | 12 +++++++++++- po/ast.po | 12 +++++++++++- po/bg.po | 12 +++++++++++- po/bs.po | 12 +++++++++++- po/ca.po | 13 ++++++++++++- po/cs.po | 13 ++++++++++++- po/cy.po | 12 +++++++++++- po/da.po | 13 ++++++++++++- po/dz.po | 12 +++++++++++- po/el.po | 13 ++++++++++++- po/es.po | 13 ++++++++++++- po/eu.po | 12 +++++++++++- po/fi.po | 12 +++++++++++- po/fr.po | 13 ++++++++++++- po/gl.po | 12 +++++++++++- po/hu.po | 13 ++++++++++++- po/it.po | 13 ++++++++++++- po/ja.po | 13 ++++++++++++- po/km.po | 12 +++++++++++- po/ko.po | 12 +++++++++++- po/ku.po | 12 +++++++++++- po/lt.po | 12 +++++++++++- po/mr.po | 12 +++++++++++- po/nb.po | 13 ++++++++++++- po/ne.po | 12 +++++++++++- po/nl.po | 13 ++++++++++++- po/nn.po | 12 +++++++++++- po/pl.po | 12 +++++++++++- po/pt.po | 12 +++++++++++- po/pt_BR.po | 12 +++++++++++- po/ro.po | 13 ++++++++++++- po/ru.po | 13 ++++++++++++- po/sk.po | 12 +++++++++++- po/sl.po | 12 +++++++++++- po/sv.po | 12 +++++++++++- po/th.po | 12 +++++++++++- po/tl.po | 12 +++++++++++- po/tr.po | 13 ++++++++++++- po/uk.po | 12 +++++++++++- po/vi.po | 12 +++++++++++- po/zh_CN.po | 13 ++++++++++++- po/zh_TW.po | 12 +++++++++++- 48 files changed, 516 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7de549936..c63aad94a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "2.7.3") +set(PACKAGE_VERSION "2.7.4") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 951c97790..5c2affe68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +apt (2.7.4) unstable; urgency=medium + + [ Julian Andres Klode ] + * CI: Do not require UID 1000 for our test user. + * methods: store: Use APT_BUFFER_SIZE (64k) instead of 4k buffers + * Only accept installs of usrmerge on unmerged-usr systems. + As of bookworm, merged-usr is mandatory, and people got caught + in the crosshairs of the dpkg fsys-unmessusr debacle and inadvertently + reverted back to an unmerged configuration and continue to remain + on an unsupported system unknowingly. + * Drop alternatives to the gpgv dependency (Closes: #1051642) + * Remove unnecessary explicit st_dev check for merged-usr + + [ Frans Spiesschaert ] + * Dutch translation update (Closes: #1051720) + * Dutch documentation translation update (Closes: #1051723) + + [ Helge Kreutzmann ] + * updated German translation (Closes: #1049427) + + -- Julian Andres Klode Sat, 16 Sep 2023 13:01:48 +0200 + apt (2.7.3) unstable; urgency=medium [ Tianon Gravi ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 114bc6157..1ccb771fe 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -274,7 +274,7 @@ "> - + diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e815a58a1..7e7d64f8d 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; - 2016-01-02T00:00:00Z + 2016-01-03T00:00:00Z diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 2948f193c..583ae32e5 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 2.7.3\n" +"Project-Id-Version: apt-doc 2.7.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-08-02 12:37+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/apt-all.pot b/po/apt-all.pot index bcb6f03c6..bb5b1b124 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.7.3\n" +"Project-Id-Version: apt 2.7.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-08-02 12:37+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1760,6 +1760,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/ar.po b/po/ar.po index 1ca4fbab0..4851c8ca0 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -1790,6 +1790,16 @@ msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم م msgid "Packages need to be removed but remove is disabled." msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/ast.po b/po/ast.po index 3914b28f3..b0e0cd0e5 100644 --- a/po/ast.po +++ b/po/ast.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -1851,6 +1851,16 @@ msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!" msgid "Packages need to be removed but remove is disabled." msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/bg.po b/po/bg.po index 7355755f2..cfa20eed1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -1893,6 +1893,16 @@ msgstr "Вътрешна грешка, „InstallPackages“ е предизви msgid "Packages need to be removed but remove is disabled." msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/bs.po b/po/bs.po index 0ca493660..4bcd2bdf9 100644 --- a/po/bs.po +++ b/po/bs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -1779,6 +1779,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/ca.po b/po/ca.po index 332ac5069..3fd190c6e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2020-08-09 22:43+0200\n" "Last-Translator: Aleix Vidal i Gaya \n" "Language-Team: Catalan \n" @@ -1935,6 +1935,17 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Hi ha paquets que s'han de suprimir però s'ha inhabilitat la supressió." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Seleccionat %s per eliminar.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/cs.po b/po/cs.po index 7bb2a8309..c8b66d1a1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.5.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2023-02-10 12:58+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -1866,6 +1866,17 @@ msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "%s byl vybrán pro odstranění.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/cy.po b/po/cy.po index 93f44f168..bde6d58e5 100644 --- a/po/cy.po +++ b/po/cy.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -1849,6 +1849,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/da.po b/po/da.po index 1aa0ee3ed..629d67e5b 100644 --- a/po/da.po +++ b/po/da.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2017-03-02 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -1895,6 +1895,17 @@ msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Valgte %s for fjernelse.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/dz.po b/po/dz.po index 5a84826de..1fd565840 100644 --- a/po/dz.po +++ b/po/dz.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -1821,6 +1821,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/el.po b/po/el.po index fa93d6896..d588e7245 100644 --- a/po/el.po +++ b/po/el.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2020-12-30 12:20+0200\n" "Last-Translator: Vangelis Skarmoutsos \n" "Language-Team: Greek \n" @@ -1842,6 +1842,17 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Επιλέχθηκαν %s για αφαίρεση.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/es.po b/po/es.po index 5b1593ac8..428e47dd6 100644 --- a/po/es.po +++ b/po/es.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" @@ -2003,6 +2003,17 @@ msgstr "" "Se necesita eliminar paquetes, pero está desactivada la posibilidad de " "eliminar." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Seleccionado %s para eliminar.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/eu.po b/po/eu.po index 3c0fe1629..3b62bce7c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -1817,6 +1817,16 @@ msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/fi.po b/po/fi.po index fb71c864c..c6ad19b7e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -1812,6 +1812,16 @@ msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/fr.po b/po/fr.po index 8de1c51f3..9388ebc47 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2019-01-21 09:19+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -1970,6 +1970,17 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Les paquets doivent être enlevés, mais la désinstallation est désactivée." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Sélection de %s pour suppression.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/gl.po b/po/gl.po index b6f40d81f..6ab514101 100644 --- a/po/gl.po +++ b/po/gl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -1879,6 +1879,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "Hai que retirar paquetes mais o retirado está desactivado." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/hu.po b/po/hu.po index 34b02afbd..8acceba68 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -1923,6 +1923,17 @@ msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "%s kijelölve eltávolításra.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/it.po b/po/it.po index c0ec8c27a..a367369d3 100644 --- a/po/it.po +++ b/po/it.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2019-03-04 11:05+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -1950,6 +1950,17 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Selezionato %s per la rimozione.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/ja.po b/po/ja.po index 42343fc0a..398ef4978 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2022-08-14 14:30+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" @@ -1918,6 +1918,17 @@ msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び msgid "Packages need to be removed but remove is disabled." msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "%s は削除で選択されました。\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/km.po b/po/km.po index 09043a4fd..b330f63db 100644 --- a/po/km.po +++ b/po/km.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -1814,6 +1814,16 @@ msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំ msgid "Packages need to be removed but remove is disabled." msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/ko.po b/po/ko.po index 1c48c9174..f1db88fc2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -1829,6 +1829,16 @@ msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습 msgid "Packages need to be removed but remove is disabled." msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/ku.po b/po/ku.po index 2cb0c024a..b79b2e174 100644 --- a/po/ku.po +++ b/po/ku.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -1774,6 +1774,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/lt.po b/po/lt.po index 9ca133ba0..b50713b2e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -1802,6 +1802,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/mr.po b/po/mr.po index d1c0e32bd..24d7eff32 100644 --- a/po/mr.po +++ b/po/mr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -1815,6 +1815,16 @@ msgstr "अंतर्गत त्रुटी, तुटलेल्या msgid "Packages need to be removed but remove is disabled." msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/nb.po b/po/nb.po index b2281a166..a6c2a3a34 100644 --- a/po/nb.po +++ b/po/nb.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2018-10-30 20:53+0100\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -1864,6 +1864,17 @@ msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Valgte %s for fjerning.\n" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/ne.po b/po/ne.po index 964e8eabe..9afffdf81 100644 --- a/po/ne.po +++ b/po/ne.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -1811,6 +1811,16 @@ msgstr "आन्तरिक त्रुटि, स्थापना प् msgid "Packages need to be removed but remove is disabled." msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/nl.po b/po/nl.po index a1bc0d07b..1e6b3daaf 100644 --- a/po/nl.po +++ b/po/nl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2023-08-18 20:38+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -1944,6 +1944,17 @@ msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!" msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Selecteerde %s om verwijderd te worden.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/nn.po b/po/nn.po index 6946675b1..f49ef2db1 100644 --- a/po/nn.po +++ b/po/nn.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -1819,6 +1819,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/pl.po b/po/pl.po index f09ce3e8a..4a30d811c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -1891,6 +1891,16 @@ msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!" msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/pt.po b/po/pt.po index a93f7fd64..129b6911f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -1894,6 +1894,16 @@ msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index fcef1be90..1b586f627 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2023-07-13 19:58+0200\n" "Last-Translator: Remus-Gabriel Chelu \n" "Language-Team: Romanian \n" @@ -1997,6 +1997,17 @@ msgstr "" "Pachetele trebuie să fie eliminate, dar opțiunea de eliminare este " "dezactivată." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "%s a fost selectat pentru eliminare\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/ru.po b/po/ru.po index 69e71518b..bf7c15d4f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.2.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2021-02-22 20:02+0300\n" "Last-Translator: Алексей Шилин \n" "Language-Team: русский \n" @@ -1933,6 +1933,17 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "Выбран %s для удаления.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/sk.po b/po/sk.po index 05fce6081..e6ecc0b8d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -1856,6 +1856,16 @@ msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi! msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/sl.po b/po/sl.po index a3bf913ec..cce7f8a68 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -1856,6 +1856,16 @@ msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/sv.po b/po/sv.po index 932289c7d..2f6bcdc1e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -1880,6 +1880,16 @@ msgstr "Internt fel. InstallPackages anropades med trasiga paket!" msgid "Packages need to be removed but remove is disabled." msgstr "Paketen måste tas bort men ”Remove” är inaktiverat." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/th.po b/po/th.po index 9817f3a59..7c223e649 100644 --- a/po/th.po +++ b/po/th.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -1826,6 +1826,16 @@ msgstr "เกิดข้อผิดพลาดภายใน: มีกา msgid "Packages need to be removed but remove is disabled." msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/tl.po b/po/tl.po index 5063852bf..7fa52dd3d 100644 --- a/po/tl.po +++ b/po/tl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -1836,6 +1836,16 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/tr.po b/po/tr.po index 57442f077..ef57fb1a9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.6.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2023-04-19 15:15+0300\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish \n" @@ -1909,6 +1909,17 @@ msgstr "" "Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı " "bırakılmış." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "%s paketi kaldırma için seçildi.\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/uk.po b/po/uk.po index af5d65659..bc724bff6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -1892,6 +1892,16 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "Необхідно видалити пакунки, але видалення заборонене." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/vi.po b/po/vi.po index aa56a107c..322669901 100644 --- a/po/vi.po +++ b/po/vi.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -1875,6 +1875,16 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt." +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, c-format +msgid "See %s for more details." +msgstr "" + #: apt-private/private-install.cc #, fuzzy msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index d9b9e42e7..891897dc1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.5.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2022-10-05 17:20-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" @@ -1822,6 +1822,17 @@ msgstr "内部错误，InstallPackages 被用在了损坏的软件包上！" msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载被设置为禁止。" +#: apt-private/private-install.cc +msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgstr "" + +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) +#: apt-private/private-install.cc +#, fuzzy, c-format +#| msgid "Selected %s for removal.\n" +msgid "See %s for more details." +msgstr "选中 %s 以待卸载。\n" + #: apt-private/private-install.cc msgid "" "Essential packages were removed and -y was used without --allow-remove-" diff --git a/po/zh_TW.po b/po/zh_TW.po index 46bce6c0c..e8a472bd2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.2.X\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-07-12 15:26+0000\n" +"POT-Creation-Date: 2023-09-16 13:02+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5]