* merged from Christian Perrier:

      * Update all PO and the POT. Gives 514t14f4u for formerly
        complete translations
      * fr.po: completed to 532t
      * ku.po, uk.po, LINGUAS: reintegrate those translations
        which disappeared from the BZR repositories

apt-pkg/pkgcachegen.cc

@@ -150,7 +150,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
  		  Desc->ParentPkg = Pkg.Index();
 		  
  		  if (NewFileDesc(Desc,List) == false)
- 		     return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
+ 		     return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str());
  		  break;
  	       }
 	    }
@@ -242,7 +242,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       Desc->ParentPkg = Pkg.Index();
 
       if (NewFileDesc(Desc,List) == false)
-	 return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());
+	 return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str());
    }
 
    FoundFileDeps |= List.HasFileDeps();

debian/changelog

@@ -7,6 +7,15 @@ apt (0.7.3) unstable; urgency=low
   * cmdline/apt-get.cc:
     - fix InstallTask code when a pkgRecord ends 
       with a single '\n' (thanks to Soren Hansen for reporting)
+  * merged from Christian Perrier:
+	* vi.po: completed to 532t, again. Closes: #429899
+	* gl.po: completed to 532t. Closes: #429506
+	* vi.po: completed to 532t. Closes: #428672
+        * Update all PO and the POT. Gives 514t14f4u for formerly
+          complete translations
+        * fr.po: completed to 532t
+        * ku.po, uk.po, LINGUAS: reintegrate those translations
+          which disappeared from the BZR repositories
 
  --
 

po/ChangeLog

@@ -1,3 +1,26 @@
+2007-06-19  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: completed to 532t, again. Closes: #429899
+
+2007-06-19  Jacobo Tarrío  <jtarrio@debian.org>
+
+	* gl.po: completed to 532t. Closes: #429506
+
+2007-06-13  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: completed to 532t. Closes: #428672
+
+2007-06-12  Christian Perrier  <bubulle@debian.org>
+
+	* Update all PO and the POT. Gives 514t14f4u for formerly
+	  complete translations
+	* fr.po: completed to 532t
+
+2007-06-12  Christian Perrier  <bubulle@debian.org>
+
+	* ku.po, uk.po, LINGUAS: reintegrate those translations
+	  which disappeared from the BZR repositories
+
 2007-06-01  Clytie Siddall  <clytie@riverland.net.au>
 
 	* vi.po: Updated to 515t. Closes: #426976

po/LINGUAS

@@ -1 +1 @@
-bg bs ca cs cy da de el en_GB es eu fi fr gl he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
+bg bs ca cs cy da de el en_GB es eu fi fr gl he hu it ja ko ku nb nl nn pl pt pt_BR ro ru sk sl sv tl uk vi zh_CN zh_TW