suggest 'apt autoremove' to get right of unneeded packages

The bugreport is more conservative in asking for a conditional, but
given that this is a message intended to be read by users to be run by
users we should suggest using a command intended to be used by users.

And while we are at, add sudo to the message – conditional of course.

Closes: 801571

apt-private/private-install.cc

@@ -484,7 +484,11 @@ static bool DoAutomaticRemove(CacheFile &Cache)
       else
 	 ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n",
 	          "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount);
-      c1out << P_("Use 'apt-get autoremove' to remove it.", "Use 'apt-get autoremove' to remove them.", autoRemoveCount) << std::endl;
+      std::string autocmd = "apt autoremove";
+      if (getenv("SUDO_USER") != NULL)
+	 autocmd = "sudo " + autocmd;
+      ioprintf(c1out, P_("Use '%s' to remove it.", "Use '%s' to remove them.", autoRemoveCount), autocmd.c_str());
+      c1out << std::endl;
    }
    return true;
 }

po/apt-all.pot

@@ -377,8 +377,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/ar.po

@@ -394,8 +394,8 @@ msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/ast.po

@@ -402,10 +402,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos."
-msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Usa '%s' pa desinstalalos."
+msgstr[1] "Usa '%s' pa desinstalalos."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/bg.po

@@ -413,10 +413,10 @@ msgstr[1] ""
 "%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
-msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Използвайте „%s“ за да го премахнете."
+msgstr[1] "Използвайте „%s“ за да ги премахнете."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/bs.po

@@ -382,8 +382,8 @@ msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/ca.po

@@ -413,10 +413,10 @@ msgstr[1] ""
 "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo."
-msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Empreu «%s» per a suprimir-lo."
+msgstr[1] "Empreu «%s» per a suprimir-los."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/cs.po

@@ -410,11 +410,11 @@ msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n
 msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“."
-msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“."
-msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Pro jeho odstranění použijte „%s“."
+msgstr[1] "Pro jejich odstranění použijte „%s“."
+msgstr[2] "Pro jejich odstranění použijte „%s“."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/cy.po

@@ -401,8 +401,8 @@ msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/da.po

@@ -407,10 +407,10 @@ msgstr[1] ""
 "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Brug »apt-get autoremove« til at fjerne den."
-msgstr[1] "Brug »apt-get autoremove« til at fjerne dem."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Brug »%s« til at fjerne den."
+msgstr[1] "Brug »%s« til at fjerne dem."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/de.po

@@ -415,10 +415,10 @@ msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen."
-msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Verwenden Sie »%s«, um es zu entfernen."
+msgstr[1] "Verwenden Sie »%s«, um sie zu entfernen."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/dz.po

@@ -404,8 +404,8 @@ msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འ
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/el.po

@@ -418,10 +418,10 @@ msgstr[1] ""
 "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε."
-msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Χρησιμοποιήστε '%s' για να το διαγράψετε."
+msgstr[1] "Χρησιμοποιήστε '%s' για να τα διαγράψετε."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/es.po

@@ -466,10 +466,10 @@ msgstr[1] ""
 "Se instalaron %lu paquetes de forma automática y ya no son necesarios.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilice «apt-get autoremove» para eliminarlo."
-msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Utilice «%s» para eliminarlo."
+msgstr[1] "Utilice «%s» para eliminarlos."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/eu.po

@@ -409,10 +409,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "'apt-get autoremove' erabili ezabatzeko."
-msgstr[1] "'apt-get autoremove' erabili ezabatzeko."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "'%s' erabili ezabatzeko."
+msgstr[1] "'%s' erabili ezabatzeko."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/fi.po

@@ -410,10 +410,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Poista ne komennolla \"apt-get autoremove\"."
-msgstr[1] "Poista ne komennolla \"apt-get autoremove\"."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Poista ne komennolla \"%s\"."
+msgstr[1] "Poista ne komennolla \"%s\"."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/fr.po

@@ -425,10 +425,10 @@ msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer."
-msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Veuillez utiliser « %s » pour le supprimer."
+msgstr[1] "Veuillez utiliser « %s » pour les supprimer."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/gl.po

@@ -416,10 +416,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Empregue «apt-get autoremove» para eliminalos."
-msgstr[1] "Empregue «apt-get autoremove» para eliminalos."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Empregue «%s» para eliminalos."
+msgstr[1] "Empregue «%s» para eliminalos."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/he.po

@@ -919,7 +919,7 @@ msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
 #: cmdline/apt-get.cc:1516
-msgid "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove them."
 msgstr ""
 
 #: cmdline/apt-get.cc:1521

po/hu.po

@@ -407,10 +407,10 @@ msgstr[1] ""
 "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti."
-msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Ezt az „%s” paranccsal törölheti."
+msgstr[1] "Ezeket az „%s” paranccsal törölheti."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/it.po

@@ -417,10 +417,10 @@ msgstr[1] ""
 "richiesti.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo."
-msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Usare \"%s\" per rimuoverlo."
+msgstr[1] "Usare \"%s\" per rimuoverli."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/ja.po

@@ -403,9 +403,9 @@ msgstr[0] ""
 "ん:\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "これを削除するには '%s' を利用してください。"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/km.po

@@ -402,8 +402,8 @@ msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹ
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/ko.po

@@ -399,9 +399,9 @@ msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "이들을 지우려면 '%s'를 사용하십시오."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/ku.po

@@ -384,8 +384,8 @@ msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/lt.po

@@ -400,10 +400,10 @@ msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikaling
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
-msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Norėdami juos pašalinti, paleiskite „%s“"
+msgstr[1] "Norėdami juos pašalinti, paleiskite „%s“"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/mr.po

@@ -401,10 +401,10 @@ msgstr[1] "खालील नवीन पॅकेजेस स्वयंच
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
-msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "ती काढून टाकण्यासाठी '%s' वापरा."
+msgstr[1] "ती काढून टाकण्यासाठी '%s' वापरा."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/nb.po

@@ -410,10 +410,10 @@ msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
-msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Bruk «%s» for å fjerne dem."
+msgstr[1] "Bruk «%s» for å fjerne dem."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/ne.po

@@ -398,8 +398,8 @@ msgstr[0] "निम्न नयाँ प्याकेजहरू स्थ
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/nl.po

@@ -413,10 +413,10 @@ msgstr[1] ""
 "%lu pakketten waren automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Gebruik 'apt-get autoremove' om het te verwijderen."
-msgstr[1] "Gebruik 'apt-get autoremove' om ze te verwijderen."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Gebruik '%s' om het te verwijderen."
+msgstr[1] "Gebruik '%s' om ze te verwijderen."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/nn.po

@@ -402,8 +402,8 @@ msgstr[0] "Dei f
 msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/pl.po

@@ -430,11 +430,11 @@ msgstr[2] ""
 "wymagane.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"."
-msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"."
-msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Aby go usunąć należy użyć \"%s\"."
+msgstr[1] "Aby je usunąć należy użyć \"%s\"."
+msgstr[2] "Aby je usunąć należy użyć \"%s\"."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/pt.po

@@ -408,10 +408,10 @@ msgstr[1] ""
 "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilize 'apt-get autoremove' para o remover."
-msgstr[1] "Utilize 'apt-get autoremove' para os remover."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Utilize '%s' para o remover."
+msgstr[1] "Utilize '%s' para os remover."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/pt_BR.po

@@ -410,10 +410,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Use 'apt-get autoremove' para removê-los."
-msgstr[1] "Use 'apt-get autoremove' para removê-los."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Use '%s' para removê-los."
+msgstr[1] "Use '%s' para removê-los."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/ro.po

@@ -413,11 +413,11 @@ msgstr[2] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge."
-msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge."
-msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Folosiți '%s' pentru a le șterge."
+msgstr[1] "Folosiți '%s' pentru a le șterge."
+msgstr[2] "Folosiți '%s' pentru a le șterge."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/ru.po

@@ -425,11 +425,11 @@ msgstr[1] "%lu пакета было установлено автоматиче
 msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Для его удаления используйте «apt-get autoremove»."
-msgstr[1] "Для их удаления используйте «apt-get autoremove»."
-msgstr[2] "Для их удаления используйте «apt-get autoremove»."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Для его удаления используйте «%s»."
+msgstr[1] "Для их удаления используйте «%s»."
+msgstr[2] "Для их удаления используйте «%s»."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/sk.po

@@ -416,11 +416,11 @@ msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“."
-msgstr[1] "Na ich odstránenie použite „apt-get autoremove“."
-msgstr[2] "Na ich odstránenie použite „apt-get autoremove“."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Na jeho odstránenie použite „%s“."
+msgstr[1] "Na ich odstránenie použite „%s“."
+msgstr[2] "Na ich odstránenie použite „%s“."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/sl.po

@@ -419,12 +419,12 @@ msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
 msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
-msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev."
-msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev."
-msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Uporabite '%s' za njihovo odstranitev."
+msgstr[1] "Uporabite '%s' za njegovo odstranitev."
+msgstr[2] "Uporabite '%s' za njuno odstranitev."
+msgstr[3] "Uporabite '%s' za njihovo odstranitev."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/sv.po

@@ -414,10 +414,10 @@ msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Använd ”apt-get autoremove” för att ta bort det."
-msgstr[1] "Använd ”apt-get autoremove” för att ta bort dem."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Använd ”%s” för att ta bort det."
+msgstr[1] "Använd ”%s” för att ta bort dem."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/th.po

@@ -394,9 +394,9 @@ msgid_plural ""
 msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "ใช้ '%s' เพื่อถอดถอนแพกเกจดังกล่าวได้"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/tl.po

@@ -407,8 +407,8 @@ msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

po/tr.po

@@ -420,10 +420,10 @@ msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın."
-msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Bu paketi kaldırmak için '%s' komutunu kullanın."
+msgstr[1] "Bu paketleri kaldırmak için '%s' komutunu kullanın."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/uk.po

@@ -423,11 +423,11 @@ msgstr[2] ""
 "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
-msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх."
-msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Використовуйте '%s' щоб видалити його."
+msgstr[1] "Використовуйте '%s' щоб видалити їх."
+msgstr[2] "Використовуйте '%s' щоб видалити їх."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/vi.po

@@ -406,9 +406,9 @@ msgid_plural ""
 msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Hãy dùng lệnh “%s” để gỡ bỏ chúng."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/zh_CN.po

@@ -393,9 +393,9 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "使用'%s'来卸载它(它们)。"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

po/zh_TW.po

@@ -399,10 +399,10 @@ msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用 'apt-get autoremove' 來將其移除。"
-msgstr[1] "使用 'apt-get autoremove' 來將其移除。"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "使用 '%s' 來將其移除。"
+msgstr[1] "使用 '%s' 來將其移除。"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

test/integration/test-apt-get-autoremove

@@ -19,6 +19,10 @@ testsuccess aptget remove debhelper -y
 testdpkgnotinstalled 'debhelper'
 testdpkginstalled 'po-debconf' 'unrelated'
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+	AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 echo 'APT::NeverAutoRemove { "^debc.*nf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove
 testsuccessequal 'Reading package lists...
 Building dependency tree...
@@ -32,13 +36,13 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   po-debconf
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 testdpkginstalled 'po-debconf'
 
@@ -81,13 +85,13 @@ Building dependency tree...
 Reading state information...
 The following packages were automatically installed and are no longer required:
   debhelper po-debconf
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 2 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 
 testsuccess aptmark hold debhelper

test/integration/test-bug-604222-new-and-autoremove

@@ -11,12 +11,17 @@ touch rootdir/var/lib/apt/extended_states
 testsuccess aptmark markauto 'libvtk5.4'
 testmarkedauto 'libvtk5.4'
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+	AUTOREMOVE="sudo $AUTOREMOVE"
+fi
+
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -27,7 +32,7 @@ testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -39,7 +44,7 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following additional packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:
@@ -54,7 +59,7 @@ testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following additional packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:

test/integration/test-bug-613420-new-garbage-dependency

@@ -11,19 +11,22 @@ insertpackage 'unstable' 'libreoffice-core' 'all' '1:3.3.1~rc1-2' 'Conflicts: op
 insertpackage 'unstable' 'libreoffice-officebean' 'all' '1:3.3.1~rc1-2' 'Depends: libreoffice-core'
 insertpackage 'unstable' 'openoffice.org-officebean' 'all' '1:3.3.0-5' 'Depends: libreoffice-officebean'
 
-
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states
 testsuccess aptmark markauto openoffice.org-officebean
 testmarkedauto openoffice.org-officebean
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+	AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 
 testfailureequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages were automatically installed and are no longer required:
   libreoffice-officebean openoffice.org-officebean
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 The following additional packages will be installed:
   libreoffice-core libreoffice-officebean openoffice.org-officebean
 The following packages will be REMOVED:
@@ -39,7 +42,7 @@ testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 2 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 The following additional packages will be installed:
   libreoffice-core libreoffice-officebean openoffice.org-officebean
 The following packages will be REMOVED:

test/integration/test-external-dependency-solver-protocol

@@ -81,13 +81,17 @@ Remv somestuff [1]
 Remv cool [1]
 Remv stuff [1]' aptget autoremove --solver apt somestuff -s
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+	AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 Execute external solver...
 The following package was automatically installed and is no longer required:
   stuff
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following packages will be REMOVED:
   cool* somestuff*
 0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.

test/integration/test-kernel-helper-autoremove

@@ -53,6 +53,10 @@ testprotected() {
 	testfailure --nomsg grep -e '^\^linux-image-amd64\$$' -e '^\^linux-image-686-pae\$$' -e ':i386' protected.list
 }
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+	AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -63,7 +67,7 @@ The following packages were automatically installed and are no longer required:
    $CURRENTKERNEL (5-1)
    ${CURRENTKERNEL}-686-pae:i386 (5-1)
    ${CURRENTKERNEL}-dbg (5-1)
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -sV
 testsuccessequal "Reading package lists...
 Building dependency tree...
@@ -76,13 +80,13 @@ The following packages were automatically installed and are no longer required:
    ${CURRENTKERNEL}-686-pae:i386 (5-1)
    ${CURRENTKERNEL}-dbg (5-1)
    ${CURRENTKERNEL}-rt (5-1)
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -sV --ignore-hold
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 6 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 testequal "Reading package lists...
 Building dependency tree...