Merge branch 'svequiv2ftparchive' into 'main'

ftparchive/: prepare for APT::StringView -> std::string_view

See merge request apt-team/apt!395

49 files changed, 460 insertions, 456 deletions

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 4994d9f28..1a016b589 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -3,9 +3,9 @@
 /* ######################################################################
 
    Override
-   
+
    Store the override file.
-   
+
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
@@ -31,11 +31,11 @@ bool Override::ReadOverride(string const &File,bool const &Source)
 {
    if (File.empty() == true)
       return true;
-   
+
    FILE *F = fopen(File.c_str(),"r");
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
-   
+
    char Line[1000];
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
@@ -43,7 +43,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
       Counter++;
       Item Itm;
 
-      // Silence 
+      // Silence
       for (char *I = Line; *I != 0; I++)
 	 if (*I == '#')
 	    *I = 0;
@@ -113,10 +113,10 @@ bool Override::ReadOverride(string const &File,bool const &Source)
 	 {
 	    *End = 0;
 	    Itm.OldMaint = _strstrip(Start);
-	    
+
 	    End += 3;
 	    Itm.NewMaint = _strstrip(End);
-	 }	 
+	 }
       }
 
       Mapping[Pkg] = Itm;
@@ -135,18 +135,18 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 {
    if (File.empty() == true)
       return true;
-   
+
    FILE *F = fopen(File.c_str(),"r");
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
-  
+
    char Line[1000];
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
       Counter++;
 
-      // Silence 
+      // Silence
       for (char *I = Line; *I != 0; I++)
 	 if (*I == '#')
 	    *I = 0;
@@ -165,7 +165,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 	 _error->Warning(_("Malformed override %s line %llu #1"),File.c_str(),
 			 Counter);
 	 continue;
-      }      
+      }
       *End = 0;
 
       // Find the field
@@ -179,8 +179,8 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 	 continue;
       }
       *End = 0;
-      
-      // Find the field value 
+
+      // Find the field value
       for (End++; isspace(*End) != 0 && *End != 0; End++);
       char *Value = End;
       for (; *End != 0; End++);
@@ -190,7 +190,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 	 _error->Warning(_("Malformed override %s line %llu #3"),File.c_str(),
 			 Counter);
 	 continue;
-      }      
+      }
       *End = 0;
 
       Mapping[Pkg].FieldOverride[Field] = Value;
@@ -208,10 +208,10 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 /* Returns a override item for the given package and the given architecture.
  * Treats "all" special
  */
-Override::Item* Override::GetItem(string const &Package, string const &Architecture)
+Override::Item* Override::GetItem(std::string_view const &Package, std::string_view const &Architecture)
 {
    map<string,Item>::const_iterator I = Mapping.find(Package);
-   map<string,Item>::iterator J = Mapping.find(Package + "/" + Architecture);
+   map<string,Item>::iterator J = Mapping.find((std::string{Package} += '/') += Architecture);
 
    if (I == Mapping.end() && J == Mapping.end())
    {
@@ -246,17 +246,17 @@ Override::Item* Override::GetItem(string const &Package, string const &Architect
    there is a rule but it does not match then the empty string is returned,
    also if there was no rewrite rule the empty string is returned. Failed
    indicates if there was some kind of problem while rewriting. */
-string Override::Item::SwapMaint(string const &Orig,bool &Failed)
+string Override::Item::SwapMaint(std::string_view const &Orig,bool &Failed)
 {
    Failed = false;
-   
+
    // Degenerate case..
    if (NewMaint.empty() == true)
 	 return OldMaint;
-   
+
    if (OldMaint == "*")
       return NewMaint;
-   
+
    /* James: ancient, eliminate it, however it is still being used in the main
       override file. Thus it persists.*/
 #if 1
@@ -264,13 +264,13 @@ string Override::Item::SwapMaint(string const &Orig,bool &Failed)
    string::const_iterator End = OldMaint.begin();
    while (1)
    {
-      string::const_iterator Start = End;      
+      string::const_iterator Start = End;
       for (; End < OldMaint.end() &&
-	   (End + 3 >= OldMaint.end() || End[0] != ' ' || 
+	   (End + 3 >= OldMaint.end() || End[0] != ' ' ||
 	    End[1] != '/' || End[2] != '/'); ++End);
       if (stringcasecmp(Start,End,Orig.begin(),Orig.end()) == 0)
 	 return NewMaint;
-      
+
       if (End >= OldMaint.end())
 	 break;
 
@@ -279,9 +279,9 @@ string Override::Item::SwapMaint(string const &Orig,bool &Failed)
    }
 #else
    if (stringcasecmp(OldMaint.begin(),OldMaint.end(),Orig.begin(),Orig.end()) == 0)
-      return NewMaint;   
+      return NewMaint;
 #endif
-   
+
    Failed = true;
    return string();
 }
diff --git a/ftparchive/override.h b/ftparchive/override.h
index af62a0498..f57c71df9 100644
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -3,9 +3,9 @@
 /* ######################################################################
 
    Override
-   
+
    Store the override file.
-   
+
    ##################################################################### */
 									/*}}}*/
 #ifndef OVERRIDE_H
@@ -16,11 +16,11 @@
 
 using std::string;
 using std::map;
-    
+
 class Override
 {
    public:
-   
+
    struct Item
    {
       string Priority;
@@ -28,21 +28,21 @@ class Override
       string NewMaint;
 
       map<string,string> FieldOverride;
-      string SwapMaint(string const &Orig,bool &Failed);
+      string SwapMaint(std::string_view const &Orig,bool &Failed);
       ~Item() {};
    };
-   
-   map<string,Item> Mapping;
-   
-   inline Item *GetItem(string const &Package) 
+
+   map<string,Item,std::less<>> Mapping;
+
+   inline Item *GetItem(std::string_view const &Package)
    {
       return GetItem(Package, "");
    }
-   Item *GetItem(string const &Package, string const &Architecture);
-   
+   Item *GetItem(std::string_view const &Package, std::string_view const &Architecture);
+
    bool ReadOverride(string const &File,bool const &Source = false);
    bool ReadExtraOverride(string const &File,bool const &Source = false);
 };
 
 #endif
-    
+
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 2651cb83d..6d2a13314 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -2,11 +2,11 @@
 // Description								/*{{{*/
 /* ######################################################################
 
-   Writer 
-   
+   Writer
+
    The file writer classes. These write various types of output, sources,
    packages and contents.
-   
+
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
@@ -103,12 +103,12 @@ int FTWScanner::ScannerFTW(const char *File,const struct stat * /*sb*/,int Flag)
    {
       Owner->NewLine(1);
       ioprintf(c1out, _("W: Unable to read directory %s\n"), File);
-   }   
+   }
    if (Flag == FTW_NS)
    {
       Owner->NewLine(1);
       ioprintf(c1out, _("W: Unable to stat %s\n"), File);
-   }   
+   }
    if (Flag != FTW_F)
       return 0;
 
@@ -154,7 +154,7 @@ int FTWScanner::ProcessFile(const char *const File, bool const ReadLink) /*{{{*/
    }
    else
       Owner->DoPackage(File);
-   
+
    if (_error->empty() == false)
    {
       // Print any errors or warnings found
@@ -163,22 +163,22 @@ int FTWScanner::ProcessFile(const char *const File, bool const ReadLink) /*{{{*/
       while (_error->empty() == false)
       {
 	 Owner->NewLine(1);
-	 
+
 	 bool const Type = _error->PopMessage(Err);
 	 if (Type == true)
 	    cerr << _("E: ") << Err << endl;
 	 else
 	    cerr << _("W: ") << Err << endl;
-	 
+
 	 if (Err.find(File) != string::npos)
 	    SeenPath = true;
-      }      
-      
+      }
+
       if (SeenPath == false)
 	 cerr << _("E: Errors apply to file ") << "'" << File << "'" << endl;
       return 0;
    }
-   
+
    return 0;
 }
 									/*}}}*/
@@ -197,11 +197,11 @@ bool FTWScanner::RecursiveScan(string const &Dir)
       InternalPrefix = RealPath;
       free(RealPath);
    }
-   
+
    // Do recursive directory searching
    Owner = this;
    int const Res = ftw(Dir.c_str(),ScannerFTW,30);
-   
+
    // Error treewalking?
    if (Res != 0)
    {
@@ -236,12 +236,12 @@ bool FTWScanner::LoadFileList(string const &Dir, string const &File)
       InternalPrefix = RealPath;
       free(RealPath);
    }
-   
+
    Owner = this;
    FILE *List = fopen(File.c_str(),"r");
    if (List == 0)
       return _error->Errno("fopen",_("Failed to open %s"),File.c_str());
-   
+
    /* We are a tad tricky here.. We prefix the buffer with the directory
       name, that way if we need a full path with just use line.. Sneaky and
       fully evil. */
@@ -250,20 +250,20 @@ bool FTWScanner::LoadFileList(string const &Dir, string const &File)
    if (Dir.empty() == true || Dir.end()[-1] != '/')
       FileStart = Line + snprintf(Line,sizeof(Line),"%s/",Dir.c_str());
    else
-      FileStart = Line + snprintf(Line,sizeof(Line),"%s",Dir.c_str());   
+      FileStart = Line + snprintf(Line,sizeof(Line),"%s",Dir.c_str());
    while (fgets(FileStart,sizeof(Line) - (FileStart - Line),List) != 0)
    {
       char *FileName = _strstrip(FileStart);
       if (FileName[0] == 0)
 	 continue;
-	 
+
       if (FileName[0] != '/')
       {
 	 if (FileName != FileStart)
 	    memmove(FileStart,FileName,strlen(FileStart));
 	 FileName = Line;
       }
-      
+
 #if 0
       struct stat St;
       int Flag = FTW_F;
@@ -276,7 +276,7 @@ bool FTWScanner::LoadFileList(string const &Dir, string const &File)
       if (ProcessFile(FileName, false) != 0)
 	 break;
    }
-  
+
    fclose(List);
    return true;
 }
@@ -290,7 +290,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
 {
    // See if this isn't an internally prefix'd file name.
    if (InternalPrefix.empty() == false &&
-       InternalPrefix.length() < FileName.length() && 
+       InternalPrefix.length() < FileName.length() &&
        stringcmp(FileName.begin(),FileName.begin() + InternalPrefix.length(),
 		 InternalPrefix.begin(),InternalPrefix.end()) != 0)
    {
@@ -299,12 +299,12 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
 	 // Tidy up the display
 	 if (DeLinkBytes == 0)
 	    cout << endl;
-	 
+
 	 NewLine(1);
 	 ioprintf(c1out, _(" DeLink %s [%s]\n"), (OriginalPath + InternalPrefix.length()),
 		    SizeToStr(FileSize).c_str());
 	 c1out << flush;
-	 
+
 	 if (NoLinkAct == false)
 	 {
 	    char OldLink[400];
@@ -322,19 +322,19 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
 		     return _error->Errno("link",_("*** Failed to link %s to %s"),
 					  FileName.c_str(),
 					  OriginalPath);
-		  }	       
+		  }
 	       }
-	    }	    
+	    }
 	 }
-	 
+
 	 DeLinkBytes += FileSize;
 	 if (DeLinkBytes/1024 >= DeLinkLimit)
-	    ioprintf(c1out, _(" DeLink limit of %sB hit.\n"), SizeToStr(DeLinkBytes).c_str());      
+	    ioprintf(c1out, _(" DeLink limit of %sB hit.\n"), SizeToStr(DeLinkBytes).c_str());
       }
-      
+
       FileName = OriginalPath;
    }
-   
+
    return true;
 }
 									/*}}}*/
@@ -400,11 +400,11 @@ PackagesWriter::PackagesWriter(FileFd * const GivenOutput, TranslationWriter * c
                                                                         /*}}}*/
 // PackagesWriter::DoPackage - Process a single package			/*{{{*/
 // ---------------------------------------------------------------------
-/* This method takes a package and gets its control information and 
-   MD5, SHA1 and SHA256 then writes out a control record with the proper fields 
+/* This method takes a package and gets its control information and
+   MD5, SHA1 and SHA256 then writes out a control record with the proper fields
    rewritten and the path/size/hash appended. */
 bool PackagesWriter::DoPackage(string FileName)
-{      
+{
    // Pull all the data we need form the DB
    if (Db.GetFileInfo(FileName,
 	    true, /* DoControl */
@@ -419,19 +419,19 @@ bool PackagesWriter::DoPackage(string FileName)
    unsigned long long FileSize = Db.GetFileSize();
    if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false)
       return false;
-   
+
    // Lookup the override information
    pkgTagSection &Tags = Db.Control.Section;
-   auto const Package = Tags.Find(pkgTagSection::Key::Package).to_string();
-   string Architecture;
+   auto const Package = Tags.Find(pkgTagSection::Key::Package);
+   string_view Architecture;
    // if we generate a Packages file for a given arch, we use it to
-   // look for overrides. if we run in "simple" mode without the 
+   // look for overrides. if we run in "simple" mode without the
    // "Architectures" variable in the config we use the architecture value
    // from the deb file
    if(Arch != "")
       Architecture = Arch;
    else
-      Architecture = Tags.Find(pkgTagSection::Key::Architecture).to_string();
+      Architecture = Tags.Find(pkgTagSection::Key::Architecture);
    unique_ptr<Override::Item> OverItem(Over.GetItem(Package, Architecture));
 
    if (Package.empty() == true)
@@ -443,12 +443,12 @@ bool PackagesWriter::DoPackage(string FileName)
       if (NoOverride == false)
       {
 	 NewLine(1);
-	 ioprintf(c1out, _("  %s has no override entry\n"), Package.c_str());
+	 ioprintf(c1out, _("  %.*s has no override entry\n"), (int)Package.size(), Package.data());
       }
 
       OverItem = unique_ptr<Override::Item>(new Override::Item);
-      OverItem->FieldOverride["Section"] = Tags.Find(pkgTagSection::Key::Section).to_string();
-      OverItem->Priority = Tags.Find(pkgTagSection::Key::Priority).to_string();
+      OverItem->FieldOverride["Section"] = Tags.Find(pkgTagSection::Key::Section);
+      OverItem->Priority = Tags.Find(pkgTagSection::Key::Priority);
    }
 
    // Strip the DirStrip prefix from the FileName and add the PathPrefix
@@ -458,7 +458,7 @@ bool PackagesWriter::DoPackage(string FileName)
        stringcmp(FileName.begin(),FileName.begin() + DirStrip.length(),
 		 DirStrip.begin(),DirStrip.end()) == 0)
       NewFileName = string(FileName.begin() + DirStrip.length(),FileName.end());
-   else 
+   else
       NewFileName = FileName;
    if (PathPrefix.empty() == false)
       NewFileName = flCombine(PathPrefix,NewFileName);
@@ -467,8 +467,9 @@ bool PackagesWriter::DoPackage(string FileName)
       in the package file - instead we want to ship a separated file */
    string desc;
    if (LongDescription == false) {
-      desc = Tags.Find(pkgTagSection::Key::Description).to_string().append("\n");
-      OverItem->FieldOverride["Description"] = desc.substr(0, desc.find('\n')).c_str();
+      desc = Tags.Find(pkgTagSection::Key::Description);
+      desc += '\n';
+      OverItem->FieldOverride["Description"] = desc.substr(0, desc.find('\n'));
    }
 
    // This lists all the changes to the fields we are going to make.
@@ -500,14 +501,15 @@ bool PackagesWriter::DoPackage(string FileName)
 
    // Rewrite the maintainer field if necessary
    bool MaintFailed;
-   string NewMaint = OverItem->SwapMaint(Tags.Find(pkgTagSection::Key::Maintainer).to_string(), MaintFailed);
+   string NewMaint = OverItem->SwapMaint(Tags.Find(pkgTagSection::Key::Maintainer), MaintFailed);
    if (MaintFailed == true)
    {
       if (NoOverride == false)
       {
-	 NewLine(1);
-	 ioprintf(c1out, _("  %s maintainer is %s not %s\n"),
-	       Package.c_str(), Tags.Find(pkgTagSection::Key::Maintainer).to_string().c_str(), OverItem->OldMaint.c_str());
+	 const auto Maint = Tags.Find(pkgTagSection::Key::Maintainer);
+         NewLine(1);
+	 ioprintf(c1out, _("  %.*s maintainer is %.*s not %s\n"),
+	       (int)Package.size(), Package.data(), (int)Maint.size(), Maint.data(), OverItem->OldMaint.c_str());
       }
    }
 
@@ -547,7 +549,7 @@ TranslationWriter::TranslationWriter(string const &File, string const &TransComp
 // TranslationWriter::DoPackage - Process a single package		/*{{{*/
 // ---------------------------------------------------------------------
 /* Create a Translation-Master file for this Packages file */
-bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc,
+bool TranslationWriter::DoPackage(string_view const &Pkg, string const &Desc,
 				  string const &MD5)
 {
    if (Output == NULL)
@@ -555,14 +557,14 @@ bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc,
 
    // Different archs can include different versions and therefore
    // different descriptions - so we need to check for both name and md5.
-   string const Record = Pkg + ":" + MD5;
+   string const Record = string{Pkg} + ":" + MD5;
 
    if (Included.find(Record) != Included.end())
       return true;
 
    std::string out;
-   strprintf(out, "Package: %s\nDescription-md5: %s\nDescription-en: %s\n",
-	   Pkg.c_str(), MD5.c_str(), Desc.c_str());
+   strprintf(out, "Package: %.*s\nDescription-md5: %s\nDescription-en: %s\n",
+	   (int)Pkg.size(), Pkg.data(), MD5.c_str(), Desc.c_str());
    Output->Write(out.c_str(), out.length());
 
    Included.insert(Record);
@@ -590,7 +592,7 @@ SourcesWriter::SourcesWriter(FileFd * const GivenOutput, string const &DB, strin
    DeLinkLimit = 0;
    Buffer = 0;
    BufSize = 0;
-   
+
    // Process the command line options
    ConfigToDoHashes(DoHashes, "APT::FTPArchive::Sources");
    NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false);
@@ -608,7 +610,7 @@ SourcesWriter::SourcesWriter(FileFd * const GivenOutput, string const &DB, strin
 
    if (ExtOverrides.empty() == false)
       SOver.ReadExtraOverride(ExtOverrides);
-   
+
    if (SOverrides.empty() == false && FileExists(SOverrides) == true)
       SOver.ReadOverride(SOverrides,true);
 }
@@ -622,7 +624,7 @@ static std::string getDscHash(unsigned int const DoHashes,
       return "";
    std::ostringstream out;
    out << "\n " << Hash->HashValue() << " " << std::to_string(Size) << " " << FileName
-      << "\n " << Tags.Find(FieldKey).to_string();
+      << "\n " << Tags.Find(FieldKey);
    return out.str();
 }
 bool SourcesWriter::DoPackage(string FileName)
@@ -664,7 +666,7 @@ bool SourcesWriter::DoPackage(string FileName)
       // Ignore too-long errors.
       char *BinList[400];
       TokSplitString(',',Buffer,BinList,sizeof(BinList)/sizeof(BinList[0]));
-      
+
       // Look at all the binaries
       unsigned char BestPrioV = pkgCache::State::Extra;
       for (unsigned I = 0; BinList[I] != 0; I++)
@@ -678,39 +680,40 @@ bool SourcesWriter::DoPackage(string FileName)
 	 {
 	    BestPrioV = NewPrioV;
 	    BestPrio = Itm->Priority;
-	 }	 
+	 }
 
 	 if (OverItem.get() == 0)
 	    OverItem = std::move(Itm);
       }
    }
-   
+
    // If we need to do any rewriting of the header do it now..
    if (OverItem.get() == 0)
    {
       if (NoOverride == false)
       {
+         const auto Source = Tags.Find(pkgTagSection::Key::Source);
 	 NewLine(1);
-	 ioprintf(c1out, _("  %s has no override entry\n"), Tags.Find(pkgTagSection::Key::Source).to_string().c_str());
+	 ioprintf(c1out, _("  %.*s has no override entry\n"), (int)Source.size(), Source.data());
       }
-      
+
       OverItem.reset(new Override::Item);
    }
-   
+
    struct stat St;
    if (stat(FileName.c_str(), &St) != 0)
       return _error->Errno("fstat","Failed to stat %s",FileName.c_str());
 
-   auto const Package = Tags.Find(pkgTagSection::Key::Source).to_string();
+   auto const Package = Tags.Find(pkgTagSection::Key::Source);
    unique_ptr<Override::Item> SOverItem(SOver.GetItem(Package));
    // const unique_ptr<Override::Item> autoSOverItem(SOverItem);
    if (SOverItem.get() == 0)
    {
-      ioprintf(c1out, _("  %s has no source override entry\n"), Package.c_str());
+      ioprintf(c1out, _("  %.*s has no source override entry\n"), (int)Package.size(), Package.data());
       SOverItem = unique_ptr<Override::Item>(BOver.GetItem(Package));
       if (SOverItem.get() == 0)
       {
-        ioprintf(c1out, _("  %s has no binary override entry either\n"), Package.c_str());
+        ioprintf(c1out, _("  %.*s has no binary override entry either\n"), (int)Package.size(), Package.data());
 	 SOverItem = unique_ptr<Override::Item>(new Override::Item);
 	 *SOverItem = *OverItem;
       }
@@ -729,7 +732,7 @@ bool SourcesWriter::DoPackage(string FileName)
        FileName.length() > DirStrip.length() &&
        stringcmp(DirStrip,OriginalPath,OriginalPath + DirStrip.length()) == 0)
       NewFileName = string(OriginalPath + DirStrip.length());
-   else 
+   else
       NewFileName = OriginalPath;
    if (PathPrefix.empty() == false)
       NewFileName = flCombine(PathPrefix,NewFileName);
@@ -826,7 +829,7 @@ bool SourcesWriter::DoPackage(string FileName)
    std::vector<pkgTagSection::Tag> Changes;
 
    Changes.push_back(pkgTagSection::Tag::Remove("Source"));
-   Changes.push_back(pkgTagSection::Tag::Rewrite("Package", Package));
+   Changes.push_back(pkgTagSection::Tag::Rewrite("Package", std::string{Package}));
    if (Files.empty() == false)
       Changes.push_back(pkgTagSection::Tag::Rewrite("Files", Files));
    else
@@ -850,14 +853,15 @@ bool SourcesWriter::DoPackage(string FileName)
 
    // Rewrite the maintainer field if necessary
    bool MaintFailed;
-   string NewMaint = OverItem->SwapMaint(Tags.Find(pkgTagSection::Key::Maintainer).to_string(), MaintFailed);
+   string NewMaint = OverItem->SwapMaint(Tags.Find(pkgTagSection::Key::Maintainer), MaintFailed);
    if (MaintFailed == true)
    {
       if (NoOverride == false)
       {
-	 NewLine(1);
-	 ioprintf(c1out, _("  %s maintainer is %s not %s\n"), Package.c_str(),
-	       Tags.Find(pkgTagSection::Key::Maintainer).to_string().c_str(), OverItem->OldMaint.c_str());
+	 const auto Maint = Tags.Find(pkgTagSection::Key::Maintainer);
+         NewLine(1);
+	 ioprintf(c1out, _("  %.*s maintainer is %.*s not %s\n"), (int)Package.size(), Package.data(),
+	       (int)Maint.size(), Maint.data(), OverItem->OldMaint.c_str());
       }
    }
    if (NewMaint.empty() == false)
@@ -873,7 +877,7 @@ bool SourcesWriter::DoPackage(string FileName)
       return false;
 
    Stats.Packages++;
-   
+
    return true;
 }
 									/*}}}*/
@@ -909,11 +913,11 @@ bool ContentsWriter::DoPackage(string FileName, string Package)
    // Parse the package name
    if (Package.empty() == true)
    {
-      Package = Db.Control.Section.Find(pkgTagSection::Key::Package).to_string();
+      Package = Db.Control.Section.Find(pkgTagSection::Key::Package);
    }
 
-   Db.Contents.Add(Gen,Package);
-   
+   Db.Contents.Add(Gen,std::move(Package));
+
    return Db.Finish();
 }
 									/*}}}*/
@@ -939,8 +943,8 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres
    pkgTagSection Section;
    while (Tags.Step(Section) == true)
    {
-      auto File = flCombine(Prefix, Section.Find(pkgTagSection::Key::Filename).to_string());
-      auto Package = flCombine(Section.Find(pkgTagSection::Key::Section).to_string(), Section.Find(pkgTagSection::Key::Package).to_string());
+      auto File = flCombine(Prefix, string{Section.Find(pkgTagSection::Key::Filename)});
+      auto Package = flCombine(string{Section.Find(pkgTagSection::Key::Section)}, string{Section.Find(pkgTagSection::Key::Package)});
       DoPackage(std::move(File), std::move(Package));
       if (_error->empty() == false)
       {
@@ -1058,7 +1062,7 @@ bool ReleaseWriter::DoPackage(string FileName)
       while (NewFileName[0] == '/')
          NewFileName = string(NewFileName.begin() + 1,NewFileName.end());
    }
-   else 
+   else
       NewFileName = FileName;
 
    if (PathPrefix.empty() == false)
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 90fb27fe7..a366233ab 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -2,11 +2,11 @@
 // Description								/*{{{*/
 /* ######################################################################
 
-   Writer 
-   
+   Writer
+
    The file writer classes. These write various types of output, sources,
    packages and contents.
-   
+
    ##################################################################### */
 									/*}}}*/
 #ifndef WRITER_H
@@ -95,7 +95,7 @@ class TranslationWriter
    FileFd *Output;
 
    public:
-   bool DoPackage(string const &Pkg, string const &Desc, string const &MD5);
+   bool DoPackage(std::string_view const &Pkg, string const &Desc, string const &MD5);
 
    TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions);
    ~TranslationWriter();
@@ -121,7 +121,7 @@ class PackagesWriter : public FTWScanner
    TranslationWriter * const TransWriter;
 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
-   inline bool ReadExtraOverride(string const &File) 
+   inline bool ReadExtraOverride(string const &File)
       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName) APT_OVERRIDE;
 
@@ -146,7 +146,7 @@ class ContentsWriter : public FTWScanner
    string Prefix;
 
    bool DoPackage(string FileName,string Package);
-   virtual bool DoPackage(string FileName) APT_OVERRIDE 
+   virtual bool DoPackage(string FileName) APT_OVERRIDE
              {return DoPackage(FileName,string());};
    bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index aa4e94063..79cd463af 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -3356,12 +3356,12 @@ msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "  %.*s has no override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
 msgstr ""
 
 #: ftparchive/writer.cc
@@ -3371,7 +3371,7 @@ msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 
 #: methods/basehttp.cc
diff --git a/po/ar.po b/po/ar.po
index 54617fbc7..074436547 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3439,22 +3439,22 @@ msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "  %.*s has no override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "  %.*s has no source override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 
 #: methods/basehttp.cc
diff --git a/po/ast.po b/po/ast.po
index 1ba96838e..464c885d6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3616,23 +3616,23 @@ msgstr "L'archivu nun tien el campu paquetes"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nun tien la entrada saltos\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s nun tien la entrada saltos\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el curiador de %s ye %s y non %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  el curiador de %.*s ye %.*s y non %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nun tien la entrada saltos de fonte\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s nun tien la entrada saltos de fonte\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s tampoco nun tiene una entrada binaria de saltos\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/bg.po b/po/bg.po
index 5e135ea65..7a4824fff 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3670,23 +3670,23 @@ msgstr "Архивът няма поле „package“"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s няма запис „override“\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s няма запис „override“\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  поддържащия пакета %s е %s, а не %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  поддържащия пакета %.*s е %.*s, а не %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s няма запис „source override“\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s няма запис „source override“\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s няма също и запис „binary override“\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s няма също и запис „binary override“\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/bs.po b/po/bs.po
index 4bc93a042..c815217cc 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3424,22 +3424,22 @@ msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "  %.*s has no override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "  %.*s has no source override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 
 #: methods/basehttp.cc
diff --git a/po/ca.po b/po/ca.po
index fca25f17f..35526f513 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3743,23 +3743,23 @@ msgstr "L'arxiu no té cap camp paquet"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s no té una entrada dominant\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s no té una entrada dominant\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el mantenidor de %s és %s, no %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  el mantenidor de %.*s és %.*s, no %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s no té una entrada dominant de font\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s no té una entrada dominant de font\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampoc no té una entrada dominant de binari\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s tampoc no té una entrada dominant de binari\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/cs.po b/po/cs.po
index 1c2626606..5bfe3e8a1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3626,23 +3626,23 @@ msgstr "Archiv nemá pole Package"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žádnou položku pro override\n"
+msgid "  %.*s has no override entry\n"
+msgstr " %.*s nemá žádnou položku pro override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správce %s je %s, ne %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  správce %.*s je %.*s, ne %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žádnou zdrojovou položku pro override\n"
+msgid "  %.*s has no source override entry\n"
+msgstr " %.*s nemá žádnou zdrojovou položku pro override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá ani žádnou binární položku pro override\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr " %.*s nemá ani žádnou binární položku pro override\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/cy.po b/po/cy.po
index 7da60722d..95a9f4ea8 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -3617,23 +3617,23 @@ msgstr "Doedd dim maes pecyn gan yr archif"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %.*s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  Cynaliwr %.*s yw %.*s nid %s\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %.*s\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %.*s\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/da.po b/po/da.po
index e12362274..ce1d9bf5c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3694,24 +3694,24 @@ msgstr "Arkivet havde intet package-felt"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen tvangs-post\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s har ingen tvangs-post\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  pakkeansvarlig for %.*s er %.*s, ikke %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s har ingen linje med tilsidesættelse af standard for kildefiler\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
-"  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
+"  %.*s har ingen linje med tilsidesættelse af standard for binøre filer\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/de.po b/po/de.po
index 25f40d212..a46a5a532 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3817,23 +3817,23 @@ msgstr "Archiv hatte kein Feld »package«"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s hat keinen Eintrag in der Override-Liste.\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-Betreuer ist %s und nicht %s.\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s-Betreuer ist %.*s und nicht %s.\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s hat keinen Eintrag in der Source-Override-Liste.\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s hat keinen Eintrag in der Binary-Override-Liste.\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/dz.po b/po/dz.po
index b5f3f1893..1db974433 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -3577,23 +3577,23 @@ msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s ་རྒྱུན་སྐྱོང་པ་འདི་  %.*s ཨིན་   %s མེན།\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/el.po b/po/el.po
index efa239880..5c3261ae3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3570,23 +3570,23 @@ msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτω�
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s δεν περιέχει εγγραφή παράκαμψης\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s συντηρητής είναι ο %.*s όχι ο %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/es.po b/po/es.po
index 42e547489..c2ac856e3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3819,23 +3819,23 @@ msgstr "Archivo no tiene campo de paquetes"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s no tiene entrada de predominio\n"
+msgid "  %.*s has no override entry\n"
+msgstr " %.*s no tiene entrada de predominio\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " el encargado de %s es %s y no %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr " el encargado de %.*s es %.*s y no %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s no tiene una entrada fuente predominante\n"
+msgid "  %.*s has no source override entry\n"
+msgstr " %.*s no tiene una entrada fuente predominante\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s tampoco tiene una entrada binaria predominante\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr " %.*s tampoco tiene una entrada binaria predominante\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/eu.po b/po/eu.po
index 9f2cb2ce5..01e5d0956 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3574,23 +3574,23 @@ msgstr "Artxiboak ez du pakete eremurik"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s: ez du override sarrerarik\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s: ez du override sarrerarik\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s mantentzailea %s da, eta ez %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s mantentzailea %.*s da, eta ez %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s: ez du jatorri gainidazketa sarrerarik\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s: ez du bitar gainidazketa sarrerarik\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/fi.po b/po/fi.po
index 8d9e39d36..b62e15d0b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3571,23 +3571,23 @@ msgstr "Arkistossa ei ollut pakettikenttää"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s:llä ei ole poikkeustietuetta\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ylläpitäjä on %s eikä %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s ylläpitäjä on %.*s eikä %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s:llä ei ole poikkeustietuetta\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s:llä ei  ole binääristäkään poikkeustietuetta\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/fr.po b/po/fr.po
index 2fd8fa603..45785b43a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3831,23 +3831,23 @@ msgstr "L'archive ne possède pas de champ de paquet"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ne possède pas d'entrée « override »\n"
+msgid "  %.*s has no override entry\n"
+msgstr "%.*s ne possède pas d'entrée « override »\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " le responsable de %s est %s et non %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr " le responsable de %.*s est %.*s et non %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ne possède pas d'entrée « source override »\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s ne possède pas d'entrée « source override »\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ne possède pas également d'entrée « binary override »\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s ne possède pas également d'entrée « binary override »\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/gl.po b/po/gl.po
index d90d6180f..c62078c92 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3651,23 +3651,23 @@ msgstr "O arquivo non tiña un campo Package"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ten unha entrada de «override»\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s non ten unha entrada de «override»\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  O mantedor de %s é %s, non %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  O mantedor de %.*s é %.*s, non %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ten unha entrada de «override» de código fonte\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s non ten unha entrada de «override» de código fonte\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s tampouco ten unha entrada de «override» de binarios\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/he.po b/po/he.po
index 50581bc36..27dbacf31 100644
--- a/po/he.po
+++ b/po/he.po
@@ -433,22 +433,22 @@ msgstr ""
 
 #: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "  %.*s has no override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "המתחזק של %s הוא %s ולא %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "המתחזק של %.*s הוא %.*s ולא %s\n"
 
 #: ftparchive/writer.cc:637
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "  %.*s has no source override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc:641
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 
 #: ftparchive/contents.cc:321
diff --git a/po/hu.po b/po/hu.po
index 1d95a99b5..e18096311 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3716,23 +3716,23 @@ msgstr "Az archívumnak nem volt csomag mezője"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s nem rendelkezik felülbíráló bejegyzéssel\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s karbantartója %s, nem %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s karbantartója %.*s, nem %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/it.po b/po/it.po
index 061f10125..df85c0352 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3779,23 +3779,23 @@ msgstr "L'archivio non ha un campo \"package\""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ha un campo override\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s non ha un campo override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  il responsabile di %s è %s non %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  il responsabile di %.*s è %.*s non %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ha un campo source override\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s non ha un campo source override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s non ha neppure un campo binario override\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s non ha neppure un campo binario override\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/ja.po b/po/ja.po
index 425a92617..0d6557a90 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3706,23 +3706,23 @@ msgstr "アーカイブにパッケージフィールドがありませんでし
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s に override エントリがありません\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s に override エントリがありません\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %1$*2$s メンテナは %5$s ではなく %3$*4$s です\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s にソース override エントリがありません\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s にソース override エントリがありません\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s にバイナリ override エントリがありません\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s にバイナリ override エントリがありません\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/km.po b/po/km.po
index 12d2a0f44..f3336b2a1 100644
--- a/po/km.po
+++ b/po/km.po
@@ -3555,23 +3555,23 @@ msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  អ្នក​ថែទាំ %.*s គឺ %.*s មិនមែន​ %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/ko.po b/po/ko.po
index 0f388d15a..312696d14 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3575,23 +3575,23 @@ msgstr "아카이브에 패키지 필드가 없습니다"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s에는 override 항목이 없습니다\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s에는 override 항목이 없습니다\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 관리자가 %s입니다 (%s 아님)\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s 관리자가 %.*s입니다 (%s 아님)\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s에는 source override 항목이 없습니다\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s에는 source override 항목이 없습니다\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s에는 binary override 항목이 없습니다\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s에는 binary override 항목이 없습니다\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/ku.po b/po/ku.po
index 4ab5d1514..234e15a1d 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -3438,22 +3438,22 @@ msgstr "Di arşîvê de qada pakêtê tuneye"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "  %.*s has no override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "  %.*s has no source override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 
 #: methods/basehttp.cc
diff --git a/po/lt.po b/po/lt.po
index 8ee1642b4..7223410bb 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3547,22 +3547,22 @@ msgstr "Archyvas neturėjo paketo lauko"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s neturi perrašymo įrašo\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s neturi perrašymo įrašo\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s prižiūrėtojas yra %s, o ne %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s prižiūrėtojas yra %.*s, o ne %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "  %.*s has no source override entry\n"
 msgstr ""
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 
 #: methods/basehttp.cc
diff --git a/po/mr.po b/po/mr.po
index 40dab029f..a445fb4b5 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -3556,23 +3556,23 @@ msgstr "अर्काईव्ह ला पॅकेज जागा ना�
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+msgid "  %.*s has no override entry\n"
+msgstr "%.*s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "%.*s देखभालकर्ता हा %.*s आणि %s नाही \n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "%.*s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "%.*s ला द्वयंक ओव्हरराईड जागा नाही\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/nb.po b/po/nb.po
index c6514daf4..92586eb90 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3644,23 +3644,23 @@ msgstr "Arkivet har ikke noe pakkefelt"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen overstyringsoppføring\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s har ingen overstyringsoppføring\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr " %.*s-vedlikeholderen er %.*s, ikke %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen kildeoverstyringsoppføring\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s har ingen kildeoverstyringsoppføring\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s har ingen binæroverstyringsoppføring heller\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/ne.po b/po/ne.po
index a573e542e..3377e1164 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -3552,23 +3552,23 @@ msgstr "संग्रह संग कुनै प्याकेज फा�
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+msgid "  %.*s has no override entry\n"
+msgstr "   %.*s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s संभारकर्ता %s हो %s होइन\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s संभारकर्ता %.*s हो %s होइन\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "   %.*s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "   %.*s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/nl.po b/po/nl.po
index f968e8206..faf0a46d1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3748,23 +3748,23 @@ msgstr "Archief heeft geen 'package'-veld"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s heeft geen voorrangsvermelding\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s heeft geen voorrangsvermelding\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s beheerder is %s, niet %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s beheerder is %.*s, niet %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s heeft geen voorrangsvermelding voor bronpakketten\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s heeft geen voorrangsvermelding voor bronpakketten\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s heeft ook geen voorrangsvermelding voor binaire pakketten\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s heeft ook geen voorrangsvermelding voor binaire pakketten\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/nn.po b/po/nn.po
index 42488cf73..eb29cb296 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3565,23 +3565,23 @@ msgstr "Arkivet har ikkje noko pakkefelt"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har inga overstyringsoppf�ring\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s har inga overstyringsoppf�ring\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s-vedlikehaldaren er %.*s, ikkje %s\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har inga overstyringsoppf�ring\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s har inga overstyringsoppf�ring\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har inga overstyringsoppf�ring\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s har inga overstyringsoppf�ring\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/pl.po b/po/pl.po
index 6c0a30b5f..54cc20285 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3755,23 +3755,23 @@ msgstr "Archiwum nie posiadało pola pakietu"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s nie posiada wpisu w pliku override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  opiekunem %s jest %s, a nie %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  opiekunem %.*s jest %.*s, a nie %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s nie posiada wpisu w pliku override źródeł\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nie posiada również wpisu w pliku override binariów\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s nie posiada również wpisu w pliku override binariów\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/pt.po b/po/pt.po
index 5bcc24f28..80f4a1856 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3675,23 +3675,23 @@ msgstr "Arquivo não possuía campo package"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s não possui entrada override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " o maintainer de %s é %s, não %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr " o maintainer de %.*s é %.*s, não %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui fonte de entrada de 'override'\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s não possui fonte de entrada de 'override'\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s também não possui entrada binária de 'override'\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s também não possui entrada binária de 'override'\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 359767b5c..f2d7d9189 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3594,23 +3594,23 @@ msgstr "Repositório não possuía campo pacote"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s não possui entrada override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  mantenedor de %s é %s, não %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  mantenedor de %.*s é %.*s, não %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui entrada override fonte\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s não possui entrada override fonte\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s também não possui entrada override binária\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s também não possui entrada override binária\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/ro.po b/po/ro.po
index f26e9f7be..30b2cee88 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3839,23 +3839,23 @@ msgstr "Arhiva nu are câmp de pachet"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nu are intrare „override”\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s nu are intrare „override”\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s responsabil este %s nu %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s responsabil este %.*s nu %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nu are nici o intrare „source override”\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s nu are nici o intrare „source override”\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nu are nici intrare „binary override”\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s nu are nici intrare „binary override”\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/ru.po b/po/ru.po
index 7d7222087..6344e9d41 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3746,27 +3746,27 @@ msgstr "В архиве нет поля package"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Нет записи о переназначении (override) для %s\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  Нет записи о переназначении (override) для %.*s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Пакет %s сопровождает %s, а не %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  Пакет %.*s сопровождает %.*s, а не %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "  %.*s has no source override entry\n"
 msgstr ""
 "  Нет записи о переназначении пакетов с исходным кодом (source override) для "
-"%s\n"
+"%.*s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "  %.*s has no binary override entry either\n"
 msgstr ""
 "  Также нет записи о переназначении двоичных пакетов (binary override) для "
-"%s\n"
+"%.*s\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/sk.po b/po/sk.po
index b0b01dd2a..cf161875d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3637,23 +3637,23 @@ msgstr "Archív neobsahuje pole „package“"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žiadnu položku override\n"
+msgid "  %.*s has no override entry\n"
+msgstr " %.*s nemá žiadnu položku override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správcom %s je %s, nie %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  správcom %.*s je %.*s, nie %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žiadnu položku „source override“\n"
+msgid "  %.*s has no source override entry\n"
+msgstr " %.*s nemá žiadnu položku „source override“\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá žiadnu položku „binary override“\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr " %.*s nemá žiadnu položku „binary override“\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/sl.po b/po/sl.po
index 316e5848c..78ee9c964 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3643,23 +3643,23 @@ msgstr "Arhiv ni imel polja s paketom"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nima prepisanega vnosa\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s nima prepisanega vnosa\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Vzdrževalec %s je %s in ne %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  Vzdrževalec %.*s je %.*s in ne %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nima izvornega vnosa prepisa\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s nima izvornega vnosa prepisa\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nima tudi binarnega vnosa prepisa\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s nima tudi binarnega vnosa prepisa\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/sv.po b/po/sv.po
index 203eb64f2..6673ebf78 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3668,24 +3668,24 @@ msgstr "Arkivet har inget package-fält"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen post i åsidosättningsfilen\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s har ingen post i åsidosättningsfilen\n"
 
 # parametrar: paket, ny, gammal
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ansvarig för paketet %s är %s ej %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  ansvarig för paketet %.*s är %.*s ej %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen källåsidosättningspost\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s har ingen källåsidosättningspost\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har heller ingen binär åsidosättningspost\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s har heller ingen binär åsidosättningspost\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/th.po b/po/th.po
index d16cd1dbf..857c70c7e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3565,23 +3565,23 @@ msgstr "แพกเกจไม่มีช่องข้อมูล 'Package
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ไม่มีข้อมูล override\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s ไม่มีข้อมูล override\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  ผู้ดูแล %.*s คือ %.*s ไม่ใช่ %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s ไม่มีข้อมูล override สำหรับซอร์ส\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/tl.po b/po/tl.po
index 61ac0473d..6f4564417 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -3583,23 +3583,23 @@ msgstr "Walang field ng pakete ang arkibo"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ay walang override entry\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s ay walang override entry\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  Tagapangalaga ng %.*s ay %.*s hindi %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ay walang override entry para sa pinagmulan\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s ay walang override entry para sa pinagmulan\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ay wala ring override entry na binary\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s ay wala ring override entry na binary\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/tr.po b/po/tr.po
index ffcfaadfd..eb9fb6194 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3701,23 +3701,23 @@ msgstr "Arşivde paket alanı yok"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s için geçersiz kılma girdisi yok\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s için geçersiz kılma girdisi yok\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s geliştiricisi %s, %s değil\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s geliştiricisi %.*s, %s değil\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  '%.*s' paketinin yerine geçecek bir kaynak paket yok\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  '%s' paketinin yerine geçecek bir ikili paket de yok\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  '%.*s' paketinin yerine geçecek bir ikili paket de yok\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/uk.po b/po/uk.po
index c29754881..ffc285e8c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3696,23 +3696,23 @@ msgstr "Архів не мав поля 'package'"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Відсутній запис про перепризначення (override) для %s\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  Відсутній запис про перепризначення (override) для %.*s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакунок %s супроводжується %s, а не %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  пакунок %.*s супроводжується %.*s, а не %s\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  Відсутній запис про перепризначення вихідних текстів для %.*s\n"
 
 #: ftparchive/writer.cc
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  Крім того, відсутній запис про бінарне перепризначення для %.*s\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/vi.po b/po/vi.po
index cceca8550..3a9f6733f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3667,23 +3667,23 @@ msgstr "Kho không có trường gói"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s không có mục ghi đè (override)\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s không có mục ghi đè (override)\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  người bảo trì %s là %s không phải %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  người bảo trì %.*s là %.*s không phải %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s không có mục ghi đè (override) nguồn\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s không có mục ghi đè (override) nguồn\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s cũng không có mục ghi đè (override) nhị phân\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s cũng không có mục ghi đè (override) nhị phân\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f7cd0aadf..01107a828 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3531,23 +3531,23 @@ msgstr "归档文件没有包含 package 字段"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 中没有 override 项\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s 中没有 override 项\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的维护者 %s 并非 %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s 的维护者 %.*s 并非 %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 没有源代码的 override 项\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s 没有源代码的 override 项\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 中没有二进制文件的 override 项\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s 中没有二进制文件的 override 项\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 42c659cde..fed13b784 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3537,23 +3537,23 @@ msgstr "套件檔裡沒有套件資訊"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 沒有重新定義項目\n"
+msgid "  %.*s has no override entry\n"
+msgstr "  %.*s 沒有重新定義項目\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的維護者是 %s，而非 %s\n"
+msgid "  %.*s maintainer is %.*s not %s\n"
+msgstr "  %.*s 的維護者是 %.*s，而非 %s\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 沒有原始碼重新定義項目\n"
+msgid "  %.*s has no source override entry\n"
+msgstr "  %.*s 沒有原始碼重新定義項目\n"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 也沒有二元碼重新定義項目\n"
+msgid "  %.*s has no binary override entry either\n"
+msgstr "  %.*s 也沒有二元碼重新定義項目\n"
 
 #: methods/basehttp.cc
 msgid "Waiting for headers"