From a79b29f32141b17cf8f923e1f2bc377749c555d8 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 20 Sep 2023 10:25:32 +0200 Subject: Release 2.7.6 Translation template reordering carnage :D --- CMakeLists.txt | 2 +- debian/changelog | 10 ++++++++++ doc/apt-verbatim.ent | 2 +- doc/apt.conf.5.xml | 2 +- doc/po/apt-doc.pot | 4 ++-- po/apt-all.pot | 22 ++++++++++++---------- po/ar.po | 24 +++++++++++++----------- po/ast.po | 24 +++++++++++++----------- po/bg.po | 24 +++++++++++++----------- po/bs.po | 20 +++++++++++--------- po/ca.po | 26 ++++++++++++++------------ po/cs.po | 26 ++++++++++++++------------ po/cy.po | 24 +++++++++++++----------- po/da.po | 26 ++++++++++++++------------ po/de.po | 26 ++++++++++++++------------ po/dz.po | 24 +++++++++++++----------- po/el.po | 26 ++++++++++++++------------ po/es.po | 26 ++++++++++++++------------ po/eu.po | 24 +++++++++++++----------- po/fi.po | 24 +++++++++++++----------- po/fr.po | 26 ++++++++++++++------------ po/gl.po | 24 +++++++++++++----------- po/hu.po | 26 ++++++++++++++------------ po/it.po | 26 ++++++++++++++------------ po/ja.po | 26 ++++++++++++++------------ po/km.po | 24 +++++++++++++----------- po/ko.po | 24 +++++++++++++----------- po/ku.po | 20 +++++++++++--------- po/lt.po | 24 +++++++++++++----------- po/mr.po | 24 +++++++++++++----------- po/nb.po | 26 ++++++++++++++------------ po/ne.po | 24 +++++++++++++----------- po/nl.po | 26 ++++++++++++++------------ po/nn.po | 24 +++++++++++++----------- po/pl.po | 24 +++++++++++++----------- po/pt.po | 24 +++++++++++++----------- po/pt_BR.po | 24 +++++++++++++----------- po/ro.po | 26 ++++++++++++++------------ po/ru.po | 26 ++++++++++++++------------ po/sk.po | 24 +++++++++++++----------- po/sl.po | 24 +++++++++++++----------- po/sv.po | 24 +++++++++++++----------- po/th.po | 24 +++++++++++++----------- po/tl.po | 24 +++++++++++++----------- po/tr.po | 26 ++++++++++++++------------ po/uk.po | 24 +++++++++++++----------- po/vi.po | 24 +++++++++++++----------- po/zh_CN.po | 26 ++++++++++++++------------ po/zh_TW.po | 24 +++++++++++++----------- 49 files changed, 598 insertions(+), 500 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 188db292d..62182cddf 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.5") +set(PACKAGE_VERSION "2.7.6") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index aa566d9f3..7c85d0cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (2.7.6) unstable; urgency=medium + + [ Américo Monteiro ] + * Portuguese manpages translation update (Closes: #1051731) + + [ Julian Andres Klode ] + * Downgrade unmerged-usr from error to two warnings (Closes: #1052058) + + -- Julian Andres Klode Wed, 20 Sep 2023 10:25:26 +0200 + apt (2.7.5) unstable; urgency=medium * doc/po/nl.po: Fix spurious translation of docbook tag diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 0d3c257e6..ee1d1d9c6 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 7e7d64f8d..e815a58a1 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; - 2016-01-03T00:00:00Z + 2016-01-02T00:00:00Z diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 583ae32e5..261dd6525 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.4\n" +"Project-Id-Version: apt-doc 2.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\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 bb5b1b124..8049744d0 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.7.4\n" +"Project-Id-Version: apt 2.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1748,26 +1748,28 @@ msgstr "" #: apt-private/private-install.cc msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." msgstr "" +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) #: apt-private/private-install.cc -msgid "Internal error, InstallPackages was called with broken packages!" +#, c-format +msgid "See %s for more details." msgstr "" #: apt-private/private-install.cc -msgid "Packages need to be removed but remove is disabled." +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" msgstr "" #: apt-private/private-install.cc -msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgid "Internal error, InstallPackages was called with broken packages!" 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." +msgid "Packages need to be removed but remove is disabled." msgstr "" #: apt-private/private-install.cc diff --git a/po/ar.po b/po/ar.po index 4851c8ca0..845ea9edd 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -1774,6 +1774,18 @@ msgstr "قد تساعد المعلومات التالية في حل المشكل msgid "Broken packages" msgstr "حزم معطوبة" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1790,16 +1802,6 @@ 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 b0e0cd0e5..90afbd6c8 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -1835,6 +1835,18 @@ msgstr "La siguiente información pue aidar a resolver la situación:" msgid "Broken packages" msgstr "Paquetes frañaos" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1851,16 +1863,6 @@ 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 cfa20eed1..4e4a756a2 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -1877,6 +1877,18 @@ msgstr "" msgid "Broken packages" msgstr "Счупени пакети" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1893,16 +1905,6 @@ 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 4bcd2bdf9..cfafb3176 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -1767,26 +1767,28 @@ msgstr "Oštećeni paketi" #: apt-private/private-install.cc msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." msgstr "" +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) #: apt-private/private-install.cc -msgid "Internal error, InstallPackages was called with broken packages!" +#, c-format +msgid "See %s for more details." msgstr "" #: apt-private/private-install.cc -msgid "Packages need to be removed but remove is disabled." +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" msgstr "" #: apt-private/private-install.cc -msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgid "Internal error, InstallPackages was called with broken packages!" 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." +msgid "Packages need to be removed but remove is disabled." msgstr "" #: apt-private/private-install.cc diff --git a/po/ca.po b/po/ca.po index 3fd190c6e..e3046c1f2 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2020-08-09 22:43+0200\n" "Last-Translator: Aleix Vidal i Gaya \n" "Language-Team: Catalan \n" @@ -1916,6 +1916,19 @@ msgstr "La informació següent pot ajudar-vos a resoldre la situació:" msgid "Broken packages" msgstr "Paquets trencats" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1935,17 +1948,6 @@ 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 c8b66d1a1..13ac74979 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2023-02-10 12:58+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -1850,6 +1850,19 @@ msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" msgid "Broken packages" msgstr "Poškozené balíky" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1866,17 +1879,6 @@ 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 bde6d58e5..0578c3d51 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -1832,6 +1832,18 @@ msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" msgid "Broken packages" msgstr "Pecynnau wedi torri" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1849,16 +1861,6 @@ 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 629d67e5b..8c6aeb8b4 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2017-03-02 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -1879,6 +1879,19 @@ msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" msgid "Broken packages" msgstr "Ødelagte pakker" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1895,17 +1908,6 @@ 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/de.po b/po/de.po index 539bf78f4..6f52b91aa 100644 --- a/po/de.po +++ b/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.7.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-09-16 12:57+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2023-07-17 19:13+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -1947,6 +1947,19 @@ msgstr "" msgid "Broken packages" msgstr "Beschädigte Pakete" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 zum Entfernen vorgewählt.\n" + #: apt-private/private-install.cc msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1963,17 +1976,6 @@ msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: 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 zum Entfernen vorgewählt.\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 1fd565840..9d7093797 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -1803,6 +1803,18 @@ msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུ msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1821,16 +1833,6 @@ 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 d588e7245..1fd6c15db 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2020-12-30 12:20+0200\n" "Last-Translator: Vangelis Skarmoutsos \n" "Language-Team: Greek \n" @@ -1825,6 +1825,19 @@ msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσου msgid "Broken packages" msgstr "Χαλασμένα πακέτα" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1842,17 +1855,6 @@ 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 428e47dd6..d5fcb576f 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" @@ -1985,6 +1985,19 @@ msgstr "La siguiente información puede ayudar a resolver la situación:" msgid "Broken packages" msgstr "Paquetes rotos" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -2003,17 +2016,6 @@ 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 3b62bce7c..31e78b7cb 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -1801,6 +1801,18 @@ msgstr "Informazio honek arazoa konpontzen lagun dezake:" msgid "Broken packages" msgstr "Hautsitako paketeak" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1817,16 +1829,6 @@ 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 c6ad19b7e..bb8dd0ccf 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -1796,6 +1796,18 @@ msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" msgid "Broken packages" msgstr "Rikkinäiset paketit" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1812,16 +1824,6 @@ 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 9388ebc47..9c047dbdf 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2019-01-21 09:19+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -1953,6 +1953,19 @@ msgstr "L'information suivante devrait vous aider à résoudre la situation : " msgid "Broken packages" msgstr "Paquets défectueux" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1970,17 +1983,6 @@ 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 6ab514101..42417c9b6 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -1861,6 +1861,18 @@ msgstr "A seguinte información pode axudar a solucionar a situación:" msgid "Broken packages" msgstr "Paquetes estragados" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1879,16 +1891,6 @@ 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 8acceba68..df9b91add 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -1907,6 +1907,19 @@ msgstr "Az alábbi információk segíthetnek megoldani a problémát:" msgid "Broken packages" msgstr "Törött csomagok" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1923,17 +1936,6 @@ 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 a367369d3..ab75fac38 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2019-03-04 11:05+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -1931,6 +1931,19 @@ msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:" msgid "Broken packages" msgstr "Pacchetti danneggiati" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1950,17 +1963,6 @@ 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 398ef4978..86b43629c 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2022-08-14 14:30+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" @@ -1902,6 +1902,19 @@ msgstr "以下の情報がこの問題を解決するために役立つかもし msgid "Broken packages" msgstr "壊れたパッケージ" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1918,17 +1931,6 @@ 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 b330f63db..90489ebc4 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -1798,6 +1798,18 @@ msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1814,16 +1826,6 @@ 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 f1db88fc2..38da3f19a 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -1813,6 +1813,18 @@ msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있 msgid "Broken packages" msgstr "망가진 패키지" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1829,16 +1841,6 @@ 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 b79b2e174..1a6a5a9c7 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -1762,26 +1762,28 @@ msgstr "Paketên şikestî" #: apt-private/private-install.cc msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." msgstr "" +#. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes) #: apt-private/private-install.cc -msgid "Internal error, InstallPackages was called with broken packages!" +#, c-format +msgid "See %s for more details." msgstr "" #: apt-private/private-install.cc -msgid "Packages need to be removed but remove is disabled." +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" msgstr "" #: apt-private/private-install.cc -msgid "Unmerged usr is no longer supported, install usrmerge to continue." +msgid "Internal error, InstallPackages was called with broken packages!" 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." +msgid "Packages need to be removed but remove is disabled." msgstr "" #: apt-private/private-install.cc diff --git a/po/lt.po b/po/lt.po index b50713b2e..2976e86db 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -1786,6 +1786,18 @@ msgstr "Ši informacija gali padėti išspręsti šią situaciją:" msgid "Broken packages" msgstr "Sugadinti paketai" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1802,16 +1814,6 @@ 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 24d7eff32..f3c9ac7c8 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -1799,6 +1799,18 @@ msgstr "खालील माहिती परिस्थिती निव msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1815,16 +1827,6 @@ 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 a6c2a3a34..27a77ab6e 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2018-10-30 20:53+0100\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -1848,6 +1848,19 @@ msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" msgid "Broken packages" msgstr "Ødelagte pakker" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1864,17 +1877,6 @@ 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 9afffdf81..f1dcc67d3 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -1795,6 +1795,18 @@ msgstr "निम्न सूचनाले अवस्थालाई हल msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1811,16 +1823,6 @@ 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 1e6b3daaf..cd1b9762b 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2023-08-18 20:38+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -1928,6 +1928,19 @@ msgstr "De volgende informatie kan misschien helpen de situatie op te lossen:" msgid "Broken packages" msgstr "Niet-werkende pakketten" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1944,17 +1957,6 @@ 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 f49ef2db1..64f0c91b8 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -1803,6 +1803,18 @@ msgstr "F msgid "Broken packages" msgstr "ydelagde pakkar" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1819,16 +1831,6 @@ 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 4a30d811c..1742000f1 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -1875,6 +1875,18 @@ msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" msgid "Broken packages" msgstr "Pakiety są uszkodzone" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1891,16 +1903,6 @@ 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 129b6911f..e7f946d36 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -1878,6 +1878,18 @@ msgstr "A seguinte informação pode ajudar a resolver a situação:" msgid "Broken packages" msgstr "Pacotes estragados" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1894,16 +1906,6 @@ 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 1b586f627..ea8ee1f52 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2023-07-13 19:58+0200\n" "Last-Translator: Remus-Gabriel Chelu \n" "Language-Team: Romanian \n" @@ -1977,6 +1977,19 @@ msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației msgid "Broken packages" msgstr "Pachete deteriorate" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1997,17 +2010,6 @@ 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 bf7c15d4f..e5fd3557c 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2021-02-22 20:02+0300\n" "Last-Translator: Алексей Шилин \n" "Language-Team: русский \n" @@ -1916,6 +1916,19 @@ msgstr "Следующая информация, возможно, вам пом msgid "Broken packages" msgstr "Сломанные пакеты" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1933,17 +1946,6 @@ 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 e6ecc0b8d..5b61e0c59 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -1840,6 +1840,18 @@ msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu: msgid "Broken packages" msgstr "Poškodené balíky" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1856,16 +1868,6 @@ 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 cce7f8a68..5cddc9512 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -1840,6 +1840,18 @@ msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:" msgid "Broken packages" msgstr "Pokvarjeni paketi" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1856,16 +1868,6 @@ 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 2f6bcdc1e..9424d5727 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -1864,6 +1864,18 @@ msgstr "Följande information kan vara till hjälp för att lösa situationen:" msgid "Broken packages" msgstr "Trasiga paket" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1880,16 +1892,6 @@ 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 7c223e649..abdc11226 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -1810,6 +1810,18 @@ msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ msgid "Broken packages" msgstr "แพกเกจมีปัญหา" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1826,16 +1838,6 @@ 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 7fa52dd3d..bb15dcb36 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -1818,6 +1818,18 @@ msgstr "" msgid "Broken packages" msgstr "Sirang mga pakete" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1836,16 +1848,6 @@ 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 ef57fb1a9..e730e7942 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2023-04-19 15:15+0300\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish \n" @@ -1891,6 +1891,19 @@ msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:" msgid "Broken packages" msgstr "Bozuk paketler" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1909,17 +1922,6 @@ 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 bc724bff6..78d1aad9c 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -1874,6 +1874,18 @@ msgstr "Наступна інформація можливо допоможе В msgid "Broken packages" msgstr "Зламані пакунки" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1892,16 +1904,6 @@ 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 322669901..9ffc210b5 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -1857,6 +1857,18 @@ msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tì msgid "Broken packages" msgstr "Gói bị hỏng" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1875,16 +1887,6 @@ 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 891897dc1..7872321ac 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2022-10-05 17:20-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" @@ -1806,6 +1806,19 @@ msgstr "下列信息可能会对解决问题有所帮助：" msgid "Broken packages" msgstr "破损的软件包" +#: apt-private/private-install.cc +msgid "" +"Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr " +"system." +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 "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" @@ -1822,17 +1835,6 @@ 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 e8a472bd2..46b8f768e 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-09-16 13:02+0200\n" +"POT-Creation-Date: 2023-09-20 08:27+0000\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5]